Changeset 5428 for trunk/src

Timestamp:

Apr 1, 2001, 9:38:51 PM (24 years ago)

Author:

sandervl

Message:

minor updates

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• windowclass.cpp (modified) (5 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.121 2001-03-30 11:14:35 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.122 2001-04-01 19:38:51 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1130 +1130 @@
     {
         dprintf(("OS2: WM_REALIZEPALETTE"));
-        goto RunDefWndProc;
-    }
-
-    case WM_OWNERPOSCHANGE:
-    {
-        dprintf(("OS2: WM_OWNERPOSCHANGE"));
         goto RunDefWndProc;
     }
@@ -1248 +1242 @@
 
     case WM_QUERYFOCUSCHAIN:
-        dprintf(("OS2: WM_QUERYFOCUSCHAIN %x", win32wnd->getWindowHandle()));
-        goto RunDefFrameWndProc;
+        dprintf(("OS2: WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2));
+        
+        RestoreOS2TIB();
+        rc = pfnFrameWndProc(hwnd, msg, mp1, mp2);
+        SetWin32TIB();
+        dprintf(("OS2: WM_QUERYFOCUSCHAIN %x fsCmd %x parent %x returned %x", win32wnd->getWindowHandle(), SHORT1FROMMP(mp1), mp2, rc));
+        break;
 
     case WM_FOCUSCHANGE:
@@ -1292 +1291 @@
 
         dprintf(("OS2: WM_ADJUSTFRAMEPOS %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+        goto RunDefFrameWndProc;
+    }
+
+    case WM_OWNERPOSCHANGE:
+    {
+        PSWP pswp   = (PSWP)mp1;
+
+        dprintf(("OS2: WM_OWNERPOSCHANGE %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
         goto RunDefFrameWndProc;
     }

trunk/src/user32/windowclass.cpp

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.17 2001-03-30 22:08:20 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.18 2001-04-01 19:38:51 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -52 +52 @@
     wc.hIconSm = 0;
  
-    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
-    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
-    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
-
-    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
-                           LR_COPYFROMRESOURCE);
-
     if(Win32WndClass::FindClass(wc.hInstance, (LPSTR)wc.lpszClassName)) {
         if(HIWORD(wc.lpszClassName)) {
@@ -68 +61 @@
     }
 
+    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
+    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
+    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
+
+    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                           LR_COPYFROMRESOURCE);
+
     wclass = new Win32WndClass(&wc,FALSE);
     if(wclass == NULL) {
@@ -114 +114 @@
     memcpy(&wc.style, lpwc, sizeof(WNDCLASSA));
 
-    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
-    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
-    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
-
-    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
-                           LR_COPYFROMRESOURCE);
-
     if(Win32WndClass::FindClass(wc.hInstance, (LPWSTR)wc.lpszClassName)) {
         if(HIWORD(wc.lpszClassName)) {
@@ -129 +122 @@
         return 0;
     }
+
+    //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
+    int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
+    int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
+
+    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                           LR_COPYFROMRESOURCE);
 
     winclass = new Win32WndClass((WNDCLASSEXA *)&wc, TRUE);