Changeset 8210 for trunk/src

Timestamp:

Apr 7, 2002, 11:37:35 PM (23 years ago)

Author:

sandervl

Message:

fixed double handle allocated for desktop window + made EnumWindows a bit safer

Location:

trunk/src/user32

Files:

• win32wbase.cpp (modified) (3 diffs)
• win32wdesktop.cpp (modified) (2 diffs)
• win32wndhandle.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.321 2002-03-28 16:20:06 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.322 2002-04-07 21:37:34 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2998 +2998 @@
  BOOL             rc;
  HWND             hwnd = WNDHANDLE_MAGIC_HIGHWORD;
+ DWORD            dwStyle;
 
     dprintf(("EnumWindows %x %x", lpfn, lParam));
@@ -3003 +3004 @@
     for(int i=0;i<MAX_WINDOW_HANDLES;i++) 
     {
-        window = GetWindowFromHandle(hwnd++);
-        if(window) 
-        {
-            if ((window->getStyle() & WS_POPUP) || ((window->getStyle() & WS_CAPTION) == WS_CAPTION))
+        window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+        if(window) {
+            if(window->getWindowHandle() != hwnd) {
+                dprintf(("CORRUPT WINDOW %x %x", window, hwnd));
+            }
+            RELEASE_WNDOBJ(window);
+            dwStyle = ::GetWindowLongA(hwnd, GWL_STYLE);
+            if ((dwStyle & WS_POPUP) || ((dwStyle & WS_CAPTION) == WS_CAPTION))
             {
-                dprintf2(("EnumWindows: Found Window %x", window->getWindowHandle()));
-                if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE) {
+                dprintf2(("EnumWindows: Found Window %x", hwnd));
+                if((rc = lpfn(hwnd, lParam)) == FALSE) {
                     break;
                 }
             }
-            RELEASE_WNDOBJ(window);
-        }
-    }
-    if(window) RELEASE_WNDOBJ(window);
+        }
+        hwnd++;
+    }
     return TRUE;
 }

trunk/src/user32/win32wdesktop.cpp

@@ -1 @@
-/* $Id: win32wdesktop.cpp,v 1.18 2001-07-08 07:15:09 sandervl Exp $ */
+/* $Id: win32wdesktop.cpp,v 1.19 2002-04-07 21:37:35 sandervl Exp $ */
 /*
  * Win32 Desktop Window for OS/2
@@ -55 +55 @@
   rectClient   = rectWindow;
 
-  if(HwAllocateWindowHandle(&Win32Hwnd, (ULONG)this) == FALSE)
-  {
-        dprintf(("Win32BaseWindow::Init HwAllocateWindowHandle failed!!"));
-        DebugInt3();
-  }
   dprintf(("Desktop window %x", Win32Hwnd));
 

trunk/src/user32/win32wndhandle.cpp

@@ -1 @@
-/* $Id: win32wndhandle.cpp,v 1.11 2002-04-07 14:37:00 sandervl Exp $ */
+/* $Id: win32wndhandle.cpp,v 1.12 2002-04-07 21:37:35 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -73 +73 @@
   lastIndex++;
   DosLeaveCriticalSection(&globalwhandlecritsect);
+  dprintf2(("HwAllocateWindowHandle %x", *hwnd));
   return TRUE;
 }
@@ -85 +86 @@
         DosLeaveCriticalSection(&globalwhandlecritsect);
   }
+  dprintf2(("HwFreeWindowHandle %x", hwnd));
 }
 //******************************************************************************