Changeset 2033 for trunk/src/user32/win32class.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/win32class.cpp (modified) (15 diffs)

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.6 1999-11-05 09:16:22 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.7 1999-12-09 00:53:36 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -23 +23 @@
 #include <win32class.h>
 #include <win32wnd.h>
+#include <win\winproc.h>
 
 static fDestroyAll = FALSE;
@@ -29 +30 @@
 //Win32WndClass methods:
 //******************************************************************************
-Win32WndClass::Win32WndClass(WNDCLASSEXA *wndclass, BOOL isUnicode) : GenericObject(&wndclasses, OBJTYPE_CLASS)
-{
-  this->isUnicode = isUnicode;
+Win32WndClass::Win32WndClass(WNDCLASSEXA *wndclass, BOOL fUnicode) : GenericObject(&wndclasses, OBJTYPE_CLASS)
+{
+  isUnicode = fUnicode;
   processId = 0;
 
@@ -59 +60 @@
                 AsciiToUnicode(classNameA, classNameW);
         }
-        classAtom = 0;
-        //SvL: If a system control has already be registered, use that atom instead
+    classAtom = 0;
+    //SvL: If a system control has already be registered, use that atom instead
         //     of creating a new one
-        if(wndclass->style & CS_GLOBALCLASS) {
-                classAtom = GlobalFindAtomA(classNameA);
-        }
-        if(!classAtom) classAtom = GlobalAddAtomA(classNameA);
+    if(wndclass->style & CS_GLOBALCLASS) {
+        classAtom = GlobalFindAtomA(classNameA);
+    }
+    if(!classAtom) classAtom = GlobalAddAtomA(classNameA);
   }
   else {
@@ -73 +74 @@
   }
   if(!(wndclass->style & CS_GLOBALCLASS)) {
-        processId = GetCurrentProcess();
+    processId = GetCurrentProcess();
   }
   menuNameA = 0;
@@ -105 +106 @@
 
   windowStyle           = wndclass->style;
-  windowProc            = wndclass->lpfnWndProc;
+  WINPROC_SetProc((HWINDOWPROC *)&windowProc, wndclass->lpfnWndProc, (isUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_CLASS);
 
   //User data class words/longs
@@ -126 +127 @@
 {
   if(classNameA) {
-        dprintf(("Win32WndClass dtor, destroy class %s\n", classNameA));
+    dprintf(("Win32WndClass dtor, destroy class %s\n", classNameA));
   }
 
   //SvL: Don't delete global classes
   if(classNameA && !(windowStyle & CS_GLOBALCLASS)) {
-        GlobalDeleteAtom(classAtom);
-  }
+    GlobalDeleteAtom(classAtom);
+  }
+
+  WINPROC_FreeProc(windowProc, WIN_PROC_CLASS);
 
   if(userClassLong)     free(userClassLong);
@@ -158 +161 @@
   }
   if(fUnicode) {
-        if(classNameW)
-                return (lstrcmpW(classNameW, (LPWSTR)classname) == 0);
-        return FALSE;
+        if(classNameW)
+            return (lstrcmpW(classNameW, (LPWSTR)classname) == 0);
+        return FALSE;
   }
   else {
-        if(classNameA)
-                return (strcmp(classNameA, classname) == 0);
-        return FALSE;
+        if(classNameA)
+            return (strcmp(classNameA, classname) == 0);
+        return FALSE;
   }
 }
@@ -234 +237 @@
 {
   if(windowStyle & CS_GLOBALCLASS)
-        return TRUE;
+    return TRUE;
 
   return curProcessId = processId;
@@ -251 +254 @@
   wndclass->lpszClassName = (classNameA) ? (LPCTSTR)classNameA : (LPCTSTR)classAtom;
   wndclass->style         = windowStyle;
-  wndclass->lpfnWndProc   = windowProc;
+  wndclass->lpfnWndProc   = (WNDPROC)getClassLongA(GCL_WNDPROC, FALSE);
   wndclass->hIconSm       = hIconSm;
   return(TRUE);
@@ -268 +271 @@
   wndclass->lpszClassName = (classNameW) ? (LPCWSTR)classNameW : (LPCWSTR)classAtom;
   wndclass->style         = windowStyle;
-  wndclass->lpfnWndProc   = windowProc;
+  wndclass->lpfnWndProc   = (WNDPROC)getClassLongA(GCL_WNDPROC, TRUE);
   wndclass->hIconSm       = hIconSm;
   return(TRUE);
@@ -335 +338 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32WndClass::getClassLongA(int index, BOOL isUnicode)
+ULONG Win32WndClass::getClassLongA(int index, BOOL fUnicode)
 {
   switch(index) {
@@ -355 +358 @@
                 return windowStyle;
         case GCL_WNDPROC:
-                return (ULONG)windowProc;
+                return (ULONG) WINPROC_GetProc(windowProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         case GCW_ATOM: //TODO: does this really happen in windows?
                 SetLastError(ERROR_INVALID_PARAMETER);
@@ -385 +388 @@
 //TODO: What effects what immediately?
 //******************************************************************************
-ULONG Win32WndClass::setClassLongA(int index, LONG lNewVal, BOOL isUnicode)
+ULONG Win32WndClass::setClassLongA(int index, LONG lNewVal, BOOL fUnicode)
 {
  ULONG rc;
@@ -423 +426 @@
                 break;
         case GCL_WNDPROC:
-                rc = (ULONG)windowProc;
-                windowProc = (WNDPROC)lNewVal;
+                rc = (LONG)WINPROC_GetProc(windowProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A );
+                WINPROC_SetProc((HWINDOWPROC *)&windowProc, (WNDPROC)lNewVal, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_CLASS );
                 break;
         case GCW_ATOM: //TODO: does this really happen in windows?