From 45dd6cab93bdb91290f2f5af9db7262521b620c7 Mon Sep 17 00:00:00 2001
From: gho tik <ghotik2002@yahoo.com>
Date: Mon, 27 Jul 2015 12:41:11 -0400
Subject: [PATCH] v2_03_31_src

Former-commit-id: b12d111cc7010081998adb437ffb88864664d076
---
 Include/dxwnd.h                               |   6 ++-
 build/dxwnd.dll                               |   4 +-
 build/dxwnd.exe                               |   2 +-
 build/exports/Adrenix 3D.dxw                  |   6 ++-
 build/exports/Adrenix.dxw                     |  31 ++++++++++++
 build/exports/Dark Disciples 1.dxw            |  31 ++++++++++++
 build/exports/Dark Disciples 2.dxw            |  31 ++++++++++++
 build/exports/Evil Dead Hail to the King.dxw  |   5 +-
 build/exports/Galapagos.dxw                   |   8 ++--
 build/exports/Ground Control.dxw              |  31 ++++++++++++
 .../Microsoft Motocross Madness 2 (emu).dxw   |  31 ++++++++++++
 .../Panzer General 3 Scorched Earth.dxw       |   5 +-
 .../Star Wars Episode I Racer (emulated).dxw  |   7 ++-
 build/exports/Syberia.dxw                     |  17 ++++---
 build/exports/Talis Gear.dxw                  |  11 ++++-
 build/exports/Thorgal.dxw                     |   2 +-
 build/readme-relnotes.txt                     |   7 ++-
 dll/ddraw.cpp                                 |  10 ++--
 dll/dxhook.cpp                                |   6 +--
 dll/dxwnd.cpp                                 |   2 +-
 dll/dxwnd.vs2008.suo                          | Bin 377856 -> 377856 bytes
 dll/hd3d7.cpp                                 |  44 +++++++++---------
 dll/user32.cpp                                |   2 +-
 host/TabDebug.cpp                             |   2 +-
 host/TabDirect3D.cpp                          |   3 +-
 host/TargetDlg.cpp                            |   4 +-
 host/TargetDlg.h                              |   4 +-
 host/dxwndhost.aps                            | Bin 158408 -> 158600 bytes
 host/dxwndhost.rc                             | Bin 101880 -> 102180 bytes
 host/dxwndhost.vs2008.suo                     | Bin 247296 -> 250880 bytes
 host/dxwndhostView.cpp                        |   8 ++--
 host/resource                                 | Bin 35698 -> 35882 bytes
 32 files changed, 252 insertions(+), 68 deletions(-)
 create mode 100644 build/exports/Adrenix.dxw
 create mode 100644 build/exports/Dark Disciples 1.dxw
 create mode 100644 build/exports/Dark Disciples 2.dxw
 create mode 100644 build/exports/Ground Control.dxw
 create mode 100644 build/exports/Microsoft Motocross Madness 2 (emu).dxw

diff --git a/Include/dxwnd.h b/Include/dxwnd.h
index 96310b8..db28c81 100644
--- a/Include/dxwnd.h
+++ b/Include/dxwnd.h
@@ -150,9 +150,9 @@
 #define DIABLOTWEAK			0x00000001 // ... ??? ...
 #define CLEARTARGET			0x00000002 // forces a D3D clean on target surface upon each BeginScene invocation
 #define NOWINPOSCHANGES		0x00000004 // suppress WM_WINDOWPOSCHANGING/CHANGED messages (RollerCoaster Tycoon...)
-#define NOSYSTEMMEMORY		0x00000008 // forces suppression of DDSCAPS_SYSTEMMEMORY capability on surfaces
+//#define NOSYSTEMMEMORY		0x00000008 // forces suppression of DDSCAPS_SYSTEMMEMORY capability on surfaces
 #define NOBLT				0x00000010 // suppress blit to primary surface
-#define NOSYSTEMEMULATED	0x00000020 // forces suppression of DDSCAPS_SYSTEMMEMORY capability on emulated front & backbuffer surfaces
+//#define NOSYSTEMEMULATED	0x00000020 // forces suppression of DDSCAPS_SYSTEMMEMORY capability on emulated front & backbuffer surfaces
 #define DOFASTBLT			0x00000040 // use FastBlt to primary surface
 #define AEROBOOST			0x00000080 // Optimize for AERO environment: does all stretching in sysmemory surfaces
 #define QUARTERBLT			0x00000100 // Consider a screen update (to count or limit FPS) only  blt operations bigger than a quarter of the whole primary surface
@@ -193,6 +193,8 @@
 #define POWER2WIDTH			0x00000200 // Fixes .....
 #define HIDETASKBAR			0x00000400 // Hides taskbar & start menu during game execution
 #define ACTIVATEAPP			0x00000800 // sends WM_ACTIVATEAPP message after every WM_WINPOSCHANGED message
+#define NOSYSMEMPRIMARY		0x00001000 // forces suppression of DDSCAPS_SYSTEMMEMORY capability on emulated primary surface
+#define NOSYSMEMBACKBUF		0x00002000 // forces suppression of DDSCAPS_SYSTEMMEMORY capability on emulated backbuffer surface
 
 // logging Tflags DWORD:
 #define OUTTRACE			0x00000001 // enables tracing to dxwnd.log in general
