Changeset 2033 for trunk/src/user32/win32wbase.cpp

Timestamp:

Dec 9, 1999, 1:54:05 AM (26 years ago)

Author:

sandervl

Message:

Unicode <-> Ascii translation changes + fixes for window procedures

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.107 1999-12-07 20:43:39 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.108 1999-12-09 00:53:37 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -268 +268 @@
 //******************************************************************************
 //******************************************************************************
+BOOL Win32BaseWindow::IsWindowUnicode()
+{
+    return (WINPROC_GetProcType(getWindowProc()) == WIN_PROC_32W);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL Win32BaseWindow::CreateWindowExA(CREATESTRUCTA *cs, ATOM classAtom)
 {
@@ -434 +440 @@
   }
 
-  setWindowProc(windowClass->getWindowProc());
+  WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, windowClass->getWindowProc(), (isUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
   hInstance = cs->hInstance;
   dwStyle   = cs->style & ~WS_VISIBLE;
@@ -627 +633 @@
   /* Get class or window DC if needed */
   if(windowClass->getStyle() & CS_OWNDC) {
-        dprintf(("Class with CS_OWNDC style"));
-//      ownDC = GetWindowDC(getWindowHandle());
-  }
-  else 
+    dprintf(("Class with CS_OWNDC style"));
+//  ownDC = GetWindowDC(getWindowHandle());
+  }
+  else
   if (windowClass->getStyle() & CS_PARENTDC)  {
-        dprintf(("ERROR: Class with CS_PARENTDC style -> NOT IMPLEMENTED!"));
-        ownDC = 0;
+    dprintf(("ERROR: Class with CS_PARENTDC style -> NOT IMPLEMENTED!"));
+    ownDC = 0;
   }
   else
   if (windowClass->getStyle() & CS_CLASSDC)  {
-        dprintf(("ERROR: Class with CS_CLASSDC style -> NOT IMPLEMENTED!"));
-        ownDC = 0;
+    dprintf(("ERROR: Class with CS_CLASSDC style -> NOT IMPLEMENTED!"));
+    ownDC = 0;
   }
   /* Set the window menu */
@@ -1519 +1525 @@
 //******************************************************************************
 //******************************************************************************
-LRESULT Win32BaseWindow::DefWindowProcA(UINT Msg, WPARAM wParam, LPARAM lParam, BOOL fReentered)
-{
-    //Lotus Notes v5.0.1 calls SetWindowTextA for unicode static window -> calls DefWindowProcA
-    if(IsUnicode() && !fReentered) {
-        return DefWindowProcW(Msg, wParam, lParam);
-    }
+LRESULT Win32BaseWindow::DefWindowProcA(UINT Msg, WPARAM wParam, LPARAM lParam)
+{
     switch(Msg)
     {
@@ -1777 +1779 @@
 
     case WM_NOTIFYFORMAT:
-        if (IsUnicode()) return NFR_UNICODE;
+        if (IsWindowUnicode()) return NFR_UNICODE;
         else return NFR_ANSI;
 
@@ -1851 +1853 @@
 
     default:
-        return DefWindowProcA(Msg, wParam, lParam, TRUE);
+        return DefWindowProcA(Msg, wParam, lParam);
     }
 }
@@ -2950 +2952 @@
 BOOL Win32BaseWindow::SetWindowTextA(LPSTR lpsz)
 {
-    //hmm. Notes v5.0.1 creates static window with CreateWindowExW and calls this...
-    if(IsUnicode() && lpsz) {
-        LPWSTR lpWindowNameW = (LPWSTR)alloca((strlen(lpsz)+1)*sizeof(WCHAR));
-        lstrcpyAtoW(lpWindowNameW, lpsz);
-
-        return SendInternalMessageW(WM_SETTEXT,0,(LPARAM)lpWindowNameW);
-    }
     return SendInternalMessageA(WM_SETTEXT,0,(LPARAM)lpsz);
 }
@@ -2975 +2970 @@
 //******************************************************************************
 //******************************************************************************
-LONG Win32BaseWindow::SetWindowLongA(int index, ULONG value)
+LONG Win32BaseWindow::SetWindowLongA(int index, ULONG value, BOOL fUnicode)
 {
  LONG oldval;
@@ -3018 +3013 @@
         }
         case GWL_WNDPROC:
-                oldval = (LONG)getWindowProc();
-                setWindowProc((WNDPROC)value);
+                oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+                WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
                 return oldval;
         case GWL_HINSTANCE:
@@ -3048 +3043 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32BaseWindow::GetWindowLongA(int index)
+ULONG Win32BaseWindow::GetWindowLongA(int index, BOOL fUnicode)
 {
  ULONG value;
@@ -3060 +3055 @@
         break;
     case GWL_WNDPROC:
-        value = (ULONG)getWindowProc();
+        value = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         break;
     case GWL_HINSTANCE: