[sginsberg] 37769: - Replace the last instances of STDCALL with WINAPI/NTAPI -- this non-standard specifier is now completely deprecated. Now the healing can begin.

Author: sginsberg
Date: Sun Nov 30 07:46:35 2008
New Revision: 37769

URL: http://svn.reactos.org/svn/reactos?rev=37769&view=rev
Log:
- Replace the last instances of STDCALL with WINAPI/NTAPI -- this non-standard specifier
is now completely deprecated. Now the healing can begin.

Modified:
    trunk/reactos/include/ddk/ddrawint.h
    trunk/reactos/include/ddk/ntddpcm.h
    trunk/reactos/include/ddk/ntddser.h
    trunk/reactos/include/ddk/pfhook.h
    trunk/reactos/include/ddk/smbus.h
    trunk/reactos/include/ddk/usbioctl.h
    trunk/reactos/include/ddk/ws2san.h
    trunk/reactos/include/psdk/accctrl.h
    trunk/reactos/include/psdk/ddrawgdi.h
    trunk/reactos/include/psdk/dhcpcapi.h
    trunk/reactos/include/psdk/icmpapi.h
    trunk/reactos/include/psdk/imagehlp.h
    trunk/reactos/include/psdk/netcon.h
    trunk/reactos/include/psdk/windef.h
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/include/psdk/winscard.h
    trunk/reactos/include/reactos/dll/directx/d3d8thk.h
    trunk/reactos/include/reactos/drivers/directx/dxeng.h
    trunk/reactos/include/reactos/libs/samlib/samlib.h
    trunk/reactos/include/reactos/libs/syssetup/syssetup.h
    trunk/reactos/include/reactos/subsys/lsass/lsasrv.h
    trunk/reactos/include/reactos/subsys/sm/helper.h
    trunk/reactos/include/reactos/subsys/win/base.h
    trunk/reactos/include/reactos/subsys/win/windows.h

Modified: trunk/reactos/include/ddk/ddrawint.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/ddrawint.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ddrawint.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -260,7 +260,7 @@
 	DWORD                         dwFlags;
 	FLATPTR                       fpProcess;
 } DD_LOCKDATA, *PDD_LOCKDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_LOCK)(PDD_LOCKDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_LOCK)(PDD_LOCKDATA);
 
 
 typedef struct _DD_UNLOCKDATA
@@ -270,7 +270,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         Unlock;
 } DD_UNLOCKDATA, *PDD_UNLOCKDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_UNLOCK)(PDD_UNLOCKDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_UNLOCK)(PDD_UNLOCKDATA);
 
 #define DDABLT_SRCOVERDEST        0x00000001
 #define DDBLT_AFLAGS              0x80000000
@@ -297,7 +297,7 @@
 	DWORD                         dwAFlags;
 	DDARGB                        ddargbScaleFactors;
 } DD_BLTDATA, *PDD_BLTDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_BLT)(PDD_BLTDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_BLT)(PDD_BLTDATA);
 
 typedef struct _DD_UPDATEOVERLAYDATA
 {
@@ -311,7 +311,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         UpdateOverlay;
 } DD_UPDATEOVERLAYDATA, *PDD_UPDATEOVERLAYDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_UPDATEOVERLAY)(PDD_UPDATEOVERLAYDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_UPDATEOVERLAY)(PDD_UPDATEOVERLAYDATA);
 
 typedef struct _DD_SETOVERLAYPOSITIONDATA
 {
@@ -323,7 +323,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         SetOverlayPosition;
 } DD_SETOVERLAYPOSITIONDATA, *PDD_SETOVERLAYPOSITIONDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_SETOVERLAYPOSITION)(PDD_SETOVERLAYPOSITIONDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_SETOVERLAYPOSITION)(PDD_SETOVERLAYPOSITIONDATA);
 
 typedef struct _DD_SETPALETTEDATA
 {
@@ -334,7 +334,7 @@
 	PVOID                         SetPalette;
 	BOOL                          Attach;
 } DD_SETPALETTEDATA, *PDD_SETPALETTEDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_SETPALETTE)(PDD_SETPALETTEDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_SETPALETTE)(PDD_SETPALETTEDATA);
 
 typedef struct _DD_FLIPDATA
 {
@@ -347,7 +347,7 @@
 	PDD_SURFACE_LOCAL             lpSurfCurrLeft;
 	PDD_SURFACE_LOCAL             lpSurfTargLeft;
 } DD_FLIPDATA, *PDD_FLIPDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_FLIP)(PDD_FLIPDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_FLIP)(PDD_FLIPDATA);
 
 typedef struct _DD_DESTROYSURFACEDATA
 {
@@ -356,7 +356,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         DestroySurface;
 } DD_DESTROYSURFACEDATA, *PDD_DESTROYSURFACEDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_DESTROYSURFACE)(PDD_DESTROYSURFACEDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_DESTROYSURFACE)(PDD_DESTROYSURFACEDATA);
 
 typedef struct _DD_SETCLIPLISTDATA
 {
@@ -365,7 +365,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         SetClipList;
 } DD_SETCLIPLISTDATA, *PDD_SETCLIPLISTDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_SETCLIPLIST)(PDD_SETCLIPLISTDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_SETCLIPLIST)(PDD_SETCLIPLISTDATA);
 
 typedef struct _DD_ADDATTACHEDSURFACEDATA
 {
@@ -375,7 +375,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         AddAttachedSurface;
 } DD_ADDATTACHEDSURFACEDATA, *PDD_ADDATTACHEDSURFACEDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_ADDATTACHEDSURFACE)(PDD_ADDATTACHEDSURFACEDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_ADDATTACHEDSURFACE)(PDD_ADDATTACHEDSURFACEDATA);
 
 typedef struct _DD_SETCOLORKEYDATA
 {
@@ -386,7 +386,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         SetColorKey;
 } DD_SETCOLORKEYDATA, *PDD_SETCOLORKEYDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_SETCOLORKEY)(PDD_SETCOLORKEYDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_SETCOLORKEY)(PDD_SETCOLORKEYDATA);
 
 typedef struct _DD_GETBLTSTATUSDATA
 {
@@ -396,7 +396,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         GetBltStatus;
 } DD_GETBLTSTATUSDATA, *PDD_GETBLTSTATUSDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_GETBLTSTATUS)(PDD_GETBLTSTATUSDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_GETBLTSTATUS)(PDD_GETBLTSTATUSDATA);
 
 typedef struct _DD_GETFLIPSTATUSDATA
 {
@@ -406,7 +406,7 @@
 	HRESULT                       ddRVal;
 	PVOID                         GetFlipStatus;
 } DD_GETFLIPSTATUSDATA, *PDD_GETFLIPSTATUSDATA;
-typedef DWORD (STDCALL *PDD_SURFCB_GETFLIPSTATUS)(PDD_GETFLIPSTATUSDATA);
+typedef DWORD (WINAPI *PDD_SURFCB_GETFLIPSTATUS)(PDD_GETFLIPSTATUSDATA);
 
 typedef struct DD_SURFACECALLBACKS
 {
@@ -456,7 +456,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    CreateSurface;
 } DD_CREATESURFACEDATA, *PDD_CREATESURFACEDATA;
-typedef DWORD (STDCALL *PDD_CREATESURFACE)(PDD_CREATESURFACEDATA);
+typedef DWORD (WINAPI *PDD_CREATESURFACE)(PDD_CREATESURFACEDATA);
 
 typedef struct _DD_DRVSETCOLORKEYDATA
 {
@@ -466,7 +466,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    SetColorKey;
 } DD_DRVSETCOLORKEYDATA, *PDD_DRVSETCOLORKEYDATA;
-typedef DWORD (STDCALL *PDD_SETCOLORKEY)(PDD_DRVSETCOLORKEYDATA);
+typedef DWORD (WINAPI *PDD_SETCOLORKEY)(PDD_DRVSETCOLORKEYDATA);
 
 #define DDWAITVB_I_TESTVB    0x80000006
 
@@ -479,7 +479,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    WaitForVerticalBlank;
 } DD_WAITFORVERTICALBLANKDATA, *PDD_WAITFORVERTICALBLANKDATA;
-typedef DWORD (STDCALL *PDD_WAITFORVERTICALBLANK)(PDD_WAITFORVERTICALBLANKDATA);
+typedef DWORD (WINAPI *PDD_WAITFORVERTICALBLANK)(PDD_WAITFORVERTICALBLANKDATA);
 
 typedef struct _DD_CANCREATESURFACEDATA
 {
@@ -489,7 +489,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    CanCreateSurface;
 } DD_CANCREATESURFACEDATA, *PDD_CANCREATESURFACEDATA;
-typedef DWORD (STDCALL *PDD_CANCREATESURFACE)(PDD_CANCREATESURFACEDATA);
+typedef DWORD (WINAPI *PDD_CANCREATESURFACE)(PDD_CANCREATESURFACEDATA);
 
 typedef struct _DD_CREATEPALETTEDATA
 {
@@ -500,7 +500,7 @@
 	PVOID                    CreatePalette;
 	BOOL                     is_excl;
 } DD_CREATEPALETTEDATA, *PDD_CREATEPALETTEDATA;
