DXGL r560 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r559‎ | r560 | r561 >
Date:17:57, 26 October 2014
Author:admin
Status:new
Tags:
Comment:
Comment out broken code in r559
Modified paths:
  • /ddraw/glDirectDraw.cpp (modified) (history)

Diff [purge]

Index: ddraw/glDirectDraw.cpp
——@@ -1425,17 +1425,17 @@
14261426 if(hWnd && !IsWindow(hWnd)) TRACE_RET(HRESULT,23,DDERR_INVALIDPARAMS);
14271427 if ((dwFlags & DDSCL_EXCLUSIVE) && !hWnd) TRACE_RET(HRESULT, 23, DDERR_INVALIDPARAMS);
14281428 if(dwFlags & 0xFFFFE020) TRACE_RET(HRESULT,23,DDERR_INVALIDPARAMS);
1429 - if (((hWnd != this->hWnd) && this->hWnd) || (this->hWnd && (dwFlags & DDSCL_NORMAL)))
 1429+ /*if (((hWnd != this->hWnd) && this->hWnd) || (this->hWnd && (dwFlags & DDSCL_NORMAL)))
14301430 {
14311431 if (winstyle)
14321432 {
14331433 SetWindowLongPtrA(hWnd, GWL_STYLE, winstyle);
14341434 SetWindowLongPtrA(hWnd, GWL_EXSTYLE, winstyleex);
1435 - //ShowWindow(hWnd, SW_RESTORE);
 1435+ ShowWindow(hWnd, SW_RESTORE);
14361436 winstyle = winstyleex = 0;
14371437 SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
14381438 }
1439 - }
 1439+ }*/ // Currently breaks The Settlers IV
14401440 this->hWnd = hWnd;
14411441 if (!winstyle && !winstyleex)
14421442 {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r559Adjust fullscreen window management slightly.admin16:53, 25 October 2014
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/560"