From 5c563db5dcbf93ae22ffff67ff6b5d57a09b35d2 Mon Sep 17 00:00:00 2001
From: gho tik <ghotik2002@yahoo.com>
Date: Sat, 18 Jul 2015 12:41:09 -0400
Subject: [PATCH] v2_03_30_src

Former-commit-id: a5bb345e33f58c0f372640e3cc2591e2c3198884
---
 Include/dxwnd.h                              |   1 +
 build/dxwnd.dll                              |   4 ++--
 build/dxwnd.exe                              |   4 ++--
 build/exports/Affari Tuoi.dxw                |   7 ++++++-
 build/exports/Championship Manager 03 04.dxw |   8 ++++----
 build/exports/Powerslide.dxw                 |   6 ++++--
 build/exports/Thorgal.dxw                    |   5 ++++-
 build/exports/dxwnd.ini                      |   5 -----
 build/readme-relnotes.txt                    |   7 ++++++-
 dll/ddraw.cpp                                |   3 ++-
 dll/dxhook.cpp                               |   7 ++++++-
 dll/dxwnd.cpp                                |   2 +-
 dll/dxwnd.vs2008.suo                         | Bin 377856 -> 377856 bytes
 dll/user32.cpp                               |  18 ++++++++++++++----
 host/TabWindow.cpp                           |   1 +
 host/TargetDlg.cpp                           |   1 +
 host/TargetDlg.h                             |   1 +
 host/dxwndhost.aps                           | Bin 157856 -> 158408 bytes
 host/dxwndhost.rc                            | Bin 101642 -> 101880 bytes
 host/dxwndhost.vs2008.suo                    | Bin 239104 -> 247296 bytes
 host/dxwndhostView.cpp                       |   9 +++++++++
 host/resource                                | Bin 35600 -> 35698 bytes
 22 files changed, 64 insertions(+), 25 deletions(-)
 delete mode 100644 build/exports/dxwnd.ini

diff --git a/Include/dxwnd.h b/Include/dxwnd.h
index d97d604..96310b8 100644
--- a/Include/dxwnd.h
+++ b/Include/dxwnd.h
@@ -192,6 +192,7 @@
 #define FIXPITCH			0x00000100 // Fixes surface filling made with no concern to actual pitch value
 #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
 
 // logging Tflags DWORD:
 #define OUTTRACE			0x00000001 // enables tracing to dxwnd.log in general
diff --git a/build/dxwnd.dll b/build/dxwnd.dll
index 9fa17b7..8208155 100644
--- a/build/dxwnd.dll
+++ b/build/dxwnd.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:427b51e427648a3f526882f2ed47eb400830ad367e5484f9fce47a94aab837b9
-size 578048
+oid sha256:84e59408df785c15d6c06b28a9c1af651f16cfc666ceedb196b4d960aa0e4e00
+size 578560
diff --git a/build/dxwnd.exe b/build/dxwnd.exe
index 30a5850..6ec8511 100644
--- a/build/dxwnd.exe
+++ b/build/dxwnd.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e15db53d932535d67b361f33febb9c9a52b3c5d3c0552f1b4f857fa0f4ac868c
-size 541184
+oid sha256:5de557160daabc9b2605f05b2c0988c129df7a8a03f8505db3a9c60269e9ee92
+size 541696
diff --git a/build/exports/Affari Tuoi.dxw b/build/exports/Affari Tuoi.dxw
index 0546937..c940be3 100644
--- a/build/exports/Affari Tuoi.dxw	
+++ b/build/exports/Affari Tuoi.dxw	
@@ -8,7 +8,7 @@ coord0=0
 flag0=536870914
 flagg0=1207959568
 flagh0=16
-flagi0=4
+flagi0=71303172
 tflag0=0
 initx0=0
 inity0=0
@@ -24,3 +24,8 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=4
+launchpath0=
+notes0=
+flagj0=0
+flagk0=0
+swapeffect0=0
diff --git a/build/exports/Championship Manager 03 04.dxw b/build/exports/Championship Manager 03 04.dxw
index 42f8729..54ada7f 100644
--- a/build/exports/Championship Manager 03 04.dxw	
+++ b/build/exports/Championship Manager 03 04.dxw	
@@ -7,13 +7,13 @@ opengllib0=
 notes0=
 ver0=0
 coord0=0
