Changeset 5242 for trunk/src/user32/win32class.cpp

Timestamp:

Feb 22, 2001, 11:37:31 AM (25 years ago)

Author:

sandervl

Message:

window & class user word access fixes

File:

• trunk/src/user32/win32class.cpp (modified) (14 diffs)

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.22 2001-02-10 10:35:31 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.23 2001-02-22 10:37:30 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -104 +104 @@
   dprintf(("USER32:  wndclass->hIconSm %X\n", wndclass->hIconSm));
 
-  nrExtraClassWords     = wndclass->cbClsExtra;
-  nrExtraWindowWords    = wndclass->cbWndExtra;
+  nrExtraClassBytes     = wndclass->cbClsExtra;
+  nrExtraWindowBytes    = wndclass->cbWndExtra;
   backgroundBrush       = wndclass->hbrBackground;
   hCursor               = wndclass->hCursor;
@@ -123 +123 @@
 
   //User data class words/longs
-  if(nrExtraClassWords) {
-        userClassLong = (ULONG *)_smalloc(nrExtraClassWords);
-        if(userClassLong == NULL) {
-                dprintf(("Win32Class ctr: userClassLong == NULL!"));
+  if(nrExtraClassBytes) {
+        userClassBytes = (char *)_smalloc(nrExtraClassBytes);
+        if(userClassBytes == NULL) {
+                dprintf(("Win32Class ctr: userClassBytes == NULL!"));
                 exit(1);
         }
-        memset(userClassLong, 0, nrExtraClassWords);
-  }
-  else  userClassLong = NULL;
+        memset(userClassBytes, 0, nrExtraClassBytes);
+  }
+  else  userClassBytes = NULL;
 
   cWindows = 0;
@@ -151 +151 @@
   WINPROC_FreeProc(windowProc, WIN_PROC_CLASS);
 
-  if(userClassLong)     free(userClassLong);
+  if(userClassBytes)    free(userClassBytes);
   if(classNameA)        free(classNameA);
   if(classNameW)        free(classNameW);
@@ -251 +251 @@
 
   if(HIWORD(id)) {
-        lpszClassName = UnicodeToAsciiString((LPWSTR)id);
-  }
-  else  lpszClassName = (LPSTR)id;
+    lpszClassName = UnicodeToAsciiString((LPWSTR)id);
+  }
+  else  lpszClassName = (LPSTR)id;
 
   winclass = FindClass(hInstance, lpszClassName);
