Changeset 10031 for trunk/src

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

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• oslibwin.cpp (modified) (22 diffs)
• oslibwin.h (modified) (2 diffs)
• pmwindow.cpp (modified) (18 diffs)
• user32dbg.def (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbaseprop.cpp (modified) (5 diffs)
• win32wfake.cpp (modified) (7 diffs)
• win32wfake.h (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.78 2003-03-03 16:36:25 sandervl Exp $
+; $Id: USER32.DEF,v 1.79 2003-04-23 18:00:58 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -36 +36 @@
 ;;;; Present in WGSS50
 ;;;;    _GpiQueryDCData             = PMGPI.665
+
+    WinQueryProperty  = PMMERGE.5450
+    WinRemoveProperty = PMMERGE.5451
+    WinSetProperty    = PMMERGE.5452
 
 EXPORTS

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.142 2003-04-11 15:22:33 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.143 2003-04-23 18:00:58 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -127 +127 @@
 //Note: Also check OSLibSetWindowStyle when changing this!!
 //******************************************************************************
-BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, 
+BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle,
                           ULONG *OSFrameStyle)
 {
@@ -144 +144 @@
 
   //WS_EX_TOOLWINDOW is incompatible with the OS2Look (titlebar thinner + smaller font)
-  if(fOS2Look && !(dwExStyle & WS_EX_TOOLWINDOW_W)) 
+  if(fOS2Look && !(dwExStyle & WS_EX_TOOLWINDOW_W))
   {
       if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
@@ -168 +168 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, 
-                                   DWORD dwExStyle, HICON hSysMenuIcon, 
+BOOL OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle,
+                                   DWORD dwExStyle, HICON hSysMenuIcon,
                                    BOOL drawCloseButton, BOOL fClassIcon)
 {
@@ -190 +190 @@
       minmaxheight = WinQuerySysValue(HWND_DESKTOP, SV_CYMINMAXBUTTON);
   }
-  
+
   if(fOS2Look == OS2_APPEARANCE_SYSMENU) {
       //Note: If no class icon *and* WS_EX_DLGMODALFRAME -> no system menu!!
@@ -236 +236 @@
               swp[i].cx -= minmaxwidth/2;
           }
-          //there is no close button in warp 3 and sometimes we do not 
+          //there is no close button in warp 3 and sometimes we do not
           //have close button as well
           if((dwStyle & WS_SYSMENU_W) && !fVersionWarp3 && drawCloseButton) {
@@ -578 +578 @@
 
 //******************************************************************************
-//@PF This is exactly that weird message PM sends when we maximize window from 
+//@PF This is exactly that weird message PM sends when we maximize window from
 //icon - this coordinates NEVER surface later and this combination of SWP
 //commands is useless, yet it starts the correct reaction of maximiztion from
@@ -595 +595 @@
  /* @@PF The reason for this weird minimize algorithm is that we are not fully
     using PM for minimization. I.e. we respect all PM messages yet we do mess
-    so much with some messages that minimization is based partly on vodoo. 
+    so much with some messages that minimization is based partly on vodoo.
     That is if you try minimize and deactivate in one call it will fail.
     Here we deactivate yourselves and give focus to next window that is
@@ -635 +635 @@
 {
     ULONG hIconOS2 = GetOS2Icon(hIcon);
-    if(hIconOS2) 
+    if(hIconOS2)
        return (BOOL) WinSendMsg(hwnd, WM_SETICON, (MPARAM)hIconOS2, 0);
     return FALSE;
@@ -996 +996 @@
 //PF: PM Logic approved by numerous testcases shows this:
 //There is no other way to tweak FID_MINMAX without deleting it
-//Controls are created with size 0,0, invisible and should be immediately 
+//Controls are created with size 0,0, invisible and should be immediately
 //positioned. MINMAX control can't function properly without FID_SYSMENU
 //control if it is present, so we need to recreate BOTH controls.
@@ -1006 +1006 @@
 //leave old, WinCreateFrameControls can't tweak anything.
 
-void OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle, 
+void OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle,
                          ULONG dwExStyle, ULONG dwOldWindowsStyle)
 {
@@ -1012 +1012 @@
     ULONG dwOldWinStyle;
 
-    int checksum, checksum2; 
+    int checksum, checksum2;
     DWORD dest_tid, dest_pid;
 
@@ -1024 +1024 @@
     dest_tid = GetWindowThreadProcessId(OS2ToWin32Handle(hwndClient) , &dest_pid );
 
-    if (dest_tid != GetCurrentThreadId()) 
+    if (dest_tid != GetCurrentThreadId())
     {
         dprintf(("OSLibSetWindowStyle: Redirecting Change Frame controls to another thread"));
@@ -1034 +1034 @@
         minmaxheight = WinQuerySysValue(HWND_DESKTOP, SV_CYMINMAXBUTTON);
     }
-  
+
     if (hwndClient)
     {
@@ -1081 +1081 @@
          dwWinStyle |= WS_MAXIMIZED;
     }
-    else 
+    else
       dwWinStyle &= ~WS_MAXIMIZED;
 
@@ -1096 +1096 @@
             }
             else
-              WinQueryWindowPos(WinWindowFromID(hwndFrame, FID_TITLEBAR), &rc1);            
+              WinQueryWindowPos(WinWindowFromID(hwndFrame, FID_TITLEBAR), &rc1);
 
             if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W))
@@ -1126 +1126 @@
               {
                   OSFrameStyle |= FCF_CLOSEBUTTON;
-                  OSFrameStyle |= FCF_SYSMENU;                   
+                  OSFrameStyle |= FCF_SYSMENU;
                   totalwidth += minmaxwidth/2;
                   dprintf(("close button"));
@@ -1132 +1132 @@
             }
        }
-       else 
+       else
        {
-          if (WinWindowFromID(hwndFrame, FID_TITLEBAR)) 
+          if (WinWindowFromID(hwndFrame, FID_TITLEBAR))
               WinDestroyWindow(WinWindowFromID(hwndFrame, FID_TITLEBAR));
        }
@@ -1140 +1140 @@
        if (checksum != checksum2)
        {
-         if (WinWindowFromID(hwndFrame, FID_SYSMENU)) 
+         if (WinWindowFromID(hwndFrame, FID_SYSMENU))
              WinDestroyWindow(WinWindowFromID(hwndFrame, FID_SYSMENU));
-         if (WinWindowFromID(hwndFrame, FID_MINMAX)) 
+         if (WinWindowFromID(hwndFrame, FID_MINMAX))
              WinDestroyWindow(WinWindowFromID(hwndFrame, FID_MINMAX));
        }
@@ -1154 +1154 @@
             GetWindowTextA(OS2ToWin32Handle(hwndClient), buffer, sizeof(buffer));
             WinCreateFrameControls(hwndFrame, &FCData, buffer );
- 
+
             if (totalwidth != rc3.cx)
             {
@@ -1162 +1162 @@
               rc3.x = rc3.x + totalwidth;
             }
-             
-            WinSetWindowPos(WinWindowFromID(hwndFrame, FID_MINMAX),0,rc3.x,rc3.y,rc3.cx,rc3.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);     
-            WinSetWindowPos(WinWindowFromID(hwndFrame, FID_SYSMENU),0,rc2.x,rc2.y,rc2.cx,rc2.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);     
-            WinSetWindowPos(WinWindowFromID(hwndFrame, FID_TITLEBAR),0,rc1.x,rc1.y,rc1.cx,rc1.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);     
+
+            WinSetWindowPos(WinWindowFromID(hwndFrame, FID_MINMAX),0,rc3.x,rc3.y,rc3.cx,rc3.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);
+            WinSetWindowPos(WinWindowFromID(hwndFrame, FID_SYSMENU),0,rc2.x,rc2.y,rc2.cx,rc2.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);
+            WinSetWindowPos(WinWindowFromID(hwndFrame, FID_TITLEBAR),0,rc1.x,rc1.y,rc1.cx,rc1.cy, SWP_MOVE | SWP_SIZE | SWP_SHOW);
 
             if (WinQueryActiveWindow(HWND_DESKTOP) == hwndFrame)
@@ -1345 +1345 @@
 //******************************************************************************
 //******************************************************************************
+
+/* 'Private' PM property stuff. */
+PVOID APIENTRY WinQueryProperty(HWND hwnd, PCSZ pszNameOrAtom);
+PVOID APIENTRY WinRemoveProperty(HWND hwnd, PCSZ pszNameOrAtom);
+BOOL  APIENTRY WinSetProperty(HWND hwnd, PCSZ pszNameOrAtom, PVOID pvData, ULONG ulFlags);
+
+/**
+ * Set Property.
+ * @returns Success indicator.
+ * @param   hwnd    Window the property is associated with.
+ * @param   psz     The property atom or name.
+ * @param   pv      Property value.
+ * @param   fFlags  Flags. Use 0.
+ */
+BOOL    OSLibSetProperty(HWND hwnd, const char *psz, void *pv, unsigned fFlags)
+{
+    USHORT selFS = RestoreOS2FS();
+    BOOL fRet = WinSetProperty(hwnd, psz, pv, fFlags);
+    SetFS(selFS);
+    return fRet;
+}
+
+/**
+ * Get Property.
+ * @returns Property value.
+ * @param   hwnd    Window the property is associated with.
+ * @param   psz     The property atom or name.
+ */
+void *  OSLibQueryProperty(HWND hwnd, const char *psz)
+{
+    USHORT selFS = RestoreOS2FS();
+    void *pvRet = WinQueryProperty(hwnd, psz);
+    SetFS(selFS);
+    return pvRet;
+}
+
+/**
+ * Remove Property.
+ * @returns Property value.
+ * @param   hwnd    Window the property is associated with.
+ * @param   psz     The property atom or name.
+ */
+void *  OSLibRemoveProperty(HWND hwnd, const char *psz)
+{
+    USHORT selFS = RestoreOS2FS();
+    void *pvRet = WinRemoveProperty(hwnd, psz);
+    SetFS(selFS);
+    return pvRet;
+}
+

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.75 2003-04-11 15:22:33 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.76 2003-04-23 18:00:58 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -398 +398 @@
 
 
+void *  OSLibRemoveProperty(HWND hwnd, const char *psz);
+BOOL    OSLibSetProperty(HWND hwnd, const char *psz, void *pv, unsigned fFlags);
+void *  OSLibQueryProperty(HWND hwnd, const char *psz);
+
 #endif //__OSLIBWIN_H__

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

trunk/src/user32/user32dbg.def

@@ -1 @@
-; $Id: user32dbg.def,v 1.11 2003-03-03 16:36:26 sandervl Exp $
+; $Id: user32dbg.def,v 1.12 2003-04-23 18:00:59 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -36 +36 @@
 ;;;; Present in WGSS50
 ;;;;    _GpiQueryDCData             = PMGPI.665
+
+    WinQueryProperty  = PMMERGE.5450
+    WinRemoveProperty = PMMERGE.5451
+    WinSetProperty    = PMMERGE.5452
 
 EXPORTS

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.366 2003-04-11 15:22:33 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.367 2003-04-23 18:00:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2361 +2361 @@
     dwOldStyle = getStyle();
 
+    /*
+     * SW_SHOWDEFAULT is an reference to the startup info wShowWindow member.
+     */
+    if (nCmdShow == SW_SHOWDEFAULT)
+    {
+        nCmdShow = GetProcessDword(0, GPD_STARTF_SHOWWINDOW);
+        dprintf(("ShowWindow: GetProcessDword(0, GPD_STARTF_SHOWWINDOW) -> %x", nCmdShow));
+    }
+ 
+
     switch(nCmdShow)
     {

trunk/src/user32/win32wbaseprop.cpp

@@ -1 @@
-/* $Id: win32wbaseprop.cpp,v 1.1 2000-05-05 11:32:38 sandervl Exp $ */
+/* $Id: win32wbaseprop.cpp,v 1.2 2003-04-23 18:01:00 sandervl Exp $ */
 /*
  * Window properties
@@ -92 +92 @@
     {
         /* We need to create it */
-        if (!(prop = (PROPERTY *)HeapAlloc(GetProcessHeap(), 0, sizeof(*prop) )))
+        if (!(prop = (PROPERTY *)_smalloc(sizeof(*prop) )))
         {
              dprintf(("setProp: malloc failed!!"));
@@ -99 +99 @@
         if(HIWORD(str))
         {
-             if (!(prop->string = HEAP_strdupA(GetProcessHeap(), 0, str)))
+             unsigned cch = strlen(str) + 1;
+             if (!(prop->string = (LPSTR)_smalloc(cch)))
              {
-                HeapFree( GetProcessHeap(), 0, prop );
+                _sfree(prop);
                 return FALSE;
              }
+             memcpy(prop->string, str, cch);
         }
         else prop->string = (char *)str;  //atom
@@ -158 +160 @@
     *pprop = prop->next;
     if(HIWORD(prop->string))
-        HeapFree(GetProcessHeap(), 0, prop->string);
-    HeapFree( GetProcessHeap(), 0, prop );
+        _sfree(prop->string);
+    _sfree(prop);
     return handle;
 }
@@ -176 +178 @@
         next = prop->next;
         if(HIWORD(prop->string))
-            HeapFree(GetProcessHeap(), 0, prop->string);
-        HeapFree(GetProcessHeap(), 0, prop);
+            _sfree(prop->string);
+        _sfree(prop);
     }
     propertyList = NULL;

trunk/src/user32/win32wfake.cpp

@@ -1 @@
-/* $Id: win32wfake.cpp,v 1.2 2003-03-27 10:42:42 sandervl Exp $ */
+/* $Id: win32wfake.cpp,v 1.3 2003-04-23 18:01:01 sandervl Exp $ */
 /*
  * Win32 Fake Window Class for OS/2
@@ -24 +24 @@
 #include "dbglocal.h"
 
-//******************************************************************************
-//******************************************************************************
+/** The Odin HWND Property - must be unique for this (custom)build. */
+char Win32FakeWindow::szPropOdinHandle[64] = "OdinFakeHWND";
+/** Flag which tells if we've inited or not. */
+BOOL Win32FakeWindow::fInited = FALSE;
+
+/**
+ * Creates a fake Odin window for an existing OS/2 window.
+ *
+ * @returns odin handle to the fake window.
+ * @returns NULL on failure.
+ * @param   hwndOS2     Window handle.
+ * @param   classAtom   The atom of the Odin window class.
+ * @author  Sander van Leeuwen <sandervl@innotek.de>
+ * @author  knut st. osmundsen <bird@anduin.net>
+ */
 HWND WIN32API CreateFakeWindowEx(HWND  hwndOS2, ATOM  classAtom)
 {
     Win32FakeWindow *window;
 
+    /*
+     * Check if already faked - fail.
+     */
+    window = Win32FakeWindow::GetWindowFromOS2Handle(hwndOS2);
+    if (window)
+    {
+        dprintf(("CreateFakeWindowEx: already faked!!! (hwndOS2=%x hwndOdin=%x)",
+                 hwndOS2, window->getOS2WindowHandle()));
+        return NULL;
+    }
+
+    /*
+     * Now proceed.
+     */
     window = new Win32FakeWindow(hwndOS2, classAtom);
-    if(window == NULL)
-    {
-        dprintf(("Win32FakeWindow creation failed!!"));
+    if (window == NULL)
+    {
+        dprintf(("Win32FakeWindow creation failed for %x!!!", hwndOS2));
         return 0;
     }
     HWND hwnd = window->getWindowHandle();
-  
+
     // set myself as last active popup / window
     window->setLastActive( hwnd );
-  
+
     RELEASE_WNDOBJ(window);
+    dprintf(("CreateFakeWindowEx: created %x for %x", hwnd, hwndOS2));
     return hwnd;
 }
@@ -51 +79 @@
 
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
+    if (!window) {
         dprintf(("DestroyFakeWindow, window %x not found", hwnd));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -64 +92 @@
                      : Win32BaseWindow()
 {
+    if (!fInited)  init();
+
     OS2Hwnd = OS2HwndFrame = hwndOS2;
 
@@ -93 +123 @@
     OSLibQueryWindowRectAbsolute (OS2Hwnd, &rectWindow);
 
+    //Store the window handle as a property of the OS/2 window.
+    if (!OSLibSetProperty(OS2Hwnd, szPropOdinHandle, (void*)getWindowHandle(), 0))
+    {
+        dprintf(("%s: f**k! WinSetProperty(%x,%s,%x,0) failed!!!", __FUNCTION__,
+                 hwndOS2, szPropOdinHandle, getWindowHandle()));
+    }
+
+    //See if parent window is either odin or fake window.
+    Win32BaseWindow * pParent = NULL;
+    HWND hwndParentOS2 = OSLibWinQueryWindow(OS2Hwnd, QWOS_PARENT);
+    if (hwndParentOS2 != OSLIB_HWND_DESKTOP)
+    {
+        pParent = Win32FakeWindow::GetWindowFromOS2Handle(hwndParentOS2);
+        if (!pParent)
+            pParent = Win32BaseWindow::GetWindowFromOS2Handle(hwndParentOS2);
+        if (pParent)
+        {
+            setParent(pParent);
+            dprintf(("%s: hwndParentOS2=%x %s window, set as parent.", __FUNCTION__,
+                     hwndParentOS2, pParent->isFakeWindow() ? "fake" : "odin"));
+            dwStyle |= WS_CHILD;
+        }
+        else
+        {
+            dprintf(("%s: hwndParentOS2=%x but not a fake nor odin window.", __FUNCTION__, hwndParentOS2));
+        }
+    }
+
+    //See if owner widnow is either odin or fake window.
+    HWND hwndOwnerOS2 = OSLibWinQueryWindow(OS2Hwnd, QWOS_OWNER);
+    if (hwndOwnerOS2 != OSLIB_HWND_DESKTOP)
+    {
+        Win32BaseWindow * pOwner;
+        if (hwndOwnerOS2 == hwndParentOS2)
+            pOwner = pParent;
+        else
+        {
+            pOwner = Win32FakeWindow::GetWindowFromOS2Handle(hwndOwnerOS2);
+            if (!pOwner)
+                pOwner = Win32BaseWindow::GetWindowFromOS2Handle(hwndOwnerOS2);
+        }
+        if (pOwner)
+        {
+            setOwner(pOwner);
+            dprintf(("%s: hwndOwnerOS2=%x %s window, set as owner.", __FUNCTION__,
+                     hwndOwnerOS2, pOwner->isFakeWindow() ? "fake" : "odin"));
+            dwStyle |= WS_CHILD;
+        }
+        else
+        {
+            dprintf(("%s: hwndOwnerOS2=%x but not a fake nor odin window.", __FUNCTION__, hwndOwnerOS2));
+        }
+    }
+
+
     setOldPMWindowProc(PMWinSubclassFakeWindow(OS2Hwnd));
 }
@@ -99 +184 @@
 Win32FakeWindow::~Win32FakeWindow()
 {
-
+    OSLibRemoveProperty(OS2Hwnd, szPropOdinHandle);
 }
 //******************************************************************************
 //******************************************************************************
 PRECT Win32FakeWindow::getWindowRect()
-{ 
+{
     //the coordinates can change without us being notified, so recheck every time
-    OSLibQueryWindowRectAbsolute (OS2Hwnd, &rectWindow);
-    return &rectWindow; 
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32FakeWindow::SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, 
+
+    Win32BaseWindow * pParent = getParent();
+    if (pParent)
+    {
+        SWP     swp;
+        if (OSLibWinQueryWindowPos(OS2Hwnd, &swp))
+        {
+            ULONG y = pParent->getWindowHeight();
+            rectWindow.left   = swp.x;
+            rectWindow.right  = swp.x + swp.cx;
+            rectWindow.top    = y - swp.y - swp.cy;
+            rectWindow.bottom = y - swp.y;
+        }
+    }
+    else
+        OSLibQueryWindowRectAbsolute(OS2Hwnd, &rectWindow);
+
+    return &rectWindow;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32FakeWindow::SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx,
                                    int cy, UINT fuFlags, BOOL fShowWindow)
 {
+    // we don't trust input either.
     dprintf(("Win32FakeWindow::SetWindowPos; don't change window position, just update internal position"));
 
-    //We pretend this window has no parent and its position is in screen coordinates
     OSLibWinQueryWindowClientRect(OS2Hwnd, &rectClient);
-    OSLibQueryWindowRectAbsolute (OS2Hwnd, &rectWindow);
-
+    getWindowRect();
     return TRUE;
 }
@@ -130 +230 @@
 //******************************************************************************
 //******************************************************************************
+
+/**
+ * Locates window in linked list and increases reference count if found.
+ * The window object msut be unreferenced after usage.
+ *
+ * @returns Pointer to fake window.
+ * @returns NULL if not found.
+ * @param   hwndOS2     OS/2 window handle of the fake window.
+ */
+Win32FakeWindow *Win32FakeWindow::GetWindowFromOS2Handle(HWND hwndOS2)
+{
+    if (fInited)    init();
+
+    HWND hwnd = (HWND)OSLibQueryProperty(hwndOS2, szPropOdinHandle);
+    Win32BaseWindow *pWindow = GetWindowFromHandle(hwnd);
+    if (pWindow)
+    {
+        if (pWindow->isFakeWindow())
+            return (Win32FakeWindow*)pWindow;
+        DebugInt3();
+    }
+    dprintf(("Win32FakeWindow::GetWindowFromOS2Handle(%x) -> null", hwndOS2));
+    return NULL;
+}
+
+
+/**
+ * Init the global(s).
+ * It will make the name property unique among the odin instances.
+ *
+ * This will chagne szPropOdinHandle and fInited.
+ */
+void     Win32FakeWindow::init()
+{
+    if (fInited)
+        return;
+
+    /*
+     * Get the name of this dll.
+     */
+    extern int _System DosQueryModFromEIP(HMODULE *phMod, ULONG *pObjNum, ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, ULONG Address);
+    char        szModName[260];
+    HMODULE     hmod;
+    ULONG       iObj, offObj;
+    USHORT      GetFS();
+    int rc = DosQueryModFromEIP(&hmod, &iObj, sizeof(szModName), &szModName[0], &offObj, (ULONG)Win32FakeWindow::init);
+    SetFS(rc);
+    if (rc)
+    {
+        dprintf(("Win32FakeWindow::init: DosQueryModFromEIP failed!!!"));
+        DebugInt3();
+        return;
+    }
+    char *psz = strrchr(szModName, '\\');
+    if (!psz)
+        psz = szModName;
+    if (strchr(szModName, '.'))
+        *strchr(szModName, '.') = '\0';
+
+    fInited = 1;
+    strcat(szPropOdinHandle, psz);
+    dprintf(("Win32FakeWindow::init: szPropOdinHandle='%s'", szPropOdinHandle));
+}
+

trunk/src/user32/win32wfake.h

@@ -1 @@
-/* $Id: win32wfake.h,v 1.2 2003-03-27 10:42:42 sandervl Exp $ */
+/* $Id: win32wfake.h,v 1.3 2003-04-23 18:01:01 sandervl Exp $ */
 /*
  * Win32 Fake Window Class for OS/2
@@ -26 +26 @@
 virtual  BOOL   isFakeWindow();
 
+static Win32FakeWindow *GetWindowFromOS2Handle(HWND hwnd);
+static void     init();
+static char     szPropOdinHandle[64];
+static BOOL     fInited;
+
 protected:
 private: