From ef394b196faaa44455bea7324e1c68b0d85ff109 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sat, 29 Nov 2008 22:48:58 +0000 Subject: [PATCH] - Less STDCALL, more WINAPI/NTAPI/APIENTRY svn path=/trunk/; revision=37752 --- reactos/subsystems/ntvdm/ntvdm.c | 2 +- reactos/subsystems/win/basesrv/init.c | 4 +- reactos/subsystems/win/basesrv/main.c | 2 +- reactos/subsystems/win/basesrv/server.c | 2 +- reactos/subsystems/win/winsrv/dllmain.c | 2 +- reactos/subsystems/win/winsrv/init.c | 8 +- reactos/subsystems/win32/csrss/api/handle.c | 12 +- reactos/subsystems/win32/csrss/api/process.c | 10 +- reactos/subsystems/win32/csrss/api/wapi.c | 8 +- reactos/subsystems/win32/csrss/include/api.h | 44 ++--- .../subsystems/win32/csrss/include/conio.h | 24 +-- .../win32/csrss/include/csrplugin.h | 16 +- reactos/subsystems/win32/csrss/init.c | 4 +- reactos/subsystems/win32/csrss/print.c | 4 +- .../win32/csrss/win32csr/appswitch.c | 2 +- .../subsystems/win32/csrss/win32csr/conio.c | 10 +- .../win32/csrss/win32csr/desktopbg.c | 2 +- .../subsystems/win32/csrss/win32csr/dllmain.c | 14 +- .../subsystems/win32/csrss/win32csr/exitros.c | 4 +- .../win32/csrss/win32csr/guiconsole.c | 22 +-- .../win32/csrss/win32csr/tuiconsole.c | 18 +- reactos/subsystems/win32/win32k/eng/bitblt.c | 38 ++-- reactos/subsystems/win32/win32k/eng/clip.c | 8 +- .../subsystems/win32/win32k/eng/copybits.c | 2 +- reactos/subsystems/win32/win32k/eng/debug.c | 2 +- reactos/subsystems/win32/win32k/eng/device.c | 2 +- .../subsystems/win32/win32k/eng/driverobj.c | 8 +- .../subsystems/win32/win32k/eng/engbrush.c | 6 +- reactos/subsystems/win32/win32k/eng/engmisc.c | 10 +- .../subsystems/win32/win32k/eng/engwindow.c | 10 +- reactos/subsystems/win32/win32k/eng/error.c | 4 +- reactos/subsystems/win32/win32k/eng/event.c | 12 +- reactos/subsystems/win32/win32k/eng/float.c | 4 +- .../subsystems/win32/win32k/eng/gradient.c | 4 +- reactos/subsystems/win32/win32k/eng/lineto.c | 6 +- reactos/subsystems/win32/win32k/eng/mem.c | 16 +- reactos/subsystems/win32/win32k/eng/misc.h | 4 +- reactos/subsystems/win32/win32k/eng/mouse.c | 6 +- reactos/subsystems/win32/win32k/eng/objects.h | 32 ++-- reactos/subsystems/win32/win32k/eng/paint.c | 8 +- reactos/subsystems/win32/win32k/eng/palette.c | 6 +- reactos/subsystems/win32/win32k/eng/perfcnt.c | 4 +- .../subsystems/win32/win32k/eng/semaphor.c | 16 +- reactos/subsystems/win32/win32k/eng/sort.c | 2 +- reactos/subsystems/win32/win32k/eng/surface.c | 22 +-- .../subsystems/win32/win32k/eng/transblt.c | 2 +- reactos/subsystems/win32/win32k/eng/xlate.c | 6 +- .../subsystems/win32/win32k/include/bitmaps.h | 4 +- .../win32/win32k/include/callback.h | 12 +- .../win32/win32k/include/clipboard.h | 2 +- .../subsystems/win32/win32k/include/color.h | 6 +- .../subsystems/win32/win32k/include/coord.h | 2 +- .../win32/win32k/include/cursoricon.h | 2 +- reactos/subsystems/win32/win32k/include/dc.h | 10 +- .../subsystems/win32/win32k/include/desktop.h | 4 +- reactos/subsystems/win32/win32k/include/dib.h | 6 +- reactos/subsystems/win32/win32k/include/eng.h | 4 +- .../subsystems/win32/win32k/include/focus.h | 2 +- .../win32/win32k/include/intddraw.h | 164 ++++++++-------- .../subsystems/win32/win32k/include/inteng.h | 16 +- .../subsystems/win32/win32k/include/intgdi.h | 40 ++-- .../subsystems/win32/win32k/include/menu.h | 2 +- .../subsystems/win32/win32k/include/misc.h | 6 +- .../win32/win32k/include/msgqueue.h | 8 +- .../subsystems/win32/win32k/include/paint.h | 4 +- .../subsystems/win32/win32k/include/palette.h | 2 +- reactos/subsystems/win32/win32k/include/pen.h | 2 +- .../subsystems/win32/win32k/include/rect.h | 12 +- .../subsystems/win32/win32k/include/region.h | 2 +- .../subsystems/win32/win32k/include/win32k.h | 2 +- .../subsystems/win32/win32k/include/winsta.h | 6 +- reactos/subsystems/win32/win32k/ldr/loader.c | 10 +- .../subsystems/win32/win32k/main/dllmain.c | 6 +- reactos/subsystems/win32/win32k/misc/driver.c | 2 +- reactos/subsystems/win32/win32k/misc/err.c | 2 +- reactos/subsystems/win32/win32k/misc/math.c | 2 +- .../subsystems/win32/win32k/misc/usrheap.c | 2 +- reactos/subsystems/win32/win32k/ntddraw/d3d.c | 20 +- reactos/subsystems/win32/win32k/ntddraw/dd.c | 10 +- .../subsystems/win32/win32k/ntddraw/ddraw.c | 38 ++-- .../subsystems/win32/win32k/ntddraw/ddsurf.c | 28 +-- reactos/subsystems/win32/win32k/ntddraw/dvp.c | 34 ++-- .../subsystems/win32/win32k/ntddraw/dxeng.c | 76 ++++---- reactos/subsystems/win32/win32k/ntddraw/eng.c | 14 +- .../subsystems/win32/win32k/ntddraw/mocomp.c | 20 +- .../win32/win32k/ntuser/accelerator.c | 8 +- .../subsystems/win32/win32k/ntuser/callback.c | 12 +- .../subsystems/win32/win32k/ntuser/caret.c | 10 +- .../subsystems/win32/win32k/ntuser/class.c | 18 +- .../win32/win32k/ntuser/clipboard.c | 38 ++-- reactos/subsystems/win32/win32k/ntuser/csr.c | 2 +- .../win32/win32k/ntuser/cursoricon.c | 32 ++-- .../subsystems/win32/win32k/ntuser/desktop.c | 22 +-- .../subsystems/win32/win32k/ntuser/display.c | 4 +- .../subsystems/win32/win32k/ntuser/event.c | 6 +- .../subsystems/win32/win32k/ntuser/focus.c | 10 +- reactos/subsystems/win32/win32k/ntuser/hook.c | 8 +- .../subsystems/win32/win32k/ntuser/hotkey.c | 4 +- .../subsystems/win32/win32k/ntuser/input.c | 22 +-- .../win32/win32k/ntuser/kbdlayout.c | 14 +- .../subsystems/win32/win32k/ntuser/keyboard.c | 20 +- reactos/subsystems/win32/win32k/ntuser/menu.c | 50 ++--- .../subsystems/win32/win32k/ntuser/message.c | 34 ++-- reactos/subsystems/win32/win32k/ntuser/misc.c | 8 +- .../subsystems/win32/win32k/ntuser/monitor.c | 10 +- .../subsystems/win32/win32k/ntuser/msgqueue.c | 8 +- .../subsystems/win32/win32k/ntuser/ntstubs.c | 176 +++++++++--------- .../subsystems/win32/win32k/ntuser/painting.c | 22 +-- reactos/subsystems/win32/win32k/ntuser/prop.c | 6 +- .../win32/win32k/ntuser/scrollbar.c | 14 +- .../win32/win32k/ntuser/simplecall.c | 16 +- .../win32/win32k/ntuser/sysparams.c | 4 +- .../subsystems/win32/win32k/ntuser/timer.c | 6 +- .../subsystems/win32/win32k/ntuser/windc.c | 10 +- .../subsystems/win32/win32k/ntuser/window.c | 92 ++++----- .../subsystems/win32/win32k/ntuser/winpos.c | 2 +- .../subsystems/win32/win32k/ntuser/winsta.c | 26 +-- reactos/subsystems/win32/win32k/objects/arc.c | 2 +- .../subsystems/win32/win32k/objects/bezier.c | 2 +- .../subsystems/win32/win32k/objects/bitblt.c | 14 +- .../subsystems/win32/win32k/objects/bitmaps.c | 26 +-- .../subsystems/win32/win32k/objects/brush.c | 22 +-- .../subsystems/win32/win32k/objects/cliprgn.c | 16 +- .../subsystems/win32/win32k/objects/color.c | 36 ++-- .../subsystems/win32/win32k/objects/coord.c | 24 +-- reactos/subsystems/win32/win32k/objects/dc.c | 34 ++-- .../subsystems/win32/win32k/objects/dcutil.c | 6 +- .../subsystems/win32/win32k/objects/dibobj.c | 14 +- .../win32/win32k/objects/fillshap.c | 12 +- .../subsystems/win32/win32k/objects/font.c | 8 +- .../win32/win32k/objects/freetype.c | 16 +- .../subsystems/win32/win32k/objects/gdidbg.c | 4 +- reactos/subsystems/win32/win32k/objects/icm.c | 8 +- .../subsystems/win32/win32k/objects/line.c | 2 +- .../win32/win32k/objects/metafile.c | 2 +- .../subsystems/win32/win32k/objects/palobj.c | 2 +- .../subsystems/win32/win32k/objects/path.c | 24 +-- reactos/subsystems/win32/win32k/objects/pen.c | 8 +- .../win32/win32k/objects/polyfill.c | 10 +- .../subsystems/win32/win32k/objects/print.c | 16 +- .../subsystems/win32/win32k/objects/region.c | 36 ++-- .../win32/win32k/objects/stockobj.c | 2 +- .../subsystems/win32/win32k/objects/text.c | 4 +- .../subsystems/win32/win32k/objects/wingl.c | 6 +- .../win32/win32k/objects/xformobj.c | 6 +- reactos/subsystems/win32/win32k/stubs/stubs.c | 2 +- 146 files changed, 1058 insertions(+), 1058 deletions(-) diff --git a/reactos/subsystems/ntvdm/ntvdm.c b/reactos/subsystems/ntvdm/ntvdm.c index 97accab52c5..afa44ef23de 100644 --- a/reactos/subsystems/ntvdm/ntvdm.c +++ b/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; diff --git a/reactos/subsystems/win/basesrv/init.c b/reactos/subsystems/win/basesrv/init.c index 9b5d0834728..71ffbf177d0 100644 --- a/reactos/subsystems/win/basesrv/init.c +++ b/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; diff --git a/reactos/subsystems/win/basesrv/main.c b/reactos/subsystems/win/basesrv/main.c index 332f30946a9..813e1664c34 100644 --- a/reactos/subsystems/win/basesrv/main.c +++ b/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) { diff --git a/reactos/subsystems/win/basesrv/server.c b/reactos/subsystems/win/basesrv/server.c index 0d19fe11439..f1ee61460da 100644 --- a/reactos/subsystems/win/basesrv/server.c +++ b/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; diff --git a/reactos/subsystems/win/winsrv/dllmain.c b/reactos/subsystems/win/winsrv/dllmain.c index e007d3888d2..d419c75d979 100644 --- a/reactos/subsystems/win/winsrv/dllmain.c +++ b/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) { diff --git a/reactos/subsystems/win/winsrv/init.c b/reactos/subsystems/win/winsrv/init.c index 6d1973ff294..e99b66d9a24 100644 --- a/reactos/subsystems/win/winsrv/init.c +++ b/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; diff --git a/reactos/subsystems/win32/csrss/api/handle.c b/reactos/subsystems/win32/csrss/api/handle.c index 5a9efda16ff..ccf79dee7ce 100644 --- a/reactos/subsystems/win32/csrss/api/handle.c +++ b/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; diff --git a/reactos/subsystems/win32/csrss/api/process.c b/reactos/subsystems/win32/csrss/api/process.c index a760aeedda0..d8a16efacf0 100644 --- a/reactos/subsystems/win32/csrss/api/process.c +++ b/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; diff --git a/reactos/subsystems/win32/csrss/api/wapi.c b/reactos/subsystems/win32/csrss/api/wapi.c index 1261bc79b09..db10d67dd56 100644 --- a/reactos/subsystems/win32/csrss/api/wapi.c +++ b/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; diff --git a/reactos/subsystems/win32/csrss/include/api.h b/reactos/subsystems/win32/csrss/include/api.h index 651da359656..6e87fba96d2 100644 --- a/reactos/subsystems/win32/csrss/include/api.h +++ b/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 STDCALL PrintString (char* fmt, ...); +VOID WINAPI DisplayString(LPCWSTR lpwString); +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 STDCALL ServerSbApiPortThread (PVOID PortHandle); -DWORD STDCALL Console_Api( PVOID unused ); +DWORD WINAPI ServerApiPortThread (PVOID PortHandle); +DWORD WINAPI ServerSbApiPortThread (PVOID PortHandle); +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); -PCSRSS_PROCESS_DATA STDCALL CsrGetProcessData(HANDLE ProcessId); -PCSRSS_PROCESS_DATA STDCALL CsrCreateProcessData(HANDLE ProcessId); -NTSTATUS STDCALL CsrFreeProcessData( HANDLE Pid ); -NTSTATUS STDCALL CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context); +VOID WINAPI CsrInitProcessData(VOID); +PCSRSS_PROCESS_DATA WINAPI CsrGetProcessData(HANDLE ProcessId); +PCSRSS_PROCESS_DATA WINAPI CsrCreateProcessData(HANDLE ProcessId); +NTSTATUS WINAPI CsrFreeProcessData( HANDLE Pid ); +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 STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, PCSRSS_PROCESS_DATA TargetProcessData); -NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access ); -BOOL STDCALL CsrServerInitialization (int,char**,char**); -NTSTATUS STDCALL CsrReleaseObjectByPointer(Object_t *Object); -NTSTATUS STDCALL CsrReleaseObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); -NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); +NTSTATUS WINAPI CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable ); +NTSTATUS WINAPI CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, PCSRSS_PROCESS_DATA TargetProcessData); +NTSTATUS WINAPI CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access ); +BOOL WINAPI CsrServerInitialization (int,char**,char**); +NTSTATUS WINAPI CsrReleaseObjectByPointer(Object_t *Object); +NTSTATUS WINAPI CsrReleaseObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); +NTSTATUS WINAPI CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); CSR_API(CsrGetInputHandle); CSR_API(CsrGetOutputHandle); diff --git a/reactos/subsystems/win32/csrss/include/conio.h b/reactos/subsystems/win32/csrss/include/conio.h index 07dff611589..5834928eaea 100644 --- a/reactos/subsystems/win32/csrss/include/conio.h +++ b/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 (STDCALL *WriteStream)(PCSRSS_CONSOLE Console, RECT *Block, LONG CursorStartX, LONG CursorStartY, + VOID (WINAPI *InitScreenBuffer)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); + 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); - BOOL (STDCALL *SetCursorInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); - BOOL (STDCALL *SetScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, + VOID (WINAPI *DrawRegion)(PCSRSS_CONSOLE Console, RECT *Region); + BOOL (WINAPI *SetCursorInfo)(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 (STDCALL *ChangeTitle)(PCSRSS_CONSOLE Console); - VOID (STDCALL *CleanupConsole)(PCSRSS_CONSOLE Console); - BOOL (STDCALL *ChangeIcon)(PCSRSS_CONSOLE Console, HICON hWindowIcon); + BOOL (WINAPI *UpdateScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); + BOOL (WINAPI *ChangeTitle)(PCSRSS_CONSOLE Console); + VOID (WINAPI *CleanupConsole)(PCSRSS_CONSOLE Console); + 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 STDCALL ConioDeleteScreenBuffer(Object_t *Buffer); -void STDCALL ConioProcessKey(MSG *msg, PCSRSS_CONSOLE Console, BOOL TextMode); +VOID WINAPI ConioDeleteConsole(Object_t *Object); +VOID WINAPI ConioDeleteScreenBuffer(Object_t *Buffer); +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); diff --git a/reactos/subsystems/win32/csrss/include/csrplugin.h b/reactos/subsystems/win32/csrss/include/csrplugin.h index 2b5943cc0d8..90e158f6242 100644 --- a/reactos/subsystems/win32/csrss/include/csrplugin.h +++ b/reactos/subsystems/win32/csrss/include/csrplugin.h @@ -22,19 +22,19 @@ #include #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 (STDCALL *CSRSS_RELEASE_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData, +typedef NTSTATUS (WINAPI *CSRSS_RELEASE_OBJECT_BY_POINTER_PROC)(Object_t *Object); +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, diff --git a/reactos/subsystems/win32/csrss/init.c b/reactos/subsystems/win32/csrss/init.c index 354499e86ed..58720a37514 100644 --- a/reactos/subsystems/win32/csrss/init.c +++ b/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, diff --git a/reactos/subsystems/win32/csrss/print.c b/reactos/subsystems/win32/csrss/print.c index e53b3fc11b6..7a46e335dad 100644 --- a/reactos/subsystems/win32/csrss/print.c +++ b/reactos/subsystems/win32/csrss/print.c @@ -32,7 +32,7 @@ #define NDEBUG #include -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; diff --git a/reactos/subsystems/win32/csrss/win32csr/appswitch.c b/reactos/subsystems/win32/csrss/win32csr/appswitch.c index e978242cca4..e4997941d88 100644 --- a/reactos/subsystems/win32/csrss/win32csr/appswitch.c +++ b/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); diff --git a/reactos/subsystems/win32/csrss/win32csr/conio.c b/reactos/subsystems/win32/csrss/win32csr/conio.c index 65c3ffd582c..a5c728d6e36 100644 --- a/reactos/subsystems/win32/csrss/win32csr/conio.c +++ b/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 }; diff --git a/reactos/subsystems/win32/csrss/win32csr/desktopbg.c b/reactos/subsystems/win32/csrss/win32csr/desktopbg.c index a8ddd0ef537..b8ebeb656f1 100644 --- a/reactos/subsystems/win32/csrss/win32csr/desktopbg.c +++ b/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; diff --git a/reactos/subsystems/win32/csrss/win32csr/dllmain.c b/reactos/subsystems/win32/csrss/win32csr/dllmain.c index 1006de6141e..df9ede6ffee 100644 --- a/reactos/subsystems/win32/csrss/win32csr/dllmain.c +++ b/reactos/subsystems/win32/csrss/win32csr/dllmain.c @@ -14,9 +14,9 @@ #include /* Not defined in any header file */ -extern VOID STDCALL PrivateCsrssManualGuiCheck(LONG Check); -extern VOID STDCALL PrivateCsrssInitialized(); -extern VOID STDCALL InitializeAppSwitchHook(); +extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check); +extern VOID WINAPI PrivateCsrssInitialized(); +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, diff --git a/reactos/subsystems/win32/csrss/win32csr/exitros.c b/reactos/subsystems/win32/csrss/win32csr/exitros.c index e3dc47a0c81..1aa580534f3 100644 --- a/reactos/subsystems/win32/csrss/win32csr/exitros.c +++ b/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; diff --git a/reactos/subsystems/win32/csrss/win32csr/guiconsole.c b/reactos/subsystems/win32/csrss/win32csr/guiconsole.c index b189b14211b..0139572deed 100644 --- a/reactos/subsystems/win32/csrss/win32csr/guiconsole.c +++ b/reactos/subsystems/win32/csrss/win32csr/guiconsole.c @@ -14,7 +14,7 @@ #include /* 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); diff --git a/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c b/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c index dd1a8bbd02f..916a4029847 100644 --- a/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/eng/bitblt.c b/reactos/subsystems/win32/win32k/eng/bitblt.c index 346d533a029..c7b6d6b6861 100644 --- a/reactos/subsystems/win32/win32k/eng/bitblt.c +++ b/reactos/subsystems/win32/win32k/eng/bitblt.c @@ -32,7 +32,7 @@ #define NDEBUG #include -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, diff --git a/reactos/subsystems/win32/win32k/eng/clip.c b/reactos/subsystems/win32/win32k/eng/clip.c index 1fa7dac1ea0..772de5fece9 100644 --- a/reactos/subsystems/win32/win32k/eng/clip.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/eng/copybits.c b/reactos/subsystems/win32/win32k/eng/copybits.c index f0ded929296..e88e397aed0 100644 --- a/reactos/subsystems/win32/win32k/eng/copybits.c +++ b/reactos/subsystems/win32/win32k/eng/copybits.c @@ -34,7 +34,7 @@ /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY EngCopyBits(SURFOBJ *Dest, SURFOBJ *Source, CLIPOBJ *Clip, diff --git a/reactos/subsystems/win32/win32k/eng/debug.c b/reactos/subsystems/win32/win32k/eng/debug.c index 6480b4a3b58..30d37e757ee 100644 --- a/reactos/subsystems/win32/win32k/eng/debug.c +++ b/reactos/subsystems/win32/win32k/eng/debug.c @@ -35,7 +35,7 @@ /* * @implemented */ -VOID STDCALL +VOID APIENTRY EngDebugPrint(PCHAR StandardPrefix, PCHAR DebugMessage, va_list ap) diff --git a/reactos/subsystems/win32/win32k/eng/device.c b/reactos/subsystems/win32/win32k/eng/device.c index 360c96d6748..b422ba961ce 100644 --- a/reactos/subsystems/win32/win32k/eng/device.c +++ b/reactos/subsystems/win32/win32k/eng/device.c @@ -35,7 +35,7 @@ /* * @implemented */ -DWORD STDCALL +DWORD APIENTRY EngDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, diff --git a/reactos/subsystems/win32/win32k/eng/driverobj.c b/reactos/subsystems/win32/win32k/eng/driverobj.c index 46f0b5fa9d4..3c12fd5bd27 100644 --- a/reactos/subsystems/win32/win32k/eng/driverobj.c +++ b/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); diff --git a/reactos/subsystems/win32/win32k/eng/engbrush.c b/reactos/subsystems/win32/win32k/eng/engbrush.c index 715da9638fd..686732acf1e 100644 --- a/reactos/subsystems/win32/win32k/eng/engbrush.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/eng/engmisc.c b/reactos/subsystems/win32/win32k/eng/engmisc.c index 99710fc3ad9..7d9cfa51a9b 100644 --- a/reactos/subsystems/win32/win32k/eng/engmisc.c +++ b/reactos/subsystems/win32/win32k/eng/engmisc.c @@ -23,7 +23,7 @@ #define NDEBUG #include -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 diff --git a/reactos/subsystems/win32/win32k/eng/engwindow.c b/reactos/subsystems/win32/win32k/eng/engwindow.c index ffae58cc2bc..e549c1ebc4c 100644 --- a/reactos/subsystems/win32/win32k/eng/engwindow.c +++ b/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) diff --git a/reactos/subsystems/win32/win32k/eng/error.c b/reactos/subsystems/win32/win32k/eng/error.c index 73f24f92603..d81b3822d84 100644 --- a/reactos/subsystems/win32/win32k/eng/error.c +++ b/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 diff --git a/reactos/subsystems/win32/win32k/eng/event.c b/reactos/subsystems/win32/win32k/eng/event.c index 73342da320f..879887c3951 100644 --- a/reactos/subsystems/win32/win32k/eng/event.c +++ b/reactos/subsystems/win32/win32k/eng/event.c @@ -14,7 +14,7 @@ #include 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) { diff --git a/reactos/subsystems/win32/win32k/eng/float.c b/reactos/subsystems/win32/win32k/eng/float.c index a603e852bc5..964d1d15b98 100644 --- a/reactos/subsystems/win32/win32k/eng/float.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/eng/gradient.c b/reactos/subsystems/win32/win32k/eng/gradient.c index 62984ba7f87..a9d76f37ec6 100644 --- a/reactos/subsystems/win32/win32k/eng/gradient.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/eng/lineto.c b/reactos/subsystems/win32/win32k/eng/lineto.c index 33e05d8aa8a..995ce32ea74 100644 --- a/reactos/subsystems/win32/win32k/eng/lineto.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/eng/mem.c b/reactos/subsystems/win32/win32k/eng/mem.c index 9ae8e11f2ab..aa953de1d3a 100644 --- a/reactos/subsystems/win32/win32k/eng/mem.c +++ b/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); diff --git a/reactos/subsystems/win32/win32k/eng/misc.h b/reactos/subsystems/win32/win32k/eng/misc.h index 4aa63bf1a53..dc38bfc6395 100644 --- a/reactos/subsystems/win32/win32k/eng/misc.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/eng/mouse.c b/reactos/subsystems/win32/win32k/eng/mouse.c index 67cd688167a..3ab55e0f447 100644 --- a/reactos/subsystems/win32/win32k/eng/mouse.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/eng/objects.h b/reactos/subsystems/win32/win32k/eng/objects.h index f2a93d9c0b2..35515ae3c8d 100644 --- a/reactos/subsystems/win32/win32k/eng/objects.h +++ b/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; diff --git a/reactos/subsystems/win32/win32k/eng/paint.c b/reactos/subsystems/win32/win32k/eng/paint.c index bff9d5138a1..9b9ee606be1 100644 --- a/reactos/subsystems/win32/win32k/eng/paint.c +++ b/reactos/subsystems/win32/win32k/eng/paint.c @@ -32,7 +32,7 @@ #define NDEBUG #include -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, diff --git a/reactos/subsystems/win32/win32k/eng/palette.c b/reactos/subsystems/win32/win32k/eng/palette.c index 68b9b8d4747..221f3e61b1b 100644 --- a/reactos/subsystems/win32/win32k/eng/palette.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/eng/perfcnt.c b/reactos/subsystems/win32/win32k/eng/perfcnt.c index a8f09f95cef..793b3cf41e7 100644 --- a/reactos/subsystems/win32/win32k/eng/perfcnt.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/eng/semaphor.c b/reactos/subsystems/win32/win32k/eng/semaphor.c index b16d86abf3b..13f376cfdf7 100644 --- a/reactos/subsystems/win32/win32k/eng/semaphor.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/eng/sort.c b/reactos/subsystems/win32/win32k/eng/sort.c index ddad4d148cb..76106e47ede 100644 --- a/reactos/subsystems/win32/win32k/eng/sort.c +++ b/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); diff --git a/reactos/subsystems/win32/win32k/eng/surface.c b/reactos/subsystems/win32/win32k/eng/surface.c index e3fd6f5ea06..e549021f7dc 100644 --- a/reactos/subsystems/win32/win32k/eng/surface.c +++ b/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) diff --git a/reactos/subsystems/win32/win32k/eng/transblt.c b/reactos/subsystems/win32/win32k/eng/transblt.c index d06fecb6c60..f9d014726cb 100644 --- a/reactos/subsystems/win32/win32k/eng/transblt.c +++ b/reactos/subsystems/win32/win32k/eng/transblt.c @@ -32,7 +32,7 @@ #define NDEBUG #include -BOOL STDCALL +BOOL APIENTRY EngTransparentBlt(SURFOBJ *Dest, SURFOBJ *Source, CLIPOBJ *Clip, diff --git a/reactos/subsystems/win32/win32k/eng/xlate.c b/reactos/subsystems/win32/win32k/eng/xlate.c index 0095315b00c..8e4b1677cd9 100644 --- a/reactos/subsystems/win32/win32k/eng/xlate.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/include/bitmaps.h b/reactos/subsystems/win32/win32k/include/bitmaps.h index d2948ded6c2..834853dd5ce 100644 --- a/reactos/subsystems/win32/win32k/include/bitmaps.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/include/callback.h b/reactos/subsystems/win32/win32k/include/callback.h index 1bc822bdecf..d99f1e9a004 100644 --- a/reactos/subsystems/win32/win32k/include/callback.h +++ b/reactos/subsystems/win32/win32k/include/callback.h @@ -3,7 +3,7 @@ #include -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, diff --git a/reactos/subsystems/win32/win32k/include/clipboard.h b/reactos/subsystems/win32/win32k/include/clipboard.h index c5880c4a0a4..32c6ed1a44a 100644 --- a/reactos/subsystems/win32/win32k/include/clipboard.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/include/color.h b/reactos/subsystems/win32/win32k/include/color.h index c97c1d78987..cb8c3108817 100644 --- a/reactos/subsystems/win32/win32k/include/color.h +++ b/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); -INT STDCALL COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col); -INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved); +COLORREF APIENTRY COLOR_LookupNearestColor (PALETTEENTRY* palPalEntry, INT size, COLORREF color); +INT APIENTRY COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col); +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); diff --git a/reactos/subsystems/win32/win32k/include/coord.h b/reactos/subsystems/win32/win32k/include/coord.h index 89c317e0311..e518102a9e1 100644 --- a/reactos/subsystems/win32/win32k/include/coord.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/include/cursoricon.h b/reactos/subsystems/win32/win32k/include/cursoricon.h index f780645b1dc..5335150b7f8 100644 --- a/reactos/subsystems/win32/win32k/include/cursoricon.h +++ b/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) diff --git a/reactos/subsystems/win32/win32k/include/dc.h b/reactos/subsystems/win32/win32k/include/dc.h index 8a035fe0a00..9e33cd570c4 100644 --- a/reactos/subsystems/win32/win32k/include/dc.h +++ b/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); -INT STDCALL IntGdiGetBkMode(HDC hDC); +COLORREF APIENTRY IntGdiGetBkColor(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); -COLORREF STDCALL IntGdiGetTextColor(HDC hDC); -INT STDCALL IntGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); +UINT APIENTRY IntGdiGetTextAlign(HDC hDC); +COLORREF APIENTRY IntGdiGetTextColor(HDC hDC); +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); diff --git a/reactos/subsystems/win32/win32k/include/desktop.h b/reactos/subsystems/win32/win32k/include/desktop.h index 995a8d6ef3b..0fdaab2df25 100644 --- a/reactos/subsystems/win32/win32k/include/desktop.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/include/dib.h b/reactos/subsystems/win32/win32k/include/dib.h index 0d1dcdecaf3..4ab6efe0bc3 100644 --- a/reactos/subsystems/win32/win32k/include/dib.h +++ b/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); diff --git a/reactos/subsystems/win32/win32k/include/eng.h b/reactos/subsystems/win32/win32k/include/eng.h index bbb206f5cc1..41cd59e80bb 100644 --- a/reactos/subsystems/win32/win32k/include/eng.h +++ b/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, diff --git a/reactos/subsystems/win32/win32k/include/focus.h b/reactos/subsystems/win32/win32k/include/focus.h index 76513e57d24..e971b0e0a91 100644 --- a/reactos/subsystems/win32/win32k/include/focus.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/include/intddraw.h b/reactos/subsystems/win32/win32k/include/intddraw.h index 00473477e65..b64a3a4dde7 100644 --- a/reactos/subsystems/win32/win32k/include/intddraw.h +++ b/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 (NTAPI* PGD_DDRELEASEDC)(HANDLE); -typedef BOOL (NTAPI* PGD_DDRESTVISRGN)(HANDLE, HWND); -typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); -typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); -typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*); -typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); -typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); -typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); -typedef NTSTATUS (NTAPI *PGD_DXDDCLEANUPDXGRAPHICS) (VOID); -typedef HANDLE (NTAPI *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc); -typedef DWORD (NTAPI *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); -typedef DWORD (NTAPI *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 BOOL (NTAPI *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE); -typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE); -typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); -typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); -typedef BOOL (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)(HANDLE, DD_HALINFO*, DWORD*, LPD3DNTHAL_CALLBACKS, LPD3DNTHAL_GLOBALDRIVERDATA, +typedef BOOL (APIENTRY* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID); +typedef BOOL (APIENTRY* PGD_DDRELEASEDC)(HANDLE); +typedef BOOL (APIENTRY* PGD_DDRESTVISRGN)(HANDLE, HWND); +typedef HANDLE (APIENTRY* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); +typedef HDC (APIENTRY *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); +typedef DWORD (APIENTRY *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*); +typedef DWORD (APIENTRY *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); +typedef DWORD (APIENTRY *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); +typedef NTSTATUS (APIENTRY *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); +typedef NTSTATUS (APIENTRY *PGD_DXDDCLEANUPDXGRAPHICS) (VOID); +typedef HANDLE (APIENTRY *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc); +typedef DWORD (APIENTRY *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); +typedef DWORD (APIENTRY *PGD_DDCOLORCONTROL)(HANDLE hSurface,PDD_COLORCONTROLDATA puColorControlData); +typedef HANDLE (APIENTRY *PGD_DXDDCREATESURFACEOBJECT)(HANDLE, HANDLE, PDD_SURFACE_LOCAL, PDD_SURFACE_MORE, PDD_SURFACE_GLOBAL, BOOL); +typedef BOOL (APIENTRY *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE); +typedef BOOL (APIENTRY *PGD_DXDDDELETESURFACEOBJECT)(HANDLE); +typedef DWORD (APIENTRY *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); +typedef DWORD (APIENTRY *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); +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 (NTAPI *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA); -typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA); -typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA); -typedef DWORD (NTAPI *PGD_D3DVALIDATETEXTURESTAGESTATE)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); -typedef DWORD (NTAPI *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 BOOL (NTAPI *PGD_D3DCONTEXTCREATE)(HANDLE, HANDLE, HANDLE, LPD3DNTHAL_CONTEXTCREATEDATA); -typedef DWORD (NTAPI *PGD_D3DCONTEXTDESTROY)(LPD3DNTHAL_CONTEXTDESTROYDATA); -typedef DWORD (NTAPI *PGD_D3DCONTEXTDESTROYALL)(LPD3DNTHAL_CONTEXTDESTROYALLDATA); +typedef DWORD (APIENTRY *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); +typedef DWORD (APIENTRY *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA); +typedef DWORD (APIENTRY *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA); +typedef DWORD (APIENTRY *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA); +typedef DWORD (APIENTRY *PGD_D3DVALIDATETEXTURESTAGESTATE)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); +typedef DWORD (APIENTRY *PGD_D3DDRAWPRIMITIVES2)(HANDLE, HANDLE, LPD3DNTHAL_DRAWPRIMITIVES2DATA, FLATPTR *, DWORD *, FLATPTR *, DWORD *); +typedef DWORD (APIENTRY *PGD_DDCREATED3DBUFFER)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *); +typedef BOOL (APIENTRY *PGD_D3DCONTEXTCREATE)(HANDLE, HANDLE, HANDLE, LPD3DNTHAL_CONTEXTCREATEDATA); +typedef DWORD (APIENTRY *PGD_D3DCONTEXTDESTROY)(LPD3DNTHAL_CONTEXTDESTROYDATA); +typedef DWORD (APIENTRY *PGD_D3DCONTEXTDESTROYALL)(LPD3DNTHAL_CONTEXTDESTROYALLDATA); /* From dvp.c */ -typedef DWORD (NTAPI* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA); -typedef DWORD (NTAPI* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA); -typedef HANDLE (NTAPI* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA); -typedef DWORD (NTAPI* PGD_DVPDESTROYVIDEOPORT)(HANDLE, PDD_DESTROYVPORTDATA); -typedef DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA); -typedef DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(HANDLE, PDD_GETVPORTFLIPSTATUSDATA); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)(HANDLE, PDD_GETVPORTOUTPUTFORMATDATA); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTCONNECTINFO)(HANDLE, PDD_GETVPORTCONNECTDATA); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA); -typedef DWORD (NTAPI *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA); -typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(HANDLE, PDD_WAITFORVPORTSYNCDATA); -typedef DWORD (NTAPI *PGD_DXDVPACQUIRENOTIFICATION)(HANDLE, HANDLE*, LPDDVIDEOPORTNOTIFY); -typedef DWORD (NTAPI *PGD_DXDVPRELEASENOTIFICATION)(HANDLE, HANDLE); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFIELD)(HANDLE, PDD_GETVPORTFIELDDATA); +typedef DWORD (APIENTRY* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA); +typedef DWORD (APIENTRY* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA); +typedef HANDLE (APIENTRY* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA); +typedef DWORD (APIENTRY* PGD_DVPDESTROYVIDEOPORT)(HANDLE, PDD_DESTROYVPORTDATA); +typedef DWORD (APIENTRY* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA); +typedef DWORD (APIENTRY* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA); +typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(HANDLE, PDD_GETVPORTFLIPSTATUSDATA); +typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA); +typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA); +typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)(HANDLE, PDD_GETVPORTOUTPUTFORMATDATA); +typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTCONNECTINFO)(HANDLE, PDD_GETVPORTCONNECTDATA); +typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA); +typedef DWORD (APIENTRY *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA); +typedef DWORD (APIENTRY *PGD_DXDVPWAITFORVIDEOPORTSYNC)(HANDLE, PDD_WAITFORVPORTSYNCDATA); +typedef DWORD (APIENTRY *PGD_DXDVPACQUIRENOTIFICATION)(HANDLE, HANDLE*, LPDDVIDEOPORTNOTIFY); +typedef DWORD (APIENTRY *PGD_DXDVPRELEASENOTIFICATION)(HANDLE, HANDLE); +typedef DWORD (APIENTRY *PGD_DXDVPGETVIDEOPORTFIELD)(HANDLE, PDD_GETVPORTFIELDDATA); /* From mocomp.c */ -typedef DWORD (NTAPI *PGD_DDBEGINMOCOMPFRAME)(HANDLE, PDD_BEGINMOCOMPFRAMEDATA); -typedef HANDLE (NTAPI *PGD_DXDDCREATEMOCOMP)(HANDLE, PDD_CREATEMOCOMPDATA ); -typedef DWORD (NTAPI *PGD_DXDDDESTROYMOCOMP)(HANDLE, PDD_DESTROYMOCOMPDATA); -typedef DWORD (NTAPI *PGD_DXDDENDMOCOMPFRAME)(HANDLE, PDD_ENDMOCOMPFRAMEDATA); -typedef DWORD (NTAPI *PGD_DXDDGETINTERNALMOCOMPINFO)(HANDLE, PDD_GETINTERNALMOCOMPDATA); -typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPBUFFINFO)(HANDLE, PDD_GETMOCOMPCOMPBUFFDATA); -typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPGUIDS)(HANDLE, PDD_GETMOCOMPGUIDSDATA); -typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPFORMATS)(HANDLE, PDD_GETMOCOMPFORMATSDATA); -typedef DWORD (NTAPI *PGD_DXDDQUERYMOCOMPSTATUS)(HANDLE, PDD_QUERYMOCOMPSTATUSDATA); -typedef DWORD (NTAPI *PGD_DXDDRENDERMOCOMP)(HANDLE, PDD_RENDERMOCOMPDATA); +typedef DWORD (APIENTRY *PGD_DDBEGINMOCOMPFRAME)(HANDLE, PDD_BEGINMOCOMPFRAMEDATA); +typedef HANDLE (APIENTRY *PGD_DXDDCREATEMOCOMP)(HANDLE, PDD_CREATEMOCOMPDATA ); +typedef DWORD (APIENTRY *PGD_DXDDDESTROYMOCOMP)(HANDLE, PDD_DESTROYMOCOMPDATA); +typedef DWORD (APIENTRY *PGD_DXDDENDMOCOMPFRAME)(HANDLE, PDD_ENDMOCOMPFRAMEDATA); +typedef DWORD (APIENTRY *PGD_DXDDGETINTERNALMOCOMPINFO)(HANDLE, PDD_GETINTERNALMOCOMPDATA); +typedef DWORD (APIENTRY *PGD_DXDDGETMOCOMPBUFFINFO)(HANDLE, PDD_GETMOCOMPCOMPBUFFDATA); +typedef DWORD (APIENTRY *PGD_DXDDGETMOCOMPGUIDS)(HANDLE, PDD_GETMOCOMPGUIDSDATA); +typedef DWORD (APIENTRY *PGD_DXDDGETMOCOMPFORMATS)(HANDLE, PDD_GETMOCOMPFORMATSDATA); +typedef DWORD (APIENTRY *PGD_DXDDQUERYMOCOMPSTATUS)(HANDLE, PDD_QUERYMOCOMPSTATUSDATA); +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 (NTAPI *PGD_DXDDWAITFORVERTICALBLANK)(HANDLE, PDD_WAITFORVERTICALBLANKDATA); -typedef DWORD (NTAPI *PGD_DDCANCREATESURFACE)(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData); -typedef DWORD (NTAPI *PGD_DXDDGETSCANLINE)(HANDLE, PDD_GETSCANLINEDATA); -typedef DWORD (NTAPI *PGD_DXDDCREATESURFACEEX)(HANDLE,HANDLE,DWORD); +typedef DWORD (APIENTRY *PGD_DDCREATESURFACE)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *); +typedef DWORD (APIENTRY *PGD_DXDDWAITFORVERTICALBLANK)(HANDLE, PDD_WAITFORVERTICALBLANKDATA); +typedef DWORD (APIENTRY *PGD_DDCANCREATESURFACE)(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData); +typedef DWORD (APIENTRY *PGD_DXDDGETSCANLINE)(HANDLE, PDD_GETSCANLINEDATA); +typedef DWORD (APIENTRY *PGD_DXDDCREATESURFACEEX)(HANDLE,HANDLE,DWORD); /* From ddsurf.c */ -typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA); -typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE); -typedef DWORD (NTAPI *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE); -typedef DWORD (NTAPI *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL); -typedef DWORD (NTAPI *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA); -typedef DWORD (NTAPI *PGD_DXDDLOCK)(HANDLE, PDD_LOCKDATA, HDC); -typedef DWORD (NTAPI *PGD_DXDDUNLOCK)(HANDLE, PDD_UNLOCKDATA ); -typedef DWORD (NTAPI *PGD_DDBLT)(HANDLE, HANDLE, PDD_BLTDATA); -typedef DWORD (NTAPI *PGD_DXDDSETCOLORKEY)(HANDLE, PDD_SETCOLORKEYDATA); -typedef DWORD (NTAPI *PGD_DDADDATTACHEDSURFACE)(HANDLE, HANDLE,PDD_ADDATTACHEDSURFACEDATA); -typedef DWORD (NTAPI *PGD_DXDDGETBLTSTATUS)(HANDLE, PDD_GETBLTSTATUSDATA); -typedef DWORD (NTAPI *PGD_DXDDGETFLIPSTATUS)(HANDLE, PDD_GETFLIPSTATUSDATA); -typedef DWORD (NTAPI *PGD_DXDDUPDATEOVERLAY)(HANDLE, HANDLE, PDD_UPDATEOVERLAYDATA); -typedef DWORD (NTAPI *PGD_DXDDSETOVERLAYPOSITION)(HANDLE, HANDLE, PDD_SETOVERLAYPOSITIONDATA); +typedef DWORD (APIENTRY *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA); +typedef BOOL (APIENTRY *PGD_DDATTACHSURFACE)(HANDLE, HANDLE); +typedef DWORD (APIENTRY *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE); +typedef DWORD (APIENTRY *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL); +typedef DWORD (APIENTRY *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA); +typedef DWORD (APIENTRY *PGD_DXDDLOCK)(HANDLE, PDD_LOCKDATA, HDC); +typedef DWORD (APIENTRY *PGD_DXDDUNLOCK)(HANDLE, PDD_UNLOCKDATA ); +typedef DWORD (APIENTRY *PGD_DDBLT)(HANDLE, HANDLE, PDD_BLTDATA); +typedef DWORD (APIENTRY *PGD_DXDDSETCOLORKEY)(HANDLE, PDD_SETCOLORKEYDATA); +typedef DWORD (APIENTRY *PGD_DDADDATTACHEDSURFACE)(HANDLE, HANDLE,PDD_ADDATTACHEDSURFACEDATA); +typedef DWORD (APIENTRY *PGD_DXDDGETBLTSTATUS)(HANDLE, PDD_GETBLTSTATUSDATA); +typedef DWORD (APIENTRY *PGD_DXDDGETFLIPSTATUS)(HANDLE, PDD_GETFLIPSTATUSDATA); +typedef DWORD (APIENTRY *PGD_DXDDUPDATEOVERLAY)(HANDLE, HANDLE, PDD_UPDATEOVERLAYDATA); +typedef DWORD (APIENTRY *PGD_DXDDSETOVERLAYPOSITION)(HANDLE, HANDLE, PDD_SETOVERLAYPOSITIONDATA); /* From eng.c */ -typedef FLATPTR (NTAPI *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG); -typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR); -typedef PVOID (NTAPI *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ; -typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); -typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); -typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); +typedef FLATPTR (APIENTRY *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG); +typedef VOID (APIENTRY *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR); +typedef PVOID (APIENTRY *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ; +typedef VOID (APIENTRY *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); +typedef PDD_SURFACE_LOCAL (APIENTRY *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); +typedef BOOL (APIENTRY *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); diff --git a/reactos/subsystems/win32/win32k/include/inteng.h b/reactos/subsystems/win32/win32k/include/inteng.h index 1c1a17dfda0..f7c786f512c 100644 --- a/reactos/subsystems/win32/win32k/include/inteng.h +++ b/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, diff --git a/reactos/subsystems/win32/win32k/include/intgdi.h b/reactos/subsystems/win32/win32k/include/intgdi.h index 507de8759f4..8b65b55c7cf 100644 --- a/reactos/subsystems/win32/win32k/include/intgdi.h +++ b/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 */ diff --git a/reactos/subsystems/win32/win32k/include/menu.h b/reactos/subsystems/win32/win32k/include/menu.h index 117404a5736..450a6ee5ccc 100644 --- a/reactos/subsystems/win32/win32k/include/menu.h +++ b/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); diff --git a/reactos/subsystems/win32/win32k/include/misc.h b/reactos/subsystems/win32/win32k/include/misc.h index 8c2cf9bd1ed..3661970fed4 100644 --- a/reactos/subsystems/win32/win32k/include/misc.h +++ b/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 *); -VOID NTAPI HackUnsecureVirtualMemory(IN PVOID); +PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); +VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID); #endif /* __WIN32K_MISC_H */ diff --git a/reactos/subsystems/win32/win32k/include/msgqueue.h b/reactos/subsystems/win32/win32k/include/msgqueue.h index 2c0c88f6edc..9a8035cbf47 100644 --- a/reactos/subsystems/win32/win32k/include/msgqueue.h +++ b/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 STDCALL IntUninitMessagePumpHook(); +BOOL APIENTRY IntInitMessagePumpHook(); +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) diff --git a/reactos/subsystems/win32/win32k/include/paint.h b/reactos/subsystems/win32/win32k/include/paint.h index 80c5ea801a0..72b8832777a 100644 --- a/reactos/subsystems/win32/win32k/include/paint.h +++ b/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 STDCALL FillPolygon ( DC* dc, BITMAPOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); +BOOL APIENTRY FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor); +BOOL APIENTRY FillPolygon ( DC* dc, BITMAPOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); #endif /* _WIN32K_PAINT_H */ diff --git a/reactos/subsystems/win32/win32k/include/palette.h b/reactos/subsystems/win32/win32k/include/palette.h index 21be008d778..2bff8dc4cc5 100644 --- a/reactos/subsystems/win32/win32k/include/palette.h +++ b/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); diff --git a/reactos/subsystems/win32/win32k/include/pen.h b/reactos/subsystems/win32/win32k/include/pen.h index 5cda0d3d5e9..d8ecd8ed2b5 100644 --- a/reactos/subsystems/win32/win32k/include/pen.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/include/rect.h b/reactos/subsystems/win32/win32k/include/rect.h index 5f1e14b94dc..2c58764848f 100644 --- a/reactos/subsystems/win32/win32k/include/rect.h +++ b/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 */ diff --git a/reactos/subsystems/win32/win32k/include/region.h b/reactos/subsystems/win32/win32k/include/region.h index 3c075b14c04..491563bf910 100644 --- a/reactos/subsystems/win32/win32k/include/region.h +++ b/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); diff --git a/reactos/subsystems/win32/win32k/include/win32k.h b/reactos/subsystems/win32/win32k/include/win32k.h index 95423ad799b..f8c8a5f3504 100644 --- a/reactos/subsystems/win32/win32k/include/win32k.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/include/winsta.h b/reactos/subsystems/win32/win32k/include/winsta.h index 766f3967db3..0f0783b63dc 100644 --- a/reactos/subsystems/win32/win32k/include/winsta.h +++ b/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 diff --git a/reactos/subsystems/win32/win32k/ldr/loader.c b/reactos/subsystems/win32/win32k/ldr/loader.c index cffd07bc489..d90f76ad2b8 100644 --- a/reactos/subsystems/win32/win32k/ldr/loader.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c index 5bc3a528849..69df156c199 100644 --- a/reactos/subsystems/win32/win32k/main/dllmain.c +++ b/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) diff --git a/reactos/subsystems/win32/win32k/misc/driver.c b/reactos/subsystems/win32/win32k/misc/driver.c index 01c9c680301..2119d3a904c 100644 --- a/reactos/subsystems/win32/win32k/misc/driver.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/misc/err.c b/reactos/subsystems/win32/win32k/misc/err.c index 1c24a6b21b9..d584cc24832 100644 --- a/reactos/subsystems/win32/win32k/misc/err.c +++ b/reactos/subsystems/win32/win32k/misc/err.c @@ -62,7 +62,7 @@ GetLastNtError() } VOID -NTAPI +APIENTRY W32kRaiseStatus(NTSTATUS Status) { EXCEPTION_RECORD ExceptionRecord; diff --git a/reactos/subsystems/win32/win32k/misc/math.c b/reactos/subsystems/win32/win32k/misc/math.c index c3c1e842de4..2f9705f9250 100644 --- a/reactos/subsystems/win32/win32k/misc/math.c +++ b/reactos/subsystems/win32/win32k/misc/math.c @@ -25,7 +25,7 @@ * * @implemented */ -INT STDCALL EngMulDiv( +INT APIENTRY EngMulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) diff --git a/reactos/subsystems/win32/win32k/misc/usrheap.c b/reactos/subsystems/win32/win32k/misc/usrheap.c index a525f68756e..5c3ef2d7619 100644 --- a/reactos/subsystems/win32/win32k/misc/usrheap.c +++ b/reactos/subsystems/win32/win32k/misc/usrheap.c @@ -23,7 +23,7 @@ #include -static NTSTATUS NTAPI +static NTSTATUS APIENTRY IntUserHeapCommitRoutine(IN PVOID Base, IN OUT PVOID *CommitAddress, IN OUT PSIZE_T CommitSize) diff --git a/reactos/subsystems/win32/win32k/ntddraw/d3d.c b/reactos/subsystems/win32/win32k/ntddraw/d3d.c index 769478d3a1a..8371ff1a882 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/d3d.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntddraw/dd.c b/reactos/subsystems/win32/win32k/ntddraw/dd.c index 03940af895e..9cccbce1ef0 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dd.c +++ b/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) diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index 788cbcb695d..ff491a1bd2c 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/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) diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c b/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c index 9315e057037..388be271343 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntddraw/dvp.c b/reactos/subsystems/win32/win32k/ntddraw/dvp.c index 7d0e6c00784..de5fe6ad926 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dvp.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c index 51a16ceb452..1d7b8759b0c 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/ntddraw/eng.c b/reactos/subsystems/win32/win32k/ntddraw/eng.c index 73932a5672d..675b5965710 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/eng.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/ntddraw/mocomp.c b/reactos/subsystems/win32/win32k/ntddraw/mocomp.c index 156ef8574b6..10675789d5d 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/mocomp.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntuser/accelerator.c b/reactos/subsystems/win32/win32k/ntuser/accelerator.c index dd1b99d0443..27718dd72c0 100644 --- a/reactos/subsystems/win32/win32k/ntuser/accelerator.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/ntuser/callback.c b/reactos/subsystems/win32/win32k/ntuser/callback.c index bcb289ba4b0..d789ccd5a9f 100644 --- a/reactos/subsystems/win32/win32k/ntuser/callback.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/ntuser/caret.c b/reactos/subsystems/win32/win32k/ntuser/caret.c index 05aa0e88b0d..c4f79979f0c 100644 --- a/reactos/subsystems/win32/win32k/ntuser/caret.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/ntuser/class.c b/reactos/subsystems/win32/win32k/ntuser/class.c index 31f06042a34..3df463b1a1d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/class.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntuser/clipboard.c b/reactos/subsystems/win32/win32k/ntuser/clipboard.c index ae3e8175f66..07aa23bf271 100644 --- a/reactos/subsystems/win32/win32k/ntuser/clipboard.c +++ b/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 diff --git a/reactos/subsystems/win32/win32k/ntuser/csr.c b/reactos/subsystems/win32/win32k/ntuser/csr.c index 5c38aa6e438..f6053e80af1 100644 --- a/reactos/subsystems/win32/win32k/ntuser/csr.c +++ b/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) diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c index 12eb4d43be0..32e005564ae 100644 --- a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c +++ b/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(); diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c index 86d67e437da..c7a932cee1b 100644 --- a/reactos/subsystems/win32/win32k/ntuser/desktop.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/ntuser/display.c b/reactos/subsystems/win32/win32k/ntuser/display.c index e1985b977e7..195e6a2769a 100644 --- a/reactos/subsystems/win32/win32k/ntuser/display.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/ntuser/event.c b/reactos/subsystems/win32/win32k/ntuser/event.c index bfad44ebf26..71bdd55ca1f 100644 --- a/reactos/subsystems/win32/win32k/ntuser/event.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c index 799be812ce1..d6435e4412f 100644 --- a/reactos/subsystems/win32/win32k/ntuser/focus.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/ntuser/hook.c b/reactos/subsystems/win32/win32k/ntuser/hook.c index 4fe0b495df9..13633469ba1 100644 --- a/reactos/subsystems/win32/win32k/ntuser/hook.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntuser/hotkey.c b/reactos/subsystems/win32/win32k/ntuser/hotkey.c index 0379b81993f..f599ee4ca2a 100644 --- a/reactos/subsystems/win32/win32k/ntuser/hotkey.c +++ b/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; diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c index 583b978145b..52a3a556f85 100644 --- a/reactos/subsystems/win32/win32k/ntuser/input.c +++ b/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, diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c index 7c6e05c9078..28c7cdc748d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c +++ b/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) { diff --git a/reactos/subsystems/win32/win32k/ntuser/keyboard.c b/reactos/subsystems/win32/win32k/ntuser/keyboard.c index 66849968fff..552bd6c4e3d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/keyboard.c +++ b/reactos/subsystems/win32/win32k/ntuser/keyboard.c @@ -77,7 +77,7 @@ static UINT DontDistinguishShifts( UINT ret ) return ret; } -static VOID STDCALL SetKeyState(DWORD key, DWORD vk, DWORD ext, BOOL down) +static VOID APIENTRY SetKeyState(DWORD key, DWORD vk, DWORD ext, BOOL down) { ASSERT(vk <= 0xff); @@ -308,7 +308,7 @@ static BOOL TryToTranslateChar(WORD wVirtKey, } static -int STDCALL +int APIENTRY ToUnicodeInner(UINT wVirtKey, UINT wScanCode, PBYTE lpKeyState, @@ -362,7 +362,7 @@ DWORD FASTCALL UserGetKeyState(DWORD key) SHORT -STDCALL +APIENTRY NtUserGetKeyState( INT key) { @@ -397,7 +397,7 @@ DWORD FASTCALL UserGetAsyncKeyState(DWORD key) SHORT -STDCALL +APIENTRY NtUserGetAsyncKeyState( INT key) { @@ -503,7 +503,7 @@ IntTranslateKbdMessage(LPMSG lpMsg, } DWORD -STDCALL +APIENTRY NtUserGetKeyboardState( LPBYTE lpKeyState) { @@ -528,7 +528,7 @@ CLEANUP: } BOOL -STDCALL +APIENTRY NtUserSetKeyboardState(LPBYTE lpKeyState) { BOOL Result = TRUE; @@ -662,7 +662,7 @@ static UINT IntMapVirtualKeyEx( UINT Code, UINT Type, PKBDTABLES keyLayout ) } UINT -STDCALL +APIENTRY NtUserMapVirtualKeyEx( UINT Code, UINT Type, DWORD keyboardId, HKL dwhkl ) { PTHREADINFO pti; @@ -688,7 +688,7 @@ CLEANUP: int -STDCALL +APIENTRY NtUserToUnicodeEx( UINT wVirtKey, UINT wScanCode, @@ -758,7 +758,7 @@ static int W32kSimpleToupper( int ch ) } DWORD -STDCALL +APIENTRY NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ) { PTHREADINFO pti; @@ -996,7 +996,7 @@ UserGetKeyboardType( look for wChar match. */ DWORD -STDCALL +APIENTRY NtUserVkKeyScanEx( WCHAR wChar, HKL KeyboardLayout, diff --git a/reactos/subsystems/win32/win32k/ntuser/menu.c b/reactos/subsystems/win32/win32k/ntuser/menu.c index 6a499ceb1f3..da345af856c 100644 --- a/reactos/subsystems/win32/win32k/ntuser/menu.c +++ b/reactos/subsystems/win32/win32k/ntuser/menu.c @@ -1325,7 +1325,7 @@ IntCleanupMenus(struct _EPROCESS *Process, PW32PROCESS Win32Process) return TRUE; } -VOID STDCALL +VOID APIENTRY co_InflateRect(LPRECT rect, int dx, int dy) { rect->left -= dx; @@ -1334,7 +1334,7 @@ co_InflateRect(LPRECT rect, int dx, int dy) rect->bottom += dy; } -BOOLEAN STDCALL +BOOLEAN APIENTRY intGetTitleBarInfo(PWINDOW_OBJECT pWindowObject, PTITLEBARINFO bti) { @@ -1472,7 +1472,7 @@ intGetTitleBarInfo(PWINDOW_OBJECT pWindowObject, PTITLEBARINFO bti) * @implemented */ DWORD -STDCALL +APIENTRY NtUserBuildMenuItemList( HMENU hMenu, VOID* Buffer, @@ -1512,7 +1512,7 @@ CLEANUP: /* * @implemented */ -DWORD STDCALL +DWORD APIENTRY NtUserCheckMenuItem( HMENU hMenu, UINT uIDCheckItem, @@ -1582,7 +1582,7 @@ HMENU FASTCALL UserCreateMenu(BOOL PopupMenu) /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserDeleteMenu( HMENU hMenu, UINT uPosition, @@ -1610,7 +1610,7 @@ CLEANUP: /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN APIENTRY NtUserGetTitleBarInfo( HWND hwnd, PTITLEBARINFO bti) @@ -1700,7 +1700,7 @@ BOOL FASTCALL UserDestroyMenu(HMENU hMenu) /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserDestroyMenu( HMENU hMenu) { @@ -1733,7 +1733,7 @@ CLEANUP: /* * @implemented */ -UINT STDCALL +UINT APIENTRY NtUserEnableMenuItem( HMENU hMenu, UINT uIDEnableItem, @@ -1762,7 +1762,7 @@ CLEANUP: /* * @implemented */ -DWORD STDCALL +DWORD APIENTRY UserInsertMenuItem( HMENU hMenu, UINT uItem, @@ -1821,7 +1821,7 @@ CLEANUP: /* * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserEndMenu(VOID) { UNIMPLEMENTED @@ -1833,7 +1833,7 @@ NtUserEndMenu(VOID) /* * @implemented */ -UINT STDCALL +UINT APIENTRY NtUserGetMenuDefaultItem( HMENU hMenu, UINT fByPos, @@ -1863,7 +1863,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserGetMenuBarInfo( HWND hwnd, LONG idObject, @@ -2079,7 +2079,7 @@ CLEANUP: /* * @unimplemented */ -UINT STDCALL +UINT APIENTRY NtUserGetMenuIndex( HMENU hMenu, UINT wID) @@ -2093,7 +2093,7 @@ NtUserGetMenuIndex( /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserGetMenuItemRect( HWND hWnd, HMENU hMenu, @@ -2168,7 +2168,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserHiliteMenuItem( HWND hWnd, HMENU hMenu, @@ -2267,7 +2267,7 @@ UserMenuInfo( * @implemented */ BOOL -STDCALL +APIENTRY NtUserMenuInfo( HMENU hMenu, PROSMENUINFO UnsafeMenuInfo, @@ -2297,7 +2297,7 @@ CLEANUP: /* * @implemented */ -int STDCALL +int APIENTRY NtUserMenuItemFromPoint( HWND hWnd, HMENU hMenu, @@ -2424,7 +2424,7 @@ UserMenuItemInfo( * @implemented */ BOOL -STDCALL +APIENTRY NtUserMenuItemInfo( HMENU hMenu, UINT Item, @@ -2456,7 +2456,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserRemoveMenu( HMENU hMenu, UINT uPosition, @@ -2486,7 +2486,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetMenuContextHelpId( HMENU hMenu, DWORD dwContextHelpId) @@ -2515,7 +2515,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetMenuDefaultItem( HMENU hMenu, UINT uItem, @@ -2544,7 +2544,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetMenuFlagRtoL( HMENU hMenu) { @@ -2571,7 +2571,7 @@ CLEANUP: /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserThunkedMenuInfo( HMENU hMenu, LPCMENUINFO lpcmi) @@ -2585,7 +2585,7 @@ NtUserThunkedMenuInfo( /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserThunkedMenuItemInfo( HMENU hMenu, UINT uItem, @@ -2609,7 +2609,7 @@ NtUserThunkedMenuItemInfo( * @implemented */ /* NOTE: unused function */ -BOOL STDCALL +BOOL APIENTRY NtUserTrackPopupMenuEx( HMENU hMenu, UINT fuFlags, diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c index bcff2791512..fbd14bae554 100644 --- a/reactos/subsystems/win32/win32k/ntuser/message.c +++ b/reactos/subsystems/win32/win32k/ntuser/message.c @@ -343,7 +343,7 @@ IntCallWndProcRet BOOL -STDCALL +APIENTRY NtUserCallMsgFilter( LPMSG lpmsg, INT code) @@ -404,7 +404,7 @@ CLEANUP: END_CLEANUP; } -LRESULT STDCALL +LRESULT APIENTRY NtUserDispatchMessage(PNTUSERDISPATCHMESSAGEINFO UnsafeMsgInfo) { NTSTATUS Status; @@ -494,7 +494,7 @@ CLEANUP: } -BOOL STDCALL +BOOL APIENTRY NtUserTranslateMessage(LPMSG lpMsg, HKL dwhkl) { @@ -961,7 +961,7 @@ MsgExit: return Present; } -BOOL STDCALL +BOOL APIENTRY NtUserPeekMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, HWND hWnd, UINT MsgFilterMin, @@ -1084,7 +1084,7 @@ co_IntWaitMessage(HWND Wnd, return FALSE; } -BOOL STDCALL +BOOL APIENTRY NtUserGetMessage(PNTUSERGETMESSAGEINFO UnsafeInfo, HWND hWnd, UINT MsgFilterMin, @@ -1364,7 +1364,7 @@ UserPostMessage(HWND Wnd, } -BOOL STDCALL +BOOL APIENTRY NtUserPostMessage(HWND hWnd, UINT Msg, WPARAM wParam, @@ -1385,7 +1385,7 @@ CLEANUP: -BOOL STDCALL +BOOL APIENTRY NtUserPostThreadMessage(DWORD idThread, UINT Msg, WPARAM wParam, @@ -1442,7 +1442,7 @@ CLEANUP: END_CLEANUP; } -DWORD STDCALL +DWORD APIENTRY NtUserQuerySendMessage(DWORD Unknown0) { UNIMPLEMENTED; @@ -1792,7 +1792,7 @@ co_IntDoSendMessage(HWND hWnd, return (LRESULT)Result; } -LRESULT STDCALL +LRESULT APIENTRY NtUserSendMessageTimeout(HWND hWnd, UINT Msg, WPARAM wParam, @@ -1831,7 +1831,7 @@ CLEANUP: END_CLEANUP; } -LRESULT STDCALL +LRESULT APIENTRY NtUserSendMessage(HWND Wnd, UINT Msg, WPARAM wParam, @@ -1925,7 +1925,7 @@ UserSendNotifyMessage(HWND hWnd, } -BOOL STDCALL +BOOL APIENTRY NtUserSendNotifyMessage(HWND hWnd, UINT Msg, WPARAM wParam, @@ -1946,7 +1946,7 @@ CLEANUP: } -BOOL STDCALL +BOOL APIENTRY NtUserWaitMessage(VOID) { DECLARE_RETURN(BOOL); @@ -1962,7 +1962,7 @@ CLEANUP: END_CLEANUP; } -DWORD STDCALL +DWORD APIENTRY IntGetQueueStatus(BOOL ClearChanges) { PTHREADINFO pti; @@ -1988,7 +1988,7 @@ CLEANUP: END_CLEANUP; } -BOOL STDCALL +BOOL APIENTRY IntInitMessagePumpHook() { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) @@ -1999,7 +1999,7 @@ IntInitMessagePumpHook() return FALSE; } -BOOL STDCALL +BOOL APIENTRY IntUninitMessagePumpHook() { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) @@ -2015,7 +2015,7 @@ IntUninitMessagePumpHook() } -LRESULT STDCALL +LRESULT APIENTRY NtUserMessageCall( HWND hWnd, UINT Msg, @@ -2188,7 +2188,7 @@ NtUserMessageCall( #define WAIT_FAILED ((DWORD)0xFFFFFFFF) DWORD -NTAPI +APIENTRY NtUserWaitForInputIdle( IN HANDLE hProcess, IN DWORD dwMilliseconds, diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c index a13b87a479b..b934e69feaa 100644 --- a/reactos/subsystems/win32/win32k/ntuser/misc.c +++ b/reactos/subsystems/win32/win32k/ntuser/misc.c @@ -63,7 +63,7 @@ IntGdiGetLanguageID() /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserGetThreadState( DWORD Routine) { @@ -107,7 +107,7 @@ CLEANUP: UINT -STDCALL +APIENTRY NtUserGetDoubleClickTime(VOID) { UINT Result; @@ -139,7 +139,7 @@ CLEANUP: } BOOL -STDCALL +APIENTRY NtUserGetGUIThreadInfo( DWORD idThread, /* if NULL use foreground thread */ LPGUITHREADINFO lpgui) @@ -244,7 +244,7 @@ CLEANUP: DWORD -STDCALL +APIENTRY NtUserGetGuiResources( HANDLE hProcess, DWORD uiFlags) diff --git a/reactos/subsystems/win32/win32k/ntuser/monitor.c b/reactos/subsystems/win32/win32k/ntuser/monitor.c index d93047b966d..a86619c82e8 100644 --- a/reactos/subsystems/win32/win32k/ntuser/monitor.c +++ b/reactos/subsystems/win32/win32k/ntuser/monitor.c @@ -453,7 +453,7 @@ IntGetMonitorsFromRect(OPTIONAL IN LPCRECT pRect, * The number of monitors which intersect the specified region or -1 on failure. */ INT -STDCALL +APIENTRY NtUserEnumDisplayMonitors( OPTIONAL IN HDC hDC, OPTIONAL IN LPCRECT pRect, @@ -624,7 +624,7 @@ NtUserEnumDisplayMonitors( * */ BOOL -STDCALL +APIENTRY NtUserGetMonitorInfo( IN HMONITOR hMonitor, OUT LPMONITORINFO pMonitorInfo) @@ -723,7 +723,7 @@ CLEANUP: * return value depends on dwFlags */ HMONITOR -STDCALL +APIENTRY NtUserMonitorFromPoint( IN POINT point, IN DWORD dwFlags) @@ -781,7 +781,7 @@ NtUserMonitorFromPoint( * return value depends on dwFlags */ HMONITOR -STDCALL +APIENTRY NtUserMonitorFromRect( IN LPCRECT pRect, IN DWORD dwFlags) @@ -876,7 +876,7 @@ NtUserMonitorFromRect( HMONITOR -STDCALL +APIENTRY NtUserMonitorFromWindow( IN HWND hWnd, IN DWORD dwFlags) diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c index f79c19315fe..8ca75f2bd92 100644 --- a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c +++ b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c @@ -294,7 +294,7 @@ MsqIsDblClk(LPMSG Msg, BOOL Remove) return Res; } -BOOL static STDCALL +BOOL static APIENTRY co_MsqTranslateMouseMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd, UINT FilterLow, UINT FilterHigh, PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed, PWINDOW_OBJECT ScopeWin, PPOINT ScreenPoint, BOOL FromGlobalQueue, PLIST_ENTRY *Next) @@ -505,7 +505,7 @@ co_MsqTranslateMouseMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd, UINT Fi return(TRUE); } -BOOL STDCALL +BOOL APIENTRY co_MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd, UINT FilterLow, UINT FilterHigh, BOOL Remove, PUSER_MESSAGE* Message) @@ -1009,7 +1009,7 @@ Notified: return(TRUE); } -VOID STDCALL +VOID APIENTRY MsqRemoveWindowMessagesFromQueue(PVOID pWindow) { PUSER_SENT_MESSAGE SentMessage; @@ -1311,7 +1311,7 @@ MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode) KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } -BOOLEAN STDCALL +BOOLEAN APIENTRY co_MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, IN BOOLEAN Hardware, IN BOOLEAN Remove, diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c index 419b5e5f330..6174b554fc7 100644 --- a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c +++ b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c @@ -13,7 +13,7 @@ #include DWORD -NTAPI +APIENTRY NtUserAssociateInputContext( DWORD dwUnknown1, DWORD dwUnknown2, @@ -25,7 +25,7 @@ NtUserAssociateInputContext( BOOL -NTAPI +APIENTRY NtUserAttachThreadInput( IN DWORD idAttach, IN DWORD idAttachTo, @@ -40,7 +40,7 @@ NtUserAttachThreadInput( // Works like BitBlt, http://msdn.microsoft.com/en-us/library/ms532278(VS.85).aspx // BOOL -NTAPI +APIENTRY NtUserBitBltSysBmp( HDC hdc, INT nXDest, @@ -71,7 +71,7 @@ NtUserBitBltSysBmp( } DWORD -NTAPI +APIENTRY NtUserBuildHimcList( DWORD dwUnknown1, DWORD dwUnknown2, @@ -83,7 +83,7 @@ NtUserBuildHimcList( } DWORD -STDCALL +APIENTRY NtUserConvertMemHandle( DWORD Unknown0, DWORD Unknown1) @@ -94,7 +94,7 @@ NtUserConvertMemHandle( } DWORD -STDCALL +APIENTRY NtUserCreateLocalMemHandle( DWORD Unknown0, DWORD Unknown1, @@ -107,7 +107,7 @@ NtUserCreateLocalMemHandle( } BOOL -NTAPI +APIENTRY NtUserDdeGetQualityOfService( IN HWND hwndClient, IN HWND hWndServer, @@ -119,7 +119,7 @@ NtUserDdeGetQualityOfService( } DWORD -STDCALL +APIENTRY NtUserDdeInitialize( DWORD Unknown0, DWORD Unknown1, @@ -133,7 +133,7 @@ NtUserDdeInitialize( } BOOL -NTAPI +APIENTRY NtUserDdeSetQualityOfService( IN HWND hwndClient, IN PSECURITY_QUALITY_OF_SERVICE pqosNew, @@ -145,7 +145,7 @@ NtUserDdeSetQualityOfService( } DWORD -NTAPI +APIENTRY NtUserDragObject( HWND hwnd1, HWND hwnd2, @@ -160,7 +160,7 @@ NtUserDragObject( } BOOL -NTAPI +APIENTRY NtUserDrawAnimatedRects( HWND hwnd, INT idAni, @@ -173,7 +173,7 @@ NtUserDrawAnimatedRects( } BOOL -STDCALL +APIENTRY NtUserEnumDisplayDevices ( PUNICODE_STRING lpDevice, /* device name */ DWORD iDevNum, /* display device */ @@ -206,7 +206,7 @@ NtUserEnumDisplayDevices ( } DWORD -STDCALL +APIENTRY NtUserEvent( DWORD Unknown0) { @@ -216,7 +216,7 @@ NtUserEvent( } DWORD -NTAPI +APIENTRY NtUserExcludeUpdateRgn( HDC hDC, HWND hWnd) @@ -227,7 +227,7 @@ NtUserExcludeUpdateRgn( } BOOL -NTAPI +APIENTRY NtUserGetAltTabInfo( HWND hwnd, INT iItem, @@ -242,7 +242,7 @@ NtUserGetAltTabInfo( } HBRUSH -NTAPI +APIENTRY NtUserGetControlBrush( HWND hwnd, HDC hdc, @@ -258,7 +258,7 @@ NtUserGetControlBrush( * Called from PaintRect, works almost like wine PaintRect16 but returns hBrush. */ HBRUSH -STDCALL +APIENTRY NtUserGetControlColor( HWND hwndParent, HWND hwnd, @@ -271,7 +271,7 @@ NtUserGetControlColor( } DWORD -STDCALL +APIENTRY NtUserGetCPD( DWORD Unknown0, DWORD Unknown1, @@ -283,7 +283,7 @@ NtUserGetCPD( } DWORD -STDCALL +APIENTRY NtUserGetImeHotKey( DWORD Unknown0, DWORD Unknown1, @@ -297,7 +297,7 @@ NtUserGetImeHotKey( DWORD -STDCALL +APIENTRY NtUserGetMouseMovePointsEx( UINT cbSize, LPMOUSEMOVEPOINT lppt, @@ -342,7 +342,7 @@ NtUserGetMouseMovePointsEx( BOOL -NTAPI +APIENTRY NtUserImpersonateDdeClientWindow( HWND hWndClient, HWND hWndServer) @@ -353,7 +353,7 @@ NtUserImpersonateDdeClientWindow( } NTSTATUS -STDCALL +APIENTRY NtUserInitializeClientPfnArrays( PPFNCLIENT pfnClientA, PPFNCLIENT pfnClientW, @@ -366,7 +366,7 @@ NtUserInitializeClientPfnArrays( } DWORD -STDCALL +APIENTRY NtUserInitTask( DWORD Unknown0, DWORD Unknown1, @@ -387,7 +387,7 @@ NtUserInitTask( } BOOL -NTAPI +APIENTRY NtUserLockWorkStation(VOID) { UNIMPLEMENTED @@ -396,7 +396,7 @@ NtUserLockWorkStation(VOID) } DWORD -STDCALL +APIENTRY NtUserMNDragLeave(VOID) { UNIMPLEMENTED @@ -405,7 +405,7 @@ NtUserMNDragLeave(VOID) } DWORD -STDCALL +APIENTRY NtUserMNDragOver( DWORD Unknown0, DWORD Unknown1) @@ -416,7 +416,7 @@ NtUserMNDragOver( } DWORD -STDCALL +APIENTRY NtUserModifyUserStartupInfoFlags( DWORD Unknown0, DWORD Unknown1) @@ -427,7 +427,7 @@ NtUserModifyUserStartupInfoFlags( } DWORD -STDCALL +APIENTRY NtUserNotifyIMEStatus( DWORD Unknown0, DWORD Unknown1, @@ -439,7 +439,7 @@ NtUserNotifyIMEStatus( } DWORD -STDCALL +APIENTRY NtUserQueryUserCounters( DWORD Unknown0, DWORD Unknown1, @@ -454,7 +454,7 @@ NtUserQueryUserCounters( DWORD -STDCALL +APIENTRY NtUserRegisterTasklist( DWORD Unknown0) { @@ -465,7 +465,7 @@ NtUserRegisterTasklist( DWORD -STDCALL +APIENTRY NtUserSBGetParms( DWORD Unknown0, DWORD Unknown1, @@ -478,7 +478,7 @@ NtUserSBGetParms( } DWORD -STDCALL +APIENTRY NtUserSetConsoleReserveKeys( DWORD Unknown0, DWORD Unknown1) @@ -489,7 +489,7 @@ NtUserSetConsoleReserveKeys( } DWORD -STDCALL +APIENTRY NtUserSetDbgTag( DWORD Unknown0, DWORD Unknown1) @@ -500,7 +500,7 @@ NtUserSetDbgTag( } DWORD -STDCALL +APIENTRY NtUserSetImeHotKey( DWORD Unknown0, DWORD Unknown1, @@ -515,7 +515,7 @@ NtUserSetImeHotKey( DWORD -STDCALL +APIENTRY NtUserSetRipFlags( DWORD Unknown0, DWORD Unknown1) @@ -526,7 +526,7 @@ NtUserSetRipFlags( } BOOL -STDCALL +APIENTRY NtUserSetSysColors( int cElements, IN CONST INT *lpaElements, @@ -566,7 +566,7 @@ NtUserSetSysColors( } DWORD -STDCALL +APIENTRY NtUserSetThreadState( DWORD Unknown0, DWORD Unknown1) @@ -577,7 +577,7 @@ NtUserSetThreadState( } BOOL -NTAPI +APIENTRY NtUserTrackMouseEvent( LPTRACKMOUSEEVENT lpEventTrack) { @@ -588,7 +588,7 @@ NtUserTrackMouseEvent( DWORD -STDCALL +APIENTRY NtUserUpdateInputContext( DWORD Unknown0, DWORD Unknown1, @@ -600,7 +600,7 @@ NtUserUpdateInputContext( } DWORD -STDCALL +APIENTRY NtUserUpdateInstance( DWORD Unknown0, DWORD Unknown1, @@ -612,7 +612,7 @@ NtUserUpdateInstance( } BOOL -NTAPI +APIENTRY NtUserUserHandleGrantAccess( IN HANDLE hUserHandle, IN HANDLE hJob, @@ -624,7 +624,7 @@ NtUserUserHandleGrantAccess( } DWORD -STDCALL +APIENTRY NtUserWaitForMsgAndEvent( DWORD Unknown0) { @@ -634,7 +634,7 @@ NtUserWaitForMsgAndEvent( } DWORD -STDCALL +APIENTRY NtUserWin32PoolAllocationStats( DWORD Unknown0, DWORD Unknown1, @@ -649,7 +649,7 @@ NtUserWin32PoolAllocationStats( } DWORD -STDCALL +APIENTRY NtUserYieldTask(VOID) { UNIMPLEMENTED @@ -659,7 +659,7 @@ NtUserYieldTask(VOID) DWORD -STDCALL +APIENTRY NtUserCheckImeHotKey( DWORD dwUnknown1, DWORD dwUnknown2) @@ -669,7 +669,7 @@ NtUserCheckImeHotKey( } DWORD -NTAPI +APIENTRY NtUserConsoleControl( DWORD dwUnknown1, DWORD dwUnknown2, @@ -680,7 +680,7 @@ NtUserConsoleControl( } DWORD -NTAPI +APIENTRY NtUserCreateInputContext( DWORD dwUnknown1) { @@ -689,7 +689,7 @@ NtUserCreateInputContext( } DWORD -NTAPI +APIENTRY NtUserDestroyInputContext( DWORD dwUnknown1) { @@ -698,7 +698,7 @@ NtUserDestroyInputContext( } DWORD -NTAPI +APIENTRY NtUserDisableThreadIme( DWORD dwUnknown1) { @@ -707,7 +707,7 @@ NtUserDisableThreadIme( } DWORD -NTAPI +APIENTRY NtUserGetAppImeLevel( DWORD dwUnknown1) { @@ -716,7 +716,7 @@ NtUserGetAppImeLevel( } DWORD -NTAPI +APIENTRY NtUserGetAtomName( ATOM nAtom, LPWSTR lpBuffer) @@ -726,7 +726,7 @@ NtUserGetAtomName( } DWORD -NTAPI +APIENTRY NtUserGetImeInfoEx( DWORD dwUnknown1, DWORD dwUnknown2) @@ -736,7 +736,7 @@ NtUserGetImeInfoEx( } DWORD -NTAPI +APIENTRY NtUserGetRawInputBuffer( PRAWINPUT pData, PUINT pcbSize, @@ -747,7 +747,7 @@ NtUserGetRawInputBuffer( } DWORD -NTAPI +APIENTRY NtUserGetRawInputData( HRAWINPUT hRawInput, UINT uiCommand, @@ -760,7 +760,7 @@ NtUserGetRawInputData( } DWORD -NTAPI +APIENTRY NtUserGetRawInputDeviceInfo( HANDLE hDevice, UINT uiCommand, @@ -773,7 +773,7 @@ NtUserGetRawInputDeviceInfo( } DWORD -NTAPI +APIENTRY NtUserGetRawInputDeviceList( PRAWINPUTDEVICELIST pRawInputDeviceList, PUINT puiNumDevices, @@ -784,7 +784,7 @@ NtUserGetRawInputDeviceList( } DWORD -NTAPI +APIENTRY NtUserGetRegisteredRawInputDevices( PRAWINPUTDEVICE pRawInputDevices, PUINT puiNumDevices, @@ -795,7 +795,7 @@ NtUserGetRegisteredRawInputDevices( } DWORD -NTAPI +APIENTRY NtUserHardErrorControl( DWORD dwUnknown1, DWORD dwUnknown2, @@ -809,7 +809,7 @@ NtUserHardErrorControl( Called from win32csr. */ NTSTATUS -NTAPI +APIENTRY NtUserInitialize( DWORD dwWinVersion, HANDLE hPowerRequestEvent, @@ -844,7 +844,7 @@ NtUserInitialize( } DWORD -NTAPI +APIENTRY NtUserMinMaximize( HWND hWnd, UINT cmd, // Wine SW_ commands @@ -855,7 +855,7 @@ NtUserMinMaximize( } DWORD -NTAPI +APIENTRY NtUserNotifyProcessCreate( DWORD dwUnknown1, DWORD dwUnknown2, @@ -867,7 +867,7 @@ NtUserNotifyProcessCreate( } BOOL -NTAPI +APIENTRY NtUserPrintWindow( HWND hwnd, HDC hdcBlt, @@ -878,7 +878,7 @@ NtUserPrintWindow( } NTSTATUS -NTAPI +APIENTRY NtUserProcessConnect( HANDLE Process, PUSERCONNECT pUserConnect, @@ -889,7 +889,7 @@ NtUserProcessConnect( } DWORD -NTAPI +APIENTRY NtUserQueryInformationThread( DWORD dwUnknown1, DWORD dwUnknown2, @@ -902,7 +902,7 @@ NtUserQueryInformationThread( } DWORD -NTAPI +APIENTRY NtUserQueryInputContext( DWORD dwUnknown1, DWORD dwUnknown2) @@ -912,7 +912,7 @@ NtUserQueryInputContext( } DWORD -NTAPI +APIENTRY NtUserRealInternalGetMessage( DWORD dwUnknown1, DWORD dwUnknown2, @@ -926,7 +926,7 @@ NtUserRealInternalGetMessage( } DWORD -NTAPI +APIENTRY NtUserRealWaitMessageEx( DWORD dwUnknown1, DWORD dwUnknown2) @@ -936,7 +936,7 @@ NtUserRealWaitMessageEx( } DWORD -NTAPI +APIENTRY NtUserRegisterUserApiHook( DWORD dwUnknown1, DWORD dwUnknown2) @@ -946,7 +946,7 @@ NtUserRegisterUserApiHook( } BOOL -NTAPI +APIENTRY NtUserRegisterRawInputDevices( IN PCRAWINPUTDEVICE pRawInputDevices, IN UINT uiNumDevices, @@ -957,7 +957,7 @@ NtUserRegisterRawInputDevices( } DWORD -NTAPI +APIENTRY NtUserResolveDesktop( DWORD dwUnknown1, DWORD dwUnknown2, @@ -969,7 +969,7 @@ NtUserResolveDesktop( } DWORD -NTAPI +APIENTRY NtUserSetAppImeLevel( DWORD dwUnknown1, DWORD dwUnknown2) @@ -979,7 +979,7 @@ NtUserSetAppImeLevel( } DWORD -NTAPI +APIENTRY NtUserSetImeInfoEx( DWORD dwUnknown1) { @@ -988,7 +988,7 @@ NtUserSetImeInfoEx( } DWORD -NTAPI +APIENTRY NtUserSetInformationProcess( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1000,7 +1000,7 @@ NtUserSetInformationProcess( } DWORD -NTAPI +APIENTRY NtUserSetInformationThread( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1012,7 +1012,7 @@ NtUserSetInformationThread( } DWORD -NTAPI +APIENTRY NtUserSetThreadLayoutHandles( DWORD dwUnknown1, DWORD dwUnknown2) @@ -1022,7 +1022,7 @@ NtUserSetThreadLayoutHandles( } BOOL -NTAPI +APIENTRY NtUserSoundSentry(VOID) { UNIMPLEMENTED; @@ -1030,7 +1030,7 @@ NtUserSoundSentry(VOID) } DWORD -NTAPI +APIENTRY NtUserTestForInteractiveUser( DWORD dwUnknown1) { @@ -1040,7 +1040,7 @@ NtUserTestForInteractiveUser( /* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634ccb2c30630da7e3666d3d07/b47155634ccb2c30630da7e3666d3d07.trace.html#NtUserGetIconSize */ DWORD -NTAPI +APIENTRY NtUserCalcMenuBar( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1053,7 +1053,7 @@ NtUserCalcMenuBar( } DWORD -NTAPI +APIENTRY NtUserPaintMenuBar( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1067,7 +1067,7 @@ NtUserPaintMenuBar( } DWORD -NTAPI +APIENTRY NtUserUnregisterUserApiHook(VOID) { UNIMPLEMENTED; @@ -1075,7 +1075,7 @@ NtUserUnregisterUserApiHook(VOID) } BOOL -NTAPI +APIENTRY NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *pcrKey, @@ -1089,7 +1089,7 @@ NtUserGetLayeredWindowAttributes( /* ValidateRect gets redirected to NtUserValidateRect: http://blog.csdn.net/ntdll/archive/2005/10/19/509299.aspx */ BOOL -NTAPI +APIENTRY NtUserValidateRect( HWND hWnd, CONST RECT *lpRect) @@ -1099,7 +1099,7 @@ NtUserValidateRect( } DWORD -NTAPI +APIENTRY NtUserValidateTimerCallback( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1110,7 +1110,7 @@ NtUserValidateTimerCallback( } DWORD -NTAPI +APIENTRY NtUserRemoteConnect( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1121,7 +1121,7 @@ NtUserRemoteConnect( } DWORD -NTAPI +APIENTRY NtUserRemoteRedrawRectangle( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1133,7 +1133,7 @@ NtUserRemoteRedrawRectangle( } DWORD -NTAPI +APIENTRY NtUserRemoteRedrawScreen(VOID) { UNIMPLEMENTED; @@ -1141,7 +1141,7 @@ NtUserRemoteRedrawScreen(VOID) } DWORD -NTAPI +APIENTRY NtUserRemoteStopScreenUpdates(VOID) { UNIMPLEMENTED; @@ -1149,7 +1149,7 @@ NtUserRemoteStopScreenUpdates(VOID) } DWORD -NTAPI +APIENTRY NtUserCtxDisplayIOCtl( DWORD dwUnknown1, DWORD dwUnknown2, diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c index 7a5a31a1c2a..75e1b3a4fec 100644 --- a/reactos/subsystems/win32/win32k/ntuser/painting.c +++ b/reactos/subsystems/win32/win32k/ntuser/painting.c @@ -765,7 +765,7 @@ co_IntFixCaret(PWINDOW_OBJECT Window, LPRECT lprc, UINT flags) * @implemented */ -HDC STDCALL +HDC APIENTRY NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs) { PWINDOW_OBJECT Window = NULL; @@ -876,7 +876,7 @@ CLEANUP: * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserEndPaint(HWND hWnd, CONST PAINTSTRUCT* pUnsafePs) { NTSTATUS Status = STATUS_SUCCESS; @@ -959,7 +959,7 @@ co_UserGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase) * @implemented */ -INT STDCALL +INT APIENTRY NtUserGetUpdateRgn(HWND hWnd, HRGN hRgn, BOOL bErase) { DECLARE_RETURN(INT); @@ -994,7 +994,7 @@ CLEANUP: * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserGetUpdateRect(HWND hWnd, LPRECT UnsafeRect, BOOL bErase) { PWINDOW_OBJECT Window; @@ -1078,7 +1078,7 @@ CLEANUP: * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserRedrawWindow(HWND hWnd, CONST RECT *lprcUpdate, HRGN hrgnUpdate, UINT flags) { @@ -1237,7 +1237,7 @@ UserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcScroll, * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcUnsafeScroll, const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate) { @@ -1321,7 +1321,7 @@ CLEANUP: * @implemented */ -DWORD STDCALL +DWORD APIENTRY NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *prcUnsafeScroll, const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate, UINT flags) { @@ -1891,7 +1891,7 @@ UserRealizePalette(HDC hdc) } BOOL -STDCALL +APIENTRY NtUserDrawCaptionTemp( HWND hWnd, HDC hDC, @@ -1946,7 +1946,7 @@ NtUserDrawCaptionTemp( } BOOL -STDCALL +APIENTRY NtUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, @@ -1956,7 +1956,7 @@ NtUserDrawCaption(HWND hWnd, } BOOL -NTAPI +APIENTRY NtUserInvalidateRect( HWND hWnd, CONST RECT *lpUnsafeRect, @@ -1966,7 +1966,7 @@ NtUserInvalidateRect( } BOOL -NTAPI +APIENTRY NtUserInvalidateRgn( HWND hWnd, HRGN hRgn, diff --git a/reactos/subsystems/win32/win32k/ntuser/prop.c b/reactos/subsystems/win32/win32k/ntuser/prop.c index e373bf69404..9098aa5b8d0 100644 --- a/reactos/subsystems/win32/win32k/ntuser/prop.c +++ b/reactos/subsystems/win32/win32k/ntuser/prop.c @@ -56,7 +56,7 @@ IntGetProp(PWINDOW_OBJECT Window, ATOM Atom) return(NULL); } -NTSTATUS STDCALL +NTSTATUS APIENTRY NtUserBuildPropList(HWND hWnd, LPVOID Buffer, DWORD BufferSize, @@ -129,7 +129,7 @@ CLEANUP: END_CLEANUP; } -HANDLE STDCALL +HANDLE APIENTRY NtUserRemoveProp(HWND hWnd, ATOM Atom) { PWINDOW_OBJECT Window; @@ -190,7 +190,7 @@ IntSetProp(PWINDOW_OBJECT pWnd, ATOM Atom, HANDLE Data) } -BOOL STDCALL +BOOL APIENTRY NtUserSetProp(HWND hWnd, ATOM Atom, HANDLE Data) { PWINDOW_OBJECT Window; diff --git a/reactos/subsystems/win32/win32k/ntuser/scrollbar.c b/reactos/subsystems/win32/win32k/ntuser/scrollbar.c index ef586efaafb..59327882fdb 100644 --- a/reactos/subsystems/win32/win32k/ntuser/scrollbar.c +++ b/reactos/subsystems/win32/win32k/ntuser/scrollbar.c @@ -498,7 +498,7 @@ IntDestroyScrollBars(PWINDOW_OBJECT Window) return FALSE; } -BOOL STDCALL +BOOL APIENTRY IntEnableScrollBar(BOOL Horz, PSCROLLBARINFO Info, UINT wArrows) { BOOL Chg = FALSE; @@ -538,7 +538,7 @@ IntEnableScrollBar(BOOL Horz, PSCROLLBARINFO Info, UINT wArrows) BOOL -STDCALL +APIENTRY NtUserGetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) { NTSTATUS Status; @@ -585,7 +585,7 @@ CLEANUP: BOOL -STDCALL +APIENTRY NtUserGetScrollInfo(HWND hWnd, int fnBar, LPSCROLLINFO lpsi) { NTSTATUS Status; @@ -640,7 +640,7 @@ CLEANUP: BOOL -STDCALL +APIENTRY NtUserEnableScrollBar( HWND hWnd, UINT wSBflags, @@ -720,7 +720,7 @@ CLEANUP: } BOOL -STDCALL +APIENTRY NtUserSetScrollBarInfo( HWND hWnd, LONG idObject, @@ -783,7 +783,7 @@ CLEANUP: } DWORD -STDCALL +APIENTRY NtUserSetScrollInfo( HWND hWnd, int fnBar, @@ -892,7 +892,7 @@ co_UserShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow) } -DWORD STDCALL +DWORD APIENTRY NtUserShowScrollBar(HWND hWnd, int wBar, DWORD bShow) { PWINDOW_OBJECT Window; diff --git a/reactos/subsystems/win32/win32k/ntuser/simplecall.c b/reactos/subsystems/win32/win32k/ntuser/simplecall.c index 2301ca95806..5ef7349aef8 100644 --- a/reactos/subsystems/win32/win32k/ntuser/simplecall.c +++ b/reactos/subsystems/win32/win32k/ntuser/simplecall.c @@ -75,7 +75,7 @@ co_IntRegisterLogonProcess(HANDLE ProcessId, BOOL Register) * @unimplemented */ DWORD -STDCALL +APIENTRY NtUserCallNoParam(DWORD Routine) { DWORD Result = 0; @@ -139,7 +139,7 @@ CLEANUP: * @implemented */ DWORD -STDCALL +APIENTRY NtUserCallOneParam( DWORD Param, DWORD Routine) @@ -416,7 +416,7 @@ CLEANUP: * @implemented */ DWORD -STDCALL +APIENTRY NtUserCallTwoParam( DWORD Param1, DWORD Param2, @@ -680,7 +680,7 @@ CLEANUP: * @unimplemented */ BOOL -STDCALL +APIENTRY NtUserCallHwndLock( HWND hWnd, DWORD Routine) @@ -757,7 +757,7 @@ CLEANUP: * @unimplemented */ HWND -STDCALL +APIENTRY NtUserCallHwndOpt( HWND hWnd, DWORD Routine) @@ -777,7 +777,7 @@ NtUserCallHwndOpt( } DWORD -STDCALL +APIENTRY NtUserCallHwnd( HWND hWnd, DWORD Routine) @@ -800,7 +800,7 @@ NtUserCallHwnd( } DWORD -STDCALL +APIENTRY NtUserCallHwndParam( HWND hWnd, DWORD Param, @@ -819,7 +819,7 @@ NtUserCallHwndParam( } DWORD -STDCALL +APIENTRY NtUserCallHwndParamLock( HWND hWnd, DWORD Param, diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/subsystems/win32/win32k/ntuser/sysparams.c index 9eb1554cd46..9896cf9e6f6 100644 --- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c +++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c @@ -1359,7 +1359,7 @@ UserSystemParametersInfo( * @implemented */ BOOL -STDCALL +APIENTRY NtUserSystemParametersInfo( UINT uiAction, UINT uiParam, @@ -1380,7 +1380,7 @@ CLEANUP: } -BOOL STDCALL +BOOL APIENTRY NtUserUpdatePerUserSystemParameters( DWORD dwReserved, BOOL bEnable) diff --git a/reactos/subsystems/win32/win32k/ntuser/timer.c b/reactos/subsystems/win32/win32k/ntuser/timer.c index 8bd52e26c55..f03bea603b0 100644 --- a/reactos/subsystems/win32/win32k/ntuser/timer.c +++ b/reactos/subsystems/win32/win32k/ntuser/timer.c @@ -231,7 +231,7 @@ InitTimerImpl(VOID) UINT_PTR -STDCALL +APIENTRY NtUserSetTimer ( HWND hWnd, @@ -255,7 +255,7 @@ CLEANUP: BOOL -STDCALL +APIENTRY NtUserKillTimer ( HWND hWnd, @@ -277,7 +277,7 @@ CLEANUP: UINT_PTR -STDCALL +APIENTRY NtUserSetSystemTimer( HWND hWnd, UINT_PTR nIDEvent, diff --git a/reactos/subsystems/win32/win32k/ntuser/windc.c b/reactos/subsystems/win32/win32k/ntuser/windc.c index fd1a03eee34..6ebf2653d92 100644 --- a/reactos/subsystems/win32/win32k/ntuser/windc.c +++ b/reactos/subsystems/win32/win32k/ntuser/windc.c @@ -132,7 +132,7 @@ DceAllocDCE(PWINDOW_OBJECT Window OPTIONAL, DCE_TYPE Type) return(pDce); } -static VOID STDCALL +static VOID APIENTRY DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags, BOOL SetClipOrigin) { @@ -865,7 +865,7 @@ UserGetWindowDC(PWINDOW_OBJECT Wnd) return UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); } -HDC STDCALL +HDC APIENTRY NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) { PWINDOW_OBJECT Wnd=NULL; @@ -898,13 +898,13 @@ CLEANUP: * Status * @implemented */ -HDC STDCALL +HDC APIENTRY NtUserGetWindowDC(HWND hWnd) { return NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); } -HDC STDCALL +HDC APIENTRY NtUserGetDC(HWND hWnd) { DPRINT("NtUGetDC -> %x:%x\n", hWnd, !hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE ); @@ -924,7 +924,7 @@ NtUserGetDC(HWND hWnd) * \todo implement ForceBackground == TRUE */ HPALETTE -STDCALL +APIENTRY NtUserSelectPalette(HDC hDC, HPALETTE hpal, BOOL ForceBackground) diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c index e6cfadba72b..8b440b56a10 100644 --- a/reactos/subsystems/win32/win32k/ntuser/window.c +++ b/reactos/subsystems/win32/win32k/ntuser/window.c @@ -1189,7 +1189,7 @@ IntIsWindowInDestroy(PWINDOW_OBJECT Window) /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserAlterWindowStyle(DWORD Unknown0, DWORD Unknown1, DWORD Unknown2) @@ -1211,7 +1211,7 @@ NtUserAlterWindowStyle(DWORD Unknown0, * @implemented */ NTSTATUS -STDCALL +APIENTRY NtUserBuildHwndList( HDESK hDesktop, HWND hwndParent, @@ -1364,7 +1364,7 @@ NtUserBuildHwndList( /* * @implemented */ -HWND STDCALL +HWND APIENTRY NtUserChildWindowFromPointEx(HWND hwndParent, LONG x, LONG y, @@ -1480,7 +1480,7 @@ IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT Window, RECT *rc, BOOL I /* * @implemented */ -HWND STDCALL +HWND APIENTRY co_IntCreateWindowEx(DWORD dwExStyle, PUNICODE_STRING ClassName, PUNICODE_STRING WindowName, @@ -2206,7 +2206,7 @@ CLEANUP: END_CLEANUP; } -HWND STDCALL +HWND APIENTRY NtUserCreateWindowEx(DWORD dwExStyle, PUNICODE_STRING UnsafeClassName, PUNICODE_STRING UnsafeWindowName, @@ -2296,7 +2296,7 @@ CLEANUP: /* * @unimplemented */ -HDWP STDCALL +HDWP APIENTRY NtUserDeferWindowPos(HDWP WinPosInfo, HWND Wnd, HWND WndInsertAfter, @@ -2450,7 +2450,7 @@ BOOLEAN FASTCALL co_UserDestroyWindow(PWINDOW_OBJECT Window) /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN APIENTRY NtUserDestroyWindow(HWND Wnd) { PWINDOW_OBJECT Window; @@ -2484,7 +2484,7 @@ CLEANUP: * @unimplemented */ DWORD -STDCALL +APIENTRY NtUserDrawMenuBarTemp( HWND hWnd, HDC hDC, @@ -2501,7 +2501,7 @@ NtUserDrawMenuBarTemp( /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserEndDeferWindowPosEx(DWORD Unknown0, DWORD Unknown1) { @@ -2517,7 +2517,7 @@ NtUserEndDeferWindowPosEx(DWORD Unknown0, /* * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserFillWindow(HWND hWndPaint, HWND hWndPaint1, HDC hDC, @@ -2603,7 +2603,7 @@ IntFindWindow(PWINDOW_OBJECT Parent, /* * @implemented */ -HWND STDCALL +HWND APIENTRY NtUserFindWindowEx(HWND hwndParent, HWND hwndChildAfter, PUNICODE_STRING ucClassName, @@ -2799,7 +2799,7 @@ CLEANUP: /* * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserFlashWindowEx(IN PFLASHWINFO pfwi) { UNIMPLEMENTED @@ -2887,7 +2887,7 @@ PWINDOW_OBJECT FASTCALL UserGetAncestor(PWINDOW_OBJECT Wnd, UINT Type) /* * @implemented */ -HWND STDCALL +HWND APIENTRY NtUserGetAncestor(HWND hWnd, UINT Type) { PWINDOW_OBJECT Window, Ancestor; @@ -2914,7 +2914,7 @@ CLEANUP: BOOL -STDCALL +APIENTRY NtUserGetComboBoxInfo( HWND hWnd, PCOMBOBOXINFO pcbi) @@ -2958,7 +2958,7 @@ CLEANUP: /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserGetInternalWindowPos( HWND hwnd, LPRECT rectWnd, LPPOINT ptIcon) @@ -2969,7 +2969,7 @@ NtUserGetInternalWindowPos( HWND hwnd, } DWORD -STDCALL +APIENTRY NtUserGetListBoxInfo( HWND hWnd) { @@ -3068,7 +3068,7 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) * @implemented */ -HWND STDCALL +HWND APIENTRY NtUserSetParent(HWND hWndChild, HWND hWndNewParent) { DECLARE_RETURN(HWND); @@ -3125,7 +3125,7 @@ HWND FASTCALL UserGetShellWindow() * Status * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) { PWINSTATION_OBJECT WinStaObject; @@ -3236,7 +3236,7 @@ CLEANUP: * @implemented */ -HMENU STDCALL +HMENU APIENTRY NtUserGetSystemMenu(HWND hWnd, BOOL bRevert) { PWINDOW_OBJECT Window; @@ -3271,7 +3271,7 @@ CLEANUP: * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetSystemMenu(HWND hWnd, HMENU hMenu) { BOOL Result = FALSE; @@ -3375,7 +3375,7 @@ UserGetWindow(HWND hWnd, UINT Relationship) * @implemented */ -HWND STDCALL +HWND APIENTRY NtUserGetWindow(HWND hWnd, UINT Relationship) { DECLARE_RETURN(HWND); @@ -3505,7 +3505,7 @@ UserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi) * @implemented */ -LONG STDCALL +LONG APIENTRY NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi) { DECLARE_RETURN(LONG); @@ -3730,7 +3730,7 @@ co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) * @implemented */ -LONG STDCALL +LONG APIENTRY NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) { DECLARE_RETURN(LONG); @@ -3755,7 +3755,7 @@ CLEANUP: * @implemented */ -WORD STDCALL +WORD APIENTRY NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) { PWINDOW_OBJECT Window; @@ -3804,7 +3804,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserGetWindowPlacement(HWND hWnd, WINDOWPLACEMENT *lpwndpl) { @@ -3882,7 +3882,7 @@ CLEANUP: /* * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserLockWindowUpdate(HWND hWnd) { UNIMPLEMENTED @@ -3894,7 +3894,7 @@ NtUserLockWindowUpdate(HWND hWnd) /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserMoveWindow( HWND hWnd, int X, @@ -3925,7 +3925,7 @@ NtUserMoveWindow( /* * @implemented */ -DWORD STDCALL +DWORD APIENTRY NtUserQueryWindow(HWND hWnd, DWORD Index) { PWINDOW_OBJECT Window; @@ -3979,7 +3979,7 @@ CLEANUP: /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserRealChildWindowFromPoint(DWORD Unknown0, DWORD Unknown1, DWORD Unknown2) @@ -3993,7 +3993,7 @@ NtUserRealChildWindowFromPoint(DWORD Unknown0, /* * @implemented */ -UINT STDCALL +UINT APIENTRY NtUserRegisterWindowMessage(PUNICODE_STRING MessageNameUnsafe) { UNICODE_STRING SafeMessageName; @@ -4032,7 +4032,7 @@ CLEANUP: /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserSetImeOwnerWindow(DWORD Unknown0, DWORD Unknown1) { @@ -4045,7 +4045,7 @@ NtUserSetImeOwnerWindow(DWORD Unknown0, /* * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserSetInternalWindowPos( HWND hwnd, UINT showCmd, @@ -4062,7 +4062,7 @@ NtUserSetInternalWindowPos( /* * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetLayeredWindowAttributes(HWND hwnd, COLORREF crKey, BYTE bAlpha, @@ -4076,7 +4076,7 @@ NtUserSetLayeredWindowAttributes(HWND hwnd, /* * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetLogonNotifyWindow(HWND hWnd) { UNIMPLEMENTED @@ -4088,7 +4088,7 @@ NtUserSetLogonNotifyWindow(HWND hWnd) /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetMenu( HWND hWnd, HMENU Menu, @@ -4134,7 +4134,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetWindowFNID(HWND hWnd, WORD fnID) { @@ -4172,7 +4172,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetWindowPlacement(HWND hWnd, WINDOWPLACEMENT *lpwndpl) { @@ -4235,7 +4235,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetWindowPos( HWND hWnd, HWND hWndInsertAfter, @@ -4356,7 +4356,7 @@ IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECT *Rect) /* * @implemented */ -INT STDCALL +INT APIENTRY NtUserSetWindowRgn( HWND hWnd, HRGN hRgn, @@ -4405,7 +4405,7 @@ CLEANUP: /* * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserShowWindow(HWND hWnd, LONG nCmdShow) { PWINDOW_OBJECT Window; @@ -4437,7 +4437,7 @@ CLEANUP: /* * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserShowWindowAsync(HWND hWnd, LONG nCmdShow) { #if 0 @@ -4453,7 +4453,7 @@ NtUserShowWindowAsync(HWND hWnd, LONG nCmdShow) * @unimplemented */ BOOL -STDCALL +APIENTRY NtUserUpdateLayeredWindow( HWND hwnd, HDC hdcDst, @@ -4474,7 +4474,7 @@ NtUserUpdateLayeredWindow( /* * @implemented */ -HWND STDCALL +HWND APIENTRY NtUserWindowFromPoint(LONG X, LONG Y) { POINT pt; @@ -4532,7 +4532,7 @@ CLEANUP: * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserDefSetText(HWND hWnd, PUNICODE_STRING WindowText) { PWINDOW_OBJECT Window; @@ -4648,7 +4648,7 @@ NtUserDefSetText(HWND hWnd, PUNICODE_STRING WindowText) * @implemented */ -INT STDCALL +INT APIENTRY NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) { PWINDOW_OBJECT Window; @@ -4773,7 +4773,7 @@ IntShowOwnedPopups(PWINDOW_OBJECT OwnerWnd, BOOL fShow ) */ BOOL -STDCALL +APIENTRY NtUserValidateHandleSecure( HANDLE handle, BOOL Restricted) diff --git a/reactos/subsystems/win32/win32k/ntuser/winpos.c b/reactos/subsystems/win32/win32k/ntuser/winpos.c index e306e00b97a..5cd7d754dc0 100644 --- a/reactos/subsystems/win32/win32k/ntuser/winpos.c +++ b/reactos/subsystems/win32/win32k/ntuser/winpos.c @@ -1662,7 +1662,7 @@ co_WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTes } BOOL -STDCALL +APIENTRY NtUserGetMinMaxInfo( HWND hWnd, MINMAXINFO *MinMaxInfo, diff --git a/reactos/subsystems/win32/win32k/ntuser/winsta.c b/reactos/subsystems/win32/win32k/ntuser/winsta.c index 816f4527907..4bb1b28d888 100644 --- a/reactos/subsystems/win32/win32k/ntuser/winsta.c +++ b/reactos/subsystems/win32/win32k/ntuser/winsta.c @@ -107,7 +107,7 @@ IntSetupClipboard(PWINSTATION_OBJECT WinStaObj) /* OBJECT CALLBACKS **********************************************************/ -VOID STDCALL +VOID APIENTRY IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) { PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)Parameters->Object; @@ -120,7 +120,7 @@ IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) } NTSTATUS -STDCALL +APIENTRY IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters) { PUNICODE_STRING RemainingName = Parameters->RemainingName; @@ -375,7 +375,7 @@ IntGetScreenDC(VOID) * @implemented */ -HWINSTA STDCALL +HWINSTA APIENTRY NtUserCreateWindowStation( PUNICODE_STRING lpszWindowStationName, ACCESS_MASK dwDesiredAccess, @@ -590,7 +590,7 @@ NtUserCreateWindowStation( * @implemented */ -HWINSTA STDCALL +HWINSTA APIENTRY NtUserOpenWindowStation( PUNICODE_STRING lpszWindowStationName, ACCESS_MASK dwDesiredAccess) @@ -665,7 +665,7 @@ NtUserOpenWindowStation( */ BOOL -STDCALL +APIENTRY NtUserCloseWindowStation( HWINSTA hWinSta) { @@ -746,7 +746,7 @@ NtUserCloseWindowStation( * @unimplemented */ -BOOL STDCALL +BOOL APIENTRY NtUserGetObjectInformation( HANDLE hObject, DWORD nIndex, @@ -898,7 +898,7 @@ NtUserGetObjectInformation( */ BOOL -STDCALL +APIENTRY NtUserSetObjectInformation( HANDLE hObject, DWORD nIndex, @@ -962,7 +962,7 @@ UserGetProcessWindowStation(VOID) * @implemented */ -HWINSTA STDCALL +HWINSTA APIENTRY NtUserGetProcessWindowStation(VOID) { return UserGetProcessWindowStation(); @@ -1021,7 +1021,7 @@ IntGetWinStaObj(VOID) * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserSetProcessWindowStation(HWINSTA hWindowStation) { HANDLE hOld; @@ -1074,7 +1074,7 @@ NtUserSetProcessWindowStation(HWINSTA hWindowStation) * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserLockWindowStation(HWINSTA hWindowStation) { PWINSTATION_OBJECT Object; @@ -1118,7 +1118,7 @@ NtUserLockWindowStation(HWINSTA hWindowStation) * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtUserUnlockWindowStation(HWINSTA hWindowStation) { PWINSTATION_OBJECT Object; @@ -1162,7 +1162,7 @@ NtUserUnlockWindowStation(HWINSTA hWindowStation) * @unimplemented */ -DWORD STDCALL +DWORD APIENTRY NtUserSetWindowStationUser( DWORD Unknown0, DWORD Unknown1, @@ -1489,7 +1489,7 @@ BuildDesktopNameList( * @implemented */ -NTSTATUS STDCALL +NTSTATUS APIENTRY NtUserBuildNameList( HWINSTA hWindowStation, ULONG dwSize, diff --git a/reactos/subsystems/win32/win32k/objects/arc.c b/reactos/subsystems/win32/win32k/objects/arc.c index d2db5d7d181..05a25509f55 100644 --- a/reactos/subsystems/win32/win32k/objects/arc.c +++ b/reactos/subsystems/win32/win32k/objects/arc.c @@ -341,7 +341,7 @@ NtGdiAngleArc( } BOOL -STDCALL +APIENTRY NtGdiArcInternal( ARCTYPE arctype, HDC hDC, diff --git a/reactos/subsystems/win32/win32k/objects/bezier.c b/reactos/subsystems/win32/win32k/objects/bezier.c index 0c6784bff3f..758e266b690 100644 --- a/reactos/subsystems/win32/win32k/objects/bezier.c +++ b/reactos/subsystems/win32/win32k/objects/bezier.c @@ -143,7 +143,7 @@ static BOOL FASTCALL BezierCheck( int level, POINT *Points) /* Helper for GDI_Bezier. * Just handles one Bezier, so Points should point to four POINTs */ -static void STDCALL GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut, +static void APIENTRY GDI_InternalBezier( POINT *Points, POINT **PtsOut, INT *dwOut, INT *nPtsOut, INT level ) { if(*nPtsOut == *dwOut) { diff --git a/reactos/subsystems/win32/win32k/objects/bitblt.c b/reactos/subsystems/win32/win32k/objects/bitblt.c index 14d888ba2d1..9ef6845dac1 100644 --- a/reactos/subsystems/win32/win32k/objects/bitblt.c +++ b/reactos/subsystems/win32/win32k/objects/bitblt.c @@ -25,7 +25,7 @@ -BOOL STDCALL +BOOL APIENTRY NtGdiAlphaBlend( HDC hDCDest, LONG XOriginDest, @@ -170,7 +170,7 @@ NtGdiAlphaBlend( return Status; } -BOOL STDCALL +BOOL APIENTRY NtGdiBitBlt( HDC hDCDest, INT XDest, @@ -338,7 +338,7 @@ cleanup: return Status; } -BOOL STDCALL +BOOL APIENTRY NtGdiTransparentBlt( HDC hdcDst, INT xDst, @@ -514,7 +514,7 @@ SwapROP3_SrcDst(BYTE bRop3) #define DSTCOPY 0x00AA0029 #define DSTERASE 0x00220326 /* dest = dest & (~src) : DSna */ -BOOL STDCALL +BOOL APIENTRY NtGdiMaskBlt ( HDC hdcDest, INT nXDest, INT nYDest, INT nWidth, INT nHeight, HDC hdcSrc, @@ -726,7 +726,7 @@ NtGdiPlgBlt( return FALSE; } -BOOL STDCALL +BOOL APIENTRY NtGdiStretchBlt( HDC hDCDest, INT XOriginDest, @@ -1075,7 +1075,7 @@ IntGdiPolyPatBlt( } -BOOL STDCALL +BOOL APIENTRY NtGdiPatBlt( HDC hDC, INT XLeft, @@ -1138,7 +1138,7 @@ NtGdiPatBlt( return ret; } -BOOL STDCALL +BOOL APIENTRY NtGdiPolyPatBlt( HDC hDC, DWORD dwRop, diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c index 7a5d5167672..bd4993cc050 100644 --- a/reactos/subsystems/win32/win32k/objects/bitmaps.c +++ b/reactos/subsystems/win32/win32k/objects/bitmaps.c @@ -31,7 +31,7 @@ (y) < (r).bottom \ ) -HBITMAP STDCALL +HBITMAP APIENTRY IntGdiCreateBitmap( INT Width, INT Height, @@ -102,7 +102,7 @@ IntGdiCreateBitmap( } -HBITMAP STDCALL +HBITMAP APIENTRY NtGdiCreateBitmap( INT Width, INT Height, @@ -186,7 +186,7 @@ IntCreateCompatibleBitmap( return Bmp; } -HBITMAP STDCALL +HBITMAP APIENTRY NtGdiCreateCompatibleBitmap( HDC hDC, INT Width, @@ -218,7 +218,7 @@ NtGdiCreateCompatibleBitmap( return Bmp; } -BOOL STDCALL +BOOL APIENTRY NtGdiGetBitmapDimension( HBITMAP hBitmap, LPSIZE Dimension) @@ -252,7 +252,7 @@ NtGdiGetBitmapDimension( return Ret; } -COLORREF STDCALL +COLORREF APIENTRY NtGdiGetPixel(HDC hDC, INT XPos, INT YPos) { PDC dc = NULL; @@ -357,7 +357,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos) } -LONG STDCALL +LONG APIENTRY IntGetBitmapBits( PBITMAPOBJ bmp, DWORD Bytes, @@ -394,7 +394,7 @@ IntGetBitmapBits( return ret; } -LONG STDCALL +LONG APIENTRY NtGdiGetBitmapBits(HBITMAP hBitmap, ULONG Bytes, OUT OPTIONAL PBYTE pUnsafeBits) @@ -442,7 +442,7 @@ NtGdiGetBitmapBits(HBITMAP hBitmap, } -LONG STDCALL +LONG APIENTRY IntSetBitmapBits( PBITMAPOBJ bmp, DWORD Bytes, @@ -479,7 +479,7 @@ IntSetBitmapBits( } -LONG STDCALL +LONG APIENTRY NtGdiSetBitmapBits( HBITMAP hBitmap, DWORD Bytes, @@ -516,7 +516,7 @@ NtGdiSetBitmapBits( return ret; } -BOOL STDCALL +BOOL APIENTRY NtGdiSetBitmapDimension( HBITMAP hBitmap, INT Width, @@ -559,7 +559,7 @@ NtGdiSetBitmapDimension( return Ret; } -BOOL STDCALL +BOOL APIENTRY GdiSetPixelV( HDC hDC, INT X, @@ -583,7 +583,7 @@ GdiSetPixelV( return TRUE; } -COLORREF STDCALL +COLORREF APIENTRY NtGdiSetPixel( HDC hDC, INT X, @@ -725,7 +725,7 @@ BITMAPOBJ_CopyBitmap(HBITMAP hBitmap) return res; } -INT STDCALL +INT APIENTRY BITMAP_GetObject(BITMAPOBJ * bmp, INT Count, LPVOID buffer) { if ((UINT)Count < sizeof(BITMAP)) return 0; diff --git a/reactos/subsystems/win32/win32k/objects/brush.c b/reactos/subsystems/win32/win32k/objects/brush.c index bfce1da713a..a2b95518c71 100644 --- a/reactos/subsystems/win32/win32k/objects/brush.c +++ b/reactos/subsystems/win32/win32k/objects/brush.c @@ -213,7 +213,7 @@ IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ * TRUE if the input values together form a valid image, FALSE otherwise. */ -BOOL STDCALL +BOOL APIENTRY CalculateColorTableSize( CONST BITMAPINFOHEADER *BitmapInfoHeader, UINT *ColorSpec, @@ -318,7 +318,7 @@ CalculateColorTableSize( } } -HBRUSH STDCALL +HBRUSH APIENTRY IntGdiCreateDIBBrush( CONST BITMAPINFO *BitmapInfo, UINT ColorSpec, @@ -388,7 +388,7 @@ IntGdiCreateDIBBrush( return hBrush; } -HBRUSH STDCALL +HBRUSH APIENTRY IntGdiCreateHatchBrush( INT Style, COLORREF Color) @@ -429,7 +429,7 @@ IntGdiCreateHatchBrush( return hBrush; } -HBRUSH STDCALL +HBRUSH APIENTRY IntGdiCreatePatternBrush( HBITMAP hBitmap) { @@ -464,7 +464,7 @@ IntGdiCreatePatternBrush( return hBrush; } -HBRUSH STDCALL +HBRUSH APIENTRY IntGdiCreateSolidBrush( COLORREF Color) { @@ -489,7 +489,7 @@ IntGdiCreateSolidBrush( return hBrush; } -HBRUSH STDCALL +HBRUSH APIENTRY IntGdiCreateNullBrush(VOID) { HBRUSH hBrush; @@ -557,7 +557,7 @@ IntGdiSelectBrush( /* PUBLIC FUNCTIONS ***********************************************************/ -HBRUSH STDCALL +HBRUSH APIENTRY NtGdiCreateDIBBrush( IN PVOID BitmapInfoAndData, IN FLONG ColorSpec, @@ -607,7 +607,7 @@ NtGdiCreateDIBBrush( return hBrush; } -HBRUSH STDCALL +HBRUSH APIENTRY NtGdiCreateHatchBrushInternal( ULONG Style, COLORREF Color, @@ -616,7 +616,7 @@ NtGdiCreateHatchBrushInternal( return IntGdiCreateHatchBrush(Style, Color); } -HBRUSH STDCALL +HBRUSH APIENTRY NtGdiCreatePatternBrushInternal( HBITMAP hBitmap, BOOL bPen, @@ -625,7 +625,7 @@ NtGdiCreatePatternBrushInternal( return IntGdiCreatePatternBrush(hBitmap); } -HBRUSH STDCALL +HBRUSH APIENTRY NtGdiCreateSolidBrush(COLORREF Color, IN OPTIONAL HBRUSH hbr) { @@ -642,7 +642,7 @@ NtGdiCreateSolidBrush(COLORREF Color, * @implemented */ -BOOL STDCALL +BOOL APIENTRY NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) { PDC dc; diff --git a/reactos/subsystems/win32/win32k/objects/cliprgn.c b/reactos/subsystems/win32/win32k/objects/cliprgn.c index 3d9d98cfbcd..3e65088a8c4 100644 --- a/reactos/subsystems/win32/win32k/objects/cliprgn.c +++ b/reactos/subsystems/win32/win32k/objects/cliprgn.c @@ -149,7 +149,7 @@ int FASTCALL GdiExtSelectClipRgn(PDC dc, } -int STDCALL NtGdiExtSelectClipRgn(HDC hDC, +int APIENTRY NtGdiExtSelectClipRgn(HDC hDC, HRGN hrgn, int fnMode) { @@ -193,7 +193,7 @@ GdiGetClipBox(HDC hDC, LPRECT rc) return retval; } -INT STDCALL +INT APIENTRY NtGdiGetAppClipBox(HDC hDC, LPRECT rc) { INT Ret; @@ -224,7 +224,7 @@ NtGdiGetAppClipBox(HDC hDC, LPRECT rc) return Ret; } -int STDCALL NtGdiExcludeClipRect(HDC hDC, +int APIENTRY NtGdiExcludeClipRect(HDC hDC, int LeftRect, int TopRect, int RightRect, @@ -275,7 +275,7 @@ int STDCALL NtGdiExcludeClipRect(HDC hDC, return Result; } -int STDCALL NtGdiIntersectClipRect(HDC hDC, +int APIENTRY NtGdiIntersectClipRect(HDC hDC, int LeftRect, int TopRect, int RightRect, @@ -325,7 +325,7 @@ int STDCALL NtGdiIntersectClipRect(HDC hDC, return Result; } -int STDCALL NtGdiOffsetClipRgn(HDC hDC, +int APIENTRY NtGdiOffsetClipRgn(HDC hDC, int XOffset, int YOffset) { @@ -354,7 +354,7 @@ int STDCALL NtGdiOffsetClipRgn(HDC hDC, return Result; } -BOOL STDCALL NtGdiPtVisible(HDC hDC, +BOOL APIENTRY NtGdiPtVisible(HDC hDC, int X, int Y) { @@ -373,7 +373,7 @@ BOOL STDCALL NtGdiPtVisible(HDC hDC, return (rgn ? NtGdiPtInRegion(rgn, X, Y) : FALSE); } -BOOL STDCALL NtGdiRectVisible(HDC hDC, +BOOL APIENTRY NtGdiRectVisible(HDC hDC, CONST PRECT UnsafeRect) { NTSTATUS Status = STATUS_SUCCESS; @@ -478,7 +478,7 @@ IntGdiSetMetaRgn(PDC pDC) } -int STDCALL NtGdiSetMetaRgn(HDC hDC) +int APIENTRY NtGdiSetMetaRgn(HDC hDC) { INT Ret; PDC pDC = DC_LockDc(hDC); diff --git a/reactos/subsystems/win32/win32k/objects/color.c b/reactos/subsystems/win32/win32k/objects/color.c index 83acc686f36..f1df7eb6399 100644 --- a/reactos/subsystems/win32/win32k/objects/color.c +++ b/reactos/subsystems/win32/win32k/objects/color.c @@ -74,7 +74,7 @@ const PALETTEENTRY* FASTCALL COLOR_GetSystemPaletteTemplate(void) return (const PALETTEENTRY*)&COLOR_sysPalTemplate; } -UINT STDCALL +UINT APIENTRY IntAnimatePalette(HPALETTE hPal, UINT StartIndex, UINT NumEntries, @@ -135,7 +135,7 @@ IntAnimatePalette(HPALETTE hPal, return ret; } -HPALETTE STDCALL NtGdiCreateHalftonePalette(HDC hDC) +HPALETTE APIENTRY NtGdiCreateHalftonePalette(HDC hDC) { int i, r, g, b; struct { @@ -243,7 +243,7 @@ HPALETTE STDCALL NtGdiCreateHalftonePalette(HDC hDC) /* * @implemented */ -HPALETTE STDCALL +HPALETTE APIENTRY NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries ) { PPALGDI PalGDI; @@ -276,7 +276,7 @@ NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries ) } -BOOL STDCALL NtGdiGetColorAdjustment(HDC hDC, +BOOL APIENTRY NtGdiGetColorAdjustment(HDC hDC, LPCOLORADJUSTMENT ca) { UNIMPLEMENTED; @@ -291,7 +291,7 @@ unsigned short GetNumberOfBits(unsigned int dwMask) return wBits; } -COLORREF STDCALL NtGdiGetNearestColor(HDC hDC, COLORREF Color) +COLORREF APIENTRY NtGdiGetNearestColor(HDC hDC, COLORREF Color) { COLORREF nearest = CLR_INVALID; PDC dc; @@ -336,7 +336,7 @@ COLORREF STDCALL NtGdiGetNearestColor(HDC hDC, COLORREF Color) return nearest; } -UINT STDCALL NtGdiGetNearestPaletteIndex(HPALETTE hpal, +UINT APIENTRY NtGdiGetNearestPaletteIndex(HPALETTE hpal, COLORREF Color) { PPALGDI palGDI = (PPALGDI) PALETTE_LockPalette(hpal); @@ -352,7 +352,7 @@ UINT STDCALL NtGdiGetNearestPaletteIndex(HPALETTE hpal, return index; } -UINT STDCALL +UINT APIENTRY IntGetPaletteEntries(HPALETTE hpal, UINT StartIndex, UINT Entries, @@ -397,7 +397,7 @@ IntGetPaletteEntries(HPALETTE hpal, return Entries; } -UINT STDCALL +UINT APIENTRY IntGetSystemPaletteEntries(HDC hDC, UINT StartIndex, UINT Entries, @@ -462,7 +462,7 @@ IntGetSystemPaletteEntries(HDC hDC, return Ret; } -UINT STDCALL NtGdiGetSystemPaletteUse(HDC hDC) +UINT APIENTRY NtGdiGetSystemPaletteUse(HDC hDC) { return SystemPaletteUse; } @@ -572,7 +572,7 @@ UINT FASTCALL IntGdiRealizePalette(HDC hDC) return realized; } -BOOL STDCALL NtGdiResizePalette(HPALETTE hpal, +BOOL APIENTRY NtGdiResizePalette(HPALETTE hpal, UINT Entries) { /* PALOBJ *palPtr = (PALOBJ*)AccessUserObject(hPal); @@ -616,14 +616,14 @@ BOOL STDCALL NtGdiResizePalette(HPALETTE hpal, return FALSE; } -BOOL STDCALL NtGdiSetColorAdjustment(HDC hDC, +BOOL APIENTRY NtGdiSetColorAdjustment(HDC hDC, LPCOLORADJUSTMENT ca) { UNIMPLEMENTED; return FALSE; } -UINT STDCALL +UINT APIENTRY IntSetPaletteEntries(HPALETTE hpal, UINT Start, UINT Entries, @@ -659,7 +659,7 @@ IntSetPaletteEntries(HPALETTE hpal, return Entries; } -UINT STDCALL +UINT APIENTRY NtGdiSetSystemPaletteUse(HDC hDC, UINT Usage) { UINT old = SystemPaletteUse; @@ -686,7 +686,7 @@ NtGdiSetSystemPaletteUse(HDC hDC, UINT Usage) } BOOL -STDCALL +APIENTRY NtGdiUnrealizeObject(HGDIOBJ hgdiobj) { BOOL Ret = FALSE; @@ -709,7 +709,7 @@ NtGdiUnrealizeObject(HGDIOBJ hgdiobj) return Ret; } -BOOL STDCALL +BOOL APIENTRY NtGdiUpdateColors(HDC hDC) { PWINDOW_OBJECT Wnd; @@ -745,7 +745,7 @@ NtGdiUpdateColors(HDC hDC) return ret; } -INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, +INT APIENTRY COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved) { int i, best = 0, diff = 0x7fffffff; @@ -773,7 +773,7 @@ INT STDCALL COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, return (XlateObj->pulXlate) ? (INT)XlateObj->pulXlate[best] : best; } -COLORREF STDCALL COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size, COLORREF color ) +COLORREF APIENTRY COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size, COLORREF color ) { INT index; @@ -784,7 +784,7 @@ COLORREF STDCALL COLOR_LookupNearestColor( PALETTEENTRY* palPalEntry, int size, palPalEntry[index].peBlue); } -int STDCALL COLOR_PaletteLookupExactIndex( PALETTEENTRY* palPalEntry, int size, +int APIENTRY COLOR_PaletteLookupExactIndex( PALETTEENTRY* palPalEntry, int size, COLORREF col ) { int i; diff --git a/reactos/subsystems/win32/win32k/objects/coord.c b/reactos/subsystems/win32/win32k/objects/coord.c index ce0b9360a9e..3dbdc95377f 100644 --- a/reactos/subsystems/win32/win32k/objects/coord.c +++ b/reactos/subsystems/win32/win32k/objects/coord.c @@ -88,7 +88,7 @@ IntGdiCombineTransform(LPXFORM XFormResult, return TRUE; } -BOOL STDCALL NtGdiCombineTransform(LPXFORM UnsafeXFormResult, +BOOL APIENTRY NtGdiCombineTransform(LPXFORM UnsafeXFormResult, LPXFORM Unsafexform1, LPXFORM Unsafexform2) { @@ -173,7 +173,7 @@ IntGdiModifyWorldTransform(PDC pDc, } BOOL -STDCALL +APIENTRY NtGdiGetTransform(HDC hDC, DWORD iXform, LPXFORM XForm) @@ -337,7 +337,7 @@ NtGdiTransformPoints( HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiModifyWorldTransform(HDC hDC, LPXFORM UnsafeXForm, DWORD Mode) @@ -376,7 +376,7 @@ NtGdiModifyWorldTransform(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiOffsetViewportOrgEx(HDC hDC, int XOffset, int YOffset, @@ -429,7 +429,7 @@ NtGdiOffsetViewportOrgEx(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiOffsetWindowOrgEx(HDC hDC, int XOffset, int YOffset, @@ -483,7 +483,7 @@ NtGdiOffsetWindowOrgEx(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiScaleViewportExtEx(HDC hDC, int Xnum, int Xdenom, @@ -565,7 +565,7 @@ NtGdiScaleViewportExtEx(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiScaleWindowExtEx(HDC hDC, int Xnum, int Xdenom, @@ -649,7 +649,7 @@ NtGdiScaleWindowExtEx(HDC hDC, } int -STDCALL +APIENTRY IntGdiSetMapMode(PDC dc, int MapMode) { @@ -730,7 +730,7 @@ IntGdiSetMapMode(PDC dc, } BOOL -STDCALL +APIENTRY NtGdiSetViewportExtEx(HDC hDC, int XExtent, int YExtent, @@ -805,7 +805,7 @@ NtGdiSetViewportExtEx(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiSetViewportOrgEx(HDC hDC, int X, int Y, @@ -859,7 +859,7 @@ NtGdiSetViewportOrgEx(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiSetWindowExtEx(HDC hDC, int XExtent, int YExtent, @@ -925,7 +925,7 @@ NtGdiSetWindowExtEx(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiSetWindowOrgEx(HDC hDC, int X, int Y, diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c index 99681f7077d..3e41270135b 100644 --- a/reactos/subsystems/win32/win32k/objects/dc.c +++ b/reactos/subsystems/win32/win32k/objects/dc.c @@ -48,14 +48,14 @@ InitDcImpl(VOID) // ----------------------------------------------------- Public Functions -BOOL STDCALL +BOOL APIENTRY NtGdiCancelDC(HDC hDC) { UNIMPLEMENTED; return FALSE; } -HDC STDCALL +HDC APIENTRY NtGdiCreateCompatibleDC(HDC hDC) { PDC NewDC, OrigDC; @@ -232,7 +232,7 @@ FindDriverFileNames(PUNICODE_STRING DriverFileNames, ULONG DisplayNumber) return TRUE; } -static NTSTATUS STDCALL +static NTSTATUS APIENTRY DevModeCallback(IN PWSTR ValueName, IN ULONG ValueType, IN PVOID ValueData, @@ -893,7 +893,7 @@ IntGdiCreateDC(PUNICODE_STRING Driver, return hNewDC; } -HDC STDCALL +HDC APIENTRY NtGdiOpenDCW( PUNICODE_STRING Device, DEVMODEW *InitData, PUNICODE_STRING pustrLogAddr, @@ -1087,7 +1087,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force) } BOOL -STDCALL +APIENTRY NtGdiDeleteObjectApp(HANDLE DCHandle) { @@ -1132,7 +1132,7 @@ NtGdiEnumObjects( } HANDLE -STDCALL +APIENTRY NtGdiGetDCObject(HDC hDC, INT ObjectType) { HGDIOBJ SelObject; @@ -1199,7 +1199,7 @@ IntCalcFillOrigin(PDC pdc) } VOID -STDCALL +APIENTRY GdiSetDCOrg(HDC hDC, LONG Left, LONG Top, PRECTL prc) { PDC pdc; @@ -1225,7 +1225,7 @@ IntGdiGetDCOrg(PDC pDc, PPOINTL ppt) return TRUE; } -BOOL STDCALL +BOOL APIENTRY GdiGetDCOrgEx(HDC hDC, PPOINTL ppt, PRECTL prc) { PDC pdc; @@ -1264,7 +1264,7 @@ IntGetAspectRatioFilter(PDC pDC, return TRUE; } -BOOL STDCALL +BOOL APIENTRY NtGdiGetDCPoint( HDC hDC, UINT iPoint, PPOINTL Point) { BOOL Ret = TRUE; @@ -1515,7 +1515,7 @@ IntGdiCopyFromSaveState(PDC dc, PDC dcs, HDC hDC) #endif } -HDC STDCALL +HDC APIENTRY IntGdiGetDCState(HDC hDC) { PDC newdc, dc; @@ -1548,7 +1548,7 @@ IntGdiGetDCState(HDC hDC) VOID -STDCALL +APIENTRY IntGdiSetDCState ( HDC hDC, HDC hDCSave ) { PDC dc, dcs; @@ -1795,7 +1795,7 @@ IntGdiGetDeviceCaps(PDC dc, INT Index) return ret; } -INT STDCALL +INT APIENTRY NtGdiGetDeviceCaps(HDC hDC, INT Index) { @@ -1950,7 +1950,7 @@ NtGdiResetDC( return 0; } -BOOL STDCALL +BOOL APIENTRY NtGdiRestoreDC(HDC hDC, INT SaveLevel) { PDC dc, dcs; @@ -2021,7 +2021,7 @@ NtGdiRestoreDC(HDC hDC, INT SaveLevel) } -INT STDCALL +INT APIENTRY NtGdiSaveDC(HDC hDC) { HDC hdcs; @@ -2241,7 +2241,7 @@ GdiSelectPalette(HDC hDC, return oldPal; } -WORD STDCALL +WORD APIENTRY IntGdiSetHookFlags(HDC hDC, WORD Flags) { WORD wRet; @@ -2276,7 +2276,7 @@ IntGdiSetHookFlags(HDC hDC, WORD Flags) BOOL -STDCALL +APIENTRY NtGdiGetDCDword( HDC hDC, UINT u, @@ -2372,7 +2372,7 @@ NtGdiGetDCDword( } BOOL -STDCALL +APIENTRY NtGdiGetAndSetDCDword( HDC hDC, UINT u, diff --git a/reactos/subsystems/win32/win32k/objects/dcutil.c b/reactos/subsystems/win32/win32k/objects/dcutil.c index a76ce42558a..1b946a00915 100644 --- a/reactos/subsystems/win32/win32k/objects/dcutil.c +++ b/reactos/subsystems/win32/win32k/objects/dcutil.c @@ -10,7 +10,7 @@ */ #define DC_GET_VAL( func_type, func_name, dc_field ) \ -func_type STDCALL func_name( HDC hdc ) \ +func_type APIENTRY func_name( HDC hdc ) \ { \ func_type ft; \ PDC dc = DC_LockDc( hdc ); \ @@ -44,7 +44,7 @@ VOID FASTCALL Int##FuncName ( PDC dc, LP##type pt) \ } #if 0 -BOOL STDCALL NtGdi##FuncName ( HDC hdc, LP##type pt ) \ +BOOL APIENTRY NtGdi##FuncName ( HDC hdc, LP##type pt ) \ { \ NTSTATUS Status = STATUS_SUCCESS; \ type Safept; \ @@ -83,7 +83,7 @@ BOOL STDCALL NtGdi##FuncName ( HDC hdc, LP##type pt ) \ #endif #define DC_SET_MODE( func_name, dc_field, min_val, max_val ) \ -INT STDCALL func_name( HDC hdc, INT mode ) \ +INT APIENTRY func_name( HDC hdc, INT mode ) \ { \ INT prevMode; \ PDC dc; \ diff --git a/reactos/subsystems/win32/win32k/objects/dibobj.c b/reactos/subsystems/win32/win32k/objects/dibobj.c index c531ba98162..5e33e8f3a12 100644 --- a/reactos/subsystems/win32/win32k/objects/dibobj.c +++ b/reactos/subsystems/win32/win32k/objects/dibobj.c @@ -24,7 +24,7 @@ #define NDEBUG #include -UINT STDCALL +UINT APIENTRY IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors) { PDC dc; @@ -89,7 +89,7 @@ IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Color return Entries; } -UINT STDCALL +UINT APIENTRY IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors) { PDC dc; @@ -295,7 +295,7 @@ IntSetDIBits( } // Converts a DIB to a device-dependent bitmap -INT STDCALL +INT APIENTRY NtGdiSetDIBits( HDC hDC, HBITMAP hBitmap, @@ -495,7 +495,7 @@ NtGdiSetDIBitsToDeviceInternal( /* Converts a device-dependent bitmap to a DIB */ -INT STDCALL +INT APIENTRY NtGdiGetDIBitsInternal(HDC hDC, HBITMAP hBitmap, UINT StartScan, @@ -1088,7 +1088,7 @@ NtGdiCreateDIBitmapInternal(IN HDC hDc, } -HBITMAP STDCALL NtGdiCreateDIBSection(HDC hDC, +HBITMAP APIENTRY NtGdiCreateDIBSection(HDC hDC, IN OPTIONAL HANDLE hSection, IN DWORD dwOffset, IN LPBITMAPINFO bmi, @@ -1128,7 +1128,7 @@ HBITMAP STDCALL NtGdiCreateDIBSection(HDC hDC, return hbitmap; } -HBITMAP STDCALL +HBITMAP APIENTRY DIB_CreateDIBSection( PDC dc, BITMAPINFO *bmi, UINT usage, LPVOID *bits, HANDLE section, @@ -1372,7 +1372,7 @@ INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) * 11/16/1999 (RJJ) lifted from wine */ -INT STDCALL DIB_GetDIBImageBytes (INT width, INT height, INT depth) +INT APIENTRY DIB_GetDIBImageBytes (INT width, INT height, INT depth) { return DIB_GetDIBWidthBytes( width, depth ) * (height < 0 ? -height : height); } diff --git a/reactos/subsystems/win32/win32k/objects/fillshap.c b/reactos/subsystems/win32/win32k/objects/fillshap.c index fc25c99edfe..1cc175480f1 100644 --- a/reactos/subsystems/win32/win32k/objects/fillshap.c +++ b/reactos/subsystems/win32/win32k/objects/fillshap.c @@ -198,7 +198,7 @@ IntGdiPolyPolygon(DC *dc, * */ -BOOL STDCALL +BOOL APIENTRY NtGdiEllipse( HDC hDC, int Left, @@ -346,7 +346,7 @@ extern BOOL FillPolygon(PDC dc, ULONG_PTR -STDCALL +APIENTRY NtGdiPolyPolyDraw( IN HDC hDC, IN PPOINT UnsafePoints, IN PULONG UnsafeCounts, @@ -651,7 +651,7 @@ cleanup: } BOOL -STDCALL +APIENTRY NtGdiRectangle(HDC hDC, int LeftRect, int TopRect, @@ -786,7 +786,7 @@ IntRoundRect( } BOOL -STDCALL +APIENTRY NtGdiRoundRect( HDC hDC, int LeftRect, @@ -928,7 +928,7 @@ IntGdiGradientFill( } BOOL -STDCALL +APIENTRY NtGdiGradientFill( HDC hdc, PTRIVERTEX pVertex, @@ -1040,7 +1040,7 @@ NtGdiGradientFill( return Ret; } -BOOL STDCALL +BOOL APIENTRY NtGdiExtFloodFill( HDC hDC, INT XStart, diff --git a/reactos/subsystems/win32/win32k/objects/font.c b/reactos/subsystems/win32/win32k/objects/font.c index 8ed89645af4..69e2e576bda 100644 --- a/reactos/subsystems/win32/win32k/objects/font.c +++ b/reactos/subsystems/win32/win32k/objects/font.c @@ -177,7 +177,7 @@ NtGdiAddFontResourceW( } DWORD -STDCALL +APIENTRY NtGdiGetFontData( HDC hDC, DWORD Table, @@ -397,7 +397,7 @@ Exit: } DWORD -STDCALL +APIENTRY NtGdiGetKerningPairs(HDC hDC, ULONG NumPairs, LPKERNINGPAIR krnpair) @@ -472,7 +472,7 @@ NtGdiGetKerningPairs(HDC hDC, 472, this is NtGdiGetOutlineTextMetricsInternalW. */ ULONG -STDCALL +APIENTRY NtGdiGetOutlineTextMetricsInternalW (HDC hDC, ULONG Data, OUTLINETEXTMETRICW *otm, @@ -715,7 +715,7 @@ NtGdiGetRealizationInfo( } HFONT -STDCALL +APIENTRY NtGdiHfontCreate( IN PENUMLOGFONTEXDVW pelfw, IN ULONG cjElfw, diff --git a/reactos/subsystems/win32/win32k/objects/freetype.c b/reactos/subsystems/win32/win32k/objects/freetype.c index c6fdcaf7187..adc4fb5631a 100644 --- a/reactos/subsystems/win32/win32k/objects/freetype.c +++ b/reactos/subsystems/win32/win32k/objects/freetype.c @@ -518,7 +518,7 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) * TRUE on success, FALSE on failure. * */ -static BOOLEAN STDCALL +static BOOLEAN APIENTRY IntTranslateCharsetInfo(PDWORD Src, /* [in] if flags == TCI_SRCFONTSIG: pointer to fsCsb of a FONTSIGNATURE if flags == TCI_SRCCHARSET: a character set value @@ -1172,7 +1172,7 @@ typedef struct FontFamilyInfoCallbackContext DWORD Size; } FONT_FAMILY_INFO_CALLBACK_CONTEXT, *PFONT_FAMILY_INFO_CALLBACK_CONTEXT; -static NTSTATUS STDCALL +static NTSTATUS APIENTRY FontFamilyInfoQueryRegistryCallback(IN PWSTR ValueName, IN ULONG ValueType, IN PVOID ValueData, IN ULONG ValueLength, IN PVOID Context, IN PVOID EntryContext) @@ -1287,7 +1287,7 @@ ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs) } -FT_Glyph STDCALL +FT_Glyph APIENTRY ftGdiGlyphCacheGet( FT_Face Face, INT GlyphIndex, @@ -1336,7 +1336,7 @@ ftGdiGlyphCacheGet( return FontEntry->Glyph; } -FT_Glyph STDCALL +FT_Glyph APIENTRY ftGdiGlyphCacheSet( FT_Face Face, INT GlyphIndex, @@ -2993,7 +2993,7 @@ ftGdiGetKerningPairs( PFONTGDI Font, // Functions needing sorting. // /////////////// -int STDCALL +int APIENTRY NtGdiGetFontFamilyInfo(HDC Dc, LPLOGFONTW UnsafeLogFont, PFONTFAMILYINFO UnsafeInfo, @@ -3700,7 +3700,7 @@ fail: * @implemented */ BOOL -STDCALL +APIENTRY NtGdiGetCharABCWidthsW( IN HDC hDC, IN UINT FirstChar, @@ -3868,7 +3868,7 @@ NtGdiGetCharABCWidthsW( * @implemented */ BOOL -STDCALL +APIENTRY NtGdiGetCharWidthW( IN HDC hDC, IN UINT FirstChar, @@ -4008,7 +4008,7 @@ NtGdiGetCharWidthW( * @implemented */ DWORD -STDCALL +APIENTRY NtGdiGetGlyphIndicesW( IN HDC hdc, IN OPTIONAL LPWSTR UnSafepwc, diff --git a/reactos/subsystems/win32/win32k/objects/gdidbg.c b/reactos/subsystems/win32/win32k/objects/gdidbg.c index 89d496b7b40..be0300b5418 100644 --- a/reactos/subsystems/win32/win32k/objects/gdidbg.c +++ b/reactos/subsystems/win32/win32k/objects/gdidbg.c @@ -1,7 +1,7 @@ #ifdef GDI_DEBUG -NTSYSAPI VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); -NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); +NTSYSAPI VOID APIENTRY KeRosDumpStackFrames(PULONG, ULONG); +NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); static int leak_reported = 0; #define GDI_STACK_LEVELS 12 diff --git a/reactos/subsystems/win32/win32k/objects/icm.c b/reactos/subsystems/win32/win32k/objects/icm.c index 30fdeb21643..064cbd19342 100644 --- a/reactos/subsystems/win32/win32k/objects/icm.c +++ b/reactos/subsystems/win32/win32k/objects/icm.c @@ -129,7 +129,7 @@ IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) } BOOL -STDCALL +APIENTRY NtGdiGetDeviceGammaRamp(HDC hDC, LPVOID Ramp) { @@ -186,7 +186,7 @@ NtGdiGetDeviceGammaRamp(HDC hDC, } BOOL -STDCALL +APIENTRY NtGdiSetColorSpace(IN HDC hdc, IN HCOLORSPACE hColorSpace) { @@ -361,7 +361,7 @@ IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) } BOOL -STDCALL +APIENTRY NtGdiSetDeviceGammaRamp(HDC hDC, LPVOID Ramp) { @@ -415,7 +415,7 @@ NtGdiSetDeviceGammaRamp(HDC hDC, } INT -STDCALL +APIENTRY NtGdiSetIcmMode(HDC hDC, ULONG nCommand, ULONG EnableICM) // ulMode diff --git a/reactos/subsystems/win32/win32k/objects/line.c b/reactos/subsystems/win32/win32k/objects/line.c index c70b692ba06..07cf1e7a4d1 100644 --- a/reactos/subsystems/win32/win32k/objects/line.c +++ b/reactos/subsystems/win32/win32k/objects/line.c @@ -392,7 +392,7 @@ IntGdiPolyPolyline(DC *dc, /******************************************************************************/ BOOL -STDCALL +APIENTRY NtGdiLineTo(HDC hDC, int XEnd, int YEnd) diff --git a/reactos/subsystems/win32/win32k/objects/metafile.c b/reactos/subsystems/win32/win32k/objects/metafile.c index 85e4d23a86a..573dde4b9dd 100644 --- a/reactos/subsystems/win32/win32k/objects/metafile.c +++ b/reactos/subsystems/win32/win32k/objects/metafile.c @@ -31,7 +31,7 @@ NtGdiConvertMetafileRect(IN HDC hDC, * @unimplemented */ HDC -STDCALL +APIENTRY NtGdiCreateMetafileDC(IN HDC hdc) { diff --git a/reactos/subsystems/win32/win32k/objects/palobj.c b/reactos/subsystems/win32/win32k/objects/palobj.c index 13171f267e5..63a373dd9ac 100644 --- a/reactos/subsystems/win32/win32k/objects/palobj.c +++ b/reactos/subsystems/win32/win32k/objects/palobj.c @@ -222,7 +222,7 @@ VOID FASTCALL PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size) #ifndef NO_MAPPING // Set the color-mapping table for selected palette. // Return number of entries which mapping has changed. -INT STDCALL PALETTE_SetMapping(PALOBJ *palPtr, UINT uStart, UINT uNum, BOOL mapOnly) +INT APIENTRY PALETTE_SetMapping(PALOBJ *palPtr, UINT uStart, UINT uNum, BOOL mapOnly) { char flag; int prevMapping = (palPtr->mapping) ? 1 : 0; diff --git a/reactos/subsystems/win32/win32k/objects/path.c b/reactos/subsystems/win32/win32k/objects/path.c index 4365bc6eb76..2ab443f65a9 100644 --- a/reactos/subsystems/win32/win32k/objects/path.c +++ b/reactos/subsystems/win32/win32k/objects/path.c @@ -2096,7 +2096,7 @@ PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECT *lprc, */ BOOL -STDCALL +APIENTRY NtGdiAbortPath(HDC hDC) { PPATH pPath; @@ -2121,7 +2121,7 @@ NtGdiAbortPath(HDC hDC) } BOOL -STDCALL +APIENTRY NtGdiBeginPath( HDC hDC ) { PPATH pPath; @@ -2186,7 +2186,7 @@ NtGdiBeginPath( HDC hDC ) } BOOL -STDCALL +APIENTRY NtGdiCloseFigure(HDC hDC) { BOOL Ret = FALSE; // default to failure @@ -2225,7 +2225,7 @@ NtGdiCloseFigure(HDC hDC) } BOOL -STDCALL +APIENTRY NtGdiEndPath(HDC hDC) { BOOL ret = TRUE; @@ -2264,7 +2264,7 @@ NtGdiEndPath(HDC hDC) } BOOL -STDCALL +APIENTRY NtGdiFillPath(HDC hDC) { BOOL ret = FALSE; @@ -2304,7 +2304,7 @@ NtGdiFillPath(HDC hDC) } BOOL -STDCALL +APIENTRY NtGdiFlattenPath(HDC hDC) { BOOL Ret = FALSE; @@ -2381,7 +2381,7 @@ NtGdiGetMiterLimit( } INT -STDCALL +APIENTRY NtGdiGetPath( HDC hDC, LPPOINT Points, @@ -2447,7 +2447,7 @@ done: } HRGN -STDCALL +APIENTRY NtGdiPathToRegion(HDC hDC) { PPATH pPath; @@ -2539,7 +2539,7 @@ NtGdiSetMiterLimit( } BOOL -STDCALL +APIENTRY NtGdiStrokeAndFillPath(HDC hDC) { DC *pDc; @@ -2579,7 +2579,7 @@ NtGdiStrokeAndFillPath(HDC hDC) } BOOL -STDCALL +APIENTRY NtGdiStrokePath(HDC hDC) { DC *pDc; @@ -2616,7 +2616,7 @@ NtGdiStrokePath(HDC hDC) } BOOL -STDCALL +APIENTRY NtGdiWidenPath(HDC hDC) { BOOL Ret; @@ -2632,7 +2632,7 @@ NtGdiWidenPath(HDC hDC) } BOOL -STDCALL +APIENTRY NtGdiSelectClipPath(HDC hDC, int Mode) { diff --git a/reactos/subsystems/win32/win32k/objects/pen.c b/reactos/subsystems/win32/win32k/objects/pen.c index 237b6ab4203..bc660ac4010 100644 --- a/reactos/subsystems/win32/win32k/objects/pen.c +++ b/reactos/subsystems/win32/win32k/objects/pen.c @@ -37,7 +37,7 @@ PENOBJ_LockPen(HGDIOBJ hBMObj) return GDIOBJ_LockObj( hBMObj, GDI_OBJECT_TYPE_PEN); } -HPEN STDCALL +HPEN APIENTRY IntGdiExtCreatePen( DWORD dwPenStyle, DWORD dwWidth, @@ -203,7 +203,7 @@ IntGdiSetSolidPenColor(HPEN hPen, COLORREF Color) } } -INT STDCALL +INT APIENTRY PEN_GetObject(PGDIBRUSHOBJ pPenObject, INT cbCount, PLOGPEN pBuffer) { PLOGPEN pLogPen; @@ -313,7 +313,7 @@ IntGdiSelectPen( /* PUBLIC FUNCTIONS ***********************************************************/ -HPEN STDCALL +HPEN APIENTRY NtGdiCreatePen( INT PenStyle, INT Width, @@ -339,7 +339,7 @@ NtGdiCreatePen( hbr); } -HPEN STDCALL +HPEN APIENTRY NtGdiExtCreatePen( DWORD dwPenStyle, DWORD ulWidth, diff --git a/reactos/subsystems/win32/win32k/objects/polyfill.c b/reactos/subsystems/win32/win32k/objects/polyfill.c index 6a703ded885..f1673eef16b 100644 --- a/reactos/subsystems/win32/win32k/objects/polyfill.c +++ b/reactos/subsystems/win32/win32k/objects/polyfill.c @@ -374,7 +374,7 @@ POLYGONFILL_UpdateScanline(FILL_EDGE* pEdge, int Scanline) */ static void -STDCALL +APIENTRY POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** ActiveHead ) { int i; @@ -399,7 +399,7 @@ POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** Ac */ static void -STDCALL +APIENTRY POLYGONFILL_FillScanLineAlternate( PDC dc, int ScanLine, @@ -447,7 +447,7 @@ POLYGONFILL_FillScanLineAlternate( static void -STDCALL +APIENTRY POLYGONFILL_FillScanLineWinding( PDC dc, int ScanLine, @@ -547,7 +547,7 @@ POLYGONFILL_FillScanLineWinding( //The direction of each edge of the polygon is important. BOOL -STDCALL +APIENTRY FillPolygon( PDC dc, BITMAPOBJ *BitmapObj, @@ -562,7 +562,7 @@ FillPolygon( int ScanLine; PDC_ATTR Dc_Attr = dc->pDc_Attr; void - (STDCALL *FillScanLine)( + (APIENTRY *FillScanLine)( PDC dc, int ScanLine, FILL_EDGE* ActiveHead, diff --git a/reactos/subsystems/win32/win32k/objects/print.c b/reactos/subsystems/win32/win32k/objects/print.c index 85e0c3a516e..c1181a02b99 100644 --- a/reactos/subsystems/win32/win32k/objects/print.c +++ b/reactos/subsystems/win32/win32k/objects/print.c @@ -24,7 +24,7 @@ #include INT -STDCALL +APIENTRY NtGdiAbortDoc(HDC hDC) { UNIMPLEMENTED; @@ -32,7 +32,7 @@ NtGdiAbortDoc(HDC hDC) } INT -STDCALL +APIENTRY NtGdiEndDoc(HDC hDC) { UNIMPLEMENTED; @@ -40,7 +40,7 @@ NtGdiEndDoc(HDC hDC) } INT -STDCALL +APIENTRY NtGdiEndPage(HDC hDC) { UNIMPLEMENTED; @@ -63,7 +63,7 @@ IntGdiEscape(PDC dc, } INT -STDCALL +APIENTRY NtGdiEscape(HDC hDC, INT Escape, INT InSize, @@ -88,7 +88,7 @@ NtGdiEscape(HDC hDC, } INT -STDCALL +APIENTRY IntEngExtEscape( SURFOBJ *Surface, INT Escape, @@ -105,7 +105,7 @@ IntEngExtEscape( } INT -STDCALL +APIENTRY IntGdiExtEscape( PDC dc, INT Escape, @@ -145,7 +145,7 @@ IntGdiExtEscape( } INT -STDCALL +APIENTRY NtGdiExtEscape( HDC hDC, IN OPTIONAL PWCHAR pDriver, @@ -308,7 +308,7 @@ NtGdiStartDoc( } INT -STDCALL +APIENTRY NtGdiStartPage(HDC hDC) { UNIMPLEMENTED; diff --git a/reactos/subsystems/win32/win32k/objects/region.c b/reactos/subsystems/win32/win32k/objects/region.c index 16c0481689f..98fbcb09e32 100644 --- a/reactos/subsystems/win32/win32k/objects/region.c +++ b/reactos/subsystems/win32/win32k/objects/region.c @@ -2203,7 +2203,7 @@ IntGdiCombineRgn(PROSRGNDATA destRgn, // NtGdi Exported Functions INT -STDCALL +APIENTRY NtGdiCombineRgn(HRGN hDest, HRGN hSrc1, HRGN hSrc2, @@ -2268,7 +2268,7 @@ NtGdiCombineRgn(HRGN hDest, } HRGN -STDCALL +APIENTRY NtGdiCreateEllipticRgn( INT Left, INT Top, @@ -2297,7 +2297,7 @@ IntGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) } -HRGN STDCALL +HRGN APIENTRY NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) { PROSRGNDATA pRgn; @@ -2319,7 +2319,7 @@ NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) HRGN -STDCALL +APIENTRY NtGdiCreateRoundRectRgn( INT left, INT top, @@ -2437,7 +2437,7 @@ NtGdiCreateRoundRectRgn( } BOOL -STDCALL +APIENTRY NtGdiEqualRgn( HRGN hSrcRgn1, HRGN hSrcRgn2 @@ -2488,7 +2488,7 @@ exit: } HRGN -STDCALL +APIENTRY NtGdiExtCreateRegion( OPTIONAL LPXFORM Xform, DWORD Count, @@ -2589,7 +2589,7 @@ NtGdiExtCreateRegion( } BOOL -STDCALL +APIENTRY NtGdiFillRgn( HDC hDC, HRGN hRgn, @@ -2623,7 +2623,7 @@ NtGdiFillRgn( } BOOL -STDCALL +APIENTRY NtGdiFrameRgn( HDC hDC, HRGN hRgn, @@ -2685,7 +2685,7 @@ REGION_GetRgnBox( API region is the intersection of the meta region and the clipping region, clearly named after the fact that it is controlled by GDI API calls. */ -INT STDCALL +INT APIENTRY NtGdiGetRandomRgn( HDC hDC, HRGN hDest, @@ -2751,7 +2751,7 @@ NtGdiGetRandomRgn( return ret; } -INT STDCALL +INT APIENTRY IntGdiGetRgnBox( HRGN hRgn, LPRECT pRect @@ -2772,7 +2772,7 @@ IntGdiGetRgnBox( } -INT STDCALL +INT APIENTRY NtGdiGetRgnBox( HRGN hRgn, LPRECT pRect @@ -2814,7 +2814,7 @@ NtGdiGetRgnBox( } BOOL -STDCALL +APIENTRY NtGdiInvertRgn( HDC hDC, HRGN hRgn @@ -2847,7 +2847,7 @@ NtGdiInvertRgn( } INT -STDCALL +APIENTRY NtGdiOffsetRgn( HRGN hRgn, INT XOffset, @@ -2963,7 +2963,7 @@ IntGdiPaintRgn( } BOOL -STDCALL +APIENTRY NtGdiPtInRegion( HRGN hRgn, INT X, @@ -3020,7 +3020,7 @@ REGION_RectInRegion( } BOOL -STDCALL +APIENTRY NtGdiRectInRegion( HRGN hRgn, LPRECT unsaferc @@ -3101,7 +3101,7 @@ REGION_SetRectRgn( } BOOL -STDCALL +APIENTRY NtGdiSetRectRgn( HRGN hRgn, INT LeftRect, @@ -3123,7 +3123,7 @@ NtGdiSetRectRgn( return TRUE; } -HRGN STDCALL +HRGN APIENTRY NtGdiUnionRectWithRgn( HRGN hDest, CONST PRECT UnsafeRect @@ -3172,7 +3172,7 @@ NtGdiUnionRectWithRgn( * * If the function fails, the return value is zero." */ -DWORD STDCALL +DWORD APIENTRY NtGdiGetRegionData( HRGN hrgn, DWORD count, diff --git a/reactos/subsystems/win32/win32k/objects/stockobj.c b/reactos/subsystems/win32/win32k/objects/stockobj.c index ea3f52b1b02..c986fb56692 100644 --- a/reactos/subsystems/win32/win32k/objects/stockobj.c +++ b/reactos/subsystems/win32/win32k/objects/stockobj.c @@ -201,7 +201,7 @@ CreateStockObjects(void) * \param Object - stock object id. * \return Handle to the object. */ -HGDIOBJ STDCALL +HGDIOBJ APIENTRY NtGdiGetStockObject(INT Object) { DPRINT("NtGdiGetStockObject index %d\n", Object); diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c index 0e2f28e41dc..252e20ca6d4 100644 --- a/reactos/subsystems/win32/win32k/objects/text.c +++ b/reactos/subsystems/win32/win32k/objects/text.c @@ -277,7 +277,7 @@ NtGdiGetTextExtentExW( } BOOL -STDCALL +APIENTRY NtGdiGetTextExtent(HDC hdc, LPWSTR lpwsz, INT cwc, @@ -288,7 +288,7 @@ NtGdiGetTextExtent(HDC hdc, } BOOL -STDCALL +APIENTRY NtGdiSetTextJustification(HDC hDC, int BreakExtra, int BreakCount) diff --git a/reactos/subsystems/win32/win32k/objects/wingl.c b/reactos/subsystems/win32/win32k/objects/wingl.c index bb495ffb2d9..de7781f87f2 100644 --- a/reactos/subsystems/win32/win32k/objects/wingl.c +++ b/reactos/subsystems/win32/win32k/objects/wingl.c @@ -24,7 +24,7 @@ #include INT -STDCALL +APIENTRY NtGdiChoosePixelFormat(HDC hDC, CONST PPIXELFORMATDESCRIPTOR pfd) { @@ -34,7 +34,7 @@ NtGdiChoosePixelFormat(HDC hDC, INT -STDCALL +APIENTRY NtGdiDescribePixelFormat(HDC hDC, INT PixelFormat, UINT BufSize, @@ -56,7 +56,7 @@ NtGdiSetPixelFormat( } BOOL -STDCALL +APIENTRY NtGdiSwapBuffers(HDC hDC) { UNIMPLEMENTED; diff --git a/reactos/subsystems/win32/win32k/objects/xformobj.c b/reactos/subsystems/win32/win32k/objects/xformobj.c index 53697ccc3b7..8321e653c0b 100644 --- a/reactos/subsystems/win32/win32k/objects/xformobj.c +++ b/reactos/subsystems/win32/win32k/objects/xformobj.c @@ -405,7 +405,7 @@ XFORMOBJ_bXformFixPoints( // www.osr.com/ddk/graphics/gdifncs_0s2v.htm ULONG -NTAPI +APIENTRY XFORMOBJ_iGetXform( IN XFORMOBJ *pxo, OUT XFORML *pxform) @@ -433,7 +433,7 @@ XFORMOBJ_iGetXform( // www.osr.com/ddk/graphics/gdifncs_5ig7.htm ULONG -NTAPI +APIENTRY XFORMOBJ_iGetFloatObjXform( IN XFORMOBJ *pxo, OUT FLOATOBJ_XFORM *pxfo) @@ -461,7 +461,7 @@ XFORMOBJ_iGetFloatObjXform( // www.osr.com/ddk/graphics/gdifncs_027b.htm BOOL -NTAPI +APIENTRY XFORMOBJ_bApplyXform( IN XFORMOBJ *pxo, IN ULONG iMode, diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c index dea2828abcc..70f9efb4c6f 100644 --- a/reactos/subsystems/win32/win32k/stubs/stubs.c +++ b/reactos/subsystems/win32/win32k/stubs/stubs.c @@ -2778,7 +2778,7 @@ NtGdiUnmapMemFont( } BOOL -STDCALL +APIENTRY EngControlSprites( IN WNDOBJ *pwo, IN FLONG fl) -- 2.17.1