Changeset 325 for trunk/src/user32/new/oslibwin.cpp

Timestamp:

Jul 18, 1999, 12:39:52 PM (26 years ago)

Author:

sandervl

Message:

Lots of changes

File:

• trunk/src/user32/new/oslibwin.cpp (modified) (9 diffs)

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.9 1999-07-17 18:30:51 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.10 1999-07-18 10:39:51 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -22 +22 @@
 #include "oslibutil.h"
 #include "oslibmsg.h"
+#include "oslibgdi.h"
 #include "pmwindow.h"
 
@@ -41 +42 @@
 {
  HWND  hwndClient;
- RECTL rectl;
 
   dprintf(("WinCreateWindow %x %x %x %s", hwndParent, dwWinStyle, dwFrameStyle, pszName));
@@ -53 +53 @@
   if(dwFrameStyle) {
         dwWinStyle &= ~WS_CLIPCHILDREN; //invalid style according to docs
+        if(pszName)
+                dwFrameStyle |= FCF_TITLEBAR;
+
         *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
                                        &dwFrameStyle, WIN32_STDCLASS,
-                                       "", 0, 0, 0, &hwndClient) != 0;
+                                       "", 0, 0, 0, &hwndClient);
         if(*hwndFrame) {
-                if(pszName) {
-                        WinSetWindowText(*hwndFrame, pszName);
-                }
+                if(pszName) {
+                        WinSetWindowText(*hwndFrame, pszName);
+                }
                 return hwndClient;
         }
@@ -158 +161 @@
 //******************************************************************************
 //******************************************************************************
-LONG OSLibWinQueryWindowTextLength(HWND hwnd)
-{
-  return WinQueryWindowTextLength(hwnd);
-}
-//******************************************************************************
-//******************************************************************************
-LONG OSLibWinQueryWindowText(HWND hwnd,LONG lLength,char* pun)
-{
-  return WinQueryWindowText(hwnd,lLength,pun);
-}
 //******************************************************************************
 //******************************************************************************
@@ -179 +172 @@
                           LONG cy, ULONG fl)
 {
- RECTL rectl;
- HWND  hwndParent;
-
   if(fl & SWP_MOVE) {
-        y = MapOS2ToWin32Y(hwnd, y);
-  }
+        y = MapOS2ToWin32Y(hwnd, cy, y);
+  }
+  dprintf(("WinSetWindowPos %x %x %d %d %d %d %x", hwnd, hwndInsertBehind, x, y, cx, cy, fl));
   return WinSetWindowPos(hwnd, hwndInsertBehind, x, y, cx, cy, fl);
 }
@@ -198 +189 @@
   if(rc == 0)
         dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
-  rc = WinSetWindowPos(hwnd, 0, 0, 0, 0, 0, fl);
+  rc = WinSetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, fl);
   if(rc == 0)
         dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
@@ -211 +202 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinQueryUpdateRect(HWND hwnd, PVOID pRect)
-{
-  return WinQueryUpdateRect(hwnd, (RECTL *)pRect);
+BOOL OSLibWinQueryUpdateRect(HWND hwnd, PRECT pRect)
+{
+ BOOL rc;
+ RECTLOS2 rectl;
+
+  rc = WinQueryUpdateRect(hwnd, (PRECTL)&rectl);
+  if(rc) {
+        MapOS2ToWin32Rectl(hwnd, &rectl, pRect);
+  }
+  return rc;
 }
 //******************************************************************************
@@ -296 +294 @@
 //******************************************************************************
 //******************************************************************************
-inline ULONG OS2TOWIN32POINT(RECTL *parent, RECTL *child, ULONG y)
-{
-  return (parent->yTop - parent->yBottom - (child->yTop - child->yBottom) - y - 1);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG MapOS2ToWin32Y(HWND hwndChild)
-{
- HWND  hwndParent;
- RECTL rectParent = {0}, rectChild = {0};
-
-   WinQueryWindowRect(hwndChild, &rectChild);
-   hwndParent = WinQueryWindow(hwndChild, QW_PARENT);
-   WinQueryWindowRect(hwndParent, &rectParent);
-   return OS2TOWIN32POINT(&rectParent, &rectChild, rectChild.yBottom);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG MapOS2ToWin32Y(HWND hwndChild, ULONG y)
-{
- HWND  hwndParent;
- RECTL rectParent = {0}, rectChild = {0};
-
-   WinQueryWindowRect(hwndChild, &rectChild);
-   hwndParent = WinQueryWindow(hwndChild, QW_PARENT);
-   WinQueryWindowRect(hwndParent, &rectParent);
-   return OS2TOWIN32POINT(&rectParent, &rectChild, y);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG MapOS2ToWin32Y(PRECTL rectParent, PRECTL rectChild, ULONG y)
-{
-   return OS2TOWIN32POINT(rectParent, rectChild, y);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG MapOS2ToWin32Y(PRECTL rectParent, HWND hwndChild, ULONG y)
-{
- RECTL rectChild = {0};
-
-   WinQueryWindowRect(hwndChild, &rectChild);
-   return OS2TOWIN32POINT(rectParent, &rectChild, y);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG MapOS2ToWin32Y(HWND hwndChild, PRECTL rectChild, ULONG y)
-{
- HWND  hwndParent;
- RECTL rectParent = {0};
-
-   hwndParent = WinQueryWindow(hwndChild, QW_PARENT);
-   WinQueryWindowRect(hwndParent, &rectParent);
-   return OS2TOWIN32POINT(&rectParent, rectChild, y);
-}
-//******************************************************************************
-//******************************************************************************
+LONG OSLibWinQueryWindowTextLength(HWND hwnd)
+{
+  return WinQueryWindowTextLength(hwnd);
+}
+//******************************************************************************
+//******************************************************************************
+LONG OSLibWinQueryWindowText(HWND hwnd, LONG length, LPSTR lpsz)
+{
+  return WinQueryWindowText(hwnd, length, lpsz);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinSetWindowText(HWND hwnd, LPSTR lpsz)
+{
+  return WinSetWindowText(hwnd, lpsz);
+}
+//******************************************************************************
+//******************************************************************************