- Go away STDCALL, time has come for WINAPI and NTAPI
authorStefan Ginsberg <stefanginsberg@gmail.com>
Sun, 30 Nov 2008 11:42:05 +0000 (11:42 +0000)
committerStefan Ginsberg <stefanginsberg@gmail.com>
Sun, 30 Nov 2008 11:42:05 +0000 (11:42 +0000)
svn path=/trunk/; revision=37763

296 files changed:
reactos/dll/cpl/access/access.c
reactos/dll/cpl/intl/intl.c
reactos/dll/cpl/liccpa/liccpa.c
reactos/dll/cpl/main/main.c
reactos/dll/cpl/mmsys/mmsys.c
reactos/dll/cpl/sysdm/hardware.c
reactos/dll/cpl/sysdm/sysdm.c
reactos/dll/directx/d3d9/d3d9_callbacks.c
reactos/dll/directx/d3d9/d3d9_caps.c
reactos/dll/keyboard/kbda1/kbda1.c
reactos/dll/keyboard/kbda2/kbda2.c
reactos/dll/keyboard/kbda3/kbda3.c
reactos/dll/keyboard/kbdal/kbdal.c
reactos/dll/keyboard/kbdarme/kbdarme.c
reactos/dll/keyboard/kbdarmw/kbdarmw.c
reactos/dll/keyboard/kbdaze/kbdaze.c
reactos/dll/keyboard/kbdazel/kbdazel.c
reactos/dll/keyboard/kbdbe/kbdbe.c
reactos/dll/keyboard/kbdbga/kbdbga.c
reactos/dll/keyboard/kbdbgm/kbdbgm.c
reactos/dll/keyboard/kbdbgt/kbdbgt.c
reactos/dll/keyboard/kbdblr/kbdblr.c
reactos/dll/keyboard/kbdbr/kbdbr.c
reactos/dll/keyboard/kbdbur/kbdbur.c
reactos/dll/keyboard/kbdcan/kbdcan.c
reactos/dll/keyboard/kbdcr/kbdcr.c
reactos/dll/keyboard/kbdcz1/kbdcz1.c
reactos/dll/keyboard/kbdda/kbdda.c
reactos/dll/keyboard/kbddv/kbddv.c
reactos/dll/keyboard/kbdes/kbdes.c
reactos/dll/keyboard/kbdest/kbdest.c
reactos/dll/keyboard/kbdfc/kbdfc.c
reactos/dll/keyboard/kbdfi/kbdfi.c
reactos/dll/keyboard/kbdfr/kbdfr.c
reactos/dll/keyboard/kbdgeo/kbdgeo.c
reactos/dll/keyboard/kbdgerg/kbdgerg.c
reactos/dll/keyboard/kbdgneo/kbdgneo.c
reactos/dll/keyboard/kbdgr/kbdgr.c
reactos/dll/keyboard/kbdgrist/kbdgrist.c
reactos/dll/keyboard/kbdhe/kbdhe.c
reactos/dll/keyboard/kbdheb/kbdheb.c
reactos/dll/keyboard/kbdhu/kbdhu.c
reactos/dll/keyboard/kbdic/kbdic.c
reactos/dll/keyboard/kbdinasa/kbdinasa.c
reactos/dll/keyboard/kbdinben/kbdinben.c
reactos/dll/keyboard/kbdindev/kbdindev.c
reactos/dll/keyboard/kbdinguj/kbdinguj.c
reactos/dll/keyboard/kbdinmal/kbdinmal.c
reactos/dll/keyboard/kbdir/kbdir.c
reactos/dll/keyboard/kbdit/kbdit.c
reactos/dll/keyboard/kbdja/kbdja.c
reactos/dll/keyboard/kbdkaz/kbdkaz.c
reactos/dll/keyboard/kbdko/kbdko.c
reactos/dll/keyboard/kbdla/kbdla.c
reactos/dll/keyboard/kbdlt/kbdlt.c
reactos/dll/keyboard/kbdlv/kbdlv.c
reactos/dll/keyboard/kbdmac/kbdmac.c
reactos/dll/keyboard/kbdne/kbdne.c
reactos/dll/keyboard/kbdno/kbdno.c
reactos/dll/keyboard/kbdpl1/kbdpl1.c
reactos/dll/keyboard/kbdpo/kbdpo.c
reactos/dll/keyboard/kbdro/kbdro.c
reactos/dll/keyboard/kbdru/kbdru.c
reactos/dll/keyboard/kbdru1/kbdru1.c
reactos/dll/keyboard/kbdsg/kbdsg.c
reactos/dll/keyboard/kbdsk/kbdsk.c
reactos/dll/keyboard/kbdsk1/kbdsk1.c
reactos/dll/keyboard/kbdsw/kbdsw.c
reactos/dll/keyboard/kbdtat/kbdtat.c
reactos/dll/keyboard/kbdth0/kbdth0.c
reactos/dll/keyboard/kbdth1/kbdth1.c
reactos/dll/keyboard/kbdth2/kbdth2.c
reactos/dll/keyboard/kbdth3/kbdth3.c
reactos/dll/keyboard/kbdtuf/kbdtuf.c
reactos/dll/keyboard/kbdtuq/kbdtuq.c
reactos/dll/keyboard/kbduk/kbduk.c
reactos/dll/keyboard/kbdur/kbdur.c
reactos/dll/keyboard/kbdurs/kbdurs.c
reactos/dll/keyboard/kbdus/kbdus.c
reactos/dll/keyboard/kbdusa/kbdusa.c
reactos/dll/keyboard/kbdusl/kbdusl.c
reactos/dll/keyboard/kbdusr/kbdusr.c
reactos/dll/keyboard/kbdusx/kbdusx.c
reactos/dll/keyboard/kbduzb/kbduzb.c
reactos/dll/keyboard/kbdvntc/kbdvntc.c
reactos/dll/keyboard/kbdycc/kbdycc.c
reactos/dll/keyboard/kbdycl/kbdycl.c
reactos/dll/shellext/deskadp/deskadp.c
reactos/dll/shellext/deskmon/deskmon.c
reactos/dll/shellext/fontext/fontext.c
reactos/dll/shellext/slayer/slayer.c
reactos/dll/win32/acledit/acledit.c
reactos/dll/win32/advapi32/advapi32.h
reactos/dll/win32/advapi32/misc/dllmain.c
reactos/dll/win32/advapi32/misc/hwprofiles.c
reactos/dll/win32/advapi32/misc/logon.c
reactos/dll/win32/advapi32/misc/shutdown.c
reactos/dll/win32/advapi32/reg/reg.c
reactos/dll/win32/advapi32/sec/ac.c
reactos/dll/win32/advapi32/sec/audit.c
reactos/dll/win32/advapi32/sec/lsa.c
reactos/dll/win32/advapi32/sec/misc.c
reactos/dll/win32/advapi32/sec/sec.c
reactos/dll/win32/advapi32/sec/sid.c
reactos/dll/win32/advapi32/service/scm.c
reactos/dll/win32/advapi32/service/sctrl.c
reactos/dll/win32/advapi32/token/privilege.c
reactos/dll/win32/advapi32/token/token.c
reactos/dll/win32/authz/authz.c
reactos/dll/win32/crtdll/dllmain.c
reactos/dll/win32/devmgr/misc.c
reactos/dll/win32/dhcpcsvc/dhcpcsvc.c
reactos/dll/win32/gdi32/include/gdi32p.h
reactos/dll/win32/gdi32/misc/gdientry.c
reactos/dll/win32/gdi32/misc/historic.c
reactos/dll/win32/gdi32/misc/misc.c
reactos/dll/win32/gdi32/misc/stubs.c
reactos/dll/win32/gdi32/misc/stubsa.c
reactos/dll/win32/gdi32/misc/stubsw.c
reactos/dll/win32/gdi32/misc/wingl.c
reactos/dll/win32/gdi32/objects/arc.c
reactos/dll/win32/gdi32/objects/bitmap.c
reactos/dll/win32/gdi32/objects/brush.c
reactos/dll/win32/gdi32/objects/coord.c
reactos/dll/win32/gdi32/objects/dc.c
reactos/dll/win32/gdi32/objects/eng.c
reactos/dll/win32/gdi32/objects/enhmfile.c
reactos/dll/win32/gdi32/objects/font.c
reactos/dll/win32/gdi32/objects/icm.c
reactos/dll/win32/gdi32/objects/linedda.c
reactos/dll/win32/gdi32/objects/metafile.c
reactos/dll/win32/gdi32/objects/painting.c
reactos/dll/win32/gdi32/objects/palette.c
reactos/dll/win32/gdi32/objects/path.c
reactos/dll/win32/gdi32/objects/region.c
reactos/dll/win32/gdi32/objects/text.c
reactos/dll/win32/gdi32/objects/utils.c
reactos/dll/win32/hid/hid.c
reactos/dll/win32/iphlpapi/media.c
reactos/dll/win32/iprtprio/iprtprio.c
reactos/dll/win32/kernel32/except/except.c
reactos/dll/win32/kernel32/file/backup.c
reactos/dll/win32/kernel32/file/bintype.c
reactos/dll/win32/kernel32/file/cnotify.c
reactos/dll/win32/kernel32/file/copy.c
reactos/dll/win32/kernel32/file/create.c
reactos/dll/win32/kernel32/file/curdir.c
reactos/dll/win32/kernel32/file/delete.c
reactos/dll/win32/kernel32/file/deviceio.c
reactos/dll/win32/kernel32/file/dir.c
reactos/dll/win32/kernel32/file/dosdev.c
reactos/dll/win32/kernel32/file/file.c
reactos/dll/win32/kernel32/file/find.c
reactos/dll/win32/kernel32/file/hardlink.c
reactos/dll/win32/kernel32/file/iocompl.c
reactos/dll/win32/kernel32/file/lfile.c
reactos/dll/win32/kernel32/file/lock.c
reactos/dll/win32/kernel32/file/mailslot.c
reactos/dll/win32/kernel32/file/move.c
reactos/dll/win32/kernel32/file/npipe.c
reactos/dll/win32/kernel32/file/pipe.c
reactos/dll/win32/kernel32/file/rw.c
reactos/dll/win32/kernel32/file/tape.c
reactos/dll/win32/kernel32/file/volume.c
reactos/dll/win32/kernel32/include/kernel32.h
reactos/dll/win32/kernel32/mem/heap.c
reactos/dll/win32/kernel32/mem/isbad.c
reactos/dll/win32/kernel32/mem/local.c
reactos/dll/win32/kernel32/mem/resnotify.c
reactos/dll/win32/kernel32/misc/actctx.c
reactos/dll/win32/kernel32/misc/chartype.c
reactos/dll/win32/kernel32/misc/comm.c
reactos/dll/win32/kernel32/misc/computername.c
reactos/dll/win32/kernel32/misc/console.c
reactos/dll/win32/kernel32/misc/dllmain.c
reactos/dll/win32/kernel32/misc/env.c
reactos/dll/win32/kernel32/misc/error.c
reactos/dll/win32/kernel32/misc/handle.c
reactos/dll/win32/kernel32/misc/lang.c
reactos/dll/win32/kernel32/misc/ldr.c
reactos/dll/win32/kernel32/misc/nls.c
reactos/dll/win32/kernel32/misc/perfcnt.c
reactos/dll/win32/kernel32/misc/profile.c
reactos/dll/win32/kernel32/misc/res.c
reactos/dll/win32/kernel32/misc/stubs.c
reactos/dll/win32/kernel32/misc/sysinfo.c
reactos/dll/win32/kernel32/misc/time.c
reactos/dll/win32/kernel32/misc/timerqueue.c
reactos/dll/win32/kernel32/misc/toolhelp.c
reactos/dll/win32/kernel32/misc/utils.c
reactos/dll/win32/kernel32/misc/version.c
reactos/dll/win32/kernel32/process/cmdline.c
reactos/dll/win32/kernel32/process/job.c
reactos/dll/win32/kernel32/process/proc.c
reactos/dll/win32/kernel32/process/procsup.c
reactos/dll/win32/kernel32/process/session.c
reactos/dll/win32/kernel32/string/lstring.c
reactos/dll/win32/kernel32/thread/thread.c
reactos/dll/win32/lsasrv/lsarpc.c
reactos/dll/win32/lsasrv/lsasrv.c
reactos/dll/win32/msafd/misc/dllmain.c
reactos/dll/win32/msvcrt/dllmain.c
reactos/dll/win32/mswsock/extensions.c
reactos/dll/win32/mswsock/stubs.c
reactos/dll/win32/netcfgx/inetcfgcomp_iface.c
reactos/dll/win32/netcfgx/netcfg_iface.c
reactos/dll/win32/netcfgx/precomp.h
reactos/dll/win32/netcfgx/tcpipconf_notify.c
reactos/dll/win32/netshell/lanconnectui.c
reactos/dll/win32/netshell/netshell.c
reactos/dll/win32/opengl32/gl.c
reactos/dll/win32/opengl32/opengl32.h
reactos/dll/win32/psapi/malloc.c
reactos/dll/win32/psapi/psapi.c
reactos/dll/win32/samlib/dllmain.c
reactos/dll/win32/samlib/samlib.c
reactos/dll/win32/samsrv/samsrv.c
reactos/dll/win32/secur32/dllmain.c
reactos/dll/win32/secur32/lsa.c
reactos/dll/win32/serialui/serialui.c
reactos/dll/win32/smdll/dllmain.c
reactos/dll/win32/smdll/query.c
reactos/dll/win32/snmpapi/snmpapi.c
reactos/dll/win32/syssetup/dllmain.c
reactos/dll/win32/syssetup/install.c
reactos/dll/win32/user32/controls/listbox.c
reactos/dll/win32/user32/controls/scrollbar.c
reactos/dll/win32/user32/include/draw.h
reactos/dll/win32/user32/include/user32.h
reactos/dll/win32/user32/include/user32p.h
reactos/dll/win32/user32/include/window.h
reactos/dll/win32/user32/include/winpos.h
reactos/dll/win32/user32/misc/desktop.c
reactos/dll/win32/user32/misc/display.c
reactos/dll/win32/user32/misc/dllmain.c
reactos/dll/win32/user32/misc/exit.c
reactos/dll/win32/user32/misc/misc.c
reactos/dll/win32/user32/misc/object.c
reactos/dll/win32/user32/misc/resources.c
reactos/dll/win32/user32/misc/stubs.c
reactos/dll/win32/user32/misc/timer.c
reactos/dll/win32/user32/misc/winhelp.c
reactos/dll/win32/user32/misc/winsta.c
reactos/dll/win32/user32/misc/wsprintf.c
reactos/dll/win32/user32/windows/bitmap.c
reactos/dll/win32/user32/windows/caret.c
reactos/dll/win32/user32/windows/class.c
reactos/dll/win32/user32/windows/clipboard.c
reactos/dll/win32/user32/windows/cursor.c
reactos/dll/win32/user32/windows/dc.c
reactos/dll/win32/user32/windows/defwnd.c
reactos/dll/win32/user32/windows/dialog.c
reactos/dll/win32/user32/windows/draw.c
reactos/dll/win32/user32/windows/font.c
reactos/dll/win32/user32/windows/hook.c
reactos/dll/win32/user32/windows/icon.c
reactos/dll/win32/user32/windows/input.c
reactos/dll/win32/user32/windows/menu.c
reactos/dll/win32/user32/windows/message.c
reactos/dll/win32/user32/windows/messagebox.c
reactos/dll/win32/user32/windows/nonclient.c
reactos/dll/win32/user32/windows/paint.c
reactos/dll/win32/user32/windows/prop.c
reactos/dll/win32/user32/windows/rect.c
reactos/dll/win32/user32/windows/text.c
reactos/dll/win32/user32/windows/window.c
reactos/dll/win32/user32/windows/winpos.c
reactos/dll/win32/userenv/directory.c
reactos/dll/win32/userenv/internal.h
reactos/dll/win32/vdmdbg/vdmdbg.c
reactos/dll/win32/winscard/winscard.c
reactos/dll/win32/winspool/info.c
reactos/dll/win32/winspool/stubs.c
reactos/dll/win32/winsta/main.c
reactos/dll/win32/winsta/winsta.h
reactos/dll/win32/ws2_32/misc/dllmain.c
reactos/dll/win32/ws2_32/tests/setup.c
reactos/dll/win32/ws2_32/tests/tests/WinsockEvent.c
reactos/dll/win32/ws2help/ws2help.c
reactos/dll/win32/ws2help/ws2help.h
reactos/dll/win32/wshirda/wshirda.h
reactos/dll/win32/wshtcpip/wshtcpip.h
reactos/dll/win32/wsock32/stubs.c
reactos/include/reactos/win32k/callback.h
reactos/include/reactos/win32k/ntgdibad.h
reactos/include/reactos/win32k/ntuser.h
reactos/lib/drivers/chew/workqueue.c
reactos/lib/drivers/ip/network/ip.c
reactos/lib/drivers/ip/network/loopback.c
reactos/lib/fslib/vfatlib/check/vfat.h
reactos/lib/sdk/crt/time/time.c
reactos/lib/sdk/nt/entry_point.c
reactos/lib/smlib/compses.c
reactos/lib/smlib/connect.c
reactos/lib/smlib/execpgm.c
reactos/lib/smlib/lookupss.c

