From f2b28d3b312ca41b1a800a4eb5d6651e4f86150d Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Tue, 20 Sep 2011 18:04:14 +0000 Subject: [PATCH] [win32k] - move function definitions from c files to headers svn path=/trunk/; revision=53777 --- reactos/include/ndk/psfuncs.h | 7 +++++++ reactos/subsystems/win32/win32k/include/clipboard.h | 5 ----- reactos/subsystems/win32/win32k/include/cliprgn.h | 1 + reactos/subsystems/win32/win32k/include/input.h | 3 ++- reactos/subsystems/win32/win32k/include/menu.h | 4 ++++ reactos/subsystems/win32/win32k/include/misc.h | 3 +++ reactos/subsystems/win32/win32k/include/painting.h | 2 ++ reactos/subsystems/win32/win32k/include/sysparams.h | 3 +++ reactos/subsystems/win32/win32k/include/win32kdebug.h | 2 ++ reactos/subsystems/win32/win32k/ntuser/accelerator.c | 4 ---- reactos/subsystems/win32/win32k/ntuser/callproc.c | 3 --- reactos/subsystems/win32/win32k/ntuser/display.c | 2 -- reactos/subsystems/win32/win32k/ntuser/kbdlayout.c | 5 ----- reactos/subsystems/win32/win32k/ntuser/message.c | 2 -- reactos/subsystems/win32/win32k/ntuser/msgqueue.c | 2 -- reactos/subsystems/win32/win32k/ntuser/ntuser.c | 2 -- reactos/subsystems/win32/win32k/ntuser/sysparams.c | 5 ----- reactos/subsystems/win32/win32k/ntuser/timer.c | 2 -- reactos/subsystems/win32/win32k/ntuser/windc.c | 2 -- reactos/subsystems/win32/win32k/ntuser/winpos.c | 6 ------ reactos/subsystems/win32/win32k/objects/dclife.c | 3 --- 21 files changed, 24 insertions(+), 44 deletions(-) diff --git a/reactos/include/ndk/psfuncs.h b/reactos/include/ndk/psfuncs.h index a32fc3b036c..b90c3181e9d 100644 --- 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 7825e117586..cd307c092d1 100644 --- 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 - 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 26de78fe80e..5ee4ba6a1d2 100644 --- 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 ab71f3cff6f..264e098eca5 100644 --- 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 acdab87ccb8..b2e6b3594b7 100644 --- 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 72bd48ced58..e5be2bde9b4 100644 --- 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 af74dee6f4c..b3325ce5cec 100644 --- 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 053f9f34d91..70d815f1287 100644 --- 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 fed5af164b3..8190299d41f 100644 --- 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 0bcf40da9ed..c7b2938f0b5 100644 --- 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 3dc7a9d7930..f42c9840368 100644 --- a/reactos/subsystems/win32/win32k/ntuser/callproc.c +++ b/reactos/subsystems/win32/win32k/ntuser/callproc.c @@ -11,9 +11,6 @@ #include -#define NDEBUG -#include - /* CALLPROC ******************************************************************/ WNDPROC diff --git a/reactos/subsystems/win32/win32k/ntuser/display.c b/reactos/subsystems/win32/win32k/ntuser/display.c index 8cd54aefa9a..b730d14b025 100644 --- 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 d369d90f9ec..98e54b29c4f 100644 --- 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 d9e5d79ac03..754bacf5034 100644 --- 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 7e73061ce45..22758f4b658 100644 --- 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 832c4a399db..3aa8405314c 100644 --- 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 265f453150a..db75af7758a 100644 --- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c +++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c @@ -13,13 +13,8 @@ #include -#include - 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 7500fe26174..d387e7c7c9c 100644 --- 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 568fb376dac..9710fdc479a 100644 --- 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 6f4813b701e..e9f246bacc4 100644 --- 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 5bbf554efac..547dc75ed1a 100644 --- 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)