-flag0=673194018
+flag0=681582627
 flagg0=1744830464
-flagh0=16
+flagh0=2129936
 flagi0=138412036
 flagj0=4224
-flagk0=0
-tflag0=-2147477233
+flagk0=2048
+tflag0=0
 initx0=0
 inity0=0
 minx0=0
diff --git a/build/exports/Powerslide.dxw b/build/exports/Powerslide.dxw
index 9e4c618..f0aa7ff 100644
--- a/build/exports/Powerslide.dxw
+++ b/build/exports/Powerslide.dxw
@@ -7,12 +7,12 @@ opengllib0=
 notes0=
 ver0=0
 coord0=0
-flag0=134217762
+flag0=679477282
 flagg0=1207959552
 flagh0=20
 flagi0=138412036
 flagj0=4224
-tflag0=512
+tflag0=0
 initx0=0
 inity0=0
 minx0=0
@@ -27,3 +27,5 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=-1
+flagk0=0
+swapeffect0=0
diff --git a/build/exports/Thorgal.dxw b/build/exports/Thorgal.dxw
index e189893..b6d50cd 100644
--- a/build/exports/Thorgal.dxw
+++ b/build/exports/Thorgal.dxw
@@ -6,7 +6,7 @@ module0=
 opengllib0=
 ver0=0
 coord0=0
-flag0=136314914
+flag0=136314915
 flagg0=1242038528
 flagh0=65552
 flagi0=136314885
@@ -26,3 +26,6 @@ maxfps0=0
 initts0=0
 winver0=0
 maxres0=-1
+notes0=
+flagk0=2048
+swapeffect0=0
diff --git a/build/exports/dxwnd.ini b/build/exports/dxwnd.ini
deleted file mode 100644
index e334ef2..0000000
--- a/build/exports/dxwnd.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[window]
-posx=1541
-posy=587
-sizx=320
-sizy=200
diff --git a/build/readme-relnotes.txt b/build/readme-relnotes.txt
index d81f782..39d593b 100644
--- a/build/readme-relnotes.txt
+++ b/build/readme-relnotes.txt
@@ -850,4 +850,9 @@ add: debug flag "Highlight Locked surfaces" to highlight service surfaces that a
 
 v2.03.29:
 fix: wrong d3d7 hook, now "Echelon" works again.
-add: "hide taskbar" option. A little experimental, so far. If the game crashes, the taskbar may not be reactivated: use menu commands to recover.
\ No newline at end of file
+add: "hide taskbar" option. A little experimental, so far. If the game crashes, the taskbar may not be reactivated: use menu commands to recover.
+
+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
diff --git a/dll/ddraw.cpp b/dll/ddraw.cpp
index a9dddd9..e20ff63 100644
--- a/dll/ddraw.cpp
+++ b/dll/ddraw.cpp
@@ -1604,7 +1604,7 @@ HRESULT WINAPI extDirectDrawCreate(GUID FAR *lpguid, LPDIRECTDRAW FAR *lplpdd, I
 	}
 
 	if(lpPrimaryDD==NULL) lpPrimaryDD=*lplpdd; // do not override the value set when creating the primary surface!
-
+	bFlippedDC = FALSE; // v02.03.30
 	return DD_OK;
 }
 
@@ -1677,6 +1677,7 @@ HRESULT WINAPI extDirectDrawCreateEx(GUID FAR *lpguid,
 	}
 
 	if(lpPrimaryDD==NULL) lpPrimaryDD=*lplpdd; // do not override the value set when creating the primary surface!
+	bFlippedDC = FALSE; // v02.03.30: fix for Powerslide
 	return DD_OK;
 }
 
diff --git a/dll/dxhook.cpp b/dll/dxhook.cpp
index 382ca2b..d7b0546 100644
--- a/dll/dxhook.cpp
+++ b/dll/dxhook.cpp
@@ -107,7 +107,7 @@ static char *Flag5Names[32]={
 static char *Flag6Names[32]={
 	"FORCESWAPEFFECT", "LEGACYALLOC", "NODESTROYWINDOW", "NOMOVIES",
 	"SUPPRESSRELEASE", "FIXMOVIESCOLOR", "WOW64REGISTRY", "DISABLEMAXWINMODE",
-	"FIXPITCH", "POWER2WIDTH", "", "",
+	"FIXPITCH", "POWER2WIDTH", "HIDETASKBAR", "ACTIVATEAPP",
 	"", "", "", "",
 	"", "", "", "",
 	"", "", "", "",
@@ -943,6 +943,11 @@ LRESULT CALLBACK extWindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
 					(*pMoveWindow)(hControlParentWnd, wp->x+fo.x, wp->y+fo.y, wp->cx, wp->cy, TRUE);
 				}
 			}
