From b806aed1e159357a68bdb0eeff7c458c821b1cba Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Sun, 6 Dec 2009 19:22:29 +0000
Subject: [PATCH] - [Win32k] If Proc is null, use original one and perform
 processing.

svn path=/trunk/; revision=44443
---
 reactos/subsystems/win32/win32k/ntuser/class.c  | 2 ++
 reactos/subsystems/win32/win32k/ntuser/window.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/reactos/subsystems/win32/win32k/ntuser/class.c b/reactos/subsystems/win32/win32k/ntuser/class.c
index 5e8f074bb41..03e4f5db839 100644
--- a/reactos/subsystems/win32/win32k/ntuser/class.c
+++ b/reactos/subsystems/win32/win32k/ntuser/class.c
@@ -385,6 +385,8 @@ IntSetClassWndProc(IN OUT PCLS Class,
       Class->Unicode = !Ansi;
    }
 
+   if (!WndProc) WndProc = Class->lpfnWndProc;
+
    chWndProc = WndProc;
 
    // Check if CallProc handle and retrieve previous call proc address and set.
diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c
index 641db2cf99e..e561b709aee 100644
--- a/reactos/subsystems/win32/win32k/ntuser/window.c
+++ b/reactos/subsystems/win32/win32k/ntuser/window.c
@@ -663,6 +663,8 @@ IntSetWindowProc(PWND pWnd,
       if (pWnd->state & WNDS_SERVERSIDEWINDOWPROC)
          pWnd->state &= ~WNDS_SERVERSIDEWINDOWPROC;
 
+      if (!NewWndProc) NewWndProc = pWnd->lpfnWndProc;
+
       if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON)
       {
          if (Ansi)