- Go away STDCALL, time has come for WINAPI and NTAPI

svn path=/trunk/; revision=37763

reactos/dll/cpl/access/access.c

@@ -252,7 +252,7 @@ CPlApplet(HWND hwndCPl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)

reactos/dll/cpl/intl/intl.c

@@ -199,7 +199,7 @@ CPlApplet(HWND hwndCpl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpReserved)

reactos/dll/cpl/liccpa/liccpa.c

@@ -99,7 +99,7 @@ CPlApplet(HWND hwndCPl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)

reactos/dll/cpl/main/main.c

@@ -128,7 +128,7 @@ CPlApplet(HWND hwndCpl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpReserved)

reactos/dll/cpl/mmsys/mmsys.c

@@ -340,7 +340,7 @@ CPlApplet(HWND hwndCpl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpReserved)

reactos/dll/cpl/sysdm/hardware.c

@@ -10,7 +10,7 @@
 
 #include "precomp.h"
 
-typedef BOOL (STDCALL *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unknown, int nCmdShow);
+typedef BOOL (WINAPI *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unknown, int nCmdShow);
 
 static BOOL
 LaunchDeviceManager(HWND hWndParent)

reactos/dll/cpl/sysdm/sysdm.c

@@ -186,7 +186,7 @@ CPlApplet(HWND hwndCPl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)

reactos/dll/directx/d3d9/d3d9_callbacks.c

@@ -7,7 +7,6 @@
  */
 #include "d3d9_common.h"
 #include "d3d9_callbacks.h"
-#define STDCALL __stdcall
 #include <d3d9.h>
 #include <dll/directx/d3d8thk.h>
 #include "d3d9_private.h"

reactos/dll/directx/d3d9/d3d9_caps.c

@@ -1,4 +1,3 @@
-#define STDCALL __stdcall
 #include <d3d9.h>
 #include <ddraw.h>
 #include <d3dnthal.h>

reactos/dll/keyboard/kbda1/kbda1.c

@@ -386,6 +386,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbda2/kbda2.c

@@ -403,6 +403,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbda3/kbda3.c

@@ -403,6 +403,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdal/kbdal.c

@@ -400,11 +400,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdarme/kbdarme.c

@@ -373,6 +373,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdarmw/kbdarmw.c

@@ -361,6 +361,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdaze/kbdaze.c

@@ -378,11 +378,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdazel/kbdazel.c

@@ -373,11 +373,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdbe/kbdbe.c

@@ -481,11 +481,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdbga/kbdbga.c

@@ -402,6 +402,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdbgm/kbdbgm.c

@@ -403,11 +403,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdbgt/kbdbgt.c

@@ -422,11 +422,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdblr/kbdblr.c

@@ -378,11 +378,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdbr/kbdbr.c

@@ -461,11 +461,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdbur/kbdbur.c

@@ -380,7 +380,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdcan/kbdcan.c

@@ -593,11 +593,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdcr/kbdcr.c

@@ -508,11 +508,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdcz1/kbdcz1.c

@@ -413,7 +413,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdda/kbdda.c

@@ -480,11 +480,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbddv/kbddv.c

@@ -351,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdes/kbdes.c

@@ -533,6 +533,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 };
 
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdest/kbdest.c

@@ -454,11 +454,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdfc/kbdfc.c

@@ -471,11 +471,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdfi/kbdfi.c

@@ -471,6 +471,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdfr/kbdfr.c

@@ -470,7 +470,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdgeo/kbdgeo.c

@@ -378,11 +378,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdgerg/kbdgerg.c

@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdgneo/kbdgneo.c

@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdgr/kbdgr.c

@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdgrist/kbdgrist.c

@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdhe/kbdhe.c

@@ -383,6 +383,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdheb/kbdheb.c

@@ -12,8 +12,8 @@
 #include <internal/kbd.h>
 
 #ifdef _MSC_VER
-#ifndef STDCALL
-#define STDCALL __stdcall
+#ifndef WINAPI
+#define WINAPI __stdcall
 #endif
 #endif//_MSC_VER
 