+			// v2.03.30: in window mode, it seems that the WM_ACTIVATEAPP message is not sent to the main win.
+			// this PostMessage call recovers "Thorgal" block at the end of intro movie and "Championship Manager 03 04" cursor
+			if((message==WM_WINDOWPOSCHANGED) && (dxw.dwFlags6 & ACTIVATEAPP)){
+				PostMessage(hwnd, WM_ACTIVATEAPP, 1, 0);
+			}
 		}
 		break;
 	case WM_ENTERSIZEMOVE:
diff --git a/dll/dxwnd.cpp b/dll/dxwnd.cpp
index 23b0f63..e49ca7a 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.29"
+#define VERSION "2.03.30"
 
 #define DDTHREADLOCK 1
 //#define LOCKTHREADS
diff --git a/dll/dxwnd.vs2008.suo b/dll/dxwnd.vs2008.suo
index d1b1b76490bb28d5cd36a77c5320de8d64ed046e..264850ad82af0b3da50c039554496aea48fa2e2a 100644
GIT binary patch
delta 6425
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
Nc~sc?e)IaczXOsJP6q%0

delta 2541
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
Xt+E=2a&*cdD#xqxI4IFAN2dH2HKpuF

diff --git a/dll/user32.cpp b/dll/user32.cpp
index 61f7749..fd7152c 100644
--- a/dll/user32.cpp
+++ b/dll/user32.cpp
@@ -153,6 +153,8 @@ static HookEntry_Type Hooks[]={
 	//{HOOK_IAT_CANDIDATE, "IsZoomed", (FARPROC)NULL, (FARPROC *)&pIsZoomed, (FARPROC)extIsZoomed},
 	//{HOOK_HOT_CANDIDATE, "IsIconic", (FARPROC)IsIconic, (FARPROC *)&pIsIconic, (FARPROC)extIsIconic},
 
+	{HOOK_HOT_CANDIDATE, "FillRect", (FARPROC)NULL, (FARPROC *)&pFillRect, (FARPROC)extFillRect},
+
 	{HOOK_IAT_CANDIDATE, 0, NULL, 0, 0} // terminator
 };
 
@@ -174,7 +176,7 @@ static HookEntry_Type ScaledHooks[]={
 	{HOOK_IAT_CANDIDATE, "TabbedTextOutA", (FARPROC)TabbedTextOutA, (FARPROC *)&pTabbedTextOutA, (FARPROC)extTabbedTextOutA},
 	{HOOK_IAT_CANDIDATE, "DrawTextA", (FARPROC)DrawTextA, (FARPROC *)&pDrawText, (FARPROC)extDrawTextA},
 	{HOOK_IAT_CANDIDATE, "DrawTextExA", (FARPROC)DrawTextExA, (FARPROC *)&pDrawTextEx, (FARPROC)extDrawTextExA},
-	{HOOK_IAT_CANDIDATE, "FillRect", (FARPROC)NULL, (FARPROC *)&pFillRect, (FARPROC)extFillRect},
+	//{HOOK_HOT_CANDIDATE, "FillRect", (FARPROC)NULL, (FARPROC *)&pFillRect, (FARPROC)extFillRect},
 	//{HOOK_IAT_CANDIDATE, "GetDC", (FARPROC)GetDC, (FARPROC *)&pGDIGetDC, (FARPROC)extGDIGetDC},
 	//{HOOK_IAT_CANDIDATE, "GetDCEx", (FARPROC)NULL, (FARPROC *)&pGDIGetDCEx, (FARPROC)extGDIGetDCEx},
 	//{HOOK_IAT_CANDIDATE, "GetWindowDC", (FARPROC)GetWindowDC, (FARPROC *)&pGDIGetWindowDC, (FARPROC)extGDIGetWindowDC},
@@ -1689,11 +1691,16 @@ int WINAPI extFillRect(HDC hdc, const RECT *lprc, HBRUSH hbr)
 		return TRUE;
 	}
 
