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

Timestamp:

Dec 14, 1999, 8:13:20 PM (26 years ago)

Author:

sandervl

Message:

MDI changes + WM_INITMENU support added + disabled experimental support for CS_PARENTDC style

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.27 1999-12-07 20:43:39 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.28 1999-12-14 19:13:18 sandervl Exp $ */
 
 /*
@@ -610 +610 @@
    if (hwnd)
    {
-      wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-      if (flags & DCX_WINDOW_W)
-         hWindow = wnd->getOS2FrameWindowHandle();
-      else
-         hWindow = wnd->getOS2WindowHandle();
+        wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+        if(wnd == NULL) {
+                dprintf (("ERROR: User32: GetDCEx bad window handle %X!!!!!", hwnd));
+                O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+                return 0;
+        }
+//SvL: Experimental change (doesn't work right)
+#if 0
+        if(wnd->fHasParentDC() && wnd->getParent()) {
+                wnd = wnd->getParent();
+        }
+#endif
+        if (flags & DCX_WINDOW_W)
+                hWindow = wnd->getOS2FrameWindowHandle();
+        else
+                hWindow = wnd->getOS2WindowHandle();
    }
    else