Changeset 3873 for trunk/src

Timestamp:

Jul 20, 2000, 8:08:13 PM (25 years ago)

Author:

sandervl

Message:

SetWindowPlacement, CreateCaret & Set/GetCaretPos fixes

Location:

trunk/src/user32

Files:

• caret.cpp (modified) (9 diffs)
• oslibmsgtranslate.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (5 diffs)

trunk/src/user32/caret.cpp

@@ -1 @@
-/* $Id: caret.cpp,v 1.12 2000-02-16 14:34:04 sandervl Exp $ */
+/* $Id: caret.cpp,v 1.13 2000-07-20 18:08:12 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include <os2sel.h>
 #include <stdlib.h>
-#include "win32type.h"
+#include <win32type.h>
+#include <win32api.h>
 #include <winconst.h>
 #include <wprocess.h>
@@ -62 +63 @@
        wnd->SetFakeOpen32();
 
-       rc = _O32_CreateCaret (wnd->getOS2WindowHandle(), hBmp, width, height);
+       rc = O32_CreateCaret (wnd->getOS2WindowHandle(), hBmp, width, height);
        if (rc)
        {
@@ -98 +99 @@
    BOOL rc;
 
-   dprintf(("USER32:  SetCaretBlinkTime"));
+   dprintf(("USER32: SetCaretBlinkTime %d ms", mSecs));
 
    rc = _SetCaretBlinkTime (mSecs);
@@ -123 +124 @@
    POINTL     caretPos = { x, y };
 
-   dprintf(("USER32:  SetCaretPos"));
+   dprintf(("USER32: SetCaretPos (%d,%d)", x, y));
 
    rc = WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo);
@@ -138 +139 @@
            if (!pHps)
            {
-              _O32_SetLastError (ERROR_INTERNAL_ERROR);
+              SetLastError(ERROR_INTERNAL_ERROR);
               return FALSE;
            }
@@ -151 +152 @@
         else
         {
-           long height = wnd->getClientHeight();
+           long height = wnd->getWindowHeight();
            caretPos.y = height - caretPos.y - 1;
            xNew = caretPos.x;
@@ -166 +167 @@
    if (rc == FALSE)
    {
-      _O32_SetLastError (ERROR_INVALID_PARAMETER);
+      SetLastError (ERROR_INVALID_PARAMETER);
       result = FALSE;
    }
@@ -199 +200 @@
             cursorInfo.x = caretPos.x;
             cursorInfo.y = caretPos.y;
-         } else {
-            long height  = wnd->getClientHeight();
+         } 
+         else {
+            long height  = wnd->getWindowHeight();
             caretPos.y  += cursorInfo.cy;
             cursorInfo.y = height - caretPos.y - 1;

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.35 2000-06-23 19:04:11 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.36 2000-07-20 18:08:12 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -251 +251 @@
                         Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
                         if(wndAfter)
-                        thdb->wp.hwndInsertAfter = wndAfter->getWindowHandle();
+                              thdb->wp.hwndInsertAfter = wndAfter->getWindowHandle();
+                        else  thdb->wp.hwndInsertAfter = HWND_TOP_W;
                 }
         }

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.99 2000-07-19 19:05:24 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.100 2000-07-20 18:08:12 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -293 +293 @@
         {
            Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
-           if(wndAfter) wp.hwndInsertAfter = wndAfter->getWindowHandle();
+           if(wndAfter) {
+                wp.hwndInsertAfter = wndAfter->getWindowHandle();
+           }
+           else wp.hwndInsertAfter = HWND_TOP_W;
         }
 
@@ -363 +366 @@
         } 
         else  OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, OSLibQueryScreenHeight(), 0, 0, hwnd);
+
+        wp.hwnd = win32wnd->getWindowHandle();
+        if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
+        {
+           Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
+           if(wndAfter) {
+                wp.hwndInsertAfter = wndAfter->getWindowHandle();
+           }
+           else wp.hwndInsertAfter = HWND_TOP_W;
+        }
 
         if(pswp->fl & SWP_ACTIVATE)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.207 2000-07-18 18:35:39 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.208 2000-07-20 18:08:13 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2077 +2077 @@
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
-    if(getWindowHandle() == 0x68000030 && nCmdShow == 0) {
+    if(getWindowHandle() == 0x6800001d && nCmdShow == 1) {
         rc = 0;
     }
@@ -2133 +2133 @@
         case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
         case SW_RESTORE:
+            //TODO: WIN_RESTORE_MAX flag!!!!!!!!!!!!!!
             swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
 
@@ -2324 +2325 @@
 }
 //******************************************************************************
+//TODO: Check how this api really works in NT
+//      This implemention doesn't make a lot of sense to me (compared to the
+//      description in the SDK docs)
 //******************************************************************************
 BOOL Win32BaseWindow::SetWindowPlacement(WINDOWPLACEMENT *wndpl)
@@ -2348 +2352 @@
    }
    else {
-        SetWindowPos(0, windowpos.rcNormalPosition.left, windowpos.rcNormalPosition.top,
+        //Papyrus calls this api with rcNormalPosition set to 0
+        //So the rcNormalPosition should probably not affect the current position
+#if 0
+        SetWindowPos(0, windowpos.rcNormalPosition.left, windowpos.rcNormalPosition.top,
                      windowpos.rcNormalPosition.right - windowpos.rcNormalPosition.left,
                      windowpos.rcNormalPosition.bottom - windowpos.rcNormalPosition.top,
                      SWP_NOZORDER | SWP_NOACTIVATE );
+#endif
    }
    ShowWindow(wndpl->showCmd);