[WIN32SS]

Properly declare with FORCEINLINE
Properly declare with static

svn path=/trunk/; revision=63152

diff --git a/reactos/win32ss/drivers/font/bmfd/glyph.c b/reactos/win32ss/drivers/font/bmfd/glyph.c
index 55e0cdb..da4642a 100644 (file)
--- a/reactos/win32ss/drivers/font/bmfd/glyph.c
+++ b/reactos/win32ss/drivers/font/bmfd/glyph.c
@@ -7,8 +7,8 @@
 
 #include "bmfd.h"
 
-ULONG
 FORCEINLINE
+ULONG
 _ReadPixel(
     CHAR* pjBits,
     ULONG x,
@@ -21,8 +21,8 @@ _ReadPixel(
 }
 
 
-VOID
 FORCEINLINE
+VOID
 _WritePixel(
     CHAR* pjBits,
     ULONG x,

diff --git a/reactos/win32ss/gdi/eng/pdevobj.c b/reactos/win32ss/gdi/eng/pdevobj.c
index a2feddc..4d90b0a 100644 (file)
--- a/reactos/win32ss/gdi/eng/pdevobj.c
+++ b/reactos/win32ss/gdi/eng/pdevobj.c
@@ -360,8 +360,8 @@ EngpCreatePDEV(
     return ppdev;
 }
 
-VOID
 FORCEINLINE
+VOID
 SwitchPointer(
     _Inout_ PVOID pvPointer1,
     _Inout_ PVOID pvPointer2)

diff --git a/reactos/win32ss/gdi/eng/surface.h b/reactos/win32ss/gdi/eng/surface.h
index cbfeac9..2ab6037 100644 (file)
--- a/reactos/win32ss/gdi/eng/surface.h
+++ b/reactos/win32ss/gdi/eng/surface.h
@@ -126,8 +126,8 @@ SURFACE_AllocSurface(
     _In_opt_ ULONG cjWidth,
     _In_opt_ PVOID pvBits);
 
-VOID
 FORCEINLINE
+VOID
 SURFACE_vSetPalette(
     _Inout_ PSURFACE psurf,
     _In_ PPALETTE ppal)

diff --git a/reactos/win32ss/gdi/eng/xlateobj.h b/reactos/win32ss/gdi/eng/xlateobj.h
index 3249c1d..7e33893 100644 (file)
--- a/reactos/win32ss/gdi/eng/xlateobj.h
+++ b/reactos/win32ss/gdi/eng/xlateobj.h
@@ -46,8 +46,8 @@ typedef struct _EXLATEOBJ
 extern EXLATEOBJ gexloTrivial;
 
 _Notnull_
-PFN_XLATE
 FORCEINLINE
+PFN_XLATE
 XLATEOBJ_pfnXlate(
     _In_ XLATEOBJ *pxlo)
 {

diff --git a/reactos/win32ss/gdi/ntgdi/brush.h b/reactos/win32ss/gdi/ntgdi/brush.h
index 69288ae..79a2e0e 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/brush.h
+++ b/reactos/win32ss/gdi/ntgdi/brush.h
@@ -142,8 +142,8 @@ EBRUSHOBJ_psoPattern(EBRUSHOBJ *pebo);
 #define BRUSHOBJ_psoPattern(pbo) \
     EBRUSHOBJ_psoPattern(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject))
 
-ULONG
 FORCEINLINE
+ULONG
 EBRUSHOBJ_iSetSolidColor(EBRUSHOBJ *pebo, ULONG iSolidColor)
 {
     ULONG iOldColor = pebo->BrushObject.iSolidColor;

diff --git a/reactos/win32ss/gdi/ntgdi/coord.h b/reactos/win32ss/gdi/ntgdi/coord.h
index 6b80232..c433f76 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/coord.h
+++ b/reactos/win32ss/gdi/ntgdi/coord.h
@@ -57,8 +57,8 @@ VOID
 FASTCALL
 DC_vUpdateDeviceToWorld(PDC pdc);
 
-PSIZEL
 FORCEINLINE
+PSIZEL
 DC_pszlViewportExt(PDC pdc)
 {
     PDC_ATTR pdcattr = pdc->pdcattr;
@@ -74,15 +74,15 @@ DC_pszlViewportExt(PDC pdc)
     return &pdcattr->szlViewportExt;
 }
 
-PMATRIX
 FORCEINLINE
+PMATRIX
 DC_pmxWorldToPage(PDC pdc)
 {
     return &pdc->pdcattr->mxWorldToPage;
 }
 
-PMATRIX
 FORCEINLINE
+PMATRIX
 DC_pmxWorldToDevice(PDC pdc)
 {
     /* Check if world or page xform was changed */
@@ -95,8 +95,8 @@ DC_pmxWorldToDevice(PDC pdc)
     return &pdc->pdcattr->mxWorldToDevice;
 }
 
-PMATRIX
 FORCEINLINE
+PMATRIX
 DC_pmxDeviceToWorld(PDC pdc)
 {
     /* Check if the device-to-world xform is invalid */
@@ -109,8 +109,8 @@ DC_pmxDeviceToWorld(PDC pdc)
     return &pdc->pdcattr->mxDeviceToWorld;
 }
 
-VOID
 FORCEINLINE
+VOID
 DC_vXformDeviceToWorld(
     IN PDC pdc,
     IN ULONG cNumPoints,
@@ -125,8 +125,8 @@ DC_vXformDeviceToWorld(
     XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource);
 }
 
-VOID
 FORCEINLINE
+VOID
 DC_vXformWorldToDevice(
     IN PDC pdc,
     IN ULONG cNumPoints,

diff --git a/reactos/win32ss/gdi/ntgdi/dc.h b/reactos/win32ss/gdi/ntgdi/dc.h
index 7d646f7..a1a1170 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/dc.h
+++ b/reactos/win32ss/gdi/ntgdi/dc.h
@@ -247,8 +247,8 @@ DC_UnlockDc(PDC pdc)
     GDIOBJ_vUnlockObject(&pdc->BaseObject);
 }
 
-VOID
 FORCEINLINE
+VOID
 DC_vSelectSurface(PDC pdc, PSURFACE psurfNew)
 {
     PSURFACE psurfOld = pdc->dclevel.pSurface;
@@ -262,8 +262,8 @@ DC_vSelectSurface(PDC pdc, PSURFACE psurfNew)
     pdc->dclevel.pSurface = psurfNew;
 }
 
-VOID
 FORCEINLINE
+VOID
 DC_vSelectFillBrush(PDC pdc, PBRUSH pbrFill)
 {
     PBRUSH pbrFillOld = pdc->dclevel.pbrFill;
@@ -274,8 +274,8 @@ DC_vSelectFillBrush(PDC pdc, PBRUSH pbrFill)
     pdc->dclevel.pbrFill = pbrFill;
 }
 
-VOID
 FORCEINLINE
+VOID
 DC_vSelectLineBrush(PDC pdc, PBRUSH pbrLine)
 {
     PBRUSH pbrLineOld = pdc->dclevel.pbrLine;
@@ -286,8 +286,8 @@ DC_vSelectLineBrush(PDC pdc, PBRUSH pbrLine)
     pdc->dclevel.pbrLine = pbrLine;
 }
 
-VOID
 FORCEINLINE
+VOID
 DC_vSelectPalette(PDC pdc, PPALETTE ppal)
 {
     PPALETTE ppalOld = pdc->dclevel.ppal;

diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c
index 8172966..c30b46b 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/freetype.c
+++ b/reactos/win32ss/gdi/ntgdi/freetype.c
@@ -3162,8 +3162,8 @@ NtGdiGetFontFamilyInfo(HDC Dc,
     return Count;
 }
 
-LONG
 FORCEINLINE
+LONG
 ScaleLong(LONG lValue, PFLOATOBJ pef)
 {
     FLOATOBJ efTemp;

diff --git a/reactos/win32ss/gdi/ntgdi/palette.h b/reactos/win32ss/gdi/ntgdi/palette.h
index 8ff54a2..3dd16db 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/palette.h
+++ b/reactos/win32ss/gdi/ntgdi/palette.h
@@ -121,8 +121,8 @@ BOOL
 NTAPI
 PALETTE_Cleanup(PVOID ObjectBody);
 
-ULONG
 FORCEINLINE
+ULONG
 CalculateShift(ULONG ulMask1, ULONG ulMask2)
 {
     ULONG ulShift1, ulShift2;

diff --git a/reactos/win32ss/gdi/ntgdi/rect.h b/reactos/win32ss/gdi/ntgdi/rect.h
index df601c9..419547c 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/rect.h
+++ b/reactos/win32ss/gdi/ntgdi/rect.h
@@ -1,7 +1,7 @@
 #pragma once
 
-VOID
 FORCEINLINE
+VOID
 RECTL_vSetRect(RECTL *prcl, LONG left, LONG top, LONG right, LONG bottom)
 {
     prcl->left = left;
@@ -10,8 +10,8 @@ RECTL_vSetRect(RECTL *prcl, LONG left, LONG top, LONG right, LONG bottom)
     prcl->bottom = bottom;
 }
 
-VOID
 FORCEINLINE
+VOID
 RECTL_vSetEmptyRect(RECTL *prcl)
 {
     prcl->left = 0;
@@ -20,8 +20,8 @@ RECTL_vSetEmptyRect(RECTL *prcl)
     prcl->bottom = 0;
 }
 
-VOID
 FORCEINLINE
+VOID
 RECTL_vOffsetRect(RECTL *prcl, INT cx, INT cy)
 {
     prcl->left += cx;
@@ -30,23 +30,23 @@ RECTL_vOffsetRect(RECTL *prcl, INT cx, INT cy)
     prcl->bottom += cy;
 }
 
-BOOL
 FORCEINLINE
+BOOL
 RECTL_bIsEmptyRect(const RECTL *prcl)
 {
     return (prcl->left >= prcl->right || prcl->top >= prcl->bottom);
 }
 
-BOOL
 FORCEINLINE
+BOOL
 RECTL_bPointInRect(const RECTL *prcl, INT x, INT y)
 {
     return (x >= prcl->left && x < prcl->right &&
             y >= prcl->top  && y < prcl->bottom);
 }
 
-BOOL
 FORCEINLINE
+BOOL
 RECTL_bIsWellOrdered(const RECTL *prcl)
 {
     return ((prcl->left <= prcl->right) &&

diff --git a/reactos/win32ss/gdi/ntgdi/text.h b/reactos/win32ss/gdi/ntgdi/text.h
index 7abb553..a528dd8 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/text.h
+++ b/reactos/win32ss/gdi/ntgdi/text.h
@@ -80,8 +80,8 @@ typedef struct _LFONT
 #define LFONT_ShareUnlockFont(plfnt) GDIOBJ_vDereferenceObject((POBJ)plfnt)
 #define LFONT_UnlockFont(plfnt) GDIOBJ_vUnlockObject((POBJ)plfnt)
 
-PTEXTOBJ
 FORCEINLINE
+PTEXTOBJ
 TEXTOBJ_LockText(HFONT hfont)
 {
     PLFONT plfnt = LFONT_ShareLockFont(hfont);
@@ -93,8 +93,8 @@ TEXTOBJ_LockText(HFONT hfont)
     return plfnt;
 }
 
-VOID
 FORCEINLINE
+VOID
 TEXTOBJ_UnlockText(PLFONT plfnt)
 {
     ExReleasePushLockExclusive(&plfnt->lock);

diff --git a/reactos/win32ss/user/ntuser/clipboard.c b/reactos/win32ss/user/ntuser/clipboard.c
index 30ab59c..2965b3a 100644 (file)
--- a/reactos/win32ss/user/ntuser/clipboard.c
+++ b/reactos/win32ss/user/ntuser/clipboard.c
@@ -17,7 +17,7 @@ DBG_DEFAULT_CHANNEL(UserClipbrd);
 #define IS_DATA_DELAYED(ce)     ((ce)->hData == DATA_DELAYED)
 #define IS_DATA_SYNTHESIZED(ce) ((ce)->hData == DATA_SYNTH_USER || (ce)->hData == DATA_SYNTH_KRNL)
 
-PWINSTATION_OBJECT static FASTCALL
+static PWINSTATION_OBJECT FASTCALL
 IntGetWinStaForCbAccess(VOID)
 {
     HWINSTA hWinSta;
@@ -37,7 +37,7 @@ IntGetWinStaForCbAccess(VOID)
 }
 
 /* If format exists, returns a non zero value (pointing to formated object) */
-PCLIP static FASTCALL
+static PCLIP FASTCALL
 IntIsFormatAvailable(PWINSTATION_OBJECT pWinStaObj, UINT fmt)
 {
     unsigned i = 0;
@@ -51,7 +51,7 @@ IntIsFormatAvailable(PWINSTATION_OBJECT pWinStaObj, UINT fmt)
     return NULL;
 }
 
-VOID static FASTCALL
+static VOID FASTCALL
 IntFreeElementData(PCLIP pElement)
 {
     if (!IS_DATA_DELAYED(pElement) &&
@@ -69,7 +69,7 @@ IntFreeElementData(PCLIP pElement)
 }
 
 /* Adds a new format and data to the clipboard */
-PCLIP static NTAPI
+static PCLIP NTAPI
 IntAddFormatedData(PWINSTATION_OBJECT pWinStaObj, UINT fmt, HANDLE hData, BOOLEAN fGlobalHandle, BOOL bEnd)
 {
     PCLIP pElement = NULL;
@@ -121,7 +121,7 @@ IntAddFormatedData(PWINSTATION_OBJECT pWinStaObj, UINT fmt, HANDLE hData, BOOLEA
     return pElement;
 }
 
-BOOL static FASTCALL
+static BOOL FASTCALL
 IntIsClipboardOpenByMe(PWINSTATION_OBJECT pWinSta)
 {
     /* Check if current thread has opened the clipboard */
@@ -134,7 +134,7 @@ IntIsClipboardOpenByMe(PWINSTATION_OBJECT pWinSta)
     return FALSE;
 }
 
-VOID static NTAPI
+static VOID NTAPI
 IntSynthesizeDib(
     PWINSTATION_OBJECT pWinStaObj,
     HBITMAP hbm)
@@ -218,7 +218,7 @@ cleanup:
     UserReleaseDC(NULL, hdc, FALSE);
 }
 
-VOID static WINAPI
+static VOID WINAPI
 IntSynthesizeBitmap(PWINSTATION_OBJECT pWinStaObj, PCLIP pBmEl)
 {
     HDC hdc = NULL;
@@ -279,7 +279,7 @@ cleanup:
         DIB_FreeConvertedBitmapInfo(pConvertedBmi, pBmi, -1);
 }
 
-VOID static NTAPI
+static VOID NTAPI
 IntAddSynthesizedFormats(PWINSTATION_OBJECT pWinStaObj)
 {
     PCLIP pTextEl, pUniTextEl, pOemTextEl, pLocaleEl, pBmEl, pDibEl;

diff --git a/reactos/win32ss/user/user32/windows/clipboard.c b/reactos/win32ss/user/user32/windows/clipboard.c
index fe321a8..6e02427 100644 (file)
--- a/reactos/win32ss/user/user32/windows/clipboard.c
+++ b/reactos/win32ss/user/user32/windows/clipboard.c
@@ -152,7 +152,7 @@ RegisterClipboardFormatW(LPCWSTR lpszFormat)
     return ret;
 }
 
-PVOID static WINAPI
+static PVOID WINAPI
 IntSynthesizeMultiByte(PVOID pwStr, DWORD cbStr, BOOL bOem)
 {
     HANDLE hGlobal;
@@ -173,7 +173,7 @@ IntSynthesizeMultiByte(PVOID pwStr, DWORD cbStr, BOOL bOem)
     return pGlobal;
 }
 
-PVOID static WINAPI
+static PVOID WINAPI
 IntSynthesizeWideChar(PVOID pwStr, DWORD cbStr, BOOL bOem)
 {
     HANDLE hGlobal;

diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
index bf335d6..7470a3c 100644 (file)
--- a/reactos/win32ss/user/user32/windows/menu.c
+++ b/reactos/win32ss/user/user32/windows/menu.c
@@ -130,7 +130,7 @@ static SIZE MenuCharSize;
  *
  * Validate the given menu handle and returns the menu structure pointer.
  */
-PMENU FORCEINLINE MENU_GetMenu(HMENU hMenu)
+FORCEINLINE PMENU MENU_GetMenu(HMENU hMenu)
 {
     return ValidateHandle(hMenu, TYPE_MENU); 
 }

diff --git a/reactos/win32ss/user/user32/windows/window.c b/reactos/win32ss/user/user32/windows/window.c
index 4522379..a2c22c6 100644 (file)
--- a/reactos/win32ss/user/user32/windows/window.c
+++ b/reactos/win32ss/user/user32/windows/window.c
@@ -120,8 +120,8 @@ CloseWindow(HWND hWnd)
     return HandleToUlong(hWnd);
 }
 
-VOID
 FORCEINLINE
+VOID
 RtlInitLargeString(
     OUT PLARGE_STRING plstr,
     LPCVOID psz,