diff --git a/src/include/core_as/strexpr.h b/src/include/core_as/strexpr.h index d48d3ed..2ebdb4f 100644 --- 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, const K(&s)[N]) { return strexpr{J{ a.a, L { s } }}; } -template -static auto e_c(const K(&s)[N]) { - using J = expr_literal(N - 1)>; - return strexpr{J{ s }}; -} - template 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::assign(p, N, static_cast(S)); + std::char_traits::assign(p, N, static_cast(S)); return p + N; } }; diff --git a/src/include/core_as/version.h b/src/include/core_as/version.h index 39abf35..1d184a0 100644 --- 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 index 119c98f..3f30b83 100644 --- a/src/inject/inject.vcxproj +++ b/src/inject/inject.vcxproj @@ -114,6 +114,7 @@ pch.h stdcpp20 /Zc:threadSafeInit- /utf-8 %(AdditionalOptions) + MultiThreadedDebug Windows @@ -170,6 +171,7 @@ pch.h stdcpp20 /Zc:threadSafeInit- /utf-8 %(AdditionalOptions) + MultiThreadedDebug Windows diff --git a/src/starter/debugdump.cpp b/src/starter/debugdump.cpp index 3760813..0d21031 100644 --- a/src/starter/debugdump.cpp +++ b/src/starter/debugdump.cpp @@ -4,7 +4,6 @@ */ #include "pch.h" -#ifdef _DEBUG #include 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 index d5b7a98..da9e9c5 100644 --- 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"));