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

Timestamp:

Sep 4, 1999, 9:42:30 PM (26 years ago)

Author:

sandervl

Message:

Dialog changes

File:

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

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.21 1999-08-31 17:14:52 sandervl Exp $ */
+/* $Id: window.cpp,v 1.22 1999-09-04 19:42:30 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -558 +558 @@
     }
     dprintf(("GetWindowTextLength %x", hwnd));
-    return window->GetWindowTextLengthA();
+    return window->GetWindowTextLength();
 }
 //******************************************************************************
@@ -565 +565 @@
 {
    Win32BaseWindow *window;
+   int rc;
 
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
@@ -571 +572 @@
         return 0;
     }
-    dprintf(("GetWindowTextA %x", hwnd));
-    return window->GetWindowTextA(lpsz, cch);
+    rc = window->GetWindowText(lpsz, cch);
+    dprintf(("GetWindowTextA %x %s", hwnd, lpsz));
+    return rc;
 }
 //******************************************************************************
@@ -585 +587 @@
 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);
+   Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetWindowTextW, window %x not found", hwnd));
+        return 0;
+    }
+    dprintf(("GetWindowTextW %x", hwnd));
+    return window->GetWindowText((LPSTR)lpsz, cch);
 }
 //******************************************************************************
@@ -615 +613 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API SetWindowTextW( HWND arg1, LPCWSTR arg2)
-{
- char *astring = UnicodeToAsciiString((LPWSTR)arg2);
- BOOL  rc;
-
-   rc = SetWindowTextA(arg1, (LPCSTR)astring);
-   dprintf(("USER32:  SetWindowTextW %X %s returned %d\n", arg1, astring, rc));
-   FreeAsciiString(astring);
-   return(rc);
+BOOL WIN32API SetWindowTextW( HWND hwnd, LPCWSTR lpsz)
+{
+   Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetWindowTextA, window %x not found", hwnd));
+        return 0;
+    }
+    dprintf(("SetWindowTextW %x", hwnd));
+    return window->SetWindowText((LPSTR)lpsz);
 }
 /*******************************************************************