Changeset 822 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

compile fixes

Location:

trunk/src/user32/new

Files:

• makefile (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (3 diffs)

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.42 1999-09-04 19:42:27 sandervl Exp $
+# $Id: makefile,v 1.43 1999-09-04 19:51:46 sandervl Exp $
 
 #
@@ -102 +102 @@
 pmwindow.obj:   pmwindow.cpp win32class.h win32wbase.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h oslibgdi.h oslibwin.h
 win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h
-win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h open32wbase.h
+win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h 
 win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
 win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.27 1999-09-04 17:56:40 dengert Exp $ */
+/* $Id: pmwindow.cpp,v 1.28 1999-09-04 19:51:46 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -131 +131 @@
     case WM_CLOSE:
         dprintf(("OS2: WM_CLOSE %x", hwnd));
-        win32wnd->RemoveFakeOpen32();
+//        win32wnd->RemoveFakeOpen32();
         if(win32wnd->MsgClose()) {
                 goto RunDefWndProc;

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;

trunk/src/user32/new/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.5 1999-09-04 19:42:29 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.6 1999-09-04 19:51:47 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -17 +17 @@
 
 #include <win32class.h>
-#include "open32wbase.h"
+//#include "open32wbase.h"
 #include <gen_object.h>
 #include <win32wndchild.h>
@@ -271 +271 @@
 
 public:
-       void SetFakeOpen32()    { WinSetDAXData (OS2Hwnd, &fakeWinBase); }
-       void RemoveFakeOpen32() { WinSetDAXData (OS2Hwnd, NULL); }
-
-  fakeOpen32WinBaseClass fakeWinBase;
+//       void SetFakeOpen32()    { WinSetDAXData (OS2Hwnd, &fakeWinBase); }
+//       void RemoveFakeOpen32() { WinSetDAXData (OS2Hwnd, NULL); }
+
+//  fakeOpen32WinBaseClass fakeWinBase;
 };