@@ -278 +278 @@
 BOOL Win32WndClass::getClassInfo(WNDCLASSEXA *wndclass)
 {
-  wndclass->cbClsExtra    = nrExtraClassWords;
-  wndclass->cbWndExtra    = nrExtraWindowWords;
+  wndclass->cbClsExtra    = nrExtraClassBytes;
+  wndclass->cbWndExtra    = nrExtraWindowBytes;
   wndclass->hbrBackground = backgroundBrush;
   wndclass->hCursor       = hCursor;
@@ -295 +295 @@
 BOOL Win32WndClass::getClassInfo(WNDCLASSEXW *wndclass)
 {
-  wndclass->cbClsExtra    = nrExtraClassWords;
-  wndclass->cbWndExtra    = nrExtraWindowWords;
+  wndclass->cbClsExtra    = nrExtraClassBytes;
+  wndclass->cbWndExtra    = nrExtraWindowBytes;
   wndclass->hbrBackground = backgroundBrush;
   wndclass->hCursor       = hCursor;
@@ -376 +376 @@
   switch(index) {
         case GCL_CBCLSEXTRA:
-                return nrExtraClassWords;
+                return nrExtraClassBytes;
         case GCL_CBWNDEXTRA:
-                return nrExtraWindowWords;
+                return nrExtraWindowBytes;
         case GCL_HBRBACKGROUND:
                 return backgroundBrush;
@@ -399 +399 @@
                 return 0;
         default:
-                if(index > 0 && index < nrExtraClassWords - sizeof(ULONG)) {
-                        return userClassLong[index];
-                }
+                if(index >= 0 && index + sizeof(ULONG) <= nrExtraClassBytes) {
+                        //Note: NT4, SP6 does not set the last error to 0
+                        SetLastError(ERROR_SUCCESS);
+                        return *(ULONG *)(userClassBytes + index);
+                }
+                if(classNameA) {
+                     dprintf2(("WARNING: getClassLong %s: %d -> wrong INDEX", classNameA, index));
+                }
+                else dprintf2(("WARNING: getClassLong %d: %d -> wrong INDEX", classAtom, index));
                 SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
                 return 0;
@@ -414 +420 @@
                 return (WORD)classAtom;
         default:
-                if(index > 0 && index < nrExtraClassWords - sizeof(WORD)) {
-                        return ((WORD *)userClassLong)[index];
-                }
+                if(index >= 0 && index + sizeof(WORD) <= nrExtraClassBytes) {
+                        //Note: NT4, SP6 does not set the last error to 0
+                        SetLastError(ERROR_SUCCESS);
+                        return *(WORD *)(userClassBytes + index);
+                }
+                if(classNameA) {
+                     dprintf2(("WARNING: getClassWord %s: %d -> wrong INDEX", classNameA, index));
+                }
+                else dprintf2(("WARNING: getClassWord %d: %d -> wrong INDEX", classAtom, index));
                 SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
                 return 0;
@@ -430 +442 @@
   switch(index) {
         case GCL_CBCLSEXTRA: //TODO (doesn't affect allocated classes, so what does it do?)
-                rc = nrExtraClassWords;
-//              nrExtraClassWords = lNewVal;
+                rc = nrExtraClassBytes;
+//              nrExtraClassBytes = lNewVal;
                 break;
         case GCL_CBWNDEXTRA:
-                rc = nrExtraWindowWords;
-                nrExtraWindowWords = lNewVal;
+                rc = nrExtraWindowBytes;
+                nrExtraWindowBytes = lNewVal;
                 break;
         case GCL_HBRBACKGROUND:
@@ -466 +478 @@
                 break;
         case GCL_WNDPROC:
-                //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)
-                //TODO: Is that also true for GCL_WNDPROC???????????????
+                //TODO: Is that also true for GCL_WNDPROC???????????????
                 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 );
@@ -478 +490 @@
                 return 0;
         default:
-                if(index > 0 && index < nrExtraClassWords - sizeof(ULONG)) {
-                        rc = userClassLong[index];
-                        userClassLong[index] = lNewVal;
+                if(index >= 0 && index + sizeof(ULONG) <= nrExtraClassBytes) {
+                        rc = *(ULONG *)(userClassBytes + index);
+                        *(ULONG *)(userClassBytes + index) = lNewVal;
                         break;
                 }
                 SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
-                if(classNameA) {
-                      dprintf2(("WARNING: Win32WndClass::setClassLongA %s: %d %x -> wrong INDEX", classNameA, index, lNewVal));
-                }
-                else  dprintf2(("WARNING: Win32WndClass::setClassLongA %d: %d %x -> wrong INDEX", classAtom, index, lNewVal));
+                if(classNameA) {
+                     dprintf2(("WARNING: Win32WndClass::setClassLongA %s: %d %x -> wrong INDEX", classNameA, index, lNewVal));
+                }
+                else dprintf2(("WARNING: Win32WndClass::setClassLongA %d: %d %x -> wrong INDEX", classAtom, index, lNewVal));
                 return 0;
   }
@@ -509 +521 @@
                 return(rc);
         default:
-                if(index > 0 && index < nrExtraClassWords - sizeof(WORD)) {
-                        rc = ((WORD *)userClassLong)[index];
-                        ((WORD *)userClassLong)[index] = wNewVal;
+                if(index >= 0 && index + sizeof(WORD) <= nrExtraClassBytes) {
+                        rc = *(WORD *)(userClassBytes + index);
+                        *(WORD *)(userClassBytes + index) = wNewVal;
+                        //Note: NT4, SP6 does not set the last error to 0
+                        SetLastError(ERROR_SUCCESS);
                         return(rc);
                 }
                 SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
+                if(classNameA) {
+                     dprintf2(("WARNING: setClassWord %s: %d %x -> wrong INDEX", classNameA, index, wNewVal));
+                }
+                else dprintf2(("WARNING: setClassWord %d: %d %x -> wrong INDEX", classAtom, index, wNewVal));
                 return 0;
   }