-typedef DWORD (STDCALL *PDD_CREATEPALETTE)(PDD_CREATEPALETTEDATA);
+typedef DWORD (WINAPI *PDD_CREATEPALETTE)(PDD_CREATEPALETTEDATA);
 
 typedef struct _DD_GETSCANLINEDATA
 {
@@ -509,7 +509,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    GetScanLine;
 } DD_GETSCANLINEDATA, *PDD_GETSCANLINEDATA;
-typedef DWORD (STDCALL *PDD_GETSCANLINE)(PDD_GETSCANLINEDATA);
+typedef DWORD (WINAPI *PDD_GETSCANLINE)(PDD_GETSCANLINEDATA);
 
 typedef struct _DD_MAPMEMORYDATA
 {
@@ -519,7 +519,7 @@
 	FLATPTR                  fpProcess;
 	HRESULT                  ddRVal;
 } DD_MAPMEMORYDATA, *PDD_MAPMEMORYDATA;
-typedef DWORD (STDCALL *PDD_MAPMEMORY)(PDD_MAPMEMORYDATA);
+typedef DWORD (WINAPI *PDD_MAPMEMORY)(PDD_MAPMEMORYDATA);
 
 
 
@@ -566,7 +566,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    GetAvailDriverMemory;
 } DD_GETAVAILDRIVERMEMORYDATA, *PDD_GETAVAILDRIVERMEMORYDATA;
-typedef DWORD (STDCALL *PDD_GETAVAILDRIVERMEMORY)(PDD_GETAVAILDRIVERMEMORYDATA);
+typedef DWORD (WINAPI *PDD_GETAVAILDRIVERMEMORY)(PDD_GETAVAILDRIVERMEMORYDATA);
 
 typedef struct _DD_MISCELLANEOUSCALLBACKS
 {
@@ -577,7 +577,7 @@
 
 #define DDHAL_MISCCB32_GETAVAILDRIVERMEMORY 0x00000001
 
-typedef DWORD (STDCALL *PDD_ALPHABLT)(PDD_BLTDATA);
+typedef DWORD (WINAPI *PDD_ALPHABLT)(PDD_BLTDATA);
 
 typedef struct _DD_CREATESURFACEEXDATA
 {
@@ -586,7 +586,7 @@
 	PDD_SURFACE_LOCAL         lpDDSLcl;
 	HRESULT                   ddRVal;
 } DD_CREATESURFACEEXDATA, *PDD_CREATESURFACEEXDATA;
-typedef DWORD (STDCALL *PDD_CREATESURFACEEX)(PDD_CREATESURFACEEXDATA);
+typedef DWORD (WINAPI *PDD_CREATESURFACEEX)(PDD_CREATESURFACEEXDATA);
 
 typedef struct _DD_GETDRIVERSTATEDATA
 {
@@ -600,7 +600,7 @@
 	DWORD                     dwLength;
 	HRESULT                   ddRVal;
 } DD_GETDRIVERSTATEDATA, *PDD_GETDRIVERSTATEDATA;
-typedef DWORD (STDCALL *PDD_GETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA);
+typedef DWORD (WINAPI *PDD_GETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA);
 
 typedef struct _DD_DESTROYDDLOCALDATA
 {
@@ -608,7 +608,7 @@
 	PDD_DIRECTDRAW_LOCAL      pDDLcl;
 	HRESULT                   ddRVal;
 } DD_DESTROYDDLOCALDATA, *PDD_DESTROYDDLOCALDATA;
-typedef DWORD (STDCALL *PDD_DESTROYDDLOCAL)(PDD_DESTROYDDLOCALDATA);
+typedef DWORD (WINAPI *PDD_DESTROYDDLOCAL)(PDD_DESTROYDDLOCALDATA);
 
 
 
@@ -636,7 +636,7 @@
 	HRESULT               ddRVal;
 	PVOID                 FreeDriverMemory;
 } DD_FREEDRIVERMEMORYDATA, *PDD_FREEDRIVERMEMORYDATA;
-typedef DWORD (STDCALL *PDD_FREEDRIVERMEMORY)(PDD_FREEDRIVERMEMORYDATA);
+typedef DWORD (WINAPI *PDD_FREEDRIVERMEMORY)(PDD_FREEDRIVERMEMORYDATA);
 
 typedef struct _DD_SETEXCLUSIVEMODEDATA
 {
@@ -646,7 +646,7 @@
 	HRESULT               ddRVal;
 	PVOID                 SetExclusiveMode;
 } DD_SETEXCLUSIVEMODEDATA, *PDD_SETEXCLUSIVEMODEDATA;
-typedef DWORD (STDCALL *PDD_SETEXCLUSIVEMODE)(PDD_SETEXCLUSIVEMODEDATA);
+typedef DWORD (WINAPI *PDD_SETEXCLUSIVEMODE)(PDD_SETEXCLUSIVEMODEDATA);
 
 typedef struct _DD_FLIPTOGDISURFACEDATA
 {
@@ -656,7 +656,7 @@
 	HRESULT               ddRVal;
 	PVOID                 FlipToGDISurface;
 } DD_FLIPTOGDISURFACEDATA, *PDD_FLIPTOGDISURFACEDATA;
-typedef DWORD (STDCALL *PDD_FLIPTOGDISURFACE)(PDD_FLIPTOGDISURFACEDATA);
+typedef DWORD (WINAPI *PDD_FLIPTOGDISURFACE)(PDD_FLIPTOGDISURFACEDATA);
 
 
 
@@ -685,7 +685,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    DestroyPalette;
 } DD_DESTROYPALETTEDATA, *PDD_DESTROYPALETTEDATA;
-typedef DWORD (STDCALL *PDD_PALCB_DESTROYPALETTE)(PDD_DESTROYPALETTEDATA);
+typedef DWORD (WINAPI *PDD_PALCB_DESTROYPALETTE)(PDD_DESTROYPALETTEDATA);
 
 typedef struct _DD_SETENTRIESDATA
 {
@@ -697,7 +697,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    SetEntries;
 } DD_SETENTRIESDATA, *PDD_SETENTRIESDATA;
-typedef DWORD (STDCALL *PDD_PALCB_SETENTRIES)(PDD_SETENTRIESDATA);
+typedef DWORD (WINAPI *PDD_PALCB_SETENTRIES)(PDD_SETENTRIESDATA);
 
 typedef struct DD_PALETTECALLBACKS
 {
@@ -721,7 +721,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          CanCreateVideoPort;
 } DD_CANCREATEVPORTDATA, *PDD_CANCREATEVPORTDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_CANCREATEVIDEOPORT)(PDD_CANCREATEVPORTDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_CANCREATEVIDEOPORT)(PDD_CANCREATEVPORTDATA);
 
 typedef struct _DD_CREATEVPORTDATA
 {
@@ -731,7 +731,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          CreateVideoPort;
 } DD_CREATEVPORTDATA, *PDD_CREATEVPORTDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_CREATEVIDEOPORT)(PDD_CREATEVPORTDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_CREATEVIDEOPORT)(PDD_CREATEVPORTDATA);
 
 typedef struct _DD_FLIPVPORTDATA
 {
@@ -742,7 +742,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          FlipVideoPort;
 } DD_FLIPVPORTDATA, *PDD_FLIPVPORTDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_FLIP)(PDD_FLIPVPORTDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_FLIP)(PDD_FLIPVPORTDATA);
 
 typedef struct _DD_GETVPORTBANDWIDTHDATA
 {
@@ -756,7 +756,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoPortBandwidth;
 } DD_GETVPORTBANDWIDTHDATA, *PDD_GETVPORTBANDWIDTHDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETBANDWIDTH)(PDD_GETVPORTBANDWIDTHDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETBANDWIDTH)(PDD_GETVPORTBANDWIDTHDATA);
 
 typedef struct _DD_GETVPORTINPUTFORMATDATA
 {
@@ -768,7 +768,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoPortInputFormats;
 } DD_GETVPORTINPUTFORMATDATA, *PDD_GETVPORTINPUTFORMATDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETINPUTFORMATS)(PDD_GETVPORTINPUTFORMATDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETINPUTFORMATS)(PDD_GETVPORTINPUTFORMATDATA);
 
 typedef struct _DD_GETVPORTOUTPUTFORMATDATA
 {
@@ -781,7 +781,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoPortInputFormats;
 } DD_GETVPORTOUTPUTFORMATDATA, *PDD_GETVPORTOUTPUTFORMATDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETOUTPUTFORMATS)(PDD_GETVPORTOUTPUTFORMATDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETOUTPUTFORMATS)(PDD_GETVPORTOUTPUTFORMATDATA);
 
 typedef struct _DD_GETVPORTFIELDDATA
 {
@@ -791,7 +791,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoPortField;
 } DD_GETVPORTFIELDDATA, *PDD_GETVPORTFIELDDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETFIELD)(PDD_GETVPORTFIELDDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETFIELD)(PDD_GETVPORTFIELDDATA);
 
 typedef struct _DD_GETVPORTLINEDATA
 {
@@ -801,7 +801,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoPortLine;
 } DD_GETVPORTLINEDATA, *PDD_GETVPORTLINEDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETLINE)(PDD_GETVPORTLINEDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETLINE)(PDD_GETVPORTLINEDATA);
 
 typedef struct _DD_GETVPORTCONNECTDATA
 {
@@ -812,7 +812,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoPortConnectInfo;
 } DD_GETVPORTCONNECTDATA, *PDD_GETVPORTCONNECTDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETVPORTCONNECT)(PDD_GETVPORTCONNECTDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETVPORTCONNECT)(PDD_GETVPORTCONNECTDATA);
 
 typedef struct _DD_DESTROYVPORTDATA
 {
@@ -821,7 +821,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          DestroyVideoPort;
 } DD_DESTROYVPORTDATA, *PDD_DESTROYVPORTDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_DESTROYVPORT)(PDD_DESTROYVPORTDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_DESTROYVPORT)(PDD_DESTROYVPORTDATA);
 
 typedef struct _DD_GETVPORTFLIPSTATUSDATA
 {
@@ -830,7 +830,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoPortFlipStatus;
 } DD_GETVPORTFLIPSTATUSDATA, *PDD_GETVPORTFLIPSTATUSDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETFLIPSTATUS)(PDD_GETVPORTFLIPSTATUSDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETFLIPSTATUS)(PDD_GETVPORTFLIPSTATUSDATA);
 
 
 
