From 6d98da6cf8cb6412104ae8da45f31e559cf1b2a1 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Sun, 15 Jan 2017 00:51:09 +0000 Subject: [PATCH 1/2] Fix compilation of Release build --- build/win32/CxbxKrnl.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/win32/CxbxKrnl.vcxproj b/build/win32/CxbxKrnl.vcxproj index d9df3af45..7e8ac2ef8 100644 --- a/build/win32/CxbxKrnl.vcxproj +++ b/build/win32/CxbxKrnl.vcxproj @@ -94,7 +94,7 @@ Include\Win32\CxbxKrnl;%(AdditionalIncludeDirectories) - Shlwapi.lib;Zydis.lib;legacy_stdio_definitions.lib;dxerr8.lib;xinput.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx8.lib;d3d8.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + Shlwapi.lib;legacy_stdio_definitions.lib;dxerr8.lib;xinput.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx8.lib;d3d8.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;dbghelp.lib;%(AdditionalDependencies) true libci.lib;%(IgnoreSpecificDefaultLibraries) false From fb2f9ce670d0c3da0b7af05c9c18cc718d51bea3 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Mon, 16 Jan 2017 17:41:41 +0900 Subject: [PATCH 2/2] Fix IDirect3DDevice8_SetSoftDisplayFilter_1_0_5344 --- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index e435a5cfa..2576a50fb 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -1168,12 +1168,12 @@ OOVPA_NO_XREF(IDirect3DDevice8_SetSoftDisplayFilter_1_0_5344, 12) { 0x28, 0x17 }, // (Offset,Value)-Pair #4 // IDirect3DDevice8_SetSoftDisplayFilter+0x2B : push 0; push esi; push 0x0E; push edx - { 0x22, 0x6A }, // (Offset,Value)-Pair #5 - { 0x23, 0x00 }, // (Offset,Value)-Pair #6 - { 0x24, 0x56 }, // (Offset,Value)-Pair #7 - { 0x25, 0x6A }, // (Offset,Value)-Pair #8 - { 0x26, 0x0E }, // (Offset,Value)-Pair #9 - { 0x27, 0x52 }, // (Offset,Value)-Pair #10 + { 0x2B, 0x6A }, // (Offset,Value)-Pair #5 + { 0x2C, 0x00 }, // (Offset,Value)-Pair #6 + { 0x2D, 0x56 }, // (Offset,Value)-Pair #7 + { 0x2E, 0x6A }, // (Offset,Value)-Pair #8 + { 0x2F, 0x0E }, // (Offset,Value)-Pair #9 + { 0x30, 0x52 }, // (Offset,Value)-Pair #10 // IDirect3DDevice8_SetSoftDisplayFilter+0x4E : retn 0x04 { 0x4E, 0xC2 }, // (Offset,Value)-Pair #11