-
 	memcpy(&rc, lprc, sizeof(rc));
 
 	if(dxw.IsRealDesktop(WindowFromDC(hdc))) {
-		OutTraceDW("FillRect: remapped hdc to virtual desktop\n");
+		HWND VirtualDesktop;
+		VirtualDesktop=dxw.GethWnd();
+		if(VirtualDesktop==NULL){
+			OutTraceDW("FillRect: no virtual desktop\n");
+			return TRUE;
+		}
+		OutTraceDW("FillRect: remapped hdc to virtual desktop hwnd=%x\n", dxw.GethWnd());
 		hdc=(*pGDIGetDC)(dxw.GethWnd());
 	}
 
@@ -1701,11 +1708,14 @@ int WINAPI extFillRect(HDC hdc, const RECT *lprc, HBRUSH hbr)
 		// when not in fullscreen mode, just proxy the call
 		// but check coordinates: some games may use excessive coordinates: see "Premier Manager 98"
 		RECT client;
-		(*pGetClientRect)(WindowFromDC(hdc), &client);
+		HWND hwnd;
+		hwnd=WindowFromDC(hdc);
+		(*pGetClientRect)(hwnd, &client);
 		if(rc.left < 0) rc.left=0;
 		if(rc.top < 0) rc.top=0;
 		if(rc.right > client.right) rc.right=client.right;
 		if(rc.bottom > client.bottom) rc.bottom=client.bottom;
+		OutTraceDW("FillRect: remapped hdc from hwnd=%x to rect=(%d,%d)-(%d,%d)\n", hwnd, rc.left, rc.top, rc.right, rc.bottom);
 		return (*pFillRect)(hdc, &rc, hbr);
 	}
 
diff --git a/host/TabWindow.cpp b/host/TabWindow.cpp
index 94ef8fa..75113e1 100644
--- a/host/TabWindow.cpp
+++ b/host/TabWindow.cpp
@@ -47,6 +47,7 @@ void CTabWindow::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_HIDETASKBAR, cTarget->m_HideTaskbar);
 	DDX_Check(pDX, IDC_UNLOCKZORDER, cTarget->m_UnlockZOrder);
 	DDX_Check(pDX, IDC_NODESTROYWINDOW, cTarget->m_NoDestroyWindow);
+	DDX_Check(pDX, IDC_ACTIVATEAPP, cTarget->m_ActivateApp);
 
 	// color management
 	DDX_Check(pDX, IDC_INIT8BPP, cTarget->m_Init8BPP);
diff --git a/host/TargetDlg.cpp b/host/TargetDlg.cpp
index 631ddf4..22ab330 100644
--- a/host/TargetDlg.cpp
+++ b/host/TargetDlg.cpp
@@ -60,6 +60,7 @@ CTargetDlg::CTargetDlg(CWnd* pParent /*=NULL*/)
 	m_NoD3DReset = FALSE;
 	m_HideDesktop = FALSE;
 	m_HideTaskbar = FALSE;
+	m_ActivateApp = FALSE;
 	m_UnlockZOrder = FALSE;
 	m_NoDestroyWindow = FALSE;
 	m_LockSysColors = FALSE;
diff --git a/host/TargetDlg.h b/host/TargetDlg.h
index f8d8aaa..e9fe0f8 100644
--- a/host/TargetDlg.h
+++ b/host/TargetDlg.h
@@ -187,6 +187,7 @@ public:
 	BOOL	m_NoD3DReset;
 	BOOL	m_HideDesktop;
 	BOOL	m_HideTaskbar;
+	BOOL	m_ActivateApp;
 	BOOL	m_UnlockZOrder;
 	BOOL	m_NoDestroyWindow;
 	BOOL	m_LockSysColors;
diff --git a/host/dxwndhost.aps b/host/dxwndhost.aps
index b695693a0884cd3b9fd7550430e6a5fa46224c4f..1abddd1301b6931235047bdf0420cd639b626ebc 100644
GIT binary patch
delta 3545
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
T`MVZYds#Idi3z#xQIY*$49m{w

delta 3285
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
Le~FLoWSRd5^_Oq|

diff --git a/host/dxwndhost.rc b/host/dxwndhost.rc
index 80e4ae9eda1afd8b013da6a8a39566c421d5cb25..ff1b8a72544e2433ad4a01d8bf931bfdb8a6374b 100644
GIT binary patch
delta 121
zcmeC0#r9)1+Xj!9liyv^3JzvSWyoVlVNhTQXYgf+XK-Y2W(Z;MWC#PYLKs|uWB?E<
xFysQ&6$4=+LpqS9#GnII;{sHRMaSg$o1vWMKov$nXfS;vGo$ckkC%rQ0{{)(954U?

delta 14
Wcmew{o2_dW+Xj!9o6TMwS_}X<7YE${

diff --git a/host/dxwndhost.vs2008.suo b/host/dxwndhost.vs2008.suo
index f7667b21744692cbc2c7c44ba1a9d6817604f996..bee13bc60f5ae065a48747ef2d0af96fc7e57825 100644
GIT binary patch
delta 7163
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

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

diff --git a/host/dxwndhostView.cpp b/host/dxwndhostView.cpp
index c3dab67..9991291 100644
--- a/host/dxwndhostView.cpp
+++ b/host/dxwndhostView.cpp
@@ -292,6 +292,7 @@ static void SetTargetFromDlg(TARGETMAP *t, CTargetDlg *dlg)
 	if(dlg->m_NoD3DReset) t->flags4 |= NOD3DRESET;
 	if(dlg->m_HideDesktop) t->flags4 |= HIDEDESKTOP;
 	if(dlg->m_HideTaskbar) t->flags6 |= HIDETASKBAR;
+	if(dlg->m_ActivateApp) t->flags6 |= ACTIVATEAPP;
 	if(dlg->m_UnlockZOrder) t->flags5 |= UNLOCKZORDER;
 	if(dlg->m_NoDestroyWindow) t->flags6 |= NODESTROYWINDOW;
 	if(dlg->m_LockSysColors) t->flags3 |= LOCKSYSCOLORS;
@@ -500,6 +501,7 @@ static void SetDlgFromTarget(TARGETMAP *t, CTargetDlg *dlg)
 	dlg->m_NoD3DReset = t->flags4 & NOD3DRESET ? 1 : 0;
 	dlg->m_HideDesktop = t->flags4 & HIDEDESKTOP ? 1 : 0;
 	dlg->m_HideTaskbar = t->flags6 & HIDETASKBAR ? 1 : 0;
+	dlg->m_ActivateApp = t->flags6 & ACTIVATEAPP ? 1 : 0;
 	dlg->m_UnlockZOrder = t->flags5 & UNLOCKZORDER ? 1 : 0;
 	dlg->m_NoDestroyWindow = t->flags6 & NODESTROYWINDOW ? 1 : 0;
 	dlg->m_LockSysColors = t->flags3 & LOCKSYSCOLORS ? 1 : 0;
@@ -1034,9 +1036,16 @@ void CDxwndhostView::OnExport()
 	CFileDialog dlg( FALSE, "*.dxw", path, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
         "dxwnd task config (*.dxw)|*.dxw|All Files (*.*)|*.*||",  this);
 	if( dlg.DoModal() == IDOK) {
+		DWORD TFlags;
+		TARGETMAP *TargetMap;
 		strcpy(path, dlg.GetPathName().GetBuffer());
 		//MessageBox(path, "PathName", MB_OK);
+		// export with no trace flags active
+		TargetMap = &TargetMaps[i];
+		TFlags = TargetMap->tflags;
+		TargetMap->tflags = 0;
 		SaveConfigItem(&TargetMaps[i], &TitleMaps[i], 0, path);
+		TargetMap->tflags = TFlags;
 		if(GetPrivateProfileInt("window", "updatepaths", 1, InitPath)) {
 			GetFolderFromPath(path);
 			WritePrivateProfileString("window", "exportpath", path, InitPath);
diff --git a/host/resource b/host/resource
index abcc3ae0aa8240c6369485a69d2adc5e6005d163..de92742ba26f3512e5250313667d5318e6d18874 100644
GIT binary patch
delta 63
zcmbO*jp@@grVSk_lS90uCL1twO%6z5nY=2cZ1M*_7C}b_XNC|4PlhlCM<DIW;5fNZ
SS$$F}+vE^=sm%(hA5;OT6%)Jw

delta 30
mcmew~jcLL(rVSk_%$y9IlN-6DCkLdkOx}=Ewz(<wgDL>8rwg<I