Changeset 1333 for trunk/src/user32/windowword.cpp

Timestamp:

Oct 17, 1999, 2:17:46 PM (26 years ago)

Author:

cbratschi

Message:

added WINE scrollbars to frame, fixed pmframe, WM_ENTERIDLE

File:

• trunk/src/user32/windowword.cpp (modified) (5 diffs)

trunk/src/user32/windowword.cpp

@@ -1 @@
-/* $Id: windowword.cpp,v 1.1 1999-09-15 23:19:03 sandervl Exp $ */
+/* $Id: windowword.cpp,v 1.2 1999-10-17 12:17:46 cbratschi Exp $ */
 
 /*
@@ -17 +17 @@
 //******************************************************************************
 //******************************************************************************
-LONG WIN32API SetWindowLongA(HWND hwnd, int nIndex, LONG  arg3)
+LONG WIN32API SetWindowLongA(HWND hwnd, int nIndex, LONG  lNewLong)
 {
  Win32BaseWindow *window;
@@ -24 +24 @@
     if(window)
     {
-    return window->SetWindowLongA(nIndex, arg3);
-    }
-    else
+      return window->SetWindowLongA(nIndex,lNewLong);
+    } else
     {
-    dprintf(("SetWindowLongA; window %x not found!", hwnd));
+      if (nIndex == GWL_WNDPROC && !Win32BaseWindow::GetWindowFromOS2Handle(hwnd))
+      {
+        dprintf(("Start subclassing OS/2 window"));
+
+        window = new Win32BaseWindow(hwnd,(PVOID)lNewLong);
+
+        if(window == NULL)
+        {
+          dprintf(("Win32BaseWindow creation failed!!"));
+          return 0;
+        }
+
+        if(GetLastError() != 0)
+        {
+          dprintf(("Win32BaseWindow error found!!"));
+          delete window;
+          return 0;
+        }
+
+        return (LONG)window->getOldWndProc();
+      } else dprintf(("SetWindowLongA; window %x not found!", hwnd));
     }
     return 0;
@@ -34 +53 @@
 //******************************************************************************
 //******************************************************************************
-LONG WIN32API SetWindowLongW(HWND hwnd, int nIndex, LONG  arg3)
+LONG WIN32API SetWindowLongW(HWND hwnd, int nIndex, LONG  lNewLong)
 {
  Win32BaseWindow *window;
@@ -41 +60 @@
     if(window)
     {
-    return window->SetWindowLongA(nIndex, arg3);
-    }
-    else
+      return window->SetWindowLongA(nIndex,lNewLong);
+    } else
     {
-    dprintf(("SetWindowLongW; window %x not found!", hwnd));
+      if (nIndex == GWL_WNDPROC && !Win32BaseWindow::GetWindowFromOS2Handle(hwnd))
+      {
+        dprintf(("Start subclassing OS/2 window"));
+
+        window = new Win32BaseWindow(hwnd,(PVOID)lNewLong);
+
+        if(window == NULL)
+        {
+          dprintf(("Win32BaseWindow creation failed!!"));
+          return 0;
+        }
+
+        if(GetLastError() != 0)
+        {
+          dprintf(("Win32BaseWindow error found!!"));
+          delete window;
+          return 0;
+        }
+
+        return (LONG)window->getOldWndProc();
+      } else dprintf(("SetWindowLongW; window %x not found!", hwnd));
     }
     return 0;