[VM][Win32][FM7] Keyboard: Fix some not effect key with Windows (8.1).

diff --git a/source/fm7.vcxproj b/source/fm7.vcxproj
index 5bd8f11..f3b5f7f 100644 (file)
--- a/source/fm7.vcxproj
+++ b/source/fm7.vcxproj
@@ -110,7 +110,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <PreprocessorDefinitions>WIN32;NDEBUG;USE_DEBUGGER;_WINDOWS;_FM7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>false</StringPooling>
+      <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeaderOutputFile>.\Release/fm7.pch</PrecompiledHeaderOutputFile>
@@ -127,9 +127,10 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FloatingPointExceptions>true</FloatingPointExceptions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/source/fm77.vcxproj b/source/fm77.vcxproj
index 119dc42..fa76aab 100644 (file)
--- a/source/fm77.vcxproj
+++ b/source/fm77.vcxproj
@@ -111,7 +111,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <PreprocessorDefinitions>WIN32;NDEBUG;USE_DEBUGGER;_WINDOWS;FM77_EXRAM_BANKS=3;_FM77;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>false</StringPooling>
+      <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeaderOutputFile>.\csp-release/fm77.pch</PrecompiledHeaderOutputFile>
@@ -130,6 +130,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <WholeProgramOptimization>false</WholeProgramOptimization>
+      <FloatingPointExceptions>true</FloatingPointExceptions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/source/fm77av.vcxproj b/source/fm77av.vcxproj
index 11e3c01..bd12847 100644 (file)
--- a/source/fm77av.vcxproj
+++ b/source/fm77av.vcxproj
@@ -132,7 +132,7 @@
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalIncludeDirectories>C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\Kyuma\src\common_source_project-fm7\source\src;C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -184,6 +184,12 @@
     <ClCompile Include="src\vm\dummydevice.cpp" />
     <ClCompile Include="src\vm\event.cpp" />
     <ClCompile Include="src\vm\fm7\vram.cpp" />
+    <ClCompile Include="src\vm\fmgen\file.cpp" />
+    <ClCompile Include="src\vm\fmgen\fmgen.cpp" />
+    <ClCompile Include="src\vm\fmgen\fmtimer.cpp" />
+    <ClCompile Include="src\vm\fmgen\opm.cpp" />
+    <ClCompile Include="src\vm\fmgen\opna.cpp" />
+    <ClCompile Include="src\vm\fmgen\psg.cpp" />
     <ClCompile Include="src\vm\mb8877.cpp" />
     <ClCompile Include="src\vm\mc6809.cpp" />
     <ClCompile Include="src\vm\memory.cpp" />
@@ -204,12 +210,6 @@
     <ClCompile Include="src\vm\fm7\sound.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\vm\fmgen\fmgen.cpp" />
-    <ClCompile Include="src\vm\fmgen\fmtimer.cpp" />
-    <ClCompile Include="src\vm\fmgen\opna.cpp" />
-    <ClCompile Include="src\vm\fmgen\psg.cpp" />
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="src\win32_debugger.cpp" />
     <ClCompile Include="src\win32_input.cpp" />
     <ClCompile Include="src\win32_screen.cpp" />
@@ -233,6 +233,17 @@
     <ClInclude Include="src\vm\disk.h" />
     <ClInclude Include="src\vm\dummydevice.h" />
     <ClInclude Include="src\vm\event.h" />
+    <ClInclude Include="src\vm\fmgen\diag.h" />
+    <ClInclude Include="src\vm\fmgen\file.h" />
+    <ClInclude Include="src\vm\fmgen\fmgen.h" />
+    <ClInclude Include="src\vm\fmgen\fmgeninl.h" />
+    <ClInclude Include="src\vm\fmgen\fmtimer.h" />
+    <ClInclude Include="src\vm\fmgen\headers.h" />
+    <ClInclude Include="src\vm\fmgen\misc.h" />
+    <ClInclude Include="src\vm\fmgen\opm.h" />
+    <ClInclude Include="src\vm\fmgen\opna.h" />
+    <ClInclude Include="src\vm\fmgen\psg.h" />
+    <ClInclude Include="src\vm\fmgen\types.h" />
     <ClInclude Include="src\vm\mb8877.h" />
     <ClInclude Include="src\vm\mc6809.h" />
     <ClInclude Include="src\vm\memory.h" />
@@ -255,18 +266,6 @@
     <ClInclude Include="src\vm\fm7\mb61vh010.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\vm\fmgen\diag.h" />
-    <ClInclude Include="src\vm\fmgen\file.h" />
-    <ClInclude Include="src\vm\fmgen\fmgen.h" />
-    <ClInclude Include="src\vm\fmgen\fmgeninl.h" />
-    <ClInclude Include="src\vm\fmgen\fmtimer.h" />
-    <ClInclude Include="src\vm\fmgen\headers.h" />
-    <ClInclude Include="src\vm\fmgen\misc.h" />
-    <ClInclude Include="src\vm\fmgen\opna.h" />
-    <ClInclude Include="src\vm\fmgen\psg.h" />
-    <ClInclude Include="src\vm\fmgen\types.h" />
-  </ItemGroup>
-  <ItemGroup>
     <Image Include="src\res\fm77av.ico" />
   </ItemGroup>
   <ItemGroup>

diff --git a/source/fm77av.vcxproj.filters b/source/fm77av.vcxproj.filters
index dc88b1f..6ccce38 100644 (file)
--- a/source/fm77av.vcxproj.filters
+++ b/source/fm77av.vcxproj.filters
@@ -103,18 +103,6 @@
     <ClCompile Include="src\vm\z80.cpp">
       <Filter>Source Files\VM Common Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\vm\fmgen\fmgen.cpp">
