From 1a522bb76bd9fc9867c892226de4ff456e048568 Mon Sep 17 00:00:00 2001
From: gho tik <ghotik2002@yahoo.com>
Date: Fri, 7 Oct 2016 12:46:22 -0400
Subject: [PATCH] v2_03_75_src

Former-commit-id: a616cd9c318d40393233f30c84c4587aacefb377
---
 build/dxwnd.dll              |   4 +--
 build/dxwnd.exe              |   4 +--
 build/readme-relnotes.txt    |  11 ++++++-
 dll/ddraw.cpp                |  45 ++++++++++++++++++++------
 dll/dxwnd.cpp                |   2 +-
 dll/dxwnd.vs2008.suo         | Bin 814592 -> 814592 bytes
 dll/gdi32.cpp                |   4 +++
 dll/user32.cpp               |  52 ++++++++++++++++++++++++++++--
 host/CDragEdit.cpp           |  35 ++++++++++++++++++++
 host/CDragEdit.h             |  13 ++++++++
 host/TabProgram.cpp          |  33 ++++++++++++++++++-
 host/TabProgram.h            |   1 +
 host/TargetDlg.h             |   5 +--
 host/dxwndhost.rc            | Bin 126068 -> 126072 bytes
 host/dxwndhost.vs2008.suo    | Bin 236544 -> 236544 bytes
 host/dxwndhost.vs2008.vcproj |  18 ++++++++---
 host/dxwndhostView.cpp       |  60 ++++++++++++++++++++++++++++++++++-
 host/dxwndhostView.h         |   4 +++
 18 files changed, 263 insertions(+), 28 deletions(-)
 create mode 100644 host/CDragEdit.cpp
 create mode 100644 host/CDragEdit.h

diff --git a/build/dxwnd.dll b/build/dxwnd.dll
index f16fa96..51a40a3 100644
--- a/build/dxwnd.dll
+++ b/build/dxwnd.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49d7c2658bf62db9650233f60f2cf5dd82912f2a522c26d4c115891440ccabd9
-size 659968
+oid sha256:7fd28d3540f74ceab1034bff9cd6fd4059e759568c2c207393d61fe20f0367da
+size 660480
diff --git a/build/dxwnd.exe b/build/dxwnd.exe
index 275e23a..5b71e95 100644
--- a/build/dxwnd.exe
+++ b/build/dxwnd.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c966fe71e5250ed781b9e1415ce53fec601a93c4384893a2afb78bab76d75e56
-size 640512
+oid sha256:b4833fd88b00f606494df68b4af21d27e5f419a90686cb407e0539166dea762e
+size 642560
diff --git a/build/readme-relnotes.txt b/build/readme-relnotes.txt
index 91bdde8..a2a517c 100644
--- a/build/readme-relnotes.txt
+++ b/build/readme-relnotes.txt
@@ -1146,4 +1146,13 @@ add: revised log configuration, added "Separate" mode to make each process to wr
 v2.03.74
 fix: logging of dwFOURCC field text value
 fix: Injection routine: avoid closing a few handles that should not be closed, simplified logic.
-add: GUI global configuration panel
\ No newline at end of file
+add: GUI global configuration panel
+
+v2.03.75
+fix: handling of restore previous screen mode when a primary fullscreen window is terminated. Fixes "Dethkarz" initialization error after 8BPP intro movie termination.
+fix: SystemParameterInfo for SPI_SETSCREENSAVERRUNNING does not return an error
+fix: added default pixel format specification to backbuffer: improves the possibility of ZBUFFER attach
+fix: recovery of DDERR_SURFACELOST error on primary surface in PrimaryStretchBlt routine. 
+fix: possible palette handle leakage 
+fix: DC leakage caused by CreateCompatibleDC. Fix "Mechwarrior 3" repeated play sessions.
+add: GUI drag & drop of game executables
\ No newline at end of file
diff --git a/dll/ddraw.cpp b/dll/ddraw.cpp
index 0cd05af..98909f8 100644
--- a/dll/ddraw.cpp
+++ b/dll/ddraw.cpp
@@ -2659,6 +2659,10 @@ static HRESULT BuildBackBufferEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateS
 	ddsd.dwFlags &= ~(DDSD_BACKBUFFERCOUNT|DDSD_REFRESHRATE);
 	ddsd.dwFlags |= (DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT);
 	ddsd.ddsCaps.dwCaps &= ~(DDSCAPS_BACKBUFFER|DDSCAPS_PRIMARYSURFACE|DDSCAPS_FLIP|DDSCAPS_COMPLEX|DDSCAPS_VIDEOMEMORY|DDSCAPS_LOCALVIDMEM);
+
+	// v2.03.75: if a surface desc is NOT specified, build one. This will allow ZBUF attach.
+	if(!(lpddsd->dwFlags & DDSD_PIXELFORMAT)) SetPixFmt((LPDDSURFACEDESC2)&ddsd);
+
 	// DDSCAPS_OFFSCREENPLAIN seems required to support the palette in memory surfaces
 	ddsd.ddsCaps.dwCaps |= (DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN);
 	if(ddsd.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) ddsd.ddsCaps.dwCaps &= ~DDSCAPS_SYSTEMMEMORY; // necessary: Martian Gotic crashes otherwise
