Add configurations and some modifications for x64.

diff --git a/xkeymacs-vc10x64.sln b/xkeymacs-vc10x64.sln
index 2699727..740ad0f 100644 (file)
--- a/xkeymacs-vc10x64.sln
+++ b/xkeymacs-vc10x64.sln
@@ -8,17 +8,27 @@ EndProject
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
+               Debug|x64 = Debug|x64\r
                Release|Win32 = Release|Win32\r
+               Release|x64 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Debug|Win32.Build.0 = Debug|Win32\r
+               {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Debug|x64.ActiveCfg = Debug|x64\r
+               {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Debug|x64.Build.0 = Debug|x64\r
                {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Release|Win32.ActiveCfg = Release|Win32\r
                {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Release|Win32.Build.0 = Release|Win32\r
+               {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Release|x64.ActiveCfg = Release|x64\r
+               {1F0783CC-C97E-F407-3004-5ED921B85CB2}.Release|x64.Build.0 = Release|x64\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|x64.ActiveCfg = Debug|x64\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|x64.Build.0 = Debug|x64\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|Win32.ActiveCfg = Release|Win32\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|Win32.Build.0 = Release|Win32\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|x64.ActiveCfg = Release|x64\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/xkeymacs-vc10x86.sln b/xkeymacs-vc10x86.sln
index 4f851dc..1c31b1d 100644 (file)
--- a/xkeymacs-vc10x86.sln
+++ b/xkeymacs-vc10x86.sln
@@ -8,17 +8,27 @@ EndProject
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
+               Debug|x64 = Debug|x64\r
                Release|Win32 = Release|Win32\r
+               Release|x64 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Debug|Win32.Build.0 = Debug|Win32\r
+               {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Debug|x64.ActiveCfg = Debug|x64\r
+               {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Debug|x64.Build.0 = Debug|x64\r
                {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Release|Win32.ActiveCfg = Release|Win32\r
                {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Release|Win32.Build.0 = Release|Win32\r
+               {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Release|x64.ActiveCfg = Release|x64\r
+               {20CA6A6B-A4E3-BE1A-6083-4AF4AC0874D8}.Release|x64.Build.0 = Release|x64\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|x64.ActiveCfg = Debug|x64\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Debug|x64.Build.0 = Debug|x64\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|Win32.ActiveCfg = Release|Win32\r
                {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|Win32.Build.0 = Release|Win32\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|x64.ActiveCfg = Release|x64\r
+               {6E0D026B-0162-ECF5-9DB6-3D5EC4311906}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/xkeymacs/stdafx.h b/xkeymacs/stdafx.h
index 3dbe5d6..09010d9 100644 (file)
--- a/xkeymacs/stdafx.h
+++ b/xkeymacs/stdafx.h
@@ -20,7 +20,6 @@
 #include <afxcmn.h>                    // MFC support for Windows Common Controls\r
 #endif // _AFX_NO_AFXCMN_SUPPORT\r
 \r
-#pragma comment(lib, "xkeymacs.lib")\r
 #include "../xkeymacsdll/xkeymacsdll.h"\r
 #include "../xkeymacsdll/Commands.h"\r
 #include "../xkeymacsdll/Utils.h"\r

diff --git a/xkeymacs/xkeymacs-vc10x64.vcxproj b/xkeymacs/xkeymacs-vc10x64.vcxproj
index 85245c3..70de6d0 100644 (file)
--- a/xkeymacs/xkeymacs-vc10x64.vcxproj
+++ b/xkeymacs/xkeymacs-vc10x64.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Release|Win32">\r
       <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <Keyword>Win32Proj</Keyword>\r
@@ -20,29 +28,57 @@
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <UseOfMfc>Dynamic</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <UseOfMfc>Dynamic</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>\r
+  </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <TargetName>xkeymacs</TargetName>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <TargetName>xkeymacs64</TargetName>\r
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -66,6 +102,27 @@
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib</AdditionalDependencies>\r
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
+    </Link>\r
+    <ResourceCompile>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+    </ResourceCompile>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -92,6 +149,29 @@
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+      <Optimization>MaxSpeed</Optimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>Version.lib;Imm32.lib;ShLwApi.Lib</AdditionalDependencies>\r
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
+    </Link>\r
+    <ResourceCompile>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+    </ResourceCompile>\r
+  </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="104keyboard.cpp" />\r
     <ClCompile Include="109keyboard.cpp" />\r

diff --git a/xkeymacs/xkeymacs-vc10x86.vcxproj b/xkeymacs/xkeymacs-vc10x86.vcxproj
index 85245c3..70de6d0 100644 (file)
--- a/xkeymacs/xkeymacs-vc10x86.vcxproj
+++ b/xkeymacs/xkeymacs-vc10x86.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Release|Win32">\r
       <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <Keyword>Win32Proj</Keyword>\r
@@ -20,29 +28,57 @@
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <UseOfMfc>Dynamic</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <UseOfMfc>Dynamic</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>\r
+  </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <TargetName>xkeymacs</TargetName>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <TargetName>xkeymacs64</TargetName>\r
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -66,6 +102,27 @@
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>Version.lib;ShLwApi.Lib;Imm32.lib</AdditionalDependencies>\r
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
+    </Link>\r
+    <ResourceCompile>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+    </ResourceCompile>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -92,6 +149,29 @@
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+      <Optimization>MaxSpeed</Optimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>Version.lib;Imm32.lib;ShLwApi.Lib</AdditionalDependencies>\r
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
+    </Link>\r
+    <ResourceCompile>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+    </ResourceCompile>\r
+  </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="104keyboard.cpp" />\r
     <ClCompile Include="109keyboard.cpp" />\r

diff --git a/xkeymacs/xkeymacs.cpp b/xkeymacs/xkeymacs.cpp
index 8b5c306..28edcd5 100644 (file)
--- a/xkeymacs/xkeymacs.cpp
+++ b/xkeymacs/xkeymacs.cpp
@@ -53,8 +53,11 @@ BOOL CXkeymacsApp::InitInstance()
        // If you are not using these features and wish to reduce the size\r
        //  of your final executable, you should remove from the following\r
        //  the specific initialization routines you do not need.\r
-\r
+#ifdef _WIN64\r
+       m_hMutex = CreateMutex(FALSE, 0, CString(MAKEINTRESOURCE(AFX_IDS_APP_TITLE)) + _T("64"));\r
+#else\r
        m_hMutex = CreateMutex(FALSE, 0, CString(MAKEINTRESOURCE(AFX_IDS_APP_TITLE)));\r
+#endif\r
 \r
     if (::GetLastError() == ERROR_ALREADY_EXISTS) {\r
                m_Instance = SecondInstance;\r
@@ -88,7 +91,7 @@ BOOL CXkeymacsApp::InitInstance()
        m_pMainWnd = new CMainFrame;\r
        m_pMainWnd->ShowWindow(SW_HIDE);\r
        m_pMainWnd->UpdateWindow();\r
-       SetClassLong(m_pMainWnd->m_hWnd, GCL_HICON, (LONG)LoadIcon(IDR_MAINFRAME));\r
+       SetClassLongPtr(m_pMainWnd->m_hWnd, GCLP_HICON, (LONG_PTR)LoadIcon(IDR_MAINFRAME));\r
 \r
        // set registry key\r
 //     CMainFrame *pMainWnd = (CMainFrame*)m_pMainWnd;\r

diff --git a/xkeymacsdll/Commands.cpp b/xkeymacsdll/Commands.cpp
index a5d4d60..299401c 100644 (file)
--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -3712,7 +3712,7 @@ BOOL CCommands::GetCaretPos(LPPOINT lpPoint)
         || CUtils::IsThunderbird()) {\r
                IMECHARPOSITION ImeCharPosition = {sizeof(IMECHARPOSITION)};\r
 \r
-               CallWindowProc((WNDPROC)GetWindowLong(GetFocus(), GWL_WNDPROC), GetFocus(), WM_IME_REQUEST, IMR_QUERYCHARPOSITION, (LPARAM)&ImeCharPosition);\r
+               CallWindowProc((WNDPROC)GetWindowLongPtr(GetFocus(), GWLP_WNDPROC), GetFocus(), WM_IME_REQUEST, IMR_QUERYCHARPOSITION, (LPARAM)&ImeCharPosition);\r
 //             CUtils::Log(_T("ImeCharPosition: rc = %d, x = %d, y = %d"), 0, ImeCharPosition.pt.x, ImeCharPosition.pt.y);\r
 \r
                ScreenToClient(GetFocus(), &ImeCharPosition.pt);\r

diff --git a/xkeymacsdll/StdAfx.h b/xkeymacsdll/StdAfx.h
index 1a3bdd8..b4890be 100644 (file)
--- a/xkeymacsdll/StdAfx.h
+++ b/xkeymacsdll/StdAfx.h
@@ -26,9 +26,11 @@
 #include <afxdb.h>                     // MFC ODBC database classes\r
 #endif // _AFX_NO_DB_SUPPORT\r
 \r
+/*\r
 #ifndef _AFX_NO_DAO_SUPPORT\r
 #include <afxdao.h>                    // MFC DAO database classes\r
 #endif // _AFX_NO_DAO_SUPPORT\r
+*/\r
 \r
 #include <afxdtctl.h>          // MFC support for Internet Explorer 4 Common Controls\r
 #ifndef _AFX_NO_AFXCMN_SUPPORT\r

diff --git a/xkeymacsdll/xkeymacs64dll.def b/xkeymacsdll/xkeymacs64dll.def
new file mode 100644 (file)
index 0000000..e16521d
--- /dev/null
+++ b/xkeymacsdll/xkeymacs64dll.def
@@ -0,0 +1,9 @@
+; xkeymacsdll.def : Declares the module parameters for the DLL.\r
+\r
+LIBRARY      "xkeymacs64"\r
+\r
+EXPORTS\r
+    ; Explicit exports can go here\r
+\r
+SECTIONS\r
+       .xkmcs  READ WRITE SHARED\r

diff --git a/xkeymacsdll/xkeymacsdll-vc10.vcxproj b/xkeymacsdll/xkeymacsdll-vc10.vcxproj
index 5b4ce5e..03bf964 100644 (file)
--- a/xkeymacsdll/xkeymacsdll-vc10.vcxproj
+++ b/xkeymacsdll/xkeymacsdll-vc10.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Release|Win32">\r
       <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <Keyword>Win32Proj</Keyword>\r
@@ -20,30 +28,59 @@
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <UseOfMfc>Dynamic</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <UseOfMfc>Dynamic</UseOfMfc>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>\r
+  </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <LinkIncremental>true</LinkIncremental>\r
     <TargetName>xkeymacs</TargetName>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <TargetName>xkeymacs64</TargetName>\r
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <TargetName>xkeymacs</TargetName>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <TargetName>xkeymacs64</TargetName>\r
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_AFXEXT;XKEYMACSDLLVC10_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -69,6 +106,29 @@
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_AFXEXT;XKEYMACSDLLVC10_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
+      <ModuleDefinitionFile>xkeymacs64dll.def</ModuleDefinitionFile>\r
+      <AdditionalDependencies>Imm32.lib</AdditionalDependencies>\r
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>\r
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
+    </Link>\r
+    <ResourceCompile>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+    </ResourceCompile>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXEXT;XKEYMACSDLLVC10_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -97,6 +157,31 @@
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXEXT;XKEYMACSDLLVC10_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
+      <Optimization>MaxSpeed</Optimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalLibraryDirectories>C:\WinDDK\7600.16385.1\lib\Mfc\amd64;C:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories>\r
+      <ModuleDefinitionFile>xkeymacs64dll.def</ModuleDefinitionFile>\r
+      <AdditionalDependencies>Imm32.lib</AdditionalDependencies>\r
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>\r
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>\r
+    </Link>\r
+    <ResourceCompile>\r
+      <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
+    </ResourceCompile>\r
+  </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="ClipboardFormatSnap.cpp" />\r
     <ClCompile Include="ClipboardSnap.cpp" />\r
@@ -107,6 +192,7 @@
     <ClCompile Include="xkeymacsdll.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <None Include="xkeymacs64dll.def" />\r
     <None Include="xkeymacsdll.def" />\r
   </ItemGroup>\r
   <ItemGroup>\r

diff --git a/xkeymacsdll/xkeymacsdll-vc10.vcxproj.filters b/xkeymacsdll/xkeymacsdll-vc10.vcxproj.filters
index 2e2d8a0..ab41043 100644 (file)
--- a/xkeymacsdll/xkeymacsdll-vc10.vcxproj.filters
+++ b/xkeymacsdll/xkeymacsdll-vc10.vcxproj.filters
@@ -41,6 +41,9 @@
     <None Include="xkeymacsdll.def">\r
       <Filter>Source Files</Filter>\r
     </None>\r
+    <None Include="xkeymacs64dll.def">\r
+      <Filter>Source Files</Filter>\r
+    </None>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="ClipboardFormatSnap.h">\r