v2_03_14_src

Former-commit-id: 3ee9e46b11381b392c850b6fcec7070a7d8f86ff

Include/dxwnd.h

@@ -175,6 +175,7 @@
 #define MESSAGEPUMP			0x04000000 // inserts a "message pump" loop between repeated operation that may stop the task on Win7 and greater
 #define TEXTUREFORMAT		0x08000000 // Apply virtual pixel format to texture surfaces without DDSD_PIXELFORMAT attribute
 #define GSKYHACK			0x10000000 // use VIDEOMEMORY+LOCALVIDMEM capability to turn hw acceleration on ...
+#define LOCKRESERVEDPALETTE 0x20000000 // lock the reserved palette entries (usually 20: 0-9 and 246-255)
 
 // logging Tflags DWORD:
 #define OUTTRACE			0x00000001 // enables tracing to dxwnd.log in general

build/dxwnd.0.ini

@@ -3,7 +3,9 @@ posx=50
 posy=50
 sizx=320
 sizy=200
-lang=automatic
+lang=default
+;lang=automatic
+;updatepaths=1
 ;debug=1
 ;multiprocesshook=0
 ;checkadmin=0

build/dxwnd.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a309ebf6376c46e11161cf10c80cfaec09dc6bb88fa7ac4d8bbd0cf92e243eb8
+oid sha256:864a3a7f784d58281c340c7d1ac1302d110b6d98167c3c4f8a42624e9341b65a
 size 571904

build/dxwnd.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7bef752b0ed1dd25215248cadaae676418c24c88518b878d1328e2e34abb6ef
+oid sha256:07f3136aad64bf4ff6b095c147274f42b9b14063a3760ebb2ab99550717af873
-size 538112
+size 538624

build/dxwnd.ini

@@ -0,0 +1,2 @@
+[window]
+exportpath=D:\DxWnd\exports\

build/exports/Beyond Divinity.dxw

@@ -3,13 +3,13 @@ title0=Beyond Divinity
 path0=D:\Games\Beyond Divinity\Div.exe
 module0=
 opengllib0=
-ver0=0
+ver0=1
 coord0=0
-flag0=134234144
+flag0=134234146
-flagg0=134217728
+flagg0=1207959552
 flagh0=61
-flagi0=0
+flagi0=4194304
-tflag0=3
+tflag0=0
 initx0=0
 inity0=0
 minx0=0
@@ -22,3 +22,8 @@ sizx0=800
 sizy0=600
 maxfps0=0
 initts0=0
+launchpath0=
+notes0=
+flagj0=128
+winver0=0
+maxres0=0

build/exports/Blaze and Blade.dxw

@@ -0,0 +1,29 @@
+[target]
+title0=Blaze and Blade
+path0=D:\Games\Blaze and Blade\Blaze.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=
+ver0=0
+coord0=0
+flag0=671088674
+flagg0=1207959552
+flagh0=20
+flagi0=138412036
+flagj0=4224
+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

build/exports/Divide, the.dxw

@@ -4,7 +4,7 @@ path0=D:\Games\divide\DIVIDE.EXE
 launchpath0=
 module0=
 opengllib0=
-notes0=
+notes0=RIP game needs "dxwnd.the Divide" registry definition
 ver0=0
 coord0=0
 flag0=134217762

build/exports/I-War.dxw

@@ -11,7 +11,7 @@ flag0=134217762
 flagg0=1476395008
 flagh0=20
 flagi0=138412036
-flagj0=4224
+flagj0=536875136
 tflag0=512
 initx0=0
 inity0=0

build/exports/Mageslayer.dxw

@@ -1,14 +1,14 @@
 [target]
-title0=Mageslayer
+title0=MageSlayer
 path0=D:\Games\MAGE\MAGESLAY.EXE
 module0=
 opengllib0=
 ver0=0
 coord0=0
 flag0=134234146
-flagg0=134217760
+flagg0=1476395040
 flagh0=20
-flagi0=0
+flagi0=4194305
 tflag0=64
 initx0=0
 inity0=0
@@ -22,3 +22,8 @@ sizx0=800
 sizy0=600
 maxfps0=0
 initts0=0
+launchpath0=
+notes0=May require "by default set no ALPHACHENNAL" if monitor doesn't support mode
+flagj0=128
+winver0=0
+maxres0=0

build/exports/Take no Prisoners.dxw

