x64 support.

tarao · Sep 18, 2010 · 5bd3a5c · 5bd3a5c
1 parent a650b34
commit 5bd3a5c
Show file tree

Hide file tree

Showing 4 changed files with 379 additions and 12 deletions.
diff --git a/mmwnd/mmwnd.sln b/mmwnd/mmwnd.sln
@@ -15,17 +15,27 @@ EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
  Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
  EndGlobalSection
  GlobalSection(ProjectConfigurationPlatforms) = postSolution
  {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Debug|Win32.ActiveCfg = Debug|Win32
  {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Debug|Win32.Build.0 = Debug|Win32
+ {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Debug|x64.ActiveCfg = Debug|x64
+ {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Debug|x64.Build.0 = Debug|x64
  {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Release|Win32.ActiveCfg = Release|Win32
  {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Release|Win32.Build.0 = Release|Win32
+ {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Release|x64.ActiveCfg = Release|x64
+ {F00FF096-8FAF-418B-B4EA-6F2FD72756ED}.Release|x64.Build.0 = Release|x64
  {F0BA11A4-926E-44AB-97F2-B7708674C996}.Debug|Win32.ActiveCfg = Debug|Win32
  {F0BA11A4-926E-44AB-97F2-B7708674C996}.Debug|Win32.Build.0 = Debug|Win32
+ {F0BA11A4-926E-44AB-97F2-B7708674C996}.Debug|x64.ActiveCfg = Debug|x64
+ {F0BA11A4-926E-44AB-97F2-B7708674C996}.Debug|x64.Build.0 = Debug|x64
  {F0BA11A4-926E-44AB-97F2-B7708674C996}.Release|Win32.ActiveCfg = Release|Win32
  {F0BA11A4-926E-44AB-97F2-B7708674C996}.Release|Win32.Build.0 = Release|Win32
+ {F0BA11A4-926E-44AB-97F2-B7708674C996}.Release|x64.ActiveCfg = Release|x64
+ {F0BA11A4-926E-44AB-97F2-B7708674C996}.Release|x64.Build.0 = Release|x64
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/mmwnd/mmwnd/mmwnd.h b/mmwnd/mmwnd/mmwnd.h
@@ -15,7 +15,11 @@ class mmwnd {
  return instance;
  }
  bool load(void) {
+#ifdef PLATFORM_X64
+ module_ = ::LoadLibrary(_T("mmwndhook64.dll"));
+#else
  module_ = ::LoadLibrary(_T("mmwndhook.dll"));
+#endif // !PLATFORM_X64
  if (!module_) return false;
  if (!check_version(module_)) return false;
  log(_T("version check passed"));

diff --git a/mmwnd/mmwnd/mmwnd.vcproj b/mmwnd/mmwnd/mmwnd.vcproj
@@ -11,14 +11,17 @@
  <Platform
  Name="Win32"
  />
+ <Platform
+ Name="x64"
+ />
  </Platforms>
  <ToolFiles>
  </ToolFiles>
  <Configurations>
  <Configuration
  Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)out\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(SolutionDir)out\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
  ConfigurationType="1"
  CharacterSet="1"
  >
@@ -60,7 +63,7 @@
  />
  <Tool
  Name="VCLinkerTool"
- OutputFile="$(SolutionDir)out\$(ConfigurationName)\$(ProjectName).exe"
+ OutputFile="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
  LinkIncremental="2"
  GenerateDebugInformation="true"
  ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
@@ -94,8 +97,8 @@
  </Configuration>
  <Configuration
  Name="Release|Win32"
- OutputDirectory="$(SolutionDir)out\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(SolutionDir)out\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
  ConfigurationType="1"
  CharacterSet="1"
  WholeProgramOptimization="1"
@@ -135,7 +138,7 @@
  />
  <Tool
  Name="VCLinkerTool"
- OutputFile="$(SolutionDir)out\$(ConfigurationName)\$(ProjectName).exe"
+ OutputFile="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
  LinkIncremental="1"
  GenerateDebugInformation="true"
  ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
@@ -169,6 +172,162 @@
  Name="VCPostBuildEventTool"
  />
  </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="PLATFORM_X64;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)64.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+ SubSystem="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="PLATFORM_X64;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(SolutionDir)out\$(PlatformName)\$(ConfigurationName)\$(ProjectName)64.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
  </Configurations>
  <References>
  </References>
@@ -201,6 +360,22 @@
  UsePrecompiledHeader="1"
  />
  </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
  </File>
  </Filter>
  <Filter