[ros-diffs] [jimtabor] 34476: Separate Default Window proc from messages.

Author: jimtabor
Date: Sun Jul 13 18:31:00 2008
New Revision: 34476

URL: http://svn.reactos.org/svn/reactos?rev=34476&view=rev
Log:
Separate Default Window proc from messages.

Added:
    trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c   (with props)
Modified:
    trunk/reactos/subsystems/win32/win32k/include/window.h
    trunk/reactos/subsystems/win32/win32k/ntuser/message.c
    trunk/reactos/subsystems/win32/win32k/win32k.rbuild

Modified: trunk/reactos/subsystems/win32/win32k/include/window.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Sun Jul 13 18:31:00 2008
@@ -164,6 +164,9 @@
 BOOL FASTCALL
 IntShowOwnedPopups( PWINDOW_OBJECT owner, BOOL fShow );

+LRESULT FASTCALL
+IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam);
+
 #endif /* _WIN32K_WINDOW_H */

/* EOF */

Added: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c (added)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Sun Jul 13 18:31:00 2008
@@ -1,0 +1,61 @@
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * PURPOSE:          Misc User funcs
+ * FILE:             subsystem/win32/win32k/ntuser/defwnd.c
+ * PROGRAMER:
+ * REVISION HISTORY:
+ *       2003/05/22  Created
+ */
+
+#include <w32k.h>
+
+#define NDEBUG
+#include <debug.h>
+
+
+/*
+   Win32k counterpart of User DefWindowProc
+ */
+LRESULT FASTCALL
+IntDefWindowProc(
+   PWINDOW_OBJECT Window,
+   UINT Msg,
+   WPARAM wParam,
+   LPARAM lParam)
+{
+   PWINDOW Wnd;
+
+   if (Msg > WM_USER) return 0;
+
+   Wnd = Window->Wnd;
+   if (!Wnd) return 0;
+
+   switch (Msg)
+   {
+      case WM_SHOWWINDOW:
+      {
+         if ((Wnd->Style & WS_VISIBLE) && wParam) break;
+         if (!(Wnd->Style & WS_VISIBLE) && !wParam) break;
+         if (!Window->hOwner) break;
+         if (LOWORD(lParam))
+         {
+            if (wParam)
+            {
+               if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break;
+               Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP;
+            }
+            else
+                Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP;
+
+            co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE);
+         }
+      }
+      break;
+   }
+
+   return 0;
+}
+
+
+/* EOF */

Propchange: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jul 13 18:31:00 2008
@@ -1832,49 +1832,6 @@
    return FALSE;
 }

-/*
-   Win32k counterpart of User DefWindowProc
- */
-LRESULT FASTCALL
-IntDefWindowProc(
-   PWINDOW_OBJECT Window,
-   UINT Msg,
-   WPARAM wParam,
-   LPARAM lParam)
-{
-   PWINDOW Wnd;
-
-   if (Msg > WM_USER) return 0;
-
-   Wnd = Window->Wnd;
-   if (!Wnd) return 0;
-
-   switch (Msg)
-   {
-      case WM_SHOWWINDOW:
-      {
-         if ((Wnd->Style & WS_VISIBLE) && wParam) break;
-         if (!(Wnd->Style & WS_VISIBLE) && !wParam) break;
-         if (!Window->hOwner) break;
-         if (LOWORD(lParam))
-         {
-            if (wParam)
-            {
-               if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break;
-               Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP;
-            }
-            else
-                Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP;
-
-            co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE);
-         }
-      }
-      break;
-   }
-
-   return 0;
-}
-

LRESULT STDCALL
 NtUserMessageCall(

Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/win...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Jul 13 18:31:00 2008
@@ -110,6 +110,7 @@
    	<file>clipboard.c</file>
    	<file>csr.c</file>
    	<file>cursoricon.c</file>
+		<file>defwnd.c</file>
    	<file>desktop.c</file>
    	<file>display.c</file>
    	<file>event.c</file>