@@ -470,7 +470,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID)
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID)
 {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdhu/kbdhu.c

@@ -351,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdic/kbdic.c

@@ -462,11 +462,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdinasa/kbdinasa.c

@@ -399,11 +399,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdinben/kbdinben.c

@@ -394,11 +394,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdindev/kbdindev.c

@@ -399,11 +399,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdinguj/kbdinguj.c

@@ -399,11 +399,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdinmal/kbdinmal.c

@@ -395,11 +395,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdir/kbdir.c

@@ -427,11 +427,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdit/kbdit.c

@@ -411,7 +411,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdja/kbdja.c

@@ -365,7 +365,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor() {
+PKBDTABLES WINAPI KbdLayerDescriptor() {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdkaz/kbdkaz.c

@@ -378,11 +378,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdko/kbdko.c

@@ -358,7 +358,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdla/kbdla.c

@@ -448,11 +448,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdlt/kbdlt.c

@@ -389,6 +389,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdlv/kbdlv.c

@@ -439,11 +439,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdmac/kbdmac.c

@@ -384,11 +384,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdne/kbdne.c

@@ -466,11 +466,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdno/kbdno.c

@@ -480,11 +480,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdpl1/kbdpl1.c

@@ -362,7 +362,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdpo/kbdpo.c

@@ -618,6 +618,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 };
 
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdro/kbdro.c

@@ -383,11 +383,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdru/kbdru.c

@@ -391,11 +391,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdru1/kbdru1.c

@@ -391,11 +391,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdsg/kbdsg.c

@@ -480,7 +480,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdsk/kbdsk.c

@@ -463,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdsk1/kbdsk1.c

@@ -463,6 +463,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdsw/kbdsw.c

@@ -476,11 +476,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdtat/kbdtat.c

@@ -388,11 +388,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdth0/kbdth0.c

@@ -378,6 +378,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdth1/kbdth1.c

@@ -378,6 +378,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdth2/kbdth2.c

@@ -377,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdth3/kbdth3.c

@@ -378,6 +378,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }

reactos/dll/keyboard/kbdtuf/kbdtuf.c

@@ -473,11 +473,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdtuq/kbdtuq.c

@@ -473,11 +473,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbduk/kbduk.c

@@ -369,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdur/kbdur.c

@@ -392,11 +392,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdurs/kbdurs.c

@@ -383,11 +383,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdus/kbdus.c

@@ -352,7 +352,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 

reactos/dll/keyboard/kbdusa/kbdusa.c

@@ -383,11 +383,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdusl/kbdusl.c

@@ -378,11 +378,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdusr/kbdusr.c

@@ -378,11 +378,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdusx/kbdusx.c

@@ -467,11 +467,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbduzb/kbduzb.c

@@ -378,11 +378,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdvntc/kbdvntc.c

@@ -383,11 +383,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdycc/kbdycc.c

@@ -399,11 +399,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/keyboard/kbdycl/kbdycl.c

@@ -519,11 +519,11 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(
   PVOID hinstDll,
   ULONG dwReason,

reactos/dll/shellext/deskadp/deskadp.c

@@ -610,7 +610,7 @@ IDeskDisplayAdapter_Constructor(REFIID riid,
     return hRet;
 }
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)

reactos/dll/shellext/deskmon/deskmon.c

@@ -735,7 +735,7 @@ IDeskMonitor_Constructor(REFIID riid,
     return hRet;
 }
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)

reactos/dll/shellext/fontext/fontext.c

@@ -28,7 +28,7 @@ DllGetClassObject(REFCLSID rclsid,
     return S_OK;
 }
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)

reactos/dll/shellext/slayer/slayer.c

@@ -908,7 +908,7 @@ ICompatibilityPage_fnLockServer(LPCOMPATIBILITYPAGE this,
    Exported
  ******************************************************************************/
 
-HRESULT STDCALL
+HRESULT WINAPI
 DllGetClassObject(REFCLSID rclsid,
                   REFIID iid,
                   LPVOID *ppv)
@@ -936,7 +936,7 @@ DllGetClassObject(REFCLSID rclsid,
     return CLASS_E_CLASSNOTAVAILABLE;
 }
 
-HRESULT STDCALL
+HRESULT WINAPI
 DllCanUnloadNow(VOID)
 {
     return ((dllrefs == 0) ? S_OK : S_FALSE);
@@ -955,7 +955,7 @@ UnregisterPropSheetHandler(LPTSTR szType)
                         szKey);
 }
 
-HRESULT STDCALL
+HRESULT WINAPI
 DllUnregisterServer(VOID)
 {
     LONG e;
@@ -1037,7 +1037,7 @@ RegisterPropSheetHandler(LPTSTR szType,
     return e;
 }
 
-HRESULT STDCALL
+HRESULT WINAPI
 DllRegisterServer(VOID)
 {
     LONG e = E_ACCESSDENIED;
@@ -1125,7 +1125,7 @@ DllRegisterServer(VOID)
     return ((e == ERROR_SUCCESS) ? S_OK : E_ACCESSDENIED);
 }
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)

reactos/dll/win32/acledit/acledit.c

