Changeset 10076 for trunk/src

Timestamp:

May 6, 2003, 3:50:37 PM (22 years ago)

Author:

sandervl

Message:

ReleaseDC check if hwnd parameter is correct (WindowFromDC(hdc)); Messagebox: Wrong ReleaseDC call

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• msgbox.c (modified) (2 diffs)
• win32wbase.cpp (modified) (8 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.119 2003-05-02 15:33:15 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.120 2003-05-06 13:50:35 sandervl Exp $ */
 
 /*
@@ -861 +861 @@
     if (hwnd)
     {
+        HWND hwndDC = WindowFromDC(hdc);
+
+        if(hwndDC != hwnd) {
+            dprintf(("WARNING: ReleaseDC: wrong window handle specified %x -> %x", hwnd, hwndDC));
+            hwnd = hwndDC;
+        }
+
         Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
         if(wnd == NULL) {

trunk/src/user32/msgbox.c

@@ -1 @@
-/* $Id: msgbox.c,v 1.6 2001-11-14 18:33:03 sandervl Exp $ */
+/* $Id: msgbox.c,v 1.7 2003-05-06 13:50:36 sandervl Exp $ */
 /*
  * Message boxes (based on Wine code)
@@ -186 +186 @@
     if (hFont)
         SelectObject(hdc, hPrevFont);
+#ifdef __WIN32OS2__
+    ReleaseDC(hwnd, hdc);
+#else
     ReleaseDC(hItem, hdc);
+#endif
 
     tiheight = 16 + MAX(iheight, theight);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.371 2003-05-02 17:18:57 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.372 2003-05-06 13:50:37 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -4111 +4111 @@
     }
 
+    lock(&critsect);
     int j = 0;
     for(int i=0;i<MAX_OPENDCS && j<nrOpenDCs;i++) {
@@ -4118 +4119 @@
         }
     }
+    unlock(&critsect);
     *pnrdcs = nrOpenDCs;
     return TRUE;
@@ -4134 +4136 @@
 void Win32BaseWindow::addOpenDC(HDC hdc)
 {
+    lock(&critsect);
     for(int i=0;i<MAX_OPENDCS;i++) {
         if(hdcWindow[i] == 0) {
@@ -4140 +4143 @@
         }
     }
+    unlock(&critsect);
     if(i == MAX_OPENDCS) {
         DebugInt3(); //no room!
@@ -4145 +4149 @@
     }
 
+    dprintf2(("Win32BaseWindow::addOpenDC %x %x %d", getWindowHandle(), hdc, nrOpenDCs+1));
     nrOpenDCs++;
 }
@@ -4161 +4166 @@
 {
     if(nrOpenDCs == 0) {
+        dprintf(("Win32BaseWindow::removeOpenDC %x hdc %x not found!! (1)", getWindowHandle(), hdc));
         DebugInt3();
         return;
     }
+    lock(&critsect);
     for(int i=0;i<MAX_OPENDCS;i++) {
         if(hdcWindow[i] == hdc) {
@@ -4170 +4177 @@
         }
     }
+    unlock(&critsect);
     if(i == MAX_OPENDCS) {
+        dprintf(("Win32BaseWindow::removeOpenDC hdc %x not found!!", hdc));
         DebugInt3(); //not found
         return;
     }
+    dprintf2(("Win32BaseWindow::removeOpenDC %x %x", getWindowHandle(), hdc, nrOpenDCs-1));
     nrOpenDCs--;
 }