@@ -847,7 +847,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          UpdateVideoPort;
 } DD_UPDATEVPORTDATA, *PDD_UPDATEVPORTDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_UPDATE)(PDD_UPDATEVPORTDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_UPDATE)(PDD_UPDATEVPORTDATA);
 
 typedef struct _DD_WAITFORVPORTSYNCDATA
 {
@@ -859,7 +859,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          UpdateVideoPort;
 } DD_WAITFORVPORTSYNCDATA, *PDD_WAITFORVPORTSYNCDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_WAITFORSYNC)(PDD_WAITFORVPORTSYNCDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_WAITFORSYNC)(PDD_WAITFORVPORTSYNCDATA);
 
 typedef struct _DD_GETVPORTSIGNALDATA
 {
@@ -869,7 +869,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          GetVideoSignalStatus;
 } DD_GETVPORTSIGNALDATA, *PDD_GETVPORTSIGNALDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_GETSIGNALSTATUS)(PDD_GETVPORTSIGNALDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_GETSIGNALSTATUS)(PDD_GETVPORTSIGNALDATA);
 
 
 
@@ -882,7 +882,7 @@
 	HRESULT                        ddRVal;
 	PVOID                          ColorControl;
 } DD_VPORTCOLORDATA, *PDD_VPORTCOLORDATA;
-typedef DWORD (STDCALL *PDD_VPORTCB_COLORCONTROL)(PDD_VPORTCOLORDATA);
+typedef DWORD (WINAPI *PDD_VPORTCB_COLORCONTROL)(PDD_VPORTCOLORDATA);
 
 
 typedef struct DD_VIDEOPORTCALLBACKS
@@ -940,7 +940,7 @@
 	HRESULT                  ddRVal;
 	PVOID                    ColorControl;
 } DD_COLORCONTROLDATA, *PDD_COLORCONTROLDATA;
-typedef DWORD (STDCALL *PDD_COLORCB_COLORCONTROL)(PDD_COLORCONTROLDATA);
+typedef DWORD (WINAPI *PDD_COLORCB_COLORCONTROL)(PDD_COLORCONTROLDATA);
 
 
 
@@ -964,7 +964,7 @@
 	GUID                        *lpGuids;
 	HRESULT                      ddRVal;
 } DD_GETMOCOMPGUIDSDATA, *PDD_GETMOCOMPGUIDSDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_GETGUIDS)(PDD_GETMOCOMPGUIDSDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_GETGUIDS)(PDD_GETMOCOMPGUIDSDATA);
 
 typedef struct _DD_GETMOCOMPFORMATSDATA
 {
@@ -974,7 +974,7 @@
 	LPDDPIXELFORMAT              lpFormats;
 	HRESULT                      ddRVal;
 } DD_GETMOCOMPFORMATSDATA, *PDD_GETMOCOMPFORMATSDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_GETFORMATS)(PDD_GETMOCOMPFORMATSDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_GETFORMATS)(PDD_GETMOCOMPFORMATSDATA);
 
 typedef struct _DD_CREATEMOCOMPDATA
 {
@@ -988,7 +988,7 @@
 	DWORD                        dwDataSize;
 	HRESULT                      ddRVal;
 } DD_CREATEMOCOMPDATA, *PDD_CREATEMOCOMPDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_CREATE)(PDD_CREATEMOCOMPDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_CREATE)(PDD_CREATEMOCOMPDATA);
 
 typedef struct _DDCOMPBUFFERINFO
 {
@@ -1012,7 +1012,7 @@
 	LPDDCOMPBUFFERINFO            lpCompBuffInfo;
 	HRESULT                      ddRVal;
 } DD_GETMOCOMPCOMPBUFFDATA, *PDD_GETMOCOMPCOMPBUFFDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_GETCOMPBUFFINFO)(PDD_GETMOCOMPCOMPBUFFDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_GETCOMPBUFFINFO)(PDD_GETMOCOMPCOMPBUFFDATA);
 
 typedef struct _DD_GETINTERNALMOCOMPDATA
 {
@@ -1024,7 +1024,7 @@
 	DWORD                        dwScratchMemAlloc;
 	HRESULT                      ddRVal;
 } DD_GETINTERNALMOCOMPDATA, *PDD_GETINTERNALMOCOMPDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_GETINTERNALINFO)(PDD_GETINTERNALMOCOMPDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_GETINTERNALINFO)(PDD_GETINTERNALMOCOMPDATA);
 
 typedef struct _DD_BEGINMOCOMPFRAMEDATA
 {
@@ -1037,7 +1037,7 @@
 	LPVOID                       lpOutputData;
 	HRESULT                      ddRVal;
 } DD_BEGINMOCOMPFRAMEDATA, *PDD_BEGINMOCOMPFRAMEDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_BEGINFRAME)(PDD_BEGINMOCOMPFRAMEDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_BEGINFRAME)(PDD_BEGINMOCOMPFRAMEDATA);
 
 typedef struct _DD_ENDMOCOMPFRAMEDATA
 {
@@ -1047,7 +1047,7 @@
 	DWORD                        dwInputDataSize;
 	HRESULT                      ddRVal;
 } DD_ENDMOCOMPFRAMEDATA, *PDD_ENDMOCOMPFRAMEDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_ENDFRAME)(PDD_ENDMOCOMPFRAMEDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_ENDFRAME)(PDD_ENDMOCOMPFRAMEDATA);
 
 typedef struct _DDMOCOMPBUFFERINFO
 {
@@ -1071,7 +1071,7 @@
 	DWORD                        dwOutputDataSize;
 	HRESULT                      ddRVal;
 } DD_RENDERMOCOMPDATA, *PDD_RENDERMOCOMPDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_RENDER)(PDD_RENDERMOCOMPDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_RENDER)(PDD_RENDERMOCOMPDATA);
 
 #define DDMCQUERY_READ 0x00000001
 
@@ -1083,7 +1083,7 @@
 	DWORD                        dwFlags;
 	HRESULT                      ddRVal;
 } DD_QUERYMOCOMPSTATUSDATA, *PDD_QUERYMOCOMPSTATUSDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_QUERYSTATUS)(PDD_QUERYMOCOMPSTATUSDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_QUERYSTATUS)(PDD_QUERYMOCOMPSTATUSDATA);
 
 typedef struct _DD_DESTROYMOCOMPDATA
 {
@@ -1091,7 +1091,7 @@
 	PDD_MOTIONCOMP_LOCAL         lpMoComp;
 	HRESULT                      ddRVal;
 } DD_DESTROYMOCOMPDATA, *PDD_DESTROYMOCOMPDATA;
-typedef DWORD (STDCALL *PDD_MOCOMPCB_DESTROY)(PDD_DESTROYMOCOMPDATA);
+typedef DWORD (WINAPI *PDD_MOCOMPCB_DESTROY)(PDD_DESTROYMOCOMPDATA);
 
 
 
@@ -1154,7 +1154,7 @@
 	DWORD   dwActualSize;
 	HRESULT ddRVal;
 } DD_GETDRIVERINFODATA, *PDD_GETDRIVERINFODATA;
-typedef DWORD (STDCALL *PDD_GETDRIVERINFO)(PDD_GETDRIVERINFODATA);
+typedef DWORD (WINAPI *PDD_GETDRIVERINFO)(PDD_GETDRIVERINFODATA);
 
 
 
@@ -1283,7 +1283,7 @@
     ULONG                 dwDriverReserved4;
     HRESULT               ddRVal;
 } DD_SYNCSURFACEDATA, *PDD_SYNCSURFACEDATA;
-typedef DWORD (STDCALL *PDD_KERNELCB_SYNCSURFACE)(PDD_SYNCSURFACEDATA);
+typedef DWORD (WINAPI *PDD_KERNELCB_SYNCSURFACE)(PDD_SYNCSURFACEDATA);
 
 typedef struct _DD_SYNCVIDEOPORTDATA
 {
@@ -1297,7 +1297,7 @@
     ULONG                 dwDriverReserved3;
     HRESULT               ddRVal;
 } DD_SYNCVIDEOPORTDATA, *PDD_SYNCVIDEOPORTDATA;
-typedef DWORD (STDCALL *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA);
+typedef DWORD (WINAPI *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA);
 
 
 typedef struct DD_NTPRIVATEDRIVERCAPS

