Changeset 3873 for trunk/src/user32/win32wbase.cpp

Timestamp:

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

Author:

sandervl

Message:

SetWindowPlacement, CreateCaret & Set/GetCaretPos fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (5 diffs)

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);