Merge branch 'develop'

.gitmodules

@@ -27,13 +27,13 @@
 	url = https://github.com/nlohmann/json
 [submodule "deps/traypp"]
 	path = deps/traypp
-	url = https://github.com/Soundux/traypp.git
+	url = https://github.com/Soundux/traypp
 [submodule "deps/fifo_map"]
 	path = deps/fifo_map
-	url = git@github.com:nlohmann/fifo_map.git
+	url =  https://github.com/nlohmann/fifo_map
 [submodule "deps/Shortcuts_VDF"]
 	path = deps/Shortcuts_VDF
-	url = git@github.com:Alia5/Shortcuts_VDF.git
+	url =  https://github.com/Alia5/Shortcuts_VDF
 [submodule "deps/cpp-httplib"]
 	path = deps/cpp-httplib
-	url = git@github.com:yhirose/cpp-httplib.git
+	url =  https://github.com/yhirose/cpp-httplib

GlosSIConfig/GlosSIConfig.vcxproj

@@ -69,7 +69,7 @@
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/Zc:__cplusplus /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <CompileAsWinRT>false</CompileAsWinRT>
-      <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;CONFIGAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\deps\WinReg;..\deps\fifo_map\src;..\deps\Shortcuts_VDF\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Manifest>
@@ -92,7 +92,7 @@
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/Zc:__cplusplus  /Zc:zwoPhase-  /permissive- %(AdditionalOptions)</AdditionalOptions>
       <CompileAsWinRT>false</CompileAsWinRT>
-      <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;CONFIGAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\deps\WinReg;..\deps\fifo_map\src;..\deps\Shortcuts_VDF\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Manifest>
@@ -136,6 +136,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\GlosSITarget\UnhookUtil.cpp" />
     <ClCompile Include="ExeImageProvider.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="UIModel.cpp" />

GlosSIConfig/GlosSIConfig.vcxproj.filters

@@ -37,6 +37,9 @@
     <ClCompile Include="ExeImageProvider.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\GlosSITarget\UnhookUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="qml\main.qml">

GlosSIConfig/Resource.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,1,101000823500
- PRODUCTVERSION 0,1,1,101000823500
+ FILEVERSION 0,1,1,2012005004400
+ PRODUCTVERSION 0,1,1,2012005004400
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Peter Repukat - FlatspotSoftware"
             VALUE "FileDescription", "GlosSI - Config"
-            VALUE "FileVersion", "0.1.1.1-1-ga8235ca"
+            VALUE "FileVersion", "0.1.1.2-12-g5fe44d0"
             VALUE "InternalName", "GlosSIConfig"
             VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware"
             VALUE "OriginalFilename", "GlosSIConfig.exe"
             VALUE "ProductName", "GlosSI"
-            VALUE "ProductVersion", "0.1.1.1-1-ga8235ca"
+            VALUE "ProductVersion", "0.1.1.2-12-g5fe44d0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1400,6 +1400,106 @@ IDI_ICON1               ICON                    "..\GlosSI_Icon.ico"
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+