[ros-diffs] [tkreuzer] 47340: [WIN32K / WIN32CSR] Get rid of FASTCALL specifier for static functions and functions with no parameters.

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Mon May 24 15:34:08 CEST 2010


Author: tkreuzer
Date: Mon May 24 15:34:08 2010
New Revision: 47340

URL: http://svn.reactos.org/svn/reactos?rev=47340&view=rev
Log:
[WIN32K / WIN32CSR]
Get rid of FASTCALL specifier for static functions and functions with no parameters.

Modified:
    trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c
    trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
    trunk/reactos/subsystems/win32/win32k/include/cursoricon.h
    trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c?rev=47340&r1=47339&r2=47340&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Mon May 24 15:34:08 2010
@@ -197,7 +197,7 @@
 
 typedef void (WINAPI *INITCOMMONCONTROLS_PROC)(void);
 
-static void FASTCALL
+static void
 CallInitCommonControls()
 {
   static BOOL Initialized = FALSE;

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c?rev=47340&r1=47339&r2=47340&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Mon May 24 15:34:08 2010
@@ -113,7 +113,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-static VOID FASTCALL
+static VOID
 GuiConsoleAppendMenuItems(HMENU hMenu,
                           const GUICONSOLE_MENUITEM *Items)
 {
@@ -168,7 +168,7 @@
     }while(!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0));
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console)
 {
     HMENU hMenu;
@@ -182,14 +182,14 @@
     }
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleGetDataPointers(HWND hWnd, PCSRSS_CONSOLE *Console, PGUI_CONSOLE_DATA *GuiData)
 {
   *Console = (PCSRSS_CONSOLE) GetWindowLongPtrW(hWnd, GWL_USERDATA);
   *GuiData = (NULL == *Console ? NULL : (*Console)->PrivateData);
 }
 
-static BOOL FASTCALL
+static BOOL
 GuiConsoleOpenUserRegistryPathPerProcessId(DWORD ProcessId, PHANDLE hProcHandle, PHKEY hResult, REGSAM samDesired)
 {
   HANDLE hProcessToken = NULL;
@@ -245,7 +245,7 @@
     return TRUE;
 }
 
-static BOOL FASTCALL
+static BOOL
 GuiConsoleOpenUserSettings(PGUI_CONSOLE_DATA GuiData, DWORD ProcessId, PHKEY hSubKey, REGSAM samDesired, BOOL bCreate)
 {
   WCHAR szProcessName[MAX_PATH];
@@ -491,7 +491,7 @@
   RegCloseKey(hKey);
 }
 
-static void FASTCALL
+static void
 GuiConsoleReadUserSettings(HKEY hKey, PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer)
 {
   DWORD dwNumSubKeys = 0;
@@ -593,7 +593,7 @@
         }
    }
 }
