Changeset 10031 for trunk/src/user32/oslibwin.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/oslibwin.cpp (modified) (22 diffs)

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;
+}
+