diff --git a/build/dxwnd.dll b/build/dxwnd.dll
index 8208155..252a75e 100644
--- a/build/dxwnd.dll
+++ b/build/dxwnd.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84e59408df785c15d6c06b28a9c1af651f16cfc666ceedb196b4d960aa0e4e00
-size 578560
+oid sha256:549536858a03ba659d55078a89d987c435aed391c5444cfe6421f23cf4c76cc6
+size 578048
diff --git a/build/dxwnd.exe b/build/dxwnd.exe
index 6ec8511..7eaa09e 100644
--- a/build/dxwnd.exe
+++ b/build/dxwnd.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5de557160daabc9b2605f05b2c0988c129df7a8a03f8505db3a9c60269e9ee92
+oid sha256:ec489528e5cb8f0bdcdd15b49650a55d6367c38520bc1724834cebef642c9d73
 size 541696
diff --git a/build/exports/Adrenix 3D.dxw b/build/exports/Adrenix 3D.dxw
index e84b1e1..8c6b0c0 100644
--- a/build/exports/Adrenix 3D.dxw	
+++ b/build/exports/Adrenix 3D.dxw	
@@ -8,10 +8,10 @@ notes0=
 ver0=0
 coord0=0
 flag0=134234150
-flagg0=1207959552
+flagg0=1208025088
 flagh0=20
 flagi0=138412036
-flagj0=4224
+flagj0=5248
 tflag0=0
 initx0=0
 inity0=0
@@ -27,3 +27,5 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=-1
+flagk0=0
+swapeffect0=0
diff --git a/build/exports/Adrenix.dxw b/build/exports/Adrenix.dxw
new file mode 100644
index 0000000..ba6f623
--- /dev/null
+++ b/build/exports/Adrenix.dxw
@@ -0,0 +1,31 @@
+[target]
+title0=Adrenix
+path0=D:\Games\Adrenix\Adrenix.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=
+ver0=0
+coord0=0
+flag0=136314918
+flagg0=1207959552
+flagh0=20
+flagi0=138412036
+flagj0=4224
+flagk0=0
+tflag0=0
+initx0=0
+inity0=0
+minx0=0
+miny0=0
+maxx0=0
+maxy0=0
+posx0=50
+posy0=50
+sizx0=800
+sizy0=600
+maxfps0=0
+initts0=0
+winver0=0
+maxres0=-1
+swapeffect0=0
diff --git a/build/exports/Dark Disciples 1.dxw b/build/exports/Dark Disciples 1.dxw
new file mode 100644
index 0000000..abaea97
--- /dev/null
+++ b/build/exports/Dark Disciples 1.dxw	
@@ -0,0 +1,31 @@
+[target]
+title0=Dark Disciples 1
+path0=D:\Games\Dark Disciples 1\DarkDisciples.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=
+ver0=0
+coord0=0
+flag0=136314914
+flagg0=1207959552
+flagh0=20
+flagi0=134217732
+flagj0=4224
+flagk0=0
+tflag0=0
+initx0=0
+inity0=0
+minx0=0
+miny0=0
+maxx0=0
+maxy0=0
+posx0=50
+posy0=50
+sizx0=800
+sizy0=600
+maxfps0=0
+initts0=0
+winver0=0
+maxres0=-1
+swapeffect0=0
diff --git a/build/exports/Dark Disciples 2.dxw b/build/exports/Dark Disciples 2.dxw
new file mode 100644
index 0000000..e4102c2
--- /dev/null
+++ b/build/exports/Dark Disciples 2.dxw	
@@ -0,0 +1,31 @@
+[target]
+title0=Dark Disciples 2
+path0=D:\Games\Dark Disciples 2\DarkDisciples2.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=
+ver0=0
+coord0=0
+flag0=136314914
+flagg0=1207959552
+flagh0=20
+flagi0=134217732
+flagj0=4224
+flagk0=0
+tflag0=0
+initx0=0
+inity0=0
+minx0=0
+miny0=0
+maxx0=0
+maxy0=0
+posx0=50
+posy0=50
+sizx0=800
+sizy0=600
+maxfps0=0
+initts0=0
+winver0=0
+maxres0=-1
+swapeffect0=0
diff --git a/build/exports/Evil Dead Hail to the King.dxw b/build/exports/Evil Dead Hail to the King.dxw
index 226a75f..12a5eab 100644
--- a/build/exports/Evil Dead Hail to the King.dxw	
+++ b/build/exports/Evil Dead Hail to the King.dxw	
@@ -10,7 +10,7 @@ flag0=134217762
 flagg0=1207959552
 flagh0=20
 flagi0=138412036
-flagj0=168
+flagj0=128
 tflag0=0
 initx0=0
 inity0=0