index 2033848..a2dd9b3 100644 (file)
@@ -252,7 +252,7 @@ CPlApplet(HWND hwndCPl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)
index d2c6d84..48a3cb7 100644 (file)
@@ -199,7 +199,7 @@ CPlApplet(HWND hwndCpl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpReserved)
index f3502c7..a8d2244 100644 (file)
@@ -99,7 +99,7 @@ CPlApplet(HWND hwndCPl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)
index bf1eee2..b9d4abb 100644 (file)
@@ -128,7 +128,7 @@ CPlApplet(HWND hwndCpl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpReserved)
index 61c10d4..83fa986 100644 (file)
@@ -340,7 +340,7 @@ CPlApplet(HWND hwndCpl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpReserved)
index 134b368..f94897e 100644 (file)
@@ -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)
index ddc6d55..b03a0ee 100644 (file)
@@ -186,7 +186,7 @@ CPlApplet(HWND hwndCPl,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)
index 7069ea2..9e01e92 100644 (file)
@@ -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"
index 2e175ba..eb8ca61 100644 (file)
@@ -1,4 +1,3 @@
-#define STDCALL __stdcall
 #include <d3d9.h>
 #include <ddraw.h>
 #include <d3dnthal.h>
index b7b1c0c..53594e0 100644 (file)
@@ -386,6 +386,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 43083d4..83bf90e 100644 (file)
@@ -403,6 +403,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 250ddb8..efe38d2 100644 (file)
@@ -403,6 +403,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   (PLIGATURE1)Ligature
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 22341b0..45518b2 100644 (file)
@@ -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,
index 787a97b..8d4cd1b 100644 (file)
@@ -373,6 +373,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index f0e2116..6040fda 100644 (file)
@@ -361,6 +361,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 8af6089..fb00593 100644 (file)
@@ -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,
index 678f0f9..f15d0ed 100644 (file)
@@ -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,
index 605517f..21556ea 100644 (file)
@@ -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,
index f1a36bd..b3df9ea 100644 (file)
@@ -402,6 +402,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 8521693..c15ae11 100644 (file)
@@ -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,
index 67a4a73..65f4ca3 100644 (file)
@@ -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,
index 1be9baf..45c4ba3 100644 (file)
@@ -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,
index 100bfe9..61bbe9e 100644 (file)
@@ -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,
index 9447e6d..c7aa667 100644 (file)
@@ -380,7 +380,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index a3d9ba0..57b7c67 100644 (file)
@@ -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,
index 0732494..b9c91cf 100644 (file)
@@ -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,
index 075bedc..481b23a 100644 (file)
@@ -413,7 +413,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index c409aa2..e66af43 100644 (file)
@@ -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,
index f728c0e..2521f9b 100644 (file)
@@ -351,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index 5838a8c..bfb323b 100644 (file)
@@ -533,6 +533,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 };
 
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 606d365..5ceae60 100644 (file)
@@ -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,
index 7580497..6f49cec 100644 (file)
@@ -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,
index 7c5f134..7f8198c 100644 (file)
@@ -471,6 +471,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index c92a823..45b72ba 100644 (file)
@@ -470,7 +470,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index 4585fdd..5f49467 100644 (file)
@@ -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,
index 25a10b6..7bc8633 100644 (file)
@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index 0089ec0..3a4d9d8 100644 (file)
@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index ce00b7e..a870303 100644 (file)
@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index e2b211b..7039fb9 100644 (file)
@@ -450,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index cd129e2..d4d0e32 100644 (file)
@@ -383,6 +383,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 6b3f9e6..9dadff5 100644 (file)
@@ -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;
 }
index 59d3a5b..ec32e1a 100644 (file)
@@ -351,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index 3d9d339..d96fdd9 100644 (file)
@@ -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,
index 38cf737..11badc0 100644 (file)
@@ -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,
index 7db4732..d41b75c 100644 (file)
@@ -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,
index 8c4adab..d23d2f2 100644 (file)
@@ -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,
index d5ff449..5e86e04 100644 (file)
@@ -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,
index 7f04d1c..2c0f8f2 100644 (file)
@@ -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,
index ebab2b6..d4ea542 100644 (file)
@@ -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,
index 303749e..33dbd7c 100644 (file)
@@ -411,7 +411,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index 01e7522..19a3367 100644 (file)
@@ -365,7 +365,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor() {
+PKBDTABLES WINAPI KbdLayerDescriptor() {
   return &keyboard_layout_table;
 }
 
index 6e01fb3..2820143 100644 (file)
@@ -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,
index c96c6e6..a45da0e 100644 (file)
@@ -358,7 +358,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index ae7dabd..5ac7fc6 100644 (file)
@@ -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,
index 1a3f0e0..c412f38 100644 (file)
@@ -389,6 +389,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 6f11e81..1cd894f 100644 (file)
@@ -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,
index 7d78934..6812d5e 100644 (file)
@@ -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,
index b131e5c..d739b4b 100644 (file)
@@ -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,
index 928ef90..32f9070 100644 (file)
@@ -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,
index 34cb069..5b6dede 100644 (file)
@@ -362,7 +362,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL\r
 };\r
 \r
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {\r
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {\r
   return &keyboard_layout_table;\r
 }\r
 \r
index 96c496b..3339f90 100644 (file)
@@ -618,6 +618,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 };
 
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 8b0b7bf..bf66f66 100644 (file)
@@ -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,
index 8ad0adf..e17a763 100644 (file)
@@ -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,
index ab0b61c..88d77d0 100644 (file)
@@ -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,
index c77c268..2d0e6cb 100644 (file)
@@ -480,7 +480,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index e071140..db8ecec 100644 (file)
@@ -463,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index 23303b1..614eb1c 100644 (file)
@@ -463,6 +463,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index e7cf00c..0e68f6b 100644 (file)
@@ -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,
index 8a1c421..fd08234 100644 (file)
@@ -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,
index 2690325..7c67dd4 100644 (file)
@@ -378,6 +378,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 27f5971..4fee15e 100644 (file)
@@ -378,6 +378,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index 6f6504c..8c2c5e6 100644 (file)
@@ -377,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index b8c7911..49e3db3 100644 (file)
@@ -378,6 +378,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
index b3c35d4..c18cba4 100644 (file)
@@ -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,
index 0953141..152b1e6 100644 (file)
@@ -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,
index ad5be79..c09b52a 100644 (file)
@@ -369,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index 1d04c2e..8b85d3a 100644 (file)
@@ -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,
index 095a5d0..d3b179e 100644 (file)
@@ -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,
index 046de1e..a58b7f0 100644 (file)
@@ -352,7 +352,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   NULL
 };
 
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+PKBDTABLES WINAPI KbdLayerDescriptor(VOID) {
   return &keyboard_layout_table;
 }
 
index a0455f8..9e385e6 100644 (file)
@@ -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,
index a8b89b9..842afce 100644 (file)
@@ -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,
index a2a9587..edb0e52 100644 (file)
@@ -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,
index db5dbc3..1b0f4b8 100644 (file)
@@ -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,
index 1fac09d..9bb95b3 100644 (file)
@@ -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,
index 57b1a8f..a595178 100644 (file)
@@ -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,
index 82bf07c..16feb1c 100644 (file)
@@ -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,
index 2f0eacf..68de865 100644 (file)
@@ -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,
index 6ac3a40..af0bf4d 100644 (file)
@@ -610,7 +610,7 @@ IDeskDisplayAdapter_Constructor(REFIID riid,
     return hRet;
 }
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)
index 19609fd..c74e772 100644 (file)
@@ -735,7 +735,7 @@ IDeskMonitor_Constructor(REFIID riid,
     return hRet;
 }
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)
index da8ce59..352d2e7 100644 (file)
@@ -28,7 +28,7 @@ DllGetClassObject(REFCLSID rclsid,
     return S_OK;
 }
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(HINSTANCE hinstDLL,
         DWORD dwReason,
         LPVOID lpvReserved)