Modified: trunk/reactos/include/ddk/ntddpcm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddpcm.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -94,7 +94,7 @@
 
 typedef ULONG MEMORY_SPACE;
 
-typedef ULONG STDCALL
+typedef ULONG NTAPI
 (*PPCMCIA_READ_WRITE_CONFIG)(
   IN PVOID  Context,
   IN ULONG  WhichSpace,
@@ -121,7 +121,7 @@
 #define PCMCIA_MEMORY_8BIT_ACCESS         0
 #define PCMCIA_MEMORY_16BIT_ACCESS        1
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN NTAPI
 (*PPCMCIA_MODIFY_MEMORY_WINDOW)(
   IN PVOID  Context,
   IN ULONGLONG  HostBase,
@@ -136,12 +136,12 @@
 #define PCMCIA_VPP_12V                    1
 #define PCMCIA_VPP_IS_VCC                 2
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN NTAPI
 (*PPCMCIA_SET_VPP)(
   IN PVOID  Context,
   IN UCHAR  VppLevel);
 
-typedef BOOLEAN STDCALL
+typedef BOOLEAN NTAPI
 (*PPCMCIA_IS_WRITE_PROTECTED)(
   IN PVOID  Context);
 

Modified: trunk/reactos/include/ddk/ntddser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddser.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/ntddser.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddser.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -369,11 +369,11 @@
 	USHORT  Reserved[1];
 } SERENUM_PORT_DESC, *PSERENUM_PORT_DESC;
 
-typedef UCHAR STDCALL
+typedef UCHAR NTAPI
 (*PSERENUM_READPORT)(
   PVOID  SerPortAddress);
 
-typedef VOID STDCALL
+typedef VOID NTAPI
 (*PSERENUM_WRITEPORT)(
   PVOID  SerPortAddress,
   UCHAR  Value);

Modified: trunk/reactos/include/ddk/pfhook.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/pfhook.h?rev=3…
==============================================================================
--- trunk/reactos/include/ddk/pfhook.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/pfhook.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -45,7 +45,7 @@
 	PF_ICMP_ON_DROP = 3
 } PF_FORWARD_ACTION;
 
-typedef PF_FORWARD_ACTION STDCALL
+typedef PF_FORWARD_ACTION NTAPI
 (*PacketFilterExtensionPtr)(
   IN unsigned char  *PacketHeader,
   IN unsigned char  *Packet,

Modified: trunk/reactos/include/ddk/smbus.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=37…
==============================================================================
--- trunk/reactos/include/ddk/smbus.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/smbus.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -86,7 +86,7 @@
   UCHAR  Data[SMB_MAX_DATA_SIZE];
 } SMB_REQUEST, *PSMB_REQUEST;
 
-typedef VOID STDCALL
+typedef VOID NTAPI
 (*SMB_ALARM_NOTIFY)(
   PVOID  Context,
   UCHAR  Address,

Modified: trunk/reactos/include/ddk/usbioctl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbioctl.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/usbioctl.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/usbioctl.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -237,7 +237,7 @@
 	UsbMIParent
 } USB_HUB_NODE;
 
-typedef VOID STDCALL
+typedef VOID NTAPI
 (*USB_IDLE_CALLBACK)(
   PVOID  Context);
 

Modified: trunk/reactos/include/ddk/ws2san.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ws2san.h?rev=3…
==============================================================================
--- trunk/reactos/include/ddk/ws2san.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ws2san.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#define WSPAPI STDCALL
+#define WSPAPI WINAPI
 
 /* FIXME: Unknown definitions */
 typedef PVOID LPWSPDATA;

Modified: trunk/reactos/include/psdk/accctrl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/accctrl.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/accctrl.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/accctrl.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -358,12 +358,12 @@
     ProgressRetryOperation
 } PROG_INVOKE_SETTING, *PPROG_INVOKE_SETTING;
 
