- Less STDCALL, more WINAPI/NTAPI/APIENTRY

svn path=/trunk/; revision=37752

reactos/subsystems/ntvdm/ntvdm.c

@@ -270,7 +270,7 @@ DestroyVDM(PVDM_CONTROL_BLOCK vdm)
     return result;
 }
 
-int STDCALL
+int WINAPI
 WinMain(HINSTANCE hInstance,  HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
     VDM_CONTROL_BLOCK VdmCB;

reactos/subsystems/win/basesrv/init.c

@@ -34,7 +34,7 @@ HANDLE BaseApiPort = (HANDLE) 0;
  * NAME							PRIVATE
  * 	BaseStaticServerThread/1
  */
-VOID STDCALL BaseStaticServerThread (PVOID x)
+VOID WINAPI BaseStaticServerThread (PVOID x)
 {
 	NTSTATUS Status = STATUS_SUCCESS;
 	PPORT_MESSAGE Request = (PPORT_MESSAGE) x;
@@ -56,7 +56,7 @@ VOID STDCALL BaseStaticServerThread (PVOID x)
 }
 
 
-NTSTATUS STDCALL ServerDllInitialization (ULONG ArgumentCount, LPWSTR *Argument)
+NTSTATUS WINAPI ServerDllInitialization (ULONG ArgumentCount, LPWSTR *Argument)
 {
 	NTSTATUS Status = STATUS_SUCCESS;
 

reactos/subsystems/win/basesrv/main.c

@@ -32,7 +32,7 @@ HANDLE DllHandle = 0;
 
 /* FUNCTIONS *****************************************************************/
 
-BOOL STDCALL DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
+BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
 {
   if (DLL_PROCESS_ATTACH == dwReason)
     {

reactos/subsystems/win/basesrv/server.c

@@ -32,7 +32,7 @@
  * 	PUBLIC API
  *===================================================================*/
 
-NTSTATUS STDCALL BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE ProcessCreateNotifyProc)
+NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE ProcessCreateNotifyProc)
 {
 	NTSTATUS Status = STATUS_NOT_IMPLEMENTED;
 

reactos/subsystems/win/winsrv/dllmain.c

@@ -32,7 +32,7 @@ HANDLE DllHandle = 0;
 
 /* FUNCTIONS *****************************************************************/
 
-BOOL STDCALL DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
+BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
 {
   if (DLL_PROCESS_ATTACH == dwReason)
     {

reactos/subsystems/win/winsrv/init.c

@@ -34,7 +34,7 @@ HANDLE WinSrvApiPort = NULL;
  * NAME							PRIVATE
  * 	ConStaticServerThread/1
  */
-VOID STDCALL ConStaticServerThread (PVOID x)
+VOID WINAPI ConStaticServerThread (PVOID x)
 {
 	NTSTATUS Status = STATUS_SUCCESS;
 	PPORT_MESSAGE Request = (PPORT_MESSAGE) x;
@@ -59,7 +59,7 @@ VOID STDCALL ConStaticServerThread (PVOID x)
  * NAME							PRIVATE
  * 	UserStaticServerThread/1
  */
-VOID STDCALL UserStaticServerThread (PVOID x)
+VOID WINAPI UserStaticServerThread (PVOID x)
 {
 	NTSTATUS Status = STATUS_SUCCESS;
 	PPORT_MESSAGE Request = (PPORT_MESSAGE) x;
@@ -84,7 +84,7 @@ VOID STDCALL UserStaticServerThread (PVOID x)
  * 	PUBLIC API
  *===================================================================*/
 
-NTSTATUS STDCALL ConServerDllInitialization (ULONG ArgumentCount,
+NTSTATUS WINAPI ConServerDllInitialization (ULONG ArgumentCount,
 					     LPWSTR *Argument)
 {
 	NTSTATUS Status = STATUS_SUCCESS;
@@ -106,7 +106,7 @@ NTSTATUS STDCALL ConServerDllInitialization (ULONG ArgumentCount,
 	return Status;
 }
 
-NTSTATUS STDCALL UserServerDllInitialization (ULONG ArgumentCount,
+NTSTATUS WINAPI UserServerDllInitialization (ULONG ArgumentCount,
 					      LPWSTR *Argument)
 {
 	NTSTATUS Status = STATUS_SUCCESS;

reactos/subsystems/win32/csrss/api/handle.c

@@ -61,7 +61,7 @@ CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions)
   return STATUS_SUCCESS;
 }
 
-NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access )
+NTSTATUS WINAPI CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access )
 {
   ULONG h = (ULONG)Handle >> 2;
   DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0);
@@ -82,7 +82,7 @@ NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, O
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 CsrReleaseObjectByPointer(Object_t *Object)
 {
   unsigned DefIndex;
@@ -106,7 +106,7 @@ CsrReleaseObjectByPointer(Object_t *Object)
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData,
                  HANDLE Handle)
 {
@@ -126,7 +126,7 @@ CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData,
   return CsrReleaseObjectByPointer(Object);
 }
 
-NTSTATUS STDCALL CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData,
+NTSTATUS WINAPI CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData,
                                  PHANDLE Handle,
                                  Object_t *Object,
                                  DWORD Access,
@@ -170,7 +170,7 @@ NTSTATUS STDCALL CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData,
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData,
+NTSTATUS WINAPI CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData,
                                          PCSRSS_PROCESS_DATA TargetProcessData)
 {
     ULONG i;
@@ -206,7 +206,7 @@ NTSTATUS STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData,
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle )
+NTSTATUS WINAPI CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle )
 {
   ULONG h = (ULONG)Handle >> 2;
 

reactos/subsystems/win32/csrss/api/process.c

@@ -24,14 +24,14 @@ RTL_CRITICAL_SECTION ProcessDataLock;
 
 /* FUNCTIONS *****************************************************************/
 
-VOID STDCALL CsrInitProcessData(VOID)
+VOID WINAPI CsrInitProcessData(VOID)
 {
    RtlZeroMemory (ProcessData, sizeof ProcessData);
    NrProcess = sizeof ProcessData / sizeof ProcessData[0];
    RtlInitializeCriticalSection( &ProcessDataLock );
 }
 
-PCSRSS_PROCESS_DATA STDCALL CsrGetProcessData(HANDLE ProcessId)
+PCSRSS_PROCESS_DATA WINAPI CsrGetProcessData(HANDLE ProcessId)
 {
    ULONG hash;
    PCSRSS_PROCESS_DATA pProcessData;
@@ -50,7 +50,7 @@ PCSRSS_PROCESS_DATA STDCALL CsrGetProcessData(HANDLE ProcessId)
    return pProcessData;
 }
 
-PCSRSS_PROCESS_DATA STDCALL CsrCreateProcessData(HANDLE ProcessId)
+PCSRSS_PROCESS_DATA WINAPI CsrCreateProcessData(HANDLE ProcessId)
 {
    ULONG hash;
    PCSRSS_PROCESS_DATA pProcessData;
@@ -125,7 +125,7 @@ PCSRSS_PROCESS_DATA STDCALL CsrCreateProcessData(HANDLE ProcessId)
    return pProcessData;
 }
 
-NTSTATUS STDCALL CsrFreeProcessData(HANDLE Pid)
+NTSTATUS WINAPI CsrFreeProcessData(HANDLE Pid)
 {
   ULONG hash;
   UINT c;
@@ -186,7 +186,7 @@ NTSTATUS STDCALL CsrFreeProcessData(HANDLE Pid)
    return STATUS_INVALID_PARAMETER;
 }
 
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context)
 {
   UINT Hash;

reactos/subsystems/win32/csrss/api/wapi.c

@@ -118,7 +118,7 @@ CsrHandleHardError(IN PCSRSS_PROCESS_DATA ProcessData,
     (VOID)CallHardError(ProcessData, Message);
 }
 
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 CsrpHandleConnectionRequest (PPORT_MESSAGE Request,
                              IN HANDLE hApiListenPort)
 {
@@ -192,7 +192,7 @@ CsrpHandleConnectionRequest (PPORT_MESSAGE Request,
 }
 
 VOID
-STDCALL
+WINAPI
 ClientConnectionThread(HANDLE ServerPort)
 {
     NTSTATUS Status;
@@ -309,7 +309,7 @@ ClientConnectionThread(HANDLE ServerPort)
  * 	"\Windows\ApiPort".
  */
 #if 0
-DWORD STDCALL
+DWORD WINAPI
 ServerApiPortThread (HANDLE hApiListenPort)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -354,7 +354,7 @@ ServerApiPortThread (HANDLE hApiListenPort)
  * 	"\Windows\SbApiPort". We will accept only one
  * 	connection request (from the SM).
  */
-DWORD STDCALL
+DWORD WINAPI
 ServerSbApiPortThread (HANDLE hSbApiPortListen)
 {
     HANDLE          hConnectedPort = (HANDLE) 0;

reactos/subsystems/win32/csrss/include/api.h

@@ -62,7 +62,7 @@ typedef struct _CSRSS_PROCESS_DATA
   BOOL Terminated;
 } CSRSS_PROCESS_DATA, *PCSRSS_PROCESS_DATA;
 
-typedef VOID (STDCALL *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object);
+typedef VOID (WINAPI *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object);
 
 typedef struct tagCSRSS_OBJECT_DEFINITION
 {
@@ -70,7 +70,7 @@ typedef struct tagCSRSS_OBJECT_DEFINITION
   CSR_CLEANUP_OBJECT_PROC CsrCleanupObjectProc;
 } CSRSS_OBJECT_DEFINITION, *PCSRSS_OBJECT_DEFINITION;
 
-typedef NTSTATUS (STDCALL *CSRSS_API_PROC)(PCSRSS_PROCESS_DATA ProcessData,
+typedef NTSTATUS (WINAPI *CSRSS_API_PROC)(PCSRSS_PROCESS_DATA ProcessData,
                                            PCSR_API_MESSAGE Request);
 
 typedef struct _CSRSS_API_DEFINITION
@@ -90,7 +90,7 @@ typedef struct _CSRSS_LISTEN_DATA
   PCSRSS_API_DEFINITION *ApiDefinitions;
 } CSRSS_LISTEN_DATA, *PCSRSS_LISTEN_DATA;
 
-#define CSR_API(n) NTSTATUS STDCALL n (\
+#define CSR_API(n) NTSTATUS WINAPI n (\
 PCSRSS_PROCESS_DATA ProcessData,\
 PCSR_API_MESSAGE Request)
 
@@ -103,16 +103,16 @@ CSR_API(CsrCreateProcess);
 CSR_API(CsrTerminateProcess);
 
 /* print.c */
-VOID STDCALL DisplayString(LPCWSTR lpwString);
+VOID WINAPI DisplayString(LPCWSTR lpwString);
-VOID STDCALL PrintString (char* fmt, ...);
+VOID WINAPI PrintString (char* fmt, ...);
 
 /* api/wapi.c */
 NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION NewDefinitions);
 VOID FASTCALL CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData,
                                 PCSR_API_MESSAGE Request);
-DWORD STDCALL ServerApiPortThread (PVOID PortHandle);
+DWORD WINAPI ServerApiPortThread (PVOID PortHandle);
-DWORD STDCALL ServerSbApiPortThread (PVOID PortHandle);
+DWORD WINAPI ServerSbApiPortThread (PVOID PortHandle);
-DWORD STDCALL Console_Api( PVOID unused );
+DWORD WINAPI Console_Api( PVOID unused );
 VOID
 NTAPI
 ClientConnectionThread(HANDLE ServerPort);
@@ -120,26 +120,26 @@ ClientConnectionThread(HANDLE ServerPort);
 extern HANDLE CsrssApiHeap;
 
 /* api/conio.c */
-VOID STDCALL CsrInitConsoleSupport(VOID);
+VOID WINAPI CsrInitConsoleSupport(VOID);
 
 /* api/process.c */
-typedef NTSTATUS (STDCALL *CSRSS_ENUM_PROCESS_PROC)(PCSRSS_PROCESS_DATA ProcessData,
+typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESS_PROC)(PCSRSS_PROCESS_DATA ProcessData,
                                                     PVOID Context);
-VOID STDCALL CsrInitProcessData(VOID);
+VOID WINAPI CsrInitProcessData(VOID);
-PCSRSS_PROCESS_DATA STDCALL CsrGetProcessData(HANDLE ProcessId);
+PCSRSS_PROCESS_DATA WINAPI CsrGetProcessData(HANDLE ProcessId);
-PCSRSS_PROCESS_DATA STDCALL CsrCreateProcessData(HANDLE ProcessId);
+PCSRSS_PROCESS_DATA WINAPI CsrCreateProcessData(HANDLE ProcessId);
-NTSTATUS STDCALL CsrFreeProcessData( HANDLE Pid );
+NTSTATUS WINAPI CsrFreeProcessData( HANDLE Pid );
-NTSTATUS STDCALL CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context);
+NTSTATUS WINAPI CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context);
 
 /* api/handle.c */
 NTSTATUS FASTCALL CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions);
-NTSTATUS STDCALL CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable );
+NTSTATUS WINAPI CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable );
-NTSTATUS STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, PCSRSS_PROCESS_DATA TargetProcessData);
+NTSTATUS WINAPI CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, PCSRSS_PROCESS_DATA TargetProcessData);
-NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access );
+NTSTATUS WINAPI CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access );
-BOOL STDCALL CsrServerInitialization (int,char**,char**);
+BOOL WINAPI CsrServerInitialization (int,char**,char**);
-NTSTATUS STDCALL CsrReleaseObjectByPointer(Object_t *Object);
+NTSTATUS WINAPI CsrReleaseObjectByPointer(Object_t *Object);
-NTSTATUS STDCALL CsrReleaseObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object );
+NTSTATUS WINAPI CsrReleaseObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object );
-NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object );
+NTSTATUS WINAPI CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object );
 
 CSR_API(CsrGetInputHandle);
 CSR_API(CsrGetOutputHandle);

reactos/subsystems/win32/csrss/include/conio.h

@@ -49,17 +49,17 @@ typedef struct tagCSRSS_SCREEN_BUFFER
 
 typedef struct tagCSRSS_CONSOLE_VTBL
 {
-  VOID (STDCALL *InitScreenBuffer)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
+  VOID (WINAPI *InitScreenBuffer)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
-  VOID (STDCALL *WriteStream)(PCSRSS_CONSOLE Console, RECT *Block, LONG CursorStartX, LONG CursorStartY,
+  VOID (WINAPI *WriteStream)(PCSRSS_CONSOLE Console, RECT *Block, LONG CursorStartX, LONG CursorStartY,
                               UINT ScrolledLines, CHAR *Buffer, UINT Length);
-  VOID (STDCALL *DrawRegion)(PCSRSS_CONSOLE Console, RECT *Region);
+  VOID (WINAPI *DrawRegion)(PCSRSS_CONSOLE Console, RECT *Region);
-  BOOL (STDCALL *SetCursorInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
+  BOOL (WINAPI *SetCursorInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
-  BOOL (STDCALL *SetScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer,
+  BOOL (WINAPI *SetScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer,
                                 UINT OldCursorX, UINT OldCursorY);
-  BOOL (STDCALL *UpdateScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
+  BOOL (WINAPI *UpdateScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer);
-  BOOL (STDCALL *ChangeTitle)(PCSRSS_CONSOLE Console);
+  BOOL (WINAPI *ChangeTitle)(PCSRSS_CONSOLE Console);
-  VOID (STDCALL *CleanupConsole)(PCSRSS_CONSOLE Console);
+  VOID (WINAPI *CleanupConsole)(PCSRSS_CONSOLE Console);
-  BOOL (STDCALL *ChangeIcon)(PCSRSS_CONSOLE Console, HICON hWindowIcon);
+  BOOL (WINAPI *ChangeIcon)(PCSRSS_CONSOLE Console, HICON hWindowIcon);
 } CSRSS_CONSOLE_VTBL, *PCSRSS_CONSOLE_VTBL;
 
 typedef struct tagCSRSS_CONSOLE
@@ -87,9 +87,9 @@ typedef struct tagCSRSS_CONSOLE
 } CSRSS_CONSOLE;
 
 NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSRSS_PROCESS_DATA ProcessData, PCSRSS_CONSOLE *Console);
-VOID STDCALL ConioDeleteConsole(Object_t *Object);
+VOID WINAPI ConioDeleteConsole(Object_t *Object);
-VOID STDCALL ConioDeleteScreenBuffer(Object_t *Buffer);
+VOID WINAPI ConioDeleteScreenBuffer(Object_t *Buffer);
-void STDCALL ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode);
+void WINAPI ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode);
 PBYTE FASTCALL ConioCoordToPointer(PCSRSS_SCREEN_BUFFER Buf, ULONG X, ULONG Y);
 VOID FASTCALL ConioDrawConsole(PCSRSS_CONSOLE Console);
 VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData);

reactos/subsystems/win32/csrss/include/csrplugin.h

@@ -22,19 +22,19 @@
 #include <windows.h>
 #include "api.h"
 