@@ -5,10 +5,10 @@ module0=
 opengllib0=
 ver0=0
 coord0=0
-flag0=134217762
+flag0=134234146
-flagg0=1207959684
+flagg0=1476395140
 flagh0=20
-flagi0=4194816
+flagi0=4194304
 tflag0=0
 initx0=0
 inity0=0

build/exports/Virtua Cop 2.dxw

@@ -0,0 +1,29 @@
+[target]
+title0=Virtua Cop 2
+path0=D:\Games\VCop2\VCop2.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=
+ver0=0
+coord0=0
+flag0=134217762
+flagg0=1207959552
+flagh0=20
+flagi0=138412036
+flagj0=4224
+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

build/exports/X-COM Interceptor.dxw

@@ -0,0 +1,29 @@
+[target]
+title0=X-COM Interceptor
+path0=D:\Games\X-COM Interceptor\Interceptor.exe
+launchpath0=
+module0=
+opengllib0=
+notes0=
+ver0=0
+coord0=0
+flag0=134217762
+flagg0=1207959552
+flagh0=20
+flagi0=138543110
+flagj0=4224
+tflag0=536870912
+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

build/exports/dxwnd.ini

@@ -1,5 +0,0 @@
-[window]
-posx=541
-posy=525
-sizx=320
-sizy=406

build/readme-relnotes.txt

@@ -759,3 +759,8 @@ fix: recovery for lost surfaces (i.e. after a Ctrl+Alt+Del command)
 fix: palette display form showing active entries
 fix: EnumDisplayModes hook in emulate surface mode
 fix: several log improvements
+
+v2.03.14
+add: window commands Minimize, Restore & Close
+add: made palette behaviour configurable (until better understood...)
+add: "updatepaths" tag in dxwnd.ini

dll/ddraw.cpp

