4500b1

diff --git a/include/options.h b/include/options.h
index 0e9ac2ad47b968d17bd858e9840584e7815a4035..820fea84f343467f974785b149f1c65717491c3f 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -15,7 +15,7 @@
 #include "traps.h"
 
 #define UAEMAJOR 4
-#define UAEMINOR 4
+#define UAEMINOR 5
 #define UAESUBREV 0
 
 #define MAX_AMIGADISPLAYS 4

diff --git a/od-win32/cputester/cputester.vcxproj b/od-win32/cputester/cputester.vcxproj
index 21815426c44bf6d8ae1aa068236b40db3aea9eeb..46e6468b99a45df9f757742e827bed47503d9b05 100644 (file)
--- a/od-win32/cputester/cputester.vcxproj
+++ b/od-win32/cputester/cputester.vcxproj
@@ -82,7 +82,9 @@
     <IncludePath>$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>c:\dev\include;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+    <TargetName>cputestgen64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -156,6 +158,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);zlibstat.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 6b264390fc2b6c5ae89fee94ef856d26cfd1a7ac..dde75806b87acfc7da05d9f285623bde84e7150a 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1396,8 +1396,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,4,0,0
- PRODUCTVERSION 4,4,0,0
+ FILEVERSION 4,5,0,0
+ PRODUCTVERSION 4,5,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1413,12 +1413,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.4.0.0"
+            VALUE "FileVersion", "4.5.0.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2020 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.4.0.0"
+            VALUE "ProductVersion", "4.5.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/od-win32/statusline_win32.cpp b/od-win32/statusline_win32.cpp
index 268fcb8e705844a363487203e7c956fd17550f46..f251ccad41167669022fe02a50ce4c76aeaced3f 100644 (file)
--- a/od-win32/statusline_win32.cpp
+++ b/od-win32/statusline_win32.cpp
@@ -102,7 +102,7 @@ static void create_led_font(int monid)
                                                RealizePalette(hdc);
                                                HFONT font = CreateFont(fontsize, 0,
                                                        0, 0,
-                                                       FW_BOLD,
+                                                       FW_MEDIUM,
                                                        FALSE,
                                                        FALSE,
                                                        FALSE,

diff --git a/od-win32/win32.h b/od-win32/win32.h
index a5d88381819131b3e953976fadc478734171c0af..e85f2056c443c0eaee458e149f40c3adefafe928 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 0
+#define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("")
+#define WINUAEBETA _T("Beta 1")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2020, 7, 1)
+#define WINUAEDATE MAKEBD(2020, 9, 26)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
index a4ff0f661a52cc60cb7b3f6d0069c59f485ed8d6..c2ae5a535be531731ff2ad596ae811c2ea6072e8 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -232,7 +232,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -256,6 +256,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -336,6 +337,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -392,7 +394,7 @@
       <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -416,6 +418,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -495,6 +498,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -647,6 +651,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -692,14 +697,14 @@
       <TypeLibraryName>.\Release/winuae_msvc.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
-      <Optimization>Full</Optimization>
+      <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -723,6 +728,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -771,14 +777,14 @@
       <TypeLibraryName>.\Release/winuae_msvc.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
-      <Optimization>Full</Optimization>
+      <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -802,6 +808,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -925,6 +932,7 @@
     <ClCompile Include="..\..\ncr9x_scsi.cpp" />
     <ClCompile Include="..\..\newcpu_common.cpp" />
     <ClCompile Include="..\..\pcem\386.cpp" />
+    <ClCompile Include="..\..\pcem\386_common.cpp" />
     <ClCompile Include="..\..\pcem\386_dynarec.cpp" />
     <ClCompile Include="..\..\pcem\808x.cpp" />
     <ClCompile Include="..\..\pcem\cpu.cpp" />
@@ -936,8 +944,8 @@
     <ClCompile Include="..\..\pcem\mem.cpp" />
     <ClCompile Include="..\..\pcem\mouse_ps2.cpp" />
     <ClCompile Include="..\..\pcem\mouse_serial.cpp" />
+    <ClCompile Include="..\..\pcem\nvr.cpp" />
     <ClCompile Include="..\..\pcem\pcemglue.cpp" />
-    <ClCompile Include="..\..\pcem\pcemnvr.cpp" />
     <ClCompile Include="..\..\pcem\pcemrtc.cpp" />
     <ClCompile Include="..\..\pcem\pic.cpp" />
     <ClCompile Include="..\..\pcem\pit.cpp" />
@@ -950,8 +958,15 @@
     <ClCompile Include="..\..\pcem\sound_sb_dsp.cpp" />
     <ClCompile Include="..\..\pcem\sound_speaker.cpp" />
     <ClCompile Include="..\..\pcem\timer.cpp" />
+    <ClCompile Include="..\..\pcem\vid_cl5429.cpp" />
+    <ClCompile Include="..\..\pcem\vid_s3.cpp" />
+    <ClCompile Include="..\..\pcem\vid_s3_virge.cpp" />
+    <ClCompile Include="..\..\pcem\vid_sdac_ramdac.cpp" />
+    <ClCompile Include="..\..\pcem\vid_svga.cpp" />
+    <ClCompile Include="..\..\pcem\vid_svga_render.cpp" />
     <ClCompile Include="..\..\pcem\x86seg.cpp" />
     <ClCompile Include="..\..\pcem\x87.cpp" />
+    <ClCompile Include="..\..\pcem\x87_timings.cpp" />
     <ClCompile Include="..\..\pci.cpp" />
     <ClCompile Include="..\..\ppc\ppc.cpp" />
     <ClCompile Include="..\..\ppc\ppcd.cpp" />

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
index 7401415a14b0350a296a9a5ed13bd6bc92e85260..f5047f54bc63499b566fffcb7ca81d3253d0a577 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
@@ -55,9 +55,6 @@
     <Filter Include="mame">
       <UniqueIdentifier>{961c1680-65e6-445a-bf6e-82775255ef2d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="x86">
-      <UniqueIdentifier>{c9a4aeea-c63c-40e4-9da2-371acd5ea8fe}</UniqueIdentifier>
-    </Filter>
     <Filter Include="support">
       <UniqueIdentifier>{fe9d96c8-c5ef-4f92-b9dc-79b5d3e4145c}</UniqueIdentifier>
     </Filter>
@@ -77,6 +74,9 @@
       <UniqueIdentifier>{5c4c971a-37b6-4c1e-82f1-d225ebb12808}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
+    <Filter Include="pcem">
+      <UniqueIdentifier>{c9a4aeea-c63c-40e4-9da2-371acd5ea8fe}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\ahidsound_dsonly.cpp">
@@ -716,7 +716,7 @@
       <Filter>mame</Filter>
     </ClCompile>
     <ClCompile Include="..\..\x86.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\vm.cpp">
       <Filter>common</Filter>
@@ -851,88 +851,85 @@
       <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\386.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\808x.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\cpu.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\keyboard.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\keyboard_at.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\mem.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\pcemglue.cpp">
-      <Filter>x86</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\pcem\pcemnvr.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\pcemrtc.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\pic.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\pit.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\timer.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\x86seg.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\x87.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\sound_speaker.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\dma.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\sound_sb.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\sound_sb_dsp.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\sound_opl.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\sound_dbopl.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\dosbox\dbopl.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\dosbox\nukedopl.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\sound_cms.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\sound_mpu401_uart.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\mouse_serial.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\serial.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\386_dynarec.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\pcem\mouse_ps2.cpp">
-      <Filter>x86</Filter>
+      <Filter>pcem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\disasm.cpp">
       <Filter>common</Filter>
@@ -943,6 +940,36 @@
     <ClCompile Include="..\..\cfgfile.cpp">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\pcem\386_common.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\nvr.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\x87_timings.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\vid_s3_virge.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\vid_svga.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\vid_svga_render.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\vid_cl5429.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\vid_s3.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\pcem\vid_sdac_ramdac.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tinyxml2.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resources\35floppy.ico">

diff --git a/pcem/pcemglue.cpp b/pcem/pcemglue.cpp
index fe33dc26e9905e0aa34a2640a457405fe9b391fc..529e741ef49edc28c5fc3e4a4e15b0e0fe4362c3 100644 (file)
--- a/pcem/pcemglue.cpp
+++ b/pcem/pcemglue.cpp
@@ -374,8 +374,6 @@ void codegen_set_rounding_mode(int mode)
 {
        /*SSE*/
        cpu_state.new_fp_control = (cpu_state.old_fp_control & ~0x6000) | (mode << 13);
-       /*x87 - used for double -> i64 conversions*/
-       cpu_state.new_fp_control2 = (cpu_state.old_fp_control2 & ~0x0c00) | (mode << 10);
 }
 #endif
 

diff --git a/pcem/vid_svga_render.cpp b/pcem/vid_svga_render.cpp
index 8ceddb39a0af4c225098cbd425712a035abbaa7c..6320542ef628e7a0fb44ff726a44383f6898e708 100644 (file)
--- a/pcem/vid_svga_render.cpp
+++ b/pcem/vid_svga_render.cpp
@@ -649,10 +649,12 @@ void svga_render_24bpp_lowres(svga_t *svga)
                 offset = (8 - (svga->scrollcache & 6)) + 24;
 
                 if (svga->swaprb) {
+                    for (x = 0; x <= svga->hdisp; x++) {
                         fg = svga->vram[svga->ma + 2] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 0] << 16);
                         svga->ma += 3;
                         svga->ma &= svga->vram_display_mask;
                         ((uint32_t *)buffer32->line[svga->displine])[(x << 1) + offset] = ((uint32_t *)buffer32->line[svga->displine])[(x << 1) + 1 + offset] = fg;
+                    }
                 } else {
                     for (x = 0; x <= svga->hdisp; x++)
                     {