-typedef NTSTATUS (STDCALL *CSRSS_INSERT_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData,
+typedef NTSTATUS (WINAPI *CSRSS_INSERT_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData,
                                                      PHANDLE Handle,
                                                      Object_t *Object,
                                                      DWORD Access,
                                                      BOOL Inheritable);
-typedef NTSTATUS (STDCALL *CSRSS_GET_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData,
+typedef NTSTATUS (WINAPI *CSRSS_GET_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData,
                                                   HANDLE Handle,
                                                   Object_t **Object,
                                                   DWORD Access);
-typedef NTSTATUS (STDCALL *CSRSS_RELEASE_OBJECT_BY_POINTER_PROC)(Object_t *Object);
+typedef NTSTATUS (WINAPI *CSRSS_RELEASE_OBJECT_BY_POINTER_PROC)(Object_t *Object);
-typedef NTSTATUS (STDCALL *CSRSS_RELEASE_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData,
+typedef NTSTATUS (WINAPI *CSRSS_RELEASE_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData,
                                                       HANDLE Object );
-typedef NTSTATUS (STDCALL *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc,
+typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc,
                                                       PVOID Context);
 
 typedef struct tagCSRSS_EXPORTED_FUNCS
@@ -46,12 +46,12 @@ typedef struct tagCSRSS_EXPORTED_FUNCS
   CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc;
 } CSRSS_EXPORTED_FUNCS, *PCSRSS_EXPORTED_FUNCS;
 
-typedef BOOL (STDCALL *CSRPLUGIN_INIT_COMPLETE_PROC)(void);
+typedef BOOL (WINAPI *CSRPLUGIN_INIT_COMPLETE_PROC)(void);
 
-typedef BOOL (STDCALL *CSRPLUGIN_HARDERROR_PROC)(IN PCSRSS_PROCESS_DATA ProcessData,
+typedef BOOL (WINAPI *CSRPLUGIN_HARDERROR_PROC)(IN PCSRSS_PROCESS_DATA ProcessData,
                                                  IN PHARDERROR_MSG HardErrorMessage);
 
-typedef BOOL (STDCALL *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefinitions,
+typedef BOOL (WINAPI *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefinitions,
                                                   PCSRSS_OBJECT_DEFINITION *ObjectDefinitions,
                                                   CSRPLUGIN_INIT_COMPLETE_PROC *InitCompleteProc,
                                                   CSRPLUGIN_HARDERROR_PROC *HardErrorProc,

reactos/subsystems/win32/csrss/init.c

@@ -297,7 +297,7 @@ CSRSS_API_DEFINITION NativeDefinitions[] =
     { 0, 0, NULL }
   };
 
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
 CsrpCreateListenPort (IN     LPWSTR  Name,
 		      IN OUT PHANDLE Port,
 		      IN     PTHREAD_START_ROUTINE ListenThread)
@@ -716,7 +716,7 @@ struct {
  * RETURN VALUE
  * 	TRUE: Initialization OK; otherwise FALSE.
  */
-BOOL STDCALL
+BOOL WINAPI
 CsrServerInitialization (
 	int argc,
 	char ** argv,

reactos/subsystems/win32/csrss/print.c

@@ -32,7 +32,7 @@
 #define NDEBUG
 #include <debug.h>
 
-VOID STDCALL DisplayString(LPCWSTR lpwString)
+VOID WINAPI DisplayString(LPCWSTR lpwString)
 {
    UNICODE_STRING us;
 
@@ -40,7 +40,7 @@ VOID STDCALL DisplayString(LPCWSTR lpwString)
    ZwDisplayString (&us);
 }
 
-VOID STDCALL PrintString (char* fmt, ...)
+VOID WINAPI PrintString (char* fmt, ...)
 {
    char buffer[512];
    va_list ap;

reactos/subsystems/win32/csrss/win32csr/appswitch.c

@@ -258,7 +258,7 @@ SwitchWindowDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
 }
 
 VOID
-STDCALL
+WINAPI
 InitializeAppSwitchHook()
 {
     hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0);

reactos/subsystems/win32/csrss/win32csr/conio.c

@@ -133,7 +133,7 @@ CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console,
   return STATUS_SUCCESS;
 }
 
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
 CsrInitConsole(PCSRSS_CONSOLE Console)
 {
   NTSTATUS Status;
@@ -894,7 +894,7 @@ CSR_API(CsrWriteConsole)
   return Status;
 }
 
-VOID STDCALL
+VOID WINAPI
 ConioDeleteScreenBuffer(Object_t *Object)
 {
   PCSRSS_SCREEN_BUFFER Buffer = (PCSRSS_SCREEN_BUFFER) Object;
@@ -914,7 +914,7 @@ ConioDrawConsole(PCSRSS_CONSOLE Console)
 }
 
 
-VOID STDCALL
+VOID WINAPI
 ConioDeleteConsole(Object_t *Object)
 {
   PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Object;
@@ -946,7 +946,7 @@ ConioDeleteConsole(Object_t *Object)
   HeapFree(Win32CsrApiHeap, 0, Console);
 }
 
-VOID STDCALL
+VOID WINAPI
 CsrInitConsoleSupport(VOID)
 {
   DPRINT("CSR: CsrInitConsoleSupport()\n");
@@ -1087,7 +1087,7 @@ ConioGetShiftState(PBYTE KeyState)
   return ssOut;
 }
 
-VOID STDCALL
+VOID WINAPI
 ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode)
 {
   static BYTE KeyState[256] = { 0 };

reactos/subsystems/win32/csrss/win32csr/desktopbg.c

@@ -149,7 +149,7 @@ DtbgInit()
   return TRUE;
 }
 
-static DWORD STDCALL
+static DWORD WINAPI
 DtbgDesktopThread(PVOID Data)
 {
   HWND BackgroundWnd;

reactos/subsystems/win32/csrss/win32csr/dllmain.c

@@ -14,9 +14,9 @@
 #include <debug.h>
 
 /* Not defined in any header file */
-extern VOID STDCALL PrivateCsrssManualGuiCheck(LONG Check);
+extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check);
-extern VOID STDCALL PrivateCsrssInitialized();
+extern VOID WINAPI PrivateCsrssInitialized();
-extern VOID STDCALL InitializeAppSwitchHook();
+extern VOID WINAPI InitializeAppSwitchHook();
 
 /* GLOBALS *******************************************************************/
 
@@ -88,7 +88,7 @@ static CSRSS_OBJECT_DEFINITION Win32CsrObjectDefinitions[] =
 
 /* FUNCTIONS *****************************************************************/
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HANDLE hDll,
 	DWORD dwReason,
 	LPVOID lpReserved)
@@ -174,7 +174,7 @@ Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc,
   return (CsrExports.CsrEnumProcessesProc)(EnumProc, Context);
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 Win32CsrInitComplete(void)
 {
   PrivateCsrssInitialized();
@@ -182,7 +182,7 @@ Win32CsrInitComplete(void)
   return TRUE;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
                   IN PHARDERROR_MSG HardErrorMessage)
 {
@@ -578,7 +578,7 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions,
                        PCSRSS_OBJECT_DEFINITION *ObjectDefinitions,
                        CSRPLUGIN_INIT_COMPLETE_PROC *InitComplete,

reactos/subsystems/win32/csrss/win32csr/exitros.c

@@ -197,7 +197,7 @@ EndNowDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam)
   return Result;
 }
 
-typedef void (STDCALL *INITCOMMONCONTROLS_PROC)(void);
+typedef void (WINAPI *INITCOMMONCONTROLS_PROC)(void);
 
 static void FASTCALL
 CallInitCommonControls()
@@ -551,7 +551,7 @@ typedef struct tagPROCESS_ENUM_CONTEXT
   DWORD CsrssProcess;
 } PROCESS_ENUM_CONTEXT, *PPROCESS_ENUM_CONTEXT;
 
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
 ExitReactosProcessEnum(PCSRSS_PROCESS_DATA ProcessData, PVOID Data)
 {
   HANDLE Process;

reactos/subsystems/win32/csrss/win32csr/guiconsole.c

@@ -14,7 +14,7 @@
 #include <debug.h>
 
 /* Not defined in any header file */
-extern VOID STDCALL PrivateCsrssManualGuiCheck(LONG Check);
+extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check);
 
 /* GLOBALS *******************************************************************/
 
@@ -1062,7 +1062,7 @@ GuiIntDrawRegion(PCSRSS_SCREEN_BUFFER Buff, PGUI_CONSOLE_DATA GuiData, HWND Wnd,
   InvalidateRect(Wnd, &RegionRect, FALSE);
 }
 
-static VOID STDCALL
+static VOID WINAPI
 GuiDrawRegion(PCSRSS_CONSOLE Console, RECT *Region)
 {
   PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData;
@@ -1086,7 +1086,7 @@ GuiInvalidateCell(PCSRSS_SCREEN_BUFFER Buff, PGUI_CONSOLE_DATA GuiData, HWND Wnd
   GuiIntDrawRegion(Buff, GuiData, Wnd, &CellRect);
 }
 
-static VOID STDCALL
+static VOID WINAPI
 GuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, LONG CursorStartX, LONG CursorStartY,
                UINT ScrolledLines, CHAR *Buffer, UINT Length)
 {
@@ -1154,7 +1154,7 @@ GuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, LONG CursorStartX, LONG Cur
     }
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 GuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
 {
   RECT UpdateRect;
@@ -1171,7 +1171,7 @@ GuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
   return TRUE;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 GuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY)
 {
   RECT UpdateRect;
@@ -1195,7 +1195,7 @@ GuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCurs
   return TRUE;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 GuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
 {
     PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData;
@@ -1929,7 +1929,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
     }
 }
 
-static DWORD STDCALL
+static DWORD WINAPI
 GuiConsoleGuiThread(PVOID Data)
 {
   MSG msg;
@@ -2015,13 +2015,13 @@ GuiInit(VOID)
   return TRUE;
 }
 
-static VOID STDCALL
+static VOID WINAPI
 GuiInitScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer)
 {
   Buffer->DefaultAttrib = DEFAULT_ATTRIB;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 GuiChangeTitle(PCSRSS_CONSOLE Console)
 {
   PWCHAR Buffer, Title;
@@ -2049,7 +2049,7 @@ GuiChangeTitle(PCSRSS_CONSOLE Console)
   return TRUE;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 GuiChangeIcon(PCSRSS_CONSOLE Console, HICON hWindowIcon)
 {
   SendMessageW(Console->hWindow, WM_SETICON, ICON_BIG, (LPARAM)hWindowIcon);
@@ -2058,7 +2058,7 @@ GuiChangeIcon(PCSRSS_CONSOLE Console, HICON hWindowIcon)
   return TRUE;
 }
 
-static VOID STDCALL
+static VOID WINAPI
 GuiCleanupConsole(PCSRSS_CONSOLE Console)
 {
   SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM) Console);

reactos/subsystems/win32/csrss/win32csr/tuiconsole.c

@@ -71,7 +71,7 @@ TuiInit(VOID)
   return TRUE;
 }
 
-static VOID STDCALL
+static VOID WINAPI
 TuiInitScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer)
 {
   Buffer->DefaultAttrib = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | BACKGROUND_BLUE;
@@ -100,7 +100,7 @@ TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, RECT *Region)
     }
 }
 
-static VOID STDCALL
+static VOID WINAPI
 TuiDrawRegion(PCSRSS_CONSOLE Console, RECT *Region)
 {
   DWORD BytesReturned;
@@ -141,7 +141,7 @@ TuiDrawRegion(PCSRSS_CONSOLE Console, RECT *Region)
   HeapFree(Win32CsrApiHeap, 0, ConsoleDraw);
 }
 
-static VOID STDCALL
+static VOID WINAPI
 TuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, LONG CursorStartX, LONG CursorStartY,
                UINT ScrolledLines, CHAR *Buffer, UINT Length)
 {
@@ -159,7 +159,7 @@ TuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, LONG CursorStartX, LONG Cur
     }
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 TuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
 {
   DWORD BytesReturned;
@@ -180,7 +180,7 @@ TuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
   return TRUE;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 TuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY)
 {
   CONSOLE_SCREEN_BUFFER_INFO Info;
@@ -206,19 +206,19 @@ TuiSetScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff, UINT OldCurs
   return TRUE;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 TuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff)
 {
     return TRUE;
 }
 
-static BOOL STDCALL
+static BOOL WINAPI
 TuiChangeTitle(PCSRSS_CONSOLE Console)
 {
   return TRUE;
 }
 
-static VOID STDCALL
+static VOID WINAPI
 TuiCleanupConsole(PCSRSS_CONSOLE Console)
 {
   DestroyWindow(Console->hWindow);
@@ -244,7 +244,7 @@ TuiCleanupConsole(PCSRSS_CONSOLE Console)
     }
 }
 