@@ -496,13 +496,13 @@ void DescribeSurface(LPDIRECTDRAWSURFACE lpdds, int dxversion, char *label, int
 
 BOOL isPaletteUpdated;
 
-void mySetPalette(int dwstart, int dwcount, LPPALETTEENTRY lpentries, BOOL Has256ColorsPalette)
+void mySetPalette(int dwstart, int dwcount, LPPALETTEENTRY lpentries)
 {
 	int i;
 	extern DXWNDSTATUS *pStatus;
 
 	// if has reserved palette entries, recover them
-	if(!Has256ColorsPalette){
+	if(dxw.dwFlags5 & LOCKRESERVEDPALETTE){
 		int nStatCols, nPalEntries;
 		PALETTEENTRY SysPalEntry[256];
 		LPPALETTEENTRY lpEntry;
@@ -3435,8 +3435,6 @@ HRESULT WINAPI extWaitForVerticalBlank(LPDIRECTDRAW lpdd, DWORD dwflags, HANDLE
 
 #define DDPCAPS_INITIALIZE_LEGACY 0x00000008l
 
-BOOL Has256ColorsPalette = FALSE;
-
 HRESULT WINAPI extCreatePalette(LPDIRECTDRAW lpdd, DWORD dwflags, LPPALETTEENTRY lpddpa,
 	LPDIRECTDRAWPALETTE *lplpddp, IUnknown *pu)
 {
@@ -3445,10 +3443,6 @@ HRESULT WINAPI extCreatePalette(LPDIRECTDRAW lpdd, DWORD dwflags, LPPALETTEENTRY
 	OutTraceDDRAW("CreatePalette: dwFlags=%x(%s)\n", dwflags, ExplainCreatePaletteFlags(dwflags));
 	if(IsDebug && (dwflags & DDPCAPS_8BIT)) dxw.DumpPalette(256, lpddpa);
 
-	//if (dwflags & ~(DDPCAPS_PRIMARYSURFACE|DDPCAPS_8BIT|DDPCAPS_ALLOW256|DDPCAPS_INITIALIZE_LEGACY)) STOPPER("Palette flags");
-	if(dwflags & DDPCAPS_ALLOW256) Has256ColorsPalette = TRUE;
-	if(!(dwflags & DDPCAPS_PRIMARYSURFACE)) Has256ColorsPalette = TRUE;
-
 	if(dxw.dwFlags1 & EMULATESURFACE) dwflags &= ~DDPCAPS_PRIMARYSURFACE;
 	res = (*pCreatePalette)(lpdd, dwflags, lpddpa, lplpddp, pu);
 	if (res) {
@@ -3508,7 +3502,7 @@ HRESULT WINAPI extSetPalette(LPDIRECTDRAWSURFACE lpdds, LPDIRECTDRAWPALETTE lpdd
 			lpentries = (LPPALETTEENTRY)PaletteEntries;
 			res2=lpddp->GetEntries(0, 0, 256, lpentries);
 			if(res2) OutTraceE("SetPalette: GetEntries ERROR res=%x(%s)\n", res2, ExplainDDError(res2));
-			mySetPalette(0, 256, lpentries, Has256ColorsPalette); // v2.02.76: necessary for "Requiem Avenging Angel" in SURFACEEMULATION mode
+			mySetPalette(0, 256, lpentries); // v2.02.76: necessary for "Requiem Avenging Angel" in SURFACEEMULATION mode
 		}
 		// Apply palette to backbuffer surface. This is necessary on some games: "Duckman private dick", "Total Soccer 2000", ...
 		if (lpDDSBack){
@@ -3544,8 +3538,7 @@ HRESULT WINAPI extSetEntries(LPDIRECTDRAWPALETTE lpddp, DWORD dwflags, DWORD dws
 			OutTraceDW("SetEntries: ASSERT start+count > 256\n");
 		}
 
-		if(dwflags & DDPCAPS_ALLOW256) Has256ColorsPalette=TRUE;
+		mySetPalette(dwstart, dwcount, lpentries);
-		mySetPalette(dwstart, dwcount, lpentries, Has256ColorsPalette);
 
 		// GHO: needed for fixed rect and variable palette animations, 
 		// e.g. dungeon keeper loading screen, Warcraft II splash, ...

dll/dxhook.cpp

@@ -98,15 +98,15 @@ static char *Flag5Names[32]={
 	"REMAPMCI", "TEXTUREHIGHLIGHT", "TEXTUREDUMP", "TEXTUREHACK",
 	"TEXTURETRANSP", "NORMALIZEPERFCOUNT", "HYBRIDMODE", "GDICOLORCONV",
 	"INJECTSON", "ENABLESONHOOK", "FREEZEINJECTEDSON", "GDIMODE",
-	"CENTERTOWIN", "MESSAGEPUMP", "", "",
+	"CENTERTOWIN", "MESSAGEPUMP", "TEXTUREFORMAT", "GSKYHACK",
-	"", "", "", "",
+	"LOCKRESERVEDPALETTE", "", "", "",
 };
 
 static char *TFlagNames[32]={
 	"OUTTRACE", "OUTDDRAWTRACE", "OUTWINMESSAGES", "OUTCURSORTRACE",
 	"OUTPROXYTRACE", "DXPROXED", "ASSERTDIALOG", "OUTIMPORTTABLE",
 	"OUTDEBUG", "OUTREGISTRY", "TRACEHOOKS", "OUTD3DTRACE",
-	"OUTDXWINTRACE", "", "", "",
+	"OUTDXWINTRACE", "ADDTIMESTAMP", "OUTDEBUGSTRING", "ERASELOGFILE",
 	"", "", "", "",
 	"", "", "", "",
 	"", "", "", "",

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.13"
+#define VERSION "2.03.14"
 
 #define DDTHREADLOCK 1
 //#define LOCKTHREADS

dll/gdi32.cpp

@@ -37,6 +37,12 @@ BOOL WINAPI extExtTextOutA(HDC, int, int, UINT, const RECT *, LPCSTR, UINT, cons
 ExtTextOutW_Type pExtTextOutW = NULL;
 ExtTextOutA_Type pExtTextOutA = NULL;
 
+#ifdef TRACEPALETTE
+typedef BOOL (WINAPI *ResizePalette_Type)(HPALETTE, UINT);
+ResizePalette_Type pResizePalette = NULL;
+BOOL WINAPI extResizePalette(HPALETTE, UINT);
+#endif
+
 /*
 typedef COLORREF (WINAPI *SetBkColor_Type)(HDC, COLORREF);
 typedef COLORREF (WINAPI *SetTextColor_Type)(HDC hdc, COLORREF crColor);
@@ -81,8 +87,9 @@ static HookEntry_Type Hooks[]={
 
 	{HOOK_HOT_CANDIDATE, "GetPaletteEntries", (FARPROC)GetPaletteEntries, (FARPROC *)&pGetPaletteEntries, (FARPROC)extGetPaletteEntries},
 	{HOOK_HOT_CANDIDATE, "GetSystemPaletteUse", (FARPROC)GetSystemPaletteUse, (FARPROC *)&pGetSystemPaletteUse, (FARPROC)extGetSystemPaletteUse},
-
+#ifdef TRACEPALETTE
-
+	{HOOK_IAT_CANDIDATE, "ResizePalette", (FARPROC)ResizePalette, (FARPROC *)&pResizePalette, (FARPROC)extResizePalette},
+#endif
 	{HOOK_IAT_CANDIDATE, 0, NULL, 0, 0} // terminator
 }; 
 
@@ -526,14 +533,14 @@ BOOL WINAPI extAnimatePalette(HPALETTE hpal, UINT iStartIndex, UINT cEntries, co
 UINT WINAPI extRealizePalette(HDC hdc)
 {
 	UINT ret;
-	extern void mySetPalette(int, int, LPPALETTEENTRY, BOOL);
+	extern void mySetPalette(int, int, LPPALETTEENTRY);
 
 	OutTraceDW("GDI.RealizePalette: hdc=%x\n", hdc);
 	if((OBJ_DC == GetObjectType(hdc)) && (dxw.dwFlags1 & EMULATESURFACE)){
 		PALETTEENTRY PalEntries[256];
 		UINT nEntries;
 		nEntries=(*pGetPaletteEntries)(hDesktopPalette, 0, 256, PalEntries);
-		mySetPalette(0, nEntries, PalEntries, TRUE); // ??
+		mySetPalette(0, nEntries, PalEntries); 
 		if(IsDebug) dxw.DumpPalette(nEntries, PalEntries);
 		ret=DD_OK;
 	}
@@ -1917,6 +1924,14 @@ BOOL WINAPI extExtTextOutW(HDC hdc, int X, int Y, UINT fuOptions, const RECT *lp
 	
 }
 
+#ifdef TRACEPALETTE
+BOOL WINAPI extResizePalette(HPALETTE hpal, UINT nEntries)
+{
+	OutTrace("ResizePalette: hpal=%x nEntries=%d\n", hpal, nEntries);
+	return (*pResizePalette)(hpal, nEntries);
+}
+#endif
+
 #if 0
 COLORREF WINAPI extSetBkColor(HDC hdc, COLORREF crColor)
 {

dll/user32.cpp

@@ -24,6 +24,14 @@ BOOL IsChangeDisplaySettingsHotPatched = FALSE;
 //EnumDisplayMonitors_Type pEnumDisplayMonitors = NULL;
 //BOOL WINAPI extEnumDisplayMonitors(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
 
+#ifdef TRACEPALETTE
+typedef UINT (WINAPI *GetDIBColorTable_Type)(HDC, UINT, UINT, RGBQUAD *);
+GetDIBColorTable_Type pGetDIBColorTable = NULL;
+UINT WINAPI extGetDIBColorTable(HDC, UINT, UINT, RGBQUAD *);
+typedef UINT (WINAPI *SetDIBColorTable_Type)(HDC, UINT, UINT, const RGBQUAD *);
+SetDIBColorTable_Type pSetDIBColorTable = NULL;
+UINT WINAPI extSetDIBColorTable(HDC, UINT, UINT, const RGBQUAD *);
+#endif
 
 static HookEntry_Type Hooks[]={
 	{HOOK_IAT_CANDIDATE, "UpdateWindow", (FARPROC)NULL, (FARPROC *)&pUpdateWindow, (FARPROC)extUpdateWindow},
@@ -66,7 +74,10 @@ static HookEntry_Type Hooks[]={
 	//{HOOK_HOT_CANDIDATE, "GetForegroundWindow", (FARPROC)GetForegroundWindow, (FARPROC *)&pGetForegroundWindow, (FARPROC)extGetForegroundWindow},
 	//{HOOK_IAT_CANDIDATE, "GetWindowTextA", (FARPROC)GetWindowTextA, (FARPROC *)&pGetWindowTextA, (FARPROC)extGetWindowTextA},
 	//{HOOK_HOT_CANDIDATE, "EnumDisplayMonitors", (FARPROC)EnumDisplayMonitors, (FARPROC *)&pEnumDisplayMonitors, (FARPROC)extEnumDisplayMonitors},
-
+#ifdef TRACEPALETTE
+	{HOOK_HOT_CANDIDATE, "GetDIBColorTable", (FARPROC)GetDIBColorTable, (FARPROC *)&pGetDIBColorTable, (FARPROC)extGetDIBColorTable},
+	{HOOK_HOT_CANDIDATE, "SetDIBColorTable", (FARPROC)SetDIBColorTable, (FARPROC *)&pSetDIBColorTable, (FARPROC)extSetDIBColorTable},
+#endif
 	{HOOK_IAT_CANDIDATE, 0, NULL, 0, 0} // terminator
 };
 
@@ -2833,6 +2844,64 @@ int WINAPI extGetUpdateRgn(HWND hWnd, HRGN hRgn, BOOL bErase)
     return regionType; 
 }
 
+#ifdef TRACEPALETTE
+UINT WINAPI extGetDIBColorTable(HDC hdc, UINT uStartIndex, UINT cEntries, RGBQUAD *pColors)
+{
+	UINT ret;
+	OutTraceDW("GetDIBColorTable: hdc=%x start=%d entries=%d\n", hdc, uStartIndex, cEntries);
+
+	//if((OBJ_DC == GetObjectType(hdc)) && (dxw.dwFlags1 & EMULATESURFACE)){
+	//	//extern PALETTEENTRY PalEntries[256];
+	//	extern DWORD *PaletteEntries;
+	//	if((uStartIndex+cEntries) > 256) cEntries = 256 - uStartIndex;
+	//	for(UINT i=0; i<cEntries; i++) {
+	//		PALETTEENTRY p;
+	//		memcpy(&p, &PaletteEntries[i+uStartIndex], sizeof(DWORD));
+	//		pColors[i].rgbBlue = p.peBlue;
+	//		pColors[i].rgbGreen = p.peGreen;
+	//		pColors[i].rgbRed = p.peRed;
+	//		pColors[i].rgbReserved = p.peFlags;
+	//	}
+	//	ret=cEntries;
+	//}
+	//else
+	//	ret = (*pGetDIBColorTable)(hdc, uStartIndex, cEntries, pColors);
+
+	ret = (*pGetDIBColorTable)(hdc, uStartIndex, cEntries, pColors);
+	OutTraceDW("GetDIBColorTable: ret=%x\n", ret);
+	if(IsDebug) dxw.DumpPalette(cEntries, (PALETTEENTRY *)pColors);
+	return ret;
+}
+
+UINT WINAPI extSetDIBColorTable(HDC hdc, UINT uStartIndex, UINT cEntries, const RGBQUAD *pColors)
+{
+	UINT ret;
+	OutTraceDW("SetDIBColorTable: hdc=%x start=%d entries=%d\n", hdc, uStartIndex, cEntries);
+	if(IsDebug) dxw.DumpPalette(cEntries, (PALETTEENTRY *)pColors);
+
+	//if((OBJ_DC == GetObjectType(hdc)) && (dxw.dwFlags1 & EMULATESURFACE)){
+	//	//extern PALETTEENTRY PalEntries[256];
+	//	extern DWORD *PaletteEntries;
+	//	if((uStartIndex+cEntries) > 256) cEntries = 256 - uStartIndex;
+	//	for(UINT i=0; i<cEntries; i++) {
+	//		PALETTEENTRY p;
+	//		memcpy(&p, &PaletteEntries[i+uStartIndex], sizeof(DWORD));
+	//		pColors[i].rgbBlue = p.peBlue;
+	//		pColors[i].rgbGreen = p.peGreen;
+	//		pColors[i].rgbRed = p.peRed;
+	//		pColors[i].rgbReserved = p.peFlags;
+	//	}
+	//	ret=cEntries;
+	//}
+	//else
+	//	ret = (*pSetDIBColorTable)(hdc, uStartIndex, cEntries, pColors);
+	
+	ret = (*pSetDIBColorTable)(hdc, uStartIndex, cEntries, pColors);
+	OutTraceDW("SetDIBColorTable: ret=%x\n", ret);
+	return ret;
+}
+#endif
+
 #ifdef NOUNHOOKED
 BOOL WINAPI extValidateRect(HWND hWnd, const RECT *lpRect)
 {

host/TabProgram.cpp

@@ -77,9 +77,11 @@ void CTabProgram::OnOpen()
         "Program (*.exe)|*.exe|All Files (*.*)|*.*||",  this);
 	if( dlg.DoModal() == IDOK) {
 		cTarget->m_File.SetWindowText(dlg.GetPathName());
-		strcpy(path, dlg.GetPathName());
+		if(GetPrivateProfileInt("window", "updatepaths", 1, gInitFilePath)){
-		GetFolderFromPath(path);
+			strcpy(path, dlg.GetPathName());
-		WritePrivateProfileString("window", "exepath", path, gInitFilePath);
+			GetFolderFromPath(path);
+			WritePrivateProfileString("window", "exepath", path, gInitFilePath);
+		}
 	}
 }
 
@@ -95,9 +97,11 @@ void CTabProgram::OnOpenLaunch()
         "Program (*.exe)|*.exe|All Files (*.*)|*.*||",  this);
 	if( dlg.DoModal() == IDOK) {
 		cTarget->m_Launch.SetWindowText(dlg.GetPathName());
-		strcpy(path, dlg.GetPathName());
+		if(GetPrivateProfileInt("window", "updatepaths", 1, gInitFilePath)){
-		GetFolderFromPath(path);
+			strcpy(path, dlg.GetPathName());
-		WritePrivateProfileString("window", "exepath", path, gInitFilePath);
+			GetFolderFromPath(path);
+			WritePrivateProfileString("window", "exepath", path, gInitFilePath);
+		}
 	}
 }
 

host/TabWindow.cpp

@@ -54,6 +54,7 @@ void CTabWindow::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_BLACKWHITE, cTarget->m_BlackWhite);
 	DDX_Check(pDX, IDC_USERGB565, cTarget->m_UseRGB565);
 	DDX_Check(pDX, IDC_LOCKSYSCOLORS, cTarget->m_LockSysColors);
+	DDX_Check(pDX, IDC_LOCKRESERVEDPALETTE, cTarget->m_LockReservedPalette);
 	DDX_Check(pDX, IDC_COLORFIX, cTarget->m_ColorFix);
 
 	// screen resolution management

host/TargetDlg.cpp

@@ -30,6 +30,7 @@ CTargetDlg::CTargetDlg(CWnd* pParent /*=NULL*/)
 	m_ModifyMouse = TRUE; // default true !!
 	m_OutProxyTrace = FALSE;
 	m_OutDebug = FALSE;
+	m_RegistryOp = FALSE;
 	m_CursorTrace = FALSE;
 	m_OutWinMessages = FALSE;
 	m_OutDWTrace = FALSE;
@@ -55,6 +56,7 @@ CTargetDlg::CTargetDlg(CWnd* pParent /*=NULL*/)
 	//m_SuppressChild = FALSE;
 	m_HideDesktop = FALSE;
 	m_LockSysColors = FALSE;
+	m_LockReservedPalette = FALSE;
 	m_ForceYUVtoRGB = FALSE;
 	m_ForceRGBtoYUV = FALSE;
 	m_LimitScreenRes = FALSE;

host/TargetDlg.h

@@ -178,6 +178,7 @@ public:
 	//BOOL	m_SuppressChild;
 	BOOL	m_HideDesktop;
 	BOOL	m_LockSysColors;
+	BOOL	m_LockReservedPalette;
 	BOOL	m_SingleProcAffinity;
 	BOOL	m_WireFrame;
 	BOOL	m_NoTextures;

host/dxwndhost.vs2008.vcproj

@@ -315,6 +315,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\findwindow.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\getfname.cpp"
 				>

host/dxwndhostView.cpp

@@ -100,6 +100,9 @@ BEGIN_MESSAGE_MAP(CDxwndhostView, CListView)
 	ON_COMMAND(ID_TASK_KILL, OnKill)
 	ON_COMMAND(ID_TASK_PAUSE, OnPause)
 	ON_COMMAND(ID_TASK_RESUME, OnResume)
+	ON_COMMAND(ID_WINDOW_MINIMIZE, OnWindowMinimize)
+	ON_COMMAND(ID_WINDOW_RESTORE, OnWindowRestore)
+	ON_COMMAND(ID_WINDOW_CLOSE, OnWindowClose)
 	ON_COMMAND(ID_ADD, OnAdd)
 	ON_COMMAND(ID_MODIFY, OnModify)
 	ON_COMMAND(ID_PEXPORT, OnExport)
@@ -279,6 +282,7 @@ static void SetTargetFromDlg(TARGETMAP *t, CTargetDlg *dlg)
 	//if(dlg->m_SuppressChild) t->flags4 |= SUPPRESSCHILD;
 	if(dlg->m_HideDesktop) t->flags4 |= HIDEDESKTOP;
 	if(dlg->m_LockSysColors) t->flags3 |= LOCKSYSCOLORS;
+	if(dlg->m_LockReservedPalette) t->flags5 |= LOCKRESERVEDPALETTE;
 	if(dlg->m_ForceYUVtoRGB) t->flags3 |= YUV2RGB;
 	if(dlg->m_ForceRGBtoYUV) t->flags3 |= RGB2YUV;
 	if(dlg->m_LimitScreenRes) t->flags4 |= LIMITSCREENRES;
@@ -475,6 +479,7 @@ static void SetDlgFromTarget(TARGETMAP *t, CTargetDlg *dlg)
 	//dlg->m_SuppressChild = t->flags4 & SUPPRESSCHILD ? 1 : 0;
 	dlg->m_HideDesktop = t->flags4 & HIDEDESKTOP ? 1 : 0;
 	dlg->m_LockSysColors = t->flags3 & LOCKSYSCOLORS ? 1 : 0;
+	dlg->m_LockReservedPalette = t->flags5 & LOCKRESERVEDPALETTE ? 1 : 0;
 	dlg->m_ForceRGBtoYUV = t->flags3 & RGB2YUV ? 1 : 0;
 	dlg->m_ForceYUVtoRGB = t->flags3 & YUV2RGB ? 1 : 0;
 	dlg->m_LimitScreenRes = t->flags4 & LIMITSCREENRES ? 1 : 0;
@@ -977,7 +982,7 @@ void CDxwndhostView::OnExport()
 	if(!listctrl.GetSelectedCount()) return;
 	pos = listctrl.GetFirstSelectedItemPosition();
 	i = listctrl.GetNextSelectedItem(pos);
-	GetPrivateProfileString("window", "exportpath", ".\\", path, MAX_PATH, InitPath);
+	GetPrivateProfileString("window", "exportpath", NULL, path, MAX_PATH, InitPath);
 	//strcat_s(path, MAX_PATH, "\\");
 	strcat_s(path, MAX_PATH, TitleMaps[i].title);
 	CFileDialog dlg( FALSE, "*.dxw", path, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
@@ -986,9 +991,10 @@ void CDxwndhostView::OnExport()
 		strcpy(path, dlg.GetPathName().GetBuffer());
 		//MessageBox(path, "PathName", MB_OK);
 		SaveConfigItem(&TargetMaps[i], &TitleMaps[i], 0, path);
-		GetFolderFromPath(path);
+		if(GetPrivateProfileInt("window", "updatepaths", 1, InitPath)) {
-		//MessageBox(path, "FolderPath", MB_OK);
+			GetFolderFromPath(path);
-		WritePrivateProfileString("window", "exportpath", path, InitPath);
+			WritePrivateProfileString("window", "exportpath", path, InitPath);
+		}
 	}
 }
 
@@ -1010,7 +1016,7 @@ void CDxwndhostView::OnImport()
 	char folder[MAX_PATH+1];
 	char pathname[MAX_PATH+1];
 	OPENFILENAME ofn = {0};
-	GetPrivateProfileString("window", "exportpath", ".", pathname, MAX_PATH, InitPath);
+	GetPrivateProfileString("window", "exportpath", NULL, pathname, MAX_PATH, InitPath);
 	ofn.lpstrInitialDir = pathname;
 	ofn.lStructSize = sizeof(ofn);
 	ofn.lpstrFilter = "DxWnd export file\0*.dxw\0\0";
@@ -1030,8 +1036,10 @@ void CDxwndhostView::OnImport()
 				listitem.iImage = SetTargetIcon(TargetMaps[i]);
 				listitem.pszText = TitleMaps[i].title;
 				listctrl.InsertItem(&listitem);
-				GetFolderFromPath(ImportExportPath);
+				if(GetPrivateProfileInt("window", "updatepaths", 1, InitPath)) {
-				WritePrivateProfileString("window", "exportpath", ImportExportPath, InitPath);
+					GetFolderFromPath(ImportExportPath);
+					WritePrivateProfileString("window", "exportpath", ImportExportPath, InitPath);
+				}
 			}
 		}
 		else{
@@ -1039,7 +1047,8 @@ void CDxwndhostView::OnImport()
 			char* p = ImportExportPath;
 			strcpy(folder, p);
 			strcat(folder, "\\");
-			WritePrivateProfileString("window", "exportpath", folder, InitPath);
+			if(GetPrivateProfileInt("window", "updatepaths", 1, InitPath)) 
+				WritePrivateProfileString("window", "exportpath", folder, InitPath);
 			p += lstrlen((LPSTR)p) + 1;
 			while(*p && (i<MAXTARGETS)){
 				// "p" - name of each file, NULL to terminate
@@ -1325,6 +1334,32 @@ void CDxwndhostView::OnResume()
 	}
 }
 
+extern HWND find_main_window(unsigned long);
+
+void CDxwndhostView::OnWindowMinimize() 
+{
+	DXWNDSTATUS DxWndStatus;
+	if ((GetHookStatus(&DxWndStatus) == DXW_RUNNING) && (DxWndStatus.hWnd!=NULL))
+		//::PostMessage(DxWndStatus.hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
+		::PostMessage(find_main_window(DxWndStatus.dwPid), WM_SYSCOMMAND, SC_MINIMIZE, 0);
+}
+
+void CDxwndhostView::OnWindowRestore() 
+{
+	DXWNDSTATUS DxWndStatus;
+	if ((GetHookStatus(&DxWndStatus) == DXW_RUNNING) && (DxWndStatus.hWnd!=NULL))
+		//::PostMessage(DxWndStatus.hWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
+		::PostMessage(find_main_window(DxWndStatus.dwPid), WM_SYSCOMMAND, SC_RESTORE, 0);
+}
+
+void CDxwndhostView::OnWindowClose() 
+{
+	DXWNDSTATUS DxWndStatus;
+	if ((GetHookStatus(&DxWndStatus) == DXW_RUNNING) && (DxWndStatus.hWnd!=NULL))
+		//::PostMessage(DxWndStatus.hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
+		::PostMessage(find_main_window(DxWndStatus.dwPid), WM_SYSCOMMAND, SC_CLOSE, 0);
+}
+
 void CDxwndhostView::OnKill() 
 {
 	CTargetDlg dlg;
@@ -1388,17 +1423,6 @@ void CDxwndhostView::OnProcessKill()
 	ClipCursor(NULL);
 	RevertScreenChanges(&this->InitDevMode);
 }
-	//GetPrivateProfileString("window", "exportpath", ".", path, MAX_PATH, InitPath);
-	//strcat_s(path, MAX_PATH, "\\");
-	//strcat_s(path, MAX_PATH, TitleMaps[i].title);
-	//CFileDialog dlg( FALSE, "*.dxw", path, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
- //       "dxwnd task config (*.dxw)|*.dxw|All Files (*.*)|*.*||",  this);
-	//if( dlg.DoModal() == IDOK) {
-	//	SaveConfigItem(&TargetMaps[i], &TitleMaps[i], 0, dlg.GetPathName().GetBuffer());
-	//	WritePrivateProfileString("window", "exportpath", dlg.GetFolderPath(), InitPath);
-	//}
-
-
 
 void CDxwndhostView::OnAdd() 
 {

host/dxwndhostView.h

@@ -70,6 +70,9 @@ protected:
 	afx_msg void OnProcessKill();
 	afx_msg void OnPause();
 	afx_msg void OnResume();
+	afx_msg void OnWindowRestore();
+	afx_msg void OnWindowMinimize();
+	afx_msg void OnWindowClose();
 	afx_msg void OnSort();
 	afx_msg void OnViewLog();
 	afx_msg void OnDeleteLog();

host/findwindow.cpp

@@ -0,0 +1,34 @@
+#include <windows.h>
+#include "stdafx.h"
+
+struct handle_data {
+    unsigned long process_id;
+    HWND best_handle;
+};
+
+static BOOL is_main_window(HWND handle)
+{   
+    return GetWindow(handle, GW_OWNER) == (HWND)0 && IsWindowVisible(handle);
+}
+
+
+static BOOL CALLBACK enum_windows_callback(HWND handle, LPARAM lParam)
+{
+    handle_data& data = *(handle_data*)lParam;
+    unsigned long process_id = 0;
+    GetWindowThreadProcessId(handle, &process_id);
+    if (data.process_id != process_id || !is_main_window(handle)) {
+        return TRUE;
+    }
+    data.best_handle = handle;
+    return FALSE;   
+}
+
+HWND find_main_window(unsigned long process_id)
+{
+    handle_data data;
+    data.process_id = process_id;
+    data.best_handle = 0;
+    EnumWindows(enum_windows_callback, (LPARAM)&data);
+    return data.best_handle;
+}