Обновлены библиотеки core_as на актуальные.

infostart-hub · Sep 23, 2021 · 9e780eb · 9e780eb
1 parent 59df336
commit 9e780eb
Show file tree

Hide file tree

Showing 16 changed files with 131 additions and 119 deletions.
diff --git a/src/include/core_as/sstring.h b/src/include/core_as/sstring.h
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,0,9
-#define P_VERSION "1.0.0.9"
+#define F_VERSION 1,0,1,0
+#define P_VERSION "1.0.1.0"
 #define COPY_RIGHT "© Àëåêñàíäð Îðåôêîâ, 2021"
diff --git a/src/inject/inject.vcxproj b/src/inject/inject.vcxproj
@@ -113,6 +113,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -139,6 +140,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -167,6 +169,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -193,6 +196,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/lib/core_as/Debug/x64/core_as.exp b/src/lib/core_as/Debug/x64/core_as.exp
diff --git a/src/lib/core_as/Debug/x64/core_as.lib b/src/lib/core_as/Debug/x64/core_as.lib
diff --git a/src/lib/core_as/Debug/x86/core_as.exp b/src/lib/core_as/Debug/x86/core_as.exp
diff --git a/src/lib/core_as/Debug/x86/core_as.lib b/src/lib/core_as/Debug/x86/core_as.lib
diff --git a/src/lib/core_as/Release/x64/core_as.exp b/src/lib/core_as/Release/x64/core_as.exp
diff --git a/src/lib/core_as/Release/x64/core_as.lib b/src/lib/core_as/Release/x64/core_as.lib
diff --git a/src/lib/core_as/Release/x86/core_as.exp b/src/lib/core_as/Release/x86/core_as.exp
diff --git a/src/lib/core_as/Release/x86/core_as.lib b/src/lib/core_as/Release/x86/core_as.lib
diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj
@@ -74,6 +74,7 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)_build\$(Configuration)\lib\$(PlatformTarget)\</OutDir>
     <IntDir>$(SolutionDir)_build\objs\$(Configuration)\$(PlatformTarget)\$(ProjectName)\</IntDir>
+    <TargetName>coreas_$(ProjectName)_c</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -85,6 +86,7 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)_build\$(Configuration)\lib\$(PlatformTarget)\</OutDir>
     <IntDir>$(SolutionDir)_build\objs\$(Configuration)\$(PlatformTarget)\$(ProjectName)\</IntDir>
