Changeset 2582 for trunk/src/user32/dc.cpp

Timestamp:

Jan 31, 2000, 11:30:52 PM (26 years ago)

Author:

sandervl

Message:

GetDCEx changes (fail if hwnd == 0)

File:

• trunk/src/user32/dc.cpp (modified) (6 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.40 2000-01-29 20:46:52 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.41 2000-01-31 22:30:51 sandervl Exp $ */
 
 /*
@@ -68 +68 @@
 BOOL changePageXForm(Win32BaseWindow *wnd, pDCData pHps, PPOINTL pValue, int x, int y, PPOINTL pPrev);
 LONG clientHeight(Win32BaseWindow *wnd, HWND hwnd, pDCData pHps);
+
+HWND WIN32API GetDesktopWindow(void);
 
 //******************************************************************************
@@ -663 +665 @@
    BOOL     creatingOwnDC = FALSE;
    PS_Type  psType;
+
+   if(hwnd == 0) {
+        dprintf(("error: GetDCEx window %x not found", hwnd));
+        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+   }
 
    if (hwnd)
@@ -683 +691 @@
                 hWindow = wnd->getOS2WindowHandle();
    }
-   else
-      hWindow = HWND_DESKTOP;
 
    //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
@@ -809 +815 @@
 HDC WIN32API GetDC (HWND hwnd)
 {
+  if(!hwnd)
+       return GetDCEx( GetDesktopWindow(), 0, DCX_CACHE_W | DCX_WINDOW_W );
   return GetDCEx (hwnd, NULL, 0);
 }
@@ -815 +823 @@
 HDC WIN32API GetWindowDC (HWND hwnd)
 {
-  return GetDCEx (hwnd, NULL, DCX_WINDOW_W);
+  if (!hwnd) hwnd = GetDesktopWindow();
+  return GetDCEx (hwnd, NULL, DCX_USESTYLE_W | DCX_WINDOW_W);
 }
 //******************************************************************************