Changeset 3766 for trunk/src

Timestamp:

Jun 28, 2000, 8:11:19 PM (25 years ago)

Author:

sandervl

Message:

MM: BeginDeferWindowPos bugfix (count can be 0)

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.70 2000-06-08 18:10:12 sandervl Exp $ */
+/* $Id: window.cpp,v 1.71 2000-06-28 18:11:19 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1178 +1178 @@
 }
 //******************************************************************************
+//Note: count 0 is a legal parameter (verified in NT4)
 //******************************************************************************
 HDWP WIN32API BeginDeferWindowPos(int count)
@@ -1184 +1185 @@
     DWP *pDWP;
 
-    if (count <= 0)
+    if (count < 0)
     {
         dprintf(("USER32: BeginDeferWindowPos invalid param %d", count));
@@ -1191 +1192 @@
     }
     dprintf(("USER32: BeginDeferWindowPos %d", count));
-    handle = (HDWP)HeapAlloc(GetProcessHeap(), 0, sizeof(DWP) + (count-1)*sizeof(WINDOWPOS) );
+    if(count == 0)
+        count = 8;  // change to any non-zero value
+
+    handle = (HDWP)HeapAlloc(GetProcessHeap(), 0, sizeof(DWP) + (count-1)*sizeof(WINDOWPOS));
     if (!handle)
         return 0;
@@ -1205 +1209 @@
 /***********************************************************************
  *           DeferWindowPos   (USER32.128)
+ * 
+ * TODO: SvL: Does this need to be thread safe?
+ *
  */
 HDWP WIN32API DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter,
@@ -1282 +1289 @@
     if (pDWP->actualCount >= pDWP->suggestedCount)
     {
+        //DWP structure already contains WINDOWPOS, allocated with (count-1)
+        //in BeginDeferWindowPos; pDWP->suggestedCount alloc increases it by one
         newhdwp = (HDWP)HeapReAlloc(GetProcessHeap(), 0, (LPVOID)hdwp,
                                     sizeof(DWP) + pDWP->suggestedCount*sizeof(WINDOWPOS));