Changeset 2316 for trunk/src

Timestamp:

Jan 4, 2000, 8:50:51 PM (26 years ago)

Author:

sandervl

Message:

SetWindowRgn memory leak + InsertMenu bug fixed

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (2 diffs)
• winmenu.cpp (modified) (3 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.32 2000-01-02 20:20:01 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.33 2000-01-04 19:50:50 sandervl Exp $ */
 
 /*
@@ -1479 +1479 @@
     }
     dprintf(("USER32:SetWindowRgn (%x,%x,%d)", hwnd, hRgn, bRedraw));
+    if(window->GetWindowRegion()) {
+        O32_DeleteObject(window->GetWindowRegion());
+    }
     window->SetWindowRegion(hRgn);
     if(bRedraw) {

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.7 2000-01-03 21:37:16 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.8 2000-01-04 19:50:51 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -132 +132 @@
             winMsg->wParam  = packet->wParam;
             winMsg->lParam  = packet->lParam;
-            if(fMsgRemoved == MSG_REMOVE) 
-                free(packet); //free the shared memory here
+            if(fMsgRemoved == MSG_REMOVE)
+                free(packet); //free the shared memory here
             break;
         }

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.19 1999-12-18 14:31:15 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.20 2000-01-04 19:50:51 sandervl Exp $ */
 
 /*
@@ -738 +738 @@
         flags |= MF_SEPARATOR;
     }
+    //SvL: RealPlayer calls InsertMenu with flag 0 & pos -1
+    if((flags & (MF_BYCOMMAND|MF_BYPOSITION)) == 0 && (pos == 0xffffffff))
+        flags |= MF_BYPOSITION;
+
     return O32_InsertMenu(hMenu, pos, flags, id, str);
 }
@@ -1077 +1081 @@
  *****************************************************************************/
 
-ODINFUNCTION4(BOOL, GetMenuItemRect,
-              HWND, hWnd,
-              HMENU, hMenu,
-              UINT, uItem,
-              LPRECT, lprcItem)
-{
-    return OSLibGetMenuItemRect(hMenu, uItem, lprcItem);
+BOOL GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, LPRECT lprcItem)
+{
+ BOOL rc;
+
+    rc = OSLibGetMenuItemRect(hMenu, uItem, lprcItem);
+    dprintf(("GetMenuItemRect %x %x %x (%d,%d)(%d,%d)", hwnd, hMenu, uItem, lprcItem->top, lprcItem->left, lprcItem->bottom, lprcItem->right));
+    return rc;
 }
 /*****************************************************************************