Changeset 391 for trunk/src/user32/new/window.cpp

Timestamp:

Jul 25, 1999, 11:19:22 AM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

• trunk/src/user32/new/window.cpp (modified) (5 diffs)

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.9 1999-07-24 14:01:45 sandervl Exp $ */
+/* $Id: window.cpp,v 1.10 1999-07-25 09:19:22 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -299 +299 @@
 //******************************************************************************
 //******************************************************************************
-HDC WIN32API GetWindowDC(HWND arg1)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetWindowDC\n");
-#endif
-    return O32_GetWindowDC(arg1);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API EnableWindow( HWND hwnd, BOOL fEnable)
 {
@@ -374 +365 @@
     dprintf(("USER32:  SetWindowPlacement\n"));
     return O32_SetWindowPlacement(arg1, arg2);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetWindowPlacement( HWND arg1, LPWINDOWPLACEMENT arg2)
+{
+#ifdef DEBUG
+    WriteLog("USER32:  GetWindowPlacement\n");
+#endif
+    return O32_GetWindowPlacement(arg1, arg2);
 }
 //******************************************************************************
@@ -455 +455 @@
              ptIcon));
 
-    if (O32_GetWindowPlacement( hwnd, &wndpl ))
+    if (GetWindowPlacement( hwnd, &wndpl ))
     {
         if (rectWnd) *rectWnd = wndpl.rcNormalPosition;
@@ -537 +537 @@
     dprintf(("GetWindowTextA %x", hwnd));
     return window->GetWindowTextA(lpsz, cch);
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API GetWindowTextLengthW( HWND hwnd)
+{
+    dprintf(("USER32:  GetWindowTextLengthW\n"));
+    return GetWindowTextLengthA(hwnd);
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API GetWindowTextW(HWND hwnd, LPWSTR lpsz, int cch)
+{
+ char title[128];
+ int  rc;
+
+   rc = O32_GetWindowText(hwnd, title, sizeof(title));
+#ifdef DEBUG
+   WriteLog("USER32:  GetWindowTextW returned %s\n", title);
+#endif
+   if(rc > cch) {
+    title[cch-1] = 0;
+    rc = cch;
+   }
+   AsciiToUnicode(title, lpsz);
+   return(rc);
 }
 //******************************************************************************