[pschweitzer] 63152: [WIN32SS] Properly declare with FORCEINLINE Properly declare with static
4 May
2014
4 May
'14
9:45 a.m.
Author: pschweitzer
Date: Sun May 4 09:45:42 2014
New Revision: 63152
URL: http://svn.reactos.org/svn/reactos?rev=63152&view=rev
Log:
[WIN32SS]
Properly declare with FORCEINLINE
Properly declare with static
Modified:
trunk/reactos/win32ss/drivers/font/bmfd/glyph.c
trunk/reactos/win32ss/gdi/eng/pdevobj.c
trunk/reactos/win32ss/gdi/eng/surface.h
trunk/reactos/win32ss/gdi/eng/xlateobj.h
trunk/reactos/win32ss/gdi/ntgdi/brush.h
trunk/reactos/win32ss/gdi/ntgdi/coord.h
trunk/reactos/win32ss/gdi/ntgdi/dc.h
trunk/reactos/win32ss/gdi/ntgdi/freetype.c
trunk/reactos/win32ss/gdi/ntgdi/palette.h
trunk/reactos/win32ss/gdi/ntgdi/rect.h
trunk/reactos/win32ss/gdi/ntgdi/text.h
trunk/reactos/win32ss/user/ntuser/clipboard.c
trunk/reactos/win32ss/user/user32/windows/clipboard.c
trunk/reactos/win32ss/user/user32/windows/menu.c
trunk/reactos/win32ss/user/user32/windows/window.c
Modified: trunk/reactos/win32ss/drivers/font/bmfd/glyph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/…
==============================================================================
--- trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] Sun May 4 09:45:42 2014
@@ -7,8 +7,8 @@
#include "bmfd.h"
+FORCEINLINE
ULONG
-FORCEINLINE
_ReadPixel(
CHAR* pjBits,
ULONG x,
@@ -21,8 +21,8 @@
}
+FORCEINLINE
VOID
-FORCEINLINE
_WritePixel(
CHAR* pjBits,
ULONG x,
Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Sun May 4 09:45:42 2014
@@ -360,8 +360,8 @@
return ppdev;
}
+FORCEINLINE
VOID
-FORCEINLINE
SwitchPointer(
_Inout_ PVOID pvPointer1,
_Inout_ PVOID pvPointer2)
Modified: trunk/reactos/win32ss/gdi/eng/surface.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.h?…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -126,8 +126,8 @@
_In_opt_ ULONG cjWidth,
_In_opt_ PVOID pvBits);
+FORCEINLINE
VOID
-FORCEINLINE
SURFACE_vSetPalette(
_Inout_ PSURFACE psurf,
_In_ PPALETTE ppal)
Modified: trunk/reactos/win32ss/gdi/eng/xlateobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.h…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -46,8 +46,8 @@
extern EXLATEOBJ gexloTrivial;
_Notnull_
+FORCEINLINE
PFN_XLATE
-FORCEINLINE
XLATEOBJ_pfnXlate(
_In_ XLATEOBJ *pxlo)
{
Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -142,8 +142,8 @@
#define BRUSHOBJ_psoPattern(pbo) \
EBRUSHOBJ_psoPattern(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject))
+FORCEINLINE
ULONG
-FORCEINLINE
EBRUSHOBJ_iSetSolidColor(EBRUSHOBJ *pebo, ULONG iSolidColor)
{
ULONG iOldColor = pebo->BrushObject.iSolidColor;
Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.h?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -57,8 +57,8 @@
FASTCALL
DC_vUpdateDeviceToWorld(PDC pdc);
+FORCEINLINE
PSIZEL
-FORCEINLINE
DC_pszlViewportExt(PDC pdc)
{
PDC_ATTR pdcattr = pdc->pdcattr;
@@ -74,15 +74,15 @@
return &pdcattr->szlViewportExt;
}
+FORCEINLINE
PMATRIX
-FORCEINLINE
DC_pmxWorldToPage(PDC pdc)
{
return &pdc->pdcattr->mxWorldToPage;
}
+FORCEINLINE
PMATRIX
-FORCEINLINE
DC_pmxWorldToDevice(PDC pdc)
{
/* Check if world or page xform was changed */
@@ -95,8 +95,8 @@
return &pdc->pdcattr->mxWorldToDevice;
}
+FORCEINLINE
PMATRIX
-FORCEINLINE
DC_pmxDeviceToWorld(PDC pdc)
{
/* Check if the device-to-world xform is invalid */
@@ -109,8 +109,8 @@
return &pdc->pdcattr->mxDeviceToWorld;
}
+FORCEINLINE
VOID
-FORCEINLINE
DC_vXformDeviceToWorld(
IN PDC pdc,
IN ULONG cNumPoints,
@@ -125,8 +125,8 @@
XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource);
}
+FORCEINLINE
VOID
-FORCEINLINE
DC_vXformWorldToDevice(
IN PDC pdc,
IN ULONG cNumPoints,
Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -247,8 +247,8 @@
GDIOBJ_vUnlockObject(&pdc->BaseObject);
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
DC_vSelectSurface(PDC pdc, PSURFACE psurfNew)
{
PSURFACE psurfOld = pdc->dclevel.pSurface;
@@ -262,8 +262,8 @@
pdc->dclevel.pSurface = psurfNew;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
DC_vSelectFillBrush(PDC pdc, PBRUSH pbrFill)
{
PBRUSH pbrFillOld = pdc->dclevel.pbrFill;
@@ -274,8 +274,8 @@
pdc->dclevel.pbrFill = pbrFill;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
DC_vSelectLineBrush(PDC pdc, PBRUSH pbrLine)
{
PBRUSH pbrLineOld = pdc->dclevel.pbrLine;
@@ -286,8 +286,8 @@
pdc->dclevel.pbrLine = pbrLine;
}
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
DC_vSelectPalette(PDC pdc, PPALETTE ppal)
{
PPALETTE ppalOld = pdc->dclevel.ppal;
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun May 4 09:45:42 2014
@@ -3162,8 +3162,8 @@
return Count;
}
+FORCEINLINE
LONG
-FORCEINLINE
ScaleLong(LONG lValue, PFLOATOBJ pef)
{
FLOATOBJ efTemp;
Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -121,8 +121,8 @@
NTAPI
PALETTE_Cleanup(PVOID ObjectBody);
+FORCEINLINE
ULONG
-FORCEINLINE
CalculateShift(ULONG ulMask1, ULONG ulMask2)
{
ULONG ulShift1, ulShift2;
Modified: trunk/reactos/win32ss/gdi/ntgdi/rect.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/rect.h?r…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/rect.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/rect.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -1,7 +1,7 @@
#pragma once
+FORCEINLINE
VOID
-FORCEINLINE
RECTL_vSetRect(RECTL *prcl, LONG left, LONG top, LONG right, LONG bottom)
{
prcl->left = left;
@@ -10,8 +10,8 @@
prcl->bottom = bottom;
}
+FORCEINLINE
VOID
-FORCEINLINE
RECTL_vSetEmptyRect(RECTL *prcl)
{
prcl->left = 0;
@@ -20,8 +20,8 @@
prcl->bottom = 0;
}
+FORCEINLINE
VOID
-FORCEINLINE
RECTL_vOffsetRect(RECTL *prcl, INT cx, INT cy)
{
prcl->left += cx;
@@ -30,23 +30,23 @@
prcl->bottom += cy;
}
+FORCEINLINE
BOOL
-FORCEINLINE
RECTL_bIsEmptyRect(const RECTL *prcl)
{
return (prcl->left >= prcl->right || prcl->top >= prcl->bottom);
}
+FORCEINLINE
BOOL
-FORCEINLINE
RECTL_bPointInRect(const RECTL *prcl, INT x, INT y)
{
return (x >= prcl->left && x < prcl->right &&
y >= prcl->top && y < prcl->bottom);
}
+FORCEINLINE
BOOL
-FORCEINLINE
RECTL_bIsWellOrdered(const RECTL *prcl)
{
return ((prcl->left <= prcl->right) &&
Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Sun May 4 09:45:42 2014
@@ -80,8 +80,8 @@
#define LFONT_ShareUnlockFont(plfnt) GDIOBJ_vDereferenceObject((POBJ)plfnt)
#define LFONT_UnlockFont(plfnt) GDIOBJ_vUnlockObject((POBJ)plfnt)
+FORCEINLINE
PTEXTOBJ
-FORCEINLINE
TEXTOBJ_LockText(HFONT hfont)
{
PLFONT plfnt = LFONT_ShareLockFont(hfont);
@@ -93,8 +93,8 @@
return plfnt;
}
+FORCEINLINE
VOID
-FORCEINLINE
TEXTOBJ_UnlockText(PLFONT plfnt)
{
ExReleasePushLockExclusive(&plfnt->lock);
Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sun May 4 09:45:42 2014
@@ -17,7 +17,7 @@
#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 @@
}
/* 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 @@
return NULL;
}
-VOID static FASTCALL
+static VOID FASTCALL
IntFreeElementData(PCLIP pElement)
{
if (!IS_DATA_DELAYED(pElement) &&
@@ -69,7 +69,7 @@
}
/* 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 @@
return pElement;
}
-BOOL static FASTCALL
+static BOOL FASTCALL
IntIsClipboardOpenByMe(PWINSTATION_OBJECT pWinSta)
{
/* Check if current thread has opened the clipboard */
@@ -134,7 +134,7 @@
return FALSE;
}
-VOID static NTAPI
+static VOID NTAPI
IntSynthesizeDib(
PWINSTATION_OBJECT pWinStaObj,
HBITMAP hbm)
@@ -218,7 +218,7 @@
UserReleaseDC(NULL, hdc, FALSE);
}
-VOID static WINAPI
+static VOID WINAPI
IntSynthesizeBitmap(PWINSTATION_OBJECT pWinStaObj, PCLIP pBmEl)
{
HDC hdc = NULL;
@@ -279,7 +279,7 @@
DIB_FreeConvertedBitmapInfo(pConvertedBmi, pBmi, -1);
}
-VOID static NTAPI
+static VOID NTAPI
IntAddSynthesizedFormats(PWINSTATION_OBJECT pWinStaObj)
{
PCLIP pTextEl, pUniTextEl, pOemTextEl, pLocaleEl, pBmEl, pDibEl;
Modified: trunk/reactos/win32ss/user/user32/windows/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/clipboard.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/clipboard.c [iso-8859-1] Sun May 4 09:45:42
2014
@@ -152,7 +152,7 @@
return ret;
}
-PVOID static WINAPI
+static PVOID WINAPI
IntSynthesizeMultiByte(PVOID pwStr, DWORD cbStr, BOOL bOem)
{
HANDLE hGlobal;
@@ -173,7 +173,7 @@
return pGlobal;
}
-PVOID static WINAPI
+static PVOID WINAPI
IntSynthesizeWideChar(PVOID pwStr, DWORD cbStr, BOOL bOem)
{
HANDLE hGlobal;
Modified: trunk/reactos/win32ss/user/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sun May 4 09:45:42
2014
@@ -130,7 +130,7 @@
*
* 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);
}
Modified: trunk/reactos/win32ss/user/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Sun May 4 09:45:42
2014
@@ -120,8 +120,8 @@
return HandleToUlong(hWnd);
}
+FORCEINLINE
VOID
-FORCEINLINE
RtlInitLargeString(
OUT PLARGE_STRING plstr,
LPCVOID psz,
3889
days inactive
3889
days old
0 comments
1 participants
participants (1)
-
pschweitzer＠svn.reactos.org