Устранен вылет при запуске на Win7 и Win Server 2008.

Fix #16, Close #19
infostart-hub · Sep 29, 2021 · ce56f23 · ce56f23
1 parent 4bded7f
commit ce56f23
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/src/include/core_as/strexpr.h b/src/include/core_as/strexpr.h
@@ -114,19 +114,13 @@ constexpr static auto operator & (const strexpr<A>& a, const K(&s)[N]) {
     return strexpr<J>{J{ a.a, L { s } }};
 }
 
-template<typename K, size_t N>
-static auto e_c(const K(&s)[N]) {
-    using J = expr_literal<K, static_cast<uint>(N - 1)>;
-    return strexpr<J>{J{ s }};
-}
-
 template<typename K, uint N, uint S = ' '>
 struct expr_spaces {
     using symb_type = K;
     constexpr uint length() const noexcept { return N; }
     constexpr symb_type* place(symb_type* p) const noexcept {
         if constexpr (N != 0)
-            char_traits<K>::assign(p, N, static_cast<K>(S));
+            std::char_traits<K>::assign(p, N, static_cast<K>(S));
         return p + N;
     }
 };

diff --git a/src/include/core_as/version.h b/src/include/core_as/version.h
@@ -1,3 +1,3 @@
-#define F_VERSION 1,0,1,0
-#define P_VERSION "1.0.1.0"
+#define F_VERSION 1,0,1,1
+#define P_VERSION "1.0.1.1"
 #define COPY_RIGHT "© Àëåêñàíäð Îðåôêîâ, 2021"
diff --git a/src/inject/inject.vcxproj b/src/inject/inject.vcxproj
@@ -114,6 +114,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -170,6 +171,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/starter/debugdump.cpp b/src/starter/debugdump.cpp
@@ -4,7 +4,6 @@
 */
 #include "pch.h"
 
-#ifdef _DEBUG
 #include <Dbghelp.h>
 
 typedef BOOL(WINAPI* MINIDUMPWRITEDUMP) (HANDLE,
@@ -54,5 +53,3 @@ void initLastDump() {
     AddVectoredExceptionHandler(1, TopLevelFilter);
     SetUnhandledExceptionFilter(TopLevelFilter);
 }
-
-#endif
diff --git a/src/starter/starter.cpp b/src/starter/starter.cpp
@@ -215,7 +215,8 @@ void processStopInject() {
         inject_unhook();
         if (h64Write) {
             char cmd = icUnhook;
-            WriteFile(h64Write, &cmd, 1, 0, 0);
+            DWORD w;
+            WriteFile(h64Write, &cmd, 1, &w, 0);
         }
         isInjected = false;
         processBroadCast(lstringw<100>(+L"starter\v"_ss & (size_t)hMainWnd & L"\vinject=0"));
@@ -234,7 +235,8 @@ void processResumeInject() {
         inject_hook();
         if (h64Write) {
             char cmd = icHook;
-            WriteFile(h64Write, &cmd, 1, 0, 0);
+            DWORD w;
+            WriteFile(h64Write, &cmd, 1, &w, 0);
         }
         isInjected = true;
         processBroadCast(lstringw<100>(+L"starter\v"_ss & (size_t) hMainWnd & L"\vinject=1"));