version 0.10.0

PandaTeemo · Apr 30, 2019 · bbd1679 · monkeyboy234 · Aug 23, 2024 · bbd1679
1 parent ffff8e2
commit bbd1679
Show file tree

Hide file tree

Showing 34 changed files with 1,157 additions and 593 deletions.
diff --git a/bin/Yolo32.pdb b/bin/Yolo32.pdb
diff --git a/build/Installer32/Product.wxs b/build/Installer32/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.9.1.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
+  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.10.0.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
 
     <Package Id="*" InstallerVersion="200" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" />
     <WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)\..\etc\Eula.rtf" />

diff --git a/build/Installer64/Product.wxs b/build/Installer64/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.9.1.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
+  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.10.0.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
 
     <Package Id="*" InstallerVersion="200" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" Platform="x64"/>
     <WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)\..\etc\Eula.rtf" />

diff --git a/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj b/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj
@@ -102,6 +102,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Opengl32.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>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -117,6 +118,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Opengl32.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>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -137,6 +139,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>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>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -157,6 +160,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>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>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -189,7 +193,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\..\..\Doc\todo.txt" />
+    <Text Include="..\..\..\doc\notes.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj.filters b/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj.filters
@@ -30,6 +30,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\..\..\Doc\todo.txt" />
+    <Text Include="..\..\..\doc\notes.txt" />
   </ItemGroup>
 </Project>
diff --git a/build/YoloMouse.Share/YoloMouse.Share.vcxproj b/build/YoloMouse.Share/YoloMouse.Share.vcxproj
@@ -26,6 +26,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\YoloMouse\Share\Constants.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Share\Enums.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Share\NotifyMessage.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Share\Root.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Share\SharedLog.hpp" />

diff --git a/build/YoloMouse.Share/YoloMouse.Share.vcxproj.filters b/build/YoloMouse.Share/YoloMouse.Share.vcxproj.filters
@@ -13,5 +13,6 @@
     <ClInclude Include="..\..\source\YoloMouse\Share\SharedLog.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Share\SharedState.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Share\SharedTools.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Share\Enums.hpp" />
   </ItemGroup>
 </Project>
diff --git a/source/Core/Constants.hpp b/source/Core/Constants.hpp
@@ -26,8 +26,10 @@ namespace Core
 
     // numeric
     //-------------------------------------------------------------------------
-    static const ULong STRING_SHORT_SIZE =  16;
-    static const ULong STRING_MEDIUM_SIZE = 64;
-    static const ULong STRING_MAX_SIZE =    512;
-    static const ULong STRING_PATH_SIZE =   STRING_MAX_SIZE;
+    static const ULong STRING_SHORT_SIZE =          16;
+    static const ULong STRING_MEDIUM_SIZE =         64;
+    static const ULong STRING_MAX_SIZE =            512;
+    static const ULong STRING_PATH_SIZE =           STRING_MAX_SIZE;
+    static const ULong GAME_WINDOW_MIN_WIDTH =      240;
+    static const ULong GAME_WINDOW_MIN_HEIGHT =     240;
 }
diff --git a/source/Core/Container/Array.hpp b/source/Core/Container/Array.hpp
@@ -252,20 +252,20 @@ namespace Core
         }
 
         /**/
-        const Iterator Begin() const
+        const Iterator begin() const
         {
             return const_cast<Iterator>(_memory);
         }
-        const Iterator End() const
+        const Iterator end() const
         {
             return const_cast<Iterator>(_memory + _count);
         }
 
-        Iterator Begin()
+        Iterator begin()
         {
             return _memory;
         }
-        Iterator End()
+        Iterator end()
         {
             return _memory + _count;
         }
@@ -299,7 +299,7 @@ namespace Core
         template<typename OBJECT>
         Iterator Find( const OBJECT& o ) const
         {
-            for( Iterator i = Begin(); i != End(); ++i )
+            for( Iterator i = begin(); i != end(); ++i )
                 if(*i == o)
                     return i;
 
@@ -338,9 +338,9 @@ namespace Core
                 return false;
             else
             {
-                Iterator i = Begin(), j = other.Begin();
-                for(; i != End() && *i == *j; i++, j++ );
-                return i == End();
+                Iterator i = begin(), j = other.begin();
+                for(; i != end() && *i == *j; i++, j++ );
+                return i == end();
             }
         }
 

diff --git a/source/Core/Container/String.hpp b/source/Core/Container/String.hpp
@@ -40,24 +40,24 @@ namespace Core
         /**/
         Bool ReadToken( BaseString& token, Char delimiter ) const
         {
-            Iterator begin = token.IsEmpty() ? Begin() : token.End();
+            Iterator b = token.IsEmpty() ? begin() : token.end();
 
             // skip delimiter
-            for( ; begin != End() && *begin == delimiter; ++begin );
-            Iterator end = begin;
+            for( ; b != end() && *b == delimiter; ++b );
+            Iterator e = b;
 
             // read token
-            for( ; end != End() && *end != delimiter; ++end );
+            for( ; e != end() && *e != delimiter; ++e );
 
             // get count
-            ULong count = (ULong)(end - begin);
+            ULong count = (ULong)(e - b);
 
             // done if empty
             if( count == 0 )
                 return false;
 
             // create token
-            token.SetMemory(begin);
+            token.SetMemory(b);
             token.SetCount(count);
 
             return true;
@@ -79,7 +79,7 @@ namespace Core
         /**/
         BaseString& ToUpper()
         {
-            for( Iterator c = Begin(); c != End(); c++ )
+            for( Iterator c = begin(); c != end(); c++ )
                 if(*c >= 'a' && *c <= 'z')
                     *c += 'A'-'a';
 
@@ -91,7 +91,7 @@ namespace Core
         {
             Index hash = 0;
 
-            for( Iterator c = Begin(); c != End(); c++ )
+            for( Iterator c = begin(); c != end(); c++ )
                 hash = *c + (hash << 6) + (hash << 16) - hash;
 
             return hash;

diff --git a/source/Core/Root.hpp b/source/Core/Root.hpp
@@ -31,6 +31,7 @@
 #define LOG_PATH                "debug.log"
 #define INVALID_ID              (~0)
 #define INVALID_INDEX           (~0)
+#define INVALID_HANDLE          (~0)
 
 namespace Core
 {

diff --git a/source/Core/Support/Enum.hpp b/source/Core/Support/Enum.hpp
@@ -52,7 +52,7 @@ namespace Core
         {
             String s;
 
-            for( KeyValueIterator i = _items.Begin(); i != _items.End(); ++i )
+            for( KeyValueIterator i = _items.begin(); i != _items.end(); ++i )
             {
                 if( value == i->value )
                 {

diff --git a/source/Core/Support/Settings.cpp b/source/Core/Support/Settings.cpp
@@ -57,7 +57,7 @@ namespace Core
 
         if(_wfopen_s(&file, _path, L"wt") == 0)
         {
-            for( KeyValueIterator i = _keyvalues.Begin(); i != _keyvalues.End(); ++i )
+            for( KeyValueIterator i = _keyvalues.begin(); i != _keyvalues.end(); ++i )
                 fprintf(file, "%s=%s\n", i->key.GetMemory(), i->value.GetMemory());
 
             fclose(file);

diff --git a/source/Core/Windows/InputMonitor.cpp b/source/Core/Windows/InputMonitor.cpp
@@ -264,16 +264,16 @@ namespace Core
     InputMonitor::Combo* InputMonitor::_FindCombo()
     {
         // for each combo
-        for( ComboIterator combo = _combos.Begin(); combo != _combos.End(); ++combo )
+        for( ComboIterator combo = _combos.begin(); combo != _combos.end(); ++combo )
         {
             KeyCollection& keys = combo->keys;
-            KeyIterator key = keys.Begin();
+            KeyIterator key = keys.begin();
 
             // for each key or translated key
-            for(; key != keys.End() && (_state[*key] || _state[_GetAlternateKey(*key)]); ++key );
+            for(; key != keys.end() && (_state[*key] || _state[_GetAlternateKey(*key)]); ++key );
 
             // success if all matched
-            if( key == keys.End() )
+            if( key == keys.end() )
                 return combo;
         }
 

diff --git a/source/Core/Windows/ShellUi.cpp b/source/Core/Windows/ShellUi.cpp
@@ -122,7 +122,7 @@ namespace Core
         if(GetMenuItemInfo(_menu, wid, FALSE, &mi))
         {
             // notify
-            for( ListenerIterator l = _listeners.Begin(); l != _listeners.End(); ++l )
+            for( ListenerIterator l = _listeners.begin(); l != _listeners.end(); ++l )
             {
                 // get current state
                 Bool enabled = (mi.fState & MFS_CHECKED) != 0;
@@ -183,7 +183,7 @@ namespace Core
 
         default:
             // notify
-            for( ListenerIterator l = _listeners.Begin(); l != _listeners.End(); ++l )
+            for( ListenerIterator l = _listeners.begin(); l != _listeners.end(); ++l )
                 if((*l)->OnMessage(hwnd, message, wparam, lparam))
                     return 0;
         }