Changeset 822 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Sep 4, 1999, 9:51:47 PM (26 years ago)

Author:

sandervl

Message:

compile fixes

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.7 1999-09-04 19:42:29 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.8 1999-09-04 19:51:46 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -429 +429 @@
 #endif
 
-  fakeWinBase.hwndThisObject = OS2Hwnd;
-  fakeWinBase.pWindowClass = windowClass;
-  *(PULONG)&fakeWinBase -= 0x90 - 8;
+//  fakeWinBase.hwndThisObject = OS2Hwnd;
+//  fakeWinBase.pWindowClass = windowClass;
+//  *(PULONG)&fakeWinBase -= 0x90 - 8;
 //  SetFakeOpen32();
 
@@ -1878 +1878 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32BaseWindow::IsWindow()
-{
-  return TRUE;
-}
-//******************************************************************************
-//******************************************************************************
 BOOL Win32BaseWindow::IsWindowEnabled()
 {
@@ -1911 +1905 @@
 //******************************************************************************
 //******************************************************************************
-int Win32BaseWindow::GetWindowTextLengthA()
-{
-    return OSLibWinQueryWindowTextLength(OS2Hwnd);
-}
-//******************************************************************************
-//******************************************************************************
-int Win32BaseWindow::GetWindowTextA(LPSTR lpsz, int cch)
-{
-    return OSLibWinQueryWindowText(OS2Hwnd, cch, lpsz);
+int Win32BaseWindow::GetWindowTextLength()
+{
+    return wndNameLength;
+}
+//******************************************************************************
+//******************************************************************************
+int Win32BaseWindow::GetWindowText(LPSTR lpsz, int cch)
+{
+    if(isUnicode == FALSE) {
+        strncpy(lpsz, windowNameA, cch);
+    }
+    else {
+        lstrcpynW((LPWSTR)lpsz, windowNameW, cch);
+    }
+    return wndNameLength;
 }
 //******************************************************************************
@@ -1926 +1926 @@
 {
     if(lpsz == NULL)
-        return FALSE;
+        return FALSE;
 
     if(isUnicode == FALSE) {
@@ -1942 +1942 @@
     wndNameLength = strlen(windowNameA)+1; //including 0 terminator
 
-    if(OS2Hwnd)
-        return OSLibWinSetWindowText(OS2Hwnd, (LPSTR)windowNameA);
+    if(OS2HwndFrame)
+        return OSLibWinSetWindowText(OS2HwndFrame, (LPSTR)windowNameA);
 
     return TRUE;