-DWORD STDCALL
+DWORD WINAPI
 TuiConsoleThread (PVOID Data)
 {
   PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Data;

reactos/subsystems/win32/win32k/eng/bitblt.c

@@ -32,7 +32,7 @@
 #define NDEBUG
 #include <debug.h>
 
-typedef BOOLEAN (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj,
+typedef BOOLEAN (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj,
                                         SURFOBJ* InputObj,
                                         SURFOBJ* Mask,
                                         XLATEOBJ* ColorTranslation,
@@ -42,7 +42,7 @@ typedef BOOLEAN (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj,
                                         BRUSHOBJ* Brush,
                                         POINTL* BrushOrigin,
                                         ROP4 Rop4);
-typedef BOOLEAN (STDCALL *PSTRETCHRECTFUNC)(SURFOBJ* OutputObj,
+typedef BOOLEAN (APIENTRY *PSTRETCHRECTFUNC)(SURFOBJ* OutputObj,
                                             SURFOBJ* InputObj,
                                             SURFOBJ* Mask,
                                             CLIPOBJ* ClipRegion,
@@ -53,7 +53,7 @@ typedef BOOLEAN (STDCALL *PSTRETCHRECTFUNC)(SURFOBJ* OutputObj,
                                             POINTL* BrushOrigin,
                                             ULONG Mode);
 
-BOOL STDCALL EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2)
+BOOL APIENTRY EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2)
 {
     static const RECTL rclEmpty = { 0, 0, 0, 0 };
 
@@ -76,7 +76,7 @@ BOOL STDCALL EngIntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2)
     return FALSE;
 }
 
-static BOOLEAN STDCALL
+static BOOLEAN APIENTRY
 BltMask(SURFOBJ* Dest,
         SURFOBJ* Source,
         SURFOBJ* Mask,
@@ -164,7 +164,7 @@ BltMask(SURFOBJ* Dest,
     return TRUE;
 }
 
-static BOOLEAN STDCALL
+static BOOLEAN APIENTRY
 BltPatCopy(SURFOBJ* Dest,
            SURFOBJ* Source,
            SURFOBJ* Mask,
@@ -184,7 +184,7 @@ BltPatCopy(SURFOBJ* Dest,
     return TRUE;
 }
 
-static BOOLEAN STDCALL
+static BOOLEAN APIENTRY
 CallDibBitBlt(SURFOBJ* OutputObj,
               SURFOBJ* InputObj,
               SURFOBJ* Mask,
@@ -252,7 +252,7 @@ INT __cdecl abs(INT nm);
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiEngBitBlt(
                 IN SURFOBJ  *psoTrg,
                 IN SURFOBJ  *psoSrc,
@@ -298,7 +298,7 @@ NtGdiEngBitBlt(
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngBitBlt(SURFOBJ *DestObj,
           SURFOBJ *SourceObj,
           SURFOBJ *Mask,
@@ -576,7 +576,7 @@ EngBitBlt(SURFOBJ *DestObj,
     return Ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngBitBltEx(SURFOBJ *DestSurf,
                SURFOBJ *SourceSurf,
                SURFOBJ *MaskSurf,
@@ -732,7 +732,7 @@ IntEngBitBltEx(SURFOBJ *DestSurf,
     return ret;
 }
 
-static BOOLEAN STDCALL
+static BOOLEAN APIENTRY
 CallDibStretchBlt(SURFOBJ* OutputObj,
                   SURFOBJ* InputObj,
                   SURFOBJ* Mask,
@@ -759,7 +759,7 @@ CallDibStretchBlt(SURFOBJ* OutputObj,
 
 
 BOOL
-STDCALL
+APIENTRY
 NtGdiEngStretchBlt(
     IN SURFOBJ  *DestObj,
     IN SURFOBJ  *SourceObj,
@@ -808,7 +808,7 @@ NtGdiEngStretchBlt(
 }
 
 BOOL
-STDCALL
+APIENTRY
 EngStretchBlt(
     IN SURFOBJ  *DestObj,
     IN SURFOBJ  *SourceObj,
@@ -906,7 +906,7 @@ EngStretchBlt(
     return Ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngStretchBlt(SURFOBJ *DestSurf,
                  SURFOBJ *SourceSurf,
                  SURFOBJ *MaskSurf,
@@ -992,7 +992,7 @@ IntEngStretchBlt(SURFOBJ *DestSurf,
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtGdiEngAlphaBlend(IN SURFOBJ *Dest,
                    IN SURFOBJ *Source,
                    IN CLIPOBJ *ClipRegion,
@@ -1026,7 +1026,7 @@ NtGdiEngAlphaBlend(IN SURFOBJ *Dest,
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 EngAlphaBlend(IN SURFOBJ *Dest,
               IN SURFOBJ *Source,
               IN CLIPOBJ *ClipRegion,
@@ -1287,7 +1287,7 @@ EngAlphaBlend(IN SURFOBJ *Dest,
     return Ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngAlphaBlend(IN SURFOBJ *Dest,
                  IN SURFOBJ *Source,
                  IN CLIPOBJ *ClipRegion,
@@ -1355,7 +1355,7 @@ IntEngAlphaBlend(IN SURFOBJ *Dest,
 /**** REACTOS FONT RENDERING CODE *********************************************/
 
 /* renders the alpha mask bitmap */
-static BOOLEAN STDCALL
+static BOOLEAN APIENTRY
 AlphaBltMask(SURFOBJ* Dest,
              SURFOBJ* Source,
              SURFOBJ* Mask,
@@ -1422,7 +1422,7 @@ AlphaBltMask(SURFOBJ* Dest,
     }
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 EngMaskBitBlt(SURFOBJ *DestObj,
               SURFOBJ *Mask,
               CLIPOBJ *ClipRegion,
@@ -1642,7 +1642,7 @@ EngMaskBitBlt(SURFOBJ *DestObj,
     return Ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngMaskBlt(SURFOBJ *DestSurf,
               SURFOBJ *Mask,
               CLIPOBJ *ClipRegion,

reactos/subsystems/win32/win32k/eng/clip.c

@@ -271,7 +271,7 @@ IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds)
 /*
  * @implemented
  */
-CLIPOBJ * STDCALL
+CLIPOBJ * APIENTRY
 EngCreateClip(VOID)
 {
     CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), TAG_CLIPOBJ);
@@ -286,7 +286,7 @@ EngCreateClip(VOID)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngDeleteClip(CLIPOBJ *ClipRegion)
 {
     EngFreeMem(ObjToGDI(ClipRegion, CLIP));
@@ -295,7 +295,7 @@ EngDeleteClip(CLIPOBJ *ClipRegion)
 /*
  * @implemented
  */
-ULONG STDCALL
+ULONG APIENTRY
 CLIPOBJ_cEnumStart(
     IN CLIPOBJ* ClipObj,
     IN BOOL ShouldDoAll,
@@ -356,7 +356,7 @@ CLIPOBJ_cEnumStart(
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 CLIPOBJ_bEnum(
     IN CLIPOBJ* ClipObj,
     IN ULONG ObjSize,

reactos/subsystems/win32/win32k/eng/copybits.c

@@ -34,7 +34,7 @@
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngCopyBits(SURFOBJ *Dest,
 	    SURFOBJ *Source,
 	    CLIPOBJ *Clip,

reactos/subsystems/win32/win32k/eng/debug.c

@@ -35,7 +35,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngDebugPrint(PCHAR StandardPrefix,
 	      PCHAR DebugMessage,
 	      va_list ap)

reactos/subsystems/win32/win32k/eng/device.c

@@ -35,7 +35,7 @@
 /*
  * @implemented
  */
-DWORD STDCALL
+DWORD APIENTRY
 EngDeviceIoControl(HANDLE  hDevice,
 		   DWORD   dwIoControlCode,
 		   LPVOID  lpInBuffer,

reactos/subsystems/win32/win32k/eng/driverobj.c

@@ -63,7 +63,7 @@ IntEngCleanupDriverObjs(struct _EPROCESS *Process,
  * @implemented
  */
 HDRVOBJ
-STDCALL
+APIENTRY
 EngCreateDriverObj(
 	IN PVOID        pvObj,
 	IN FREEOBJPROC  pFreeObjProc,
@@ -104,7 +104,7 @@ EngCreateDriverObj(
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 EngDeleteDriverObj(
 	IN HDRVOBJ  hdo,
 	IN BOOL  bCallBack,
@@ -148,7 +148,7 @@ EngDeleteDriverObj(
  * @implemented
  */
 PDRIVEROBJ
-STDCALL
+APIENTRY
 EngLockDriverObj( IN HDRVOBJ hdo )
 {
   PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo;
@@ -167,7 +167,7 @@ EngLockDriverObj( IN HDRVOBJ hdo )
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 EngUnlockDriverObj ( IN HDRVOBJ hdo )
 {
   PDRIVERGDI DrvObjInt = ObjToGDI((PDRIVEROBJ)hdo, DRIVER);

reactos/subsystems/win32/win32k/eng/engbrush.c

@@ -35,7 +35,7 @@
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID APIENTRY
 BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ  *BrushObj,
 		       IN ULONG  ObjSize)
 {
@@ -46,7 +46,7 @@ BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ  *BrushObj,
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID APIENTRY
 BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ  *BrushObj)
 {
   return(BrushObj->pvRbrush);
@@ -55,7 +55,7 @@ BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ  *BrushObj)
 /*
  * @implemented
  */
-ULONG STDCALL
+ULONG APIENTRY
 BRUSHOBJ_ulGetBrushColor(IN BRUSHOBJ *BrushObj)
 {
    return BrushObj->iSolidColor;

reactos/subsystems/win32/win32k/eng/engmisc.c

@@ -23,7 +23,7 @@
 #define NDEBUG
 #include <debug.h>
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
             SURFOBJ *DestSurf,
             RECTL *DestRect,
@@ -159,7 +159,7 @@ IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
   return TRUE;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave)
 {
   POINTL SrcPoint;
@@ -220,21 +220,21 @@ IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave)
   return Result;
 }
 
-HANDLE STDCALL
+HANDLE APIENTRY
 EngGetCurrentProcessId(VOID)
 {
   /* http://www.osr.com/ddk/graphics/gdifncs_5ovb.htm */
   return PsGetCurrentProcessId();
 }
 
-HANDLE STDCALL
+HANDLE APIENTRY
 EngGetCurrentThreadId(VOID)
 {
   /* http://www.osr.com/ddk/graphics/gdifncs_25rb.htm */
   return PsGetCurrentThreadId();
 }
 
-HANDLE STDCALL
+HANDLE APIENTRY
 EngGetProcessHandle(VOID)
 {
   /* http://www.osr.com/ddk/graphics/gdifncs_3tif.htm

reactos/subsystems/win32/win32k/eng/engwindow.c

@@ -194,7 +194,7 @@ IntEngWindowChanged(
  * @implemented
  */
 WNDOBJ*
-STDCALL
+APIENTRY
 EngCreateWnd(
   SURFOBJ          *pso,
   HWND              hWnd,
@@ -271,7 +271,7 @@ CLEANUP:
  * @implemented
  */
 VOID
-STDCALL
+APIENTRY
 EngDeleteWnd(
   IN WNDOBJ *pwo)
 {
@@ -313,7 +313,7 @@ EngDeleteWnd(
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 WNDOBJ_bEnum(
   IN WNDOBJ  *pwo,
   IN ULONG  cj,
@@ -334,7 +334,7 @@ WNDOBJ_bEnum(
  * @implemented
  */
 ULONG
-STDCALL
+APIENTRY
 WNDOBJ_cEnumStart(
   IN WNDOBJ  *pwo,
   IN ULONG  iType,
@@ -359,7 +359,7 @@ WNDOBJ_cEnumStart(
  * @implemented
  */
 VOID
-STDCALL
+APIENTRY
 WNDOBJ_vSetConsumer(
   IN WNDOBJ  *pwo,
   IN PVOID  pvConsumer)

reactos/subsystems/win32/win32k/eng/error.c

@@ -7,7 +7,7 @@
  * @implemented
  */
 ULONG
-STDCALL
+APIENTRY
 EngGetLastError ( VOID )
 {
   // www.osr.com/ddk/graphics/gdifncs_3non.htm
@@ -18,7 +18,7 @@ EngGetLastError ( VOID )
  * @implemented
  */
 VOID
-STDCALL
+APIENTRY
 EngSetLastError ( IN ULONG iError )
 {
   // www.osr.com/ddk/graphics/gdifncs_95m0.htm

reactos/subsystems/win32/win32k/eng/event.c

@@ -14,7 +14,7 @@
 #include <debug.h>
 
 BOOL
-STDCALL
+APIENTRY
 EngCreateEvent ( OUT PEVENT *Event )
 {
   (*Event) = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_DFSM);
@@ -27,7 +27,7 @@ EngCreateEvent ( OUT PEVENT *Event )
 }
 
 BOOL
-STDCALL
+APIENTRY
 EngDeleteEvent ( IN PEVENT Event)
 {
   ExFreePoolWithTag(Event, TAG_DFSM);
@@ -35,7 +35,7 @@ EngDeleteEvent ( IN PEVENT Event)
 }
 
 PEVENT
-STDCALL
+APIENTRY
 EngMapEvent(IN HDEV    Dev,
 	    IN HANDLE  UserObject,
 	    IN PVOID   Reserved1,
@@ -68,14 +68,14 @@ EngMapEvent(IN HDEV    Dev,
 }
 
 LONG
-STDCALL
+APIENTRY
 EngSetEvent ( IN PEVENT Event )
 {
   return KeSetEvent((PKEVENT)Event, IO_NO_INCREMENT, FALSE);
 }
 
 BOOL
-STDCALL
+APIENTRY
 EngUnmapEvent ( IN PEVENT Event )
 {
   ObDereferenceObject((PVOID)Event);
@@ -84,7 +84,7 @@ EngUnmapEvent ( IN PEVENT Event )
 }
 
 BOOL
-STDCALL
+APIENTRY
 EngWaitForSingleObject (IN PEVENT          Event,
 			IN PLARGE_INTEGER  TimeOut)
 {

reactos/subsystems/win32/win32k/eng/float.c

@@ -36,7 +36,7 @@
 /* FUNCTIONS *****************************************************************/
 
 BOOL
-STDCALL
+APIENTRY
 EngRestoreFloatingPointState ( IN VOID *Buffer )
 {
   NTSTATUS Status;
@@ -49,7 +49,7 @@ EngRestoreFloatingPointState ( IN VOID *Buffer )
 }
 
 ULONG
-STDCALL
+APIENTRY
 EngSaveFloatingPointState(OUT VOID  *Buffer,
      IN ULONG  BufferSize)
 {

reactos/subsystems/win32/win32k/eng/gradient.c

@@ -467,7 +467,7 @@ IntEngIsNULLTriangle(TRIVERTEX  *pVertex, GRADIENT_TRIANGLE *gt)
 }
 
 
-BOOL STDCALL
+BOOL APIENTRY
 EngGradientFill(
     IN SURFOBJ  *psoDest,
     IN CLIPOBJ  *pco,
@@ -539,7 +539,7 @@ EngGradientFill(
   return ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngGradientFill(
     IN SURFOBJ  *psoDest,
     IN CLIPOBJ  *pco,

reactos/subsystems/win32/win32k/eng/lineto.c

@@ -328,7 +328,7 @@ SEtoNW(SURFOBJ* OutputObj, CLIPOBJ* Clip,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngLineTo(SURFOBJ *DestObj,
           CLIPOBJ *Clip,
           BRUSHOBJ *Brush,
@@ -505,7 +505,7 @@ EngLineTo(SURFOBJ *DestObj,
     return IntEngLeave(&EnterLeave);
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngLineTo(SURFOBJ *DestSurf,
              CLIPOBJ *ClipObj,
              BRUSHOBJ *Brush,
@@ -593,7 +593,7 @@ IntEngLineTo(SURFOBJ *DestSurf,
     return ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngPolyline(SURFOBJ *DestSurf,
                CLIPOBJ *Clip,
                BRUSHOBJ *Brush,

reactos/subsystems/win32/win32k/eng/mem.c

@@ -42,7 +42,7 @@ USERMEMHEADER, *PUSERMEMHEADER;
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID APIENTRY
 EngAllocMem(ULONG Flags,
 	    ULONG MemSize,
 	    ULONG Tag)
@@ -62,7 +62,7 @@ EngAllocMem(ULONG Flags,
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngFreeMem(PVOID Mem)
 {
   ExFreePool(Mem);
@@ -71,7 +71,7 @@ EngFreeMem(PVOID Mem)
 /*
  * @implemented
  */
-PVOID STDCALL
+PVOID APIENTRY
 EngAllocUserMem(SIZE_T cj, ULONG Tag)
 {
   PVOID NewMem = NULL;
@@ -96,7 +96,7 @@ EngAllocUserMem(SIZE_T cj, ULONG Tag)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngFreeUserMem(PVOID pv)
 {
   PUSERMEMHEADER Header = ((PUSERMEMHEADER) pv) - 1;
@@ -108,7 +108,7 @@ EngFreeUserMem(PVOID pv)
 
 
 PVOID
-NTAPI
+APIENTRY
 HackSecureVirtualMemory(
 	IN PVOID Address,
 	IN SIZE_T Size,
@@ -158,7 +158,7 @@ HackSecureVirtualMemory(
 }
 
 VOID
-NTAPI
+APIENTRY
 HackUnsecureVirtualMemory(
 	IN PVOID  SecureHandle)
 {
@@ -171,7 +171,7 @@ HackUnsecureVirtualMemory(
 /*
  * @implemented
  */
-HANDLE STDCALL
+HANDLE APIENTRY
 EngSecureMem(PVOID Address, ULONG Length)
 {
   return MmSecureVirtualMemory(Address, Length, PAGE_READWRITE);
@@ -180,7 +180,7 @@ EngSecureMem(PVOID Address, ULONG Length)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngUnsecureMem(HANDLE Mem)
 {
   return MmUnsecureVirtualMemory((PVOID) Mem);

reactos/subsystems/win32/win32k/eng/misc.h

@@ -35,12 +35,12 @@ typedef struct INTENG_ENTER_LEAVE_TAG
   BOOL ReadOnly;
   } INTENG_ENTER_LEAVE, *PINTENG_ENTER_LEAVE;
 
-extern BOOL STDCALL IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
+extern BOOL APIENTRY IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
                                 SURFOBJ *DestObj,
                                 RECTL *DestRect,
                                 BOOL ReadOnly,
                                 POINTL *Translate,
                                 SURFOBJ **OutputObj);
-extern BOOL STDCALL IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave);
+extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave);
 
 #endif

reactos/subsystems/win32/win32k/eng/mouse.c

@@ -322,7 +322,7 @@ IntShowMousePointer(GDIDEVICE *ppdev, SURFOBJ *DestSurface)
  * @implemented
  */
 
-ULONG STDCALL
+ULONG APIENTRY
 EngSetPointerShape(
    IN SURFOBJ *pso,
    IN SURFOBJ *psoMask,
@@ -529,7 +529,7 @@ EngSetPointerShape(
  * @implemented
  */
 
-VOID STDCALL
+VOID APIENTRY
 EngMovePointer(
    IN SURFOBJ *pso,
    IN LONG x,
@@ -567,7 +567,7 @@ EngMovePointer(
 
 }
 
-VOID STDCALL
+VOID APIENTRY
 IntEngMovePointer(
    IN SURFOBJ *SurfObj,
    IN LONG x,

reactos/subsystems/win32/win32k/eng/objects.h

@@ -94,50 +94,50 @@ typedef struct _PATHGDI {
   PATHOBJ PathObj;
 } PATHGDI;
 
-typedef BOOL (STDCALL *PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *,
+typedef BOOL (APIENTRY *PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *,
                            XLATEOBJ *, RECTL *, POINTL *, POINTL *,
                            BRUSHOBJ *, POINTL *, ROP4);
 
-typedef BOOL (STDCALL *PFN_TransparentBlt)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *, RECTL *, RECTL *, ULONG, ULONG);
+typedef BOOL (APIENTRY *PFN_TransparentBlt)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *, RECTL *, RECTL *, ULONG, ULONG);
 
-typedef BOOL (STDCALL *PFN_StretchBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *,
+typedef BOOL (APIENTRY *PFN_StretchBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *,
                                XLATEOBJ *, COLORADJUSTMENT *, POINTL *,
                                RECTL *, RECTL *, PPOINT, ULONG);
 
-typedef BOOL (STDCALL *PFN_TextOut)(SURFOBJ *, STROBJ *, FONTOBJ *, CLIPOBJ *,
+typedef BOOL (APIENTRY *PFN_TextOut)(SURFOBJ *, STROBJ *, FONTOBJ *, CLIPOBJ *,
                             RECTL *, RECTL *, BRUSHOBJ *, BRUSHOBJ *,
                             POINTL *, MIX);
 
-typedef BOOL (STDCALL *PFN_Paint)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, POINTL *, MIX);
+typedef BOOL (APIENTRY *PFN_Paint)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, POINTL *, MIX);
 
-typedef BOOL (STDCALL *PFN_StrokePath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, XFORMOBJ *,
+typedef BOOL (APIENTRY *PFN_StrokePath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, XFORMOBJ *,
                                BRUSHOBJ *, POINTL *, LINEATTRS *, MIX);
 
-typedef BOOL (STDCALL *PFN_FillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, BRUSHOBJ *,
+typedef BOOL (APIENTRY *PFN_FillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, BRUSHOBJ *,
                              POINTL *, MIX, ULONG);
 
-typedef BOOL (STDCALL *PFN_StrokeAndFillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *,
+typedef BOOL (APIENTRY *PFN_StrokeAndFillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *,
                 XFORMOBJ *, BRUSHOBJ *, LINEATTRS *, BRUSHOBJ *,
                 POINTL *, MIX, ULONG);
 
-typedef BOOL (STDCALL *PFN_LineTo)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *,
+typedef BOOL (APIENTRY *PFN_LineTo)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *,
                            LONG, LONG, LONG, LONG, RECTL *, MIX);
 
-typedef BOOL (STDCALL *PFN_CopyBits)(SURFOBJ *, SURFOBJ *, CLIPOBJ *,
+typedef BOOL (APIENTRY *PFN_CopyBits)(SURFOBJ *, SURFOBJ *, CLIPOBJ *,
                              XLATEOBJ *, RECTL *, POINTL *);
 
-typedef VOID (STDCALL *PFN_Synchronize)(DHPDEV, RECTL *);
+typedef VOID (APIENTRY *PFN_Synchronize)(DHPDEV, RECTL *);
 
-typedef VOID (STDCALL *PFN_MovePointer)(SURFOBJ *, LONG, LONG, RECTL *);
+typedef VOID (APIENTRY *PFN_MovePointer)(SURFOBJ *, LONG, LONG, RECTL *);
 
-typedef ULONG (STDCALL *PFN_SetPointerShape)(SURFOBJ *, SURFOBJ *, SURFOBJ *, XLATEOBJ *,
+typedef ULONG (APIENTRY *PFN_SetPointerShape)(SURFOBJ *, SURFOBJ *, SURFOBJ *, XLATEOBJ *,
 			    LONG, LONG, LONG, LONG, RECTL *, FLONG);
 
-typedef HBITMAP (STDCALL *PFN_CreateDeviceBitmap)(DHPDEV, SIZEL, ULONG);
+typedef HBITMAP (APIENTRY *PFN_CreateDeviceBitmap)(DHPDEV, SIZEL, ULONG);
 
-typedef BOOL (STDCALL *PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG);
+typedef BOOL (APIENTRY *PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG);
 
-typedef BOOL (STDCALL *PFN_GradientFill)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG);
+typedef BOOL (APIENTRY *PFN_GradientFill)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG);
 
 typedef struct _WNDGDI {
   WNDOBJ            WndObj;

reactos/subsystems/win32/win32k/eng/paint.c

@@ -32,7 +32,7 @@
 #define NDEBUG
 #include <debug.h>
 
-BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
+BOOL APIENTRY FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
 {
   LONG y;
   ULONG LineWidth;
@@ -56,7 +56,7 @@ BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
   return TRUE;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 EngPaintRgn(SURFOBJ *Surface, CLIPOBJ *ClipRegion, ULONG iColor, MIX Mix,
             BRUSHOBJ *BrushObj, POINTL *BrushPoint)
 {
@@ -102,7 +102,7 @@ EngPaintRgn(SURFOBJ *Surface, CLIPOBJ *ClipRegion, ULONG iColor, MIX Mix,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngPaint(IN SURFOBJ *Surface,
 	 IN CLIPOBJ *ClipRegion,
 	 IN BRUSHOBJ *Brush,
@@ -117,7 +117,7 @@ EngPaint(IN SURFOBJ *Surface,
   return ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngPaint(IN SURFOBJ *Surface,
             IN CLIPOBJ *ClipRegion,
             IN BRUSHOBJ *Brush,

reactos/subsystems/win32/win32k/eng/palette.c

@@ -59,7 +59,7 @@ ColorCorrection(PPALGDI PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors)
 /*
  * @implemented
  */
-HPALETTE STDCALL
+HPALETTE APIENTRY
 EngCreatePalette(ULONG Mode, ULONG NumColors, ULONG *Colors,
                  ULONG Red, ULONG Green, ULONG Blue)
 {
@@ -77,7 +77,7 @@ EngCreatePalette(ULONG Mode, ULONG NumColors, ULONG *Colors,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngDeletePalette(IN HPALETTE Palette)
 {
    GDIOBJ_SetOwnership(Palette, PsGetCurrentProcess());
@@ -88,7 +88,7 @@ EngDeletePalette(IN HPALETTE Palette)
 /*
  * @implemented
  */
-ULONG STDCALL
+ULONG APIENTRY
 PALOBJ_cGetColors(PALOBJ *PalObj, ULONG Start, ULONG Colors, ULONG *PaletteEntry)
 {
    PALGDI *PalGDI;

reactos/subsystems/win32/win32k/eng/perfcnt.c

@@ -33,7 +33,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngQueryPerformanceFrequency(LONGLONG *Frequency)
 {
   LARGE_INTEGER Freq;
@@ -45,7 +45,7 @@ EngQueryPerformanceFrequency(LONGLONG *Frequency)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngQueryPerformanceCounter(LONGLONG *Count)
 {
   LARGE_INTEGER PerfCount;

reactos/subsystems/win32/win32k/eng/semaphor.c

@@ -7,7 +7,7 @@
  * @implemented
  */
 HSEMAPHORE
-STDCALL
+APIENTRY
 EngCreateSemaphore ( VOID )
 {
   // www.osr.com/ddk/graphics/gdifncs_95lz.htm
@@ -34,7 +34,7 @@ IntGdiAcquireSemaphore ( HSEMAPHORE hsem )
  * @implemented
  */
 VOID
-STDCALL
+APIENTRY
 EngAcquireSemaphore ( IN HSEMAPHORE hsem )
 {
   // www.osr.com/ddk/graphics/gdifncs_14br.htm
@@ -58,7 +58,7 @@ IntGdiReleaseSemaphore ( HSEMAPHORE hsem )
  * @implemented
  */
 VOID
-STDCALL
+APIENTRY
 EngReleaseSemaphore ( IN HSEMAPHORE hsem )
 {
   // www.osr.com/ddk/graphics/gdifncs_5u3r.htm
@@ -73,7 +73,7 @@ EngReleaseSemaphore ( IN HSEMAPHORE hsem )
  * @implemented
  */
 VOID
-STDCALL
+APIENTRY
 EngDeleteSemaphore ( IN HSEMAPHORE hsem )
 {
   // www.osr.com/ddk/graphics/gdifncs_13c7.htm
@@ -88,7 +88,7 @@ EngDeleteSemaphore ( IN HSEMAPHORE hsem )
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 EngIsSemaphoreOwned ( IN HSEMAPHORE hsem )
 {
   // www.osr.com/ddk/graphics/gdifncs_6wmf.htm
@@ -100,7 +100,7 @@ EngIsSemaphoreOwned ( IN HSEMAPHORE hsem )
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 EngIsSemaphoreOwnedByCurrentThread ( IN HSEMAPHORE hsem )
 {
   // www.osr.com/ddk/graphics/gdifncs_9yxz.htm
@@ -111,7 +111,7 @@ EngIsSemaphoreOwnedByCurrentThread ( IN HSEMAPHORE hsem )
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngInitializeSafeSemaphore(
    OUT ENGSAFESEMAPHORE *Semaphore)
 {
@@ -144,7 +144,7 @@ EngInitializeSafeSemaphore(
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngDeleteSafeSemaphore(
    IN OUT ENGSAFESEMAPHORE *Semaphore)
 {

reactos/subsystems/win32/win32k/eng/sort.c

@@ -26,7 +26,7 @@
 /*
  * @implemented
  */
-void STDCALL
+void APIENTRY
 EngSort(IN OUT PBYTE Buf, IN ULONG ElemSize, IN ULONG ElemCount, IN SORTCOMP CompFunc)
 {
   qsort(Buf, ElemCount, ElemSize, CompFunc);

reactos/subsystems/win32/win32k/eng/surface.c

@@ -138,7 +138,7 @@ BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *BitmapObj)
 /*
  * @implemented
  */
-HBITMAP STDCALL
+HBITMAP APIENTRY
 EngCreateDeviceBitmap(IN DHSURF dhsurf,
                       IN SIZEL Size,
                       IN ULONG Format)
@@ -402,7 +402,7 @@ IntCreateBitmap(IN SIZEL Size,
 /*
  * @implemented
  */
-HBITMAP STDCALL
+HBITMAP APIENTRY
 EngCreateBitmap(IN SIZEL Size,
                 IN LONG Width,
                 IN ULONG Format,
@@ -423,7 +423,7 @@ EngCreateBitmap(IN SIZEL Size,
 /*
  * @unimplemented
  */
-HSURF STDCALL
+HSURF APIENTRY
 EngCreateDeviceSurface(IN DHSURF dhsurf,
                        IN SIZEL Size,
                        IN ULONG Format)
@@ -481,7 +481,7 @@ PFN FASTCALL DriverFunction(DRVENABLEDATA *DED, ULONG DriverFunc)
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngAssociateSurface(IN HSURF Surface,
                     IN HDEV Dev,
                     IN ULONG Hooks)
@@ -511,7 +511,7 @@ EngAssociateSurface(IN HSURF Surface,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngModifySurface(
     IN HSURF hsurf,
     IN HDEV hdev,
@@ -549,7 +549,7 @@ EngModifySurface(
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngDeleteSurface(IN HSURF Surface)
 {
     GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess());
@@ -560,7 +560,7 @@ EngDeleteSurface(IN HSURF Surface)
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL APIENTRY
 EngEraseSurface(SURFOBJ *Surface,
                 RECTL *Rect,
                 ULONG iColor)
@@ -577,7 +577,7 @@ EngEraseSurface(SURFOBJ *Surface,
 /*
  * @implemented
  */
-SURFOBJ * STDCALL
+SURFOBJ * APIENTRY
 NtGdiEngLockSurface(IN HSURF Surface)
 {
     return EngLockSurface(Surface);
@@ -587,7 +587,7 @@ NtGdiEngLockSurface(IN HSURF Surface)
 /*
  * @implemented
  */
-SURFOBJ * STDCALL
+SURFOBJ * APIENTRY
 EngLockSurface(IN HSURF Surface)
 {
     BITMAPOBJ *bmp = GDIOBJ_ShareLockObj(Surface, GDI_OBJECT_TYPE_BITMAP);
@@ -602,7 +602,7 @@ EngLockSurface(IN HSURF Surface)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 NtGdiEngUnlockSurface(IN SURFOBJ *Surface)
 {
     EngUnlockSurface(Surface);
@@ -611,7 +611,7 @@ NtGdiEngUnlockSurface(IN SURFOBJ *Surface)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID APIENTRY
 EngUnlockSurface(IN SURFOBJ *Surface)
 {
     if (Surface != NULL)

reactos/subsystems/win32/win32k/eng/transblt.c

@@ -32,7 +32,7 @@
 #define NDEBUG
 #include <debug.h>
 
-BOOL STDCALL
+BOOL APIENTRY
 EngTransparentBlt(SURFOBJ *Dest,
 		  SURFOBJ *Source,
 		  CLIPOBJ *Clip,

reactos/subsystems/win32/win32k/eng/xlate.c

@@ -532,7 +532,7 @@ EngDeleteXlate(XLATEOBJ *XlateObj)
 /*
  * @implemented
  */
-PULONG STDCALL
+PULONG APIENTRY
 XLATEOBJ_piVector(XLATEOBJ *XlateObj)
 {
    if (XlateObj->iSrcType == PAL_INDEXED)
@@ -546,7 +546,7 @@ XLATEOBJ_piVector(XLATEOBJ *XlateObj)
 /*
  * @implemented
  */
-ULONG STDCALL
+ULONG APIENTRY
 XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
 {
    XLATEGDI *XlateGDI;
@@ -603,7 +603,7 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
 /*
  * @implemented
  */
-ULONG STDCALL
+ULONG APIENTRY
 XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj, ULONG PalOutType, ULONG cPal,
    ULONG *OutPal)
 {

reactos/subsystems/win32/win32k/include/bitmaps.h

@@ -56,9 +56,9 @@ INT     FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp);
 UINT    FASTCALL BITMAPOBJ_GetRealBitsPixel(UINT nBitsPixel);
 HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP  hBitmap);
 INT     FASTCALL DIB_GetDIBWidthBytes (INT  width, INT  depth);
-int     NTAPI  DIB_GetDIBImageBytes (INT  width, INT  height, INT  depth);
+int     APIENTRY  DIB_GetDIBImageBytes (INT  width, INT  height, INT  depth);
 INT     FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
-INT     NTAPI  BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer);
+INT     APIENTRY  BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer);
 HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice);
 
 #endif

reactos/subsystems/win32/win32k/include/callback.h

@@ -3,7 +3,7 @@
 
 #include <include/win32.h>
 
-LRESULT STDCALL
+LRESULT APIENTRY
 co_IntCallWindowProc(WNDPROC Proc,
                   BOOLEAN IsAnsiProc,
                   HWND Wnd,
@@ -12,7 +12,7 @@ co_IntCallWindowProc(WNDPROC Proc,
                   LPARAM lParam,
                   INT lParamBufferSize);
 
-VOID STDCALL
+VOID APIENTRY
 co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
 			    HWND hWnd,
 			    UINT Msg,
@@ -20,13 +20,13 @@ co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
 			    LRESULT Result);
 
 
-HMENU STDCALL
+HMENU APIENTRY
 co_IntLoadSysMenuTemplate();
 
-BOOL STDCALL
+BOOL APIENTRY
 co_IntLoadDefaultCursors(VOID);
 
-LRESULT STDCALL
+LRESULT APIENTRY
 co_IntCallHookProc(INT HookId,
                 INT Code,
                 WPARAM wParam,
@@ -35,7 +35,7 @@ co_IntCallHookProc(INT HookId,
                 BOOLEAN Ansi,
                 PUNICODE_STRING ModuleName);
 
-LRESULT STDCALL
+LRESULT APIENTRY
 co_IntCallEventProc(HWINEVENTHOOK hook,
                            DWORD event,
                              HWND hwnd,

reactos/subsystems/win32/win32k/include/clipboard.h

@@ -44,7 +44,7 @@ typedef struct _CLIPBOARDSYSTEM
 VOID FASTCALL
 IntClipboardFreeWindow(PWINDOW_OBJECT window);
 
-UINT STDCALL IntEnumClipboardFormats(UINT format);
+UINT APIENTRY IntEnumClipboardFormats(UINT format);
 
 /*
 UINT FASTCALL

reactos/subsystems/win32/win32k/include/color.h

@@ -34,9 +34,9 @@ typedef struct _COLORTRANSFORMOBJ
 extern HCOLORSPACE hStockColorSpace;
 
 const PALETTEENTRY* FASTCALL COLOR_GetSystemPaletteTemplate (VOID);
-COLORREF STDCALL COLOR_LookupNearestColor (PALETTEENTRY* palPalEntry, INT size, COLORREF color);
+COLORREF APIENTRY COLOR_LookupNearestColor (PALETTEENTRY* palPalEntry, INT size, COLORREF color);
-INT STDCALL COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col);
+INT APIENTRY COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col);
-INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved);
+INT APIENTRY COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved);
 UINT FASTCALL IntGdiRealizePalette (HDC);
 HCOLORSPACE FASTCALL IntGdiCreateColorSpace(PLOGCOLORSPACEEXW);
 BOOL FASTCALL IntGdiDeleteColorSpace(HCOLORSPACE);

reactos/subsystems/win32/win32k/include/coord.h

@@ -14,7 +14,7 @@ int
 FASTCALL
 IntGetGraphicsMode ( PDC dc );
 
-int STDCALL IntGdiSetMapMode(PDC, int);
+int APIENTRY IntGdiSetMapMode(PDC, int);
 
 BOOL
 FASTCALL

reactos/subsystems/win32/win32k/include/cursoricon.h

@@ -77,7 +77,7 @@ BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxW
    INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
 PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon);
 
-int NTAPI UserShowCursor(BOOL bShow);
+int APIENTRY UserShowCursor(BOOL bShow);
 
 #define IntGetSysCursorInfo(WinStaObj) \
   (PSYSTEM_CURSORINFO)((WinStaObj)->SystemCursor)

reactos/subsystems/win32/win32k/include/dc.h

@@ -256,13 +256,13 @@ VOID FASTCALL IntGetWindowOrgEx(PDC dc, LPPOINT pt);
 
 COLORREF FASTCALL IntGdiSetBkColor (HDC hDC, COLORREF Color);
 INT FASTCALL IntGdiSetBkMode(HDC  hDC, INT  backgroundMode);
-COLORREF STDCALL  IntGdiGetBkColor(HDC  hDC);
+COLORREF APIENTRY  IntGdiGetBkColor(HDC  hDC);
-INT STDCALL  IntGdiGetBkMode(HDC  hDC);
+INT APIENTRY  IntGdiGetBkMode(HDC  hDC);
 COLORREF FASTCALL  IntGdiSetTextColor(HDC hDC, COLORREF color);
 UINT FASTCALL IntGdiSetTextAlign(HDC  hDC, UINT  Mode);
-UINT STDCALL  IntGdiGetTextAlign(HDC  hDC);
+UINT APIENTRY  IntGdiGetTextAlign(HDC  hDC);
-COLORREF STDCALL  IntGdiGetTextColor(HDC  hDC);
+COLORREF APIENTRY  IntGdiGetTextColor(HDC  hDC);
-INT STDCALL  IntGdiSetStretchBltMode(HDC  hDC, INT  stretchBltMode);
+INT APIENTRY  IntGdiSetStretchBltMode(HDC  hDC, INT  stretchBltMode);
 VOID FASTCALL IntGdiReferencePdev(PGDIDEVICE pPDev);
 VOID FASTCALL IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType);
 HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC);

reactos/subsystems/win32/win32k/include/desktop.h

@@ -49,7 +49,7 @@ NTSTATUS FASTCALL
 CleanupDesktopImpl(VOID);
 
 NTSTATUS
-STDCALL
+APIENTRY
 IntDesktopObjectParse(IN PVOID ParseObject,
                       IN PVOID ObjectType,
                       IN OUT PACCESS_STATE AccessState,
@@ -61,7 +61,7 @@ IntDesktopObjectParse(IN PVOID ParseObject,
                       IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL,
                       OUT PVOID *Object);
 
-VOID STDCALL
+VOID APIENTRY
 IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters);
 
 VOID FASTCALL

reactos/subsystems/win32/win32k/include/dib.h

@@ -5,11 +5,11 @@
 
 INT FASTCALL
 DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
-HBITMAP STDCALL
+HBITMAP APIENTRY
 DIB_CreateDIBSection (PDC dc, PBITMAPINFO bmi, UINT usage, LPVOID *bits, HANDLE section, DWORD offset, DWORD ovr_pitch);
-INT STDCALL
+INT APIENTRY
 DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, PLONG width, PLONG height, PWORD planes, PWORD bpp, PLONG compr, PLONG size );
-INT STDCALL
+INT APIENTRY
 DIB_GetDIBImageBytes (INT  width, INT height, INT depth);
 INT FASTCALL
 DIB_GetDIBWidthBytes (INT width, INT depth);

reactos/subsystems/win32/win32k/include/eng.h

@@ -1,9 +1,9 @@
 #ifndef _WIN32K_ENG_H
 #define _WIN32K_ENG_H
 
-BOOL STDCALL  EngIntersectRect (PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2);
+BOOL APIENTRY  EngIntersectRect (PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2);
 VOID FASTCALL EngDeleteXlate (XLATEOBJ *XlateObj);
-BOOL STDCALL
+BOOL APIENTRY
 IntEngMaskBlt(SURFOBJ *DestObj,
              SURFOBJ *Mask,
              CLIPOBJ *ClipRegion,

reactos/subsystems/win32/win32k/include/focus.h

@@ -14,7 +14,7 @@ IntGetFocusWindow();
  */
 HWND FASTCALL
 IntGetThreadFocusWindow();
-HWND STDCALL IntGetCapture();
+HWND APIENTRY IntGetCapture();
 HWND FASTCALL UserGetActiveWindow();
 
 BOOL FASTCALL

reactos/subsystems/win32/win32k/include/intddraw.h

@@ -9,104 +9,104 @@
 
 /* From ddraw.c */
 BOOL intEnableReactXDriver(HDC);
-NTSTATUS STDCALL DxDdStartupDxGraphics(ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);
+NTSTATUS APIENTRY DxDdStartupDxGraphics(ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);
 extern DRVFN gpDxFuncs[];
 
-typedef BOOL (NTAPI* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID);
+typedef BOOL (APIENTRY* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID);
-typedef BOOL (NTAPI* PGD_DDRELEASEDC)(HANDLE);
+typedef BOOL (APIENTRY* PGD_DDRELEASEDC)(HANDLE);
-typedef BOOL (NTAPI* PGD_DDRESTVISRGN)(HANDLE, HWND);
+typedef BOOL (APIENTRY* PGD_DDRESTVISRGN)(HANDLE, HWND);
-typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL);
+typedef HANDLE (APIENTRY* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL);
-typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *);
+typedef HDC (APIENTRY *PGD_DDGETDC)(HANDLE, PALETTEENTRY *);
-typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*);
+typedef DWORD (APIENTRY *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*);
-typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA);
-typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA);
+typedef DWORD (APIENTRY *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA);
-typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);
+typedef NTSTATUS (APIENTRY *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);
-typedef NTSTATUS (NTAPI *PGD_DXDDCLEANUPDXGRAPHICS) (VOID);
+typedef NTSTATUS (APIENTRY *PGD_DXDDCLEANUPDXGRAPHICS) (VOID);
-typedef HANDLE (NTAPI *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc);
+typedef HANDLE (APIENTRY *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc);
-typedef DWORD (NTAPI *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA);
+typedef DWORD (APIENTRY *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA);
-typedef DWORD (NTAPI *PGD_DDCOLORCONTROL)(HANDLE hSurface,PDD_COLORCONTROLDATA puColorControlData);
+typedef DWORD (APIENTRY *PGD_DDCOLORCONTROL)(HANDLE hSurface,PDD_COLORCONTROLDATA puColorControlData);
-typedef HANDLE (NTAPI *PGD_DXDDCREATESURFACEOBJECT)(HANDLE, HANDLE, PDD_SURFACE_LOCAL, PDD_SURFACE_MORE, PDD_SURFACE_GLOBAL, BOOL);
+typedef HANDLE (APIENTRY *PGD_DXDDCREATESURFACEOBJECT)(HANDLE, HANDLE, PDD_SURFACE_LOCAL, PDD_SURFACE_MORE, PDD_SURFACE_GLOBAL, BOOL);
-typedef BOOL (NTAPI *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE);
+typedef BOOL (APIENTRY *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE);
-typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE);
+typedef BOOL (APIENTRY *PGD_DXDDDELETESURFACEOBJECT)(HANDLE);
-typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA);
+typedef DWORD (APIENTRY *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA);
-typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA);
-typedef BOOL (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)(HANDLE, DD_HALINFO*, DWORD*,  LPD3DNTHAL_CALLBACKS, LPD3DNTHAL_GLOBALDRIVERDATA,
+typedef BOOL (APIENTRY *PGD_DXDDQUERYDIRECTDRAWOBJECT)(HANDLE, DD_HALINFO*, DWORD*,  LPD3DNTHAL_CALLBACKS, LPD3DNTHAL_GLOBALDRIVERDATA,
                                                     PDD_D3DBUFCALLBACKS, LPDDSURFACEDESC, DWORD *, VIDEOMEMORY *, DWORD *, DWORD *);
 
 
 /* From d3d.c */
-typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE);
+typedef DWORD (APIENTRY *PGD_DXDDDESTROYD3DBUFFER)(HANDLE);
-typedef DWORD (NTAPI *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA);
+typedef DWORD (APIENTRY *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA);
-typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA);
+typedef DWORD (APIENTRY *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA);
-typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA);
+typedef DWORD (APIENTRY *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA);
-typedef DWORD (NTAPI *PGD_D3DVALIDATETEXTURESTAGESTATE)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA);
+typedef DWORD (APIENTRY *PGD_D3DVALIDATETEXTURESTAGESTATE)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA);
-typedef DWORD (NTAPI *PGD_D3DDRAWPRIMITIVES2)(HANDLE, HANDLE, LPD3DNTHAL_DRAWPRIMITIVES2DATA, FLATPTR *, DWORD *, FLATPTR *, DWORD *);
+typedef DWORD (APIENTRY *PGD_D3DDRAWPRIMITIVES2)(HANDLE, HANDLE, LPD3DNTHAL_DRAWPRIMITIVES2DATA, FLATPTR *, DWORD *, FLATPTR *, DWORD *);
-typedef DWORD (NTAPI *PGD_DDCREATED3DBUFFER)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *);
+typedef DWORD (APIENTRY *PGD_DDCREATED3DBUFFER)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *);
-typedef BOOL (NTAPI *PGD_D3DCONTEXTCREATE)(HANDLE, HANDLE, HANDLE, LPD3DNTHAL_CONTEXTCREATEDATA);
+typedef BOOL (APIENTRY *PGD_D3DCONTEXTCREATE)(HANDLE, HANDLE, HANDLE, LPD3DNTHAL_CONTEXTCREATEDATA);
-typedef DWORD (NTAPI *PGD_D3DCONTEXTDESTROY)(LPD3DNTHAL_CONTEXTDESTROYDATA);
+typedef DWORD (APIENTRY *PGD_D3DCONTEXTDESTROY)(LPD3DNTHAL_CONTEXTDESTROYDATA);
-typedef DWORD (NTAPI *PGD_D3DCONTEXTDESTROYALL)(LPD3DNTHAL_CONTEXTDESTROYALLDATA);
+typedef DWORD (APIENTRY *PGD_D3DCONTEXTDESTROYALL)(LPD3DNTHAL_CONTEXTDESTROYALLDATA);
 
 /* From dvp.c */
-typedef DWORD (NTAPI* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA);
+typedef DWORD (APIENTRY* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA);
-typedef DWORD (NTAPI* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA);
+typedef DWORD (APIENTRY* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA);
-typedef HANDLE (NTAPI* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA);
+typedef HANDLE (APIENTRY* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA);
-typedef DWORD (NTAPI* PGD_DVPDESTROYVIDEOPORT)(HANDLE, PDD_DESTROYVPORTDATA);
+typedef DWORD (APIENTRY* PGD_DVPDESTROYVIDEOPORT)(HANDLE, PDD_DESTROYVPORTDATA);
-typedef DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA);
+typedef DWORD (APIENTRY* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA);
-typedef DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA);
+typedef DWORD (APIENTRY* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA);
-typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(HANDLE, PDD_GETVPORTFLIPSTATUSDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(HANDLE, PDD_GETVPORTFLIPSTATUSDATA);
-typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA);
-typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA);
-typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)(HANDLE, PDD_GETVPORTOUTPUTFORMATDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)(HANDLE, PDD_GETVPORTOUTPUTFORMATDATA);
-typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTCONNECTINFO)(HANDLE, PDD_GETVPORTCONNECTDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTCONNECTINFO)(HANDLE, PDD_GETVPORTCONNECTDATA);
-typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA);
-typedef DWORD (NTAPI *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA);
-typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(HANDLE, PDD_WAITFORVPORTSYNCDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPWAITFORVIDEOPORTSYNC)(HANDLE, PDD_WAITFORVPORTSYNCDATA);
-typedef DWORD (NTAPI *PGD_DXDVPACQUIRENOTIFICATION)(HANDLE, HANDLE*, LPDDVIDEOPORTNOTIFY);
+typedef DWORD (APIENTRY *PGD_DXDVPACQUIRENOTIFICATION)(HANDLE, HANDLE*, LPDDVIDEOPORTNOTIFY);
-typedef DWORD (NTAPI *PGD_DXDVPRELEASENOTIFICATION)(HANDLE, HANDLE);
+typedef DWORD (APIENTRY *PGD_DXDVPRELEASENOTIFICATION)(HANDLE, HANDLE);
-typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFIELD)(HANDLE, PDD_GETVPORTFIELDDATA);
+typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTFIELD)(HANDLE, PDD_GETVPORTFIELDDATA);
 
 /* From mocomp.c */
-typedef DWORD (NTAPI *PGD_DDBEGINMOCOMPFRAME)(HANDLE, PDD_BEGINMOCOMPFRAMEDATA);
+typedef DWORD (APIENTRY *PGD_DDBEGINMOCOMPFRAME)(HANDLE, PDD_BEGINMOCOMPFRAMEDATA);
-typedef HANDLE (NTAPI *PGD_DXDDCREATEMOCOMP)(HANDLE, PDD_CREATEMOCOMPDATA );
+typedef HANDLE (APIENTRY *PGD_DXDDCREATEMOCOMP)(HANDLE, PDD_CREATEMOCOMPDATA );
-typedef DWORD (NTAPI *PGD_DXDDDESTROYMOCOMP)(HANDLE, PDD_DESTROYMOCOMPDATA);
+typedef DWORD (APIENTRY *PGD_DXDDDESTROYMOCOMP)(HANDLE, PDD_DESTROYMOCOMPDATA);
-typedef DWORD (NTAPI *PGD_DXDDENDMOCOMPFRAME)(HANDLE, PDD_ENDMOCOMPFRAMEDATA);
+typedef DWORD (APIENTRY *PGD_DXDDENDMOCOMPFRAME)(HANDLE, PDD_ENDMOCOMPFRAMEDATA);
-typedef DWORD (NTAPI *PGD_DXDDGETINTERNALMOCOMPINFO)(HANDLE, PDD_GETINTERNALMOCOMPDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETINTERNALMOCOMPINFO)(HANDLE, PDD_GETINTERNALMOCOMPDATA);
-typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPBUFFINFO)(HANDLE, PDD_GETMOCOMPCOMPBUFFDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETMOCOMPBUFFINFO)(HANDLE, PDD_GETMOCOMPCOMPBUFFDATA);
-typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPGUIDS)(HANDLE, PDD_GETMOCOMPGUIDSDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETMOCOMPGUIDS)(HANDLE, PDD_GETMOCOMPGUIDSDATA);
-typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPFORMATS)(HANDLE, PDD_GETMOCOMPFORMATSDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETMOCOMPFORMATS)(HANDLE, PDD_GETMOCOMPFORMATSDATA);
-typedef DWORD (NTAPI *PGD_DXDDQUERYMOCOMPSTATUS)(HANDLE, PDD_QUERYMOCOMPSTATUSDATA);
+typedef DWORD (APIENTRY *PGD_DXDDQUERYMOCOMPSTATUS)(HANDLE, PDD_QUERYMOCOMPSTATUSDATA);
-typedef DWORD (NTAPI *PGD_DXDDRENDERMOCOMP)(HANDLE, PDD_RENDERMOCOMPDATA);
+typedef DWORD (APIENTRY *PGD_DXDDRENDERMOCOMP)(HANDLE, PDD_RENDERMOCOMPDATA);
 
 /* From dd.c */
-typedef DWORD (NTAPI *PGD_DDCREATESURFACE)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *);
+typedef DWORD (APIENTRY *PGD_DDCREATESURFACE)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *);
-typedef DWORD (NTAPI *PGD_DXDDWAITFORVERTICALBLANK)(HANDLE, PDD_WAITFORVERTICALBLANKDATA);
+typedef DWORD (APIENTRY *PGD_DXDDWAITFORVERTICALBLANK)(HANDLE, PDD_WAITFORVERTICALBLANKDATA);
-typedef DWORD (NTAPI *PGD_DDCANCREATESURFACE)(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData);
+typedef DWORD (APIENTRY *PGD_DDCANCREATESURFACE)(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData);
-typedef DWORD (NTAPI *PGD_DXDDGETSCANLINE)(HANDLE, PDD_GETSCANLINEDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETSCANLINE)(HANDLE, PDD_GETSCANLINEDATA);
-typedef DWORD (NTAPI *PGD_DXDDCREATESURFACEEX)(HANDLE,HANDLE,DWORD);
+typedef DWORD (APIENTRY *PGD_DXDDCREATESURFACEEX)(HANDLE,HANDLE,DWORD);
 
 /* From ddsurf.c */
-typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA);
+typedef DWORD (APIENTRY *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA);
-typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE);
+typedef BOOL (APIENTRY *PGD_DDATTACHSURFACE)(HANDLE, HANDLE);
-typedef DWORD (NTAPI *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE);
+typedef DWORD (APIENTRY *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE);
-typedef DWORD (NTAPI *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL);
+typedef DWORD (APIENTRY *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL);
-typedef DWORD (NTAPI *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA);
+typedef DWORD (APIENTRY *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA);
-typedef DWORD (NTAPI *PGD_DXDDLOCK)(HANDLE, PDD_LOCKDATA, HDC);
+typedef DWORD (APIENTRY *PGD_DXDDLOCK)(HANDLE, PDD_LOCKDATA, HDC);
-typedef DWORD (NTAPI *PGD_DXDDUNLOCK)(HANDLE, PDD_UNLOCKDATA );
+typedef DWORD (APIENTRY *PGD_DXDDUNLOCK)(HANDLE, PDD_UNLOCKDATA );
-typedef DWORD (NTAPI *PGD_DDBLT)(HANDLE, HANDLE, PDD_BLTDATA);
+typedef DWORD (APIENTRY *PGD_DDBLT)(HANDLE, HANDLE, PDD_BLTDATA);
-typedef DWORD (NTAPI *PGD_DXDDSETCOLORKEY)(HANDLE, PDD_SETCOLORKEYDATA);
+typedef DWORD (APIENTRY *PGD_DXDDSETCOLORKEY)(HANDLE, PDD_SETCOLORKEYDATA);
-typedef DWORD (NTAPI *PGD_DDADDATTACHEDSURFACE)(HANDLE, HANDLE,PDD_ADDATTACHEDSURFACEDATA);
+typedef DWORD (APIENTRY *PGD_DDADDATTACHEDSURFACE)(HANDLE, HANDLE,PDD_ADDATTACHEDSURFACEDATA);
-typedef DWORD (NTAPI *PGD_DXDDGETBLTSTATUS)(HANDLE, PDD_GETBLTSTATUSDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETBLTSTATUS)(HANDLE, PDD_GETBLTSTATUSDATA);
-typedef DWORD (NTAPI *PGD_DXDDGETFLIPSTATUS)(HANDLE, PDD_GETFLIPSTATUSDATA);
+typedef DWORD (APIENTRY *PGD_DXDDGETFLIPSTATUS)(HANDLE, PDD_GETFLIPSTATUSDATA);
-typedef DWORD (NTAPI *PGD_DXDDUPDATEOVERLAY)(HANDLE, HANDLE, PDD_UPDATEOVERLAYDATA);
+typedef DWORD (APIENTRY *PGD_DXDDUPDATEOVERLAY)(HANDLE, HANDLE, PDD_UPDATEOVERLAYDATA);
-typedef DWORD (NTAPI *PGD_DXDDSETOVERLAYPOSITION)(HANDLE, HANDLE, PDD_SETOVERLAYPOSITIONDATA);
+typedef DWORD (APIENTRY *PGD_DXDDSETOVERLAYPOSITION)(HANDLE, HANDLE, PDD_SETOVERLAYPOSITIONDATA);
 
 /* From eng.c */
-typedef FLATPTR (NTAPI *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG);
+typedef FLATPTR (APIENTRY *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG);
-typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR);
+typedef VOID (APIENTRY *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR);
-typedef PVOID (NTAPI *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ;
+typedef PVOID (APIENTRY *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ;
-typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID);
+typedef VOID (APIENTRY *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID);
-typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE);
+typedef PDD_SURFACE_LOCAL (APIENTRY *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE);
-typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL);
+typedef BOOL (APIENTRY *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL);
 
 /* Gammaramp internal prototype */
 BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp);

reactos/subsystems/win32/win32k/include/inteng.h

@@ -44,7 +44,7 @@ VOID FASTCALL
 IntEngCleanupDriverObjs(struct _EPROCESS *Process,
                         PW32PROCESS Win32Process);
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngLineTo(SURFOBJ *Surface,
              CLIPOBJ *Clip,
              BRUSHOBJ *Brush,
@@ -55,7 +55,7 @@ IntEngLineTo(SURFOBJ *Surface,
              RECTL *RectBounds,
              MIX mix);
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngBitBltEx(SURFOBJ *DestObj,
                SURFOBJ *SourceObj,
                SURFOBJ *Mask,
@@ -75,7 +75,7 @@ IntEngBitBltEx(SURFOBJ *DestObj,
                        (ColorTranslation), (DestRect), (SourcePoint), \
                        (MaskOrigin), (Brush), (BrushOrigin), (Rop4), TRUE)
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngStretchBlt(SURFOBJ *DestObj,
                  SURFOBJ *SourceObj,
                  SURFOBJ *Mask,
@@ -88,7 +88,7 @@ IntEngStretchBlt(SURFOBJ *DestObj,
                  POINTL *BrushOrigin,
                  ULONG Mode);
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngGradientFill(SURFOBJ *psoDest,
                    CLIPOBJ *pco,
                    XLATEOBJ *pxlo,
@@ -121,7 +121,7 @@ HPALETTE FASTCALL
 IntEngGetXlatePalette(XLATEOBJ *XlateObj,
                       ULONG Palette);
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngPolyline(SURFOBJ *DestSurf,
                CLIPOBJ *Clip,
                BRUSHOBJ *Brush,
@@ -153,20 +153,20 @@ IntEngTransparentBlt(SURFOBJ *Dest,
                      ULONG iTransColor,
                      ULONG Reserved);
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngPaint(IN SURFOBJ *Surface,
             IN CLIPOBJ *ClipRegion,
             IN BRUSHOBJ *Brush,
             IN POINTL *BrushOrigin,
             IN MIX Mix);
 
-VOID STDCALL
+VOID APIENTRY
 IntEngMovePointer(IN SURFOBJ *pso,
                   IN LONG x,
                   IN LONG y,
                   IN RECTL *prcl);
 
-BOOL STDCALL
+BOOL APIENTRY
 IntEngAlphaBlend(IN SURFOBJ *Dest,
                  IN SURFOBJ *Source,
                  IN CLIPOBJ *ClipRegion,

reactos/subsystems/win32/win32k/include/intgdi.h

@@ -18,27 +18,27 @@ IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, BITMAPOBJ* pDestSurf, BITMAPOBJ* p
 VOID FASTCALL
 IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ *XlateObj);
 
-HBRUSH STDCALL
+HBRUSH APIENTRY
 IntGdiCreateDIBBrush(
    CONST BITMAPINFO *BitmapInfo,
    UINT ColorSpec,
    UINT BitmapInfoSize,
    CONST VOID *PackedDIB);
 
-HBRUSH STDCALL
+HBRUSH APIENTRY
 IntGdiCreateHatchBrush(
    INT Style,
    COLORREF Color);
 
-HBRUSH STDCALL
+HBRUSH APIENTRY
 IntGdiCreatePatternBrush(
    HBITMAP hBitmap);
 
-HBRUSH STDCALL
+HBRUSH APIENTRY
 IntGdiCreateSolidBrush(
    COLORREF Color);
 
-HBRUSH STDCALL
+HBRUSH APIENTRY
 IntGdiCreateNullBrush(VOID);
 
 BOOL FASTCALL
@@ -56,7 +56,7 @@ IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color);
 
 /* Pen functions */
 
-HPEN STDCALL
+HPEN APIENTRY
 IntGdiExtCreatePen(DWORD, DWORD, IN ULONG, IN ULONG, IN ULONG_PTR, IN ULONG_PTR, DWORD, PULONG, IN ULONG, IN BOOL, IN OPTIONAL HBRUSH);
 
 VOID FASTCALL
@@ -230,7 +230,7 @@ IntCreateCompatibleBitmap(PDC Dc,
                           INT Width,
                           INT Height);
 
-HBITMAP STDCALL
+HBITMAP APIENTRY
 IntGdiCreateBitmap(
     INT  Width,
     INT  Height,
@@ -238,45 +238,45 @@ IntGdiCreateBitmap(
     UINT  BitsPixel,
     IN OPTIONAL LPBYTE pBits);
 
-HDC STDCALL IntGdiGetDCState(HDC  hDC);
+HDC APIENTRY IntGdiGetDCState(HDC  hDC);
 
-WORD STDCALL IntGdiSetHookFlags(HDC hDC, WORD Flags);
+WORD APIENTRY IntGdiSetHookFlags(HDC hDC, WORD Flags);
 
-VOID STDCALL IntGdiSetDCState ( HDC hDC, HDC hDCSave );
+VOID APIENTRY IntGdiSetDCState ( HDC hDC, HDC hDCSave );
 
-LONG STDCALL IntSetBitmapBits(PBITMAPOBJ bmp, DWORD  Bytes, IN PBYTE Bits);
+LONG APIENTRY IntSetBitmapBits(PBITMAPOBJ bmp, DWORD  Bytes, IN PBYTE Bits);
 
-LONG STDCALL IntGetBitmapBits(PBITMAPOBJ bmp, DWORD Bytes, OUT PBYTE Bits);
+LONG APIENTRY IntGetBitmapBits(PBITMAPOBJ bmp, DWORD Bytes, OUT PBYTE Bits);
 
-UINT STDCALL IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors);
+UINT APIENTRY IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors);
 
-UINT STDCALL IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors);
+UINT APIENTRY IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors);
 
-UINT STDCALL
+UINT APIENTRY
 IntAnimatePalette(HPALETTE hPal, UINT StartIndex,
    UINT NumEntries, CONST PPALETTEENTRY PaletteColors);
 
-UINT STDCALL
+UINT APIENTRY
 IntGetPaletteEntries(HPALETTE  hpal,
                      UINT  StartIndex,
                      UINT  Entries,
                      LPPALETTEENTRY  pe);
 
-UINT STDCALL
+UINT APIENTRY
 IntSetPaletteEntries(HPALETTE  hpal,
                       UINT  Start,
                       UINT  Entries,
                       CONST LPPALETTEENTRY  pe);
 
-UINT STDCALL
+UINT APIENTRY
 IntGetSystemPaletteEntries(HDC  hDC,
                            UINT  StartIndex,
                            UINT  Entries,
                            LPPALETTEENTRY  pe);
-UINT STDCALL
+UINT APIENTRY
 IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors);
 
-UINT STDCALL
+UINT APIENTRY
 IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors);
 
 #endif /* _WIN32K_INTGDI_H */

reactos/subsystems/win32/win32k/include/menu.h

@@ -97,7 +97,7 @@ IntCheckMenuItem(PMENU_OBJECT MenuObject, UINT uIDCheckItem, UINT uCheck);
 BOOL FASTCALL
 IntSetMenuItemRect(PMENU_OBJECT MenuObject, UINT Item, BOOL fByPos, RECT *rcRect);
 
-DWORD STDCALL UserInsertMenuItem(HMENU hMenu, UINT uItem, BOOL fByPosition, LPCMENUITEMINFOW lpmii);
+DWORD APIENTRY UserInsertMenuItem(HMENU hMenu, UINT uItem, BOOL fByPosition, LPCMENUITEMINFOW lpmii);
 
 BOOL FASTCALL
 IntCleanupMenus(struct _EPROCESS *Process, PW32PROCESS Win32Process);

reactos/subsystems/win32/win32k/include/misc.h

@@ -35,9 +35,9 @@ extern SHORT gusLanguageID;
 
 SHORT FASTCALL IntGdiGetLanguageID();
 ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni);
-DWORD STDCALL IntGetQueueStatus(BOOL ClearChanges);
+DWORD APIENTRY IntGetQueueStatus(BOOL ClearChanges);
 VOID FASTCALL IntUserManualGuiCheck(LONG Check);
-PVOID NTAPI HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *);
+PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *);
-VOID NTAPI HackUnsecureVirtualMemory(IN PVOID);
+VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID);
 
 #endif /* __WIN32K_MISC_H */

reactos/subsystems/win32/win32k/include/msgqueue.h

@@ -135,7 +135,7 @@ MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue,
 	       MSG* Msg, BOOLEAN FreeLParam, DWORD MessageBits);
 VOID FASTCALL
 MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode);
-BOOLEAN STDCALL
+BOOLEAN APIENTRY
 co_MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue,
 	       IN BOOLEAN Hardware,
 	       IN BOOLEAN Remove,
@@ -204,8 +204,8 @@ MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, HWND hWnd);
 __inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue );
 __inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits );
 __inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits );
-BOOL STDCALL IntInitMessagePumpHook();
+BOOL APIENTRY IntInitMessagePumpHook();
-BOOL STDCALL IntUninitMessagePumpHook();
+BOOL APIENTRY IntUninitMessagePumpHook();
 #define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF))
 
 PHOOKTABLE FASTCALL MsqGetHooks(PUSER_MESSAGE_QUEUE Queue);
@@ -213,7 +213,7 @@ VOID FASTCALL MsqSetHooks(PUSER_MESSAGE_QUEUE Queue, PHOOKTABLE Hooks);
 
 LPARAM FASTCALL MsqSetMessageExtraInfo(LPARAM lParam);
 LPARAM FASTCALL MsqGetMessageExtraInfo(VOID);
-VOID STDCALL MsqRemoveWindowMessagesFromQueue(PVOID pWindow); /* F*(&$ headers, will be gone in the rewrite! */
+VOID APIENTRY MsqRemoveWindowMessagesFromQueue(PVOID pWindow); /* F*(&$ headers, will be gone in the rewrite! */
 
 #define IntLockHardwareMessageQueue(MsgQueue) \
   KeWaitForMutexObject(&(MsgQueue)->HardwareLock, UserRequest, KernelMode, FALSE, NULL)

reactos/subsystems/win32/win32k/include/paint.h

@@ -1,7 +1,7 @@
 #ifndef _WIN32K_PAINT_H
 #define _WIN32K_PAINT_H
 
-BOOL STDCALL FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor);
+BOOL APIENTRY FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor);
-BOOL STDCALL FillPolygon ( DC* dc, BITMAPOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect );
+BOOL APIENTRY FillPolygon ( DC* dc, BITMAPOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect );
 
 #endif /* _WIN32K_PAINT_H */

reactos/subsystems/win32/win32k/include/palette.h

@@ -75,7 +75,7 @@ BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody);
 HPALETTE FASTCALL PALETTE_Init (VOID);
 VOID     FASTCALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size);
 #ifndef NO_MAPPING
-INT      STDCALL  PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly);
+INT      APIENTRY  PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly);
 #endif
 INT      FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color);
 

reactos/subsystems/win32/win32k/include/pen.h

@@ -26,6 +26,6 @@
 
 
 PGDIBRUSHOBJ FASTCALL PENOBJ_LockPen(HGDIOBJ);
-INT STDCALL PEN_GetObject(PGDIBRUSHOBJ hPen, INT Count, PLOGPEN Buffer);
+INT APIENTRY PEN_GetObject(PGDIBRUSHOBJ hPen, INT Count, PLOGPEN Buffer);
 
 #endif

reactos/subsystems/win32/win32k/include/rect.h

@@ -1,17 +1,17 @@
 #ifndef _WIN32K_RECT_H
 #define _WIN32K_RECT_H
 
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiUnionRect(PRECT Dest, const RECT* Src1, const RECT* Src2);
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiSetRect(PRECT Rect, int left, int top, int right, int bottom);
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiSetEmptyRect(PRECT Rect);
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiIsEmptyRect(const RECT* Rect);
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiIntersectRect(PRECT Dest, const RECT* Src1, const RECT* Src2);
-BOOL STDCALL
+BOOL APIENTRY
 NtGdiOffsetRect(LPRECT Rect, int x, int y);
 
 #endif /* _WIN32K_RECT_H */

reactos/subsystems/win32/win32k/include/region.h

@@ -41,7 +41,7 @@ VOID FASTCALL REGION_Delete(PROSRGNDATA);
 VOID FASTCALL IntGdiReleaseRaoRgn(PDC);
 VOID FASTCALL IntGdiReleaseVisRgn(PDC);
 
-INT STDCALL IntGdiGetRgnBox(HRGN, LPRECT);
+INT APIENTRY IntGdiGetRgnBox(HRGN, LPRECT);
 BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN );
 HRGN FASTCALL IntCreatePolyPolygonRgn(PPOINT, PULONG, INT, INT);
 

reactos/subsystems/win32/win32k/include/win32k.h

@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 #ifndef __WIN32K_H
 #define __WIN32K_H
-#define INTERNAL_CALL NTAPI
+#define INTERNAL_CALL APIENTRY
 
 /* Internal Win32k Headers */
 #include <include/accelerator.h>

reactos/subsystems/win32/win32k/include/winsta.h

@@ -64,14 +64,14 @@ NTSTATUS FASTCALL
 CleanupWindowStationImpl(VOID);
 
 NTSTATUS
-STDCALL
+APIENTRY
 IntWinStaObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters);
 
-VOID STDCALL
+VOID APIENTRY
 IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters);
 
 NTSTATUS
-STDCALL
+APIENTRY
 IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters);
 
 NTSTATUS FASTCALL

reactos/subsystems/win32/win32k/ldr/loader.c

@@ -39,7 +39,7 @@ extern LIST_ENTRY GlobalDriverListHead;
  * Blatantly stolen from ldr/utils.c in ntdll.  I can't link ntdll from
  * here, though.
  */
-NTSTATUS STDCALL
+NTSTATUS APIENTRY
 LdrGetProcedureAddress (IN PVOID BaseAddress,
                         IN PANSI_STRING Name,
                         IN ULONG Ordinal,
@@ -99,7 +99,7 @@ LdrGetProcedureAddress (IN PVOID BaseAddress,
    return STATUS_PROCEDURE_NOT_FOUND;
 }
 
-PVOID STDCALL
+PVOID APIENTRY
 EngFindImageProcAddress(IN HANDLE Module,
 			IN LPSTR ProcName)
 {
@@ -196,7 +196,7 @@ EngFindImageProcAddress(IN HANDLE Module,
  * @implemented
  */
 HANDLE
-STDCALL
+APIENTRY
 EngLoadImage (LPWSTR DriverName)
 {
 	HANDLE hImageHandle = NULL;
@@ -247,7 +247,7 @@ EngLoadImage (LPWSTR DriverName)
  * @unimplemented
  */
 HANDLE
-STDCALL
+APIENTRY
 EngLoadModule(LPWSTR ModuleName)
 {
   SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo;
@@ -264,7 +264,7 @@ EngLoadModule(LPWSTR ModuleName)
 }
 
 VOID
-STDCALL
+APIENTRY
 EngUnloadImage ( IN HANDLE hModule )
 {
   NTSTATUS Status;

reactos/subsystems/win32/win32k/main/dllmain.c

@@ -49,7 +49,7 @@ extern UCHAR Win32kSSPT[];
 extern ULONG Win32kNumberOfSysCalls;
 
 NTSTATUS
-STDCALL
+APIENTRY
 Win32kProcessCallback(struct _EPROCESS *Process,
                       BOOLEAN Create)
 {
@@ -171,7 +171,7 @@ CLEANUP:
 
 
 NTSTATUS
-STDCALL
+APIENTRY
 Win32kThreadCallback(struct _ETHREAD *Thread,
                      PSW32THREADCALLOUTTYPE Type)
 {
@@ -374,7 +374,7 @@ Win32kInitWin32Thread(PETHREAD Thread)
 /*
  * This definition doesn't work
  */
-NTSTATUS STDCALL
+NTSTATUS APIENTRY
 DriverEntry (
   IN	PDRIVER_OBJECT	DriverObject,
   IN	PUNICODE_STRING	RegistryPath)

reactos/subsystems/win32/win32k/misc/driver.c

@@ -491,7 +491,7 @@ BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA  DED,
 }
 
 typedef LONG VP_STATUS;
-typedef VP_STATUS (STDCALL *PMP_DRIVERENTRY)(PVOID, PVOID);
+typedef VP_STATUS (APIENTRY *PMP_DRIVERENTRY)(PVOID, PVOID);
 
 PFILE_OBJECT DRIVER_FindMPDriver(ULONG DisplayNumber)
 {

reactos/subsystems/win32/win32k/misc/err.c

@@ -62,7 +62,7 @@ GetLastNtError()
 }
 
 VOID
-NTAPI
+APIENTRY
 W32kRaiseStatus(NTSTATUS Status)
 {
     EXCEPTION_RECORD ExceptionRecord;

reactos/subsystems/win32/win32k/misc/math.c

@@ -25,7 +25,7 @@
  *
  * @implemented
  */
-INT STDCALL EngMulDiv(
+INT APIENTRY EngMulDiv(
 	     INT nMultiplicand,
 	     INT nMultiplier,
 	     INT nDivisor)

reactos/subsystems/win32/win32k/misc/usrheap.c

@@ -23,7 +23,7 @@
 #include <debug.h>
 
 
-static NTSTATUS NTAPI
+static NTSTATUS APIENTRY
 IntUserHeapCommitRoutine(IN PVOID Base,
                          IN OUT PVOID *CommitAddress,
                          IN OUT PSIZE_T CommitSize)

reactos/subsystems/win32/win32k/ntddraw/d3d.c

@@ -56,7 +56,7 @@
 *--*/
 
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw,
                           PDD_CANCREATESURFACEDATA puCanCreateSurfaceData)
 {
@@ -113,7 +113,7 @@ NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw,
 * the correct struct is LPD3DHAL_CONTEXTCREATEDATA.
 *--*/
 BOOL 
-STDCALL
+APIENTRY
 NtGdiD3dContextCreate(HANDLE hDirectDrawLocal,
                       HANDLE hSurfColor,
                       HANDLE hSurfZ,
@@ -151,7 +151,7 @@ NtGdiD3dContextCreate(HANDLE hDirectDrawLocal,
 *
 *--*/
 DWORD
-STDCALL
+APIENTRY
 NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData)
 {
     PGD_D3DCONTEXTDESTROY pfnD3dContextDestroy = (PGD_D3DCONTEXTDESTROY)gpDxFuncs[DXG_INDEX_DxD3dContextDestroy].pfn;
@@ -189,7 +189,7 @@ NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData)
 * any parameters. Last time MSDN checked: 19/10-2007
 *--*/
 DWORD
-STDCALL
+APIENTRY
 NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad)
 {
     PGD_D3DCONTEXTDESTROYALL pfnD3dContextDestroyAll = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxD3dContextDestroyAll].pfn;
@@ -257,7 +257,7 @@ NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad)
 *
 *--*/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw,
                        HANDLE *hSurface,
                        DDSURFACEDESC *puSurfaceDescription,
@@ -286,7 +286,7 @@ NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw,
 /* NtGdiDdDestroyD3DBuffer                                              */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdDestroyD3DBuffer(HANDLE hSurface)
 {
     PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = (PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn;  
@@ -305,7 +305,7 @@ NtGdiDdDestroyD3DBuffer(HANDLE hSurface)
 /* NtGdiD3dDrawPrimitives2                                              */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf,
                         HANDLE hVBuf,
                         LPD3DNTHAL_DRAWPRIMITIVES2DATA pded,
@@ -331,7 +331,7 @@ NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf,
 /* NtGdiD3dValidateTextureStageState                                    */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdLockD3D(HANDLE hSurface,
                PDD_LOCKDATA puLockData)
 {
@@ -351,7 +351,7 @@ NtGdiDdLockD3D(HANDLE hSurface,
 /* NtGdiD3dValidateTextureStageState                                    */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData)
 {
     PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = (PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn;  
@@ -370,7 +370,7 @@ NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData
 /* NtGdiDdUnlockD3D                                                     */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdUnlockD3D(HANDLE hSurface,
                  PDD_UNLOCKDATA puUnlockData)
 {

reactos/subsystems/win32/win32k/ntddraw/dd.c

@@ -15,7 +15,7 @@
 /* NtGdiDdCreateSurface                                                 */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdCreateSurface(HANDLE hDirectDrawLocal,
                      HANDLE *hSurface,
                      DDSURFACEDESC *puSurfaceDescription,
@@ -42,7 +42,7 @@ NtGdiDdCreateSurface(HANDLE hDirectDrawLocal,
 /* NtGdiDdWaitForVerticalBlank                                          */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw,
                             PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData)
 {
@@ -62,7 +62,7 @@ NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw,
 /* NtGdiDdCanCreateSurface                                              */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal,
                         PDD_CANCREATESURFACEDATA puCanCreateSurfaceData)
 {
@@ -83,7 +83,7 @@ NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal,
 /* NtGdiDdGetScanLine                                                   */
 /************************************************************************/
 DWORD
-STDCALL 
+APIENTRY 
 NtGdiDdGetScanLine(HANDLE hDirectDrawLocal,
                    PDD_GETSCANLINEDATA puGetScanLineData)
 {
@@ -110,7 +110,7 @@ NtGdiDdGetScanLine(HANDLE hDirectDrawLocal,
 /* NtGdiDdCreateSurfaceEx                                               */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdCreateSurfaceEx(HANDLE hDirectDraw,
                        HANDLE hSurface,
                        DWORD dwSurfaceHandle)

reactos/subsystems/win32/win32k/ntddraw/ddraw.c

@@ -114,7 +114,7 @@ intEnableReactXDriver(HDC hdc)
 /* DirectX graphic/video driver loading and cleanup start here          */
 /************************************************************************/
 NTSTATUS
-STDCALL
+APIENTRY
 DxDdStartupDxGraphics(  ULONG ulc1,
                         PDRVENABLEDATA DxEngDrvOld,
                         ULONG ulc2,
@@ -218,7 +218,7 @@ DxDdStartupDxGraphics(  ULONG ulc1,
 /* NtGdiDdCreateDirectDrawObject                                        */
 /************************************************************************/
 HANDLE
-STDCALL
+APIENTRY
 NtGdiDdCreateDirectDrawObject(HDC hdc)
 {
     PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject;
@@ -284,7 +284,7 @@ NtGdiDdCreateDirectDrawObject(HDC hdc)
 *
 *--*/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDxgGenericThunk(ULONG_PTR ulIndex,
                      ULONG_PTR ulHandle,
                      SIZE_T *pdwSizeOfPtr1,
@@ -308,7 +308,7 @@ NtGdiDxgGenericThunk(ULONG_PTR ulIndex,
 /* NtGdiDdGetDriverState                                                */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetDriverState(PDD_GETDRIVERSTATEDATA pdata)
 {
     PGD_DDGETDRIVERSTATE pfnDdGetDriverState = (PGD_DDGETDRIVERSTATE)gpDxFuncs[DXG_INDEX_DxDdGetDriverState].pfn;
@@ -327,7 +327,7 @@ NtGdiDdGetDriverState(PDD_GETDRIVERSTATEDATA pdata)
 /* NtGdiDdColorControl                                                  */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdColorControl(HANDLE hSurface,
                     PDD_COLORCONTROLDATA puColorControlData)
 {
@@ -347,7 +347,7 @@ NtGdiDdColorControl(HANDLE hSurface,
 /* NtGdiDdCreateSurfaceObject                                           */
 /************************************************************************/
 HANDLE
-STDCALL
+APIENTRY
 NtGdiDdCreateSurfaceObject(HANDLE hDirectDrawLocal,
                            HANDLE hSurface,
                            PDD_SURFACE_LOCAL puSurfaceLocal,
@@ -372,7 +372,7 @@ NtGdiDdCreateSurfaceObject(HANDLE hDirectDrawLocal,
 /* NtGdiDdDeleteDirectDrawObject                                        */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal)
 {
     PGD_DXDDDELETEDIRECTDRAWOBJECT pfnDdDeleteDirectDrawObject = (PGD_DXDDDELETEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdDeleteDirectDrawObject].pfn;
@@ -399,7 +399,7 @@ NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal)
 /* NtGdiDdDeleteSurfaceObject                                           */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdDeleteSurfaceObject(HANDLE hSurface)
 {
     PGD_DXDDDELETESURFACEOBJECT pfnDdDeleteSurfaceObject = (PGD_DXDDDELETESURFACEOBJECT)gpDxFuncs[DXG_INDEX_DxDdDeleteSurfaceObject].pfn;
@@ -419,7 +419,7 @@ NtGdiDdDeleteSurfaceObject(HANDLE hSurface)
 /* NtGdiDdQueryDirectDrawObject                                         */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal,
                              DD_HALINFO  *pHalInfo,
                              DWORD *pCallBackFlags,
@@ -453,7 +453,7 @@ NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal,
 /* NtGdiDdReenableDirectDrawObject                                      */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal,
                                 BOOL *pubNewMode)
 {
@@ -485,7 +485,7 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal,
 /* NtGdiDdGetDriverInfo                                                 */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal,
                      PDD_GETDRIVERINFODATA puGetDriverInfoData)
 
@@ -507,7 +507,7 @@ NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal,
 /* NtGdiDdGetAvailDriverMemory                                          */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetAvailDriverMemory(HANDLE hDirectDrawLocal,
                             PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData)
 {
@@ -529,7 +529,7 @@ NtGdiDdGetAvailDriverMemory(HANDLE hDirectDrawLocal,
 /************************************************************************/
 
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdSetExclusiveMode(HANDLE hDirectDraw,
                         PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData)
 {
@@ -551,7 +551,7 @@ NtGdiDdSetExclusiveMode(HANDLE hDirectDraw,
 /* NtGdiDdFlipToGDISurface                                              */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdFlipToGDISurface(HANDLE hDirectDraw,
                         PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData)
 {
@@ -572,7 +572,7 @@ NtGdiDdFlipToGDISurface(HANDLE hDirectDraw,
 /* NtGdiDdGetDC                                                         */
 /************************************************************************/
 HDC
-STDCALL
+APIENTRY
 NtGdiDdGetDC(HANDLE hSurface,
              PALETTEENTRY *puColorTable)
 {
@@ -592,7 +592,7 @@ NtGdiDdGetDC(HANDLE hSurface,
 /* NtGdiDdGetDxHandle                                                   */
 /************************************************************************/
 HANDLE
-STDCALL
+APIENTRY
 NtGdiDdGetDxHandle(HANDLE hDirectDraw,
                    HANDLE hSurface,
                    BOOL bRelease)
@@ -614,7 +614,7 @@ NtGdiDdGetDxHandle(HANDLE hDirectDraw,
 /* NtGdiDdReleaseDC                                                     */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdReleaseDC(HANDLE hSurface)
 {
     PGD_DDRELEASEDC pfnDdReleaseDC = (PGD_DDRELEASEDC)gpDxFuncs[DXG_INDEX_DxDdReleaseDC].pfn;
@@ -633,7 +633,7 @@ NtGdiDdReleaseDC(HANDLE hSurface)
 /* NtGdiDdResetVisrgn                                                   */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdResetVisrgn(HANDLE hSurface,
                    HWND hwnd)
 {
@@ -654,7 +654,7 @@ NtGdiDdResetVisrgn(HANDLE hSurface,
 /* NtGdiDdSetGammaRamp                                                  */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdSetGammaRamp(HANDLE hDirectDraw,
                     HDC hdc,
                     LPVOID lpGammaRamp)

reactos/subsystems/win32/win32k/ntddraw/ddsurf.c

@@ -15,7 +15,7 @@
 /* NtGdiDdDestroySurface                                                */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy)
 {
     PGD_DXDDDESTROYSURFACE pfnDdDestroySurface = (PGD_DXDDDESTROYSURFACE)gpDxFuncs[DXG_INDEX_DxDdDestroySurface].pfn;
@@ -34,7 +34,7 @@ NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy)
 /* NtGdiDdFlip                                                          */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdFlip(HANDLE hSurfaceCurrent,
             HANDLE hSurfaceTarget,
             HANDLE hSurfaceCurrentLeft,
@@ -57,7 +57,7 @@ NtGdiDdFlip(HANDLE hSurfaceCurrent,
 /* NtGdiDdUnlock                                                        */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdLock(HANDLE hSurface,
             PDD_LOCKDATA puLockData,
             HDC hdcClip)
@@ -78,7 +78,7 @@ NtGdiDdLock(HANDLE hSurface,
 /* NtGdiDdunlock                                                        */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdUnlock(HANDLE hSurface, 
               PDD_UNLOCKDATA puUnlockData)
 {
@@ -98,7 +98,7 @@ NtGdiDdUnlock(HANDLE hSurface,
 /* NtGdiDdBlt                                                           */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdBlt(HANDLE hSurfaceDest,
            HANDLE hSurfaceSrc,
            PDD_BLTDATA puBltData)
@@ -119,7 +119,7 @@ NtGdiDdBlt(HANDLE hSurfaceDest,
 /* NtGdiDdSetColorKey                                                   */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdSetColorKey(HANDLE hSurface,
                    PDD_SETCOLORKEYDATA puSetColorKeyData)
 {
@@ -141,7 +141,7 @@ NtGdiDdSetColorKey(HANDLE hSurface,
 /************************************************************************/
 
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdAddAttachedSurface(HANDLE hSurface,
                           HANDLE hSurfaceAttached,
                           PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData)
@@ -162,7 +162,7 @@ NtGdiDdAddAttachedSurface(HANDLE hSurface,
 /* NtGdiDdGetBltStatus                                                  */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetBltStatus(HANDLE hSurface,
                     PDD_GETBLTSTATUSDATA puGetBltStatusData)
 {
@@ -182,7 +182,7 @@ NtGdiDdGetBltStatus(HANDLE hSurface,
 /* NtGdiDdGetFlipStatus                                                 */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetFlipStatus(HANDLE hSurface,
                      PDD_GETFLIPSTATUSDATA puGetFlipStatusData)
 {
@@ -202,7 +202,7 @@ NtGdiDdGetFlipStatus(HANDLE hSurface,
 /* NtGdiDdUpdateOverlay                                                 */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdUpdateOverlay(HANDLE hSurfaceDestination,
                      HANDLE hSurfaceSource,
                      PDD_UPDATEOVERLAYDATA puUpdateOverlayData)
@@ -224,7 +224,7 @@ NtGdiDdUpdateOverlay(HANDLE hSurfaceDestination,
 /************************************************************************/
 
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource,
                           HANDLE hSurfaceDestination,
                           PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData)
@@ -251,7 +251,7 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource,
 /* NtGdiDdAlphaBlt                                                      */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdAlphaBlt(HANDLE hSurfaceDest,
                 HANDLE hSurfaceSrc,
                 PDD_BLTDATA puBltData)
@@ -272,7 +272,7 @@ NtGdiDdAlphaBlt(HANDLE hSurfaceDest,
 /* NtGdiDdAttachSurface                                                 */
 /************************************************************************/
 BOOL
-STDCALL
+APIENTRY
 NtGdiDdAttachSurface(HANDLE hSurfaceFrom,
                      HANDLE hSurfaceTo
 )
@@ -297,7 +297,7 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom,
           so I guess it is a typo in MSDN for this protypes for the info talk against it self
 */
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdUnattachSurface(HANDLE hSurface,
                        HANDLE hSurfaceAttached)
 {

reactos/subsystems/win32/win32k/ntddraw/dvp.c

@@ -16,7 +16,7 @@
 /* NtGdiDvpCanCreateVideoPort                                           */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw,
                            PDD_CANCREATEVPORTDATA puCanCreateVPortData)
 {
@@ -36,7 +36,7 @@ NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw,
 /* NtGdiDvpColorControl                                                 */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpColorControl(HANDLE hVideoPort,
                      PDD_VPORTCOLORDATA puVPortColorData)
 {
@@ -56,7 +56,7 @@ NtGdiDvpColorControl(HANDLE hVideoPort,
 /* NtGdiDvpCreateVideoPort                                              */
 /************************************************************************/
 HANDLE
-STDCALL
+APIENTRY
 NtGdiDvpCreateVideoPort(HANDLE hDirectDraw,
                         PDD_CREATEVPORTDATA puCreateVPortData)
 {
@@ -76,7 +76,7 @@ NtGdiDvpCreateVideoPort(HANDLE hDirectDraw,
 /* NtGdiDvpDestroyVideoPort                                             */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpDestroyVideoPort(HANDLE hVideoPort,
                          PDD_DESTROYVPORTDATA puDestroyVPortData)
 {
@@ -96,7 +96,7 @@ NtGdiDvpDestroyVideoPort(HANDLE hVideoPort,
 /* NtGdiDvpFlipVideoPort                                                */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpFlipVideoPort(HANDLE hVideoPort,
                       HANDLE hDDSurfaceCurrent,
                       HANDLE hDDSurfaceTarget,
@@ -119,7 +119,7 @@ NtGdiDvpFlipVideoPort(HANDLE hVideoPort,
 /* NtGdiDvpGetVideoPortBandwidth                                        */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort,
                               PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData)
 {
@@ -140,7 +140,7 @@ NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort,
 /* NtGdiDvpGetVideoPortFlipStatus                                       */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw,
                                PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData)
 {
@@ -161,7 +161,7 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw,
 /* NtGdiDvpGetVideoPortInputFormats                                     */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort,
                                  PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData)
 {
@@ -182,7 +182,7 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort,
 /* NtGdiDvpGetVideoPortLine                                             */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoPortLine(HANDLE hVideoPort,
                          PDD_GETVPORTLINEDATA puGetVPortLineData)
 {
@@ -203,7 +203,7 @@ NtGdiDvpGetVideoPortLine(HANDLE hVideoPort,
 /* NtGdiDvpGetVideoPortOutputFormats                                    */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort,
                                   PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData)
 {
@@ -225,7 +225,7 @@ NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort,
 /* NtGdiDvpGetVideoPortConnectInfo                                      */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw,
                                 PDD_GETVPORTCONNECTDATA puGetVPortConnectData)
 {
@@ -246,7 +246,7 @@ NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw,
 /* NtGdiDvpGetVideoSignalStatus                                         */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort,
                              PDD_GETVPORTSIGNALDATA puGetVPortSignalData)
 {
@@ -268,7 +268,7 @@ NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort,
 /* NtGdiDvpUpdateVideoPort                                              */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpUpdateVideoPort(HANDLE hVideoPort,
                         HANDLE* phSurfaceVideo,
                         HANDLE* phSurfaceVbi,
@@ -292,7 +292,7 @@ NtGdiDvpUpdateVideoPort(HANDLE hVideoPort,
 /* NtGdiDvpWaitForVideoPortSync                                         */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort,
                              PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData)
 {
@@ -313,7 +313,7 @@ NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort,
 /* NtGdiDvpAcquireNotification                                          */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpAcquireNotification(HANDLE hVideoPort,
                             HANDLE* hEvent,
                             LPDDVIDEOPORTNOTIFY pNotify)
@@ -335,7 +335,7 @@ NtGdiDvpAcquireNotification(HANDLE hVideoPort,
 /* NtGdiDvpReleaseNotification                                          */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpReleaseNotification(HANDLE hVideoPort,
                             HANDLE hEvent)
 {
@@ -357,7 +357,7 @@ NtGdiDvpReleaseNotification(HANDLE hVideoPort,
 /* NtGdiDvpGetVideoPortField                                            */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDvpGetVideoPortField(HANDLE hVideoPort,
                           PDD_GETVPORTFIELDDATA puGetVPortFieldData)
 {

reactos/subsystems/win32/win32k/ntddraw/dxeng.c

@@ -101,7 +101,7 @@ DxEngDispUniq()
 *
 *--*/
 BOOL
-STDCALL
+APIENTRY
 DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp)
 {
     DPRINT1("ReactX Calling : DxEngGetDeviceGammaRamp\n");
@@ -126,7 +126,7 @@ DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp)
 *
 *--*/
 PDC
-STDCALL
+APIENTRY
 DxEngLockDC(HDC hDC)
 {
     DPRINT1("ReactX Calling : DxEngLockDC\n");
@@ -151,7 +151,7 @@ DxEngLockDC(HDC hDC)
 *
 *--*/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngUnlockDC(PDC pDC)
 {
     DPRINT1("ReactX Calling : DxEngUnlockDC\n");
@@ -175,7 +175,7 @@ DxEngUnlockDC(PDC pDC)
 *SystemResourcesList
 *--*/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngLockShareSem()
 {
     DPRINT1("ReactX Calling : DxEngLockShareSem\n");
@@ -198,7 +198,7 @@ DxEngLockShareSem()
 *
 *--*/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngUnlockShareSem()
 {
     DPRINT1("ReactX Calling : DxEngUnlockShareSem\n");
@@ -229,7 +229,7 @@ DxEngUnlockShareSem()
 *
 *--*/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test)
 {
     DPRINT1("ReactX Calling : DxEngSetDeviceGammaRamp\n");
@@ -276,7 +276,7 @@ DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test)
 *
 *--*/
 DWORD_PTR
-STDCALL
+APIENTRY
 DxEngGetHdevData(HDEV hDev,
                  DXEGSHDEVDATA Type)
 {
@@ -405,7 +405,7 @@ DxEngGetHdevData(HDEV hDev,
 *
 *--*/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngSetHdevData(HDEV hDev,
                  DXEGSHDEVDATA Type,
                  DWORD_PTR Data)
@@ -448,7 +448,7 @@ DxEngSetHdevData(HDEV hDev,
 *
 *--*/
 DWORD_PTR
-STDCALL
+APIENTRY
 DxEngGetDCState(HDC hDC,
                 DWORD type)
 {
@@ -524,7 +524,7 @@ DxEngIncDispUniq()
 *
 *--*/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngLockHdev(HDEV hDev)
 {
     PGDIDEVICE pPDev = (PGDIDEVICE)hDev;
@@ -561,7 +561,7 @@ DxEngLockHdev(HDEV hDev)
 *
 *--*/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngUnlockHdev(HDEV hDev)
 {
     PGDIDEVICE pPDev = (PGDIDEVICE)hDev;
@@ -582,7 +582,7 @@ DxEngUnlockHdev(HDEV hDev)
 /* DxEngReferenceHdev                                                   */
 /************************************************************************/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngReferenceHdev(HDEV hDev)
 {
     IntGdiReferencePdev((PGDIDEVICE) hDev);;
@@ -596,7 +596,7 @@ DxEngReferenceHdev(HDEV hDev)
 
 /* Notes : Check see if termal server got a connections or not */
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngNUIsTermSrv()
 {
     /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */
@@ -639,7 +639,7 @@ DxEngVisRgnUniq()
 /************************************************************************/
 /* Enumerate all drivers in win32k */
 HDEV *
-STDCALL
+APIENTRY
 DxEngEnumerateHdev(HDEV *hdev)
 {
     /* FIXME Enumerate all drivers in win32k */
@@ -651,7 +651,7 @@ DxEngEnumerateHdev(HDEV *hdev)
 /* DxEngCreateMemoryDC                                                  */
 /************************************************************************/
 HDC
-STDCALL
+APIENTRY
 DxEngCreateMemoryDC(HDEV hDev)
 {
     return IntGdiCreateDisplayDC(hDev, DC_TYPE_MEMORY, FALSE);
@@ -660,7 +660,7 @@ DxEngCreateMemoryDC(HDEV hDev)
 /************************************************************************/
 /* DxEngScreenAccessCheck                                               */
 /************************************************************************/
-DWORD STDCALL DxEngScreenAccessCheck()
+DWORD APIENTRY DxEngScreenAccessCheck()
 {
     UNIMPLEMENTED;
 
@@ -672,7 +672,7 @@ DWORD STDCALL DxEngScreenAccessCheck()
 /* DxEngIsHdevLockedByCurrentThread                                     */
 /************************************************************************/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngIsHdevLockedByCurrentThread(HDEV hDev)
 {   // base on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call.
     PERESOURCE pSem = ((PGDIDEVICE)hDev)->hsemDevLock;
@@ -684,7 +684,7 @@ DxEngIsHdevLockedByCurrentThread(HDEV hDev)
 /* DxEngUnreferenceHdev                                                 */
 /************************************************************************/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngUnreferenceHdev(HDEV hDev)
 {
     IntGdiUnreferencePdev((PGDIDEVICE) hDev, 0);
@@ -695,7 +695,7 @@ DxEngUnreferenceHdev(HDEV hDev)
 /* DxEngGetDesktopDC                                                    */
 /************************************************************************/
 HDC
-STDCALL
+APIENTRY
 DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd)
 {
     PWINDOW_OBJECT DesktopObject = 0;
@@ -718,7 +718,7 @@ DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd)
 /* DxEngDeleteDC                                                        */
 /************************************************************************/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngDeleteDC(HDC hdc, BOOL Force)
 {
    return IntGdiDeleteDC(hdc, Force);
@@ -728,7 +728,7 @@ DxEngDeleteDC(HDC hdc, BOOL Force)
 /* DxEngCleanDC                                                         */
 /************************************************************************/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngCleanDC(HDC hdc)
 {
     return IntGdiCleanDC(hdc);
@@ -737,7 +737,7 @@ DxEngCleanDC(HDC hdc)
 /************************************************************************/
 /* DxEngSetDCOwner                                                      */
 /************************************************************************/
-BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask)
+BOOL APIENTRY DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask)
 {
     DPRINT1("ReactX Calling : DxEngSetDCOwner \n");
 
@@ -748,7 +748,7 @@ BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask)
 /* DxEngSetDCState                                                      */
 /************************************************************************/
 BOOLEAN
-STDCALL
+APIENTRY
 DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set)
 {
    BOOLEAN Ret = FALSE;
@@ -773,7 +773,7 @@ DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set)
 /************************************************************************/
 /* DxEngSelectBitmap                                                    */
 /************************************************************************/
-DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2)
+DWORD APIENTRY DxEngSelectBitmap(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -782,7 +782,7 @@ DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2)
 /************************************************************************/
 /* DxEngSetBitmapOwner                                                  */
 /************************************************************************/
-DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2)
+DWORD APIENTRY DxEngSetBitmapOwner(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -791,7 +791,7 @@ DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2)
 /************************************************************************/
 /* DxEngDeleteSurface                                                   */
 /************************************************************************/
-DWORD STDCALL DxEngDeleteSurface(DWORD x1)
+DWORD APIENTRY DxEngDeleteSurface(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -800,7 +800,7 @@ DWORD STDCALL DxEngDeleteSurface(DWORD x1)
 /************************************************************************/
 /* DxEngGetSurfaceData                                                  */
 /************************************************************************/
-DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2)
+DWORD APIENTRY DxEngGetSurfaceData(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -809,7 +809,7 @@ DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2)
 /************************************************************************/
 /* DxEngAltLockSurface                                                  */
 /************************************************************************/
-DWORD STDCALL DxEngAltLockSurface(DWORD x1)
+DWORD APIENTRY DxEngAltLockSurface(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -818,7 +818,7 @@ DWORD STDCALL DxEngAltLockSurface(DWORD x1)
 /************************************************************************/
 /* DxEngUploadPaletteEntryToSurface                                     */
 /************************************************************************/
-DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4)
+DWORD APIENTRY DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -827,7 +827,7 @@ DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWOR
 /************************************************************************/
 /* DxEngMarkSurfaceAsDirectDraw                                         */
 /************************************************************************/
-DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2)
+DWORD APIENTRY DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -836,7 +836,7 @@ DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2)
 /************************************************************************/
 /* DxEngSelectPaletteToSurface                                          */
 /************************************************************************/
-DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2)
+DWORD APIENTRY DxEngSelectPaletteToSurface(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -845,7 +845,7 @@ DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2)
 /************************************************************************/
 /* DxEngSyncPaletteTableWithDevice                                      */
 /************************************************************************/
-DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2)
+DWORD APIENTRY DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -854,7 +854,7 @@ DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2)
 /************************************************************************/
 /* DxEngSetPaletteState                                                 */
 /************************************************************************/
-DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3)
+DWORD APIENTRY DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -864,7 +864,7 @@ DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3)
 /* DxEngGetRedirectionBitmap                                            */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 DxEngGetRedirectionBitmap(DWORD x1)
 {
     return FALSE; // Normal return.
@@ -873,7 +873,7 @@ DxEngGetRedirectionBitmap(DWORD x1)
 /************************************************************************/
 /* DxEngLoadImage                                                       */
 /************************************************************************/
-DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2)
+DWORD APIENTRY DxEngLoadImage(DWORD x1,DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -882,7 +882,7 @@ DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2)
 /************************************************************************/
 /* DxEngSpTearDownSprites                                               */
 /************************************************************************/
-DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
+DWORD APIENTRY DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -891,7 +891,7 @@ DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
 /************************************************************************/
 /* DxEngSpUnTearDownSprites                                             */
 /************************************************************************/
-DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
+DWORD APIENTRY DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -900,7 +900,7 @@ DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
 /************************************************************************/
 /* DxEngSpSpritesVisible                                                */
 /************************************************************************/
-DWORD STDCALL DxEngSpSpritesVisible(DWORD x1)
+DWORD APIENTRY DxEngSpSpritesVisible(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;

reactos/subsystems/win32/win32k/ntddraw/eng.c

@@ -18,7 +18,7 @@
 /* HeapVidMemAllocAligned                                               */
 /************************************************************************/
 FLATPTR
-STDCALL
+APIENTRY
 HeapVidMemAllocAligned(LPVIDMEM lpVidMem,
                        DWORD dwWidth,
                        DWORD dwHeight,
@@ -41,7 +41,7 @@ HeapVidMemAllocAligned(LPVIDMEM lpVidMem,
 /* VidMemFree                                                           */
 /************************************************************************/
 VOID
-STDCALL
+APIENTRY
 VidMemFree(LPVMEMHEAP pvmh,
            FLATPTR ptr)
 {
@@ -62,7 +62,7 @@ VidMemFree(LPVMEMHEAP pvmh,
 /* EngAllocPrivateUserMem                                               */
 /************************************************************************/
 PVOID
-STDCALL
+APIENTRY
 EngAllocPrivateUserMem(PDD_SURFACE_LOCAL  psl,
                        SIZE_T  cj,
                        ULONG  tag)
@@ -83,7 +83,7 @@ EngAllocPrivateUserMem(PDD_SURFACE_LOCAL  psl,
 /* EngFreePrivateUserMem                                                */
 /************************************************************************/
 VOID
-STDCALL
+APIENTRY
 EngFreePrivateUserMem(PDD_SURFACE_LOCAL  psl,
                       PVOID  pv)
 {
@@ -125,7 +125,7 @@ EngFreePrivateUserMem(PDD_SURFACE_LOCAL  psl,
 *
 *--*/
 DWORD
-STDCALL
+APIENTRY
 EngDxIoctl(ULONG ulIoctl,
            PVOID pBuffer,
            ULONG ulBufferSize)
@@ -160,7 +160,7 @@ EngDxIoctl(ULONG ulIoctl,
 *
 *--*/
 PDD_SURFACE_LOCAL
-STDCALL
+APIENTRY
 EngLockDirectDrawSurface(HANDLE hSurface)
 {
     PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = (PGD_ENGLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdLockDirectDrawSurface].pfn;
@@ -194,7 +194,7 @@ EngLockDirectDrawSurface(HANDLE hSurface)
 *
 *--*/
 BOOL
-STDCALL
+APIENTRY
 EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface)
 {
     PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = (PGD_ENGUNLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnlockDirectDrawSurface].pfn;

reactos/subsystems/win32/win32k/ntddraw/mocomp.c

@@ -16,7 +16,7 @@
 /* NtGdiDdBeginMoCompFrame                                              */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdBeginMoCompFrame(HANDLE hMoComp,
                         PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData)
 {
@@ -36,7 +36,7 @@ NtGdiDdBeginMoCompFrame(HANDLE hMoComp,
 /* NtGdiDdCreateMoComp                                                  */
 /************************************************************************/
 HANDLE
-STDCALL
+APIENTRY
 NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData)
 {
     PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp = (PGD_DXDDCREATEMOCOMP)gpDxFuncs[DXG_INDEX_DxDdCreateMoComp].pfn;
@@ -55,7 +55,7 @@ NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData)
 /* NtGdiDdDestroyMoComp                                                 */
 /************************************************************************/
 DWORD 
-STDCALL
+APIENTRY
 NtGdiDdDestroyMoComp(HANDLE hMoComp,
                      PDD_DESTROYMOCOMPDATA puBeginFrameData)
 {
@@ -75,7 +75,7 @@ NtGdiDdDestroyMoComp(HANDLE hMoComp,
 /* NtGdiDdEndMoCompFrame                                                */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdEndMoCompFrame(HANDLE hMoComp,
                       PDD_ENDMOCOMPFRAMEDATA puEndFrameData)
 {
@@ -95,7 +95,7 @@ NtGdiDdEndMoCompFrame(HANDLE hMoComp,
 /* NtGdiDdGetInternalMoCompInfo                                         */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw,
                              PDD_GETINTERNALMOCOMPDATA puGetInternalData)
 {
@@ -116,7 +116,7 @@ NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw,
 /* NtGdiDdGetMoCompBuffInfo                                             */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw,
                          PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData)
 {
@@ -136,7 +136,7 @@ NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw,
 /* NtGdiDdGetMoCompFormats                                              */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetMoCompFormats(HANDLE hDirectDraw,
                         PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData)
 {
@@ -157,7 +157,7 @@ NtGdiDdGetMoCompFormats(HANDLE hDirectDraw,
 /* NtGdiDdGetMoCompGuids                                                */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdGetMoCompGuids(HANDLE hDirectDraw,
                       PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData)
 {
@@ -179,7 +179,7 @@ NtGdiDdGetMoCompGuids(HANDLE hDirectDraw,
 /* NtGdiDdQueryMoCompStatus                                             */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdQueryMoCompStatus(HANDLE hMoComp,
                          PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData)
 {
@@ -200,7 +200,7 @@ NtGdiDdQueryMoCompStatus(HANDLE hMoComp,
 /* NtGdiDdRenderMoComp                                                  */
 /************************************************************************/
 DWORD
-STDCALL
+APIENTRY
 NtGdiDdRenderMoComp(HANDLE hMoComp,
                     PDD_RENDERMOCOMPDATA puRenderMoCompData)
 {

reactos/subsystems/win32/win32k/ntuser/accelerator.c

@@ -286,7 +286,7 @@ found:
 
 
 int
-STDCALL
+APIENTRY
 NtUserCopyAcceleratorTable(
    HACCEL hAccel,
    LPACCEL Entries,
@@ -329,7 +329,7 @@ CLEANUP:
 }
 
 HACCEL
-STDCALL
+APIENTRY
 NtUserCreateAcceleratorTable(
    LPACCEL Entries,
    SIZE_T EntriesCount)
@@ -393,7 +393,7 @@ CLEANUP:
 
 
 BOOLEAN
-STDCALL
+APIENTRY
 NtUserDestroyAcceleratorTable(
    HACCEL hAccel)
 {
@@ -431,7 +431,7 @@ CLEANUP:
 
 
 int
-STDCALL
+APIENTRY
 NtUserTranslateAccelerator(
    HWND hWnd,
    HACCEL hAccel,

reactos/subsystems/win32/win32k/ntuser/callback.c

@@ -136,7 +136,7 @@ IntRestoreTebWndCallback (HWND hWnd, PVOID pWnd)
 
 /* FUNCTIONS *****************************************************************/
 
-VOID STDCALL
+VOID APIENTRY
 co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
                               HWND hWnd,
                               UINT Msg,
@@ -175,7 +175,7 @@ co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
    return;
 }
 
-LRESULT STDCALL
+LRESULT APIENTRY
 co_IntCallWindowProc(WNDPROC Proc,
                      BOOLEAN IsAnsiProc,
                      HWND Wnd,
@@ -265,7 +265,7 @@ co_IntCallWindowProc(WNDPROC Proc,
    return Result;
 }
 
-HMENU STDCALL
+HMENU APIENTRY
 co_IntLoadSysMenuTemplate()
 {
    LRESULT Result;
@@ -296,7 +296,7 @@ co_IntLoadSysMenuTemplate()
    return (HMENU)Result;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 co_IntLoadDefaultCursors(VOID)
 {
    LRESULT Result;
@@ -328,7 +328,7 @@ co_IntLoadDefaultCursors(VOID)
    return TRUE;
 }
 
-LRESULT STDCALL
+LRESULT APIENTRY
 co_IntCallHookProc(INT HookId,
                    INT Code,
                    WPARAM wParam,
@@ -518,7 +518,7 @@ co_IntCallHookProc(INT HookId,
 }
 
 LRESULT
-STDCALL
+APIENTRY
 co_IntCallEventProc(HWINEVENTHOOK hook,
                            DWORD event,
                              HWND hWnd,

reactos/subsystems/win32/win32k/ntuser/caret.c

@@ -312,7 +312,7 @@ BOOL FASTCALL co_UserShowCaret(PWINDOW_OBJECT Window OPTIONAL)
 /* SYSCALLS *****************************************************************/
 
 BOOL
-STDCALL
+APIENTRY
 NtUserCreateCaret(
    HWND hWnd,
    HBITMAP hBitmap,
@@ -371,7 +371,7 @@ CLEANUP:
 }
 
 UINT
-STDCALL
+APIENTRY
 NtUserGetCaretBlinkTime(VOID)
 {
    DECLARE_RETURN(UINT);
@@ -388,7 +388,7 @@ CLEANUP:
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserGetCaretPos(
    LPPOINT lpPoint)
 {
@@ -419,7 +419,7 @@ CLEANUP:
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserShowCaret(HWND hWnd OPTIONAL)
 {
    PWINDOW_OBJECT Window = NULL;
@@ -450,7 +450,7 @@ CLEANUP:
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserHideCaret(HWND hWnd OPTIONAL)
 {
    PWINDOW_OBJECT Window = NULL;

reactos/subsystems/win32/win32k/ntuser/class.c

@@ -1878,7 +1878,7 @@ UserRegisterSystemClasses(IN ULONG Count,
 /* SYSCALLS *****************************************************************/
 
 
-RTL_ATOM NTAPI
+RTL_ATOM APIENTRY
 NtUserRegisterClassEx(IN CONST WNDCLASSEXW* lpwcx,
                       IN PUNICODE_STRING ClassName,
                       IN PUNICODE_STRING MenuName,
@@ -1988,7 +1988,7 @@ InvalidParameter:
 
 
 RTL_ATOM
-NTAPI
+APIENTRY
 NtUserRegisterClassExWOW(
     WNDCLASSEXW* lpwcx,
     PUNICODE_STRING ClassName,
@@ -2093,7 +2093,7 @@ InvalidParameter:
 }
 
 
-ULONG_PTR NTAPI
+ULONG_PTR APIENTRY
 NtUserGetClassLong(IN HWND hWnd,
                    IN INT Offset,
                    IN BOOL Ansi)
@@ -2130,7 +2130,7 @@ NtUserGetClassLong(IN HWND hWnd,
 
 
 
-ULONG_PTR STDCALL
+ULONG_PTR APIENTRY
 NtUserSetClassLong(HWND hWnd,
                    INT Offset,
                    ULONG_PTR dwNewLong,
@@ -2210,7 +2210,7 @@ Cleanup:
 }
 
 WORD
-STDCALL
+APIENTRY
 NtUserSetClassWord(
   HWND hWnd,
   INT nIndex,
@@ -2219,7 +2219,7 @@ NtUserSetClassWord(
    return(0);
 }
 
-BOOL NTAPI
+BOOL APIENTRY
 NtUserUnregisterClass(IN PUNICODE_STRING ClassNameOrAtom,
                       IN HINSTANCE hInstance,
                       OUT PCLSMENUNAME pClassMenuName)
@@ -2270,7 +2270,7 @@ InvalidParameter:
 }
 
 /* NOTE: for system classes hInstance is not NULL here, but User32Instance */
-BOOL STDCALL
+BOOL APIENTRY
 NtUserGetClassInfo(
    HINSTANCE hInstance,
    PUNICODE_STRING ClassName,
@@ -2382,7 +2382,7 @@ Cleanup:
 
 
 
-INT NTAPI
+INT APIENTRY
 NtUserGetClassName (IN HWND hWnd,
                     OUT PUNICODE_STRING ClassName,
                     IN BOOL Ansi)
@@ -2424,7 +2424,7 @@ NtUserGetClassName (IN HWND hWnd,
     return Ret;
 }
 
-DWORD STDCALL
+DWORD APIENTRY
 NtUserGetWOWClass(DWORD Unknown0,
                   DWORD Unknown1)
 {

reactos/subsystems/win32/win32k/ntuser/clipboard.c

@@ -370,7 +370,7 @@ IntClipboardFreeWindow(PWINDOW_OBJECT window)
     }
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserOpenClipboard(HWND hWnd, DWORD Unknown1)
 {
 
@@ -437,7 +437,7 @@ NtUserOpenClipboard(HWND hWnd, DWORD Unknown1)
     return ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserCloseClipboard(VOID)
 {
     BOOL ret = FALSE;
@@ -473,7 +473,7 @@ NtUserCloseClipboard(VOID)
     return ret;
 }
 
-HWND STDCALL
+HWND APIENTRY
 NtUserGetOpenClipboardWindow(VOID)
 {
     HWND ret = NULL;
@@ -490,7 +490,7 @@ NtUserGetOpenClipboardWindow(VOID)
     return ret;
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext)
 {
     BOOL ret = FALSE;
@@ -528,7 +528,7 @@ NtUserChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext)
     return ret;
 }
 
-DWORD STDCALL
+DWORD APIENTRY
 NtUserCountClipboardFormats(VOID)
 {
     DWORD ret = 0;
@@ -541,7 +541,7 @@ NtUserCountClipboardFormats(VOID)
     return ret;
 }
 
-DWORD STDCALL
+DWORD APIENTRY
 NtUserEmptyClipboard(VOID)
 {
     BOOL ret = FALSE;
@@ -578,7 +578,7 @@ NtUserEmptyClipboard(VOID)
     return ret;
 }
 
-HANDLE STDCALL
+HANDLE APIENTRY
 NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
 {
     HANDLE ret = NULL;
@@ -695,7 +695,7 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
     return ret;
 }
 
-INT STDCALL
+INT APIENTRY
 NtUserGetClipboardFormatName(UINT format, PUNICODE_STRING FormatName,
                              INT cchMaxCount)
 {
@@ -742,7 +742,7 @@ NtUserGetClipboardFormatName(UINT format, PUNICODE_STRING FormatName,
     return ret;
 }
 
-HWND STDCALL
+HWND APIENTRY
 NtUserGetClipboardOwner(VOID)
 {
     HWND ret = NULL;
@@ -759,7 +759,7 @@ NtUserGetClipboardOwner(VOID)
     return ret;
 }
 
-HWND STDCALL
+HWND APIENTRY
 NtUserGetClipboardViewer(VOID)
 {
     HWND ret = NULL;
@@ -776,7 +776,7 @@ NtUserGetClipboardViewer(VOID)
     return ret;
 }
 
-INT STDCALL
+INT APIENTRY
 NtUserGetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats)
 {
     INT i;
@@ -822,7 +822,7 @@ NtUserGetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats)
 
 }
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserIsClipboardFormatAvailable(UINT format)
 {
     BOOL ret = FALSE;
@@ -838,7 +838,7 @@ NtUserIsClipboardFormatAvailable(UINT format)
 
 
 
-HANDLE STDCALL
+HANDLE APIENTRY
 NtUserSetClipboardData(UINT uFormat, HANDLE hMem, DWORD size)
 {
     HANDLE hCBData = NULL;
@@ -1030,7 +1030,7 @@ exit_setCB:
     return hMem;
 }
 
-HWND STDCALL
+HWND APIENTRY
 NtUserSetClipboardViewer(HWND hWndNewViewer)
 {
     HWND ret = NULL;
@@ -1062,7 +1062,7 @@ NtUserSetClipboardViewer(HWND hWndNewViewer)
     return ret;
 }
 
-UINT STDCALL
+UINT APIENTRY
 IntEnumClipboardFormats(UINT uFormat)
 {
     UINT ret = 0;
@@ -1135,7 +1135,7 @@ IntIncrementSequenceNumber(VOID)
     WinStaObj->Clipboard->ClipboardSequenceNumber++;
 }
 
-DWORD STDCALL
+DWORD APIENTRY
 NtUserGetClipboardSequenceNumber(VOID)
 {
     //windowstation sequence number
@@ -1171,7 +1171,7 @@ NtUserGetClipboardSequenceNumber(VOID)
 
 /**************** VISTA FUNCTIONS******************/
 
-BOOL STDCALL NtUserAddClipboardFormatListener(
+BOOL APIENTRY NtUserAddClipboardFormatListener(
     HWND hwnd
 )
 {
@@ -1179,7 +1179,7 @@ BOOL STDCALL NtUserAddClipboardFormatListener(
     return FALSE;
 }
 
-BOOL STDCALL NtUserRemoveClipboardFormatListener(
+BOOL APIENTRY NtUserRemoveClipboardFormatListener(
     HWND hwnd
 )
 {
@@ -1187,7 +1187,7 @@ BOOL STDCALL NtUserRemoveClipboardFormatListener(
     return FALSE;
 }
 
-BOOL STDCALL NtUserGetUpdatedClipboardFormats(
+BOOL APIENTRY NtUserGetUpdatedClipboardFormats(
     PUINT lpuiFormats,
     UINT cFormats,
     PUINT pcFormatsOut

reactos/subsystems/win32/win32k/ntuser/csr.c

@@ -88,7 +88,7 @@ co_CsrNotify(PCSR_API_MESSAGE Request)
 
 
 NTSTATUS
-STDCALL
+APIENTRY
 CsrInsertObject(HANDLE ObjectHandle,
                 ACCESS_MASK DesiredAccess,
                 PHANDLE Handle)

reactos/subsystems/win32/win32k/ntuser/cursoricon.c

@@ -550,7 +550,7 @@ IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process)
  * @implemented
  */
 HANDLE
-STDCALL
+APIENTRY
 NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect)
 {
    PCURICON_OBJECT CurIcon;
@@ -629,7 +629,7 @@ CLEANUP:
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserGetIconInfo(
    HANDLE hCurIcon,
    PICONINFO IconInfo,
@@ -722,7 +722,7 @@ CLEANUP:
  * @implemented
  */
 BOOL
-NTAPI
+APIENTRY
 NtUserGetIconSize(
     HANDLE hCurIcon,
     UINT istepIfAniCur,
@@ -772,7 +772,7 @@ cleanup:
  * @unimplemented
  */
 DWORD
-STDCALL
+APIENTRY
 NtUserGetCursorFrameInfo(
    DWORD Unknown0,
    DWORD Unknown1,
@@ -789,7 +789,7 @@ NtUserGetCursorFrameInfo(
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserGetCursorInfo(
    PCURSORINFO pci)
 {
@@ -863,7 +863,7 @@ CLEANUP:
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserClipCursor(
    RECT *UnsafeRect)
 {
@@ -936,7 +936,7 @@ CLEANUP:
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserDestroyCursor(
    HANDLE hCurIcon,
    DWORD Unknown)
@@ -978,7 +978,7 @@ CLEANUP:
  * @implemented
  */
 HICON
-STDCALL
+APIENTRY
 NtUserFindExistingCursorIcon(
    HMODULE hModule,
    HRSRC hRsrc,
@@ -1024,7 +1024,7 @@ CLEANUP:
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserGetClipCursor(
    RECT *lpRect)
 {
@@ -1086,7 +1086,7 @@ CLEANUP:
  * @implemented
  */
 HCURSOR
-STDCALL
+APIENTRY
 NtUserSetCursor(
    HCURSOR hCursor)
 {
@@ -1138,7 +1138,7 @@ CLEANUP:
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserSetCursorContents(
    HANDLE hCurIcon,
    PICONINFO UnsafeIconInfo)
@@ -1231,7 +1231,7 @@ CLEANUP:
  */
 #if 0
 BOOL
-NTAPI
+APIENTRY
 NtUserSetCursorIconData(
   HANDLE Handle,
   HMODULE hModule,
@@ -1318,7 +1318,7 @@ CLEANUP:
 }
 #else
 BOOL
-STDCALL
+APIENTRY
 NtUserSetCursorIconData(
    HANDLE hCurIcon,
    PBOOL fIcon,
@@ -1405,7 +1405,7 @@ CLEANUP:
  * @unimplemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserSetSystemCursor(
    HCURSOR hcur,
    DWORD id)
@@ -1771,7 +1771,7 @@ cleanup:
  * @implemented
  */
 BOOL
-STDCALL
+APIENTRY
 NtUserDrawIconEx(
    HDC hdc,
    int xLeft,
@@ -1817,7 +1817,7 @@ NtUserDrawIconEx(
 /* Called from NtUserCallOneParam with Routine ONEPARAM_ROUTINE_SHOWCURSOR
  * User32 macro NtUserShowCursor */
 int
-NTAPI
+APIENTRY
 UserShowCursor(BOOL bShow)
 {
     PTHREADINFO pti = PsGetCurrentThreadWin32Thread();

reactos/subsystems/win32/win32k/ntuser/desktop.c

@@ -77,7 +77,7 @@ GENERIC_MAPPING IntDesktopMapping =
 /* OBJECT CALLBACKS **********************************************************/
 
 NTSTATUS
-NTAPI
+APIENTRY
 IntDesktopObjectParse(IN PVOID ParseObject,
                       IN PVOID ObjectType,
                       IN OUT PACCESS_STATE AccessState,
@@ -174,7 +174,7 @@ IntDesktopObjectParse(IN PVOID ParseObject,
     return STATUS_SUCCESS;
 }
 
-VOID STDCALL
+VOID APIENTRY
 IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters)
 {
    PDESKTOP Desktop = (PDESKTOP)Parameters->Object;
@@ -876,7 +876,7 @@ IntFreeDesktopHeap(IN OUT PDESKTOP Desktop)
  *    @implemented
  */
 
-HDESK STDCALL
+HDESK APIENTRY
 NtUserCreateDesktop(
    PUNICODE_STRING lpszDesktopName,
    DWORD dwFlags,
@@ -1088,7 +1088,7 @@ CLEANUP:
  *    @implemented
  */
 
-HDESK STDCALL
+HDESK APIENTRY
 NtUserOpenDesktop(
    PUNICODE_STRING lpszDesktopName,
    DWORD dwFlags,
@@ -1214,7 +1214,7 @@ CLEANUP:
  *    @implemented
  */
 
-HDESK STDCALL
+HDESK APIENTRY
 NtUserOpenInputDesktop(
    DWORD dwFlags,
    BOOL fInherit,
@@ -1294,7 +1294,7 @@ CLEANUP:
  *    @implemented
  */
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserCloseDesktop(HDESK hDesktop)
 {
    PDESKTOP Object;
@@ -1355,7 +1355,7 @@ CLEANUP:
  *    @implemented
  */
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserPaintDesktop(HDC hDC)
 {
    RECT Rect;
@@ -1569,7 +1569,7 @@ CLEANUP:
  *    @unimplemented
  */
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserSwitchDesktop(HDESK hDesktop)
 {
    PDESKTOP DesktopObject;
@@ -1635,7 +1635,7 @@ CLEANUP:
  *    @unimplemented
  */
 
-DWORD STDCALL
+DWORD APIENTRY
 NtUserResolveDesktopForWOW(DWORD Unknown0)
 {
    UNIMPLEMENTED
@@ -1649,7 +1649,7 @@ NtUserResolveDesktopForWOW(DWORD Unknown0)
  *    @implemented
  */
 
-HDESK STDCALL
+HDESK APIENTRY
 NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1)
 {
    NTSTATUS Status;
@@ -1959,7 +1959,7 @@ IntSetThreadDesktop(IN PDESKTOP DesktopObject,
  *    @implemented
  */
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserSetThreadDesktop(HDESK hDesktop)
 {
    PDESKTOP DesktopObject;

reactos/subsystems/win32/win32k/ntuser/display.c

@@ -21,7 +21,7 @@
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 NTSTATUS
-NTAPI
+APIENTRY
 NtUserEnumDisplaySettings(
    PUNICODE_STRING pusDeviceName,
    DWORD iModeNum,
@@ -113,7 +113,7 @@ NtUserEnumDisplaySettings(
 
 
 LONG
-NTAPI
+APIENTRY
 NtUserChangeDisplaySettings(
    PUNICODE_STRING lpszDeviceName,
    LPDEVMODEW lpDevMode,

reactos/subsystems/win32/win32k/ntuser/event.c

@@ -213,7 +213,7 @@ IntNotifyWinEvent(
 }            
 
 VOID
-STDCALL
+APIENTRY
 NtUserNotifyWinEvent(
    DWORD Event,
    HWND  hWnd,
@@ -240,7 +240,7 @@ NtUserNotifyWinEvent(
 }
 
 HWINEVENTHOOK
-STDCALL
+APIENTRY
 NtUserSetWinEventHook(
    UINT eventMin,
    UINT eventMax,
@@ -380,7 +380,7 @@ SetEventExit:
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserUnhookWinEvent(
    HWINEVENTHOOK hWinEventHook)
 {

reactos/subsystems/win32/win32k/ntuser/focus.c

@@ -413,7 +413,7 @@ UserGetForegroundWindow(VOID)
 /*
  * @implemented
  */
-HWND STDCALL
+HWND APIENTRY
 NtUserGetForegroundWindow(VOID)
 {
    DECLARE_RETURN(HWND);
@@ -441,7 +441,7 @@ HWND FASTCALL UserGetActiveWindow()
 }
 
 
-HWND STDCALL
+HWND APIENTRY
 NtUserSetActiveWindow(HWND hWnd)
 {
    USER_REFERENCE_ENTRY Ref;
@@ -491,7 +491,7 @@ CLEANUP:
 /*
  * @implemented
  */
-HWND STDCALL
+HWND APIENTRY
 IntGetCapture(VOID)
 {
    PTHREADINFO pti;
@@ -512,7 +512,7 @@ CLEANUP:
 /*
  * @implemented
  */
-HWND STDCALL
+HWND APIENTRY
 NtUserSetCapture(HWND hWnd)
 {
    PTHREADINFO pti;
@@ -609,7 +609,7 @@ HWND FASTCALL co_UserSetFocus(PWINDOW_OBJECT Window OPTIONAL)
 /*
  * @implemented
  */
-HWND STDCALL
+HWND APIENTRY
 NtUserSetFocus(HWND hWnd)
 {
    PWINDOW_OBJECT Window;

reactos/subsystems/win32/win32k/ntuser/hook.c

@@ -878,7 +878,7 @@ UserCallNextHookEx(
 }
 
 LRESULT
-STDCALL
+APIENTRY
 NtUserCallNextHookEx(
    int Code,
    WPARAM wParam,
@@ -940,7 +940,7 @@ CLEANUP:
 }
 
 HHOOK
-STDCALL
+APIENTRY
 NtUserSetWindowsHookAW(
    int idHook, 
    HOOKPROC lpfn,
@@ -952,7 +952,7 @@ NtUserSetWindowsHookAW(
 }
 
 HHOOK
-STDCALL
+APIENTRY
 NtUserSetWindowsHookEx(
    HINSTANCE Mod,
    PUNICODE_STRING UnsafeModuleName,
@@ -1168,7 +1168,7 @@ CLEANUP:
 
 
 BOOL
-STDCALL
+APIENTRY
 NtUserUnhookWindowsHookEx(
    HHOOK Hook)
 {

reactos/subsystems/win32/win32k/ntuser/hotkey.c

@@ -158,7 +158,7 @@ IsHotKey (UINT fsModifiers, UINT vk)
 /* SYSCALLS *****************************************************************/
 
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserRegisterHotKey(HWND hWnd,
                      int id,
                      UINT fsModifiers,
@@ -214,7 +214,7 @@ CLEANUP:
 }
 
 
-BOOL STDCALL
+BOOL APIENTRY
 NtUserUnregisterHotKey(HWND hWnd, int id)
 {
    PHOT_KEY_ITEM HotKeyItem;

reactos/subsystems/win32/win32k/ntuser/input.c

@@ -81,7 +81,7 @@ DWORD IntLastInputTick(BOOL LastInputTickSetGet)
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserGetLastInputInfo(PLASTINPUTINFO plii)
 {
     BOOL ret = TRUE;
@@ -201,7 +201,7 @@ ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount)
 
 
 
-VOID STDCALL
+VOID APIENTRY
 MouseThreadMain(PVOID StartContext)
 {
    UNICODE_STRING MouseDeviceName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0");
@@ -290,7 +290,7 @@ MouseThreadMain(PVOID StartContext)
 /* Returns a value that indicates if the key is a modifier key, and
  * which one.
  */
-static UINT STDCALL
+static UINT APIENTRY
 IntKeyboardGetModifiers(KEYBOARD_INPUT_DATA *InputData)
 {
    if (InputData->Flags & KEY_E1)
@@ -337,7 +337,7 @@ IntKeyboardGetModifiers(KEYBOARD_INPUT_DATA *InputData)
 /* Asks the keyboard driver to send a small table that shows which
  * lights should connect with which scancodes
  */
-static NTSTATUS STDCALL
+static NTSTATUS APIENTRY
 IntKeyboardGetIndicatorTrans(HANDLE KeyboardDeviceHandle,
                              PKEYBOARD_INDICATOR_TRANSLATION *IndicatorTrans)
 {
@@ -390,7 +390,7 @@ IntKeyboardGetIndicatorTrans(HANDLE KeyboardDeviceHandle,
 
 /* Sends the keyboard commands to turn on/off the lights.
  */
-static NTSTATUS STDCALL
+static NTSTATUS APIENTRY
 IntKeyboardUpdateLeds(HANDLE KeyboardDeviceHandle,
                       PKEYBOARD_INPUT_DATA KeyInput,
                       PKEYBOARD_INDICATOR_TRANSLATION IndicatorTrans)
@@ -431,7 +431,7 @@ IntKeyboardUpdateLeds(HANDLE KeyboardDeviceHandle,
    return STATUS_SUCCESS;
 }
 
-static VOID STDCALL
+static VOID APIENTRY
 IntKeyboardSendWinKeyMsg()
 {
    PWINDOW_OBJECT Window;
@@ -452,13 +452,13 @@ IntKeyboardSendWinKeyMsg()
    MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY);
 }
 
-static VOID STDCALL
+static VOID APIENTRY
 co_IntKeyboardSendAltKeyMsg()
 {
    co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0);
 }
 
-static VOID STDCALL
+static VOID APIENTRY
 KeyboardThreadMain(PVOID StartContext)
 {
    UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0");
@@ -882,7 +882,7 @@ CleanupInputImp(VOID)
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserDragDetect(
    HWND hWnd,
    POINT pt) // Just like the User call.
@@ -935,7 +935,7 @@ IntBlockInput(PTHREADINFO W32Thread, BOOL BlockIt)
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserBlockInput(
    BOOL BlockIt)
 {
@@ -1230,7 +1230,7 @@ IntKeyboardInput(KEYBDINPUT *ki)
 }
 
 UINT
-STDCALL
+APIENTRY
 NtUserSendInput(
    UINT nInputs,
    LPINPUT pInput,

reactos/subsystems/win32/win32k/ntuser/kbdlayout.c

@@ -20,7 +20,7 @@
 PKBL KBLList = NULL; // Keyboard layout list.
 
 typedef PVOID (*KbdLayerDescriptor)(VOID);
-NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module,
+NTSTATUS APIENTRY LdrGetProcedureAddress(PVOID module,
                                         PANSI_STRING import_name,
                                         DWORD flags,
                                         PVOID *func_addr);
@@ -40,7 +40,7 @@ NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module,
  * Returns NTSTATUS
  */
 
-static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName,
+static NTSTATUS APIENTRY ReadRegistryValue( PUNICODE_STRING KeyName,
       PUNICODE_STRING ValueName,
       PUNICODE_STRING ReturnedValue )
 {
@@ -467,7 +467,7 @@ UserGetKeyboardLayout(
 }
 
 UINT
-STDCALL
+APIENTRY
 NtUserGetKeyboardLayoutList(
    INT nItems,
    HKL* pHklBuff)
@@ -517,7 +517,7 @@ NtUserGetKeyboardLayoutList(
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserGetKeyboardLayoutName(
    LPWSTR lpszName)
 {
@@ -548,7 +548,7 @@ NtUserGetKeyboardLayoutName(
 
 
 HKL
-STDCALL
+APIENTRY
 NtUserLoadKeyboardLayoutEx(
    IN HANDLE Handle,
    IN DWORD offTable,
@@ -609,7 +609,7 @@ the_end:
 }
 
 HKL
-STDCALL
+APIENTRY
 NtUserActivateKeyboardLayout(
    HKL hKl,
    ULONG Flags)
@@ -666,7 +666,7 @@ the_end:
 }
 
 BOOL
-STDCALL
+APIENTRY
 NtUserUnloadKeyboardLayout(
    HKL hKl)
 {