Author: jimtabor Date: Thu Dec 6 07:00:51 2007 New Revision: 31035
URL: http://svn.reactos.org/svn/reactos?rev=31035&view=rev Log: Restore to default behavior for now.
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 6 07:00:51 2007 @@ -108,6 +108,7 @@ HDC STDCALL NtUserGetDC(HWND hWnd) { +#if 0 if (!hWnd) { // MSDN: //"hWnd [in] Handle to the window whose DC is to be retrieved. @@ -119,6 +120,9 @@ return NULL; } return NtUserGetDCEx(hWnd, NULL, DCX_USESTYLE); +#endif +// We have a problem here! + return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); }
PDCE FASTCALL @@ -406,9 +410,9 @@
if (NULL == Window) { // Do the same as GetDC with a NULL. - Window = UserGetWindowObject(IntGetDesktopWindow()); - if (Window) Wnd = Window->Wnd; - else +// Window = UserGetWindowObject(IntGetDesktopWindow()); +// if (Window) Wnd = Window->Wnd; +// else Flags &= ~DCX_USESTYLE; } else @@ -729,7 +733,7 @@ }
IntGdiDeleteDC(pdce->hDC, TRUE); - + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(pdce->hClipRgn);