@@ -26,3 +26,6 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=-1
+notes0=
+flagk0=0
+swapeffect0=0
diff --git a/build/exports/Galapagos.dxw b/build/exports/Galapagos.dxw
index 7bddc2e..481edbe 100644
--- a/build/exports/Galapagos.dxw
+++ b/build/exports/Galapagos.dxw
@@ -7,12 +7,12 @@ opengllib0=
 notes0=
 ver0=7
 coord0=0
-flag0=746602528
-flagg0=1209008128
+flag0=681590816
+flagg0=1207959552
 flagh0=16
 flagi0=138412036
-flagj0=142610600
-tflag0=6402
+flagj0=142606464
+tflag0=0
 initx0=0
 inity0=0
 minx0=0
diff --git a/build/exports/Ground Control.dxw b/build/exports/Ground Control.dxw
new file mode 100644
index 0000000..1748f77
--- /dev/null
+++ b/build/exports/Ground Control.dxw	
@@ -0,0 +1,31 @@
+[target]
+title0=Ground Control
+path0=D:\Games\GC\gc.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=
+ver0=0
+coord0=0
+flag0=681574434
+flagg0=1744830464
+flagh0=20
+flagi0=138412036
+flagj0=4224
+flagk0=0
+tflag0=0
+initx0=0
+inity0=0
+minx0=0
+miny0=0
+maxx0=0
+maxy0=0
+posx0=50
+posy0=50
+sizx0=800
+sizy0=600
+maxfps0=0
+initts0=0
+winver0=0
+maxres0=-1
+swapeffect0=0
diff --git a/build/exports/Microsoft Motocross Madness 2 (emu).dxw b/build/exports/Microsoft Motocross Madness 2 (emu).dxw
new file mode 100644
index 0000000..eb34a34
--- /dev/null
+++ b/build/exports/Microsoft Motocross Madness 2 (emu).dxw	
@@ -0,0 +1,31 @@
+[target]
+title0=Microsoft Motocross Madness 2 (emu)
+path0=D:\Games\Motocross Madness 2\mcm2.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=Run the game in emulation mode\nDoesn't work on all video cards, and works only chosing the accelerated video card, \nnot the software mode.\nIn case of troubles, it may be necessary to delete the registry entries to force a \nnew clean configuration.
+ver0=0
+coord0=0
+flag0=136314914
+flagg0=1207959552
+flagh0=20
+flagi0=138412036
+flagj0=4224
+flagk0=8192
+tflag0=0
+initx0=0
+inity0=0
+minx0=0
+miny0=0
+maxx0=0
+maxy0=0
+posx0=50
+posy0=50
+sizx0=800
+sizy0=600
+maxfps0=0
+initts0=0
+winver0=0
+maxres0=-1
+swapeffect0=0
diff --git a/build/exports/Panzer General 3 Scorched Earth.dxw b/build/exports/Panzer General 3 Scorched Earth.dxw
index 8a17e47..b86a2e7 100644
--- a/build/exports/Panzer General 3 Scorched Earth.dxw	
+++ b/build/exports/Panzer General 3 Scorched Earth.dxw	
@@ -10,7 +10,7 @@ flag0=671088674
 flagg0=1207975936
 flagh0=2097172
 flagi0=138412036
-flagj0=8328
+flagj0=8320
 tflag0=0
 initx0=0
 inity0=0
@@ -26,3 +26,6 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=-1
+notes0=
+flagk0=0
+swapeffect0=0
diff --git a/build/exports/Star Wars Episode I Racer (emulated).dxw b/build/exports/Star Wars Episode I Racer (emulated).dxw
index ca8f2fd..f78a696 100644
--- a/build/exports/Star Wars Episode I Racer (emulated).dxw	
+++ b/build/exports/Star Wars Episode I Racer (emulated).dxw	
@@ -8,9 +8,9 @@ ver0=0
 coord0=0
 flag0=679493671
 flagg0=1210056720
-flagh0=8212
+flagh0=20
 flagi0=2097172
-flagj0=136
+flagj0=128
 tflag0=0
 initx0=0
 inity0=0
@@ -26,3 +26,6 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=0
+notes0=
+flagk0=0
+swapeffect0=0
diff --git a/build/exports/Syberia.dxw b/build/exports/Syberia.dxw
index b27650c..a2c00c4 100644
--- a/build/exports/Syberia.dxw
+++ b/build/exports/Syberia.dxw
@@ -1,15 +1,15 @@
 [target]
 title0=Syberia
 path0=D:\Games\Syberia\Syberia.exe
-module0=Syberia ck2_3d ck2
+module0=
 opengllib0=
 ver0=0
-coord0=2
-flag0=1610694673
-flagg0=1207959576
+coord0=0
+flag0=1610694675
+flagg0=1207959552
 flagh0=20
-flagi0=4
-tflag0=6418
+flagi0=4194308
+tflag0=0
 initx0=300
 inity0=300
 minx0=0
@@ -24,3 +24,8 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=-1
+launchpath0=
+notes0=
+flagj0=128
+flagk0=4096
+swapeffect0=0
diff --git a/build/exports/Talis Gear.dxw b/build/exports/Talis Gear.dxw
index bc14a14..9050248 100644
--- a/build/exports/Talis Gear.dxw	
+++ b/build/exports/Talis Gear.dxw	
@@ -5,10 +5,10 @@ module0=
 opengllib0=
 ver0=0
 coord0=0
