Changeset 1405 for trunk/src/user32/winmenu.cpp

Timestamp:

Oct 22, 1999, 8:11:51 PM (26 years ago)

Author:

sandervl

Message:

Lots of changes/fixes

File:

• trunk/src/user32/winmenu.cpp (modified) (3 diffs)

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.7 1999-09-24 12:47:51 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.8 1999-10-22 18:11:51 sandervl Exp $ */
 
 /*
@@ -296 +296 @@
               const RECT *, arg7)
 {
-    dprintf(("USER32:  TrackPopupMenu\n"));
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-    return O32_TrackPopupMenu(hMenu, arg2, arg3, arg4, arg5, arg6, arg7);
+  Win32BaseWindow *window;
+
+  window = Win32BaseWindow::GetWindowFromHandle(arg6);
+  if(!window)
+  {
+    dprintf(("TrackPopupMenu, window %x not found", arg6));
+    return 0;
+  }
+  dprintf(("USER32:  TrackPopupMenu\n"));
+  if(hMenu == 0)
+  {
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return 0;
+  }
+  return O32_TrackPopupMenu(hMenu, arg2, arg3, arg4, arg5, window->getOS2WindowHandle(),
+                            arg7);
 }
 //******************************************************************************
@@ -314 +323 @@
               LPTPMPARAMS, lpPM)
 {
- RECT *rect = NULL;
-
-    dprintf(("USER32:  TrackPopupMenuEx, not completely implemented\n"));
-    if(lpPM->cbSize != 0)
-        rect = &lpPM->rcExclude;
-
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-    return O32_TrackPopupMenu(hMenu, flags, X, Y, 0, hwnd, rect);
+  RECT *rect = NULL;
+  Win32BaseWindow *window;
+
+  window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+  if(!window)
+  {
+    dprintf(("TrackPopupMenu, window %x not found", hwnd));
+    return 0;
+  }
+
+  dprintf(("USER32:  TrackPopupMenuEx, not completely implemented\n"));
+  if(lpPM->cbSize != 0)
+      rect = &lpPM->rcExclude;
+
+  if(hMenu == 0)
+  {
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return 0;
+  }
+  return O32_TrackPopupMenu(hMenu, flags, X, Y, 0, window->getOS2WindowHandle(), rect);
 }
 //******************************************************************************