Merge 000df0a into 146c27e

Author: Olive6841

Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.cpp

@@ -37,9 +37,15 @@ static BOOL CALLBACK FindSettingsEnum( HWND hwnd, LPARAM lParam )
 HMODULE LoadClassicExplorerDll( void )
 {
 	wchar_t path[_MAX_PATH];
-	GetModuleFileName(NULL,path,_countof(path));
-	*PathFindFileName(path)=0;
-	PathAppend(path,L"ClassicExplorer32.dll");
+	GetModuleFileName(NULL, path, _countof(path));
+	*PathFindFileName(path) = 0;
+
+	// Load the proper module depending on architecture rather than hardcoding the x86 one
+#ifdef _WIN64
+	PathAppend(path, L"ClassicExplorer64.dll");
+#else
+	PathAppend(path, L"ClassicExplorer32.dll");
+#endif
 	return LoadLibrary(path);
 }
 

Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj

@@ -5,14 +5,26 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Setup|Win32">
       <Configuration>Setup</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Setup|x64">
+      <Configuration>Setup</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E93271C8-0252-4A08-8227-1978C64C2D34}</ProjectGuid>

Src/OpenShell.sln

@@ -201,13 +201,13 @@ Global
 		{E1017135-9916-4B11-9AC5-1EC0BD8F8CD6}.Setup|x64.ActiveCfg = Release|Win32
 		{E93271C8-0252-4A08-8227-1978C64C2D34}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E93271C8-0252-4A08-8227-1978C64C2D34}.Debug|Win32.Build.0 = Debug|Win32
-		{E93271C8-0252-4A08-8227-1978C64C2D34}.Debug|x64.ActiveCfg = Debug|Win32
+		{E93271C8-0252-4A08-8227-1978C64C2D34}.Debug|x64.ActiveCfg = Debug|x64
 		{E93271C8-0252-4A08-8227-1978C64C2D34}.Release|Win32.ActiveCfg = Release|Win32
 		{E93271C8-0252-4A08-8227-1978C64C2D34}.Release|Win32.Build.0 = Release|Win32
-		{E93271C8-0252-4A08-8227-1978C64C2D34}.Release|x64.ActiveCfg = Release|Win32
+		{E93271C8-0252-4A08-8227-1978C64C2D34}.Release|x64.ActiveCfg = Release|x64
 		{E93271C8-0252-4A08-8227-1978C64C2D34}.Setup|Win32.ActiveCfg = Setup|Win32
 		{E93271C8-0252-4A08-8227-1978C64C2D34}.Setup|Win32.Build.0 = Setup|Win32
-		{E93271C8-0252-4A08-8227-1978C64C2D34}.Setup|x64.ActiveCfg = Setup|Win32
+		{E93271C8-0252-4A08-8227-1978C64C2D34}.Setup|x64.ActiveCfg = Setup|x64
 		{0A60FD06-3A81-4651-A869-9850DBC115EA}.Debug|Win32.ActiveCfg = Resource|Win32
 		{0A60FD06-3A81-4651-A869-9850DBC115EA}.Debug|Win32.Build.0 = Resource|Win32
 		{0A60FD06-3A81-4651-A869-9850DBC115EA}.Debug|x64.ActiveCfg = Resource|Win32