[win32k]

- move function definitions from c files to headers

svn path=/trunk/; revision=53777

diff --git a/reactos/include/ndk/psfuncs.h b/reactos/include/ndk/psfuncs.h
index a32fc3b..b90c318 100644 (file)
--- a/reactos/include/ndk/psfuncs.h
+++ b/reactos/include/ndk/psfuncs.h
@@ -192,6 +192,13 @@ PsGetProcessExitStatus(
     PEPROCESS Process
 );
 
+NTKERNELAPI
+BOOLEAN 
+NTAPI 
+PsGetProcessExitProcessCalled(
+    PEPROCESS Process
+);
+
 //
 // Quota Functions
 //

diff --git a/reactos/subsystems/win32/win32k/include/clipboard.h b/reactos/subsystems/win32/win32k/include/clipboard.h
index 7825e11..cd307c0 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/clipboard.h
+++ b/reactos/subsystems/win32/win32k/include/clipboard.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include "window.h"
-#include <include/win32.h>
-
 typedef struct _CLIP
 {
     UINT   fmt;
@@ -16,7 +13,5 @@ UserEnumClipboardFormats(UINT uFormat);
 VOID FASTCALL
 UserClipboardFreeWindow(PWND pWindow);
 
-struct _WINSTATION_OBJECT;
-
 VOID NTAPI
 UserEmptyClipboardData(struct _WINSTATION_OBJECT *pWinSta);

diff --git a/reactos/subsystems/win32/win32k/include/cliprgn.h b/reactos/subsystems/win32/win32k/include/cliprgn.h
index 26de78f..5ee4ba6 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/cliprgn.h
+++ b/reactos/subsystems/win32/win32k/include/cliprgn.h
@@ -3,3 +3,4 @@
 INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc);
 INT FASTCALL GdiSelectVisRgn(HDC hdc, HRGN hrgn);
 INT FASTCALL GdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode);
+int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc);
\ No newline at end of file

diff --git a/reactos/subsystems/win32/win32k/include/input.h b/reactos/subsystems/win32/win32k/include/input.h
index ab71f3c..264e098 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/input.h
+++ b/reactos/subsystems/win32/win32k/include/input.h
@@ -51,7 +51,8 @@ BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi, BOOL Injected);
 BOOL UserInitDefaultKeyboardLayout(VOID);
 PKBL UserHklToKbl(HKL hKl);
 BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL);
-
+VOID FASTCALL DoTheScreenSaver(VOID);
+WORD FASTCALL get_key_state(void);
 #define ThreadHasInputAccess(W32Thread) \
   (TRUE)
 

diff --git a/reactos/subsystems/win32/win32k/include/menu.h b/reactos/subsystems/win32/win32k/include/menu.h
index acdab87..b2e6b35 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/menu.h
+++ b/reactos/subsystems/win32/win32k/include/menu.h
@@ -69,3 +69,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
 
 PMENU_OBJECT FASTCALL
 IntGetSystemMenu(PWND Window, BOOL bRevert, BOOL RetMenu);
+
+UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget );
+UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags);
+

diff --git a/reactos/subsystems/win32/win32k/include/misc.h b/reactos/subsystems/win32/win32k/include/misc.h
index 72bd48c..e5be2bd 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/misc.h
+++ b/reactos/subsystems/win32/win32k/include/misc.h
@@ -145,6 +145,9 @@ NTSTATUS FASTCALL
 IntSafeCopyUnicodeStringTerminateNULL(PUNICODE_STRING Dest,
                                       PUNICODE_STRING Source);
 
+HBITMAP NTAPI UserLoadImage(PCWSTR);
+
+BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING);
 
 #define ROUND_DOWN(n, align) \
     (((ULONG)n) & ~((align) - 1l))

diff --git a/reactos/subsystems/win32/win32k/include/painting.h b/reactos/subsystems/win32/win32k/include/painting.h
index af74dee..b3325ce 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/painting.h
+++ b/reactos/subsystems/win32/win32k/include/painting.h
@@ -5,3 +5,5 @@ VOID FASTCALL IntInvalidateWindows(PWND Window, HRGN hRgn, ULONG Flags);
 BOOL FASTCALL IntGetPaintMessage(PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, PTHREADINFO Thread, MSG *Message, BOOL Remove);
 INT FASTCALL UserRealizePalette(HDC);
 INT FASTCALL co_UserGetUpdateRgn(PWND, HRGN, BOOL);
+VOID FASTCALL co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse);
+BOOL FASTCALL IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse);

diff --git a/reactos/subsystems/win32/win32k/include/sysparams.h b/reactos/subsystems/win32/win32k/include/sysparams.h
index 053f9f3..70d815f 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/sysparams.h
+++ b/reactos/subsystems/win32/win32k/include/sysparams.h
@@ -175,3 +175,6 @@ typedef union _SPIBUFFER
 } SPIBUFFER;
 
 extern SPIVALUES gspv;
+
+BOOL InitSysParams();
+

diff --git a/reactos/subsystems/win32/win32k/include/win32kdebug.h b/reactos/subsystems/win32/win32k/include/win32kdebug.h
index fed5af1..8190299 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/win32kdebug.h
+++ b/reactos/subsystems/win32/win32k/include/win32kdebug.h
@@ -177,4 +177,6 @@
     #define UNIMPLEMENTED
 #endif
 
+#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode)
+
 BOOL DbgInitDebugChannels();

diff --git a/reactos/subsystems/win32/win32k/ntuser/accelerator.c b/reactos/subsystems/win32/win32k/ntuser/accelerator.c
index 0bcf40d..c7b2938 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/accelerator.c
+++ b/reactos/subsystems/win32/win32k/ntuser/accelerator.c
@@ -38,10 +38,6 @@
 
 DBG_DEFAULT_CHANNEL(UserAccel);
 
-UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget );
-HMENU FASTCALL IntGetSubMenu( HMENU hMenu, int nPos);
-UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags);
-
 /* FUNCTIONS *****************************************************************/
 
 PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel)

diff --git a/reactos/subsystems/win32/win32k/ntuser/callproc.c b/reactos/subsystems/win32/win32k/ntuser/callproc.c
index 3dc7a9d..f42c984 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/callproc.c
+++ b/reactos/subsystems/win32/win32k/ntuser/callproc.c
@@ -11,9 +11,6 @@
 
 #include <win32k.h>
 
-#define NDEBUG
-#include <debug.h>
-
 /* CALLPROC ******************************************************************/
 
 WNDPROC

diff --git a/reactos/subsystems/win32/win32k/ntuser/display.c b/reactos/subsystems/win32/win32k/ntuser/display.c
index 8cd54ae..b730d14 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/display.c
+++ b/reactos/subsystems/win32/win32k/ntuser/display.c
@@ -12,8 +12,6 @@
 
 DBG_DEFAULT_CHANNEL(UserDisplay);
 
-BOOL InitSysParams();
-
 BOOL gbBaseVideo = 0;
 
 static const PWCHAR KEY_ROOT = L"";

diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
index d369d90..98e54b2 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
+++ b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
@@ -19,11 +19,6 @@ DBG_DEFAULT_CHANNEL(UserKbdLayout);
 PKBL KBLList = NULL; // Keyboard layout list.
 
 typedef PVOID (*KbdLayerDescriptor)(VOID);
-NTSTATUS APIENTRY LdrGetProcedureAddress(PVOID module,
-                                        PANSI_STRING import_name,
-                                        DWORD flags,
-                                        PVOID *func_addr);
-
 
 
 /* PRIVATE FUNCTIONS ******************************************************/

diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c
index d9e5d79..754bacf 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/message.c
+++ b/reactos/subsystems/win32/win32k/ntuser/message.c
@@ -14,8 +14,6 @@
 
 DBG_DEFAULT_CHANNEL(UserMsg);
 
-BOOLEAN NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process);
-
 #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE)
 
 /* FUNCTIONS *****************************************************************/

diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
index 7e73061..22758f4 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
+++ b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
@@ -16,8 +16,6 @@
 
 DBG_DEFAULT_CHANNEL(UserMsgQ);
 
-VOID FASTCALL DoTheScreenSaver(VOID);
-
 /* GLOBALS *******************************************************************/
 
 static PAGED_LOOKASIDE_LIST MessageLookasideList;

diff --git a/reactos/subsystems/win32/win32k/ntuser/ntuser.c b/reactos/subsystems/win32/win32k/ntuser/ntuser.c
index 832c4a3..3aa8405 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/ntuser.c
+++ b/reactos/subsystems/win32/win32k/ntuser/ntuser.c
@@ -13,8 +13,6 @@
 
 DBG_DEFAULT_CHANNEL(UserMisc);
 
-BOOL InitSysParams();
-
 /* GLOBALS *******************************************************************/
 
 PTHREADINFO gptiCurrent = NULL;

diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
index 265f453..db75af7 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c
+++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
@@ -13,13 +13,8 @@
 
 #include <win32k.h>
 
-#include <winsta.h>
-
 DBG_DEFAULT_CHANNEL(UserSysparams);
 
-#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode)
-HBITMAP NTAPI UserLoadImage(PCWSTR);
-BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING);
 
 SPIVALUES gspv;
 BOOL gbSpiInitialized = FALSE;

diff --git a/reactos/subsystems/win32/win32k/ntuser/timer.c b/reactos/subsystems/win32/win32k/ntuser/timer.c
index 7500fe2..d387e7c 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/timer.c
+++ b/reactos/subsystems/win32/win32k/ntuser/timer.c
@@ -16,8 +16,6 @@
 
 DBG_DEFAULT_CHANNEL(UserTimer);
 
-WORD FASTCALL get_key_state(void);
-
 /* GLOBALS *******************************************************************/
 
 static LIST_ENTRY TimersListHead;

diff --git a/reactos/subsystems/win32/win32k/ntuser/windc.c b/reactos/subsystems/win32/win32k/ntuser/windc.c
index 568fb37..9710fdc 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/windc.c
+++ b/reactos/subsystems/win32/win32k/ntuser/windc.c
@@ -13,8 +13,6 @@
 
 DBG_DEFAULT_CHANNEL(UserDce);
 
-int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc);
-
 /* GLOBALS *******************************************************************/
 
 /* NOTE - I think we should store this per window station (including gdi objects) */

diff --git a/reactos/subsystems/win32/win32k/ntuser/winpos.c b/reactos/subsystems/win32/win32k/ntuser/winpos.c
index 6f4813b..e9f246b 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/winpos.c
+++ b/reactos/subsystems/win32/win32k/ntuser/winpos.c
@@ -31,12 +31,6 @@
 
 DBG_DEFAULT_CHANNEL(UserWinpos);
 
-VOID FASTCALL
-co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse);
-
-BOOL FASTCALL
-IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse);
-
 /* GLOBALS *******************************************************************/
 
 #define MINMAX_NOSWP  (0x00010000)

diff --git a/reactos/subsystems/win32/win32k/objects/dclife.c b/reactos/subsystems/win32/win32k/objects/dclife.c
index 5bbf554..547dc75 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/dclife.c
+++ b/reactos/subsystems/win32/win32k/objects/dclife.c
@@ -457,9 +457,6 @@ GreSetDCOwner(HDC hdc, ULONG ulOwner)
     return TRUE;
 }
 
-int FASTCALL
-CLIPPING_UpdateGCRegion(DC* Dc);
-
 static
 void
 DC_vUpdateDC(PDC pdc)