index bfda5be..9b8b243 100644 (file)
@@ -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)
index 56cd4ab..602dc8a 100644 (file)
@@ -36,7 +36,7 @@
 HINSTANCE hDllInstance;
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(
        HINSTANCE hinstDLL,
        DWORD     dwReason,
index f518835..a57cf6a 100644 (file)
@@ -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;
index 3a7fb98..39a2445 100644 (file)
@@ -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)
index ffd4bf5..f3ac824 100644 (file)
@@ -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];
index f65abb6..a0f8b08 100644 (file)
@@ -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,
index 0d7411f..5578f5b 100644 (file)
@@ -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,
index 5c6928d..4884f6c 100644 (file)
@@ -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,
index 1687372..2d12d6e 100644 (file)
@@ -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,
index 5509884..fda7892 100644 (file)
@@ -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,
index 5a2ebeb..ec4cf89 100644 (file)
@@ -75,7 +75,7 @@ PLSAPR_SERVER_NAME_unbind(PLSAPR_SERVER_NAME pszSystemName,
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 LsaClose(LSA_HANDLE ObjectHandle)
 {
     TRACE("LsaClose(0x%p) called\n", ObjectHandle);
@@ -91,7 +91,7 @@ LsaClose(LSA_HANDLE ObjectHandle)
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 LsaDelete(LSA_HANDLE ObjectHandle)
 {
     TRACE("LsaDelete(0x%p) called\n", ObjectHandle);
@@ -104,7 +104,7 @@ LsaDelete(LSA_HANDLE ObjectHandle)
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaAddAccountRights(
     LSA_HANDLE PolicyHandle,
     PSID AccountSid,
@@ -119,7 +119,7 @@ LsaAddAccountRights(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaCreateTrustedDomainEx(
     LSA_HANDLE PolicyHandle,
     PTRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation,
@@ -136,7 +136,7 @@ LsaCreateTrustedDomainEx(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaDeleteTrustedDomain(
     LSA_HANDLE PolicyHandle,
     PSID TrustedDomainSid)
@@ -149,7 +149,7 @@ LsaDeleteTrustedDomain(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaEnumerateAccountRights(
     LSA_HANDLE PolicyHandle,
     PSID AccountSid,
@@ -164,7 +164,7 @@ LsaEnumerateAccountRights(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaEnumerateAccountsWithUserRight(
     LSA_HANDLE PolicyHandle,
     OPTIONAL PLSA_UNICODE_STRING UserRights,
@@ -179,7 +179,7 @@ LsaEnumerateAccountsWithUserRight(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaEnumerateTrustedDomains(
     LSA_HANDLE PolicyHandle,
     PLSA_ENUMERATION_HANDLE EnumerationContext,
@@ -196,7 +196,7 @@ LsaEnumerateTrustedDomains(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaEnumerateTrustedDomainsEx(
     LSA_HANDLE PolicyHandle,
     PLSA_ENUMERATION_HANDLE EnumerationContext,
@@ -212,7 +212,7 @@ LsaEnumerateTrustedDomainsEx(
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 LsaFreeMemory(PVOID Buffer)
 {
     TRACE("(%p)\n", Buffer);
@@ -273,7 +273,7 @@ LsaLookupNames(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaLookupNames2(
     LSA_HANDLE PolicyHandle,
     ULONG Flags,
@@ -339,7 +339,7 @@ LsaLookupSids(
  *
  * @implemented
  */
-ULONG STDCALL
+ULONG WINAPI
 LsaNtStatusToWinError(NTSTATUS Status)
 {
     TRACE("(%lx)\n", Status);
@@ -358,7 +358,7 @@ LsaNtStatusToWinError(NTSTATUS Status)
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaOpenPolicy(
     IN PLSA_UNICODE_STRING SystemName,
     IN PLSA_OBJECT_ATTRIBUTES ObjectAttributes,
@@ -377,7 +377,7 @@ LsaOpenPolicy(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaOpenTrustedDomainByName(
     LSA_HANDLE PolicyHandle,
     PLSA_UNICODE_STRING TrustedDomainName,
@@ -392,7 +392,7 @@ LsaOpenTrustedDomainByName(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaQueryDomainInformationPolicy(
     LSA_HANDLE PolicyHandle,
     POLICY_DOMAIN_INFORMATION_CLASS InformationClass,
@@ -406,7 +406,7 @@ LsaQueryDomainInformationPolicy(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaQueryForestTrustInformation(
     LSA_HANDLE PolicyHandle,
     PLSA_UNICODE_STRING TrustedDomainName,
@@ -419,7 +419,7 @@ LsaQueryForestTrustInformation(
 /*
  * @unimplemented
  */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 LsaQueryInformationPolicy(LSA_HANDLE PolicyHandle,
               POLICY_INFORMATION_CLASS InformationClass,
               PVOID *Buffer)
@@ -512,7 +512,7 @@ LsaQueryInformationPolicy(LSA_HANDLE PolicyHandle,
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaQueryTrustedDomainInfoByName(
     LSA_HANDLE PolicyHandle,
     PLSA_UNICODE_STRING TrustedDomainName,
@@ -527,7 +527,7 @@ LsaQueryTrustedDomainInfoByName(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaQueryTrustedDomainInfo(
     LSA_HANDLE PolicyHandle,
     PSID TrustedDomainSid,
@@ -542,7 +542,7 @@ LsaQueryTrustedDomainInfo(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaRemoveAccountRights(
     LSA_HANDLE PolicyHandle,
     PSID AccountSid,
@@ -558,7 +558,7 @@ LsaRemoveAccountRights(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaRetrievePrivateData(
     LSA_HANDLE PolicyHandle,
     PLSA_UNICODE_STRING KeyName,
@@ -572,7 +572,7 @@ LsaRetrievePrivateData(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaSetDomainInformationPolicy(
     LSA_HANDLE PolicyHandle,
     POLICY_DOMAIN_INFORMATION_CLASS InformationClass,
@@ -586,7 +586,7 @@ LsaSetDomainInformationPolicy(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaSetInformationPolicy(
     LSA_HANDLE PolicyHandle,
     POLICY_INFORMATION_CLASS InformationClass,
@@ -600,7 +600,7 @@ LsaSetInformationPolicy(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaSetForestTrustInformation(
     LSA_HANDLE PolicyHandle,
     PLSA_UNICODE_STRING TrustedDomainName,
@@ -616,7 +616,7 @@ LsaSetForestTrustInformation(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaSetTrustedDomainInfoByName(
     LSA_HANDLE PolicyHandle,
     PLSA_UNICODE_STRING TrustedDomainName,
@@ -631,7 +631,7 @@ LsaSetTrustedDomainInfoByName(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaSetTrustedDomainInformation(
     LSA_HANDLE PolicyHandle,
     PSID TrustedDomainSid,
@@ -646,7 +646,7 @@ LsaSetTrustedDomainInformation(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaStorePrivateData(
     LSA_HANDLE PolicyHandle,
     PLSA_UNICODE_STRING KeyName,
@@ -660,7 +660,7 @@ LsaStorePrivateData(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaGetUserName(
     PUNICODE_STRING *UserName,
     PUNICODE_STRING *DomainName)
@@ -673,7 +673,7 @@ LsaGetUserName(
  * @unimplemented
  */
 NTSTATUS
-STDCALL
+WINAPI
 LsaQueryInfoTrustedDomain (DWORD Unknonw0,
                           DWORD Unknonw1,
                           DWORD Unknonw2)
index 18cbf76..8245daf 100644 (file)
@@ -343,7 +343,7 @@ UnloadNtMarta(VOID)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AreAllAccessesGranted(DWORD GrantedAccess,
                       DWORD DesiredAccess)
 {
@@ -356,7 +356,7 @@ AreAllAccessesGranted(DWORD GrantedAccess,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AreAnyAccessesGranted(DWORD GrantedAccess,
                       DWORD DesiredAccess)
 {
@@ -521,7 +521,7 @@ GetFileSecurityW(LPCWSTR lpFileName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetKernelObjectSecurity(HANDLE Handle,
                         SECURITY_INFORMATION RequestedInformation,
                         PSECURITY_DESCRIPTOR pSecurityDescriptor,
@@ -552,7 +552,7 @@ GetKernelObjectSecurity(HANDLE Handle,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetFileSecurityA(LPCSTR lpFileName,
                  SECURITY_INFORMATION SecurityInformation,
                  PSECURITY_DESCRIPTOR pSecurityDescriptor)
@@ -586,7 +586,7 @@ SetFileSecurityA(LPCSTR lpFileName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetFileSecurityW(LPCWSTR lpFileName,
                  SECURITY_INFORMATION SecurityInformation,
                  PSECURITY_DESCRIPTOR pSecurityDescriptor)
@@ -656,7 +656,7 @@ SetFileSecurityW(LPCWSTR lpFileName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetKernelObjectSecurity(HANDLE Handle,
                         SECURITY_INFORMATION SecurityInformation,
                         PSECURITY_DESCRIPTOR SecurityDescriptor)
@@ -700,7 +700,7 @@ ImpersonateAnonymousToken(IN HANDLE ThreadHandle)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 ImpersonateLoggedOnUser(HANDLE hToken)
 {
     SECURITY_QUALITY_OF_SERVICE Qos;
@@ -784,7 +784,7 @@ ImpersonateLoggedOnUser(HANDLE hToken)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
 {
     NTSTATUS Status;
@@ -804,7 +804,7 @@ ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 RevertToSelf(VOID)
 {
     NTSTATUS Status;
@@ -990,7 +990,7 @@ GetUserNameW(LPWSTR lpszName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupAccountSidA(LPCSTR lpSystemName,
                   PSID lpSid,
                   LPSTR lpName,
@@ -1226,7 +1226,7 @@ LookupAccountSidW(LPCWSTR pSystemName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupAccountNameA(LPCSTR SystemName,
                    LPCSTR AccountName,
                    PSID Sid,
@@ -1363,7 +1363,7 @@ LookupAccountNameW(LPCWSTR lpSystemName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupPrivilegeValueA(LPCSTR lpSystemName,
                       LPCSTR lpName,
                       PLUID lpLuid)
@@ -1413,7 +1413,7 @@ LookupPrivilegeValueA(LPCSTR lpSystemName,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupPrivilegeValueW(LPCWSTR SystemName,
                       LPCWSTR PrivName,
                       PLUID Luid)
@@ -1482,7 +1482,7 @@ LookupPrivilegeValueW(LPCWSTR SystemName,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupPrivilegeDisplayNameA(LPCSTR lpSystemName,
                             LPCSTR lpName,
                             LPSTR lpDisplayName,
@@ -1501,7 +1501,7 @@ LookupPrivilegeDisplayNameA(LPCSTR lpSystemName,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupPrivilegeDisplayNameW(LPCWSTR lpSystemName,
                             LPCWSTR lpName,
                             LPWSTR lpDisplayName,
@@ -1520,7 +1520,7 @@ LookupPrivilegeDisplayNameW(LPCWSTR lpSystemName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupPrivilegeNameA(LPCSTR lpSystemName,
                      PLUID lpLuid,
                      LPSTR lpName,
@@ -1578,7 +1578,7 @@ LookupPrivilegeNameA(LPCSTR lpSystemName,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 LookupPrivilegeNameW(LPCWSTR lpSystemName,
                      PLUID lpLuid,
                      LPWSTR lpName,
@@ -1798,7 +1798,7 @@ ProtectSacl:
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetNamedSecurityInfoW(LPWSTR pObjectName,
                       SE_OBJECT_TYPE ObjectType,
                       SECURITY_INFORMATION SecurityInfo,
@@ -1849,7 +1849,7 @@ GetNamedSecurityInfoW(LPWSTR pObjectName,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetNamedSecurityInfoA(LPSTR pObjectName,
                       SE_OBJECT_TYPE ObjectType,
                       SECURITY_INFORMATION SecurityInfo,
@@ -1891,7 +1891,7 @@ GetNamedSecurityInfoA(LPSTR pObjectName,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 SetNamedSecurityInfoW(LPWSTR pObjectName,
                       SE_OBJECT_TYPE ObjectType,
                       SECURITY_INFORMATION SecurityInfo,
@@ -1939,7 +1939,7 @@ SetNamedSecurityInfoW(LPWSTR pObjectName,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 SetNamedSecurityInfoA(LPSTR pObjectName,
                       SE_OBJECT_TYPE ObjectType,
                       SECURITY_INFORMATION SecurityInfo,
@@ -1979,7 +1979,7 @@ SetNamedSecurityInfoA(LPSTR pObjectName,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetSecurityInfo(HANDLE handle,
                 SE_OBJECT_TYPE ObjectType,
                 SECURITY_INFORMATION SecurityInfo,
@@ -2118,7 +2118,7 @@ GetSecurityInfoExW(HANDLE hObject,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 ImpersonateNamedPipeClient(HANDLE hNamedPipe)
 {
     IO_STATUS_BLOCK StatusBlock;
@@ -2150,7 +2150,7 @@ ImpersonateNamedPipeClient(HANDLE hNamedPipe)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 CreatePrivateObjectSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
                             PSECURITY_DESCRIPTOR CreatorDescriptor,
                             PSECURITY_DESCRIPTOR *NewDescriptor,
@@ -2180,7 +2180,7 @@ CreatePrivateObjectSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 CreatePrivateObjectSecurityEx(PSECURITY_DESCRIPTOR ParentDescriptor,
                               PSECURITY_DESCRIPTOR CreatorDescriptor,
                               PSECURITY_DESCRIPTOR* NewDescriptor,
@@ -2199,7 +2199,7 @@ CreatePrivateObjectSecurityEx(PSECURITY_DESCRIPTOR ParentDescriptor,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR ParentDescriptor,
                                                    PSECURITY_DESCRIPTOR CreatorDescriptor,
                                                    PSECURITY_DESCRIPTOR* NewDescriptor,
@@ -2219,7 +2219,7 @@ CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR ParentDe
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 DestroyPrivateObjectSecurity(PSECURITY_DESCRIPTOR *ObjectDescriptor)
 {
     NTSTATUS Status;
@@ -2239,7 +2239,7 @@ DestroyPrivateObjectSecurity(PSECURITY_DESCRIPTOR *ObjectDescriptor)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR ObjectDescriptor,
                          SECURITY_INFORMATION SecurityInformation,
                          PSECURITY_DESCRIPTOR ResultantDescriptor,
@@ -2267,7 +2267,7 @@ GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR ObjectDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetPrivateObjectSecurity(SECURITY_INFORMATION SecurityInformation,
                          PSECURITY_DESCRIPTOR ModificationDescriptor,
                          PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
@@ -2295,7 +2295,7 @@ SetPrivateObjectSecurity(SECURITY_INFORMATION SecurityInformation,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 TreeResetNamedSecurityInfoW(LPWSTR pObjectName,
                             SE_OBJECT_TYPE ObjectType,
                             SECURITY_INFORMATION SecurityInfo,
@@ -2372,7 +2372,7 @@ typedef struct _INERNAL_FNPROGRESSW_DATA
     PVOID Args;
 } INERNAL_FNPROGRESSW_DATA, *PINERNAL_FNPROGRESSW_DATA;
 
-static VOID STDCALL
+static VOID WINAPI
 InternalfnProgressW(LPWSTR pObjectName,
                     DWORD Status,
                     PPROG_INVOKE_SETTING pInvokeSetting,
@@ -2428,7 +2428,7 @@ InternalfnProgressW(LPWSTR pObjectName,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 TreeResetNamedSecurityInfoA(LPSTR pObjectName,
                             SE_OBJECT_TYPE ObjectType,
                             SECURITY_INFORMATION SecurityInfo,
index 6e9ca32..c602f6c 100644 (file)
@@ -20,7 +20,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                              PSECURITY_DESCRIPTOR_CONTROL pControl,
                              LPDWORD lpdwRevision)
@@ -44,7 +44,7 @@ GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                           LPBOOL lpbDaclPresent,
                           PACL *pDacl,
@@ -75,7 +75,7 @@ GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                            PSID *pGroup,
                            LPBOOL lpbGroupDefaulted)
@@ -102,7 +102,7 @@ GetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                            PSID *pOwner,
                            LPBOOL lpbOwnerDefaulted)
@@ -129,7 +129,7 @@ GetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor,
                                PUCHAR RMControl)
 {
@@ -145,7 +145,7 @@ GetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                           LPBOOL lpbSaclPresent,
                           PACL *pSacl,
@@ -176,7 +176,7 @@ GetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                              DWORD dwRevision)
 {
@@ -198,7 +198,7 @@ InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor)
 {
     BOOLEAN Result;
@@ -215,7 +215,7 @@ IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 MakeAbsoluteSD(PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
                PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
                LPDWORD lpdwAbsoluteSecurityDescriptorSize,
@@ -255,7 +255,7 @@ MakeAbsoluteSD(PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 MakeAbsoluteSD2(IN OUT PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
                 OUT LPDWORD lpdwBufferSize)
 {
@@ -277,7 +277,7 @@ MakeAbsoluteSD2(IN OUT PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 MakeSelfRelativeSD(PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
                    PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
                    LPDWORD lpdwBufferLength)
@@ -301,7 +301,7 @@ MakeSelfRelativeSD(PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                              SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest,
                              SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet)
@@ -325,7 +325,7 @@ SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                           BOOL bDaclPresent,
                           PACL pDacl,
@@ -351,7 +351,7 @@ SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                            PSID pGroup,
                            BOOL bGroupDefaulted)
@@ -375,7 +375,7 @@ SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                            PSID pOwner,
                            BOOL bOwnerDefaulted)
@@ -399,7 +399,7 @@ SetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR pSecurityDescriptor,
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 SetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor,
                                PUCHAR RMControl)
 {
@@ -414,7 +414,7 @@ SetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
                           BOOL bSaclPresent,
                           PACL pSacl,
@@ -482,7 +482,7 @@ SetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 ConvertToAutoInheritPrivateObjectSecurity(IN PSECURITY_DESCRIPTOR ParentDescriptor,
                                           IN PSECURITY_DESCRIPTOR CurrentSecurityDescriptor,
                                           OUT PSECURITY_DESCRIPTOR* NewSecurityDescriptor,
@@ -499,7 +499,7 @@ ConvertToAutoInheritPrivateObjectSecurity(IN PSECURITY_DESCRIPTOR ParentDescript
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 BuildSecurityDescriptorW(IN PTRUSTEE_W pOwner  OPTIONAL,
                          IN PTRUSTEE_W pGroup  OPTIONAL,
                          IN ULONG cCountOfAccessEntries,
@@ -519,7 +519,7 @@ BuildSecurityDescriptorW(IN PTRUSTEE_W pOwner  OPTIONAL,
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 BuildSecurityDescriptorA(IN PTRUSTEE_A pOwner  OPTIONAL,
                          IN PTRUSTEE_A pGroup  OPTIONAL,
                          IN ULONG cCountOfAccessEntries,
index a3c9363..9bbce25 100644 (file)
@@ -20,7 +20,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 
 #define MAX_GUID_STRING_LEN 39
 
-BOOL STDCALL
+BOOL WINAPI
 AddAuditAccessAceEx(PACL pAcl,
                    DWORD dwAceRevision,
                    DWORD AceFlags,
@@ -610,7 +610,7 @@ ParseAceString(
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AllocateLocallyUniqueId(PLUID Luid)
 {
     NTSTATUS Status;
@@ -629,7 +629,7 @@ AllocateLocallyUniqueId(PLUID Luid)
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
                          BYTE nSubAuthorityCount,
                          DWORD dwSubAuthority0,
@@ -668,7 +668,7 @@ AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 CopySid(DWORD nDestinationSidLength,
         PSID pDestinationSid,
         PSID pSourceSid)
@@ -1280,7 +1280,7 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA(
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EqualPrefixSid(PSID pSid1,
                PSID pSid2)
 {
@@ -1291,7 +1291,7 @@ EqualPrefixSid(PSID pSid1,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EqualSid(PSID pSid1,
          PSID pSid2)
 {
@@ -1306,7 +1306,7 @@ EqualSid(PSID pSid1,
  *  Docs says this function does NOT return a value
  *  even thou it's defined to return a PVOID...
  */
-PVOID STDCALL
+PVOID WINAPI
 FreeSid(PSID pSid)
 {
     return RtlFreeSid(pSid);
@@ -1316,7 +1316,7 @@ FreeSid(PSID pSid)
 /*
  * @implemented
  */
-DWORD STDCALL
+DWORD WINAPI
 GetLengthSid(PSID pSid)
 {
     return (DWORD)RtlLengthSid(pSid);
@@ -1326,7 +1326,7 @@ GetLengthSid(PSID pSid)
 /*
  * @implemented
  */
-PSID_IDENTIFIER_AUTHORITY STDCALL
+PSID_IDENTIFIER_AUTHORITY WINAPI
 GetSidIdentifierAuthority(PSID pSid)
 {
     return RtlIdentifierAuthoritySid(pSid);
@@ -1336,7 +1336,7 @@ GetSidIdentifierAuthority(PSID pSid)
 /*
  * @implemented
  */
-DWORD STDCALL
+DWORD WINAPI
 GetSidLengthRequired(UCHAR nSubAuthorityCount)
 {
     return (DWORD)RtlLengthRequiredSid(nSubAuthorityCount);
@@ -1346,7 +1346,7 @@ GetSidLengthRequired(UCHAR nSubAuthorityCount)
 /*
  * @implemented
  */
-PDWORD STDCALL
+PDWORD WINAPI
 GetSidSubAuthority(PSID pSid,
                    DWORD nSubAuthority)
 {
@@ -1357,7 +1357,7 @@ GetSidSubAuthority(PSID pSid,
 /*
  * @implemented
  */
-PUCHAR STDCALL
+PUCHAR WINAPI
 GetSidSubAuthorityCount(PSID pSid)
 {
     return RtlSubAuthorityCountSid(pSid);
@@ -1367,7 +1367,7 @@ GetSidSubAuthorityCount(PSID pSid)
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 InitializeSid(PSID Sid,
               PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
               BYTE nSubAuthorityCount)
@@ -1390,7 +1390,7 @@ InitializeSid(PSID Sid,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 IsValidSid(PSID pSid)
 {
     return (BOOL)RtlValidSid(pSid);
@@ -1400,7 +1400,7 @@ IsValidSid(PSID pSid)
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ConvertSidToStringSidW(PSID Sid,
                        LPWSTR *StringSid)
 {
@@ -1454,7 +1454,7 @@ ConvertSidToStringSidW(PSID Sid,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ConvertSidToStringSidA(PSID Sid,
                        LPSTR *StringSid)
 {
@@ -1498,7 +1498,7 @@ ConvertSidToStringSidA(PSID Sid,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EqualDomainSid(IN PSID pSid1,
                IN PSID pSid2,
                OUT BOOL* pfEqual)
@@ -1511,7 +1511,7 @@ EqualDomainSid(IN PSID pSid1,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetWindowsAccountDomainSid(IN PSID pSid,
                            OUT PSID ppDomainSid,
                            IN OUT DWORD* cbSid)
@@ -1524,7 +1524,7 @@ GetWindowsAccountDomainSid(IN PSID pSid,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType,
                    IN PSID DomainSid  OPTIONAL,
                    OUT PSID pSid,
@@ -1572,7 +1572,7 @@ CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType,
 /*
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 IsWellKnownSid(IN PSID pSid,
                IN WELL_KNOWN_SID_TYPE WellKnownSidType)
 {
@@ -1595,7 +1595,7 @@ IsWellKnownSid(IN PSID pSid,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ConvertStringSidToSidA(IN LPCSTR StringSid,
                        OUT PSID* sid)
 {
index 95cf143..b5b4dbe 100644 (file)
@@ -329,7 +329,7 @@ ChangeServiceConfig2W(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ChangeServiceConfigA(SC_HANDLE hService,
                      DWORD dwServiceType,
                      DWORD dwStartType,
@@ -403,7 +403,7 @@ ChangeServiceConfigA(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ChangeServiceConfigW(SC_HANDLE hService,
                      DWORD dwServiceType,
                      DWORD dwStartType,
@@ -477,7 +477,7 @@ ChangeServiceConfigW(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 CloseServiceHandle(SC_HANDLE hSCObject)
 {
     DWORD dwError;
@@ -513,7 +513,7 @@ CloseServiceHandle(SC_HANDLE hSCObject)
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ControlService(SC_HANDLE hService,
                DWORD dwControl,
                LPSERVICE_STATUS lpServiceStatus)
@@ -554,7 +554,7 @@ ControlService(SC_HANDLE hService,
  *
  * @unimplemented
  */
-BOOL STDCALL
+BOOL WINAPI
 ControlServiceEx(IN SC_HANDLE hService,
                  IN DWORD dwControl,
                  IN DWORD dwInfoLevel,
@@ -572,7 +572,7 @@ ControlServiceEx(IN SC_HANDLE hService,
  *
  * @implemented
  */
-SC_HANDLE STDCALL
+SC_HANDLE WINAPI
 CreateServiceA(SC_HANDLE hSCManager,
                LPCSTR lpServiceName,
                LPCSTR lpDisplayName,
@@ -737,7 +737,7 @@ cleanup:
  *
  * @implemented
  */
-SC_HANDLE STDCALL
+SC_HANDLE WINAPI
 CreateServiceW(SC_HANDLE hSCManager,
                LPCWSTR lpServiceName,
                LPCWSTR lpDisplayName,
@@ -819,7 +819,7 @@ CreateServiceW(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 DeleteService(SC_HANDLE hService)
 {
     DWORD dwError;
@@ -853,7 +853,7 @@ DeleteService(SC_HANDLE hService)
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EnumDependentServicesA(SC_HANDLE hService,
                        DWORD dwServiceState,
                        LPENUM_SERVICE_STATUSA lpServices,
@@ -914,7 +914,7 @@ EnumDependentServicesA(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EnumDependentServicesW(SC_HANDLE hService,
                        DWORD dwServiceState,
                        LPENUM_SERVICE_STATUSW lpServices,
@@ -976,7 +976,7 @@ EnumDependentServicesW(SC_HANDLE hService,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 EnumServiceGroupW(
     SC_HANDLE               hSCManager,
     DWORD                   dwServiceType,
@@ -999,7 +999,7 @@ EnumServiceGroupW(
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EnumServicesStatusA(SC_HANDLE hSCManager,
                     DWORD dwServiceType,
                     DWORD dwServiceState,
@@ -1064,7 +1064,7 @@ EnumServicesStatusA(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EnumServicesStatusW(SC_HANDLE hSCManager,
                     DWORD dwServiceType,
                     DWORD dwServiceState,
@@ -1129,7 +1129,7 @@ EnumServicesStatusW(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EnumServicesStatusExA(SC_HANDLE hSCManager,
                       SC_ENUM_TYPE InfoLevel,
                       DWORD dwServiceType,
@@ -1206,7 +1206,7 @@ EnumServicesStatusExA(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 EnumServicesStatusExW(SC_HANDLE hSCManager,
                       SC_ENUM_TYPE InfoLevel,
                       DWORD dwServiceType,
@@ -1283,7 +1283,7 @@ EnumServicesStatusExW(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetServiceDisplayNameA(SC_HANDLE hSCManager,
                        LPCSTR lpServiceName,
                        LPSTR lpDisplayName,
@@ -1328,7 +1328,7 @@ GetServiceDisplayNameA(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetServiceDisplayNameW(SC_HANDLE hSCManager,
                        LPCWSTR lpServiceName,
                        LPWSTR lpDisplayName,
@@ -1370,7 +1370,7 @@ GetServiceDisplayNameW(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetServiceKeyNameA(SC_HANDLE hSCManager,
                    LPCSTR lpDisplayName,
                    LPSTR lpServiceName,
@@ -1412,7 +1412,7 @@ GetServiceKeyNameA(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetServiceKeyNameW(SC_HANDLE hSCManager,
                    LPCWSTR lpDisplayName,
                    LPWSTR lpServiceName,
@@ -1454,7 +1454,7 @@ GetServiceKeyNameW(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-SC_LOCK STDCALL
+SC_LOCK WINAPI
 LockServiceDatabase(SC_HANDLE hSCManager)
 {
     SC_LOCK hLock;
@@ -1532,7 +1532,7 @@ WaitForSCManager(VOID)
  *
  * @implemented
  */
-SC_HANDLE STDCALL
+SC_HANDLE WINAPI
 OpenSCManagerA(LPCSTR lpMachineName,
                LPCSTR lpDatabaseName,
                DWORD dwDesiredAccess)
@@ -1577,7 +1577,7 @@ OpenSCManagerA(LPCSTR lpMachineName,
  *
  * @implemented
  */
-SC_HANDLE STDCALL
+SC_HANDLE WINAPI
 OpenSCManagerW(LPCWSTR lpMachineName,
                LPCWSTR lpDatabaseName,
                DWORD dwDesiredAccess)
@@ -1622,7 +1622,7 @@ OpenSCManagerW(LPCWSTR lpMachineName,
  *
  * @implemented
  */
-SC_HANDLE STDCALL
+SC_HANDLE WINAPI
 OpenServiceA(SC_HANDLE hSCManager,
              LPCSTR lpServiceName,
              DWORD dwDesiredAccess)
@@ -1665,7 +1665,7 @@ OpenServiceA(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-SC_HANDLE STDCALL
+SC_HANDLE WINAPI
 OpenServiceW(SC_HANDLE hSCManager,
              LPCWSTR lpServiceName,
              DWORD dwDesiredAccess)
@@ -1711,7 +1711,7 @@ OpenServiceW(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceConfigA(SC_HANDLE hService,
                     LPQUERY_SERVICE_CONFIGA lpServiceConfig,
                     DWORD cbBufSize,
@@ -1780,7 +1780,7 @@ QueryServiceConfigA(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceConfigW(SC_HANDLE hService,
                     LPQUERY_SERVICE_CONFIGW lpServiceConfig,
                     DWORD cbBufSize,
@@ -1852,7 +1852,7 @@ QueryServiceConfigW(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceConfig2A(SC_HANDLE hService,
                      DWORD dwInfoLevel,
                      LPBYTE lpBuffer,
@@ -1947,7 +1947,7 @@ QueryServiceConfig2A(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceConfig2W(SC_HANDLE hService,
                      DWORD dwInfoLevel,
                      LPBYTE lpBuffer,
@@ -2042,7 +2042,7 @@ QueryServiceConfig2W(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceLockStatusA(SC_HANDLE hSCManager,
                         LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus,
                         DWORD cbBufSize,
@@ -2090,7 +2090,7 @@ QueryServiceLockStatusA(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceLockStatusW(SC_HANDLE hSCManager,
                         LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus,
                         DWORD cbBufSize,
@@ -2138,7 +2138,7 @@ QueryServiceLockStatusW(SC_HANDLE hSCManager,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceObjectSecurity(SC_HANDLE hService,
                            SECURITY_INFORMATION dwSecurityInformation,
                            PSECURITY_DESCRIPTOR lpSecurityDescriptor,
@@ -2180,7 +2180,7 @@ QueryServiceObjectSecurity(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 SetServiceObjectSecurity(SC_HANDLE hService,
                          SECURITY_INFORMATION dwSecurityInformation,
                          PSECURITY_DESCRIPTOR lpSecurityDescriptor)
@@ -2249,7 +2249,7 @@ SetServiceObjectSecurity(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceStatus(SC_HANDLE hService,
                    LPSERVICE_STATUS lpServiceStatus)
 {
@@ -2286,7 +2286,7 @@ QueryServiceStatus(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 QueryServiceStatusEx(SC_HANDLE hService,
                      SC_STATUS_TYPE InfoLevel,
                      LPBYTE lpBuffer,
@@ -2328,7 +2328,7 @@ QueryServiceStatusEx(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 StartServiceA(SC_HANDLE hService,
               DWORD dwNumServiceArgs,
               LPCSTR *lpServiceArgVectors)
@@ -2363,7 +2363,7 @@ StartServiceA(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 StartServiceW(SC_HANDLE hService,
               DWORD dwNumServiceArgs,
               LPCWSTR *lpServiceArgVectors)
@@ -2398,7 +2398,7 @@ StartServiceW(SC_HANDLE hService,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 UnlockServiceDatabase(SC_LOCK ScLock)
 {
     DWORD dwError;
@@ -2432,7 +2432,7 @@ UnlockServiceDatabase(SC_LOCK ScLock)
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 NotifyBootConfigStatus(BOOL BootAcceptable)
 {
     DWORD dwError;
index 9cde3fb..256613d 100644 (file)
@@ -416,7 +416,7 @@ ScServiceDispatcher(HANDLE hPipe,
  *
  * @implemented
  */
-SERVICE_STATUS_HANDLE STDCALL
+SERVICE_STATUS_HANDLE WINAPI
 RegisterServiceCtrlHandlerA(LPCSTR lpServiceName,
                             LPHANDLER_FUNCTION lpHandlerProc)
 {
@@ -445,7 +445,7 @@ RegisterServiceCtrlHandlerA(LPCSTR lpServiceName,
  *
  * @implemented
  */
-SERVICE_STATUS_HANDLE STDCALL
+SERVICE_STATUS_HANDLE WINAPI
 RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName,
                             LPHANDLER_FUNCTION lpHandlerProc)
 {
@@ -471,7 +471,7 @@ RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName,
  *
  * @implemented
  */
-SERVICE_STATUS_HANDLE STDCALL
+SERVICE_STATUS_HANDLE WINAPI
 RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName,
                               LPHANDLER_FUNCTION_EX lpHandlerProc,
                               LPVOID lpContext)
@@ -502,7 +502,7 @@ RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName,
  *
  * @implemented
  */
-SERVICE_STATUS_HANDLE STDCALL
+SERVICE_STATUS_HANDLE WINAPI
 RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName,
                               LPHANDLER_FUNCTION_EX lpHandlerProc,
                               LPVOID lpContext)
@@ -532,7 +532,7 @@ RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 I_ScSetServiceBitsA(SERVICE_STATUS_HANDLE hServiceStatus,
                     DWORD dwServiceBits,
                     BOOL bSetBitsOn,
@@ -568,7 +568,7 @@ I_ScSetServiceBitsA(SERVICE_STATUS_HANDLE hServiceStatus,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 I_ScSetServiceBitsW(SERVICE_STATUS_HANDLE hServiceStatus,
                     DWORD dwServiceBits,
                     BOOL bSetBitsOn,
@@ -602,7 +602,7 @@ I_ScSetServiceBitsW(SERVICE_STATUS_HANDLE hServiceStatus,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 SetServiceBits(SERVICE_STATUS_HANDLE hServiceStatus,
                DWORD dwServiceBits,
                BOOL bSetBitsOn,
@@ -621,7 +621,7 @@ SetServiceBits(SERVICE_STATUS_HANDLE hServiceStatus,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus,
                  LPSERVICE_STATUS lpServiceStatus)
 {
@@ -651,7 +651,7 @@ SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus,
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA lpServiceStartTable)
 {
     ULONG i;
@@ -741,7 +741,7 @@ StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA lpServiceStartTable)
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW lpServiceStartTable)
 {
     ULONG i;
index f89d55c..61a84bd 100644 (file)
@@ -17,7 +17,7 @@
  *
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 PrivilegeCheck(HANDLE ClientToken,
                PPRIVILEGE_SET RequiredPrivileges,
                LPBOOL pfResult)
index ca4d3fa..4e05378 100644 (file)
@@ -16,7 +16,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AdjustTokenGroups(HANDLE TokenHandle,
                   BOOL ResetToDefault,
                   PTOKEN_GROUPS NewState,
@@ -45,7 +45,7 @@ AdjustTokenGroups(HANDLE TokenHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AdjustTokenPrivileges(HANDLE TokenHandle,
                       BOOL DisableAllPrivileges,
                       PTOKEN_PRIVILEGES NewState,
@@ -83,7 +83,7 @@ AdjustTokenPrivileges(HANDLE TokenHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 GetTokenInformation(HANDLE TokenHandle,
                     TOKEN_INFORMATION_CLASS TokenInformationClass,
                     LPVOID TokenInformation,
@@ -110,7 +110,7 @@ GetTokenInformation(HANDLE TokenHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 SetTokenInformation(HANDLE TokenHandle,
                     TOKEN_INFORMATION_CLASS TokenInformationClass,
                     LPVOID TokenInformation,
@@ -135,7 +135,7 @@ SetTokenInformation(HANDLE TokenHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 AccessCheck(PSECURITY_DESCRIPTOR pSecurityDescriptor,
             HANDLE ClientToken,
             DWORD DesiredAccess,
@@ -178,7 +178,7 @@ AccessCheck(PSECURITY_DESCRIPTOR pSecurityDescriptor,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 OpenProcessToken(HANDLE ProcessHandle,
                  DWORD DesiredAccess,
                  PHANDLE TokenHandle)
@@ -201,7 +201,7 @@ OpenProcessToken(HANDLE ProcessHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 OpenThreadToken(HANDLE ThreadHandle,
                 DWORD DesiredAccess,
                 BOOL OpenAsSelf,
@@ -226,7 +226,7 @@ OpenThreadToken(HANDLE ThreadHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 SetThreadToken(IN PHANDLE ThreadHandle  OPTIONAL,
                IN HANDLE TokenHandle)
 {
@@ -252,7 +252,7 @@ SetThreadToken(IN PHANDLE ThreadHandle  OPTIONAL,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 DuplicateTokenEx(IN HANDLE ExistingTokenHandle,
                  IN DWORD dwDesiredAccess,
                  IN LPSECURITY_ATTRIBUTES lpTokenAttributes  OPTIONAL,
@@ -307,7 +307,7 @@ DuplicateTokenEx(IN HANDLE ExistingTokenHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 DuplicateToken(IN HANDLE ExistingTokenHandle,
                IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel,
                OUT PHANDLE DuplicateTokenHandle)
@@ -324,7 +324,7 @@ DuplicateToken(IN HANDLE ExistingTokenHandle,
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 CheckTokenMembership(IN HANDLE ExistingTokenHandle,
                      IN PSID SidToCheck,
                      OUT PBOOL IsMember)
@@ -510,7 +510,7 @@ Cleanup:
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 IsTokenRestricted(HANDLE TokenHandle)
 {
     ULONG RetLength;
@@ -574,7 +574,7 @@ AllocAndReadRestrictedSids:
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 CreateRestrictedToken(HANDLE TokenHandle,
                       DWORD Flags,
                       DWORD DisableSidCount,
index 62a932b..45042ce 100644 (file)
@@ -318,7 +318,7 @@ AuthzUnregisterSecurityEventSource(IN DWORD dwFlags,
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 DllMain(IN HINSTANCE hinstDLL,
         IN DWORD dwReason,
         IN LPVOID lpvReserved)
index a97de0c..8af185b 100644 (file)
@@ -103,7 +103,7 @@ HANDLE hHeap = NULL;        /* handle for heap */
 /* LIBRARY ENTRY POINT ********************************************************/
 
 BOOL
-STDCALL
+WINAPI
 DllMain(PVOID hinstDll, ULONG dwReason, PVOID reserved)
 {
     switch (dwReason)
index 28e358b..1e90e6b 100644 (file)
@@ -1095,7 +1095,7 @@ LoadAndInitComctl32(VOID)
 
 
 BOOL
-STDCALL
+WINAPI
 DllMain(IN HINSTANCE hinstDLL,
         IN DWORD dwReason,
            IN LPVOID lpvReserved)
index 4d3a6b5..3955c33 100644 (file)
@@ -217,7 +217,7 @@ DWORD APIENTRY DhcpRosGetAdapterInfo( DWORD AdapterIndex,
     return Reply.Reply;
 }
 
-INT STDCALL
+INT WINAPI
 DllMain(PVOID hinstDll,
        ULONG dwReason,
        PVOID reserved)
index 09c6af1..3ae1154 100644 (file)
@@ -161,7 +161,7 @@ PLDC
 GdiGetLDC(HDC hDC);
 
 HGDIOBJ
-STDCALL
+WINAPI
 GdiFixUpHandle(HGDIOBJ hGO);
 
 BOOL
@@ -186,15 +186,15 @@ NTAPI
 GdiConvertToDevmodeW(DEVMODEA *dm);
 
 DWORD
-STDCALL
+WINAPI
 GetAndSetDCDWord( HDC, INT, DWORD, DWORD, DWORD, DWORD );
 
 DWORD
-STDCALL
+WINAPI
 GetDCDWord( HDC, INT, DWORD);
 
 HGDIOBJ
-STDCALL
+WINAPI
 GetDCObject( HDC, INT);
 
 VOID
@@ -212,7 +212,7 @@ LogFontW2A(
 );
 
 VOID
-STDCALL
+WINAPI
 EnumLogFontExW2A(
     LPENUMLOGFONTEXA fontA,
     CONST ENUMLOGFONTEXW *fontW );
@@ -223,14 +223,14 @@ WINAPI
 UserRealizePalette(HDC hDC);
 
 int
-STDCALL
+WINAPI
 GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv);
 
 VOID
-STDCALL
+WINAPI
 GdiSetLastError( DWORD dwErrCode );
 
-DWORD STDCALL GdiGetCodePage(HDC);
+DWORD WINAPI GdiGetCodePage(HDC);
 UINT FASTCALL DIB_BitmapBitsSize( PBITMAPINFO );
 
 /* EOF */
index a9f2e9a..cca6582 100644 (file)
@@ -1937,7 +1937,7 @@ DdReleaseDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal)
  * GDIEntry 9
  */
 HBITMAP
-STDCALL
+WINAPI
 DdCreateDIBSection(HDC hdc,
                    CONST BITMAPINFO *pbmi,
                    UINT iUsage,
@@ -1971,7 +1971,7 @@ DdReenableDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
  * GDIEntry 11
  */
 BOOL
-STDCALL
+WINAPI
 DdAttachSurface( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom,
                  LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo)
 {
@@ -2004,7 +2004,7 @@ DdAttachSurface( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom,
  * GDIEntry 12
  */
 VOID
-STDCALL
+WINAPI
 DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface,
                   LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached)
 {
@@ -2019,7 +2019,7 @@ DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface,
  * GDIEntry 13
  */
 ULONG
-STDCALL
+WINAPI
 DdQueryDisplaySettingsUniqueness()
 {
  return GdiSharedHandleTable->flDeviceUniq;
index 380c6da..4b5db77 100644 (file)
@@ -20,7 +20,7 @@
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 EngQueryEMFInfo(HDEV hdev,
                 EMFINFO *pEMFInfo)
 {
@@ -31,7 +31,7 @@ EngQueryEMFInfo(HDEV hdev,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiPlayDCScript(DWORD a0,
                 DWORD a1,
                 DWORD a2,
@@ -47,7 +47,7 @@ GdiPlayDCScript(DWORD a0,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiPlayJournal(DWORD a0,
                DWORD a1,
                DWORD a2,
@@ -62,7 +62,7 @@ GdiPlayJournal(DWORD a0,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiPlayScript(DWORD a0,
               DWORD a1,
               DWORD a2,
@@ -79,7 +79,7 @@ GdiPlayScript(DWORD a0,
  * @implemented
  */
 HBITMAP
-STDCALL
+WINAPI
 GdiConvertBitmap(HBITMAP hbm)
 {
     /* Note Windows 2000/XP/VISTA always returns hbm */
@@ -90,7 +90,7 @@ GdiConvertBitmap(HBITMAP hbm)
  * @implemented
  */
 HBRUSH
-STDCALL
+WINAPI
 GdiConvertBrush(HBRUSH hbr)
 {
     /* Note Windows 2000/XP/VISTA always returns hbr */
@@ -101,7 +101,7 @@ GdiConvertBrush(HBRUSH hbr)
  * @implemented
  */
 HDC
-STDCALL
+WINAPI
 GdiConvertDC(HDC hdc)
 {
     /* Note Windows 2000/XP/VISTA always returns hdc */
@@ -112,7 +112,7 @@ GdiConvertDC(HDC hdc)
  * @implemented
  */
 HFONT
-STDCALL
+WINAPI
 GdiConvertFont(HFONT hfont)
 {
     /* Note Windows 2000/XP/VISTA always returns hfont */
@@ -123,7 +123,7 @@ GdiConvertFont(HFONT hfont)
  * @implemented
  */
 HPALETTE
-STDCALL
+WINAPI
 GdiConvertPalette(HPALETTE hpal)
 {
     /* Note Windows 2000/XP/VISTA always returns hpal */
@@ -134,7 +134,7 @@ GdiConvertPalette(HPALETTE hpal)
  * @implemented
  */
 HRGN
-STDCALL
+WINAPI
 GdiConvertRegion(HRGN hregion)
 {
     /* Note Windows 2000/XP/VISTA always returns hregion */
@@ -145,7 +145,7 @@ GdiConvertRegion(HRGN hregion)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiSetAttrs(HDC hdc)
 {
     /* Note Windows 2000/XP/VISTA always returns TRUE */
@@ -156,7 +156,7 @@ GdiSetAttrs(HDC hdc)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiDeleteLocalDC(HDC hdc)
 {
     /* Note Windows 2000/XP/VISTA always returns TRUE */
@@ -168,7 +168,7 @@ GdiDeleteLocalDC(HDC hdc)
  * @implemented
  */
 VOID
-STDCALL
+WINAPI
 GdiSetServerAttr(HDC hdc,DWORD attr)
 {
     /* it does do nothing */
@@ -179,7 +179,7 @@ GdiSetServerAttr(HDC hdc,DWORD attr)
  * @implemented
  */
 int
-STDCALL
+WINAPI
 DeviceCapabilitiesExA(LPCSTR pDevice,
                       LPCSTR pPort,
                       WORD fwCapability,
@@ -194,7 +194,7 @@ DeviceCapabilitiesExA(LPCSTR pDevice,
  * @implemented
  */
 int
-STDCALL
+WINAPI
 DeviceCapabilitiesExW(LPCWSTR pDevice,
                       LPCWSTR pPort,
                       WORD fwCapability,
@@ -209,7 +209,7 @@ DeviceCapabilitiesExW(LPCWSTR pDevice,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 FixBrushOrgEx(HDC hDC,
               INT nXOrg,
               INT nYOrg,
@@ -238,7 +238,7 @@ DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiReleaseLocalDC(HDC hdc)
 {
     /* Note Windows 2000/XP/VISTA always returns TRUE */
@@ -249,7 +249,7 @@ GdiReleaseLocalDC(HDC hdc)
  * @implemented
  */
 HBRUSH
-STDCALL
+WINAPI
 SelectBrushLocal(HBRUSH Currenthbm,
                  HBRUSH Newhbm)
 {
@@ -260,7 +260,7 @@ SelectBrushLocal(HBRUSH Currenthbm,
  * @implemented
  */
 HFONT
-STDCALL
+WINAPI
 SelectFontLocal(HFONT Currenthfnt,
                 HFONT newhfnt)
 {
@@ -271,7 +271,7 @@ SelectFontLocal(HFONT Currenthfnt,
  * @implemented
  */
 HBRUSH
-STDCALL
+WINAPI
 GdiGetLocalBrush(HBRUSH hbr)
 {
     return hbr;
@@ -281,7 +281,7 @@ GdiGetLocalBrush(HBRUSH hbr)
  * @implemented
  */
 HDC
-STDCALL
+WINAPI
 GdiGetLocalDC(HDC hdc)
 {
     return hdc;
@@ -291,7 +291,7 @@ GdiGetLocalDC(HDC hdc)
  * @implemented
  */
 HFONT
-STDCALL
+WINAPI
 GdiGetLocalFont(HFONT hfont)
 {
     return hfont;
index ba1ee64..75558ac 100644 (file)
@@ -35,7 +35,7 @@ DWORD GDI_BatchLimit = 1;
 
 
 BOOL
-STDCALL
+WINAPI
 GdiAlphaBlend(
             HDC hDCDst,
             int DstX,
@@ -73,7 +73,7 @@ GdiAlphaBlend(
  * @implemented
  */
 HGDIOBJ
-STDCALL
+WINAPI
 GdiFixUpHandle(HGDIOBJ hGdiObj)
 {
     PGDI_TABLE_ENTRY Entry;
@@ -95,7 +95,7 @@ GdiFixUpHandle(HGDIOBJ hGdiObj)
  * @implemented
  */
 PVOID
-STDCALL
+WINAPI
 GdiQueryTable(VOID)
 {
   return (PVOID)GdiHandleTable;
@@ -168,7 +168,7 @@ PLDC GdiGetLDC(HDC hDC)
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GdiSetBatchLimit(DWORD Limit)
 {
     DWORD OldLimit = GDI_BatchLimit;
@@ -189,7 +189,7 @@ GdiSetBatchLimit(DWORD      Limit)
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GdiGetBatchLimit()
 {
     return GDI_BatchLimit;
@@ -199,14 +199,14 @@ GdiGetBatchLimit()
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiReleaseDC(HDC hdc)
 {
     return 0;
 }
 
 INT
-STDCALL
+WINAPI
 ExtEscape(HDC hDC,
           int nEscape,
           int cbInput,
@@ -221,14 +221,14 @@ ExtEscape(HDC hDC,
  * @implemented
  */
 VOID
-STDCALL
+WINAPI
 GdiSetLastError(DWORD dwErrCode)
 {
     NtCurrentTeb()->LastErrorValue = (ULONG) dwErrCode;
 }
 
 BOOL
-STDCALL
+WINAPI
 GdiAddGlsBounds(HDC hdc,LPRECT prc)
 {
     //FIXME: Lookup what 0x8000 means
index 9853109..7ca0c7d 100644 (file)
@@ -25,7 +25,7 @@
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 PtInRegion(IN HRGN hrgn,
            int x,
            int y)
@@ -38,7 +38,7 @@ PtInRegion(IN HRGN hrgn,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 RectInRegion(HRGN hrgn,
              LPCRECT prcl)
 {
@@ -50,7 +50,7 @@ RectInRegion(HRGN hrgn,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 RestoreDC(IN HDC hdc,
           IN INT iLevel)
 {
@@ -62,7 +62,7 @@ RestoreDC(IN HDC hdc,
  * @unimplemented
  */
 INT
-STDCALL
+WINAPI
 SaveDC(IN HDC hdc)
 {
     /* FIXME Sharememory */
@@ -75,7 +75,7 @@ SaveDC(IN HDC hdc)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 CancelDC(HDC hdc)
 {
     UNIMPLEMENTED;
@@ -88,7 +88,7 @@ CancelDC(HDC hdc)
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 DrawEscape(HDC  hdc,
            int a1,
            int a2,
@@ -104,7 +104,7 @@ DrawEscape(HDC  hdc,
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 EnumObjects(HDC hdc,
             int a1,
             GOBJENUMPROC a2,
@@ -121,7 +121,7 @@ EnumObjects(HDC hdc,
  * @implemented
  */
 UINT
-STDCALL
+WINAPI
 GetBoundsRect(
        HDC     hdc,
        LPRECT  lprcBounds,
@@ -136,7 +136,7 @@ GetBoundsRect(
  * @unimplemented
  */
 UINT
-STDCALL
+WINAPI
 GetMetaFileBitsEx(
        HMETAFILE       a0,
        UINT            a1,
@@ -152,7 +152,7 @@ GetMetaFileBitsEx(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 PlayMetaFile(
        HDC             a0,
        HMETAFILE       a1
@@ -167,7 +167,7 @@ PlayMetaFile(
  * @implemented
  */
 UINT
-STDCALL
+WINAPI
 SetBoundsRect(HDC hdc,
               CONST RECT *prc,
               UINT flags)
@@ -180,7 +180,7 @@ SetBoundsRect(HDC hdc,
  * @unimplemented
  */
 HMETAFILE
-STDCALL
+WINAPI
 SetMetaFileBitsEx(
        UINT            a0,
        CONST BYTE      *a1
@@ -195,7 +195,7 @@ SetMetaFileBitsEx(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 PlayMetaFileRecord(
        HDC             a0,
        LPHANDLETABLE   a1,
@@ -213,7 +213,7 @@ PlayMetaFileRecord(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 EnumMetaFile(
        HDC                     a0,
        HMETAFILE               a1,
@@ -230,7 +230,7 @@ EnumMetaFile(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 DeleteEnhMetaFile(
        HENHMETAFILE    a0
        )
@@ -244,7 +244,7 @@ DeleteEnhMetaFile(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 EnumEnhMetaFile(
        HDC             a0,
        HENHMETAFILE    a1,
@@ -262,7 +262,7 @@ EnumEnhMetaFile(
  * @unimplemented
  */
 UINT
-STDCALL
+WINAPI
 GetEnhMetaFileBits(
        HENHMETAFILE    a0,
        UINT            a1,
@@ -279,7 +279,7 @@ GetEnhMetaFileBits(
  * @unimplemented
  */
 UINT
-STDCALL
+WINAPI
 GetEnhMetaFileHeader(
        HENHMETAFILE    a0,
        UINT            a1,
@@ -295,7 +295,7 @@ GetEnhMetaFileHeader(
  * @unimplemented
  */
 UINT
-STDCALL
+WINAPI
 GetEnhMetaFilePaletteEntries(
        HENHMETAFILE    a0,
        UINT            a1,
@@ -311,7 +311,7 @@ GetEnhMetaFilePaletteEntries(
  * @unimplemented
  */
 UINT
-STDCALL
+WINAPI
 GetWinMetaFileBits(
        HENHMETAFILE    a0,
        UINT            a1,
@@ -330,7 +330,7 @@ GetWinMetaFileBits(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 PlayEnhMetaFile(
        HDC             a0,
        HENHMETAFILE    a1,
@@ -347,7 +347,7 @@ PlayEnhMetaFile(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 PlayEnhMetaFileRecord(
        HDC                     a0,
        LPHANDLETABLE           a1,
@@ -365,7 +365,7 @@ PlayEnhMetaFileRecord(
  * @unimplemented
  */
 HENHMETAFILE
-STDCALL
+WINAPI
 SetEnhMetaFileBits(
        UINT            a0,
        CONST BYTE      *a1
@@ -381,7 +381,7 @@ SetEnhMetaFileBits(
  * @unimplemented
  */
 HENHMETAFILE
-STDCALL
+WINAPI
 SetWinMetaFileBits(
        UINT                    a0,
        CONST BYTE              *a1,
@@ -398,7 +398,7 @@ SetWinMetaFileBits(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiComment(
        HDC             hDC,
        UINT            bytes,
@@ -428,7 +428,7 @@ GdiComment(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 SetColorAdjustment(
        HDC                     hdc,
        CONST COLORADJUSTMENT   *a1
@@ -443,7 +443,7 @@ SetColorAdjustment(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 EndDoc(
        HDC     hdc
        )
@@ -458,7 +458,7 @@ EndDoc(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 StartPage(
        HDC     hdc
        )
@@ -473,7 +473,7 @@ StartPage(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 EndPage(
        HDC     hdc
        )
@@ -488,7 +488,7 @@ EndPage(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 AbortDoc(
        HDC     hdc
        )
@@ -503,7 +503,7 @@ AbortDoc(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 SetAbortProc(
        HDC hdc,
        ABORTPROC lpAbortProc)
@@ -517,7 +517,7 @@ SetAbortProc(
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 UnrealizeObject(HGDIOBJ  hgdiobj)
 {
     BOOL retValue = TRUE;
@@ -547,7 +547,7 @@ UnrealizeObject(HGDIOBJ  hgdiobj)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiFlush()
 {
     NtGdiFlush();
@@ -559,7 +559,7 @@ GdiFlush()
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 SetICMMode(
        HDC     a0,
        int     a1
@@ -575,7 +575,7 @@ SetICMMode(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 CheckColorsInGamut(
        HDC     a0,
        LPVOID  a1,
@@ -593,7 +593,7 @@ CheckColorsInGamut(
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetDeviceGammaRamp( HDC hdc,
                     LPVOID lpGammaRamp)
 {
@@ -614,7 +614,7 @@ GetDeviceGammaRamp( HDC hdc,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetDeviceGammaRamp(HDC hdc,
                    LPVOID lpGammaRamp)
 {
@@ -637,7 +637,7 @@ SetDeviceGammaRamp(HDC hdc,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 ColorMatchToTarget(
        HDC     a0,
        HDC     a1,
@@ -654,7 +654,7 @@ ColorMatchToTarget(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglCopyContext(
        HGLRC   a0,
        HGLRC   a1,
@@ -671,7 +671,7 @@ wglCopyContext(
  * @unimplemented
  */
 HGLRC
-STDCALL
+WINAPI
 wglCreateContext(
        HDC     hDc
        )
@@ -686,7 +686,7 @@ wglCreateContext(
  * @unimplemented
  */
 HGLRC
-STDCALL
+WINAPI
 wglCreateLayerContext(
        HDC     hDc,
        int     a1
@@ -702,7 +702,7 @@ wglCreateLayerContext(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglDeleteContext(
        HGLRC   a
        )
@@ -717,7 +717,7 @@ wglDeleteContext(
  * @unimplemented
  */
 HGLRC
-STDCALL
+WINAPI
 wglGetCurrentContext(VOID)
 {
        UNIMPLEMENTED;
@@ -730,7 +730,7 @@ wglGetCurrentContext(VOID)
  * @unimplemented
  */
 HDC
-STDCALL
+WINAPI
 wglGetCurrentDC(VOID)
 {
        UNIMPLEMENTED;
@@ -743,7 +743,7 @@ wglGetCurrentDC(VOID)
  * @unimplemented
  */
 PROC
-STDCALL
+WINAPI
 wglGetProcAddress(
        LPCSTR          a0
        )
@@ -758,7 +758,7 @@ wglGetProcAddress(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglMakeCurrent(
        HDC     a0,
        HGLRC   a1
@@ -774,7 +774,7 @@ wglMakeCurrent(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglShareLists(
        HGLRC   a0,
        HGLRC   a1
@@ -790,7 +790,7 @@ wglShareLists(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglDescribeLayerPlane(
        HDC                     a0,
        int                     a1,
@@ -809,7 +809,7 @@ wglDescribeLayerPlane(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 wglSetLayerPaletteEntries(
        HDC             a0,
        int             a1,
@@ -828,7 +828,7 @@ wglSetLayerPaletteEntries(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 wglGetLayerPaletteEntries(
        HDC             a0,
        int             a1,
@@ -847,7 +847,7 @@ wglGetLayerPaletteEntries(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglRealizeLayerPalette(
        HDC             a0,
        int             a1,
@@ -864,7 +864,7 @@ wglRealizeLayerPalette(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglSwapLayerBuffers(
        HDC             a0,
        UINT            a1
@@ -885,7 +885,7 @@ wglSwapLayerBuffers(
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 IsValidEnhMetaRecord(
        DWORD   a0,
        DWORD   a1
@@ -901,7 +901,7 @@ IsValidEnhMetaRecord(
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 IsValidEnhMetaRecordOffExt(
        DWORD   a0,
        DWORD   a1,
@@ -919,7 +919,7 @@ IsValidEnhMetaRecordOffExt(
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GetGlyphOutlineWow(
        DWORD   a0,
        DWORD   a1,
@@ -939,7 +939,7 @@ GetGlyphOutlineWow(
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 gdiPlaySpoolStream(
        DWORD   a0,
        DWORD   a1,
@@ -958,7 +958,7 @@ gdiPlaySpoolStream(
  * @unimplemented
  */
 HANDLE
-STDCALL
+WINAPI
 AddFontMemResourceEx(
        PVOID pbFont,
        DWORD cbFont,
@@ -975,7 +975,7 @@ AddFontMemResourceEx(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 AddFontResourceTracking(
        LPCSTR lpString,
        int unknown
@@ -992,7 +992,7 @@ AddFontResourceTracking(
  * @unimplemented
  */
 HBITMAP
-STDCALL
+WINAPI
 ClearBitmapAttributes(HBITMAP hbm, DWORD dwFlags)
 {
        UNIMPLEMENTED;
@@ -1004,7 +1004,7 @@ ClearBitmapAttributes(HBITMAP hbm, DWORD dwFlags)
  * @unimplemented
  */
 HBRUSH
-STDCALL
+WINAPI
 ClearBrushAttributes(HBRUSH hbm, DWORD dwFlags)
 {
        UNIMPLEMENTED;
@@ -1016,7 +1016,7 @@ ClearBrushAttributes(HBRUSH hbm, DWORD dwFlags)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 ColorCorrectPalette(HDC hDC,HPALETTE hPalette,DWORD dwFirstEntry,DWORD dwNumOfEntries)
 {
        UNIMPLEMENTED;
@@ -1028,7 +1028,7 @@ ColorCorrectPalette(HDC hDC,HPALETTE hPalette,DWORD dwFirstEntry,DWORD dwNumOfEn
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 EndFormPage(HDC hdc)
 {
        UNIMPLEMENTED;
@@ -1040,7 +1040,7 @@ EndFormPage(HDC hdc)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiArtificialDecrementDriver(LPWSTR pDriverName,BOOL unknown)
 {
        UNIMPLEMENTED;
@@ -1052,7 +1052,7 @@ GdiArtificialDecrementDriver(LPWSTR pDriverName,BOOL unknown)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiCleanCacheDC(HDC hdc)
 {
        UNIMPLEMENTED;
@@ -1064,7 +1064,7 @@ GdiCleanCacheDC(HDC hdc)
  * @unimplemented
  */
 HDC
-STDCALL
+WINAPI
 GdiConvertAndCheckDC(HDC hdc)
 {
        UNIMPLEMENTED;
@@ -1076,7 +1076,7 @@ GdiConvertAndCheckDC(HDC hdc)
  * @unimplemented
  */
 HENHMETAFILE
-STDCALL
+WINAPI
 GdiConvertEnhMetaFile(HENHMETAFILE hmf)
 {
     UNIMPLEMENTED;
@@ -1088,7 +1088,7 @@ GdiConvertEnhMetaFile(HENHMETAFILE hmf)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiDrawStream(HDC dc, ULONG l, VOID *v)
 {
     UNIMPLEMENTED;
@@ -1100,7 +1100,7 @@ GdiDrawStream(HDC dc, ULONG l, VOID *v)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiIsMetaFileDC(HDC hdc)
 {
     UNIMPLEMENTED;
@@ -1112,7 +1112,7 @@ GdiIsMetaFileDC(HDC hdc)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiIsMetaPrintDC(HDC hdc)
 {
     UNIMPLEMENTED;
@@ -1124,7 +1124,7 @@ GdiIsMetaPrintDC(HDC hdc)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiIsPlayMetafileDC(HDC hdc)
 {
     UNIMPLEMENTED;
@@ -1136,7 +1136,7 @@ GdiIsPlayMetafileDC(HDC hdc)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiValidateHandle(HGDIOBJ hobj)
 {
     UNIMPLEMENTED;
@@ -1148,7 +1148,7 @@ GdiValidateHandle(HGDIOBJ hobj)
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GetBitmapAttributes(HBITMAP hbm)
 {
     UNIMPLEMENTED;
@@ -1160,7 +1160,7 @@ GetBitmapAttributes(HBITMAP hbm)
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GetBrushAttributes(HBRUSH hbr)
 {
     UNIMPLEMENTED;
@@ -1172,7 +1172,7 @@ GetBrushAttributes(HBRUSH hbr)
  * @implemented
  */
 ULONG
-STDCALL
+WINAPI
 GetEUDCTimeStamp(VOID)
 {
     return NtGdiGetEudcTimeStampEx(NULL,0,TRUE);
@@ -1182,7 +1182,7 @@ GetEUDCTimeStamp(VOID)
  * @implemented
  */
 ULONG
-STDCALL
+WINAPI
 GetFontAssocStatus(HDC hdc)
 {
     ULONG retValue = 0;
@@ -1199,7 +1199,7 @@ GetFontAssocStatus(HDC hdc)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetTextExtentExPointWPri(HDC hdc,
                          LPWSTR lpwsz,
                          ULONG cwc,
@@ -1215,7 +1215,7 @@ GetTextExtentExPointWPri(HDC hdc,
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 QueryFontAssocStatus(VOID)
 {
     UNIMPLEMENTED;
@@ -1227,7 +1227,7 @@ QueryFontAssocStatus(VOID)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 RemoveFontMemResourceEx(HANDLE fh)
 {
     BOOL retValue=0;
@@ -1247,7 +1247,7 @@ RemoveFontMemResourceEx(HANDLE fh)
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 RemoveFontResourceTracking(LPCSTR lpString,int unknown)
 {
        UNIMPLEMENTED;
@@ -1259,7 +1259,7 @@ RemoveFontResourceTracking(LPCSTR lpString,int unknown)
  * @unimplemented
  */
 HBITMAP
-STDCALL
+WINAPI
 SetBitmapAttributes(HBITMAP hbm, DWORD dwFlags)
 {
        UNIMPLEMENTED;
@@ -1271,7 +1271,7 @@ SetBitmapAttributes(HBITMAP hbm, DWORD dwFlags)
  * @unimplemented
  */
 HBRUSH
-STDCALL
+WINAPI
 SetBrushAttributes(HBRUSH hbm, DWORD dwFlags)
 {
        UNIMPLEMENTED;
@@ -1283,7 +1283,7 @@ SetBrushAttributes(HBRUSH hbm, DWORD dwFlags)
  * @implemented
  */
 int
-STDCALL
+WINAPI
 StartFormPage(HDC hdc)
 {
     return StartPage(hdc);
@@ -1293,7 +1293,7 @@ StartFormPage(HDC hdc)
  * @unimplemented
  */
 VOID
-STDCALL
+WINAPI
 UnloadNetworkFonts(DWORD unknown)
 {
     UNIMPLEMENTED;
@@ -1304,7 +1304,7 @@ UnloadNetworkFonts(DWORD unknown)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiRealizationInfo(HDC hdc,
                    PREALIZATION_INFO pri)
 {
@@ -1316,7 +1316,7 @@ GdiRealizationInfo(HDC hdc,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GetETM(HDC hdc,
        EXTTEXTMETRIC *petm)
 {
@@ -1332,7 +1332,7 @@ GetETM(HDC hdc,
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 Escape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpvInData, LPVOID lpvOutData)
 {
     int retValue = SP_ERROR;    
@@ -1518,7 +1518,7 @@ Escape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpvInData, LPVOID lpvOutData)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiAddGlsRecord(HDC hdc,
                 DWORD unknown1,
                 LPCSTR unknown2,
@@ -1533,7 +1533,7 @@ GdiAddGlsRecord(HDC hdc,
  * @unimplemented
  */
 HANDLE
-STDCALL
+WINAPI
 GdiConvertMetaFilePict(HGLOBAL hMem)
 {
     UNIMPLEMENTED;
@@ -1545,7 +1545,7 @@ GdiConvertMetaFilePict(HGLOBAL hMem)
  * @implemented
  */
 DEVMODEW *
-STDCALL
+WINAPI
 GdiConvertToDevmodeW(DEVMODEA *dmA)
 {
     DEVMODEW *dmW;
@@ -1592,7 +1592,7 @@ GdiConvertToDevmodeW(DEVMODEA *dmA)
  * @unimplemented
  */
 HENHMETAFILE
-STDCALL
+WINAPI
 GdiCreateLocalEnhMetaFile(HENHMETAFILE hmo)
 {
     UNIMPLEMENTED;
@@ -1604,7 +1604,7 @@ GdiCreateLocalEnhMetaFile(HENHMETAFILE hmo)
  * @unimplemented
  */
 METAFILEPICT *
-STDCALL
+WINAPI
 GdiCreateLocalMetaFilePict(HENHMETAFILE hmo)
 {
     UNIMPLEMENTED;
@@ -1617,7 +1617,7 @@ GdiCreateLocalMetaFilePict(HENHMETAFILE hmo)
  * @unimplemented
  */
 HANDLE
-STDCALL
+WINAPI
 GdiGetSpoolFileHandle(LPWSTR pwszPrinterName,
                       LPDEVMODEW pDevmode,
                       LPWSTR pwszDocName)
@@ -1631,7 +1631,7 @@ GdiGetSpoolFileHandle(LPWSTR pwszPrinterName,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle)
 {
     UNIMPLEMENTED;
@@ -1643,7 +1643,7 @@ GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle)
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GdiGetPageCount(HANDLE SpoolFileHandle)
 {
     UNIMPLEMENTED;
@@ -1655,7 +1655,7 @@ GdiGetPageCount(HANDLE SpoolFileHandle)
  * @unimplemented
  */
 HDC
-STDCALL
+WINAPI
 GdiGetDC(HANDLE SpoolFileHandle)
 {
     UNIMPLEMENTED;
@@ -1667,7 +1667,7 @@ GdiGetDC(HANDLE SpoolFileHandle)
  * @unimplemented
  */
 HANDLE
-STDCALL
+WINAPI
 GdiGetPageHandle(HANDLE SpoolFileHandle,
                  DWORD Page,
                  LPDWORD pdwPageType)
@@ -1681,7 +1681,7 @@ GdiGetPageHandle(HANDLE SpoolFileHandle,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiStartDocEMF(HANDLE SpoolFileHandle,
                DOCINFOW *pDocInfo)
 {
@@ -1694,7 +1694,7 @@ GdiStartDocEMF(HANDLE SpoolFileHandle,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiStartPageEMF(HANDLE SpoolFileHandle)
 {
     UNIMPLEMENTED;
@@ -1706,7 +1706,7 @@ GdiStartPageEMF(HANDLE SpoolFileHandle)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiPlayPageEMF(HANDLE SpoolFileHandle,
                HANDLE hemf,
                RECT *prectDocument,
@@ -1722,7 +1722,7 @@ GdiPlayPageEMF(HANDLE SpoolFileHandle,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiEndPageEMF(HANDLE SpoolFileHandle,
               DWORD dwOptimization)
 {
@@ -1735,7 +1735,7 @@ GdiEndPageEMF(HANDLE SpoolFileHandle,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiEndDocEMF(HANDLE SpoolFileHandle)
 {
     UNIMPLEMENTED;
@@ -1747,7 +1747,7 @@ GdiEndDocEMF(HANDLE SpoolFileHandle)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiGetDevmodeForPage(HANDLE SpoolFileHandle,
                      DWORD dwPageNumber,
                      PDEVMODEW *pCurrDM,
@@ -1762,7 +1762,7 @@ GdiGetDevmodeForPage(HANDLE SpoolFileHandle,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiResetDCEMF(HANDLE SpoolFileHandle,
               PDEVMODEW pCurrDM)
 {
@@ -1776,7 +1776,7 @@ GdiResetDCEMF(HANDLE SpoolFileHandle,
  * @unimplemented
  */
 INT
-STDCALL
+WINAPI
 CombineRgn(HRGN  hDest,
            HRGN  hSrc1,
            HRGN  hSrc2,
@@ -1789,7 +1789,7 @@ CombineRgn(HRGN  hDest,
 /*
  * @unimplemented
  */
-ULONG STDCALL
+ULONG WINAPI
 XLATEOBJ_iXlate(XLATEOBJ *XlateObj,
                 ULONG Color)
 {
@@ -1802,7 +1802,7 @@ XLATEOBJ_iXlate(XLATEOBJ *XlateObj,
  * @unimplemented
  */
 ULONG *
-STDCALL
+WINAPI
 XLATEOBJ_piVector(XLATEOBJ *XlateObj)
 {
     return XlateObj->pulXlate;
@@ -1812,7 +1812,7 @@ XLATEOBJ_piVector(XLATEOBJ *XlateObj)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiPlayEMF(LPWSTR pwszPrinterName,
            LPDEVMODEW pDevmode,
            LPWSTR pwszDocName,
@@ -1831,7 +1831,7 @@ GdiPlayEMF(LPWSTR pwszPrinterName,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiPlayPrivatePageEMF(HANDLE SpoolFileHandle,
                       DWORD unknown,
                       RECT *prectDocument)
@@ -1844,7 +1844,7 @@ GdiPlayPrivatePageEMF(HANDLE SpoolFileHandle,
 /*
  * @unimplemented
  */
-VOID STDCALL GdiInitializeLanguagePack(DWORD InitParam)
+VOID WINAPI GdiInitializeLanguagePack(DWORD InitParam)
 {
     UNIMPLEMENTED;
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -1855,7 +1855,7 @@ VOID STDCALL GdiInitializeLanguagePack(DWORD InitParam)
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 ExcludeClipRect(IN HDC hdc, IN INT xLeft, IN INT yTop, IN INT xRight, IN INT yBottom)
 {
     /* FIXME some part need be done on user mode size */
@@ -1866,7 +1866,7 @@ ExcludeClipRect(IN HDC hdc, IN INT xLeft, IN INT yTop, IN INT xRight, IN INT yBo
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 ExtSelectClipRgn( IN HDC hdc, IN HRGN hrgn, IN INT iMode)
 {
     /* FIXME some part need be done on user mode size */
@@ -1877,7 +1877,7 @@ ExtSelectClipRgn( IN HDC hdc, IN HRGN hrgn, IN INT iMode)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiGradientFill(
     IN HDC hdc,
     IN PTRIVERTEX pVertex,
@@ -1895,7 +1895,7 @@ GdiGradientFill(
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiTransparentBlt(IN HDC hdcDst,
                   IN INT xDst,
                   IN INT yDst,
@@ -1917,7 +1917,7 @@ GdiTransparentBlt(IN HDC hdcDst,
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GdiPrinterThunk(
     IN HUMPD humpd,
     DWORD *status,
@@ -1936,7 +1936,7 @@ GdiPrinterThunk(
  *
  */
 HBITMAP
-STDCALL
+WINAPI
 GdiConvertBitmapV5(
     HBITMAP in_format_BitMap,
     HBITMAP src_BitMap,
@@ -1959,7 +1959,7 @@ GdiConvertBitmapV5(
  *
  */
 int
-STDCALL
+WINAPI
 GetClipBox(HDC hdc,
            LPRECT lprc)
 {
@@ -1971,7 +1971,7 @@ GetClipBox(HDC hdc,
  *
  */
 DWORD
-STDCALL
+WINAPI
 GetFontData(HDC hdc,
             DWORD dwTable,
             DWORD dwOffset,
@@ -1991,7 +1991,7 @@ GetFontData(HDC hdc,
  *
  */
 DWORD
-STDCALL
+WINAPI
 GetRegionData(HRGN hrgn,
               DWORD nCount,
               LPRGNDATA lpRgnData)
@@ -2010,7 +2010,7 @@ GetRegionData(HRGN hrgn,
  *
  */
 INT
-STDCALL
+WINAPI
 GetRgnBox(HRGN hrgn,
           LPRECT prcOut)
 {
@@ -2041,7 +2041,7 @@ GetRgnBox(HRGN hrgn,
  *
  */
 INT
-STDCALL
+WINAPI
 OffsetRgn( HRGN hrgn,
           int nXOffset,
           int nYOffset)
@@ -2054,7 +2054,7 @@ OffsetRgn( HRGN hrgn,
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 IntersectClipRect(HDC hdc,
                   int nLeftRect,
                   int nTopRect,
@@ -2088,7 +2088,7 @@ IntersectClipRect(HDC hdc,
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 OffsetClipRgn(HDC hdc,
               int nXOffset,
               int nYOffset)
@@ -2118,7 +2118,7 @@ OffsetClipRgn(HDC hdc,
 
 
 INT
-STDCALL
+WINAPI
 NamedEscape(HDC hdc,
             PWCHAR pDriver,
             INT iEsc,
@@ -2142,7 +2142,7 @@ NamedEscape(HDC hdc,
 
 /* FIXME wrong protypes, it is a fastcall api */
 DWORD
-STDCALL
+WINAPI
 cGetTTFFromFOT(DWORD x1 ,DWORD x2 ,DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7)
 {
     UNIMPLEMENTED;
index ec2894c..a011044 100644 (file)
@@ -20,7 +20,7 @@
  * @unimplemented
  */
 DWORD
-STDCALL
+WINAPI
 GetCharacterPlacementA(
        HDC             hDc,
        LPCSTR          a1,
@@ -40,7 +40,7 @@ GetCharacterPlacementA(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 StartDocA(
        HDC             hdc,
        CONST DOCINFOA  *lpdi
@@ -56,7 +56,7 @@ StartDocA(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 PolyTextOutA(
        HDC                     hdc,
        CONST POLYTEXTA         *a1,
@@ -72,7 +72,7 @@ PolyTextOutA(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GetLogColorSpaceA(
        HCOLORSPACE             a0,
        LPLOGCOLORSPACEA        a1,
@@ -89,7 +89,7 @@ GetLogColorSpaceA(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GetICMProfileA(
        HDC             hdc,
        LPDWORD pBufSize,
@@ -106,7 +106,7 @@ GetICMProfileA(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 SetICMProfileA(
        HDC     a0,
        LPSTR   a1
@@ -122,7 +122,7 @@ SetICMProfileA(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 EnumICMProfilesA(
        HDC             a0,
        ICMENUMPROCA    a1,
@@ -149,7 +149,7 @@ EnumICMProfilesA(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglUseFontBitmapsA(
        HDC             a0,
        DWORD           a1,
@@ -167,7 +167,7 @@ wglUseFontBitmapsA(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglUseFontOutlinesA(
        HDC                     a0,
        DWORD                   a1,
@@ -189,7 +189,7 @@ wglUseFontOutlinesA(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 UpdateICMRegKeyA(
        DWORD   a0,
        LPSTR   a1,
@@ -206,7 +206,7 @@ UpdateICMRegKeyA(
  * @implemented
  */
 UINT
-STDCALL
+WINAPI
 GetStringBitmapA(HDC hdc,
                  LPSTR psz,
                  BOOL DoCall,
index d00154b..28c5ab8 100644 (file)
@@ -20,7 +20,7 @@
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 PolyTextOutW(
        HDC                     hdc,
        CONST POLYTEXTW         *a1,
@@ -36,7 +36,7 @@ PolyTextOutW(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GetLogColorSpaceW(
        HCOLORSPACE             a0,
        LPLOGCOLORSPACEW        a1,
@@ -53,7 +53,7 @@ GetLogColorSpaceW(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 GetICMProfileW(
        HDC             a0,
        LPDWORD         a1,
@@ -70,7 +70,7 @@ GetICMProfileW(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 SetICMProfileW(
        HDC     a0,
        LPWSTR  a1
@@ -86,7 +86,7 @@ SetICMProfileW(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 EnumICMProfilesW(
        HDC             hDC,
        ICMENUMPROCW    lpEnumICMProfilesFunc,
@@ -112,7 +112,7 @@ EnumICMProfilesW(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglUseFontBitmapsW(
        HDC             a0,
        DWORD           a1,
@@ -130,7 +130,7 @@ wglUseFontBitmapsW(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 wglUseFontOutlinesW(
        HDC                     a0,
        DWORD                   a1,
@@ -152,7 +152,7 @@ wglUseFontOutlinesW(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 UpdateICMRegKeyW(
        DWORD   a0,
        LPWSTR  a1,
@@ -176,7 +176,7 @@ UpdateICMRegKeyW(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 EudcLoadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath,INT iPriority,INT iFontLinkType)
 {
        UNIMPLEMENTED;
@@ -188,7 +188,7 @@ EudcLoadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath,INT iPriority,INT iFon
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
 {
        UNIMPLEMENTED;
@@ -200,7 +200,7 @@ EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 GdiAddFontResourceW(
     LPCWSTR lpszFilename,
     FLONG fl,
@@ -213,7 +213,7 @@ GdiAddFontResourceW(
  * @implemented
  */
 DWORD
-STDCALL
+WINAPI
 GetEUDCTimeStampExW(LPWSTR lpBaseFaceName)
 {
     DWORD retValue = 0;
@@ -236,7 +236,7 @@ GetEUDCTimeStampExW(LPWSTR lpBaseFaceName)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 bInitSystemAndFontsDirectoriesW(LPWSTR *SystemDir,LPWSTR *FontsDir)
 {
        UNIMPLEMENTED;
@@ -248,7 +248,7 @@ bInitSystemAndFontsDirectoriesW(LPWSTR *SystemDir,LPWSTR *FontsDir)
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unknown)
 {
        UNIMPLEMENTED;
@@ -260,7 +260,7 @@ bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unkno
  * @implemented
  */
 UINT
-STDCALL
+WINAPI
 GetStringBitmapW(HDC hdc,
                  LPWSTR pwsz,
                  BOOL doCall,
index 6f6f121..7e58777 100644 (file)
 
 
 
-typedef int  STDCALL (*CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL STDCALL (*SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL STDCALL (*SWAPBUFFERS) (HDC hdc);
-typedef int  STDCALL (*DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
-typedef int  STDCALL (*GETPIXELFMT) (HDC);
+typedef int  WINAPI (*CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
+typedef BOOL WINAPI (*SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
+typedef BOOL WINAPI (*SWAPBUFFERS) (HDC hdc);
+typedef int  WINAPI (*DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
+typedef int  WINAPI (*GETPIXELFMT) (HDC);
 
 
 static CHOOSEPIXELFMT    glChoosePixelFormat   = NULL;
@@ -109,7 +109,7 @@ static BOOL OpenGLEnable(void)
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 ChoosePixelFormat(HDC  hdc,
                   CONST PIXELFORMATDESCRIPTOR * ppfd)
 {
@@ -126,7 +126,7 @@ ChoosePixelFormat(HDC  hdc,
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 DescribePixelFormat(HDC  hdc,
                     INT  iPixelFormat,
                     UINT  nBytes,
@@ -145,7 +145,7 @@ DescribePixelFormat(HDC  hdc,
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 GetPixelFormat(HDC  hdc)
 {
   if (glGetPixelFormat == NULL)
@@ -161,7 +161,7 @@ GetPixelFormat(HDC  hdc)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetPixelFormat(HDC  hdc,
                INT  iPixelFormat,
                CONST PIXELFORMATDESCRIPTOR * ppfd)
@@ -179,7 +179,7 @@ SetPixelFormat(HDC  hdc,
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SwapBuffers(HDC  hdc)
 {
   if (glSwapBuffers == NULL)
@@ -199,7 +199,7 @@ SwapBuffers(HDC  hdc)
  * @implemented
  */
 UINT
-STDCALL
+WINAPI
 GetEnhMetaFilePixelFormat(
        HENHMETAFILE                    hemf,
        UINT                            cbBuffer,
index b3d534a..ba5047c 100644 (file)
@@ -56,7 +56,7 @@ Arc(
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 AngleArc(HDC   hDC,
          int   X,
          int   Y,
@@ -196,7 +196,7 @@ Chord(
  * @unimplemented
  */
 BOOL
-STDCALL
+WINAPI
 Pie(
        HDC     hDC,
        int     a1,
index a16cc86..ff68b08 100644 (file)
@@ -65,7 +65,7 @@ DIB_BitmapBitsSize( PBITMAPINFO Info )
  * did not calc the info right for some headers.
  */
 INT
-STDCALL
+WINAPI
 DIB_GetBitmapInfo(const BITMAPINFOHEADER *header,
                   PLONG width,
                   PLONG height,
@@ -128,7 +128,7 @@ DIB_GetBitmapInfo(const BITMAPINFOHEADER *header,
 /*
  * @implemented
  */
-HBITMAP STDCALL
+HBITMAP WINAPI
 CreateDIBSection(
    HDC hDC,
    CONST BITMAPINFO *BitmapInfo,
@@ -186,7 +186,7 @@ CreateDIBSection(
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 BitBlt(HDC hdcDest,      /* handle to destination DC */
        int nXOriginDest, /* x-coord of destination upper-left corner */
        int nYOriginDest, /* y-coord of destination upper-left corner */
@@ -219,7 +219,7 @@ BitBlt(HDC hdcDest,      /* handle to destination DC */
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOL WINAPI
 StretchBlt(
    HDC hdcDest,      /* handle to destination DC */
    int nXOriginDest, /* x-coord of destination upper-left corner */
@@ -248,7 +248,7 @@ StretchBlt(
 /*
  * @unimplemented
  */
-HBITMAP STDCALL
+HBITMAP WINAPI
 CreateBitmap(INT  Width,
              INT  Height,
              UINT  Planes,
@@ -342,7 +342,7 @@ CreateCompatibleBitmap(
 
 
 INT
-STDCALL
+WINAPI
 GetDIBits(
     HDC hDC,
     HBITMAP hbmp,
@@ -402,7 +402,7 @@ GetDIBits(
  * @implemented
  */
 HBITMAP
-STDCALL
+WINAPI
 CreateDIBitmap( HDC hDC,
                 const BITMAPINFOHEADER *Header,
                 DWORD Init,
@@ -484,7 +484,7 @@ Exit:
  * @implemented
  */
 INT
-STDCALL
+WINAPI
 SetDIBits(HDC hDC,
           HBITMAP hBitmap,
           UINT uStartScan,
@@ -574,7 +574,7 @@ SetDIBits(HDC hDC,
 #endif
 
 INT
-STDCALL
+WINAPI
 SetDIBits(HDC hdc,
           HBITMAP hbmp,
           UINT uStartScan,
@@ -631,7 +631,7 @@ SetDIBits(HDC hdc,
  *
  */
 INT
-STDCALL
+WINAPI
 SetDIBitsToDevice(
     HDC hdc,
     int XDest,
@@ -758,7 +758,7 @@ SetDIBitsToDevice(
  * @unimplemented
  */
 int
-STDCALL
+WINAPI
 StretchDIBits(HDC hdc,
               int XDest,
               int YDest,
index 757cfef..dd4d305 100644 (file)
@@ -110,7 +110,7 @@ ExtCreatePen(DWORD dwPenStyle,
 /*
  * @implemented
  */
-HBRUSH STDCALL
+HBRUSH WINAPI
 CreateDIBPatternBrush(
    HGLOBAL hglbDIBPacked,
    UINT fuColorSpec)
@@ -142,7 +142,7 @@ CreateDIBPatternBrush(
 /*
  * @implemented
  */
-HBRUSH STDCALL
+HBRUSH WINAPI
 CreateDIBPatternBrushPt(
    CONST VOID *lpPackedDIB,
    UINT fuColorSpec)
@@ -171,7 +171,7 @@ CreateDIBPatternBrushPt(
  * @implemented
  */
 HBRUSH
-STDCALL
+WINAPI
 CreateHatchBrush(INT fnStyle,
                  COLORREF clrref)
 {
@@ -182,7 +182,7 @@ CreateHatchBrush(INT fnStyle,
  * @implemented
  */
 HBRUSH
-STDCALL
+WINAPI
 CreatePatternBrush(HBITMAP hbmp)
 {
     return NtGdiCreatePatternBrushInternal(hbmp, FALSE, FALSE);
@@ -192,7 +192,7 @@ CreatePatternBrush(HBITMAP hbmp)
  * @implemented
  */
 HBRUSH
-STDCALL
+WINAPI
 CreateSolidBrush(IN COLORREF crColor)
 {
     /* Call Server-Side API */
@@ -202,7 +202,7 @@ CreateSolidBrush(IN COLORREF crColor)
 /*
  * @implemented
  */
-HBRUSH STDCALL
+HBRUSH WINAPI
 CreateBrushIndirect(
    CONST LOGBRUSH *LogBrush)
 {
@@ -257,7 +257,7 @@ CreateBrushIndirect(
 }
 
 BOOL
-STDCALL
+WINAPI
 PatBlt(HDC hdc,
        int nXLeft,
        int nYLeft,
@@ -270,7 +270,7 @@ PatBlt(HDC hdc,
 }
 
 BOOL
-STDCALL
+WINAPI
 PolyPatBlt(IN HDC hdc,
            IN DWORD rop4,
            IN PPOLYPATBLT pPoly,
@@ -286,7 +286,7 @@ PolyPatBlt(IN HDC hdc,
  *
  */
 int
-STDCALL
+WINAPI
 GetROP2(HDC hdc)
 {
   PDC_ATTR Dc_Attr;
@@ -298,7 +298,7 @@ GetROP2(HDC hdc)
  * @implemented
  */
 int
-STDCALL
+WINAPI
 SetROP2(HDC hdc,
         int fnDrawMode)
 {
@@ -349,7 +349,7 @@ SetROP2(HDC hdc,
  *
  */
 BOOL
-STDCALL
+WINAPI
 GetBrushOrgEx(HDC hdc,LPPOINT pt)
 {
   PDC_ATTR Dc_Attr;
@@ -367,7 +367,7 @@ GetBrushOrgEx(HDC hdc,LPPOINT pt)
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 SetBrushOrgEx(HDC hdc,
               int nXOrg,
               int nYOrg,