-      <Filter>Source Files\VM Common Source Files\fmgen Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\vm\fmgen\fmtimer.cpp">
-      <Filter>Source Files\VM Common Source Files\fmgen Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\vm\fmgen\opna.cpp">
-      <Filter>Source Files\VM Common Source Files\fmgen Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\vm\fmgen\psg.cpp">
-      <Filter>Source Files\VM Common Source Files\fmgen Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\vm\fm7\display.cpp">
       <Filter>Source Files\VM Driver Source Files</Filter>
     </ClCompile>
@@ -154,6 +142,24 @@
     <ClCompile Include="src\vm\fm7\vram.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\vm\fmgen\file.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vm\fmgen\fmgen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vm\fmgen\fmtimer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vm\fmgen\opm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vm\fmgen\opna.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vm\fmgen\psg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\common.h">
@@ -207,36 +213,6 @@
     <ClInclude Include="src\vm\z80.h">
       <Filter>Header Files\VM Common Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\vm\fmgen\diag.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\file.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\fmgen.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\fmgeninl.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\fmtimer.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\headers.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\misc.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\opna.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\psg.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\vm\fmgen\types.h">
-      <Filter>Header Files\VM Common Header Files\fmgen Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\vm\fm7\fm7.h">
       <Filter>Header Files\VM Driver Header Files</Filter>
     </ClInclude>
@@ -282,6 +258,39 @@
     <ClInclude Include="src\vm\beep.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\vm\fmgen\diag.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\file.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\fmgen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\fmgeninl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\fmtimer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\headers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\misc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\opm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\opna.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\psg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vm\fmgen\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="src\res\fm77av.ico">

diff --git a/source/fm77av40ex.vcxproj b/source/fm77av40ex.vcxproj
index 8042577..4af19a8 100644 (file)
--- a/source/fm77av40ex.vcxproj
+++ b/source/fm77av40ex.vcxproj
@@ -107,15 +107,15 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_FM77AV40EX;USE_DEBUGGER;FM77_EXRAM_BANKS=12;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <ControlFlowGuard>false</ControlFlowGuard>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <CreateHotpatchableImage>false</CreateHotpatchableImage>
@@ -124,6 +124,9 @@
       <AssemblerListingLocation>$(IntDir)\$(TargetName)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointExceptions>true</FloatingPointExceptions>
+      <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>

diff --git a/source/src/vm/fm7/keyboard_tables.h b/source/src/vm/fm7/keyboard_tables.h
index 29d93cf..1438019 100644 (file)
--- a/source/src/vm/fm7/keyboard_tables.h
+++ b/source/src/vm/fm7/keyboard_tables.h
@@ -27,14 +27,22 @@ const uint16 vk_matrix_106[0x68] = { // VK
        VK_OEM_1,       VK_OEM_6,       'Z',            'X',            'C',            'V',            'B',            'N',            // +0x28
        /* M, , , ., / , \, RSPACE=RWIN , * , / */
        'M',            VK_OEM_COMMA,   VK_OEM_PERIOD,  VK_OEM_2,       VK_OEM_102,     VK_CONVERT,     VK_MULTIPLY,    VK_DIVIDE,      // +0x30
-       /* + , - , 7, 8, 9, = = RWIN, 4, 5 */
+#if defined(_MSC_VER) || defined(Q_OS_WIN)
+       /* + , - , 7, 8, 9, = = RWIN or Scroll Lock (Windows), 4, 5 */
+       VK_ADD,         VK_SUBTRACT,    VK_NUMPAD7,     VK_NUMPAD8,     VK_NUMPAD9,     VK_SCROLL,      VK_NUMPAD4,     VK_NUMPAD5,     // +0x38
+#else
        VK_ADD,         VK_SUBTRACT,    VK_NUMPAD7,     VK_NUMPAD8,     VK_NUMPAD9,     VK_RWIN,        VK_NUMPAD4,     VK_NUMPAD5,     // +0x38
+#endif
        /* 6, NUMPADCOMMA=RMENU , 1, 2, 3, NUMPADENTER=RETURN,0, . */
        VK_NUMPAD6,     VK_RMENU,       VK_NUMPAD1,     VK_NUMPAD2,     VK_NUMPAD3,     VK_RETURN,      VK_NUMPAD0,     VK_DECIMAL,     // +0x40
        /* INS, HOME, PRIOR, DEL, END, ↑, ↓,← */
        VK_INSERT,      VK_HOME,        VK_PRIOR,       VK_DELETE,      VK_END,         VK_UP,          VK_NEXT,        VK_LEFT,        // +0x48
-       /* PAgeDown, →, LCTRL, LSHIFT, RSHIFT, CAPS, Graph=LWIN, Lspace=Muhenkan */
+       /* PAgeDown, →, LCTRL, LSHIFT or SHIFT (Winwdows), RSHIFT, CAPS, Graph=LWIN or ALT (WIndows), Lspace=Muhenkan */
+#if defined(_MSC_VER) || defined(Q_OS_WIN)
+       VK_DOWN,        VK_RIGHT,       VK_CONTROL,     VK_SHIFT,       VK_RSHIFT,      VK_CAPITAL,     VK_MENU,        VK_NONCONVERT,  // +0x50
+#else // Non-Windows
        VK_DOWN,        VK_RIGHT,       VK_CONTROL,     VK_LSHIFT,      VK_RSHIFT,      VK_CAPITAL,     VK_LWIN,        VK_NONCONVERT,  // +0x50
+#endif
        /* Cspace=Space, *Unknown*, KANA, *Unknown* , ESC(Break), F1, F2, F3 */
        VK_SPACE,       0x00,           0x15,           0x00,           VK_ESCAPE,      VK_F1,          VK_F2,  VK_F3,  // +0x58
        /* F4, F5, F6, F7, F8, F9, F10 , *END* */