-typedef VOID (STDCALL *FN_PROGRESSW)(LPWSTR pObjectName,
+typedef VOID (WINAPI *FN_PROGRESSW)(LPWSTR pObjectName,
                                      DWORD Status,
                                      PPROG_INVOKE_SETTING pInvokeSetting,
                                      PVOID Args,
                                      BOOL SecuritySet);
-typedef VOID (STDCALL *FN_PROGRESSA)(LPSTR pObjectName,
+typedef VOID (WINAPI *FN_PROGRESSA)(LPSTR pObjectName,
                                      DWORD Status,
                                      PPROG_INVOKE_SETTING pInvokeSetting,
                                      PVOID Args,

Modified: trunk/reactos/include/psdk/ddrawgdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?re…
==============================================================================
--- trunk/reactos/include/psdk/ddrawgdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ddrawgdi.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -49,14 +49,14 @@
 #endif
 
 BOOL
-STDCALL
+WINAPI
 DdCreateDirectDrawObject(
     LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
     HDC hdc
 );
 
 BOOL
-STDCALL
+WINAPI
 DdQueryDirectDrawObject(
     LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
     LPDDHALINFO pHalInfo,
@@ -72,46 +72,46 @@
 );
 
 BOOL
-STDCALL
+WINAPI
 DdDeleteDirectDrawObject(
     LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal
 );
 
 BOOL
-STDCALL
+WINAPI
 DdCreateSurfaceObject(
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
     BOOL bPrimarySurface
 );
 
 BOOL
-STDCALL
+WINAPI
 DdDeleteSurfaceObject(
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
 );
 
 BOOL
-STDCALL
+WINAPI
 DdResetVisrgn(
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
     HWND hWnd
 );
 
 HDC
-STDCALL
+WINAPI
 DdGetDC(
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal,
     LPPALETTEENTRY pColorTable
 );
 
 BOOL
-STDCALL
+WINAPI
 DdReleaseDC(
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal
 );
 
 HBITMAP
-STDCALL
+WINAPI
 DdCreateDIBSection(
     HDC hdc,
     CONST BITMAPINFO *pbmi,
@@ -122,32 +122,32 @@
 );
 
 BOOL
-STDCALL
+WINAPI
 DdReenableDirectDrawObject(
     LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
     BOOL *pbNewMode
 );
 
 BOOL
-STDCALL
+WINAPI
 DdAttachSurface(
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom,
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo
 );
 
 VOID
-STDCALL
+WINAPI
 DdUnattachSurface(
     LPDDRAWI_DDRAWSURFACE_LCL pSurface,
     LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached
 );
 
 ULONG
-STDCALL
+WINAPI
 DdQueryDisplaySettingsUniqueness(VOID);
 
 HANDLE
-STDCALL
+WINAPI
 DdGetDxHandle(
     LPDDRAWI_DIRECTDRAW_LCL pDDraw,
     LPDDRAWI_DDRAWSURFACE_LCL pSurface,
@@ -155,7 +155,7 @@
 );
 
 BOOL
-STDCALL
+WINAPI
 DdSetGammaRamp(
     LPDDRAWI_DIRECTDRAW_LCL pDDraw,
     HDC hdc,
@@ -163,7 +163,7 @@
 );
 
 DWORD
-STDCALL
+WINAPI
 DdSwapTextureHandles(
     LPDDRAWI_DIRECTDRAW_LCL pDDraw,
     LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,

Modified: trunk/reactos/include/psdk/dhcpcapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dhcpcapi.h?re…
==============================================================================
--- trunk/reactos/include/psdk/dhcpcapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/dhcpcapi.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -8,9 +8,9 @@
 extern "C" {
 #endif
 
-    VOID STDCALL DhcpLeaseIpAddress( ULONG AdapterIndex );
-    VOID STDCALL DhcpReleaseIpAddressLease( ULONG AdapterIndex );
-    VOID STDCALL DhcpStaticRefreshParams
+    VOID WINAPI DhcpLeaseIpAddress( ULONG AdapterIndex );
+    VOID WINAPI DhcpReleaseIpAddressLease( ULONG AdapterIndex );
+    VOID WINAPI DhcpStaticRefreshParams
     ( ULONG AdapterIndex, ULONG IpAddress, ULONG NetMask );
 
 #ifdef __cplusplus

Modified: trunk/reactos/include/psdk/icmpapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/icmpapi.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/icmpapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/icmpapi.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -21,19 +21,19 @@
 #ifndef __WINE_ICMPAPI_H
 #define __WINE_ICMPAPI_H
 
-HANDLE STDCALL  IcmpCreateFile(
+HANDLE WINAPI  IcmpCreateFile(
     VOID
     );
 
-HANDLE STDCALL  Icmp6CreateFile(
+HANDLE WINAPI  Icmp6CreateFile(
     VOID
     );
 
-BOOL STDCALL  IcmpCloseHandle(
+BOOL WINAPI  IcmpCloseHandle(
     HANDLE  IcmpHandle
     );
 
-DWORD STDCALL  IcmpSendEcho(
+DWORD WINAPI  IcmpSendEcho(
     HANDLE                 IcmpHandle,
     IPAddr                 DestinationAddress,
     LPVOID                 RequestData,
@@ -45,7 +45,7 @@
     );
 
 DWORD
-STDCALL
+WINAPI
 IcmpSendEcho2(
     HANDLE                   IcmpHandle,
     HANDLE                   Event,
@@ -61,7 +61,7 @@
     );
 
 DWORD
-STDCALL
+WINAPI
 Icmp6SendEcho2(
     HANDLE                   IcmpHandle,
     HANDLE                   Event,
@@ -78,14 +78,14 @@
     );
 
 DWORD
-STDCALL
+WINAPI
 IcmpParseReplies(
     LPVOID                   ReplyBuffer,
     DWORD                    ReplySize
     );
 
 DWORD
-STDCALL
+WINAPI
 Icmp6ParseReplies(
     LPVOID                   ReplyBuffer,
     DWORD                    ReplySize

Modified: trunk/reactos/include/psdk/imagehlp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re…
==============================================================================
--- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -106,7 +106,7 @@
 	BindMismatchedSymbols,
 	BindSymbolsNotUpdated
 } IMAGEHLP_STATUS_REASON;
-typedef
BOOL(STDCALL*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG);
+typedef
BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG);
 typedef struct _LOADED_IMAGE {
 	LPSTR ModuleName;
 	HANDLE hFile;
@@ -185,10 +185,10 @@
 	DWORD Reserved[3];
 	KDHELP KdHelp;
 } STACKFRAME,*LPSTACKFRAME;
-typedef BOOL(STDCALL*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE
,LPCVOID,LPVOID,DWORD,LPDWORD);
-typedef LPVOID(STDCALL*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD);
-typedef DWORD(STDCALL*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD);
-typedef DWORD(STDCALL*PTRANSLATE_ADDRESS_ROUTINE)(HANDLE,HANDLE,LPADDRESS);
+typedef BOOL(WINAPI*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD);
+typedef LPVOID(WINAPI*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD);
+typedef DWORD(WINAPI*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD);
+typedef DWORD(WINAPI*PTRANSLATE_ADDRESS_ROUTINE)(HANDLE,HANDLE,LPADDRESS);
 typedef struct API_VERSION {
 	USHORT MajorVersion;
 	USHORT MinorVersion;

Modified: trunk/reactos/include/psdk/netcon.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/netcon.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -248,6 +248,6 @@
 EXTERN_C const IID IID_INetConnectionPropertyUi2;
 
 
-VOID STDCALL NcFreeNetconProperties (NETCON_PROPERTIES* pProps);
-
-#endif
+VOID WINAPI NcFreeNetconProperties (NETCON_PROPERTIES* pProps);
+
+#endif

Modified: trunk/reactos/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -124,7 +124,6 @@
 #define CDECL _cdecl
 
 #if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)
-#define STDCALL __stdcall // FIXME: Non-standard, should be deprecated
 #define CALLBACK    __stdcall
 #define WINAPI      __stdcall
 #define WINAPIV     __cdecl
@@ -132,7 +131,6 @@
 #define APIPRIVATE  __stdcall
 #define PASCAL      __stdcall
 #else
-#define STDCALL
 #define CALLBACK
 #define WINAPI
 #define WINAPIV

Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3…
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -4590,7 +4590,7 @@
 
 NTSYSAPI
 SIZE_T
-STDCALL
+NTAPI
 RtlCompareMemory (
     const VOID *Source1,
     const VOID *Source2,

Modified: trunk/reactos/include/psdk/winscard.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winscard.h?re…
==============================================================================
--- trunk/reactos/include/psdk/winscard.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winscard.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -134,62 +134,62 @@
   BYTE rgbMask[36];
 } SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK;
 
-HANDLE STDCALL SCardAccessStartedEvent(VOID);
-LONG STDCALL SCardAddReaderToGroupA(SCARDCONTEXT, LPCSTR, LPCSTR);
-LONG STDCALL SCardAddReaderToGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR);
-LONG STDCALL SCardBeginTransaction(SCARDHANDLE);
-LONG STDCALL SCardCancel(SCARDCONTEXT);
-LONG STDCALL SCardConnectA(SCARDCONTEXT, LPCSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD);
-LONG STDCALL SCardConnectW(SCARDCONTEXT, LPCWSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD);
-LONG STDCALL SCardControl(SCARDHANDLE, DWORD, LPCVOID, DWORD, LPVOID, DWORD, LPDWORD);
-LONG STDCALL SCardDisconnect(SCARDHANDLE, DWORD);
-LONG STDCALL SCardEndTransaction(SCARDHANDLE, DWORD);
-LONG STDCALL SCardEstablishContext(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT);
-LONG STDCALL SCardForgetCardTypeA(SCARDCONTEXT, LPCSTR);
-LONG STDCALL SCardForgetCardTypeW(SCARDCONTEXT, LPCWSTR);
-LONG STDCALL SCardForgetReaderA(SCARDCONTEXT, LPCSTR);
-LONG STDCALL SCardForgetReaderW(SCARDCONTEXT, LPCWSTR);
-LONG STDCALL SCardForgetReaderGroupA(SCARDCONTEXT, LPCSTR);
-LONG STDCALL SCardForgetReaderGroupW(SCARDCONTEXT, LPCWSTR);
-LONG STDCALL SCardFreeMemory(SCARDCONTEXT, LPCVOID);
-LONG STDCALL SCardGetAttrib(SCARDHANDLE, DWORD, LPBYTE, LPDWORD);
-LONG STDCALL SCardGetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPSTR, LPDWORD);
-LONG STDCALL SCardGetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPWSTR,
LPDWORD);
-LONG STDCALL SCardGetProviderIdA(SCARDCONTEXT, LPCSTR, LPGUID);
-LONG STDCALL SCardGetProviderIdW(SCARDCONTEXT, LPCWSTR, LPGUID);
-LONG STDCALL SCardGetStatusChangeA(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEA, DWORD);
-LONG STDCALL SCardGetStatusChangeW(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEW, DWORD);
-LONG STDCALL SCardIntroduceCardTypeA(SCARDCONTEXT, LPCSTR, LPCGUID, LPCGUID, DWORD,
LPCBYTE, LPCBYTE, DWORD);
-LONG STDCALL SCardIntroduceCardTypeW(SCARDCONTEXT, LPCWSTR, LPCGUID, LPCGUID, DWORD,
LPCBYTE, LPCBYTE, DWORD);
-LONG STDCALL SCardIntroduceReaderA(SCARDCONTEXT, LPCSTR, LPCSTR);
-LONG STDCALL SCardIntroduceReaderW(SCARDCONTEXT, LPCWSTR, LPCWSTR);
-LONG STDCALL SCardIntroduceReaderGroupA(SCARDCONTEXT, LPCSTR);
-LONG STDCALL SCardIntroduceReaderGroupW(SCARDCONTEXT, LPCWSTR);
-LONG STDCALL SCardIsValidContext(SCARDCONTEXT);
-LONG STDCALL SCardListCardsA(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCSTR, LPDWORD);
-LONG STDCALL SCardListCardsW(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCWSTR, LPDWORD);
-LONG STDCALL SCardListInterfacesA(SCARDCONTEXT, LPCSTR, LPGUID, LPDWORD);
-LONG STDCALL SCardListInterfacesW(SCARDCONTEXT, LPCWSTR, LPGUID, LPDWORD);
-LONG STDCALL SCardListReaderGroupsA(SCARDCONTEXT, LPSTR, LPDWORD);
-LONG STDCALL SCardListReaderGroupsW(SCARDCONTEXT, LPWSTR, LPDWORD);
-LONG STDCALL SCardListReadersA(SCARDCONTEXT, LPCSTR, LPSTR, LPDWORD);
-LONG STDCALL SCardListReadersW(SCARDCONTEXT, LPCWSTR, LPWSTR, LPDWORD);
-LONG STDCALL SCardLocateCardsA(SCARDCONTEXT, LPCSTR, LPSCARD_READERSTATEA, DWORD);
-LONG STDCALL SCardLocateCardsW(SCARDCONTEXT, LPCWSTR, LPSCARD_READERSTATEW, DWORD);
-LONG STDCALL SCardLocateCardsByATRA(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD,
LPSCARD_READERSTATEA, DWORD);
-LONG STDCALL SCardLocateCardsByATRW(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD,
LPSCARD_READERSTATEW, DWORD);
-LONG STDCALL SCardReconnect(SCARDHANDLE, DWORD, DWORD, DWORD, LPDWORD);
-LONG STDCALL SCardReleaseContext(SCARDCONTEXT);
-VOID STDCALL SCardReleaseStartedEvent(HANDLE);
-LONG STDCALL SCardRemoveReaderFromGroupA(SCARDCONTEXT, LPCSTR, LPCSTR);
-LONG STDCALL SCardRemoveReaderFromGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR);
-LONG STDCALL SCardSetAttrib(SCARDHANDLE, DWORD, LPCBYTE, DWORD);
-LONG STDCALL SCardSetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPCSTR);
-LONG STDCALL SCardSetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPCWSTR);
-LONG STDCALL SCardState(SCARDHANDLE, LPDWORD, LPDWORD, LPBYTE, LPDWORD);
-LONG STDCALL SCardStatusA(SCARDHANDLE, LPSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE,
LPDWORD);
-LONG STDCALL SCardStatusW(SCARDHANDLE, LPWSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE,
LPDWORD);
-LONG STDCALL SCardTransmit(SCARDHANDLE, LPCSCARD_IO_REQUEST, LPCBYTE, DWORD,
LPSCARD_IO_REQUEST, LPBYTE, LPDWORD);
+HANDLE WINAPI SCardAccessStartedEvent(VOID);
+LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT, LPCSTR, LPCSTR);
+LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR);
+LONG WINAPI SCardBeginTransaction(SCARDHANDLE);
+LONG WINAPI SCardCancel(SCARDCONTEXT);
+LONG WINAPI SCardConnectA(SCARDCONTEXT, LPCSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD);
+LONG WINAPI SCardConnectW(SCARDCONTEXT, LPCWSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD);
+LONG WINAPI SCardControl(SCARDHANDLE, DWORD, LPCVOID, DWORD, LPVOID, DWORD, LPDWORD);
+LONG WINAPI SCardDisconnect(SCARDHANDLE, DWORD);
+LONG WINAPI SCardEndTransaction(SCARDHANDLE, DWORD);
+LONG WINAPI SCardEstablishContext(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT);
+LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT, LPCSTR);
+LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT, LPCWSTR);
+LONG WINAPI SCardForgetReaderA(SCARDCONTEXT, LPCSTR);
+LONG WINAPI SCardForgetReaderW(SCARDCONTEXT, LPCWSTR);
+LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT, LPCSTR);
+LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT, LPCWSTR);
+LONG WINAPI SCardFreeMemory(SCARDCONTEXT, LPCVOID);
+LONG WINAPI SCardGetAttrib(SCARDHANDLE, DWORD, LPBYTE, LPDWORD);
+LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPSTR, LPDWORD);
+LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPWSTR,
LPDWORD);
+LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT, LPCSTR, LPGUID);
+LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT, LPCWSTR, LPGUID);
+LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEA, DWORD);
+LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEW, DWORD);
+LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT, LPCSTR, LPCGUID, LPCGUID, DWORD,
LPCBYTE, LPCBYTE, DWORD);
+LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT, LPCWSTR, LPCGUID, LPCGUID, DWORD,
LPCBYTE, LPCBYTE, DWORD);
+LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT, LPCSTR, LPCSTR);
+LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT, LPCWSTR, LPCWSTR);
+LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT, LPCSTR);
+LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT, LPCWSTR);
+LONG WINAPI SCardIsValidContext(SCARDCONTEXT);
+LONG WINAPI SCardListCardsA(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCSTR, LPDWORD);
+LONG WINAPI SCardListCardsW(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCWSTR, LPDWORD);
+LONG WINAPI SCardListInterfacesA(SCARDCONTEXT, LPCSTR, LPGUID, LPDWORD);
+LONG WINAPI SCardListInterfacesW(SCARDCONTEXT, LPCWSTR, LPGUID, LPDWORD);
+LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT, LPSTR, LPDWORD);
+LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT, LPWSTR, LPDWORD);
+LONG WINAPI SCardListReadersA(SCARDCONTEXT, LPCSTR, LPSTR, LPDWORD);
+LONG WINAPI SCardListReadersW(SCARDCONTEXT, LPCWSTR, LPWSTR, LPDWORD);
+LONG WINAPI SCardLocateCardsA(SCARDCONTEXT, LPCSTR, LPSCARD_READERSTATEA, DWORD);
+LONG WINAPI SCardLocateCardsW(SCARDCONTEXT, LPCWSTR, LPSCARD_READERSTATEW, DWORD);
+LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD,
LPSCARD_READERSTATEA, DWORD);
+LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD,
LPSCARD_READERSTATEW, DWORD);
+LONG WINAPI SCardReconnect(SCARDHANDLE, DWORD, DWORD, DWORD, LPDWORD);
+LONG WINAPI SCardReleaseContext(SCARDCONTEXT);
+VOID WINAPI SCardReleaseStartedEvent(HANDLE);
+LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT, LPCSTR, LPCSTR);
+LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR);
+LONG WINAPI SCardSetAttrib(SCARDHANDLE, DWORD, LPCBYTE, DWORD);
+LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPCSTR);
+LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPCWSTR);
+LONG WINAPI SCardState(SCARDHANDLE, LPDWORD, LPDWORD, LPBYTE, LPDWORD);
+LONG WINAPI SCardStatusA(SCARDHANDLE, LPSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE,
LPDWORD);
+LONG WINAPI SCardStatusW(SCARDHANDLE, LPWSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE,
LPDWORD);
+LONG WINAPI SCardTransmit(SCARDHANDLE, LPCSCARD_IO_REQUEST, LPCBYTE, DWORD,
LPSCARD_IO_REQUEST, LPBYTE, LPDWORD);
 
 #ifndef _DISABLE_TIDENTS
 

Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/direct…
==============================================================================
--- trunk/reactos/include/reactos/dll/directx/d3d8thk.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/dll/directx/d3d8thk.h [iso-8859-1] Sun Nov 30 07:46:35
2008
@@ -9,7 +9,7 @@
 extern "C" {
 #endif
 
-BOOL STDCALL OsThunkD3dContextCreate(
+BOOL WINAPI OsThunkD3dContextCreate(
     HANDLE hDirectDrawLocal,
     HANDLE hSurfColor,
     HANDLE hSurfZ,
@@ -17,15 +17,15 @@
 );
 
 
-DWORD STDCALL OsThunkD3dContextDestroy(
+DWORD WINAPI OsThunkD3dContextDestroy(
     LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData
 );
 
-DWORD STDCALL OsThunkD3dContextDestroyAll(
+DWORD WINAPI OsThunkD3dContextDestroyAll(
     LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData
 );
 
-DWORD STDCALL OsThunkD3dDrawPrimitives2(
+DWORD WINAPI OsThunkD3dDrawPrimitives2(
     HANDLE hCmdBuf,
     HANDLE hVBuf,
     LPD3DNTHAL_DRAWPRIMITIVES2DATA pded,
@@ -35,51 +35,51 @@
     DWORD *pdwSizeVtx
 );
 
-DWORD STDCALL OsThunkD3dValidateTextureStageState(
+DWORD WINAPI OsThunkD3dValidateTextureStageState(
     LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData
 );
 
 
-DWORD STDCALL OsThunkDdAddAttachedSurface(
+DWORD WINAPI OsThunkDdAddAttachedSurface(
     HANDLE hSurface,
     HANDLE hSurfaceAttached,
     PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData
 );
 
-DWORD STDCALL OsThunkDdAlphaBlt(VOID);
-
-BOOL STDCALL OsThunkDdAttachSurface(
+DWORD WINAPI OsThunkDdAlphaBlt(VOID);
+
+BOOL WINAPI OsThunkDdAttachSurface(
     HANDLE hSurfaceFrom,
     HANDLE hSurfaceTo
 );
 
-DWORD STDCALL OsThunkDdBeginMoCompFrame(
+DWORD WINAPI OsThunkDdBeginMoCompFrame(
     HANDLE hMoComp,
     PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData
 );
 
-DWORD STDCALL OsThunkDdBlt(
+DWORD WINAPI OsThunkDdBlt(
     HANDLE hSurfaceDest,
     HANDLE hSurfaceSrc,
     PDD_BLTDATA puBltData
 );
 
-DWORD STDCALL OsThunkDdCanCreateD3DBuffer(
+DWORD WINAPI OsThunkDdCanCreateD3DBuffer(
     HANDLE hDirectDraw,
     PDD_CANCREATESURFACEDATA puCanCreateSurfaceData
 );
 
-DWORD STDCALL OsThunkDdCanCreateSurface(
+DWORD WINAPI OsThunkDdCanCreateSurface(
     HANDLE hDirectDraw,
     PDD_CANCREATESURFACEDATA puCanCreateSurfaceData
 );
 
-DWORD STDCALL OsThunkDdColorControl(
+DWORD WINAPI OsThunkDdColorControl(
     HANDLE hSurface,
     PDD_COLORCONTROLDATA puColorControlData
 );
 
-DWORD STDCALL OsThunkDdCreateD3DBuffer(
+DWORD WINAPI OsThunkDdCreateD3DBuffer(
     HANDLE hDirectDraw,
     HANDLE *hSurface,
     DDSURFACEDESC *puSurfaceDescription,
@@ -90,14 +90,14 @@
     HANDLE *puhSurface
 );
 
-HANDLE STDCALL OsThunkDdCreateDirectDrawObject(HDC hdc);
-
-HANDLE STDCALL OsThunkDdCreateMoComp(
+HANDLE WINAPI OsThunkDdCreateDirectDrawObject(HDC hdc);
+
+HANDLE WINAPI OsThunkDdCreateMoComp(
     HANDLE hDirectDraw,
     PDD_CREATEMOCOMPDATA puCreateMoCompData
 );
 
-DWORD STDCALL OsThunkDdCreateSurface(
+DWORD WINAPI OsThunkDdCreateSurface(
     HANDLE hDirectDraw,
     HANDLE *hSurface,
     DDSURFACEDESC *puSurfaceDescription,
@@ -108,13 +108,13 @@
     HANDLE *puhSurface
 );
 
-DWORD STDCALL OsThunkDdCreateSurfaceEx(
+DWORD WINAPI OsThunkDdCreateSurfaceEx(
     HANDLE hDirectDraw,
     HANDLE hSurface,
     DWORD dwSurfaceHandle
 );
 
-HANDLE STDCALL OsThunkDdCreateSurfaceObject(
+HANDLE WINAPI OsThunkDdCreateSurfaceObject(
     HANDLE hDirectDrawLocal,
     HANDLE hSurface,
     PDD_SURFACE_LOCAL puSurfaceLocal,
@@ -123,34 +123,34 @@
     BOOL bComplete
 );
 
-BOOL STDCALL OsThunkDdDeleteDirectDrawObject(
+BOOL WINAPI OsThunkDdDeleteDirectDrawObject(
     HANDLE hDirectDrawLocal
 );
 
-BOOL STDCALL OsThunkDdDeleteSurfaceObject(
+BOOL WINAPI OsThunkDdDeleteSurfaceObject(
     HANDLE hSurface
 );
 
-DWORD STDCALL OsThunkDdDestroyD3DBuffer(
+DWORD WINAPI OsThunkDdDestroyD3DBuffer(
     HANDLE hSurface
 );
 
-DWORD STDCALL OsThunkDdDestroyMoComp(
+DWORD WINAPI OsThunkDdDestroyMoComp(
     HANDLE hMoComp,
     PDD_DESTROYMOCOMPDATA puBeginFrameData
 );
 
-DWORD STDCALL OsThunkDdDestroySurface(
+DWORD WINAPI OsThunkDdDestroySurface(
     HANDLE hSurface,
     BOOL bRealDestroy
 );
 
-DWORD STDCALL OsThunkDdEndMoCompFrame(
+DWORD WINAPI OsThunkDdEndMoCompFrame(
     HANDLE hMoComp,
     PDD_ENDMOCOMPFRAMEDATA puEndFrameData
 );
 
-DWORD STDCALL OsThunkDdFlip(
+DWORD WINAPI OsThunkDdFlip(
     HANDLE hSurfaceCurrent,
     HANDLE hSurfaceTarget,
     HANDLE hSurfaceCurrentLeft,
@@ -158,84 +158,84 @@
     PDD_FLIPDATA puFlipData
 );
 
-DWORD STDCALL OsThunkDdFlipToGDISurface(
+DWORD WINAPI OsThunkDdFlipToGDISurface(
     HANDLE hDirectDraw,
     PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData
 );
 
-DWORD STDCALL OsThunkDdGetAvailDriverMemory(
+DWORD WINAPI OsThunkDdGetAvailDriverMemory(
     HANDLE hDirectDraw,
     PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData
 );
 
-DWORD STDCALL OsThunkDdGetBltStatus(
+DWORD WINAPI OsThunkDdGetBltStatus(
     HANDLE hSurface,
     PDD_GETBLTSTATUSDATA puGetBltStatusData
 );
 
-HDC STDCALL OsThunkDdGetDC(
+HDC WINAPI OsThunkDdGetDC(
     HANDLE hSurface,
     PALETTEENTRY *puColorTable
 );
 
-DWORD STDCALL OsThunkDdGetDriverInfo(
+DWORD WINAPI OsThunkDdGetDriverInfo(
     HANDLE hDirectDraw,
     PDD_GETDRIVERINFODATA puGetDriverInfoData
 );
 
-DWORD STDCALL OsThunkDdGetDriverState(
+DWORD WINAPI OsThunkDdGetDriverState(
     PDD_GETDRIVERSTATEDATA pdata
 );
 
-DWORD STDCALL OsThunkDdGetDxHandle(
+DWORD WINAPI OsThunkDdGetDxHandle(
     HANDLE hDirectDraw,
     HANDLE hSurface,
     BOOL bRelease
 );
 
-DWORD STDCALL OsThunkDdGetFlipStatus(
+DWORD WINAPI OsThunkDdGetFlipStatus(
     HANDLE hSurface,
     PDD_GETFLIPSTATUSDATA puGetFlipStatusData
 );
 
-DWORD STDCALL OsThunkDdGetInternalMoCompInfo(
+DWORD WINAPI OsThunkDdGetInternalMoCompInfo(
     HANDLE hDirectDraw,
     PDD_GETINTERNALMOCOMPDATA puGetInternalData
 );
 
-DWORD STDCALL OsThunkDdGetMoCompBuffInfo(
+DWORD WINAPI OsThunkDdGetMoCompBuffInfo(
     HANDLE hDirectDraw,
     PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData
 );
 
-DWORD STDCALL OsThunkDdGetMoCompFormats(
+DWORD WINAPI OsThunkDdGetMoCompFormats(
     HANDLE hDirectDraw,
     PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData
 );
 
-DWORD STDCALL OsThunkDdGetMoCompGuids(
+DWORD WINAPI OsThunkDdGetMoCompGuids(
     HANDLE hDirectDraw,
     PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData
 );
 
-DWORD STDCALL OsThunkDdGetScanLine(
+DWORD WINAPI OsThunkDdGetScanLine(
     HANDLE hDirectDraw,
     PDD_GETSCANLINEDATA puGetScanLineData
 );
 
-DWORD STDCALL OsThunkDdLock(
+DWORD WINAPI OsThunkDdLock(
     HANDLE hSurface,
     PDD_LOCKDATA puLockData,
     HDC hdcClip
 );
 
-DWORD STDCALL OsThunkDdLockD3D(
+DWORD WINAPI OsThunkDdLockD3D(
     HANDLE hSurface,
     PDD_LOCKDATA puLockData
 );
 
 
-BOOL STDCALL OsThunkDdQueryDirectDrawObject(
+BOOL WINAPI OsThunkDdQueryDirectDrawObject(
     HANDLE hDirectDrawLocal,
     DD_HALINFO  *pHalInfo,
     DWORD *pCallBackFlags,
@@ -250,74 +250,74 @@
 );
 
 
-DWORD STDCALL OsThunkDdQueryMoCompStatus(
+DWORD WINAPI OsThunkDdQueryMoCompStatus(
     HANDLE hMoComp,
     PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData
 );
 
-BOOL STDCALL OsThunkDdReenableDirectDrawObject(
+BOOL WINAPI OsThunkDdReenableDirectDrawObject(
     HANDLE hDirectDrawLocal,
     BOOL *pubNewMode
 );
 
-BOOL STDCALL OsThunkDdReleaseDC(
+BOOL WINAPI OsThunkDdReleaseDC(
     HANDLE hSurface
 );
 
-DWORD STDCALL OsThunkDdRenderMoComp(
+DWORD WINAPI OsThunkDdRenderMoComp(
     HANDLE hMoComp,
     PDD_RENDERMOCOMPDATA puRenderMoCompData
 );
 
-BOOL STDCALL OsThunkDdResetVisrgn(
+BOOL WINAPI OsThunkDdResetVisrgn(
     HANDLE hSurface,
     HWND hwnd
 );
 
-DWORD STDCALL OsThunkDdSetColorKey(
+DWORD WINAPI OsThunkDdSetColorKey(
     HANDLE hSurface,
     PDD_SETCOLORKEYDATA puSetColorKeyData
 );
 
-DWORD STDCALL OsThunkDdSetExclusiveMode(
+DWORD WINAPI OsThunkDdSetExclusiveMode(
     HANDLE hDirectDraw,
     PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData
 );
 
-BOOL STDCALL OsThunkDdSetGammaRamp(
+BOOL WINAPI OsThunkDdSetGammaRamp(
     HANDLE hDirectDraw,
     HDC hdc,
     LPVOID lpGammaRamp
 );
 
-DWORD STDCALL OsThunkDdSetOverlayPosition(
+DWORD WINAPI OsThunkDdSetOverlayPosition(
     HANDLE hSurfaceSource,
     HANDLE hSurfaceDestination,
     PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData
 );
 
-VOID STDCALL OsThunkDdUnattachSurface(
+VOID WINAPI OsThunkDdUnattachSurface(
     HANDLE hSurface,
     HANDLE hSurfaceAttached
 );
 
-DWORD STDCALL OsThunkDdUnlock(
+DWORD WINAPI OsThunkDdUnlock(
     HANDLE hSurface,
     PDD_UNLOCKDATA puUnlockData
 );
 
-DWORD STDCALL OsThunkDdUnlockD3D(
+DWORD WINAPI OsThunkDdUnlockD3D(
     HANDLE hSurface,
     PDD_UNLOCKDATA puUnlockData
 );
 
-DWORD STDCALL OsThunkDdUpdateOverlay(
+DWORD WINAPI OsThunkDdUpdateOverlay(
     HANDLE hSurfaceDestination,
     HANDLE hSurfaceSource,
     PDD_UPDATEOVERLAYDATA puUpdateOverlayData
 );
 
-DWORD STDCALL OsThunkDdWaitForVerticalBlank(
+DWORD WINAPI OsThunkDdWaitForVerticalBlank(
     HANDLE hDirectDraw,
     PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData
 );

Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di…
==============================================================================
--- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sun Nov 30 07:46:35
2008
@@ -73,51 +73,51 @@
 /************************************************************************/
 /* win32k.sys internal protypes for driver functions it exports         */
 /************************************************************************/
-BOOLEAN STDCALL DxEngNUIsTermSrv();
-PDC STDCALL DxEngLockDC(HDC hDC);
-BOOLEAN STDCALL DxEngUnlockDC(PDC pDC);
-DWORD_PTR STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA);
-BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD_PTR);
-BOOLEAN STDCALL DxEngLockHdev(HDEV hdev);
-BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev);
-DWORD_PTR STDCALL DxEngGetDCState(HDC hDC, DWORD type);
-BOOLEAN STDCALL DxEngReferenceHdev(HDEV hdev);
-BOOLEAN STDCALL DxEngLockShareSem();
-BOOLEAN STDCALL DxEngUnlockShareSem();
-DWORD STDCALL DxEngScreenAccessCheck();
-BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask);
+BOOLEAN NTAPI DxEngNUIsTermSrv();
+PDC NTAPI DxEngLockDC(HDC hDC);
+BOOLEAN NTAPI DxEngUnlockDC(PDC pDC);
+DWORD_PTR NTAPI DxEngGetHdevData(HDEV, DXEGSHDEVDATA);
+BOOLEAN NTAPI DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD_PTR);
+BOOLEAN NTAPI DxEngLockHdev(HDEV hdev);
+BOOLEAN NTAPI DxEngUnlockHdev(HDEV hdev);
+DWORD_PTR NTAPI DxEngGetDCState(HDC hDC, DWORD type);
+BOOLEAN NTAPI DxEngReferenceHdev(HDEV hdev);
+BOOLEAN NTAPI DxEngLockShareSem();
+BOOLEAN NTAPI DxEngUnlockShareSem();
+DWORD NTAPI DxEngScreenAccessCheck();
+BOOL NTAPI DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask);
 
 /* Prototypes for the following functions are not yet finished */
-BOOLEAN STDCALL DxEngRedrawDesktop();
-ULONG STDCALL DxEngDispUniq();
-ULONG STDCALL DxEngVisRgnUniq();
-HDEV* STDCALL DxEngEnumerateHdev(HDEV *hdev);
-BOOL STDCALL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp);
-BOOLEAN STDCALL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse);
-BOOLEAN STDCALL DxEngCleanDC(HDC hdc);
-BOOLEAN STDCALL DxEngIncDispUniq();
+BOOLEAN NTAPI DxEngRedrawDesktop();
+ULONG NTAPI DxEngDispUniq();
+ULONG NTAPI DxEngVisRgnUniq();
+HDEV* NTAPI DxEngEnumerateHdev(HDEV *hdev);
+BOOL NTAPI DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp);
+BOOLEAN NTAPI DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse);
+BOOLEAN NTAPI DxEngCleanDC(HDC hdc);
+BOOLEAN NTAPI DxEngIncDispUniq();
 
-HDC STDCALL DxEngCreateMemoryDC(HDEV hDev);
+HDC NTAPI DxEngCreateMemoryDC(HDEV hDev);
 
-BOOLEAN STDCALL DxEngIsHdevLockedByCurrentThread(HDEV hDev);
-BOOLEAN STDCALL DxEngUnreferenceHdev(HDEV hDev);
-DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
-DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
-DWORD STDCALL DxEngSpSpritesVisible(DWORD x1);
-HDC STDCALL DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd);
-BOOLEAN STDCALL DxEngDeleteDC(HDC hdc, BOOL Force);
-BOOLEAN STDCALL DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set);
-DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2);
-DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2);
-DWORD STDCALL DxEngDeleteSurface(DWORD x1);
-DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2);
-DWORD STDCALL DxEngAltLockSurface(DWORD x1);
-DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4);
-DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2);
-DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2);
-DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2);
-DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3);
-DWORD STDCALL DxEngGetRedirectionBitmap(DWORD x1);
-DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2);
+BOOLEAN NTAPI DxEngIsHdevLockedByCurrentThread(HDEV hDev);
+BOOLEAN NTAPI DxEngUnreferenceHdev(HDEV hDev);
+DWORD NTAPI DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
+DWORD NTAPI DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
+DWORD NTAPI DxEngSpSpritesVisible(DWORD x1);
+HDC NTAPI DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd);
+BOOLEAN NTAPI DxEngDeleteDC(HDC hdc, BOOL Force);
+BOOLEAN NTAPI DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set);
+DWORD NTAPI DxEngSelectBitmap(DWORD x1, DWORD x2);
+DWORD NTAPI DxEngSetBitmapOwner(DWORD x1, DWORD x2);
+DWORD NTAPI DxEngDeleteSurface(DWORD x1);
+DWORD NTAPI DxEngGetSurfaceData(DWORD x1, DWORD x2);
+DWORD NTAPI DxEngAltLockSurface(DWORD x1);
+DWORD NTAPI DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4);
+DWORD NTAPI DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2);
+DWORD NTAPI DxEngSelectPaletteToSurface(DWORD x1, DWORD x2);
+DWORD NTAPI DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2);
+DWORD NTAPI DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3);
+DWORD NTAPI DxEngGetRedirectionBitmap(DWORD x1);
+DWORD NTAPI DxEngLoadImage(DWORD x1,DWORD x2);
 
 

Modified: trunk/reactos/include/reactos/libs/samlib/samlib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/samli…
==============================================================================
--- trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] Sun Nov 30 07:46:35
2008
@@ -26,25 +26,25 @@
 #define __SAMLIB_H_INCLUDED__
 
 
-BOOL STDCALL
+BOOL WINAPI
 SamInitializeSAM (VOID);
 
-BOOL STDCALL
+BOOL WINAPI
 SamGetDomainSid (PSID *Sid);
 
-BOOL STDCALL
+BOOL WINAPI
 SamSetDomainSid (PSID Sid);
 
-BOOL STDCALL
+BOOL WINAPI
 SamCreateUser (PWSTR UserName,
 	       PWSTR UserPassword,
 	       PSID UserSid);
 
-BOOL STDCALL
+BOOL WINAPI
 SamCheckUserPassword (PWSTR UserName,
 		      PWSTR UserPassword);
 
-BOOL STDCALL
+BOOL WINAPI
 SamGetUserSid (PWSTR UserName,
 	       PSID *Sid);
 

Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse…
==============================================================================
--- trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Sun Nov 30
07:46:35 2008
@@ -27,7 +27,7 @@
 
 /* System setup APIs */
 
-DWORD STDCALL
+DWORD WINAPI
 InstallReactOS (HINSTANCE hInstance);
 
 

Modified: trunk/reactos/include/reactos/subsys/lsass/lsasrv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/lsa…
==============================================================================
--- trunk/reactos/include/reactos/subsys/lsass/lsasrv.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/lsass/lsasrv.h [iso-8859-1] Sun Nov 30 07:46:35
2008
@@ -2,7 +2,7 @@
 #ifndef __LSASRV_H
 #define __LSASRV_H
 
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 LsapInitLsa(VOID);
 
 #endif /* __LSASRV_H */

Modified: trunk/reactos/include/reactos/subsys/sm/helper.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/…
==============================================================================
--- trunk/reactos/include/reactos/subsys/sm/helper.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/sm/helper.h [iso-8859-1] Sun Nov 30 07:46:35
2008
@@ -8,30 +8,30 @@
 /* $Id$ */
 
 /* smlib/connect.c */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 SmConnectApiPort (IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
 		  IN      HANDLE           hSbApiPort      OPTIONAL,
 		  IN      WORD             wSubsystem      OPTIONAL, /* pe.h */
 		  IN OUT  PHANDLE          phSmApiPort);
 /* smlib/compses.c */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 SmCompleteSession (IN     HANDLE  hSmApiPort,
 		   IN     HANDLE  hSbApiPort,
 		   IN     HANDLE  hApiPort);
 /* smlib/execpgm.c */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 SmExecuteProgram (IN     HANDLE           hSmApiPort,
 		  IN     PUNICODE_STRING  Pgm
 		  );
 /* smdll/query.c */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 SmQueryInformation (IN      HANDLE                SmApiPort,
 		    IN      SM_INFORMATION_CLASS  SmInformationClass,
 		    IN OUT  PVOID                 Data,
 		    IN      ULONG                 DataLength,
 		    IN OUT  PULONG                ReturnedDataLength OPTIONAL);
 /* smlib/lookupss.c */
-NTSTATUS STDCALL
+NTSTATUS WINAPI
 SmLookupSubsystem (IN     PWSTR   Name,
 		   IN OUT PWSTR   Data,
 		   IN OUT PULONG  DataLength,

Modified: trunk/reactos/include/reactos/subsys/win/base.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win…
==============================================================================
--- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Sun Nov 30 07:46:35 2008
@@ -9,8 +9,8 @@
 
 typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID);
 
-NTSTATUS STDCALL BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
-NTSTATUS STDCALL ServerDllInitialization (ULONG,LPWSTR*);
+NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
+NTSTATUS WINAPI ServerDllInitialization (ULONG,LPWSTR*);
 
 #endif /* ndef __INCLUDE_WIN_BASE_H */
 

Modified: trunk/reactos/include/reactos/subsys/win/windows.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win…
==============================================================================
--- trunk/reactos/include/reactos/subsys/win/windows.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/win/windows.h [iso-8859-1] Sun Nov 30 07:46:35
2008
@@ -5,11 +5,11 @@
 
 /* w32 console server */
 #define WIN_SRV_WIN_CONSOLE  2
-NTSTATUS STDCALL ConServerDllInitialization (ULONG,LPWSTR*);
+NTSTATUS WINAPI ConServerDllInitialization (ULONG,LPWSTR*);
 
 /* w32 user server */
 #define WIN_SRV_WIN_USER     3
-NTSTATUS STDCALL UserServerDllInitialization (ULONG,LPWSTR*);
+NTSTATUS WINAPI UserServerDllInitialization (ULONG,LPWSTR*);
 
 #endif /* ndef __INCLUDE_WIN_WINDOWS_H */