From f260a88bac2fa6e112b8a1cb63f9c307c93e401f Mon Sep 17 00:00:00 2001 From: gho tik Date: Tue, 17 Jan 2017 11:49:27 -0500 Subject: [PATCH] v2_04_06_src Former-commit-id: 91f17dc67c3b955350280809333f442ac6afb059 --- build/dxwnd.dll | 2 +- build/dxwnd.exe | 4 ++-- build/readme-relnotes.txt | 10 +++++++++- dll/advapi.cpp | 4 ++-- dll/ddcreates.cpp | 8 +++++--- dll/dxwnd.cpp | 2 +- dll/dxwnd.vs2008.suo | Bin 555008 -> 563200 bytes dll/hd3d7.cpp | 24 ++++++++++++------------ dll/iatpatch.cpp | 2 +- dll/winproc.cpp | 31 +++++++++++++++++++++++-------- host/CGlobalSettings.cpp | 10 +++++----- host/CGlobalSettings.h | 2 +- host/dxwndhost.aps | Bin 257860 -> 260664 bytes host/dxwndhost.cpp | 21 ++++++++++----------- host/dxwndhost.rc | Bin 146050 -> 149820 bytes host/dxwndhost.vs2008.suo | Bin 150528 -> 170496 bytes host/dxwndhostView.cpp | 14 ++++++++++++++ host/dxwndhostView.h | 1 + host/resource | Bin 53372 -> 53466 bytes 19 files changed, 87 insertions(+), 48 deletions(-) diff --git a/build/dxwnd.dll b/build/dxwnd.dll index 11fb8ba..37e8849 100644 --- a/build/dxwnd.dll +++ b/build/dxwnd.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:614dc453abbfbc0659502a136e3cd3b2dbb7e794dc3c964ffd2f53a784c6f429 +oid sha256:8448e58dc97c4a242f28a3c94cd1e3837f13fd9cb48d6c3342f84df91fccbbf3 size 779264 diff --git a/build/dxwnd.exe b/build/dxwnd.exe index 81894e6..07ebb26 100644 --- a/build/dxwnd.exe +++ b/build/dxwnd.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5c8f132cd8013ecb60b7bd0b0a17727fc0e4ffbc2c17756dcb835897d511427 -size 671232 +oid sha256:41137464c3c599b09e720882a36a3e1c939081fa477027447459c269fdb15971 +size 673280 diff --git a/build/readme-relnotes.txt b/build/readme-relnotes.txt index 32bbeaa..f8a7cad 100644 --- a/build/readme-relnotes.txt +++ b/build/readme-relnotes.txt @@ -1453,4 +1453,12 @@ fix?: bypass for WM_FONTCHANGE: avoids "Warhammer: Shadow of the Horned Rat" cra add: WinG32 debug highlighting of blitted rects on screen add: GDI32 debug highlighting of blitted rects on screen add: hooks for GDI32 GetTextExtentPointA and GetTextExtentPoint32A: needed for proper string rendering on "Warhammer: Shadow of the Horned Rat" -add: hook for GDI32 GdiAlphaBlend, very rare call that appeared in "RHEM" during savegame load. \ No newline at end of file +add: hook for GDI32 GdiAlphaBlend, very rare call that appeared in "RHEM" during savegame load. + +v2.04.06 +GUI: +add: Expert mode +DLL: +fix: corrected condition to print two virtual registry log messages +fix: improved logic to recover surfaces with DDSCAPS_TEXTURE capability - ref. "Dominant Species" +fix: fixed cursor clipping state and toggle key to make it work in all conditions \ No newline at end of file diff --git a/dll/advapi.cpp b/dll/advapi.cpp index 45a75cc..35c0788 100644 --- a/dll/advapi.cpp +++ b/dll/advapi.cpp @@ -101,7 +101,7 @@ static int ReplaceVar(char *pData, LPBYTE *lplpData, LPDWORD lpcbData) } // set output vars if not NULL iTokenLength = strlen(sTokenValue); - OutTrace("REPLACED token=%d val=\"%s\" len=%d\n", iTokenIndex, sTokenValue, iTokenLength); + OutTraceR("REPLACED token=%d val=\"%s\" len=%d\n", iTokenIndex, sTokenValue, iTokenLength); if(lplpData) { strcpy((char *)*lplpData, sTokenValue); *lplpData += iTokenLength; @@ -456,7 +456,7 @@ static LONG myRegOpenKeyEx( if(RegBuf[0]=='['){ // beware: registry keys are case insensitive. Must use _strnicmp instead of strncmp if((!_strnicmp(&RegBuf[1],sKey,strlen(sKey))) && (RegBuf[strlen(sKey)+1]==']')){ - OutTrace("%s: found fake Key=\"%s\" hkResult=%x\n", label, sKey, phkResult ? *phkResult : 0); + OutTraceR("%s: found fake Key=\"%s\" hkResult=%x\n", label, sKey, phkResult ? *phkResult : 0); fclose(regf); return ERROR_SUCCESS; } diff --git a/dll/ddcreates.cpp b/dll/ddcreates.cpp index 7a450a8..04a36b4 100644 --- a/dll/ddcreates.cpp +++ b/dll/ddcreates.cpp @@ -715,11 +715,13 @@ static HRESULT BuildGenericEmu(LPDIRECTDRAW lpdd, CreateSurface_Type pCreateSurf res=(*pCreateSurface)(lpdd, &ddsd, lplpdds, pu); // v2.04.05: error condition found & fixed on certain platforms for "Dominant Species" only (so far). - if ((res == DDERR_UNSUPPORTED) && (ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY|DDSCAPS_TEXTURE))){ + if (((res == DDERR_UNSUPPORTED) || (res == DDERR_UNSUPPORTEDMODE)) && + (ddsd.ddsCaps.dwCaps & DDSCAPS_TEXTURE)){ OutTraceDW("BuildGenericEmu: CreateSurface ERROR res=%x(%s) at %d, TEXTURE->OFFSCREENPLAIN retry\n", res, ExplainDDError(res), __LINE__); - ddsd.ddsCaps.dwCaps = (DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN); + ddsd.ddsCaps.dwCaps &= ~(DDSCAPS_TEXTURE|DDSCAPS_ALLOCONLOAD); + ddsd.ddsCaps.dwCaps |= (DDSCAPS_OFFSCREENPLAIN); res=(*pCreateSurface)(lpdd, &ddsd, lplpdds, pu); - } + } if ((dxw.dwFlags1 & SWITCHVIDEOMEMORY) && (res!=DD_OK)){ OutTraceDW("BuildGenericEmu: CreateSurface ERROR res=%x(%s) at %d, retry\n", res, ExplainDDError(res), __LINE__); ddsd.ddsCaps.dwCaps &= ~DDSCAPS_VIDEOMEMORY; diff --git a/dll/dxwnd.cpp b/dll/dxwnd.cpp index 2f8925a..f3355a4 100644 --- a/dll/dxwnd.cpp +++ b/dll/dxwnd.cpp @@ -27,7 +27,7 @@ along with this program. If not, see . #include "TlHelp32.h" -#define VERSION "2.04.05" +#define VERSION "2.04.06" #define DDTHREADLOCK 1 diff --git a/dll/dxwnd.vs2008.suo b/dll/dxwnd.vs2008.suo index ddc1930a58433cc31bdc476323362a70e244fb32..233884c12276e9ea7b6c15e08a2d2de4fd262545 100644 GIT binary patch delta 6957 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 delta 5476 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 I)@yeD|7SypL;wH) diff --git a/dll/hd3d7.cpp b/dll/hd3d7.cpp index 6485132..fd30ed1 100644 --- a/dll/hd3d7.cpp +++ b/dll/hd3d7.cpp @@ -1822,48 +1822,48 @@ HRESULT WINAPI extTexInitialize(void *t, LPDIRECT3DDEVICE lpd3dd, LPDIRECTDRAWSU return (*pTInitialize)(t, lpd3dd, lpdds); } -HRESULT WINAPI extTexGetHandle(TexGetHandle_Type pTGetHandle, void *t, LPDIRECT3DDEVICE lpd3dd, LPD3DTEXTUREHANDLE lpth) +static HRESULT WINAPI extTexGetHandle(int version, TexGetHandle_Type pTGetHandle, void *t, LPDIRECT3DDEVICE lpd3dd, LPD3DTEXTUREHANDLE lpth) { HRESULT ret; - OutTrace("Texture::GetHandle lpt=%x lpd3dd=%x lpth=%x\n", t, lpd3dd, lpth); + OutTrace("Texture(%d)::GetHandle lpt=%x lpd3dd=%x lpth=%x\n", version, t, lpd3dd, lpth); ret = (*pTGetHandle)(t, lpd3dd, lpth); if(ret) OutTraceE("Texture::Load ERROR res=%x(%s)\n", ret, ExplainDDError(ret)); return ret; } HRESULT WINAPI extTexGetHandle1(void *t, LPDIRECT3DDEVICE lpd3dd, LPD3DTEXTUREHANDLE lpth) -{ return extTexGetHandle(pTGetHandle1, t, lpd3dd, lpth); } +{ return extTexGetHandle(1, pTGetHandle1, t, lpd3dd, lpth); } HRESULT WINAPI extTexGetHandle2(void *t, LPDIRECT3DDEVICE2 lpd3dd, LPD3DTEXTUREHANDLE lpth) -{ return extTexGetHandle(pTGetHandle2, t, (LPDIRECT3DDEVICE)lpd3dd, lpth); } +{ return extTexGetHandle(2, pTGetHandle2, t, (LPDIRECT3DDEVICE)lpd3dd, lpth); } -HRESULT WINAPI extTexPaletteChanged(TexPaletteChanged_Type pTPaletteChanged, void *t, DWORD dw1, DWORD dw2) +static HRESULT WINAPI extTexPaletteChanged(int version, TexPaletteChanged_Type pTPaletteChanged, void *t, DWORD dw1, DWORD dw2) { HRESULT ret; - OutTrace("Texture::PaletteChanged lpt=%x dw1=%x dw2=%x\n", t, dw1, dw2); + OutTrace("Texture(%d)::PaletteChanged lpt=%x dw1=%x dw2=%x\n", version, t, dw1, dw2); ret = (*pTPaletteChanged)(t, dw1, dw2); if(ret) OutTraceE("Texture::PaletteChanged ERROR res=%x(%s)\n", ret, ExplainDDError(ret)); return ret; } HRESULT WINAPI extTexPaletteChanged1(void *t, DWORD dw1, DWORD dw2) -{ return extTexPaletteChanged(pTPaletteChanged1, t, dw1, dw2); } +{ return extTexPaletteChanged(1, pTPaletteChanged1, t, dw1, dw2); } HRESULT WINAPI extTexPaletteChanged2(void *t, DWORD dw1, DWORD dw2) -{ return extTexPaletteChanged(pTPaletteChanged2, t, dw1, dw2); } +{ return extTexPaletteChanged(2, pTPaletteChanged2, t, dw1, dw2); } -HRESULT WINAPI extTexLoad(TexLoad_Type pTLoad, void *t, LPDIRECT3DTEXTURE lpt) +HRESULT WINAPI extTexLoad(int version, TexLoad_Type pTLoad, void *t, LPDIRECT3DTEXTURE lpt) { HRESULT ret; - OutTrace("Texture::Load lpt=%x lpd3dt=%x\n", t, lpt); + OutTrace("Texture(%d)::Load lpt=%x lpd3dt=%x\n", version, t, lpt); ret = (*pTLoad)(t, lpt); if(ret) OutTraceE("Texture::Load ERROR res=%x(%s)\n", ret, ExplainDDError(ret)); return ret; } HRESULT WINAPI extTexLoad1(void *t, LPDIRECT3DTEXTURE lpt) -{ return extTexLoad(pTLoad1, t, lpt); } +{ return extTexLoad(1, pTLoad1, t, lpt); } HRESULT WINAPI extTexLoad2(void *t, LPDIRECT3DTEXTURE lpt) -{ return extTexLoad(pTLoad2, t, lpt); } +{ return extTexLoad(2, pTLoad2, t, lpt); } HRESULT WINAPI extTexUnload(void *t) { diff --git a/dll/iatpatch.cpp b/dll/iatpatch.cpp index 7720284..9949182 100644 --- a/dll/iatpatch.cpp +++ b/dll/iatpatch.cpp @@ -467,7 +467,7 @@ BOOL IsIATSequential(HMODULE module) // skip first string for(; *fname; fname++); for(; !*fname; fname++); // if second string is another DLL it is sequential, otherwise not. - OutTraceB("IsIATSequential: second entry=%s\n", fname); + //OutTraceB("IsIATSequential: second entry=%s\n", fname); return (BOOL)stristr(fname, ".DLL"); } __except(EXCEPTION_EXECUTE_HANDLER) diff --git a/dll/winproc.cpp b/dll/winproc.cpp index 5d8b08f..4988a3c 100644 --- a/dll/winproc.cpp +++ b/dll/winproc.cpp @@ -224,7 +224,7 @@ LRESULT CALLBACK extWindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp POINT prev, curr; RECT rect; static int i=0; - static int ClipCursorToggleState = 1; + static int ClipCursorToggleState = 0; WNDPROC pWindowProc; extern void dxwFixWindowPos(char *, HWND, LPARAM); extern LPRECT lpClipRegion; @@ -236,9 +236,20 @@ LRESULT CALLBACK extWindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp extern void DDrawScreenShot(int); if(DoOnce){ + RECT cliprect; + BOOL clipret; DoOnce=FALSE; IsToBeLocked=(dxw.dwFlags1 & LOCKWINPOS); LastTimeShift=SaveTimeShift=dxw.TimeShift; + clipret = (*pGetClipCursor)(&cliprect); + // v2.04.06: you always get a clipper area. To tell that the clipper is NOT active for your window + // you can compare the clipper area with the whole desktop. If they are equivalent, you have no + // clipper (or you are in fullscreen mode, but that is equivalent). + ClipCursorToggleState = TRUE; + if (((cliprect.right - cliprect.left) == (*pGetSystemMetrics)(SM_CXVIRTUALSCREEN)) && + ((cliprect.bottom - cliprect.top) == (*pGetSystemMetrics)(SM_CYVIRTUALSCREEN))) + ClipCursorToggleState = FALSE; + OutTraceDW("Initial clipper status=%x\n", ClipCursorToggleState); } // v2.1.93: adjust clipping region @@ -467,7 +478,10 @@ LRESULT CALLBACK extWindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp case WM_MBUTTONUP: case WM_MBUTTONDBLCLK: if(dxw.Windowize){ - if((dxw.dwFlags1 & CLIPCURSOR) && ClipCursorToggleState) dxw.SetClipCursor(); + if((dxw.dwFlags1 & CLIPCURSOR) && !ClipCursorToggleState) { + ClipCursorToggleState = TRUE; + dxw.SetClipCursor(); + } if((dxw.dwFlags1 & MODIFYMOUSE) && !(dxw.dwFlags1 & MESSAGEPROC)){ // mouse processing // scale mouse coordinates prev.x = LOWORD(lparam); @@ -488,7 +502,10 @@ LRESULT CALLBACK extWindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp break; case WM_SETFOCUS: OutTraceDW("WindowProc: hwnd=%x GOT FOCUS\n", hwnd); - if(dxw.dwFlags1 & CLIPCURSOR) dxw.SetClipCursor(); + if(dxw.dwFlags1 & CLIPCURSOR) { + ClipCursorToggleState = TRUE; + dxw.SetClipCursor(); + } if (dxw.dwFlags1 & DISABLECLIPPING) extClipCursor(lpClipRegion); break; case WM_KILLFOCUS: @@ -551,11 +568,9 @@ LRESULT CALLBACK extWindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp DxWndKey=dxw.MapKeysConfig(message, lparam, wparam); switch (DxWndKey){ case DXVK_CLIPTOGGLE: - if(dxw.dwFlags1 & CLIPCURSOR){ - OutTraceDW("WindowProc: WM_SYSKEYDOWN key=%x ToggleState=%x\n",wparam,ClipCursorToggleState); - ClipCursorToggleState = !ClipCursorToggleState; - ClipCursorToggleState ? dxw.SetClipCursor() : dxw.EraseClipCursor(); - } + OutTraceDW("WindowProc: WM_SYSKEYDOWN key=%x ToggleState=%x\n", wparam, ClipCursorToggleState); + ClipCursorToggleState = !ClipCursorToggleState; + ClipCursorToggleState ? dxw.SetClipCursor() : dxw.EraseClipCursor(); break; case DXVK_REFRESH: dxw.ScreenRefresh(); diff --git a/host/CGlobalSettings.cpp b/host/CGlobalSettings.cpp index 23d9d68..7c7ce65 100644 --- a/host/CGlobalSettings.cpp +++ b/host/CGlobalSettings.cpp @@ -80,7 +80,7 @@ IMPLEMENT_DYNAMIC(CGlobalSettings, CDialog) CGlobalSettings::CGlobalSettings(CWnd* pParent /*=NULL*/) : CDialog(CGlobalSettings::IDD, pParent) { - m_DebugMode = GetPrivateProfileInt("window", "debug", 0, gInitPath); + //m_DebugMode = GetPrivateProfileInt("window", "debug", 0, gInitPath); m_AutoHideMode = GetPrivateProfileInt("window", "autohide", 0, gInitPath); m_CheckAdminRights = GetPrivateProfileInt("window", "checkadmin", 0, gInitPath); m_NameFromFolder = GetPrivateProfileInt("window", "namefromfolder", 0, gInitPath); @@ -112,7 +112,7 @@ void CGlobalSettings::DoDataExchange(CDataExchange* pDX) CString sDefaultPosX, sDefaultPosY; sDefaultPosX.Format("%d", m_DefaultPosX); sDefaultPosY.Format("%d", m_DefaultPosY); - DDX_Check(pDX, IDC_CONFIG_DEBUGMODE, m_DebugMode); + //DDX_Check(pDX, IDC_CONFIG_DEBUGMODE, m_DebugMode); DDX_Check(pDX, IDC_CONFIG_AUTOHIDE, m_AutoHideMode); DDX_Check(pDX, IDC_CONFIG_CHECKADMIN, m_CheckAdminRights); DDX_Check(pDX, IDC_CONFIG_NAMEFROMFOLDER, m_NameFromFolder); @@ -180,8 +180,8 @@ void CGlobalSettings::OnOK() char val[32]; CDialog::OnOK(); // boolean flags - sprintf_s(val, sizeof(val), "%i", m_DebugMode); - WritePrivateProfileString("window", "debug", val, gInitPath); + //sprintf_s(val, sizeof(val), "%i", m_DebugMode); + //WritePrivateProfileString("window", "debug", val, gInitPath); sprintf_s(val, sizeof(val), "%i", m_AutoHideMode); WritePrivateProfileString("window", "autohide", val, gInitPath); sprintf_s(val, sizeof(val), "%i", m_CheckAdminRights); @@ -244,7 +244,7 @@ void CGlobalSettings::OnOK() WritePrivateProfileString("keymapping", HKeys[i].sIniLabel, "", gInitPath); } //(CDxwndhostView *)(this->GetParent())->UpdateHotKeys(); - gbDebug = m_DebugMode; + //gbDebug = m_DebugMode; gAutoHideMode = m_AutoHideMode; gWarnOnExit = m_WarnOnExit; } diff --git a/host/CGlobalSettings.h b/host/CGlobalSettings.h index 771cc45..1dfa5ff 100644 --- a/host/CGlobalSettings.h +++ b/host/CGlobalSettings.h @@ -31,7 +31,7 @@ public: protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - BOOL m_DebugMode; + //BOOL m_DebugMode; BOOL m_UpdatePaths; BOOL m_AutoHideMode; BOOL m_CheckAdminRights; diff --git a/host/dxwndhost.aps b/host/dxwndhost.aps index ae61289a9c3182d7c10788f2c82976de0e6f5bfe..57ee12d5340086eac694c5373cc3e0e7a25c9f27 100644 GIT binary patch delta 21436 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 nJx^0;lE&|HtRyiSRYkO7|6@Tz_| z>v|=V0kZTHu!!Kefzt(ti+POR@;G>$4tPAKMl|}BOU!*C$EK6h!NVS{iBrxI2XChH zi=EDvRLOACQ&Trfwh8=hE2p0xagU#=d&URmtXaT71mh{?l$!Y-q(%&(FHS zIKmUBJwNXTR|pt;(QYtChdA=Nyc=94VC+rP;9Rl0fSZM&oGl<;YPBy+6H6%uxH#>( zl6;U})m>U9q*d%{npbMIU6Yd5hpHp>IPMaMI=`SLr55dfIPnu^{!4nf)N=xSo82E!qv7UOr*rH_`=zt@ieAnpiJz)az$A z(UQSdZ84{DCoTMDS`XDAH2RdQ{`T(4(cc01(>u~|*)|d{V|OaN8JkQTP>ADecrB5noZUsohj{qiGOwMd zviLnTW~j}+L?sZ1I?1Ie06)8w&Kqi-yG%*tc~C7Dy#V52O2e?Dh}C1n3yGiIn=Yx3 zM6i4Z;D>*w;B?(Gb{}mSYBT9@1`8gsEE|?#`@Pa?h+{2{H?_%9!!7@T+`}CFeySYi zay_6_#A2YFkUTdFz!N`+;s0+Be~9iGX16}9)RG5*z5ouAmt)2Fw?kXOmwjQWUuonO znjLLuZIIDk0Ou8dRIqUW(vgI5l7MABfaByxjI5)xrBAAl7hXiu>i z5^&^?DT&dx>I5f%DEm*{ajfqFxc0}p;OaalfWZ3+zU)hjX*Jrbc!?ROmhkUS8kxeY zV{H?Cfb)(u3KVs~d7(VF3BcVy#p%i~3;EOJ9pT|?DL%rgt>g5@moED=DuEoJ$yo;1 z{bzb;gtfgxNn4tt4MxC*)d2^MaBqQ%0DD%6jm1JawE)hVpX-9lBWLKBv%hq~ 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 Ba83XK delta 19566 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 diff --git a/host/dxwndhost.cpp b/host/dxwndhost.cpp index a30a06d..530dead 100644 --- a/host/dxwndhost.cpp +++ b/host/dxwndhost.cpp @@ -148,17 +148,6 @@ BOOL CDxwndhostApp::InitInstance() // standard initialization - // Register the document template. - - CSingleDocTemplate* pDocTemplate; - pDocTemplate = new CSingleDocTemplate( - IDR_MAINFRAME, - RUNTIME_CLASS(CDxwndhostDoc), - RUNTIME_CLASS(CMainFrame), // SDI main frame window - RUNTIME_CLASS(CDxwndhostView)); - AddDocTemplate(pDocTemplate); - - // DDE file open: Parse command line for standard shell commands and so on. // Parse command line for standard shell commands, DDE, file open // and user-defined flags. The CCommandLine class has been replaced @@ -174,6 +163,16 @@ BOOL CDxwndhostApp::InitInstance() if(!gAutoHideMode) gAutoHideMode = GetPrivateProfileInt("window", "autohide", 0, InitPath); // debug flag set from config file gWarnOnExit = GetPrivateProfileInt("window", "warnonexit", 0, InitPath); // WarnOnExit flag set from config file + // Register the document template. + + CSingleDocTemplate* pDocTemplate; + pDocTemplate = new CSingleDocTemplate( + gbDebug ? IDR_MAINFRAME_EX : IDR_MAINFRAME, + RUNTIME_CLASS(CDxwndhostDoc), + RUNTIME_CLASS(CMainFrame), // SDI main frame window + RUNTIME_CLASS(CDxwndhostView)); + AddDocTemplate(pDocTemplate); + if(!LangSelected){ LANGID LangId; char LangString[20+1]; diff --git a/host/dxwndhost.rc b/host/dxwndhost.rc index ddf9b64e7b0f8496202f4867c1e6ea594ab3d94c..384e7d923d338d664f669847c748e11668e2db99 100644 GIT binary patch delta 419 zcmaKmJxD@f6o$`9Zfeoxrd<#;D=6rXQj^MlB&rKWrj`Y5HPluZ(GX4jOqm+_L1&3@ zX^D#9LKnoLA82olhC4)4g#-;Q*=Ox;&v{=C@3Z@D%B9WMS%KZQ45*(%rrN5&Cal3S ztiuL0!YagIi9LyJY|&WR6NU)P!UTjN1W{N31?G98zzk2PcskCxlYfmtfYTUEg2IlP zJJeLIF4Fr4TGX7dSivM?oqB4{8_R9k%WScjU1mSdMiy`cm{h-_a&|JkyQ;Jy34dOD zg+Z+_h?i!w8{FXKT0XkF!9ML(!N+R!v4)IHx6}9{xWNS;)|9cPkGn{p!L*?d`v32C z%J|TvWuv%_1`qUV!*f{l(sKg+v=zrI8j5q$i&#aG1jfl!Dr`wSr`7}XAE!9nC(%LT xJ_a?*A?9T|PhlNhJfKJ;H7K#%j;M{EVK!jk*3?8Olj{oyDD;Uo?d=0kg1-VGfiD06 delta 256 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 H^x^*ioEBXn delta 7903 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 } +void CDxwndhostView::OnExpertModeToggle() +{ + CMenu *menu; + gbDebug = !gbDebug; + menu = this->GetParent()->GetMenu(); + ::DestroyMenu(menu->GetSafeHmenu()); + menu->LoadMenu(gbDebug ? IDR_MAINFRAME_EX : IDR_MAINFRAME); + this->GetParent()->SetMenu(menu); + menu->CheckMenuItem(ID_OPTIONS_EXPERTMODE, gbDebug ? MF_CHECKED : MF_UNCHECKED); + WritePrivateProfileString("window", "debug", (gbDebug ? "1" : "0"), gInitPath); + +} + void CDxwndhostView::OnViewTimeSlider() { CTimeSliderDialog *pDlg = new CTimeSliderDialog(); diff --git a/host/dxwndhostView.h b/host/dxwndhostView.h index be50a48..7fd0698 100644 --- a/host/dxwndhostView.h +++ b/host/dxwndhostView.h @@ -83,6 +83,7 @@ protected: afx_msg void OnTaskbarShow(); afx_msg void OnSort(); afx_msg void OnGlobalSettings(); + afx_msg void OnExpertModeToggle(); afx_msg void OnViewLog(); afx_msg void OnDeleteLog(); afx_msg void OnDebugView(); diff --git a/host/resource b/host/resource index 4950f98213ca8c01aa234fd50bb8c34186e83c88..4c865d733f62f91bb635db4b10413bf601d80c39 100644 GIT binary patch delta 56 zcmV-80LTCQpaa^W1F-x71z!L~09cXnA(N1I29s1O7?VH(2D9t|bcq8m056lV5*d@w OI0Tcxd^Za9RL6T