From d412903cb137b16921968e380e9630228be5ca68 Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Mon, 24 Aug 2009 20:09:58 +0000 Subject: [PATCH] Sprinkle win32k with some explicit voids, svn path=/trunk/; revision=42926 --- reactos/subsystems/win32/win32k/include/accelerator.h | 4 ++-- reactos/subsystems/win32/win32k/include/dc.h | 2 +- reactos/subsystems/win32/win32k/include/error.h | 2 +- reactos/subsystems/win32/win32k/include/focus.h | 10 +++++----- reactos/subsystems/win32/win32k/include/guicheck.h | 4 ++-- reactos/subsystems/win32/win32k/include/hotkey.h | 2 +- reactos/subsystems/win32/win32k/include/misc.h | 2 +- reactos/subsystems/win32/win32k/include/ntuser.h | 4 ++-- reactos/subsystems/win32/win32k/include/object.h | 2 +- reactos/subsystems/win32/win32k/include/userfuncs.h | 4 ++-- reactos/subsystems/win32/win32k/misc/err.c | 2 +- reactos/subsystems/win32/win32k/ntuser/clipboard.c | 10 +++++----- reactos/subsystems/win32/win32k/ntuser/focus.c | 8 ++++---- reactos/subsystems/win32/win32k/ntuser/hotkey.c | 4 ++-- reactos/subsystems/win32/win32k/ntuser/misc.c | 2 +- reactos/subsystems/win32/win32k/ntuser/ntuser.c | 4 ++-- reactos/subsystems/win32/win32k/ntuser/object.c | 2 +- reactos/subsystems/win32/win32k/ntuser/windc.c | 2 +- reactos/subsystems/win32/win32k/ntuser/window.c | 2 +- reactos/subsystems/win32/win32k/objects/device.c | 10 +++++----- reactos/subsystems/win32/win32k/objects/gdiobj.c | 2 +- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/reactos/subsystems/win32/win32k/include/accelerator.h b/reactos/subsystems/win32/win32k/include/accelerator.h index cf247d81c9a..367715cfc7b 100644 --- a/reactos/subsystems/win32/win32k/include/accelerator.h +++ b/reactos/subsystems/win32/win32k/include/accelerator.h @@ -12,10 +12,10 @@ typedef struct _ACCELERATOR_TABLE } ACCELERATOR_TABLE, *PACCELERATOR_TABLE; NTSTATUS FASTCALL -InitAcceleratorImpl(); +InitAcceleratorImpl(VOID); NTSTATUS FASTCALL -CleanupAcceleratorImpl(); +CleanupAcceleratorImpl(VOID); PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL); diff --git a/reactos/subsystems/win32/win32k/include/dc.h b/reactos/subsystems/win32/win32k/include/dc.h index 023fad7f7d0..c92ae4dffd5 100644 --- a/reactos/subsystems/win32/win32k/include/dc.h +++ b/reactos/subsystems/win32/win32k/include/dc.h @@ -233,7 +233,7 @@ DC_vSelectPalette(PDC pdc, PPALETTE ppal) } BOOL FASTCALL -IntPrepareDriverIfNeeded(); +IntPrepareDriverIfNeeded(VOID); extern PDEVOBJ PrimarySurface; #endif /* not __WIN32K_DC_H */ diff --git a/reactos/subsystems/win32/win32k/include/error.h b/reactos/subsystems/win32/win32k/include/error.h index cf637b4c2ef..6b923536257 100644 --- a/reactos/subsystems/win32/win32k/include/error.h +++ b/reactos/subsystems/win32/win32k/include/error.h @@ -10,7 +10,7 @@ SetLastWin32Error( DWORD Status); NTSTATUS FASTCALL -GetLastNtError(); +GetLastNtError(VOID); #endif /* _WIN32K_ERROR_H */ diff --git a/reactos/subsystems/win32/win32k/include/focus.h b/reactos/subsystems/win32/win32k/include/focus.h index e971b0e0a91..03438bb3b16 100644 --- a/reactos/subsystems/win32/win32k/include/focus.h +++ b/reactos/subsystems/win32/win32k/include/focus.h @@ -5,17 +5,17 @@ * These functions take the window handles from current message queue. */ HWND FASTCALL -IntGetCaptureWindow(); +IntGetCaptureWindow(VOID); HWND FASTCALL -IntGetFocusWindow(); +IntGetFocusWindow(VOID); /* * These functions take the window handles from current thread queue. */ HWND FASTCALL -IntGetThreadFocusWindow(); -HWND APIENTRY IntGetCapture(); -HWND FASTCALL UserGetActiveWindow(); +IntGetThreadFocusWindow(VOID); +HWND APIENTRY IntGetCapture(VOID); +HWND FASTCALL UserGetActiveWindow(VOID); BOOL FASTCALL co_IntMouseActivateWindow(PWINDOW_OBJECT Window); diff --git a/reactos/subsystems/win32/win32k/include/guicheck.h b/reactos/subsystems/win32/win32k/include/guicheck.h index 7878d3fb55e..3cdcd7b7000 100644 --- a/reactos/subsystems/win32/win32k/include/guicheck.h +++ b/reactos/subsystems/win32/win32k/include/guicheck.h @@ -2,8 +2,8 @@ #define _WIN32K_GUICHECK_H BOOL FASTCALL co_IntGraphicsCheck(BOOL Create); -BOOL FASTCALL IntCreatePrimarySurface(); -VOID FASTCALL IntDestroyPrimarySurface(); +BOOL FASTCALL IntCreatePrimarySurface(VOID); +VOID FASTCALL IntDestroyPrimarySurface(VOID); NTSTATUS FASTCALL InitGuiCheckImpl (VOID); diff --git a/reactos/subsystems/win32/win32k/include/hotkey.h b/reactos/subsystems/win32/win32k/include/hotkey.h index 9b9c1035cd5..25c79fc1ec4 100644 --- a/reactos/subsystems/win32/win32k/include/hotkey.h +++ b/reactos/subsystems/win32/win32k/include/hotkey.h @@ -15,7 +15,7 @@ typedef struct _HOT_KEY_ITEM } HOT_KEY_ITEM, *PHOT_KEY_ITEM; NTSTATUS FASTCALL -InitHotkeyImpl(); +InitHotkeyImpl(VOID); //NTSTATUS FASTCALL //CleanupHotKeys(PWINSTATION_OBJECT WinStaObject); diff --git a/reactos/subsystems/win32/win32k/include/misc.h b/reactos/subsystems/win32/win32k/include/misc.h index 08d358edd6f..6ec5f26348c 100644 --- a/reactos/subsystems/win32/win32k/include/misc.h +++ b/reactos/subsystems/win32/win32k/include/misc.h @@ -24,7 +24,7 @@ extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave); extern HGDIOBJ StockObjects[]; extern SHORT gusLanguageID; -SHORT FASTCALL IntGdiGetLanguageID(); +SHORT FASTCALL IntGdiGetLanguageID(VOID); DWORD APIENTRY IntGetQueueStatus(BOOL ClearChanges); VOID FASTCALL IntUserManualGuiCheck(LONG Check); PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); diff --git a/reactos/subsystems/win32/win32k/include/ntuser.h b/reactos/subsystems/win32/win32k/include/ntuser.h index e11eece5ba0..d64e246056b 100644 --- a/reactos/subsystems/win32/win32k/include/ntuser.h +++ b/reactos/subsystems/win32/win32k/include/ntuser.h @@ -17,8 +17,8 @@ VOID FASTCALL CleanupUserImpl(VOID); VOID FASTCALL UserEnterShared(VOID); VOID FASTCALL UserEnterExclusive(VOID); VOID FASTCALL UserLeave(VOID); -BOOL FASTCALL UserIsEntered(); -BOOL FASTCALL UserIsEnteredExclusive(); +BOOL FASTCALL UserIsEntered(VOID); +BOOL FASTCALL UserIsEnteredExclusive(VOID); #endif /* _WIN32K_NTUSER_H */ diff --git a/reactos/subsystems/win32/win32k/include/object.h b/reactos/subsystems/win32/win32k/include/object.h index 76af581542b..c3452dee3e2 100644 --- a/reactos/subsystems/win32/win32k/include/object.h +++ b/reactos/subsystems/win32/win32k/include/object.h @@ -115,7 +115,7 @@ HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, USER_OBJECT_TYPE typ BOOL UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ); PVOID UserGetNextHandle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ); PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ); -BOOL FASTCALL UserCreateHandleTable(); +BOOL FASTCALL UserCreateHandleTable(VOID); VOID UserInitHandleTable(PUSER_HANDLE_TABLE ht, PVOID mem, ULONG bytes); diff --git a/reactos/subsystems/win32/win32k/include/userfuncs.h b/reactos/subsystems/win32/win32k/include/userfuncs.h index 84911e8f58d..9c3b6201761 100644 --- a/reactos/subsystems/win32/win32k/include/userfuncs.h +++ b/reactos/subsystems/win32/win32k/include/userfuncs.h @@ -53,7 +53,7 @@ UserGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point); /*************** FOCUS.C ***************/ -HWND FASTCALL UserGetActiveWindow(); +HWND FASTCALL UserGetActiveWindow(VOID); HWND FASTCALL UserGetForegroundWindow(VOID); @@ -125,7 +125,7 @@ PWINDOW_OBJECT FASTCALL UserGetWindowObject(HWND hWnd); VOID FASTCALL co_DestroyThreadWindows(struct _ETHREAD *Thread); -HWND FASTCALL UserGetShellWindow(); +HWND FASTCALL UserGetShellWindow(VOID); HWND FASTCALL UserGetWindow(HWND hWnd, UINT Relationship); diff --git a/reactos/subsystems/win32/win32k/misc/err.c b/reactos/subsystems/win32/win32k/misc/err.c index 5943b4fde1f..43225ce403b 100644 --- a/reactos/subsystems/win32/win32k/misc/err.c +++ b/reactos/subsystems/win32/win32k/misc/err.c @@ -50,7 +50,7 @@ SetLastWin32Error(DWORD Status) } NTSTATUS FASTCALL -GetLastNtError() +GetLastNtError(VOID) { PTEB Teb = PsGetCurrentThread()->Tcb.Teb; diff --git a/reactos/subsystems/win32/win32k/ntuser/clipboard.c b/reactos/subsystems/win32/win32k/ntuser/clipboard.c index a5dbb06a6d9..4781be15437 100644 --- a/reactos/subsystems/win32/win32k/ntuser/clipboard.c +++ b/reactos/subsystems/win32/win32k/ntuser/clipboard.c @@ -54,7 +54,7 @@ IntIsWindowInChain(PWINDOW_OBJECT window) return wce; } -VOID FASTCALL printChain() +VOID FASTCALL printChain(VOID) { /*test*/ PCLIPBOARDCHAINELEMENT wce2 = WindowsChain; @@ -148,7 +148,7 @@ intIsFormatAvailable(UINT format) /* counts how many distinct format were are in the clipboard */ DWORD FASTCALL -IntCountClipboardFormats() +IntCountClipboardFormats(VOID) { DWORD ret = 0; PCLIPBOARDELEMENT ce = ClipboardData; @@ -221,7 +221,7 @@ intRemoveFormatedData(UINT format) } VOID FASTCALL -IntEmptyClipboardData() +IntEmptyClipboardData(VOID) { PCLIPBOARDELEMENT ce = ClipboardData; PCLIPBOARDELEMENT tmp; @@ -322,7 +322,7 @@ synthesizeData(UINT format) } VOID FASTCALL -freeSynthesizedData() +freeSynthesizedData(VOID) { ExFreePool(synthesizedData); } @@ -330,7 +330,7 @@ freeSynthesizedData() /*==============================================================*/ BOOL FASTCALL -intIsClipboardOpenByMe() +intIsClipboardOpenByMe(VOID) { /* check if we open the clipboard */ if (ClipboardThread && ClipboardThread == PsGetCurrentThreadWin32Thread()) diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c index 17fa6bdc7d4..fc3f9f88dbf 100644 --- a/reactos/subsystems/win32/win32k/ntuser/focus.c +++ b/reactos/subsystems/win32/win32k/ntuser/focus.c @@ -24,21 +24,21 @@ #include HWND FASTCALL -IntGetCaptureWindow() +IntGetCaptureWindow(VOID) { PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetFocusMessageQueue(); return ForegroundQueue != NULL ? ForegroundQueue->CaptureWindow : 0; } HWND FASTCALL -IntGetFocusWindow() +IntGetFocusWindow(VOID) { PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetFocusMessageQueue(); return ForegroundQueue != NULL ? ForegroundQueue->FocusWindow : 0; } HWND FASTCALL -IntGetThreadFocusWindow() +IntGetThreadFocusWindow(VOID) { PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; @@ -445,7 +445,7 @@ CLEANUP: } -HWND FASTCALL UserGetActiveWindow() +HWND FASTCALL UserGetActiveWindow(VOID) { PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; diff --git a/reactos/subsystems/win32/win32k/ntuser/hotkey.c b/reactos/subsystems/win32/win32k/ntuser/hotkey.c index f599ee4ca2a..bf2ee79f462 100644 --- a/reactos/subsystems/win32/win32k/ntuser/hotkey.c +++ b/reactos/subsystems/win32/win32k/ntuser/hotkey.c @@ -53,7 +53,7 @@ LIST_ENTRY gHotkeyList; /* FUNCTIONS *****************************************************************/ NTSTATUS FASTCALL -InitHotkeyImpl() +InitHotkeyImpl(VOID) { InitializeListHead(&gHotkeyList); @@ -63,7 +63,7 @@ InitHotkeyImpl() #if 0 //not used NTSTATUS FASTCALL -CleanupHotKeys() +CleanupHotKeys(VOID) { return STATUS_SUCCESS; diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c index 3deaaf2a01e..1085ec3b4b2 100644 --- a/reactos/subsystems/win32/win32k/ntuser/misc.c +++ b/reactos/subsystems/win32/win32k/ntuser/misc.c @@ -16,7 +16,7 @@ SHORT FASTCALL -IntGdiGetLanguageID() +IntGdiGetLanguageID(VOID) { HANDLE KeyHandle; ULONG Size = sizeof(WCHAR) * (MAX_PATH + 12); diff --git a/reactos/subsystems/win32/win32k/ntuser/ntuser.c b/reactos/subsystems/win32/win32k/ntuser/ntuser.c index ec8c8412554..bcdf6ccc21a 100644 --- a/reactos/subsystems/win32/win32k/ntuser/ntuser.c +++ b/reactos/subsystems/win32/win32k/ntuser/ntuser.c @@ -180,13 +180,13 @@ NtUserInitialize( RETURN True if current thread owns the lock (possibly shared) */ -BOOL FASTCALL UserIsEntered() +BOOL FASTCALL UserIsEntered(VOID) { return ExIsResourceAcquiredExclusiveLite(&UserLock) || ExIsResourceAcquiredSharedLite(&UserLock); } -BOOL FASTCALL UserIsEnteredExclusive() +BOOL FASTCALL UserIsEnteredExclusive(VOID) { return ExIsResourceAcquiredExclusiveLite(&UserLock); } diff --git a/reactos/subsystems/win32/win32k/ntuser/object.c b/reactos/subsystems/win32/win32k/ntuser/object.c index 0221c57ce50..fd3ba246726 100644 --- a/reactos/subsystems/win32/win32k/ntuser/object.c +++ b/reactos/subsystems/win32/win32k/ntuser/object.c @@ -402,7 +402,7 @@ BOOL FASTCALL UserDereferenceObject(PVOID obj) -BOOL FASTCALL UserCreateHandleTable() +BOOL FASTCALL UserCreateHandleTable(VOID) { PVOID mem; diff --git a/reactos/subsystems/win32/win32k/ntuser/windc.c b/reactos/subsystems/win32/win32k/ntuser/windc.c index a78cdb20189..3ff1d5bc591 100644 --- a/reactos/subsystems/win32/win32k/ntuser/windc.c +++ b/reactos/subsystems/win32/win32k/ntuser/windc.c @@ -713,7 +713,7 @@ DceFreeClassDCE(HDC hDC) } VOID FASTCALL -DceEmptyCache() +DceEmptyCache(VOID) { PDCE pDCE = FirstDce; KeEnterCriticalRegion(); diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c index 2250b7d58ac..e062f78c7c5 100644 --- a/reactos/subsystems/win32/win32k/ntuser/window.c +++ b/reactos/subsystems/win32/win32k/ntuser/window.c @@ -3272,7 +3272,7 @@ CLEANUP: * Status * @implemented */ -HWND FASTCALL UserGetShellWindow() +HWND FASTCALL UserGetShellWindow(VOID) { PWINSTATION_OBJECT WinStaObject; HWND Ret; diff --git a/reactos/subsystems/win32/win32k/objects/device.c b/reactos/subsystems/win32/win32k/objects/device.c index 3b8af79c89e..53fea842acf 100644 --- a/reactos/subsystems/win32/win32k/objects/device.c +++ b/reactos/subsystems/win32/win32k/objects/device.c @@ -202,7 +202,7 @@ SetupDevMode(PDEVMODEW DevMode, ULONG DisplayNumber) } static BOOL FASTCALL -IntPrepareDriver() +IntPrepareDriver(VOID) { PFN_DrvEnableDriver GDEnableDriver; DRVENABLEDATA DED; @@ -437,13 +437,13 @@ cleanup: } BOOL FASTCALL -IntPrepareDriverIfNeeded() +IntPrepareDriverIfNeeded(VOID) { return (PrimarySurface.PreparedDriver ? TRUE : IntPrepareDriver()); } static BOOL FASTCALL -PrepareVideoPrt() +PrepareVideoPrt(VOID) { PIRP Irp; NTSTATUS Status; @@ -499,7 +499,7 @@ PrepareVideoPrt() BOOL FASTCALL -IntCreatePrimarySurface() +IntCreatePrimarySurface(VOID) { SIZEL SurfSize; RECTL SurfaceRect; @@ -573,7 +573,7 @@ IntCreatePrimarySurface() } VOID FASTCALL -IntDestroyPrimarySurface() +IntDestroyPrimarySurface(VOID) { BOOL calledFromUser; diff --git a/reactos/subsystems/win32/win32k/objects/gdiobj.c b/reactos/subsystems/win32/win32k/objects/gdiobj.c index 8ad5d23d830..ec9efde58ea 100644 --- a/reactos/subsystems/win32/win32k/objects/gdiobj.c +++ b/reactos/subsystems/win32/win32k/objects/gdiobj.c @@ -196,7 +196,7 @@ LockErrorDebugOutput(HGDIOBJ hObj, PGDI_TABLE_ENTRY Entry, LPSTR Function) ULONG FASTCALL -InterlockedPopFreeEntry() +InterlockedPopFreeEntry(VOID) { ULONG idxFirst, idxNext, idxPrev; PGDI_TABLE_ENTRY pEntry;