[jimtabor] 44443: - [Win32k] If Proc is null, use original one and perform processing.

Author: jimtabor
Date: Sun Dec  6 20:22:29 2009
New Revision: 44443

URL: http://svn.reactos.org/svn/reactos?rev=44443&view=rev
Log:
- [Win32k] If Proc is null, use original one and perform processing.

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/class.c
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun Dec  6 20:22:29
2009
@@ -385,6 +385,8 @@
       Class->Unicode = !Ansi;
    }
 
+   if (!WndProc) WndProc = Class->lpfnWndProc;
+
    chWndProc = WndProc;
 
    // Check if CallProc handle and retrieve previous call proc address and set.

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Dec  6 20:22:29
2009
@@ -662,6 +662,8 @@
 
       if (pWnd->state & WNDS_SERVERSIDEWINDOWPROC)
          pWnd->state &= ~WNDS_SERVERSIDEWINDOWPROC;
+
+      if (!NewWndProc) NewWndProc = pWnd->lpfnWndProc;
 
       if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON)
       {