Changeset 1096

Timestamp:

Oct 1, 1999, 12:15:23 PM (26 years ago)

Author:

sandervl

Message:

EB's fixes

Location:

trunk/src/user32

Files:

• combo.cpp (modified) (3 diffs)
• msgbox.cpp (modified) (3 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.1 1999-09-15 23:18:48 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.2 1999-10-01 10:15:22 sandervl Exp $ */
 /*
  * Combo controls
@@ -1225 +1225 @@
 HWND COMBO_GetLBWindow( HWND hwnd )
 {
-  LPHEADCOMBO       lphc = CB_GETPTR(hwnd);
-  if( lphc ) return lphc->hWndLBox;
+  LPHEADCOMBO   lphc = NULL;
+  LONG          ptr = GetInfoPtr(hwnd);
+  if(ptr)
+  {
+    lphc =  (*(LPHEADCOMBO*)(ptr));
+    if( lphc ) return lphc->hWndLBox;
+  }
   return 0;
 }
@@ -1756 +1761 @@
                              WPARAM wParam, LPARAM lParam )
 {
-      LPHEADCOMBO       lphc = CB_GETPTR(hwnd);
+      LPHEADCOMBO   lphc = NULL;
+      LONG          ptr = GetInfoPtr(hwnd);
+
+      if(ptr)
+        lphc = (*(LPHEADCOMBO*)(ptr));
 
       //TRACE("[%04x]: msg %s wp %08x lp %08lx\n",

trunk/src/user32/msgbox.cpp

@@ -1 @@
-/* $Id: msgbox.cpp,v 1.2 1999-09-19 08:24:47 sandervl Exp $ */
+/* $Id: msgbox.cpp,v 1.3 1999-10-01 10:15:23 sandervl Exp $ */
 /*
  * Win32 message box function for OS/2
@@ -11 +11 @@
 #include <os2win.h>
 #include <misc.h>
+#include "win32wnd.h"
+
 /*****************************************************************************
  * Name      : int WIN32API MessageBoxExA
@@ -142 +144 @@
 {
   dprintf(("USER32:  MessageBoxA %s %s\n", lpszText, lpszTitle));
+  hwndOwner = Win32Window::Win32ToOS2Handle(hwndOwner);
   return(O32_MessageBox(hwndOwner, lpszText, lpszTitle, fuStyle));
 }