Changeset 7241 for trunk/src

Timestamp:

Oct 28, 2001, 11:38:14 AM (24 years ago)

Author:

sandervl

Message:

setwindowlong fix for dialogs

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (5 diffs)
• win32dlg.h (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbase.h (modified) (3 diffs)
• windowword.cpp (modified) (5 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.70 2001-06-15 14:07:22 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.71 2001-10-28 10:38:13 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -1083 +1083 @@
     dialogFlags |= DF_END;
     idResult = retval;
+
     return TRUE;
 }
 //******************************************************************************
 //******************************************************************************
-LONG Win32Dialog::SetWindowLongA(int index, ULONG value, BOOL fUnicode)
+LONG Win32Dialog::SetWindowLong(int index, ULONG value, BOOL fUnicode)
 {
     LONG oldval;
@@ -1096 +1097 @@
     case DWL_DLGPROC:
     {
-    //Note: Type of SetWindowLong determines new window proc type
+        //Note: Type of SetWindowLong determines new window proc type
         //      UNLESS the new window proc has already been registered
         //      (use the old type in that case)
         //      (VERIFIED in NT 4, SP6)
         WINDOWPROCTYPE type = WINPROC_GetProcType((HWINDOWPROC)value);
-    if(type == WIN_PROC_INVALID) {
-        type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
-    }
+        if(type == WIN_PROC_INVALID) {
+            type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
+        }
         oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, type, WIN_PROC_WINDOW);
@@ -1117 +1118 @@
         return oldval;
     default:
-        return Win32BaseWindow::SetWindowLongA(index, value);
-    }
-}
-//******************************************************************************
-//******************************************************************************
-ULONG Win32Dialog::GetWindowLongA(int index, BOOL fUnicode)
+        return Win32BaseWindow::SetWindowLong(index, value, fUnicode);
+    }
+}
+//******************************************************************************
+//******************************************************************************
+ULONG Win32Dialog::GetWindowLong(int index, BOOL fUnicode)
 {
     dprintf2(("Win32Dialog::GetWindowLongA %x %d", getWindowHandle(), index));
@@ -1134 +1135 @@
         return userDlgData;
     default:
-        return Win32BaseWindow::GetWindowLongA(index);
+        return Win32BaseWindow::GetWindowLong(index, fUnicode);
     }
 }

trunk/src/user32/win32dlg.h

@@ -1 @@
-/* $Id: win32dlg.h,v 1.13 2001-06-09 14:50:21 sandervl Exp $ */
+/* $Id: win32dlg.h,v 1.14 2001-10-28 10:38:13 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -75 +75 @@
 virtual  ULONG  MsgCreate(HWND hwndOS2);
 
-virtual  LONG   SetWindowLongA(int index, ULONG value, BOOL fUnicode = FALSE);
-virtual  ULONG  GetWindowLongA(int index, BOOL fUnicode = FALSE);
+virtual  LONG   SetWindowLong(int index, ULONG value, BOOL fUnicode);
+virtual  ULONG  GetWindowLong(int index, BOOL fUnicode);
 
 static   ULONG  GetDialogBaseUnits()  { return MAKELONG(xBaseUnit, yBaseUnit); };

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.296 2001-10-25 10:40:45 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.297 2001-10-28 10:38:13 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3589 +3589 @@
 //******************************************************************************
 //******************************************************************************
-LONG Win32BaseWindow::SetWindowLongA(int index, ULONG value, BOOL fUnicode)
+LONG Win32BaseWindow::SetWindowLong(int index, ULONG value, BOOL fUnicode)
 {
  LONG oldval;
@@ -3699 +3699 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32BaseWindow::GetWindowLongA(int index, BOOL fUnicode)
+ULONG Win32BaseWindow::GetWindowLong(int index, BOOL fUnicode)
 {
  ULONG value;

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.131 2001-10-17 14:30:10 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.132 2001-10-28 10:38:14 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -34 +34 @@
 #define WINDOWFLAG_ACTIVE         1
 
-#define WIN32PM_MAGIC           0x12345678
-#define CheckMagicDword(a)      (a==WIN32PM_MAGIC)
+#define WIN32PM_MAGIC             0x12345678
+#define CheckMagicDword(a)        (a==WIN32PM_MAGIC)
+
+#define TYPE_ASCII                0
+#define TYPE_UNICODE              1
 
 #define GW_HWNDNEXTCHILD          (0x10000 | GW_HWNDNEXT)
@@ -165 +168 @@
          VOID   updateWindowStyle(DWORD oldExStyle,DWORD oldStyle);
 
-virtual  LONG   SetWindowLongA(int index, ULONG value, BOOL fUnicode = FALSE);
-virtual  ULONG  GetWindowLongA(int index, BOOL fUnicode = FALSE);
+virtual  LONG   SetWindowLong(int index, ULONG value, BOOL fUnicode);
+virtual  ULONG  GetWindowLong(int index, BOOL fUnicode);
 virtual  WORD   SetWindowWord(int index, WORD value);
 virtual  WORD   GetWindowWord(int index);

trunk/src/user32/windowword.cpp

@@ -1 @@
-/* $Id: windowword.cpp,v 1.11 2001-06-09 14:50:26 sandervl Exp $ */
+/* $Id: windowword.cpp,v 1.12 2001-10-28 10:38:14 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
     if(window)
     {
-        ret = window->SetWindowLongA(nIndex,lNewLong);
+        ret = window->SetWindowLong(nIndex,lNewLong, TYPE_ASCII);
         RELEASE_WNDOBJ(window);
         return ret;
@@ -48 +48 @@
     if(window)
     {
-        ret = window->SetWindowLongA(nIndex,lNewLong, TRUE);
+        ret = window->SetWindowLong(nIndex,lNewLong, TYPE_UNICODE);
         RELEASE_WNDOBJ(window);
         return ret;
@@ -110 +110 @@
     if(window)
     {
-        ret = window->GetWindowLongA(nIndex);
+        ret = window->GetWindowLong(nIndex, TYPE_ASCII);
         RELEASE_WNDOBJ(window);
         return ret;
@@ -131 +131 @@
     if(window)
     {
-        ret = window->GetWindowLongA(nIndex, TRUE);
+        ret = window->GetWindowLong(nIndex, TYPE_UNICODE);
         RELEASE_WNDOBJ(window);
         return ret;