@@ -3426,14 +3430,27 @@ HRESULT WINAPI PrimaryStretchBlt(int dxversion, Blt_Type pBlt, LPDIRECTDRAWSURFA
 		OutTraceE("PrimaryStretchBlt: Blt ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
 	}
 	else {
-		// fast-blit to primary
-		if(dxw.dwFlags3 & FORCECLIPPER){
-			res= (*pBlt)(lpdds, lpdestrect, lpddsTmp, &TmpRect, DDBLT_WAIT, 0);
-			if(res) OutTraceE("PrimaryStretchBlt: Blt ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
-		}
-		else{
-			res= (*pBltFast)(lpdds, lpdestrect->left, lpdestrect->top, lpddsTmp, &TmpRect, DDBLTFAST_WAIT);
-			if(res) OutTraceE("PrimaryStretchBlt: BltFast ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
+		while(TRUE) {
+			// fast-blit to primary
+			if(dxw.dwFlags3 & FORCECLIPPER){
+				res= (*pBlt)(lpdds, lpdestrect, lpddsTmp, &TmpRect, DDBLT_WAIT, 0);
+				if(res) OutTraceE("PrimaryStretchBlt: Blt ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
+			}
+			else{
+				res= (*pBltFast)(lpdds, lpdestrect->left, lpdestrect->top, lpddsTmp, &TmpRect, DDBLTFAST_WAIT);
+				if(res) OutTraceE("PrimaryStretchBlt: BltFast ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
+			}
+			if(res == DDERR_SURFACELOST){
+				res = lpdds->Restore();
+				if(res) {
+					OutTraceE("PrimaryStretchBlt: Restore ERROR %x(%s) at %d\n", res, ExplainDDError(res), __LINE__);
+				}
+				else {
+					OutTraceDW("PrimaryStretchBlt: surface sucessfully recovered, retry\n"); 
+					continue;
+				}
+			}
+			break;
 		}
 	}
 	(*pReleaseSMethod(dxversion))(lpddsTmp);
@@ -5522,8 +5539,16 @@ HRESULT WINAPI extReleaseP(LPDIRECTDRAWPALETTE lpddPalette)
 	OutTraceDDRAW("Release(P): lpddPalette=%x ref=%x\n", lpddPalette, ref);
 
 	if (lpddPalette == lpDDP) {
-		OutTraceDW("Release(P): lpDDP extrarefcount=%d\n", iDDPExtraRefCounter);
-		ref -= iDDPExtraRefCounter;
+		if(dxw.dwFlags4 & FIXREFCOUNTER) {
+			OutTraceDW("Release(P): lpDDP extrarefcount=%d\n", iDDPExtraRefCounter);
+			if((ULONG)iDDPExtraRefCounter >= ref){
+				while(ref) ref = (*pReleaseP)(lpddPalette);
+				lpDDP=NULL;
+				iDDPExtraRefCounter = 0;
+				return 0;
+			}
+			ref -= iDDPExtraRefCounter;
+		}
 		if (ref <= 0) {
 			ref = 0;
 			OutTraceDW("Release(P): clearing lpDDP=%x->NULL\n", lpDDP);
diff --git a/dll/dxwnd.cpp b/dll/dxwnd.cpp
index d8d9631..ace19f4 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.74"
+#define VERSION "2.03.75"
 
 #define DDTHREADLOCK 1
 //#define LOCKTHREADS
diff --git a/dll/dxwnd.vs2008.suo b/dll/dxwnd.vs2008.suo
index b035987adf9a347d411215de99b82a296f256d99..fe9277578515f937d78a2970a069653238383c1d 100644
GIT binary patch
delta 11441
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
GzJCGisuVf^

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

diff --git a/dll/gdi32.cpp b/dll/gdi32.cpp
index 7362d22..7867f9a 100644
--- a/dll/gdi32.cpp
+++ b/dll/gdi32.cpp
@@ -921,12 +921,15 @@ HDC WINAPI extCreateICA(LPCTSTR lpszDriver, LPCTSTR lpszDevice, LPCTSTR lpszOutp
 
 HDC WINAPI extGDICreateCompatibleDC(HDC hdc)
 {
+	// v2.03.75: fixed dc leakage that crashed "Mechwarrior 3"
 	HDC RetHdc;
 	DWORD LastError;
+	BOOL bSwitchedToMainWin = FALSE;
 
 	OutTraceDW("GDI.CreateCompatibleDC: hdc=%x\n", hdc);
 	if(hdc==0){
 		hdc=(*pGDIGetDC)(dxw.GethWnd());
+		bSwitchedToMainWin = TRUE;
 		if(dxw.dwFlags6 & CREATEDESKTOP){
 			extern HWND hDesktopWindow;
 			hdc=(*pGDIGetDC)(hDesktopWindow);
@@ -937,6 +940,7 @@ HDC WINAPI extGDICreateCompatibleDC(HDC hdc)
 	// eliminated error message for errorcode 0.
 	SetLastError(0);
 	RetHdc=(*pGDICreateCompatibleDC)(hdc);
+	if(bSwitchedToMainWin) (*pGDIReleaseDC)(dxw.GethWnd(),hdc);
 	LastError=GetLastError();
 	if(LastError == 0){
 		OutTraceDW("GDI.CreateCompatibleDC: returning HDC=%x\n", RetHdc);
diff --git a/dll/user32.cpp b/dll/user32.cpp
index e2d3ff6..2e34e3d 100644
--- a/dll/user32.cpp
+++ b/dll/user32.cpp
@@ -108,6 +108,9 @@ BOOL WINAPI extDrawMenuBar(HWND);
 //typedef BOOL (WINAPI *TranslateMessage_Type)(MSG *);
 //TranslateMessage_Type pTranslateMessage = NULL;
 //BOOL WINAPI extTranslateMessage(MSG *);
+typedef BOOL (WINAPI *EnumDisplayDevicesA_Type)(LPCSTR, DWORD, PDISPLAY_DEVICE, DWORD);
+EnumDisplayDevicesA_Type pEnumDisplayDevicesA = NULL;
+BOOL WINAPI extEnumDisplayDevicesA(LPCSTR, DWORD, PDISPLAY_DEVICE, DWORD);
 
 
 #ifdef TRACEPALETTE
@@ -200,6 +203,8 @@ static HookEntryEx_Type Hooks[]={
 	{HOOK_HOT_CANDIDATE, 0, "ShowScrollBar", (FARPROC)ShowScrollBar, (FARPROC *)&pShowScrollBar, (FARPROC)extShowScrollBar},
 	{HOOK_HOT_CANDIDATE, 0, "DrawMenuBar", (FARPROC)DrawMenuBar, (FARPROC *)&pDrawMenuBar, (FARPROC)extDrawMenuBar},
 
+	//{HOOK_HOT_CANDIDATE, 0, "EnumDisplayDevicesA", (FARPROC)EnumDisplayDevicesA, (FARPROC *)&pEnumDisplayDevicesA, (FARPROC)extEnumDisplayDevicesA},
+	
 	{HOOK_IAT_CANDIDATE, 0, 0, NULL, 0, 0} // terminator
 };
 
@@ -1466,6 +1471,9 @@ static BOOL IsFullscreenWindow(
 	return FALSE;
 }
 
+static HWND hLastFullScrWin = 0;
+static DDPIXELFORMAT ddpLastPixelFormat;
+
 static HWND WINAPI extCreateWindowCommon(
   LPCTSTR ApiName,
   BOOL WideChar,
@@ -1529,6 +1537,12 @@ static HWND WINAPI extCreateWindowCommon(
 		RECT screen;
 		POINT upleft = {0,0};
 
+		// if already in fullscreen mode, save previous settings
+		if(dxw.IsFullScreen() && dxw.GethWnd()){
+			hLastFullScrWin = dxw.GethWnd();
+			ddpLastPixelFormat = dxw.VirtualPixelFormat;
+		}
+
 		// update virtual screen size if it has grown 
 		// v2.03.58 fix: do't consider CW_USEDEFAULT ad a big unsigned integer!! Fixes "Imperialism".
 		if((nWidth != CW_USEDEFAULT) && (nHeight != CW_USEDEFAULT)) dxw.SetScreenSize(nWidth, nHeight);
@@ -2648,12 +2662,25 @@ BOOL WINAPI extDestroyWindow(HWND hWnd)
 
 	OutTraceB("DestroyWindow: hwnd=%x\n", hWnd);
 	if (hWnd == dxw.GethWnd()) {
+		OutTraceDW("DestroyWindow: destroy main hwnd=%x\n", hWnd);
+		if(hLastFullScrWin){
+			OutTraceDW("DestroyWindow: revert to main hwnd=%x bpp=%d\n", 
+				hWnd, ddpLastPixelFormat.dwRGBBitCount);
+			dxw.SethWnd(hLastFullScrWin);
+			hLastFullScrWin = NULL;
+			dxw.VirtualPixelFormat = ddpLastPixelFormat;
+			extern int iBakBufferVersion;
+			SetBltTransformations(iBakBufferVersion);
+		}
+		else {
+			OutTraceDW("DestroyWindow: destroy main hwnd=%x\n", hWnd);
+			dxw.SethWnd(NULL);
+		}
+
 		if(dxw.dwFlags6 & NODESTROYWINDOW) {
 			OutTraceDW("DestroyWindow: do NOT destroy main hwnd=%x\n", hWnd);
 			return TRUE;
 		}
-		OutTraceDW("DestroyWindow: destroy main hwnd=%x\n", hWnd);
-		dxw.SethWnd(NULL);
 	}
 	if (hControlParentWnd && (hWnd == hControlParentWnd)) {
 		OutTraceDW("DestroyWindow: destroy control parent hwnd=%x\n", hWnd);
@@ -3049,6 +3076,7 @@ BOOL WINAPI extSystemParametersInfoA(UINT uiAction, UINT uiParam, PVOID pvParam,
 	switch(uiAction){
 		case SPI_SETKEYBOARDDELAY:
 		case SPI_SETKEYBOARDSPEED:
+		case SPI_SETSCREENSAVERRUNNING: // v2.03.75 used by Dethkarz, but not really necessary
 			OutTraceDW("SystemParametersInfoA: bypass action=%x\n", uiAction);
 			return TRUE;
 			break;
@@ -3722,4 +3750,22 @@ BOOL WINAPI extTranslateMessage(MSG *pMsg)
 	ret=(*pTranslateMessage)(pMsg);
 	return ret;
 }
-#endif
\ No newline at end of file
+#endif
+
+BOOL WINAPI extEnumDisplayDevicesA(LPCSTR lpDevice, DWORD iDevNum, PDISPLAY_DEVICE lpDisplayDevice, DWORD dwFlags)
+{
+	BOOL ret;
+	MessageBox(0, "EnumDisplayDevicesA", "dxwnd", 0);
+	OutTrace("EnumDisplayDevices: device=%s devnum=%i flags=%x\n", lpDevice, iDevNum, dwFlags);
+
+	ret = (*pEnumDisplayDevicesA)(lpDevice, iDevNum, lpDisplayDevice, dwFlags);
+
+	if(ret){
+		OutTrace("EnumDisplayDevices: cb=%x devname=%s devstring=%s stateflags=%x\n", 
+			lpDisplayDevice->cb, lpDisplayDevice->DeviceName, lpDisplayDevice->DeviceString, lpDisplayDevice->StateFlags);
+	}
+	else{
+		OutTraceE("EnumDisplayDevices ERROR: err=%d\n", GetLastError());
+	}
+	return ret;
+}
diff --git a/host/CDragEdit.cpp b/host/CDragEdit.cpp
new file mode 100644
index 0000000..63953c4
--- /dev/null
+++ b/host/CDragEdit.cpp
@@ -0,0 +1,35 @@
+#include "stdafx.h"
+#include "CDragEdit.h"
+
+CDragEdit::CDragEdit()
+{
+}
+
+CDragEdit::~CDragEdit()
+{
+}
+
+BOOL CDragEdit::OnInitDialog()
+{
+	DragAcceptFiles();
+	return TRUE;
+}
+
+void CDragEdit::OnDropFiles(HDROP dropInfo)
+{
+	CString sFile;
+	DWORD nBuffer = 0;
+	// Get number of files
+	UINT nFilesDropped = DragQueryFile(dropInfo, 0xFFFFFFFF, NULL, 0);
+	if(nFilesDropped > 0){
+		nBuffer = DragQueryFile(dropInfo, 0, NULL, 0);
+		DragQueryFile(dropInfo, 0, sFile.GetBuffer(nBuffer+1), nBuffer+1);
+		SetWindowTextA(sFile.GetBuffer());
+		sFile.ReleaseBuffer();
+	}
+	DragFinish(dropInfo);
+}
+
+BEGIN_MESSAGE_MAP(CDragEdit, CEdit)
+	ON_WM_DROPFILES()
+END_MESSAGE_MAP()
diff --git a/host/CDragEdit.h b/host/CDragEdit.h
new file mode 100644
index 0000000..9d7aee3
--- /dev/null
+++ b/host/CDragEdit.h
@@ -0,0 +1,13 @@
+// CDragEdit class: inherited by DEdit, adds drag & drop of file pathnames 
+// within the text field.
+
+class CDragEdit : public CEdit
+{
+public:
+	CDragEdit();
+	virtual ~CDragEdit();
+	BOOL OnInitDialog();
+private:
+	afx_msg void OnDropFiles(HDROP hDropInfo);
+	DECLARE_MESSAGE_MAP()
+};
diff --git a/host/TabProgram.cpp b/host/TabProgram.cpp
index 0cce3dd..8582597 100644
--- a/host/TabProgram.cpp
+++ b/host/TabProgram.cpp
@@ -66,9 +66,10 @@ void CTabProgram::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(CTabProgram, CDialog)
 	//{{AFX_MSG_MAP(CTabProgram)
-		// NOTE: the ClassWizard will add message map macros here
+	// NOTE: the ClassWizard will add message map macros here
 	ON_BN_CLICKED(IDC_OPEN, OnOpen)
 	ON_BN_CLICKED(IDC_OPENLAUNCH, OnOpenLaunch)
+	ON_WM_DROPFILES()
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -150,6 +151,25 @@ void CTabProgram::OnOpenLaunch()
 	}
 }
 
+void CTabProgram::OnDropFiles(HDROP dropInfo)
+{
+	CString sFile;
+	DWORD nBuffer = 0;
+	// Get number of files
+	UINT nFilesDropped = DragQueryFile(dropInfo, 0xFFFFFFFF, NULL, 0);
+	if(nFilesDropped > 0){
+		nBuffer = DragQueryFile(dropInfo, 0, NULL, 0);
+		DragQueryFile(dropInfo, 0, sFile.GetBuffer(nBuffer+1), nBuffer+1);
+		//CTargetDlg *pDlg = (CTargetDlg *)this->GetParent()->GetParent();
+		//pDlg->m_FilePath = sFile;
+		CDragEdit *pEditFile = (CDragEdit *)this->GetDlgItem(IDC_FILE);
+		pEditFile->SetWindowTextA(sFile.GetBuffer());
+		//MessageBox(sFile.GetBuffer(), "debug", 0);
+		sFile.ReleaseBuffer();
+	}
+	DragFinish(dropInfo);
+}
+
 BOOL CTabProgram::OnInitDialog()
 {
 	HINSTANCE Hinst;
@@ -157,6 +177,17 @@ BOOL CTabProgram::OnInitDialog()
 	CStatic *IconBox;
 	IFormat *m_pRelIntegerFormat = new(RelIntegerFormat);
 
+	//ChangeWindowMessageFilter(WM_DROPFILES, MSGFLT_ADD);
+	//ChangeWindowMessageFilter(WM_COPYDATA, MSGFLT_ADD);
+	//ChangeWindowMessageFilter(0x0049, MSGFLT_ADD);
+	DragAcceptFiles();
+	CDragEdit *pEditFile;
+	pEditFile = (CDragEdit *)this->GetDlgItem(IDC_FILE);
+	pEditFile->DragAcceptFiles();
+	pEditFile = (CDragEdit *)this->GetDlgItem(IDC_LAUNCH);
+	pEditFile->DragAcceptFiles();
+	//m_File.DragAcceptFiles();
+	//m_Launch.DragAcceptFiles();
 	CDialog::OnInitDialog();
 	CTargetDlg *cTarget = ((CTargetDlg *)(this->GetParent()->GetParent()));
 	Hinst = ::LoadLibrary(cTarget->m_FilePath);
diff --git a/host/TabProgram.h b/host/TabProgram.h
index efcedb3..d5779b0 100644
--- a/host/TabProgram.h
+++ b/host/TabProgram.h
@@ -45,6 +45,7 @@ public:
 protected:
 	CSpecialEdit m_EditPosX;
 	CSpecialEdit m_EditPosY;
+	afx_msg void OnDropFiles(HDROP hDropInfo);
 };
 
 //{{AFX_INSERT_LOCATION}}
diff --git a/host/TargetDlg.h b/host/TargetDlg.h
index 5903984..bbed84e 100644
--- a/host/TargetDlg.h
+++ b/host/TargetDlg.h
@@ -8,6 +8,7 @@
 //
 #include "dxTabCtrl.h"
 #include "SpecialEdit.h"
+#include "CDragEdit.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CTargetDlg Dialog
@@ -23,8 +24,8 @@ public:
 	//{{AFX_DATA(CTargetDlg)
 	enum { IDD = IDD_TARGET };
 	CDXTabCtrl	m_tabdxTabCtrl;
-	CEdit	m_File;
-	CEdit	m_Launch;
+	CDragEdit	m_File;
+	CDragEdit	m_Launch;
 	int		m_DXVersion;
 	int		m_Coordinates;
 	int		m_InitColorDepth;
diff --git a/host/dxwndhost.rc b/host/dxwndhost.rc
index df676ffffec3d7ab4466c21c0d412567fdd35061..f41a4d9297b8d16f2787726d3cd10690503a3505 100644
GIT binary patch
delta 33
rcmV++0N(%f*a!I72e2Fhmlmr5q=UW!x4r@a%IKH)d;z4FD(nGD5rz+o

delta 27
jcmexygZ;}5_6;&j&2miJ<(L?AUQU){S~A_>4WkDDqTvdh

diff --git a/host/dxwndhost.vs2008.suo b/host/dxwndhost.vs2008.suo
index fa826d61fe8be3353702046337680617496a554a..88714c8a1af680c6bafda0b5b751ba5ccedc6483 100644
GIT binary patch
delta 2911
zcmYk83s6*57{|}Kdv|#W3883$EFuqOQ8W}ykhL_CUND)are&H>97|~eqn2hAOC2XW
z;SCdk93P{N1739PrTEB4nfWT6N(U*CeBz^0M7IC8`%Uec`S15Xzw<u#o^!W!S6Jz;
zu-XFMR{gE5=eA$e0zF^tj~JlRbY0!mpO#&W$uC&qk?o`!0(DhnZPz<I9*-)rMavGe
z+-8yeC{LOzgqQ=(hvq@VUPs)Z2~mdl2K0_l2LlFnbHSEEjRy;hCf42^UGx3y=ERbJ
zGF5(HnsNpnunZBx*gH;(wPc7v#?)}xMG7-JC`if}Bmb&QQH8;a<w)~h@DU3N_J`GJ
zRvJyH;_$a^3FtULsJ8HTrLKx2Tyl<iFJh>sT2i7dAwsD6kx_D(n%(7BIphB^;#SH&
zYVPGn)aPA;RejeL7Ml>}6H!uHZ=pNQJE}Dfw$Lo@_LNiyBGPO#khKZ3t$SIxF5%VU
zl+17}R%8Udf?pvpCCuqWN`E6gN7}t>!8kF>`Dic0c}ON3d9TU{wbs#FMPx+le=n#n
zQ`K>iA(3cG{e_}Sk7I<<d8oyywB$(h<J1Dp$Qx>LjIH7-5s1|grOgmE8w72EDD8lV
zkv8F{KjLOY%BMp+AxcdEsxI1YR;N{KE-H<IG%O|q(Sk^f<c6n~yO<4w|D6huTA95J
ze-ob4^A=ybe(+=ADOE6=0>6e?nC`2WC`4cJ5HggyF(lueSr2A*uxO)Zr52@Kl%|&6
zA+xBOgNx(fQ@KeNGg{MdW}}%62FoF4Jhx0H7zLFw*<3bww^bd^bg072JZn#sW&580
zOxOr@FEf{pNXRVYmIdMmZ9VZa)?AmhF<8d^cVNuIoV*d%XcRy0ZEoKApjzt9*emms
z<(rdS&+rVWgJ*eGdCce?&Sy4`*(k8_%wA*G9c%`(0%pCz<}oW_Mh~a~p70?bGir{>
z5g*mJ24>+&jfd3T`swybFcYBlsPrWC68vOn3RDT1B|Gl+?6eN93fc{+($gh+4W8om
zpPXG>czog=8U^V`-#}h}oY_fcc(=tV_DvjzgEe!#tIVkJHD=eDVNeld6@tbJMx@2X
zLN|0l7mE;G8K%KU!Ba|MMz7l#czPFdnNed0*L%y46){`O%#M1M%<BBuc4mjH*}mEI
zLdC-jo4F#fOU&AtQHKwhCEC!|ShZ13GS6OV3C-?}vLrA{*;Ix|lXfyIWJa5_1ilC2
zQf5xNIqvOsy~%Z}nA5vl&8(IgExwM~US>dIAG7_;27n!4_5-sduw%?lGD`$I<zp^!
zh9NEHtPhIc{Mb2W7yMWgvu0+r=u6CO0ltl({sQ1BB{HLvmc%T@%OpM`6*9%VeE&0B
zDqY5uwxZe>&_0Or+Yq;6bLq;YJf)6RQ&SSY1o#U2h6{Eh?tvPhy-+K(!5DB`o0fVG
zwh=lH4MShl$73AH{{emxYJoiN3X9wn>Y@wL!P9-wJ6$2@9htzan3)}H5wl8W^vu>V
z+rumltby4DX7ON6%xt)-FeUFv2?!KUSRs-b(!hOucbOQ>j5^F<Hkw%iSdNdmJ>l}b
z5Z5#=q2)~H+FSf;Z)J9b8TI-dv*XO@X`W#AGc%g{8D{60(Jaq1yXIqVPmEkLP#>k^
z%k+MpOt*%%;#Ii`-GcBOGj@)X&VJt0be)^t;qGYIznI-;mIT($Obhbu7?|6&Se9$u
z=tDst4!WAhK)KKjjN^7Jm8YGqrNL;8v>cJPn!dIxn0@HSRxvC0W2>31Vb&LIKV??M
zjPA2)W>@^!RUZo$^#6w5H(}&Yll@mOl%0)+IZ}5YJuKS;kfHxh#+~DGtbEw(-GwLQ
z(Q>B+3#Amq3#Jnn%&Z5qEU;*1#ms247Qw5!mQ3U8nc7GffT-Y7@@u%oT4qsT>){=U
z+nCYCRSQq&*Ysm&;IY5rPd|1Wp1#;^%;+|6ho=MaAV>`NZacvMY)LL+2yc@ez7iEF
z#WL#)Z-=LpNX&>+GTz-dOKTjG?Y&L7a26G!5@`YaM8t*6?C`U>UKul-1-GY0lWqS3
D7v#&X

delta 1429
zcmZ9Mdr(w$6vxlGdv{#{mq)y6kVnwS$ZJ_)Q$$-3(6O3fozgL&0VTmAKqHeRxHFLz
zP80G&fA)t(n2)kjyvkA<AvldT5m2Dy^uR_PdW_>V{sH8;eeVvL({Jaq=Xrm>-<)&q
z)p~4NkL`GsYN4j*TVEU#TUEChNJ|%XRTWd}V|<@1dD0XQGeGoNRk7WCTdg1>vE35I
zUVV?n#HrVrs1m+AUa$9A$Ql6EYuLs*s1WUhZwt7_;;T81NF$`d+_!#XRZx4t%2%5b
z9`270SRve2yKq_0nX-uF*|kcHtS#dQ#PYcoy<o1w94*~{a+0X?Yvuxd+V6siSs$=<
zDdt*i)+XwMcUU$-t6?z{+{ji@AJW8E_34l$ikbnx9J$D=g%);>EAQ@}Dq6!6M0a>g
zTSTI$jQG)PTsh2ljyVp`Y}4x_A7%4jP=kD4%g0b_*Xc9&?+ixSm_>6^wrC7Y6q8Aj
z3CqYz^N_HHo}nsGMlayMf!5Jxs-{Kcprs@yhB!*Nk~O*I5<5idX<J*0OKMNCODKt<
zdV5NhB0E3iMkSj>S5&OtVee3o{-CVd&slMg=Y4$v2lz@%6a($N*|3SmA<+xj^&ZEI
zQfI8vtLRF`9hPlHoT!$!UcN0l;zH$`7WQqGsJA$K%^Wvd)9gZ#mu)vUVWS&jI(xN+
zjY>S?i~7F;uhCm9>5b<Y{oQ4U{5b0FaOicb3Ukc!5zh5Jpx=74gH@x=`o3L976jH%
zEy_?$%TXM^|E_4;+n`uX6w6{b&@T6n@f^KRx3l%%(GgQ8%VUjetj7!;P>BkFVc)y-
zhEr3~0rz@@Hrn7j{KS|mOk4>KlOsc%rci@)m$AFD0sYuPcFLi2%Agg{9F$Kf<fKf<
zOlTSK6u_T?oLqQvpe=!PAd(M%KD10)41WO`rAc=z%E)x0)pb-%n|!S<r<Y{<22Pi?
zP7ac}8&UJV!yGOr$~aaZ|6_8V+`0i~co8q;ZIWA*B2he3e%MvSEc@T#h5GM*cUqc0
zz~)E5QSce)2i@RPa1_1%2=Wtf3>ZZ_4%r1x03DnJr@#T=0X^Uh_#B)DUw{G73%&$>
z;4HWa4&pWU&wQw95c;=Z2n>S}@E!ObjDj(65nKY};0JIS`~rRg6X0jC6!*OXnFaYP
z<aKZrTmzH9xWB<~v-)gDJ;zMEd!A5ZqQ%4lr))3gs_qch{DpR-P$W)=O8Z-i8et^k
zwZxCe7{fX$rz|S=c<1wL4%LWy-YDb@^X{^|?zQYn-CM#gkJilXN~957iMewBZ?-(i
zuk$F9N?9{|v_W2FV#PPy^42gvA<m~Id+J8`n?2I;9GctP&OtWgGZ+G%_MI-eCbQ+4
v3MEf!C9KJSmpM|_zK@Ss_1kRaLFumGc-gm^ZJwKz%J5?8DrMK9PG#mFMr+||

diff --git a/host/dxwndhost.vs2008.vcproj b/host/dxwndhost.vs2008.vcproj
index c567b8d..929cf57 100644
--- a/host/dxwndhost.vs2008.vcproj
+++ b/host/dxwndhost.vs2008.vcproj
@@ -221,6 +221,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath=".\CDragEdit.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\CGlobalSettings.cpp"
 				>
@@ -508,6 +512,10 @@
 				RelativePath=".\cdib.h"
 				>
 			</File>
+			<File
+				RelativePath=".\CDragEdit.h"
+				>
+			</File>
 			<File
 				RelativePath=".\CGlobalSettings.h"
 				>
@@ -714,22 +722,22 @@
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath=".\alt-ctrl-shift.png"
-			>
-		</File>
 		<File
 			RelativePath=".\res\alt-ctrl-shift.png"
 			>
 		</File>
 		<File
-			RelativePath=".\res\alt.png"
+			RelativePath=".\alt-ctrl-shift.png"
 			>
 		</File>
 		<File
 			RelativePath=".\alt.png"
 			>
 		</File>
+		<File
+			RelativePath=".\res\alt.png"
+			>
+		</File>
 		<File
 			RelativePath=".\resource"
 			>
diff --git a/host/dxwndhostView.cpp b/host/dxwndhostView.cpp
index 4a3299f..801ba76 100644
--- a/host/dxwndhostView.cpp
+++ b/host/dxwndhostView.cpp
@@ -153,6 +153,7 @@ BEGIN_MESSAGE_MAP(CDxwndhostView, CListView)
 	ON_COMMAND(ID_MOVE_BOTTOM, OnMoveBottom)
 	ON_WM_RBUTTONDOWN()
 	ON_WM_HOTKEY()
+	ON_WM_DROPFILES()
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -1154,6 +1155,11 @@ void CDxwndhostView::OnInitialUpdate()
 	LV_ITEM listitem;
 	int i;
 
+	DragAcceptFiles();
+	ChangeWindowMessageFilter(WM_DROPFILES, MSGFLT_ADD);
+	ChangeWindowMessageFilter(WM_COPYDATA, MSGFLT_ADD);
+	ChangeWindowMessageFilter(0x0049, MSGFLT_ADD);
+
 	// Create 256 color image lists
 	HIMAGELIST hList = ImageList_Create(32,32, ILC_COLOR8 |ILC_MASK , 4, 1);
 	m_cImageListNormal.Attach(hList);
@@ -1295,6 +1301,27 @@ void CDxwndhostView::OnExport()
 	}
 }
 
+void CDxwndhostView::OnImport(CString sFilePath)
+{
+	LV_ITEM listitem;
+	int i;
+	for (i=0; strlen(TargetMaps[i].path) && i<MAXTARGETS; i++)
+		;
+	if (i==MAXTARGETS) {
+		MessageBoxLang(DXW_STRING_MAXENTRIES, DXW_STRING_WARNING, MB_OK | MB_ICONEXCLAMATION);
+		return;
+	}
+	CListCtrl& listctrl = GetListCtrl();
+	if(LoadConfigItem(&TargetMaps[i], &PrivateMaps[i], 0, (char *)sFilePath.GetString())){
+		listitem.mask = LVIF_TEXT | LVIF_IMAGE;
+		listitem.iItem = i;
+		listitem.iSubItem = 0;
+		listitem.iImage = SetTargetIcon(TargetMaps[i]);
+		listitem.pszText = PrivateMaps[i].title;
+		listctrl.InsertItem(&listitem);
+	}
+}
+
 void CDxwndhostView::OnImport()
 {
 	LV_ITEM listitem;
@@ -1802,7 +1829,12 @@ void CDxwndhostView::OnProcessKill()
 	RevertScreenChanges(&this->InitDevMode);
 }
 
-void CDxwndhostView::OnAdd() 
+void CDxwndhostView::OnAdd()
+{
+	OnAdd(NULL);
+}
+
+void CDxwndhostView::OnAdd(char *sInitialPath) 
 {
 	// TODO: Please add a command handler code here.
 	int i;
@@ -1815,6 +1847,8 @@ void CDxwndhostView::OnAdd()
 		return;
 	}
 	memset(&TargetMaps[i],0,sizeof(TARGETMAP)); // clean up, just in case....
+	if(sInitialPath) dlg.m_FilePath = CString(sInitialPath);
+
 	if(dlg.DoModal() == IDOK && dlg.m_FilePath.GetLength()){
 		strnncpy(PrivateMaps[i].title, (char *)dlg.m_Title.GetString(), MAX_TITLE);
 		PrivateMaps[i].notes = (char *)malloc(strlen(dlg.m_Notes.GetString())+1);
@@ -2759,3 +2793,27 @@ void CDxwndhostView::OnClearCompatibilityFlags()
 		RegCloseKey(hk);
 	}
 }
+
+void CDxwndhostView::OnDropFiles(HDROP dropInfo)
+{
+	CString sFile;
+	DWORD nBuffer = 0;
+	char *p;
+	// Get number of files
+	UINT nFilesDropped = DragQueryFile(dropInfo, 0xFFFFFFFF, NULL, 0);
+	if(nFilesDropped > 0){
+		nBuffer = DragQueryFile(dropInfo, 0, NULL, 0);
+		DragQueryFile(dropInfo, 0, sFile.GetBuffer(nBuffer+1), nBuffer+1);
+		p = (char *)sFile.GetString();
+		p += (strlen(p)-4);
+		if(!_strnicmp(p, ".dxw", 4)){
+			this->OnImport(sFile);
+		}
+		else {
+			this->OnAdd(sFile.GetBuffer());
+		}
+		sFile.ReleaseBuffer();
+	}
+	DragFinish(dropInfo);
+}
+
diff --git a/host/dxwndhostView.h b/host/dxwndhostView.h
index 835cbd0..e1654cb 100644
--- a/host/dxwndhostView.h
+++ b/host/dxwndhostView.h
@@ -19,6 +19,7 @@ protected: // Create from serialization only features.
 	DECLARE_DYNCREATE(CDxwndhostView)
 	BOOL isUpdated;
 	void SaveConfigFile();
+	BOOL OnInitDialog();
 
 private:
 	void Resize(void);
@@ -62,10 +63,12 @@ protected:
 	//{{AFX_MSG(CDxwndhostView)
 	afx_msg void OnDblclk(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnAdd();
+	afx_msg void OnAdd(char *);
 	afx_msg void OnDuplicate();
 	afx_msg void OnModify();
 	afx_msg void OnExport();
 	afx_msg void OnImport();
+	afx_msg void OnImport(CString);
 	afx_msg void OnDelete();
 	afx_msg void OnExplore();
 	afx_msg void OnKill();
@@ -109,6 +112,7 @@ protected:
 	afx_msg void OnMoveUp();
 	afx_msg void OnMoveDown();
 	afx_msg void OnMoveBottom();
+	afx_msg void OnDropFiles(HDROP hDropInfo);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };