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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.241 2001-02-21 21:30:43 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.242 2001-02-22 10:37:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -110 +110 @@
   wndNameLength    = 0;
 
-  userWindowLong   = NULL;;
-  nrUserWindowLong = 0;
+  userWindowBytes  = NULL;;
+  nrUserWindowBytes= 0;
 
   magic            = WIN32PM_MAGIC;
@@ -214 +214 @@
         HwFreeWindowHandle(Win32Hwnd);
 
-    if(userWindowLong)
-        free(userWindowLong);
+    if(userWindowBytes)
+        free(userWindowBytes);
 
     if(windowNameA) {
@@ -393 +393 @@
 
     //Allocate window words
-    nrUserWindowLong = windowClass->getExtraWndWords();
-    if(nrUserWindowLong) {
-        userWindowLong = (ULONG *)_smalloc(nrUserWindowLong);
-        memset(userWindowLong, 0, nrUserWindowLong);
+    nrUserWindowBytes = windowClass->getExtraWndBytes();
+    if(nrUserWindowBytes) {
+        userWindowBytes = (char *)_smalloc(nrUserWindowBytes);
+        memset(userWindowBytes, 0, nrUserWindowBytes);
     }
 
@@ -3424 +3424 @@
 
         default:
-                if(index >= 0 && index/4 < nrUserWindowLong)
+                if(index >= 0 && index + sizeof(ULONG) <= nrUserWindowBytes)
                 {
-                    oldval = userWindowLong[index/4];
-                    userWindowLong[index/4] = value;
+                    oldval = *(ULONG *)(userWindowBytes + index);
+                    *(ULONG *)(userWindowBytes + index) = value;
                     break;
                 }
@@ -3468 +3468 @@
         break;
     default:
-        if(index >= 0 && index/4 < nrUserWindowLong)
-        {
-            value = userWindowLong[index/4];
+        if(index >= 0 && index + sizeof(ULONG) <= nrUserWindowBytes)
+        {
+            value = *(ULONG *)(userWindowBytes + index);
             break;
         }
+        dprintf(("WARNING: GetWindowLong%c %x %d %x returned %x INVALID index!", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
         SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
         return 0;
     }
-    dprintf2(("GetWindowLongA %x %d %x", getWindowHandle(), index, value));
+    dprintf2(("GetWindowLong%c %x %d %x", getWindowHandle(), (fUnicode) ? 'W' : 'A', index, value));
     //Note: NT4, SP6 does not set the last error to 0
     SetLastError(ERROR_SUCCESS);
@@ -3487 +3488 @@
  WORD oldval;
 
-    if(index >= 0 && index/4 < nrUserWindowLong)
-    {
-        oldval = ((WORD *)userWindowLong)[index/2];
-        ((WORD *)userWindowLong)[index/2] = value;
+    if(index >= 0 && index + sizeof(WORD) <= nrUserWindowBytes)
+    {
+        oldval = *(WORD *)(userWindowBytes + index);
+        *(WORD *)(userWindowBytes + index) = value;
+        //Note: NT4, SP6 does not set the last error to 0
+        dprintf2(("SetWindowWord %x %d %x returned %x", getWindowHandle(), index, value, oldval));
+        SetLastError(ERROR_SUCCESS);
+        return oldval;
+    }
+    dprintf(("WARNING: SetWindowWord %x %d %x returned %x INVALID index!", getWindowHandle(), index, value));
+    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************
+WORD Win32BaseWindow::GetWindowWord(int index)
+{
+    if(index >= 0 && index + sizeof(WORD) <= nrUserWindowBytes)
+    {
         //Note: NT4, SP6 does not set the last error to 0
         SetLastError(ERROR_SUCCESS);
-        return oldval;
-    }
-    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
-    return 0;
-}
-//******************************************************************************
-//******************************************************************************
-WORD Win32BaseWindow::GetWindowWord(int index)
-{
-    if(index >= 0 && index/4 < nrUserWindowLong)
-    {
-        //Note: NT4, SP6 does not set the last error to 0
-        SetLastError(ERROR_SUCCESS);
-        return ((WORD *)userWindowLong)[index/2];
-    }
+        dprintf2(("GetWindowWord %x %d %x", getWindowHandle(), index, *(WORD *)(userWindowBytes + index)));
+        return *(WORD *)(userWindowBytes + index);
+    }
+    dprintf(("WARNING: GetWindowWord %x %d returned %x INVALID index!", getWindowHandle(), index));
     SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
     return 0;