-static VOID FASTCALL
+static VOID
 GuiConsoleUseDefaults(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer)
 {
   /*
@@ -676,7 +676,7 @@
                SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE);
 }
 
-static BOOL FASTCALL
+static BOOL
 GuiConsoleHandleNcCreate(HWND hWnd, CREATESTRUCTW *Create)
 {
   PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Create->lpCreateParams;
@@ -797,7 +797,7 @@
     Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ShowY) * GuiData->CharHeight;
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleUpdateSelection(PCSRSS_CONSOLE Console, PCOORD coord)
 {
   RECT oldRect, newRect;
@@ -857,7 +857,7 @@
 }
 
 
-static VOID FASTCALL
+static VOID
 GuiConsolePaint(PCSRSS_CONSOLE Console,
                 PGUI_CONSOLE_DATA GuiData,
                 HDC hDC,
@@ -980,7 +980,7 @@
                  OldFont);
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleHandlePaint(HWND hWnd, HDC hDCPaint)
 {
     HDC hDC;
@@ -1035,7 +1035,7 @@
     EndPaint(hWnd, &ps);
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleHandleKey(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   PCSRSS_CONSOLE Console;
@@ -1065,7 +1065,7 @@
     InvalidateRect(Console->hWindow, &RegionRect, FALSE);
 }
 
-static VOID FASTCALL
+static VOID
 GuiInvalidateCell(PCSRSS_CONSOLE Console, UINT x, UINT y)
 {
     SMALL_RECT CellRect = { x, y, x, y };
@@ -1165,7 +1165,7 @@
     return TRUE;
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleHandleTimer(HWND hWnd)
 {
   PCSRSS_CONSOLE Console;
@@ -1254,7 +1254,7 @@
   }
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleHandleClose(HWND hWnd)
 {
   PCSRSS_CONSOLE Console;
@@ -1281,7 +1281,7 @@
   LeaveCriticalSection(&Console->Lock);
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleHandleNcDestroy(HWND hWnd)
 {
   PCSRSS_CONSOLE Console;
@@ -1316,7 +1316,7 @@
     return Coord;
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleLeftMouseDown(HWND hWnd, LPARAM lParam)
 {
   PCSRSS_CONSOLE Console;
@@ -1334,7 +1334,7 @@
   GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor);
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleLeftMouseUp(HWND hWnd, LPARAM lParam)
 {
   PCSRSS_CONSOLE Console;
@@ -1354,7 +1354,7 @@
   ReleaseCapture();
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
   PCSRSS_CONSOLE Console;
@@ -1372,7 +1372,7 @@
   GuiConsoleUpdateSelection(Console, &c);
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleRightMouseDown(HWND hWnd)
 {
   PCSRSS_CONSOLE Console;
@@ -1467,7 +1467,7 @@
 
   CPLFunc(hWnd, CPL_DBLCLK, (LPARAM)&SharedInfo, Defaults);
 }
-static LRESULT FASTCALL
+static LRESULT
 GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam, PGUI_CONSOLE_DATA GuiData)
 {
     LRESULT Ret = TRUE;
@@ -1497,7 +1497,7 @@
     return Ret;
 }
 
-static VOID FASTCALL
+static VOID
 GuiConsoleGetMinMaxInfo(HWND hWnd, PMINMAXINFO minMaxInfo)
 {
   PCSRSS_CONSOLE Console;
@@ -1520,7 +1520,7 @@
   minMaxInfo->ptMaxTrackSize.x = windx;
   minMaxInfo->ptMaxTrackSize.y = windy;
 }
-static VOID FASTCALL
+static VOID
 GuiConsoleResize(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
   PCSRSS_CONSOLE Console;
@@ -1576,6 +1576,7 @@
      GuiData->WindowSizeLock = FALSE;
   }
 }
+
 VOID
 FASTCALL
 GuiConsoleHandleScrollbarMenu()
@@ -1694,7 +1695,7 @@
     return STATUS_SUCCESS;
 }
 
-static VOID FASTCALL
+static VOID
 GuiApplyUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PConsoleInfo pConInfo)
 {
   DWORD windx, windy;
@@ -2031,7 +2032,7 @@
   return 1;
 }
 
-static BOOL FASTCALL
+static BOOL
 GuiInit(VOID)
 {
   WNDCLASSEXW wc;

Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/cursoricon.h?rev=47340&r1=47339&r2=47340&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Mon May 24 15:34:08 2010
@@ -69,8 +69,8 @@
   BOOL ScreenSaverRunning;
 } SYSTEM_CURSORINFO, *PSYSTEM_CURSORINFO;
 
-BOOL FASTCALL InitCursorImpl();
-PCURICON_OBJECT FASTCALL IntCreateCurIconHandle();
+BOOL InitCursorImpl();
+PCURICON_OBJECT IntCreateCurIconHandle();
 VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process);
 
 BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth,
@@ -81,8 +81,7 @@
 
 int UserShowCursor(BOOL bShow);
 
-PSYSTEM_CURSORINFO FASTCALL
-IntGetSysCursorInfo();
+PSYSTEM_CURSORINFO IntGetSysCursorInfo();
 
 #define IntReleaseCurIconObject(CurIconObj) \
   UserDereferenceObject(CurIconObj)

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c?rev=47340&r1=47339&r2=47340&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Mon May 24 15:34:08 2010
@@ -46,7 +46,7 @@
 
 SYSTEM_CURSORINFO gSysCursorInfo;
 
-BOOL FASTCALL
+BOOL
 InitCursorImpl()
 {
     ExInitializePagedLookasideList(&gProcessLookasideList,
@@ -70,7 +70,7 @@
     return TRUE;
 }
 
-PSYSTEM_CURSORINFO FASTCALL
+PSYSTEM_CURSORINFO
 IntGetSysCursorInfo()
 {
     return &gSysCursorInfo;
@@ -378,7 +378,7 @@
     return NULL;
 }
 
-PCURICON_OBJECT FASTCALL
+PCURICON_OBJECT
 IntCreateCurIconHandle()
 {
     PCURICON_OBJECT CurIcon;




More information about the Ros-diffs mailing list