Changeset 10031 for trunk/src/user32/pmwindow.cpp

Timestamp:

Apr 23, 2003, 8:01:01 PM (22 years ago)

Author:

sandervl

Message:

KSO: Properties allocated from shared memory & Fake window updates & SW_SHOWDEFAULT update

File:

• trunk/src/user32/pmwindow.cpp (modified) (18 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.208 2003-04-11 10:55:02 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.209 2003-04-23 18:00:59 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -31 +31 @@
 #include <dbglog.h>
 #include <win32wbase.h>
+#include <win32wfake.h>
 #include <win32dlg.h>
 #include "win32wdesktop.h"
@@ -884 +885 @@
         {
                 win32wnd->DispatchMsgA(pWinMsg);
-                if(WinQueryUpdateRect(hwnd, NULL) == TRUE) 
+                if(WinQueryUpdateRect(hwnd, NULL) == TRUE)
                 {//the application didn't validate the update region; Windows
                  //will only send a WM_PAINT once until another part of the
@@ -1018 +1019 @@
             break;
         }
-  
+
         ULONG ulBytes, cItems;
         char *pszFiles;
@@ -1036 +1037 @@
         else {
             rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
-        }  
+        }
         break;
     }
@@ -1272 +1273 @@
     {
         //ignore this message. don't forward it to the default PM frame window handler
-        //as that one sends it to the client. as a result we end up translating 
+        //as that one sends it to the client. as a result we end up translating
         //it twice
         break;
@@ -1366 +1367 @@
                  DWORD dwOldStyle = win32wnd->getOldStyle();
                  DWORD dwStyle    = win32wnd->getStyle();
-    
+
                  win32wnd->setOldStyle(dwStyle);
                  if((dwOldStyle & WS_MINIMIZE_W) && !(dwStyle & WS_MINIMIZE_W)) {
@@ -1553 +1554 @@
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
             }
-            if(pswp->fl & (SWP_SHOW|SWP_HIDE)) 
+            if(pswp->fl & (SWP_SHOW|SWP_HIDE))
             {//TODO: necessary for more options? (activate?)
                 if(win32wnd->CanReceiveSizeMsgs())
@@ -1948 +1949 @@
         //result will be illegal. Btw we do not honour PM border size settings
         //and never will. I was unable to figure out why only X coordinate
-        //is being broken but not Y as well. 
-
-        if ((pswp->fl & SWP_MAXIMIZE) == SWP_MAXIMIZE)  
+        //is being broken but not Y as well.
+
+        if ((pswp->fl & SWP_MAXIMIZE) == SWP_MAXIMIZE)
         {
             RECT rect;
@@ -2091 +2092 @@
     SetWin32TIB();
 
-    //We can't query the window object directly from this window as it's not the
-    //real thing. There should be a genuine win32 child window which we can use.
-    HWND hwndChild = WinQueryWindow(hwnd, QW_TOP);
-
-    win32wndchild = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndChild);
-    if(win32wndchild == NULL) {
-        DebugInt3();
-        goto RunDefWndProc;
-    }
-    //now get the parent window object
-    win32wnd = Win32BaseWindow::GetWindowFromHandle(GetParent(win32wndchild->getWindowHandle()));
-    if(win32wndchild) RELEASE_WNDOBJ(win32wndchild);
-
+    win32wnd = Win32FakeWindow::GetWindowFromOS2Handle(hwnd);
     if(win32wnd == NULL) {
         DebugInt3();
@@ -2207 +2196 @@
 //******************************************************************************
 //******************************************************************************
-static char *PMDragExtractFiles(PDRAGINFO pDragInfo, ULONG *pcItems, ULONG *pulBytes) 
+static char *PMDragExtractFiles(PDRAGINFO pDragInfo, ULONG *pcItems, ULONG *pulBytes)
 {
     PDRAGITEM pDragItem;
@@ -2225 +2214 @@
 
     //computer memory required to hold all filenames
-    int bufsize = 0;        
+    int bufsize = 0;
     for (i = 0; i < cItems; i++) {
         pDragItem = DrgQueryDragitemPtr(pDragInfo, i);
@@ -2240 +2229 @@
         goto failure;
     }
-    memset(pszFiles, 0, bufsize); 
+    memset(pszFiles, 0, bufsize);
 
     pszCurFile = pszFiles;
@@ -2285 +2274 @@
 //******************************************************************************
 //******************************************************************************
-static BOOL PMDragValidate(PDRAGINFO pDragInfo) 
+static BOOL PMDragValidate(PDRAGINFO pDragInfo)
 {
     PDRAGITEM pDragItem;
@@ -2324 +2313 @@
 
         dprintf(("dropped file %s%s", szContainerName, szFileName));
-        break; 
+        break;
     }
 
@@ -2347 +2336 @@
 failure:
     DrgFreeDraginfo(pDragInfo);
-    return FALSE;    
+    return FALSE;
 }
 
@@ -2376 +2365 @@
 {
     static char szSWPFlags[512];
-  
+
     szSWPFlags[0] = 0;
 
@@ -2402 +2391 @@
     if(flags & SWP_ACTIVATE) {
         strcat(szSWPFlags, "SWP_ACTIVATE ");
-    }                                    
+    }
     if(flags & SWP_DEACTIVATE) {
         strcat(szSWPFlags, "SWP_DEACTIVATE ");