-flag0=134217760
+flag0=134217762
 flagg0=1207959552
 flagh0=20
-flagi0=0
+flagi0=4194304
 tflag0=0
 initx0=0
 inity0=0
@@ -22,3 +22,10 @@ sizx0=800
 sizy0=600
 maxfps0=0
 initts0=0
+launchpath0=
+notes0=
+flagj0=128
+flagk0=0
+winver0=0
+maxres0=0
+swapeffect0=0
diff --git a/build/exports/Thorgal.dxw b/build/exports/Thorgal.dxw
index b6d50cd..9201a0e 100644
--- a/build/exports/Thorgal.dxw
+++ b/build/exports/Thorgal.dxw
@@ -10,7 +10,7 @@ flag0=136314915
 flagg0=1242038528
 flagh0=65552
 flagi0=136314885
-flagj0=136
+flagj0=128
 tflag0=0
 initx0=0
 inity0=0
diff --git a/build/readme-relnotes.txt b/build/readme-relnotes.txt
index 39d593b..7abdb11 100644
--- a/build/readme-relnotes.txt
+++ b/build/readme-relnotes.txt
@@ -855,4 +855,9 @@ add: "hide taskbar" option. A little experimental, so far. If the game crashes,
 v2.03.30:
 fix: reset for flipped DC retrieved from ddraw interface after ddraw creation. Fixes "Powerslide".
 add: added "Send WM_ACTIVATEAPP message" flag: fixes "Championship Manager 03 04" mouse and "Thorgal" lock
-fix: FillRect hooker. Good for "Premier Manager 98" and "Premier Manager 97".
\ No newline at end of file
+fix: FillRect hooker. Good for "Premier Manager 98" and "Premier Manager 97".
+fix: revised the DDSCAPS_SYSTEMMEMORY suppression, now separated for primary & backbuffer surfaces
+
+v2.03.31:
+fix: handling of "No SYSTEMMEMORY on BackBuffer" flag for no-emulation mode: necessary to run "Microsoft Motocross Madness 2" in this mode.
+fix: allowing hot patching to GetCursorPos() user32.dll call. This allows correct mouse control with obfuscated exes, like the chinese RPG "Paladin 3".
diff --git a/dll/ddraw.cpp b/dll/ddraw.cpp
index e20ff63..16daaf0 100644
--- a/dll/ddraw.cpp
+++ b/dll/ddraw.cpp
@@ -2203,7 +2203,7 @@ static HRESULT BuildPrimaryEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf
 	// DDSCAPS_OFFSCREENPLAIN seems required to support the palette in memory surfaces
 	ddsd.ddsCaps.dwCaps |= (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_SYSTEMMEMORY);
 	// on WinXP Fifa 99 doesn't like DDSCAPS_SYSTEMMEMORY cap, so better to leave a way to unset it....
-	if(dxw.dwFlags5 & NOSYSTEMEMULATED) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY;
+	if(dxw.dwFlags6 & NOSYSMEMPRIMARY) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY;
 
 	extern BOOL bInCreateDevice;
 	//if (bInCreateDevice) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY;
@@ -2249,7 +2249,7 @@ static HRESULT BuildPrimaryEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf
 	dwBackBufferCaps = (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_SYSTEMMEMORY);
 	// on WinXP Fifa 99 doesn't like DDSCAPS_SYSTEMMEMORY cap, so better to leave a way to unset it....
 	// this is important to avoid that certain D3D operations will abort - see "Forsaken" problem
-	if(dxw.dwFlags5 & NOSYSTEMEMULATED) dwBackBufferCaps = DDSCAPS_OFFSCREENPLAIN;
+	if(dxw.dwFlags6 & NOSYSMEMBACKBUF) dwBackBufferCaps = DDSCAPS_OFFSCREENPLAIN;
 
 	if(dxw.dwFlags5 & GDIMODE) return DD_OK;
 