+    <TargetName>coreas_$(ProjectName)_c</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -96,15 +98,16 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(ProjectDir)..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>Default</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -132,6 +135,7 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -154,15 +158,16 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(ProjectDir)..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>Default</LanguageStandard_C>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -187,6 +192,7 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/src/starter/modules_list.cpp b/src/starter/modules_list.cpp
@@ -31,45 +31,44 @@ struct LoadModuleInfo {
 };
 
 stringw parseArguments(ssw args) {
-    return stringw::join(core_as_parseArguments(args), L"\v").replace(L"\"\"", L"\"");
+    return stringw{ eew & e_repl(lstringw<500>::join(core_as_parseArguments(args), L"\v").to_str(), L"\"\"", L"\"") };
 }
 
 void processFile(const wchar_t* filePath, vector<LoadModuleInfo>& modules) {
-    lstringw<0x200> sectionNames;
-    lstringsw<0x200> buffer;
-    sectionNames << [filePath](wchar_t* p, unsigned s) {
+    lstringw<0x200> sectionNames{ [filePath](wchar_t* p, unsigned s) {
         return grow2(GetPrivateProfileString(NULL, NULL, NULL, p, s + 1, filePath), s - 1);
-    };
+    } };
+    lstringsw<0x200> buffer;
 
     for (const wchar_t* section = sectionNames; *section; section += char_traits<u16symbol>::length(section) + 1) {
-        buffer << [&](wchar_t* p, unsigned s) {
+        buffer << [&](wchar_t* p, uint s) {
             return grow2(GetPrivateProfileString(section, L"modul", NULL, p, s + 1, filePath), s);
         };
         if (!buffer)
             continue;
-        stringw modulName(move(buffer));
+        stringw modulName{ move(buffer) };
 
-        auto procList = (buffer << [&](wchar_t* p, unsigned s) {
+        auto procList = (buffer << [&](wchar_t* p, uint s) {
             return grow2(GetPrivateProfileString(section, L"proc", NULL, p, s + 1, filePath), s);
-            }).splitf<vector<stringw>>(L",", trim_w());
+            }).splitf<vector<stringw>>(L",", trim_w{});
 
         if (procList.empty())
             continue;
 
-        LoadModuleInfo info(move(modulName), move(procList));
+        LoadModuleInfo info{ move(modulName), move(procList) };
 
-        auto lib = (buffer << [&](wchar_t* p, unsigned s) {
+        auto lib = (buffer << [&](wchar_t* p, uint s) {
             return grow2(GetPrivateProfileString(section, L"test", NULL, p, s + 1, filePath), s);
-            }).splitf<vector<stringw>>(L",", trim_w());
+            }).splitf<vector<stringw>>(L",", trim_w{});
         if (lib.size() == 2) {
             info.testLib = move(lib[0]);
             info.testFunc = move(lib[1]);
         }
 
-        info.args = parseArguments(buffer << [&](wchar_t* p, unsigned s) {
+        info.args = parseArguments(buffer << [&](wchar_t* p, uint s) {
             return grow2(GetPrivateProfileString(section, L"args", NULL, p, s, filePath), s);
             });
-        info.defs = parseArguments(buffer << [&](wchar_t* p, unsigned s) {
+        info.defs = parseArguments(buffer << [&](wchar_t* p, uint s) {
             return grow2(GetPrivateProfileString(section, L"defs", NULL, p, s, filePath), s);
             });
         modules.emplace_back(move(info));

diff --git a/src/starter/starter.vcxproj b/src/starter/starter.vcxproj
@@ -114,6 +114,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -128,7 +129,7 @@
     </PreBuildEvent>
     <CustomBuildStep>
       <Command>robocopy ..\modules\starter "$(OutDir)modules\starter" /mir /im /NJH /NJS /NP
-runner check starter
+$(OutDir)lib\x86\coreas_runner_c check starter
 exit 0
 </Command>
     </CustomBuildStep>
@@ -157,6 +158,7 @@ exit 0
       <LanguageStandard>stdcpp17</LanguageStandard>
       <Optimization>Full</Optimization>
       <StringPooling>true</StringPooling>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -181,7 +183,7 @@ exit 0
     </PostBuildEvent>
     <CustomBuildStep>
       <Command>robocopy ..\modules\starter "$(OutDir)modules\starter" /mir /im /NJH /NJS /NP
-coreas_runner_c check starter
+$(OutDir)lib\x86\coreas_runner_c check starter
 exit 0
 </Command>
     </CustomBuildStep>
@@ -201,6 +203,7 @@ exit 0
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -225,6 +228,7 @@ exit 0
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <StringPooling>true</StringPooling>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/wrunner/wrunner.vcxproj b/src/wrunner/wrunner.vcxproj
@@ -74,6 +74,7 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)_build\$(Configuration)\lib\$(PlatformTarget)\</OutDir>
     <IntDir>$(SolutionDir)_build\objs\$(Configuration)\$(PlatformTarget)\$(ProjectName)\</IntDir>
+    <TargetName>coreas_runner_w</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -85,6 +86,7 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)_build\$(Configuration)\lib\$(PlatformTarget)\</OutDir>
     <IntDir>$(SolutionDir)_build\objs\$(Configuration)\$(PlatformTarget)\$(ProjectName)\</IntDir>
+    <TargetName>coreas_runner_w</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -96,18 +98,19 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(ProjectDir)..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>Default</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)src\lib\core_as\$(Configuration)\$(PlatformTarget)</AdditionalLibraryDirectories>
       <AdditionalDependencies>core_as.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -132,6 +135,7 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -154,18 +158,19 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(ProjectDir)..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>Default</LanguageStandard_C>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)src\lib\core_as\$(Configuration)\$(PlatformTarget)</AdditionalLibraryDirectories>
       <AdditionalDependencies>core_as.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -187,6 +192,7 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/wrunner/wrunner.vcxproj.filters b/src/wrunner/wrunner.vcxproj.filters
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="runner.cpp" />
+    <ClCompile Include="wrunner.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="runner.rc" />
+    <ResourceCompile Include="wrunner.rc" />
   </ItemGroup>
 </Project>