Changeset 6019 for trunk/src

Timestamp:

Jun 15, 2001, 4:07:22 PM (24 years ago)

Author:

sandervl

Message:

dialog + os/2 frame control fixes

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• oslibwin.cpp (modified) (4 diffs)
• win32dlg.cpp (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.57 2001-06-14 11:30:55 sandervl Exp $
+; $Id: USER32.DEF,v 1.58 2001-06-15 14:07:21 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -694 +694 @@
     _checkOrigin@4                                               @2029 NONAME
 
+    ; Do NOT change this ordinal
     _SetWindowAppearance@4                                       @2030 NONAME

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.101 2001-06-14 11:30:55 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.102 2001-06-15 14:07:22 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -96 +96 @@
     if(fOS2Look && *hwndFrame) {
         FCData.flCreateFlags = dwOSFrameStyle;
+//        FCData.flCreateFlags = FCF_TITLEBAR|FCF_SYSMENU|FCF_MINMAX;
         WinCreateFrameControls(*hwndFrame, &FCData, NULL);
     }
@@ -199 +200 @@
           i++;
       }
-      else return; //no titlebar -> no frame controls
+      else return FALSE; //no titlebar -> no frame controls
   }
   if((dwStyle & WS_MINIMIZEBOX_W) || (dwStyle & WS_MAXIMIZEBOX_W) || (dwStyle & WS_SYSMENU_W)) {
@@ -890 +891 @@
          WinSetWindowULong(hwndFrame, QWL_STYLE, dwWinStyle);
     }
+    if(fOS2Look) {
+        ULONG OSFrameStyle = 0;
+        if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W) {
+            if(WinWindowFromID(hwndFrame, FID_TITLEBAR) == 0) {
+                OSFrameStyle = FCF_TITLEBAR;
+            }
+            if((dwStyle & WS_SYSMENU_W) && !(dwExStyle & WS_EX_TOOLWINDOW_W))
+            {
+                if(WinWindowFromID(hwndFrame, FID_SYSMENU) == 0) {
+                    OSFrameStyle |= FCF_SYSMENU;
+                }
+            }
+            if((dwStyle & WS_MINIMIZEBOX_W) || (dwStyle & WS_MAXIMIZEBOX_W)) {
+                if(WinWindowFromID(hwndFrame, FID_MINMAX) == 0) {
+                    OSFrameStyle |= FCF_MINMAX;
+                }
+            }
+            else
+            if(dwStyle & WS_SYSMENU_W) {
+                if(WinWindowFromID(hwndFrame, FID_MINMAX) == 0) {
+                    OSFrameStyle |= FCF_CLOSEBUTTON;
+                }
+            }
+        }
+        if(OSFrameStyle) {
+            FRAMECDATA FCData = {sizeof (FRAMECDATA), 0, 0, 0};
+
+            FCData.flCreateFlags = OSFrameStyle;
+            WinCreateFrameControls(hwndFrame, &FCData, NULL);
+        }
+    }
 }
 //******************************************************************************

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.69 2001-06-13 17:28:06 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.70 2001-06-15 14:07:22 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -646 +646 @@
     {
         info->windowName = (LPCSTR)(UINT)GET_WORD(p + 1);
-        p = (WORD *)((char *)p+3);
+        //Wine add 3 (bytes) here. But that causes problems with certain
+        //InstallShield installers.
+        p += 2;
     }
     else