Ver Fonte

Fixing stack corruption on 32-bit builds

BearishSun há 9 anos atrás
pai
commit
68f2b08a2e

+ 1 - 1
Documentation/GitHub/dependencies.md

@@ -9,7 +9,7 @@ Rename and place the compiled/retrieved outputs into proper folders depending on
   - Includes
   - Includes
    - Place outputs in (BansheeSource)/Dependencies/(LibName)/include
    - Place outputs in (BansheeSource)/Dependencies/(LibName)/include
   - Tools (executables)
   - Tools (executables)
-   - Place outputs in (BansheeSource)/Dependencies/(tools)/(LibName)  
+   - Place outputs in (BansheeSource)/Dependencies/tools/(LibName)  
    
    
 Each library below lists a set of outputs required by Banshee. After you compile/retrieve the library rename the outputs to what Banshee expects and place them relative to the above paths, depending on their type. Depending on which platform you're compiling for you will need to compile 32-bit or 64-bit versions of the libraries (or both).
 Each library below lists a set of outputs required by Banshee. After you compile/retrieve the library rename the outputs to what Banshee expects and place them relative to the above paths, depending on their type. Depending on which platform you're compiling for you will need to compile 32-bit or 64-bit versions of the libraries (or both).
    
    

+ 6 - 4
Source/BansheeEditor/Source/Win32/BsVSCodeEditor.cpp

@@ -583,12 +583,14 @@ EndProject)";
 	Map<CodeEditorType, VSCodeEditorFactory::VSVersionInfo> VSCodeEditorFactory::getAvailableVersions() const
 	Map<CodeEditorType, VSCodeEditorFactory::VSVersionInfo> VSCodeEditorFactory::getAvailableVersions() const
 	{
 	{
 #if BS_ARCH_TYPE == BS_ARCHITECTURE_x86_64
 #if BS_ARCH_TYPE == BS_ARCHITECTURE_x86_64
-		bool is64bit = true;
+		BOOL is64bit = 1;
 #else
 #else
-		bool is64bit = false;
-		IsWow64Process(GetCurrentProcess(), (PBOOL)&is64bit);
+		BOOL is64bit = 0;
+		
+		HANDLE process = GetCurrentProcess();
+		IsWow64Process(process, (PBOOL)&is64bit);
 #endif
 #endif
-
+		
 		WString registryKeyRoot;
 		WString registryKeyRoot;
 		if (is64bit)
 		if (is64bit)
 			registryKeyRoot = L"SOFTWARE\\Wow6432Node\\Microsoft"; 
 			registryKeyRoot = L"SOFTWARE\\Wow6432Node\\Microsoft";