- Remove usage of STATIC, and use static in the right place. Modified: trunk/reactos/lib/kernel32/file/bintype.c Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/synch/event.c Modified: trunk/reactos/lib/user32/controls/scrollbar.c Modified: trunk/reactos/lib/user32/windows/bitmap.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/lib/user32/windows/message.c Modified: trunk/reactos/lib/user32/windows/window.c _____
Modified: trunk/reactos/lib/kernel32/file/bintype.c --- trunk/reactos/lib/kernel32/file/bintype.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/file/bintype.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -17,7 +17,6 @@
#define NDEBUG #include "../include/debug.h"
- /* FUNCTIONS ****************************************************************/
/* Check whether a file is an OS/2 or a very old Windows executable @@ -26,7 +25,7 @@ * FIXME: is reading the module imports the only way of discerning * old Windows binaries from OS/2 ones ? At least it seems so... */ -STATIC DWORD STDCALL +static DWORD STDCALL InternalIsOS2OrOldWin(HANDLE hFile, IMAGE_DOS_HEADER *mz, IMAGE_OS2_HEADER *ne) { DWORD CurPos; @@ -78,7 +77,7 @@ return Ret; }
-STATIC DWORD STDCALL +static DWORD STDCALL InternalGetBinaryType(HANDLE hFile) { union _____
Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -2898,7 +2898,7 @@
}
-BOOL STATIC +static BOOL AddConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) { if (HandlerRoutine == NULL) @@ -2932,7 +2932,7 @@ }
-BOOL STATIC +static BOOL RemoveConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) { ULONG i; _____
Modified: trunk/reactos/lib/kernel32/synch/event.c --- trunk/reactos/lib/kernel32/synch/event.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/synch/event.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -90,7 +90,7 @@
}
Status = NtCreateEvent(&hEvent, - STANDARD_RIGHTS_ALL | EVENT_READ_ACCESS | EVENT_WRITE_ACCESS, + EVENT_ALL_ACCESS, &ObjectAttributes, (bManualReset ? NotificationEvent : SynchronizationEvent), bInitialState); _____
Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -210,7 +210,7 @@
SelectObject(hDC, hSaveBrush); }
-STATIC VOID FASTCALL +static VOID FASTCALL IntDrawScrollArrows(HDC hDC, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { RECT RectLT, RectRB; @@ -253,7 +253,7 @@ DrawFrameControl(hDC, &RectRB, DFC_SCROLL, ScrollDirFlagRB); }
-STATIC VOID FASTCALL +static VOID FASTCALL IntScrollDrawMovingThumb(HDC Dc, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { INT Pos = ScrollTrackingPos; @@ -291,7 +291,7 @@ ScrollMovingThumb = ! ScrollMovingThumb; }
-STATIC LONG FASTCALL +static LONG FASTCALL IntScrollGetObjectId(INT SBType) { if (SB_VERT == SBType) @@ -306,7 +306,7 @@ return OBJID_CLIENT; }
-STATIC BOOL FASTCALL +static BOOL FASTCALL IntGetScrollBarInfo(HWND Wnd, INT Bar, PSCROLLBARINFO ScrollBarInfo) { ScrollBarInfo->cbSize = sizeof(SCROLLBARINFO); @@ -382,7 +382,7 @@ } }
-STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollPtInRectEx(LPRECT Rect, POINT Pt, BOOL Vertical) { RECT TempRect = *Rect; @@ -400,7 +400,7 @@ return PtInRect(&TempRect, Pt); }
-STATIC DWORD FASTCALL +static DWORD FASTCALL IntScrollHitTest(PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, POINT Pt, BOOL Dragging) { INT ArrowSize, ThumbSize, ThumbPos; @@ -479,7 +479,7 @@ * relative to the left or to the top. * Return TRUE if the scrollbar is vertical, FALSE if horizontal. */ -STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollGetScrollBarRect(HWND Wnd, INT Bar, RECT *Rect, INT *ArrowSize, INT *ThumbSize, INT *ThumbPos) @@ -629,7 +629,7 @@ * Compute the current scroll position based on the thumb position in pixels * from the top of the scroll-bar. */ -STATIC UINT FASTCALL +static UINT FASTCALL IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, INT Pos) { @@ -676,7 +676,7 @@
/*********************************************************************** * IntScrollClipPos */ -STATIC POINT IntScrollClipPos(PRECT Rect, POINT Pt) +static POINT IntScrollClipPos(PRECT Rect, POINT Pt) { if (Pt.x < Rect->left) { @@ -704,7 +704,7 @@ * * Draw the size grip. */ -STATIC void FASTCALL +static void FASTCALL IntScrollDrawSizeGrip(HWND Wnd, HDC Dc) { RECT Rect; @@ -723,7 +723,7 @@ * * Handle a keyboard event (only for SB_CTL scrollbars with focus). */ -STATIC void FASTCALL +static void FASTCALL IntScrollHandleKbdEvent( HWND Wnd /* [in] Handle of window with scrollbar(s) */, WPARAM wParam /* [in] Variable input including enable state */, @@ -778,7 +778,7 @@ * Handle a mouse or timer event for the scrollbar. * 'Pt' is the location of the mouse event in drawing coordinates */ -STATIC VOID FASTCALL +static VOID FASTCALL IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) { static POINT PrevPt; /* Previous mouse position for timer events */ @@ -1136,7 +1136,7 @@ } }
-STATIC INT FASTCALL +static INT FASTCALL IntScrollGetScrollPos(HWND Wnd, INT Bar) { SCROLLINFO ScrollInfo; @@ -1151,7 +1151,7 @@ return ScrollInfo.nPos; }
-STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollGetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos) { BOOL Result; _____
Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/bitmap.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -70,7 +70,7 @@
}
-HANDLE STATIC +static HANDLE LoadCursorImage(HINSTANCE hinst, LPCWSTR lpszName, UINT fuLoad) { HANDLE hResource; @@ -249,7 +249,7 @@ }
-HANDLE STATIC +static HANDLE LoadIconImage(HINSTANCE hinst, LPCWSTR lpszName, INT width, INT height, UINT fuLoad) { HANDLE hResource; @@ -443,7 +443,7 @@ }
-HANDLE STATIC +static HANDLE LoadBitmapImage(HINSTANCE hInstance, LPCWSTR lpszName, UINT fuLoad) { HANDLE hResource; _____
Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -366,7 +366,7 @@
#define ON_BOTTOM_BORDER(hit) \ (((hit) == HTBOTTOM) || ((hit) == HTBOTTOMLEFT) || ((hit) == HTBOTTOMRIGHT))
-VOID STATIC +static VOID UserDrawWindowFrame(HDC hdc, const RECT *rect, ULONG width, ULONG height) { @@ -394,7 +394,7 @@ SelectObject( hdc, hbrush ); }
-VOID STATIC +static VOID UserDrawMovingFrame(HDC hdc, RECT *rect, BOOL thickframe) { if(thickframe) @@ -407,7 +407,7 @@ } }
-VOID STATIC +static VOID DefWndDoSizeMove(HWND hwnd, WORD wParam) { HRGN DesktopRgn; @@ -723,7 +723,7 @@ * * Track a mouse button press on the horizontal or vertical scroll-bar. */ -STATIC VOID +static VOID DefWndTrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt) { INT ScrollBar; _____
Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/hook.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -139,7 +139,7 @@
return NtUserCallNextHookEx(Hook, Code, wParam, lParam); }
-STATIC +static HHOOK FASTCALL IntSetWindowsHook( _____
Modified: trunk/reactos/lib/user32/windows/message.c --- trunk/reactos/lib/user32/windows/message.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/message.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -963,7 +963,7 @@
} }
-STATIC LRESULT FASTCALL +static LRESULT FASTCALL IntCallWindowProcA(BOOL IsAnsiProc, WNDPROC WndProc, HWND hWnd, _____
Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/window.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -379,9 +379,8 @@
return NtUserGetForegroundWindow(); }
- +static BOOL -STATIC User32EnumWindows ( HDESK hDesktop, HWND hWndparent,