Changeset 215 for trunk/src/user32/user32.cpp

Timestamp:

Jun 26, 1999, 3:21:53 PM (26 years ago)

Author:

sandervl

Message:

Spy and window message changes

File:

• trunk/src/user32/user32.cpp (modified) (9 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.14 1999-06-23 16:36:56 achimha Exp $ */
+/* $Id: user32.cpp,v 1.15 1999-06-26 13:21:12 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include "user32.h"
 #include "wndproc.h"
-#include "wndsubproc.h"
 #include "wndclass.h"
 #include "icon.h"
@@ -639 +638 @@
  LRESULT rc;
 
-#ifdef DEBUG
+#ifdef DEBUG1
     WriteLog("USER32:  SendMessage....\n");
 #endif
     rc = O32_SendMessage(arg1, arg2, arg3, arg4);
-#ifdef DEBUG
+#ifdef DEBUG1
     WriteLog("USER32:  *****SendMessage %X %X %X %X returned %d\n", arg1, arg2, arg3, arg4, rc);
 #endif
@@ -952 +951 @@
 //******************************************************************************
 //******************************************************************************
-LONG WIN32API GetWindowLongA(HWND hwnd, int nIndex)
-{
- LONG rc;
-
-    if(nIndex == GWL_WNDPROC || nIndex == DWL_DLGPROC) {
-#ifdef DEBUG
-        WriteLog("USER32:  GetWindowLong %X %d\n", hwnd, nIndex);
-#endif
-        Win32WindowProc *window = Win32WindowProc::FindProc(hwnd);
-        if(window && !(nIndex == DWL_DLGPROC && window->IsWindow() == TRUE)) {
-                return (LONG)window->GetWin32Callback();
-        }
-    }
-    rc = O32_GetWindowLong(hwnd, nIndex);
-    return(rc);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API SetDlgItemInt( HWND arg1, int arg2, UINT arg3, BOOL  arg4)
 {
@@ -1230 +1211 @@
 #endif
 
-    if(Win32WindowSubProc::FindSubProc((WNDPROC_O32)wndprcPrev) != NULL) {
-         WNDPROC_O32 orgprc = (WNDPROC_O32)wndprcPrev; //is original Open32 system class callback (_System)
-         return orgprc(arg2, arg3, arg4, arg5);
-    }
-    else return wndprcPrev(arg2, arg3, arg4, arg5);   //win32 callback (__stdcall)
+    return wndprcPrev(arg2, arg3, arg4, arg5);   //win32 callback (__stdcall)
 }
 //******************************************************************************
@@ -2317 +2294 @@
 //******************************************************************************
 //******************************************************************************
-LONG WIN32API GetWindowLongW( HWND arg1, int  arg2)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetWindowLongW\n");
-#endif
-    return GetWindowLongA(arg1, arg2);   //class procedures..
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API GetWindowPlacement( HWND arg1, LPWINDOWPLACEMENT arg2)
 {
@@ -2396 +2364 @@
 //******************************************************************************
 //******************************************************************************
-WORD WIN32API GetWindowWord( HWND arg1, int  arg2)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetWindowWord\n");
-#endif
-    return O32_GetWindowWord(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API HideCaret( HWND arg1)
 {
@@ -2913 +2872 @@
 //******************************************************************************
 //******************************************************************************
-LONG WIN32API SetWindowLongA(HWND hwnd, int nIndex, LONG  arg3)
-{
- LONG rc;
-
-    dprintf(("USER32:  SetWindowLongA %X %d %X\n", hwnd, nIndex, arg3));
-    if(nIndex == GWL_WNDPROC || nIndex == DWL_DLGPROC) {
-        Win32WindowProc *wndproc = Win32WindowProc::FindProc(hwnd);
-        if(wndproc == NULL) {//created with system class and app wants to change the handler
-                dprintf(("USER32:  SetWindowLong new WindowProc for system class\n"));
-                wndproc = new Win32WindowProc((WNDPROC)arg3);
-                wndproc->SetWindowHandle(hwnd);
-                rc = O32_GetWindowLong(hwnd, nIndex);
-                Win32WindowSubProc *subwndproc = new Win32WindowSubProc(hwnd, (WNDPROC_O32)rc);
-                O32_SetWindowLong(hwnd, nIndex, (LONG)wndproc->GetOS2Callback());
-                return((LONG)subwndproc->GetWin32Callback());
-        }
-        else {
-                if(!(nIndex == DWL_DLGPROC && wndproc->IsWindow() == TRUE)) {
-                        rc = (LONG)wndproc->GetWin32Callback();
-                        dprintf(("USER32:  SetWindowLong change WindowProc %X to %X\n", rc, arg3));
-                        wndproc->SetWin32Callback((WNDPROC)arg3);
-                        return(rc);
-                }
-                //else window that accesses it's normal window data
-       }
-    }
-    return O32_SetWindowLong(hwnd, nIndex, arg3);
-}
-//******************************************************************************
-//TODO: Is this always correct? (GWL_ID: window identifier??)
-//******************************************************************************
-LONG WIN32API SetWindowLongW(HWND arg1, int arg2, LONG  arg3)
-{
-    dprintf(("USER32:  SetWindowLongW %X %d %X\n", arg1, arg2, arg3));
-    return SetWindowLongA(arg1, arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API SetWindowPlacement( HWND arg1, const WINDOWPLACEMENT *  arg2)
 {
@@ -2967 +2888 @@
    FreeAsciiString(astring);
    return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-WORD WIN32API SetWindowWord( HWND arg1, int arg2, WORD  arg3)
-{
-    dprintf(("USER32:  SetWindowWord\n"));
-    return O32_SetWindowWord(arg1, arg2, arg3);
 }
 //******************************************************************************