@@ -2393,7 +2393,7 @@ static HRESULT BuildBackBufferEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateS
 	ddsd.ddsCaps.dwCaps |= (DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN);
 	if(ddsd.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY; // necessary: Martian Gotic crashes otherwise
 	// on WinXP Fifa 99 doesn't like DDSCAPS_SYSTEMMEMORY cap, so better to leave a way to unset it....
-	if(dxw.dwFlags5 & NOSYSTEMMEMORY) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY;
+	if(dxw.dwFlags6 & NOSYSMEMBACKBUF) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY;
 	ddsd.dwWidth = dxw.GetScreenWidth();
 	ddsd.dwHeight = dxw.GetScreenHeight();
 	GetPixFmt(&ddsd);
@@ -2431,6 +2431,7 @@ static HRESULT BuildBackBufferDir(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateS
 	else
 		ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; 
 	if (dxversion >= 4) ddsd.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN;
+	if(dxw.dwFlags6 & NOSYSMEMBACKBUF) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY;
 	ddsd.dwWidth = dxw.GetScreenWidth();
 	ddsd.dwHeight = dxw.GetScreenHeight();
 	if (dxw.dwFlags2 & BACKBUFATTACH) {
@@ -2480,8 +2481,6 @@ static HRESULT BuildGenericEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf
 	// with the same type, so that assuming an identical lPitch and memcopy-ing from one buffer to the 
 	// other is a legitimate operation. 
 	if(ddsd.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY; // v2.03.03 !!
-	// on WinXP Fifa 99 doesn't like DDSCAPS_SYSTEMMEMORY cap, so better to leave a way to unset it....
-	if(dxw.dwFlags5 & NOSYSTEMMEMORY) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY;
 
 	if(dxw.dwFlags6 & POWER2WIDTH){ // v2.03.28: POWER2WIDTH to fix "Midtown Madness" in surface emulation mode
 		if(((ddsd.dwFlags & (DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH)) == (DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH)) &&
@@ -3184,7 +3183,6 @@ HRESULT WINAPI extFlip(LPDIRECTDRAWSURFACE lpdds, LPDIRECTDRAWSURFACE lpddssrc,
 			if (res) OutTraceDW("Flip: GetSurfaceDesc res=%x at %d\n",res, __LINE__);
 
 			// replace these CAPS (good for seven kingdoms II) with same as lpdds surface
-			//ddsc.dwCaps=DDSCAPS_OFFSCREENPLAIN+DDSCAPS_SYSTEMMEMORY;
 			ddsc.dwCaps=sd.ddsCaps.dwCaps;
 
 			res=lpdds->GetAttachedSurface(&ddsc, &lpddsAttached);
diff --git a/dll/dxhook.cpp b/dll/dxhook.cpp
index d7b0546..3fe7131 100644
--- a/dll/dxhook.cpp
+++ b/dll/dxhook.cpp
@@ -94,8 +94,8 @@ static char *Flag4Names[32]={
 };
 
 static char *Flag5Names[32]={
-	"DIABLOTWEAK", "CLEARTARGET", "NOWINPOSCHANGES", "NOSYSTEMMEMORY",
-	"NOBLT", "NOSYSTEMEMULATED", "DOFASTBLT", "AEROBOOST",
+	"DIABLOTWEAK", "CLEARTARGET", "NOWINPOSCHANGES", "--NOSYSTEMMEMORY--",
+	"NOBLT", "--NOSYSTEMEMULATED--", "DOFASTBLT", "AEROBOOST",
 	"QUARTERBLT", "NOIMAGEHLP", "BILINEARFILTER", "REPLACEPRIVOPS",
 	"REMAPMCI", "TEXTUREHIGHLIGHT", "TEXTUREDUMP", "TEXTUREHACK",
 	"TEXTURETRANSP", "NORMALIZEPERFCOUNT", "HYBRIDMODE", "GDICOLORCONV",
@@ -108,7 +108,7 @@ static char *Flag6Names[32]={
 	"FORCESWAPEFFECT", "LEGACYALLOC", "NODESTROYWINDOW", "NOMOVIES",
 	"SUPPRESSRELEASE", "FIXMOVIESCOLOR", "WOW64REGISTRY", "DISABLEMAXWINMODE",
 	"FIXPITCH", "POWER2WIDTH", "HIDETASKBAR", "ACTIVATEAPP",
-	"", "", "", "",
+	"NOSYSMEMPRIMARY", "NOSYSMEMBACKBUF", "", "",
 	"", "", "", "",
 	"", "", "", "",
 	"", "", "", "",
diff --git a/dll/dxwnd.cpp b/dll/dxwnd.cpp
index e49ca7a..3a6005b 100644
--- a/dll/dxwnd.cpp
+++ b/dll/dxwnd.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "TlHelp32.h"
 
-#define VERSION "2.03.30"
+#define VERSION "2.03.31"
 
 #define DDTHREADLOCK 1
 //#define LOCKTHREADS
diff --git a/dll/dxwnd.vs2008.suo b/dll/dxwnd.vs2008.suo
index 264850ad82af0b3da50c039554496aea48fa2e2a..1846877e729cd324670601b23c09985ce7e486a9 100644
GIT binary patch
delta 11506
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

delta 9624
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
T%ss54;bm@?6ZM{UV`={ba0h-X

diff --git a/dll/hd3d7.cpp b/dll/hd3d7.cpp
index 2d42224..a403671 100644
--- a/dll/hd3d7.cpp
+++ b/dll/hd3d7.cpp
@@ -904,15 +904,15 @@ HRESULT WINAPI extCreateDevice2(void *lpd3d, REFCLSID Guid, LPDIRECTDRAWSURFACE
 		if(!(dxw.dwFlags1 & EMULATESURFACE)) break; // no more tricks ....
 		if(!(dxw.dwFlags1 & AUTOMATIC)) break;
 
-		OutTraceD3D("CreateDevice(D3D2): SYSMEMORY OFF\n");
-		dxw.dwFlags5 |= NOSYSTEMEMULATED;
-		res=(*pCreateDevice2)(lpd3d, Guid, lpdds, lplpd3dd);
-		if(res==DD_OK) break;
-		OutTraceE("CreateDevice(D3D2) ERROR: err=%x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
-		if(!(dxw.dwFlags1 & AUTOMATIC)) break;
+		//OutTraceD3D("CreateDevice(D3D2): SYSMEMORY OFF\n");
+		//dxw.dwFlags6 |= NOSYSMEMPRIMARY;
+		//res=(*pCreateDevice2)(lpd3d, Guid, lpdds, lplpd3dd);
+		//if(res==DD_OK) break;
+		//OutTraceE("CreateDevice(D3D2) ERROR: err=%x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
+		//if(!(dxw.dwFlags1 & AUTOMATIC)) break;
 
 		OutTraceD3D("CreateDevice(D3D2): Emulation OFF\n");
-		dxw.dwFlags5 &= ~NOSYSTEMEMULATED;
+		//dxw.dwFlags5 &= ~NOSYSTEMEMULATED;
 		dxw.dwFlags1 &= ~EMULATESURFACE;
 		dxw.dwFlags1 |= LOCKEDSURFACE;
 		res=(*pCreateDevice2)(lpd3d, Guid, lpdds, lplpd3dd);
@@ -943,15 +943,15 @@ HRESULT WINAPI extCreateDevice3(void *lpd3d, REFCLSID Guid, LPDIRECTDRAWSURFACE4
 		if(!(dxw.dwFlags1 & EMULATESURFACE)) break; // no more tricks ....
 		if(!(dxw.dwFlags1 & AUTOMATIC)) break;
 
-		OutTraceD3D("CreateDevice(D3D3): SYSMEMORY OFF\n");
-		dxw.dwFlags5 |= NOSYSTEMEMULATED;
-		res=(*pCreateDevice3)(lpd3d, Guid, lpdds, lplpd3dd, unk);
-		if(res==DD_OK) break;
-		OutTraceE("CreateDevice(D3D3) ERROR: err=%x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
-		if(!(dxw.dwFlags1 & AUTOMATIC)) break;
+		//OutTraceD3D("CreateDevice(D3D3): SYSMEMORY OFF\n");
+		//dxw.dwFlags5 |= NOSYSTEMEMULATED;
+		//res=(*pCreateDevice3)(lpd3d, Guid, lpdds, lplpd3dd, unk);
+		//if(res==DD_OK) break;
+		//OutTraceE("CreateDevice(D3D3) ERROR: err=%x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
+		//if(!(dxw.dwFlags1 & AUTOMATIC)) break;
 
 		OutTraceD3D("CreateDevice(D3D3): Emulation OFF\n");
-		dxw.dwFlags5 &= ~NOSYSTEMEMULATED;
+		//dxw.dwFlags5 &= ~NOSYSTEMEMULATED;
 		dxw.dwFlags1 &= ~EMULATESURFACE;
 		dxw.dwFlags1 |= LOCKEDSURFACE;
 		res=(*pCreateDevice3)(lpd3d, Guid, lpdds, lplpd3dd, unk);
@@ -986,15 +986,15 @@ HRESULT WINAPI extCreateDevice7(void *lpd3d, REFCLSID Guid, LPDIRECTDRAWSURFACE7
 		if(!(dxw.dwFlags1 & EMULATESURFACE)) break; // no more tricks ....
 		if(!(dxw.dwFlags1 & AUTOMATIC)) break;
 
-		OutTraceD3D("CreateDevice(D3D7): SYSMEMORY OFF\n");
-		dxw.dwFlags5 |= NOSYSTEMEMULATED;
-		res=(*pCreateDevice7)(lpd3d, Guid, lpdds, lplpd3dd);
-		if(res==DD_OK) break;
-		OutTraceE("CreateDevice(D3D7) ERROR: err=%x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
-		if(!(dxw.dwFlags1 & AUTOMATIC)) break;
+		//OutTraceD3D("CreateDevice(D3D7): SYSMEMORY OFF\n");
+		//dxw.dwFlags5 |= NOSYSTEMEMULATED;
+		//res=(*pCreateDevice7)(lpd3d, Guid, lpdds, lplpd3dd);
+		//if(res==DD_OK) break;
+		//OutTraceE("CreateDevice(D3D7) ERROR: err=%x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
+		//if(!(dxw.dwFlags1 & AUTOMATIC)) break;
 
 		OutTraceD3D("CreateDevice(D3D7): Emulation OFF\n");
-		dxw.dwFlags5 &= ~NOSYSTEMEMULATED;
+		//dxw.dwFlags5 &= ~NOSYSTEMEMULATED;
 		dxw.dwFlags1 &= ~EMULATESURFACE;
 		dxw.dwFlags1 |= LOCKEDSURFACE;
 		res=(*pCreateDevice7)(lpd3d, Guid, lpdds, lplpd3dd);
@@ -1599,7 +1599,7 @@ HRESULT WINAPI extEnumZBufferFormats(void *lpd3d, REFCLSID riidDevice, LPD3DENUM
 
 // Beware: using service surfaces with DDSCAPS_SYSTEMMEMORY capability may lead to crashes in D3D operations
 // like Vievport::Clear() in "Forsaken" set in emulation AERO-friendly mode. To avoid the problem, you can 
-// suppress the offending cap by use of the NOSYSTEMEMULATED flag
+// suppress the offending cap by use of the NOSYSMEMPRIMARY or NOSYSMEMBACKBUF flags
 
 HRESULT WINAPI extViewportClear(void *lpd3dvp, DWORD p1, LPD3DRECT lpRect, DWORD p2)
 {
diff --git a/dll/user32.cpp b/dll/user32.cpp
index fd7152c..af8ed17 100644
--- a/dll/user32.cpp
+++ b/dll/user32.cpp
@@ -205,7 +205,7 @@ static HookEntry_Type PeekAllHooks[]={
 };
 
 static HookEntry_Type MouseHooks[]={
-	{HOOK_IAT_CANDIDATE, "GetCursorPos", (FARPROC)GetCursorPos, (FARPROC *)&pGetCursorPos, (FARPROC)extGetCursorPos},
+	{HOOK_HOT_CANDIDATE, "GetCursorPos", (FARPROC)GetCursorPos, (FARPROC *)&pGetCursorPos, (FARPROC)extGetCursorPos},
 	{HOOK_IAT_CANDIDATE, "GetCursorInfo", (FARPROC)GetCursorInfo, (FARPROC *)&pGetCursorInfo, (FARPROC)extGetCursorInfo},
 	{HOOK_IAT_CANDIDATE, "SetCursor", (FARPROC)SetCursor, (FARPROC *)&pSetCursor, (FARPROC)extSetCursor},
 	{HOOK_IAT_CANDIDATE, "SendMessageA", (FARPROC)SendMessageA, (FARPROC *)&pSendMessageA, (FARPROC)extSendMessageA}, 
diff --git a/host/TabDebug.cpp b/host/TabDebug.cpp
index 160dc1a..040271f 100644
--- a/host/TabDebug.cpp
+++ b/host/TabDebug.cpp
@@ -47,7 +47,7 @@ void CTabDebug::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_HOTPATCHALWAYS, cTarget->m_HotPatchAlways);
 	DDX_Check(pDX, IDC_FREEZEINJECTEDSON, cTarget->m_FreezeInjectedSon);
 	DDX_Check(pDX, IDC_STRESSRESOURCES, cTarget->m_StressResources);
-	DDX_Check(pDX, IDC_NOSYSTEMMEMORY, cTarget->m_NoSystemMemory);
+//	DDX_Check(pDX, IDC_NOSYSTEMMEMORY, cTarget->m_NoSystemMemory);
 }
 
 BEGIN_MESSAGE_MAP(CTabDebug, CDialog)
diff --git a/host/TabDirect3D.cpp b/host/TabDirect3D.cpp
index 21b065d..04ea1d5 100644
--- a/host/TabDirect3D.cpp
+++ b/host/TabDirect3D.cpp
@@ -36,7 +36,8 @@ void CTabDirect3D::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_FORCESHEL, cTarget->m_ForcesHEL);
 
 	// Ddraw tweaks
-	DDX_Check(pDX, IDC_NOSYSTEMEMULATED, cTarget->m_NoSystemEmulated);
+	DDX_Check(pDX, IDC_NOSYSMEMPRIMARY, cTarget->m_NoSysMemPrimary);
+	DDX_Check(pDX, IDC_NOSYSMEMBACKBUF, cTarget->m_NoSysMemBackBuf);
 	DDX_Check(pDX, IDC_FIXPITCH, cTarget->m_FixPitch);
 	DDX_Check(pDX, IDC_POWER2WIDTH, cTarget->m_Power2Width);
 
diff --git a/host/TargetDlg.cpp b/host/TargetDlg.cpp
index 22ab330..aae62de 100644
--- a/host/TargetDlg.cpp
+++ b/host/TargetDlg.cpp
@@ -124,8 +124,8 @@ CTargetDlg::CTargetDlg(CWnd* pParent /*=NULL*/)
 	m_SuppressDXErrors = FALSE;
 	m_MarkBlit = FALSE;
 	m_MarkLock = FALSE;
-	m_NoSystemMemory = FALSE;
-	m_NoSystemEmulated = FALSE;
+	m_NoSysMemPrimary = FALSE;
+	m_NoSysMemBackBuf = FALSE;
 	m_NoBlt = FALSE;
 	m_BilinearBlt = FALSE;
 	m_FastBlt = FALSE;
diff --git a/host/TargetDlg.h b/host/TargetDlg.h
index e9fe0f8..7265f25 100644
--- a/host/TargetDlg.h
+++ b/host/TargetDlg.h
@@ -97,8 +97,8 @@ public:
 	BOOL	m_SuppressDXErrors;
 	BOOL	m_MarkBlit;
 	BOOL	m_MarkLock;
-	BOOL	m_NoSystemMemory;
-	BOOL	m_NoSystemEmulated;
+	BOOL	m_NoSysMemPrimary;
+	BOOL	m_NoSysMemBackBuf;
 	BOOL	m_NoBlt;
 	BOOL	m_BilinearBlt;
 	BOOL	m_FastBlt;
diff --git a/host/dxwndhost.aps b/host/dxwndhost.aps
index 1abddd1301b6931235047bdf0420cd639b626ebc..680e5fa2ddbaae26fc89eb41dd6795301acc73a0 100644
GIT binary patch
delta 3275
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
A!2kdN

delta 3260
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

diff --git a/host/dxwndhost.rc b/host/dxwndhost.rc
index ff1b8a72544e2433ad4a01d8bf931bfdb8a6374b..1708027de0ae8289febe0b1a146ca8de7a3ab3c8 100644
GIT binary patch
delta 178
zcmew{n{CNFwhcb>*z+0k7!()+rZ>tnN>0w1$Hni<;L7035Wo<`;0dH1C)a-uoxE>8
z+vG>{9!*wSC^9+WF308v^PL!(O&KgEJ5IEozJZaEZL-lkDPD+CP7H|*$qd<(7Z!od
z6NZ@Q#Nf!_%;3%7#1P8hHhJUyTA-OctcDCm3>KTU7w&Fg)@RV4Y#6LOokNN70EjdF
UAUC7x^a2S+f$e{k82@Ae0M>gqH2?qr

delta 115
zcmZ27kL|~7whcb>1d|yO847?ni6N6A2Z&21$Ig=!3}J9(@CD;g1|J4ThLFh{SBFlv
zTf{c`!MsPz#tbHt9VbdoFW_WU+O$A{aq^-0BGYZu7{xXhESl9YDMV?yfimNP$$cJ5
Q(-Wi_g|=&`F#gE`05Dl4o&W#<

diff --git a/host/dxwndhost.vs2008.suo b/host/dxwndhost.vs2008.suo
index bee13bc60f5ae065a48747ef2d0af96fc7e57825..20d91db3f4a1c30abb341b75da828da114d7dbb4 100644
GIT binary patch
delta 3350
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
Ud$2yCm|ejnBVWm4TOMKjUp?$5WB>pF

delta 4596
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
KOMgUo{C@$GmczvW

diff --git a/host/dxwndhostView.cpp b/host/dxwndhostView.cpp
index 9991291..3e1c5d9 100644
--- a/host/dxwndhostView.cpp
+++ b/host/dxwndhostView.cpp
@@ -325,8 +325,8 @@ static void SetTargetFromDlg(TARGETMAP *t, CTargetDlg *dlg)
 	if(dlg->m_SuppressDXErrors) t->flags |= SUPPRESSDXERRORS;
 	if(dlg->m_MarkBlit) t->flags3 |= MARKBLIT;
 	if(dlg->m_MarkLock) t->flags3 |= MARKLOCK;
-	if(dlg->m_NoSystemMemory) t->flags5 |= NOSYSTEMMEMORY;
-	if(dlg->m_NoSystemEmulated) t->flags5 |= NOSYSTEMEMULATED;
+	if(dlg->m_NoSysMemPrimary) t->flags6 |= NOSYSMEMPRIMARY;
+	if(dlg->m_NoSysMemBackBuf) t->flags6 |= NOSYSMEMBACKBUF;
 	if(dlg->m_NoBlt) t->flags5 |= NOBLT;
 	if(dlg->m_FastBlt) t->flags5 |= DOFASTBLT;
 	if(dlg->m_GDIColorConv) t->flags5 |= GDICOLORCONV;
@@ -551,8 +551,8 @@ static void SetDlgFromTarget(TARGETMAP *t, CTargetDlg *dlg)
 	dlg->m_SuppressDXErrors = t->flags & SUPPRESSDXERRORS ? 1 : 0;
 	dlg->m_MarkBlit = t->flags3 & MARKBLIT ? 1 : 0;
 	dlg->m_MarkLock = t->flags3 & MARKLOCK ? 1 : 0;
-	dlg->m_NoSystemMemory = t->flags5 & NOSYSTEMMEMORY ? 1 : 0;
-	dlg->m_NoSystemEmulated = t->flags5 & NOSYSTEMEMULATED ? 1 : 0;
+	dlg->m_NoSysMemPrimary = t->flags6 & NOSYSMEMPRIMARY ? 1 : 0;
+	dlg->m_NoSysMemBackBuf = t->flags6 & NOSYSMEMBACKBUF ? 1 : 0;
 	dlg->m_NoBlt = t->flags5 & NOBLT ? 1 : 0;
 	dlg->m_FastBlt = t->flags5 & DOFASTBLT ? 1 : 0;
 	dlg->m_GDIColorConv = t->flags5 & GDICOLORCONV ? 1 : 0;
diff --git a/host/resource b/host/resource
index de92742ba26f3512e5250313667d5318e6d18874..b7282e954c6b1775c16764f3fd8ddae6302cdaee 100644
GIT binary patch
delta 90
zcmew~jcL^krVUN0lRxmW@cS|NGXyh40<kZHD}(Q3Nh|Hi0VynurjrjkC`uy9FgP(d
hGB`7M1L;r(x5<o*vLJPnnd-zQ3uLfuZb^No3IJWR7ncA4

delta 14
WcmZ2AgXz;WrVUN0o2}A5r~&{qhz8C8