@@ -36,7 +36,7 @@
 HINSTANCE hDllInstance;
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(
 	HINSTANCE hinstDLL,
 	DWORD     dwReason,

reactos/dll/win32/advapi32/advapi32.h

@@ -72,7 +72,7 @@ typedef struct _NTMARTA
     /* 2E8 */PVOID GetAccessForTrustee;
     /* 2EC */PVOID GetExplicitEntries;
     /* 2F0 */
-    DWORD (STDCALL *RewriteGetNamedRights)(LPWSTR pObjectName,
+    DWORD (WINAPI *RewriteGetNamedRights)(LPWSTR pObjectName,
                                            SE_OBJECT_TYPE ObjectType,
                                            SECURITY_INFORMATION SecurityInfo,
                                            PSID* ppsidOwner,
@@ -82,13 +82,13 @@ typedef struct _NTMARTA
                                            PSECURITY_DESCRIPTOR* ppSecurityDescriptor);
 
     /* 2F4 */
-    DWORD (STDCALL *RewriteSetNamedRights)(LPWSTR pObjectName,
+    DWORD (WINAPI *RewriteSetNamedRights)(LPWSTR pObjectName,
                                            SE_OBJECT_TYPE ObjectType,
                                            SECURITY_INFORMATION SecurityInfo,
                                            PSECURITY_DESCRIPTOR pSecurityDescriptor);
 
     /*2F8*/
-    DWORD (STDCALL *RewriteGetHandleRights)(HANDLE handle,
+    DWORD (WINAPI *RewriteGetHandleRights)(HANDLE handle,
                                             SE_OBJECT_TYPE ObjectType,
                                             SECURITY_INFORMATION SecurityInfo,
                                             PSID* ppsidOwner,
@@ -98,24 +98,24 @@ typedef struct _NTMARTA
                                             PSECURITY_DESCRIPTOR* ppSecurityDescriptor);
 
     /* 2FC */
-    DWORD (STDCALL *RewriteSetHandleRights)(HANDLE handle,
+    DWORD (WINAPI *RewriteSetHandleRights)(HANDLE handle,
                                             SE_OBJECT_TYPE ObjectType,
                                             SECURITY_INFORMATION SecurityInfo,
                                             PSECURITY_DESCRIPTOR pSecurityDescriptor);
 
     /* 300 */
-    DWORD (STDCALL *RewriteSetEntriesInAcl)(ULONG cCountOfExplicitEntries,
+    DWORD (WINAPI *RewriteSetEntriesInAcl)(ULONG cCountOfExplicitEntries,
                                             PEXPLICIT_ACCESS_W pListOfExplicitEntries,
                                             PACL OldAcl,
                                             PACL* NewAcl);
 
     /* 304 */
-    DWORD (STDCALL *RewriteGetExplicitEntriesFromAcl)(PACL pacl,
+    DWORD (WINAPI *RewriteGetExplicitEntriesFromAcl)(PACL pacl,
                                                       PULONG pcCountOfExplicitEntries,
                                                       PEXPLICIT_ACCESS_W* pListOfExplicitEntries);
 
     /* 308 */
-    DWORD (STDCALL *TreeResetNamedSecurityInfo)(LPWSTR pObjectName,
+    DWORD (WINAPI *TreeResetNamedSecurityInfo)(LPWSTR pObjectName,
                                                 SE_OBJECT_TYPE ObjectType,
                                                 SECURITY_INFORMATION SecurityInfo,
                                                 PSID pOwner,
@@ -127,7 +127,7 @@ typedef struct _NTMARTA
                                                 PROG_INVOKE_SETTING ProgressInvokeSetting,
                                                 PVOID Args);
     /* 30C */
-    DWORD (STDCALL *GetInheritanceSource)(LPWSTR pObjectName,
+    DWORD (WINAPI *GetInheritanceSource)(LPWSTR pObjectName,
                                           SE_OBJECT_TYPE ObjectType,
                                           SECURITY_INFORMATION SecurityInfo,
                                           BOOL Container,
@@ -139,7 +139,7 @@ typedef struct _NTMARTA
                                           PINHERITED_FROMW pInheritArray);
 
     /* 310 */
-    DWORD (STDCALL *FreeIndexArray)(PINHERITED_FROMW pInheritArray,
+    DWORD (WINAPI *FreeIndexArray)(PINHERITED_FROMW pInheritArray,
                                     USHORT AceCnt,
                                     PFN_OBJECT_MGR_FUNCTS pfnArray  OPTIONAL);
 } NTMARTA, *PNTMARTA;

reactos/dll/win32/advapi32/misc/dllmain.c

@@ -17,7 +17,7 @@ extern BOOL RegInitialize(VOID);
 extern BOOL RegCleanup(VOID);
 extern VOID UnloadNtMarta(VOID);
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDll,
     DWORD dwReason,
     LPVOID reserved)

reactos/dll/win32/advapi32/misc/hwprofiles.c

@@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetCurrentHwProfileA(LPHW_PROFILE_INFOA lpHwProfileInfo)
 {
     HW_PROFILE_INFOW ProfileInfo;
@@ -83,7 +83,7 @@ GetCurrentHwProfileA(LPHW_PROFILE_INFOA lpHwProfileInfo)
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetCurrentHwProfileW(LPHW_PROFILE_INFOW lpHwProfileInfo)
 {
     WCHAR szKeyName[256];

reactos/dll/win32/advapi32/misc/logon.c

@@ -17,7 +17,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 CreateProcessAsUserA(HANDLE hToken,
                      LPCSTR lpApplicationName,
                      LPSTR lpCommandLine,
@@ -75,7 +75,7 @@ CreateProcessAsUserA(HANDLE hToken,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 CreateProcessAsUserW(HANDLE hToken,
                      LPCWSTR lpApplicationName,
                      LPWSTR lpCommandLine,
@@ -133,7 +133,7 @@ CreateProcessAsUserW(HANDLE hToken,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 LogonUserA(LPSTR lpszUsername,
            LPSTR lpszDomain,
            LPSTR lpszPassword,
@@ -198,7 +198,7 @@ UsernameDone:
 }
 
 
-static BOOL STDCALL
+static BOOL WINAPI
 SamGetUserSid(LPCWSTR UserName,
               PSID *Sid)
 {
@@ -294,7 +294,7 @@ SamGetUserSid(LPCWSTR UserName,
 }
 
 
-static BOOL STDCALL
+static BOOL WINAPI
 SamGetDomainSid(PSID *Sid)
 {
     PSID lpSid;
@@ -595,7 +595,7 @@ FreeGroupSids(PTOKEN_GROUPS TokenGroups)
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 LogonUserW(LPWSTR lpszUsername,
            LPWSTR lpszDomain,
            LPWSTR lpszPassword,

reactos/dll/win32/advapi32/misc/shutdown.c

@@ -20,7 +20,7 @@
  *
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AbortSystemShutdownW(LPCWSTR lpMachineName)
 {
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -33,7 +33,7 @@ AbortSystemShutdownW(LPCWSTR lpMachineName)
  *
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AbortSystemShutdownA(LPCSTR lpMachineName)
 {
     ANSI_STRING MachineNameA;
@@ -61,7 +61,7 @@ AbortSystemShutdownA(LPCSTR lpMachineName)
  *
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 InitiateSystemShutdownW(LPWSTR lpMachineName,
                         LPWSTR lpMessage,
                         DWORD dwTimeout,
@@ -94,7 +94,7 @@ InitiateSystemShutdownW(LPWSTR lpMachineName,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 InitiateSystemShutdownA(LPSTR lpMachineName,
                         LPSTR lpMessage,
                         DWORD dwTimeout,

reactos/dll/win32/advapi32/reg/reg.c

@@ -323,7 +323,7 @@ RegDisablePredefinedCache(VOID)
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDisablePredefinedCacheEx(VOID)
 {
     RtlEnterCriticalSection(&HandleTableCS);
@@ -339,7 +339,7 @@ RegDisablePredefinedCacheEx(VOID)
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegOverridePredefKey(IN HKEY hKey,
                      IN HKEY hNewHKey  OPTIONAL)
 {
@@ -397,7 +397,7 @@ RegOverridePredefKey(IN HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegCloseKey(HKEY hKey)
 {
     NTSTATUS Status;
@@ -705,7 +705,7 @@ RegpCopyTree(IN HKEY hKeySrc,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegCopyTreeW(IN HKEY hKeySrc,
              IN LPCWSTR lpSubKey  OPTIONAL,
              IN HKEY hKeyDest)
@@ -781,7 +781,7 @@ Cleanup2:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegCopyTreeA(IN HKEY hKeySrc,
              IN LPCSTR lpSubKey  OPTIONAL,
              IN HKEY hKeyDest)
@@ -811,7 +811,7 @@ RegCopyTreeA(IN HKEY hKeySrc,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegConnectRegistryA(IN LPCSTR lpMachineName,
                     IN HKEY hKey,
                     OUT PHKEY phkResult)
@@ -841,7 +841,7 @@ RegConnectRegistryA(IN LPCSTR lpMachineName,
  *
  * @unimplemented
  */
-LONG STDCALL
+LONG WINAPI
 RegConnectRegistryW(LPCWSTR lpMachineName,
                     HKEY hKey,
                     PHKEY phkResult)
@@ -1001,7 +1001,7 @@ CreateNestedKey(PHKEY KeyHandle,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegCreateKeyExA(HKEY hKey,
                 LPCSTR lpSubKey,
                 DWORD Reserved,
@@ -1075,7 +1075,7 @@ RegCreateKeyExA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegCreateKeyExW(HKEY hKey,
                 LPCWSTR lpSubKey,
                 DWORD Reserved,
@@ -1140,7 +1140,7 @@ RegCreateKeyExW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegCreateKeyA(HKEY hKey,
               LPCSTR lpSubKey,
               PHKEY phkResult)
@@ -1162,7 +1162,7 @@ RegCreateKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegCreateKeyW(HKEY hKey,
               LPCWSTR lpSubKey,
               PHKEY phkResult)
@@ -1184,7 +1184,7 @@ RegCreateKeyW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteKeyA(HKEY hKey,
               LPCSTR lpSubKey)
 {
@@ -1245,7 +1245,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteKeyW(HKEY hKey,
               LPCWSTR lpSubKey)
 {
@@ -1338,7 +1338,7 @@ RegDeleteKeyExW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteKeyValueW(IN HKEY hKey,
                    IN LPCWSTR lpSubKey  OPTIONAL,
                    IN LPCWSTR lpValueName  OPTIONAL)
@@ -1409,7 +1409,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteKeyValueA(IN HKEY hKey,
                    IN LPCSTR lpSubKey  OPTIONAL,
                    IN LPCSTR lpValueName  OPTIONAL)
@@ -1653,7 +1653,7 @@ SubKeyFailureNoFree:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteTreeW(IN HKEY hKey,
                IN LPCWSTR lpSubKey  OPTIONAL)
 {
@@ -1824,7 +1824,7 @@ cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteTreeA(IN HKEY hKey,
                IN LPCSTR lpSubKey  OPTIONAL)
 {
@@ -2157,7 +2157,7 @@ RegGetValueA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSetKeyValueW(IN HKEY hKey,
                 IN LPCWSTR lpSubKey  OPTIONAL,
                 IN LPCWSTR lpValueName  OPTIONAL,
@@ -2228,7 +2228,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSetKeyValueA(IN HKEY hKey,
                 IN LPCSTR lpSubKey  OPTIONAL,
                 IN LPCSTR lpValueName  OPTIONAL,
@@ -2306,7 +2306,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteValueA(HKEY hKey,
                 LPCSTR lpValueName)
 {
@@ -2343,7 +2343,7 @@ RegDeleteValueA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegDeleteValueW(HKEY hKey,
                 LPCWSTR lpValueName)
 {
@@ -2380,7 +2380,7 @@ RegDeleteValueW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegEnumKeyA(HKEY hKey,
             DWORD dwIndex,
             LPSTR lpName,
@@ -2405,7 +2405,7 @@ RegEnumKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegEnumKeyW(HKEY hKey,
             DWORD dwIndex,
             LPWSTR lpName,
@@ -2430,7 +2430,7 @@ RegEnumKeyW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegEnumKeyExA(HKEY hKey,
               DWORD dwIndex,
               LPSTR lpName,
@@ -2600,7 +2600,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegEnumKeyExW(HKEY hKey,
               DWORD dwIndex,
               LPWSTR lpName,
@@ -2748,7 +2748,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegEnumValueA(HKEY hKey,
               DWORD index,
               LPSTR value,
@@ -2884,7 +2884,7 @@ RegEnumValueA(HKEY hKey,
  *  Success: ERROR_SUCCESS
  *  Failure: nonzero error code from Winerror.h
  */
-LONG STDCALL
+LONG WINAPI
 RegEnumValueW(HKEY hKey,
               DWORD index,
               LPWSTR value,
@@ -2986,7 +2986,7 @@ RegEnumValueW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegFlushKey(HKEY hKey)
 {
     HANDLE KeyHandle;
@@ -3022,7 +3022,7 @@ RegFlushKey(HKEY hKey)
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegGetKeySecurity(HKEY hKey,
                   SECURITY_INFORMATION SecurityInformation,
                   PSECURITY_DESCRIPTOR pSecurityDescriptor,
@@ -3069,7 +3069,7 @@ RegGetKeySecurity(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegLoadKeyA(HKEY hKey,
             LPCSTR lpSubKey,
             LPCSTR lpFile)
@@ -3099,7 +3099,7 @@ RegLoadKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegLoadKeyW(HKEY hKey,
             LPCWSTR lpSubKey,
             LPCWSTR lpFile)
@@ -3173,7 +3173,7 @@ Cleanup:
  *
  * @unimplemented
  */
-LONG STDCALL
+LONG WINAPI
 RegNotifyChangeKeyValue(HKEY hKey,
                         BOOL bWatchSubtree,
                         DWORD dwNotifyFilter,
@@ -3230,7 +3230,7 @@ RegNotifyChangeKeyValue(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegOpenCurrentUser(IN REGSAM samDesired,
                    OUT PHKEY phkResult)
 {
@@ -3255,7 +3255,7 @@ RegOpenCurrentUser(IN REGSAM samDesired,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegOpenKeyA(HKEY hKey,
             LPCSTR lpSubKey,
             PHKEY phkResult)
@@ -3291,7 +3291,7 @@ RegOpenKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegOpenKeyW(HKEY hKey,
             LPCWSTR lpSubKey,
             PHKEY phkResult)
@@ -3323,7 +3323,7 @@ RegOpenKeyW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegOpenKeyExA(HKEY hKey,
               LPCSTR lpSubKey,
               DWORD ulOptions,
@@ -3374,7 +3374,7 @@ RegOpenKeyExA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegOpenKeyExW(HKEY hKey,
               LPCWSTR lpSubKey,
               DWORD ulOptions,
@@ -3426,7 +3426,7 @@ RegOpenKeyExW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegOpenUserClassesRoot(IN HANDLE hToken,
                        IN DWORD dwOptions,
                        IN REGSAM samDesired,
@@ -3568,7 +3568,7 @@ ReadTokenSid:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegQueryInfoKeyA(HKEY hKey,
                  LPSTR lpClass,
                  LPDWORD lpcbClass,
@@ -3629,7 +3629,7 @@ RegQueryInfoKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegQueryInfoKeyW(HKEY hKey,
                  LPWSTR lpClass,
                  LPDWORD lpcbClass,
@@ -3813,7 +3813,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegQueryMultipleValuesA(HKEY hKey,
                         PVALENTA val_list,
                         DWORD num_vals,
@@ -3877,7 +3877,7 @@ RegQueryMultipleValuesA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegQueryMultipleValuesW(HKEY hKey,
                         PVALENTW val_list,
                         DWORD num_vals,
@@ -3956,7 +3956,7 @@ RegQueryReflectionKey(IN HKEY hBase,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegQueryValueExA(HKEY hKey,
                  LPCSTR lpValueName,
                  LPDWORD lpReserved,
@@ -4154,7 +4154,7 @@ RegQueryValueExW(HKEY hkeyorg,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegQueryValueA(HKEY hKey,
                LPCSTR lpSubKey,
                LPSTR lpValue,
@@ -4249,7 +4249,7 @@ RegQueryValueA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegQueryValueW(HKEY hKey,
                LPCWSTR lpSubKey,
                LPWSTR lpValue,
@@ -4323,7 +4323,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegReplaceKeyA(HKEY hKey,
                LPCSTR lpSubKey,
                LPCSTR lpNewFile,
@@ -4359,7 +4359,7 @@ RegReplaceKeyA(HKEY hKey,
  *
  * @unimplemented
  */
-LONG STDCALL
+LONG WINAPI
 RegReplaceKeyW(HKEY hKey,
                LPCWSTR lpSubKey,
                LPCWSTR lpNewFile,
@@ -4494,7 +4494,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegRestoreKeyA(HKEY hKey,
                LPCSTR lpFile,
                DWORD dwFlags)
@@ -4520,7 +4520,7 @@ RegRestoreKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegRestoreKeyW(HKEY hKey,
                LPCWSTR lpFile,
                DWORD dwFlags)
@@ -4595,7 +4595,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSaveKeyA(HKEY hKey,
             LPCSTR lpFile,
             LPSECURITY_ATTRIBUTES lpSecurityAttributes)
@@ -4619,7 +4619,7 @@ RegSaveKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSaveKeyW(HKEY hKey,
             LPCWSTR lpFile,
             LPSECURITY_ATTRIBUTES lpSecurityAttributes)
@@ -4698,7 +4698,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSetKeySecurity(HKEY hKey,
                   SECURITY_INFORMATION SecurityInformation,
                   PSECURITY_DESCRIPTOR pSecurityDescriptor)
@@ -4738,7 +4738,7 @@ RegSetKeySecurity(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSetValueExA(HKEY hKey,
                LPCSTR lpValueName,
                DWORD Reserved,
@@ -4826,7 +4826,7 @@ RegSetValueExA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSetValueExW(HKEY hKey,
                LPCWSTR lpValueName,
                DWORD Reserved,
@@ -4889,7 +4889,7 @@ RegSetValueExW(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSetValueA(HKEY hKeyOriginal,
              LPCSTR lpSubKey,
              DWORD dwType,
@@ -4935,7 +4935,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegSetValueW(HKEY hKeyOriginal,
              LPCWSTR lpSubKey,
              DWORD dwType,
@@ -4984,7 +4984,7 @@ Cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegUnLoadKeyA(HKEY hKey,
               LPCSTR lpSubKey)
 {
@@ -5008,7 +5008,7 @@ RegUnLoadKeyA(HKEY hKey,
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegUnLoadKeyW(HKEY hKey,
               LPCWSTR lpSubKey)
 {
@@ -5099,7 +5099,7 @@ static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMa
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegLoadMUIStringW(IN HKEY hKey,
                   IN LPCWSTR pszValue  OPTIONAL,
                   OUT LPWSTR pszOutBuf,
@@ -5199,7 +5199,7 @@ cleanup:
  *
  * @implemented
  */
-LONG STDCALL
+LONG WINAPI
 RegLoadMUIStringA(IN HKEY hKey,
                   IN LPCSTR pszValue  OPTIONAL,
                   OUT LPSTR pszOutBuf,

reactos/dll/win32/advapi32/sec/ac.c

@@ -17,7 +17,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetAclInformation(PACL pAcl,
                   LPVOID pAclInformation,
                   DWORD nAclInformationLength,
@@ -43,7 +43,7 @@ GetAclInformation(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 InitializeAcl(PACL pAcl,
               DWORD nAclLength,
               DWORD dwAclRevision)
@@ -67,7 +67,7 @@ InitializeAcl(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 IsValidAcl(PACL pAcl)
 {
     return RtlValidAcl (pAcl);
@@ -78,7 +78,7 @@ IsValidAcl(PACL pAcl)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetAclInformation(PACL pAcl,
                   LPVOID pAclInformation,
                   DWORD nAclInformationLength,
@@ -106,7 +106,7 @@ SetAclInformation(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AddAccessAllowedAce(PACL pAcl,
                     DWORD dwAceRevision,
                     DWORD AccessMask,
@@ -131,7 +131,7 @@ AddAccessAllowedAce(PACL pAcl,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AddAccessAllowedAceEx(PACL pAcl,
                       DWORD dwAceRevision,
                       DWORD AceFlags,
@@ -159,7 +159,7 @@ AddAccessAllowedAceEx(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AddAccessAllowedObjectAce(PACL pAcl,
                           DWORD dwAceRevision,
                           DWORD AceFlags,
@@ -191,7 +191,7 @@ AddAccessAllowedObjectAce(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AddAccessDeniedAce(PACL pAcl,
                    DWORD dwAceRevision,
                    DWORD AccessMask,
@@ -216,7 +216,7 @@ AddAccessDeniedAce(PACL pAcl,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AddAccessDeniedAceEx(PACL pAcl,
                      DWORD dwAceRevision,
                      DWORD AceFlags,
@@ -244,7 +244,7 @@ AddAccessDeniedAceEx(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AddAccessDeniedObjectAce(PACL pAcl,
                          DWORD dwAceRevision,
                          DWORD AceFlags,
@@ -276,7 +276,7 @@ AddAccessDeniedObjectAce(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AddAce(PACL pAcl,
        DWORD dwAceRevision,
        DWORD dwStartingAceIndex,
@@ -304,7 +304,7 @@ AddAce(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AddAuditAccessAce(PACL pAcl,
                   DWORD dwAceRevision,
                   DWORD dwAccessMask,
@@ -333,7 +333,7 @@ AddAuditAccessAce(PACL pAcl,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AddAuditAccessAceEx(PACL pAcl,
                     DWORD dwAceRevision,
                     DWORD AceFlags,
@@ -365,7 +365,7 @@ AddAuditAccessAceEx(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AddAuditAccessObjectAce(PACL pAcl,
                         DWORD dwAceRevision,
                         DWORD AceFlags,
@@ -430,7 +430,7 @@ AddMandatoryAce(IN OUT PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 DeleteAce(PACL pAcl,
           DWORD dwAceIndex)
 {
@@ -452,7 +452,7 @@ DeleteAce(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 FindFirstFreeAce(PACL pAcl,
                  LPVOID *pAce)
 {
@@ -465,7 +465,7 @@ FindFirstFreeAce(PACL pAcl,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetAce(PACL pAcl,
        DWORD dwAceIndex,
        LPVOID *pAce)
@@ -489,7 +489,7 @@ GetAce(PACL pAcl,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetInheritanceSourceW(LPWSTR pObjectName,
                       SE_OBJECT_TYPE ObjectType,
                       SECURITY_INFORMATION SecurityInfo,
@@ -527,7 +527,7 @@ GetInheritanceSourceW(LPWSTR pObjectName,
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GetInheritanceSourceA(LPSTR pObjectName,
                       SE_OBJECT_TYPE ObjectType,
                       SECURITY_INFORMATION SecurityInfo,
@@ -549,7 +549,7 @@ GetInheritanceSourceA(LPSTR pObjectName,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 FreeInheritedFromArray(PINHERITED_FROMW pInheritArray,
                        USHORT AceCnt,
                        PFN_OBJECT_MGR_FUNCTS pfnArray  OPTIONAL)
@@ -573,7 +573,7 @@ FreeInheritedFromArray(PINHERITED_FROMW pInheritArray,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 SetEntriesInAclW(ULONG cCountOfExplicitEntries,
                  PEXPLICIT_ACCESS_W pListOfExplicitEntries,
                  PACL OldAcl,
@@ -980,7 +980,7 @@ RawTrusteeCopy:
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 SetEntriesInAclA(ULONG cCountOfExplicitEntries,
                  PEXPLICIT_ACCESS_A pListOfExplicitEntries,
                  PACL OldAcl,
@@ -1013,7 +1013,7 @@ SetEntriesInAclA(ULONG cCountOfExplicitEntries,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetExplicitEntriesFromAclW(PACL pacl,
                            PULONG pcCountOfExplicitEntries,
                            PEXPLICIT_ACCESS_W *pListOfExplicitEntries)
@@ -1037,7 +1037,7 @@ GetExplicitEntriesFromAclW(PACL pacl,
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GetEffectiveRightsFromAclW(IN PACL pacl,
                            IN PTRUSTEE_W pTrustee,
                            OUT PACCESS_MASK pAccessRights)
@@ -1051,7 +1051,7 @@ GetEffectiveRightsFromAclW(IN PACL pacl,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetEffectiveRightsFromAclA(IN PACL pacl,
                            IN PTRUSTEE_A pTrustee,
                            OUT PACCESS_MASK pAccessRights)
@@ -1081,7 +1081,7 @@ GetEffectiveRightsFromAclA(IN PACL pacl,
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GetAuditedPermissionsFromAclW(IN PACL pacl,
                               IN PTRUSTEE_W pTrustee,
                               OUT PACCESS_MASK pSuccessfulAuditedRights,
@@ -1096,7 +1096,7 @@ GetAuditedPermissionsFromAclW(IN PACL pacl,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetAuditedPermissionsFromAclA(IN PACL pacl,
                               IN PTRUSTEE_A pTrustee,
                               OUT PACCESS_MASK pSuccessfulAuditedRights,

reactos/dll/win32/advapi32/sec/audit.c

@@ -21,7 +21,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckAndAuditAlarmA(LPCSTR SubsystemName,
                           LPVOID HandleId,
                           LPSTR ObjectTypeName,
@@ -87,7 +87,7 @@ AccessCheckAndAuditAlarmA(LPCSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckAndAuditAlarmW(LPCWSTR SubsystemName,
                           LPVOID HandleId,
                           LPWSTR ObjectTypeName,
@@ -150,7 +150,7 @@ AccessCheckAndAuditAlarmW(LPCWSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectCloseAuditAlarmA(LPCSTR SubsystemName,
                        LPVOID HandleId,
                        BOOL GenerateOnClose)
@@ -183,7 +183,7 @@ ObjectCloseAuditAlarmA(LPCSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectCloseAuditAlarmW(LPCWSTR SubsystemName,
                        LPVOID HandleId,
                        BOOL GenerateOnClose)
@@ -210,7 +210,7 @@ ObjectCloseAuditAlarmW(LPCWSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectDeleteAuditAlarmA(LPCSTR SubsystemName,
                         LPVOID HandleId,
                         BOOL GenerateOnClose)
@@ -243,7 +243,7 @@ ObjectDeleteAuditAlarmA(LPCSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectDeleteAuditAlarmW(LPCWSTR SubsystemName,
                         LPVOID HandleId,
                         BOOL GenerateOnClose)
@@ -270,7 +270,7 @@ ObjectDeleteAuditAlarmW(LPCWSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectOpenAuditAlarmA(LPCSTR SubsystemName,
                       LPVOID HandleId,
                       LPSTR ObjectTypeName,
@@ -324,7 +324,7 @@ ObjectOpenAuditAlarmA(LPCSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectOpenAuditAlarmW(LPCWSTR SubsystemName,
                       LPVOID HandleId,
                       LPWSTR ObjectTypeName,
@@ -375,7 +375,7 @@ ObjectOpenAuditAlarmW(LPCWSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectPrivilegeAuditAlarmA(LPCSTR SubsystemName,
                            LPVOID HandleId,
                            HANDLE ClientToken,
@@ -409,7 +409,7 @@ ObjectPrivilegeAuditAlarmA(LPCSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ObjectPrivilegeAuditAlarmW(LPCWSTR SubsystemName,
                            LPVOID HandleId,
                            HANDLE ClientToken,
@@ -442,7 +442,7 @@ ObjectPrivilegeAuditAlarmW(LPCWSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 PrivilegedServiceAuditAlarmA(LPCSTR SubsystemName,
                              LPCSTR ServiceName,
                              HANDLE ClientToken,
@@ -478,7 +478,7 @@ PrivilegedServiceAuditAlarmA(LPCSTR SubsystemName,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 PrivilegedServiceAuditAlarmW(LPCWSTR SubsystemName,
                              LPCWSTR ServiceName,
                              HANDLE ClientToken,
@@ -512,7 +512,7 @@ PrivilegedServiceAuditAlarmW(LPCWSTR SubsystemName,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckByTypeResultListAndAuditAlarmByHandleW(IN LPCWSTR SubsystemName,
                                                   IN LPVOID HandleId,
                                                   IN HANDLE ClientToken,
@@ -540,7 +540,7 @@ AccessCheckByTypeResultListAndAuditAlarmByHandleW(IN LPCWSTR SubsystemName,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckByTypeResultListAndAuditAlarmByHandleA(IN LPCSTR SubsystemName,
                                                   IN LPVOID HandleId,
                                                   IN HANDLE ClientToken,
@@ -568,7 +568,7 @@ AccessCheckByTypeResultListAndAuditAlarmByHandleA(IN LPCSTR SubsystemName,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckByTypeResultListAndAuditAlarmW(IN LPCWSTR SubsystemName,
                                           IN LPVOID HandleId,
                                           IN LPCWSTR ObjectTypeName,
@@ -595,7 +595,7 @@ AccessCheckByTypeResultListAndAuditAlarmW(IN LPCWSTR SubsystemName,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckByTypeResultListAndAuditAlarmA(IN LPCSTR SubsystemName,
                                           IN LPVOID HandleId,
                                           IN LPCSTR ObjectTypeName,
@@ -622,7 +622,7 @@ AccessCheckByTypeResultListAndAuditAlarmA(IN LPCSTR SubsystemName,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckByTypeAndAuditAlarmW(IN LPCWSTR SubsystemName,
                                 IN LPVOID HandleId,
                                 IN LPCWSTR ObjectTypeName,
@@ -649,7 +649,7 @@ AccessCheckByTypeAndAuditAlarmW(IN LPCWSTR SubsystemName,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheckByTypeAndAuditAlarmA(IN LPCSTR SubsystemName,
                                 IN LPVOID HandleId,
                                 IN LPCSTR ObjectTypeName,