From 8c002db0c2a9e956c45a99d3ef504ba459040189 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Wed, 19 Oct 2005 17:03:38 +0000 Subject: [PATCH] - NDK fix: don't undef a million status codes, instead, have apps define WIN32_NO_STATUS. - winnt.h: respect WIN32_NO_STATUS for DBG codes. - rtl: change STDCALL to NTAPI - everything else: add precompiled headers where missing, define WIN32_NO_STATUS. svn path=/trunk/; revision=18598 --- reactos/apps/utils/ps/ps.c | 3 +- reactos/include/ndk/ntndk.h | 2 +- reactos/include/ndk/rtlfuncs.h | 17 +++ reactos/include/ndk/umtypes.h | 46 +------- reactos/include/ndk/zwfuncs.h | 3 + reactos/lib/advapi32/advapi32.h | 1 + reactos/lib/crt/except/unwind.c | 1 + reactos/lib/crt/wine/scanf.c | 1 + reactos/lib/dnsapi/dnsapi.xml | 1 + reactos/lib/dnsapi/dnsapi/adns.c | 8 +- reactos/lib/dnsapi/dnsapi/context.c | 10 +- reactos/lib/dnsapi/dnsapi/free.c | 10 +- reactos/lib/dnsapi/dnsapi/names.c | 11 +- reactos/lib/dnsapi/dnsapi/precomp.h | 22 ++++ reactos/lib/dnsapi/dnsapi/query.c | 10 +- reactos/lib/dnsapi/dnsapi/stubs.c | 6 +- reactos/lib/epsapi/enum/drivers.c | 1 + reactos/lib/epsapi/enum/modules.c | 1 + reactos/lib/epsapi/enum/processes.c | 2 +- reactos/lib/fmifs/chkdsk.c | 5 +- reactos/lib/fmifs/compress.c | 5 +- reactos/lib/fmifs/diskcopy.c | 4 +- reactos/lib/fmifs/extend.c | 4 +- reactos/lib/fmifs/fmifs.xml | 1 + reactos/lib/fmifs/format.c | 9 +- reactos/lib/fmifs/init.c | 4 +- reactos/lib/fmifs/label.c | 4 +- reactos/lib/fmifs/media.c | 4 +- reactos/lib/fmifs/precomp.h | 26 +++++ reactos/lib/fslib/vfatlib/vfatlib.h | 1 + reactos/lib/fslib/vfatxlib/vfatxlib.h | 1 + reactos/lib/gdi32/include/precomp.h | 1 + reactos/lib/kernel32/k32.h | 1 + reactos/lib/lsasrv/lsaport.c | 1 + reactos/lib/lsasrv/lsasrv.c | 2 +- reactos/lib/msafd/msafd.h | 3 +- reactos/lib/nt/entry_point.c | 1 + reactos/lib/ntdll/inc/ntdll.h | 1 + reactos/lib/opengl32/gl.c | 1 + reactos/lib/opengl32/opengl32.c | 1 + reactos/lib/opengl32/teb.h | 28 ----- reactos/lib/opengl32/wgl.c | 1 + reactos/lib/psapi/precomp.h | 2 +- reactos/lib/rtl/access.c | 31 +++--- reactos/lib/rtl/acl.c | 28 ++--- reactos/lib/rtl/atom.c | 18 ++-- reactos/lib/rtl/bit.c | 4 +- reactos/lib/rtl/bitmap.c | 46 ++++---- reactos/lib/rtl/bootdata.c | 8 +- reactos/lib/rtl/compress.c | 16 +-- reactos/lib/rtl/crc32.c | 2 +- reactos/lib/rtl/critical.c | 26 ++--- reactos/lib/rtl/dbgbuffer.c | 8 +- reactos/lib/rtl/debug.c | 8 +- reactos/lib/rtl/dos8dot3.c | 6 +- reactos/lib/rtl/encode.c | 4 +- reactos/lib/rtl/env.c | 14 +-- reactos/lib/rtl/error.c | 18 ++-- reactos/lib/rtl/exception.c | 8 +- reactos/lib/rtl/generictable.c | 46 ++++---- reactos/lib/rtl/handle.c | 12 +-- reactos/lib/rtl/heap.c | 32 +++--- reactos/lib/rtl/i386/exception.c | 12 +-- reactos/lib/rtl/image.c | 8 +- reactos/lib/rtl/largeint.c | 30 +++--- reactos/lib/rtl/luid.c | 6 +- reactos/lib/rtl/mem.c | 16 +-- reactos/lib/rtl/message.c | 4 +- reactos/lib/rtl/network.c | 36 +++---- reactos/lib/rtl/nls.c | 36 +++---- reactos/lib/rtl/path.c | 26 ++--- reactos/lib/rtl/ppb.c | 10 +- reactos/lib/rtl/process.c | 8 +- reactos/lib/rtl/propvar.c | 8 +- reactos/lib/rtl/random.c | 6 +- reactos/lib/rtl/rangelist.c | 24 ++--- reactos/lib/rtl/registry.c | 26 ++--- reactos/lib/rtl/resource.c | 16 +-- reactos/lib/rtl/rtl.h | 7 +- reactos/lib/rtl/rtlp.h | 18 ++-- reactos/lib/rtl/sd.c | 88 ++++++++-------- reactos/lib/rtl/security.c | 12 +-- reactos/lib/rtl/sid.c | 28 ++--- reactos/lib/rtl/splaytree.c | 14 +-- reactos/lib/rtl/thread.c | 14 +-- reactos/lib/rtl/time.c | 20 ++-- reactos/lib/rtl/timerqueue.c | 12 +-- reactos/lib/rtl/timezone.c | 4 +- reactos/lib/rtl/unicode.c | 110 ++++++++++---------- reactos/lib/rtl/unicodeprefix.c | 10 +- reactos/lib/rtl/vectoreh.c | 4 +- reactos/lib/rtl/version.c | 4 +- reactos/lib/samlib/samlib.c | 2 +- reactos/lib/secur32/dllmain.c | 5 +- reactos/lib/secur32/lsa.c | 7 +- reactos/lib/secur32/precomp.h | 18 ++++ reactos/lib/secur32/secur32.xml | 1 + reactos/lib/smdll/query.c | 1 + reactos/lib/smlib/compses.c | 6 +- reactos/lib/smlib/connect.c | 5 +- reactos/lib/smlib/execpgm.c | 6 +- reactos/lib/smlib/lookupss.c | 6 +- reactos/lib/smlib/precomp.h | 18 ++++ reactos/lib/smlib/smlib.xml | 1 + reactos/lib/string/mbstowcs.c | 1 + reactos/lib/string/sscanf.c | 2 +- reactos/lib/string/wcstombs.c | 1 + reactos/lib/syssetup/install.c | 1 + reactos/lib/syssetup/logfile.c | 2 +- reactos/lib/userenv/precomp.h | 1 + reactos/lib/ws2_32/include/ws2_32.h | 1 + reactos/lib/ws2help/ws2help.h | 1 + reactos/lib/wshirda/wshirda.h | 1 + reactos/regtests/shared/regtests.c | 1 + reactos/services/eventlog/eventlog.h | 1 + reactos/services/eventlog/eventlog.xml | 1 + reactos/services/rpcss/endpoint.c | 3 +- reactos/services/rpcss/rpcss.c | 8 -- reactos/services/rpcss/rpcss.h | 8 ++ reactos/services/umpnpmgr/umpnpmgr.c | 2 +- reactos/subsys/csrss/csrss.h | 1 + reactos/subsys/csrss/win32csr/w32csr.h | 1 + reactos/subsys/ntvdm/ntvdm.c | 2 +- reactos/subsys/smss/smss.h | 1 + reactos/subsys/system/autochk/autochk.c | 1 + reactos/subsys/system/cmd/precomp.h | 2 +- reactos/subsys/system/lsass/lsass.c | 1 + reactos/subsys/system/services/database.c | 6 -- reactos/subsys/system/services/rpcserver.c | 4 - reactos/subsys/system/services/services.c | 4 - reactos/subsys/system/services/services.h | 2 + reactos/subsys/system/services/services.xml | 1 + reactos/subsys/system/setup/setup.c | 2 +- reactos/subsys/system/sm/sm.c | 1 + reactos/subsys/system/taskmgr/precomp.h | 1 + reactos/subsys/system/winlogon/setup.c | 9 +- reactos/subsys/system/winlogon/winlogon.h | 1 + reactos/subsys/system/winlogon/winlogon.xml | 1 + reactos/w32api/include/winnt.h | 2 + 139 files changed, 688 insertions(+), 685 deletions(-) create mode 100644 reactos/lib/dnsapi/dnsapi/precomp.h create mode 100644 reactos/lib/fmifs/precomp.h create mode 100644 reactos/lib/secur32/precomp.h create mode 100644 reactos/lib/smlib/precomp.h diff --git a/reactos/apps/utils/ps/ps.c b/reactos/apps/utils/ps/ps.c index 807c63f6bfa..e2f8ddf0185 100644 --- a/reactos/apps/utils/ps/ps.c +++ b/reactos/apps/utils/ps/ps.c @@ -22,8 +22,9 @@ Thanks to Filip Navara patch for fixing the Xp crash problem. */ -#include #define NTOS_MODE_USER +#define WIN32_NO_STATUS +#include #include typedef struct _SYSTEM_THREADS diff --git a/reactos/include/ndk/ntndk.h b/reactos/include/ndk/ntndk.h index e65400d7329..a1cfea70708 100644 --- a/reactos/include/ndk/ntndk.h +++ b/reactos/include/ndk/ntndk.h @@ -13,7 +13,7 @@ #include /* Helper Header */ -#include +#include /* A version of ntdef.h to be used with PSDK headers. */ #include "umtypes.h" diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index ae7065f4dcf..8d1592fd9a9 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -1988,6 +1988,19 @@ ULONG NTAPI RtlUniform(PULONG Seed); +/* + * Network Functions + */ +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv4StringToAddressW( + IN LPWSTR IpString, + IN ULONG Base, + OUT PULONG PtrToIpAddr, + OUT PULONG IpAddr +); + /* * Time Functions */ @@ -2042,6 +2055,10 @@ NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation); +NTSYSAPI +BOOLEAN +NTAPI +RtlGetNtProductType(OUT PNT_PRODUCT_TYPE ProductType); static __inline struct _PEB* NtCurrentPeb (void) { diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index 2083aa6b8f3..9031b1ac8da 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -14,51 +14,7 @@ /* DEPENDENCIES **************************************************************/ #include #include - -/* Undef the following to avoid conflects including ntstatus.h with winnt.h */ -#undef STATUS_WAIT_0 -#undef STATUS_ABANDONED_WAIT_0 -#undef STATUS_USER_APC -#undef STATUS_TIMEOUT -#undef STATUS_PENDING -#undef DBG_EXCEPTION_HANDLED -#undef STATUS_SEGMENT_NOTIFICATION -#undef DBG_TERMINATE_THREAD -#undef DBG_TERMINATE_PROCESS -#undef DBG_CONTROL_C -#undef DBG_CONTROL_BREAK -#undef DBG_COMMAND_EXCEPTION -#undef STATUS_GUARD_PAGE_VIOLATION -#undef STATUS_DATATYPE_MISALIGNMENT -#undef STATUS_BREAKPOINT -#undef STATUS_SINGLE_STEP -#undef DBG_EXCEPTION_NOT_HANDLED -#undef STATUS_ACCESS_VIOLATION -#undef STATUS_IN_PAGE_ERROR -#undef STATUS_INVALID_HANDLE -#undef STATUS_NO_MEMORY -#undef STATUS_ILLEGAL_INSTRUCTION -#undef STATUS_NONCONTINUABLE_EXCEPTION -#undef STATUS_INVALID_DISPOSITION -#undef STATUS_ARRAY_BOUNDS_EXCEEDED -#undef STATUS_FLOAT_DENORMAL_OPERAND -#undef STATUS_FLOAT_DIVIDE_BY_ZERO -#undef STATUS_FLOAT_INEXACT_RESULT -#undef STATUS_FLOAT_INVALID_OPERATION -#undef STATUS_FLOAT_OVERFLOW -#undef STATUS_FLOAT_STACK_CHECK -#undef STATUS_FLOAT_UNDERFLOW -#undef STATUS_INTEGER_DIVIDE_BY_ZERO -#undef STATUS_INTEGER_OVERFLOW -#undef STATUS_PRIVILEGED_INSTRUCTION -#undef STATUS_STACK_OVERFLOW -#undef STATUS_CONTROL_C_EXIT -#undef STATUS_FLOAT_MULTIPLE_FAULTS -#undef STATUS_FLOAT_MULTIPLE_TRAPS -#undef STATUS_REG_NAT_CONSUMPTION -#undef STATUS_SXS_EARLY_DEACTIVATION -#undef STATUS_SXS_INVALID_DEACTIVATION - +#undef WIN32_NO_STATUS #include /* CONSTANTS *****************************************************************/ diff --git a/reactos/include/ndk/zwfuncs.h b/reactos/include/ndk/zwfuncs.h index d79d6c50dd7..5e3f89365ff 100644 --- a/reactos/include/ndk/zwfuncs.h +++ b/reactos/include/ndk/zwfuncs.h @@ -12,6 +12,9 @@ /* DEPENDENCIES **************************************************************/ #define _WMIKM_ #include +#include "lpctypes.h" +#include "dbgktypes.h" +#include "kdtypes.h" /* FUNCTION TYPES ************************************************************/ diff --git a/reactos/lib/advapi32/advapi32.h b/reactos/lib/advapi32/advapi32.h index 978d6f5626f..afb6d0c739b 100644 --- a/reactos/lib/advapi32/advapi32.h +++ b/reactos/lib/advapi32/advapi32.h @@ -12,6 +12,7 @@ #include /* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/lib/crt/except/unwind.c b/reactos/lib/crt/except/unwind.c index c3291645a91..ff2d41c2827 100644 --- a/reactos/lib/crt/except/unwind.c +++ b/reactos/lib/crt/except/unwind.c @@ -1,3 +1,4 @@ +#define WIN32_NO_STATUS #include "precomp.h" #include #define NTOS_MODE_USER diff --git a/reactos/lib/crt/wine/scanf.c b/reactos/lib/crt/wine/scanf.c index 9b9d03e3ce7..01628112ec9 100644 --- a/reactos/lib/crt/wine/scanf.c +++ b/reactos/lib/crt/wine/scanf.c @@ -33,6 +33,7 @@ #include "winternl.h" #include "msvcrt.h" */ +#define WIN32_NO_STATUS #include #include diff --git a/reactos/lib/dnsapi/dnsapi.xml b/reactos/lib/dnsapi/dnsapi.xml index 368fc54edbc..1601eaee551 100644 --- a/reactos/lib/dnsapi/dnsapi.xml +++ b/reactos/lib/dnsapi/dnsapi.xml @@ -20,6 +20,7 @@ names.c query.c stubs.c + precomp.h dnsapi.rc diff --git a/reactos/lib/dnsapi/dnsapi/adns.c b/reactos/lib/dnsapi/dnsapi/adns.c index cc54d568e05..de9029b781c 100644 --- a/reactos/lib/dnsapi/dnsapi/adns.c +++ b/reactos/lib/dnsapi/dnsapi/adns.c @@ -8,10 +8,10 @@ * 12/15/03 -- Created */ -#include -#include -#include -#include +#include "precomp.h" + +#define NDEBUG +#include DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS( int Status ) { switch( Status ) { diff --git a/reactos/lib/dnsapi/dnsapi/context.c b/reactos/lib/dnsapi/dnsapi/context.c index a46be104fc9..b01643f4982 100644 --- a/reactos/lib/dnsapi/dnsapi/context.c +++ b/reactos/lib/dnsapi/dnsapi/context.c @@ -8,12 +8,10 @@ * 12/15/03 -- Created */ -#include -#include -#include -#define NTOS_MODE_USER -#include -#include +#include "precomp.h" + +#define NDEBUG +#include /* DnsAcquireContextHandle ************* * Create a context handle that will allow us to open and retrieve queries. diff --git a/reactos/lib/dnsapi/dnsapi/free.c b/reactos/lib/dnsapi/dnsapi/free.c index 28571b4105a..a700f43532b 100644 --- a/reactos/lib/dnsapi/dnsapi/free.c +++ b/reactos/lib/dnsapi/dnsapi/free.c @@ -8,12 +8,10 @@ * 12/15/03 -- Created */ -#include -#include -#include -#include -#define NTOS_MODE_USER -#include +#include "precomp.h" + +#define NDEBUG +#include VOID WINAPI DnsFree ( PVOID Data, DNS_FREE_TYPE FreeType ) { diff --git a/reactos/lib/dnsapi/dnsapi/names.c b/reactos/lib/dnsapi/dnsapi/names.c index fc9757169fd..d1b1d904f8c 100644 --- a/reactos/lib/dnsapi/dnsapi/names.c +++ b/reactos/lib/dnsapi/dnsapi/names.c @@ -1,10 +1,7 @@ -#include -#include -#include -#include -#include -#define NTOS_MODE_USER -#include +#include "precomp.h" + +#define NDEBUG +#include static BOOL DnsIntNameContainsDots( LPCWSTR Name ) { return wcschr( Name, '.' ) ? TRUE : FALSE; diff --git a/reactos/lib/dnsapi/dnsapi/precomp.h b/reactos/lib/dnsapi/dnsapi/precomp.h new file mode 100644 index 00000000000..acc903f73fb --- /dev/null +++ b/reactos/lib/dnsapi/dnsapi/precomp.h @@ -0,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/dnsapi/precomp.h + * PURPOSE: Win32 DNS API Libary Header + * PROGRAMMER: Alex Ionescu (alex@relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#define WIN32_NO_STATUS +#define NTOS_MODE_USER + +/* PSDK/NDK Headers */ +#include +#include +#include +#include + +/* Internal DNSAPI Headers */ +#include + diff --git a/reactos/lib/dnsapi/dnsapi/query.c b/reactos/lib/dnsapi/dnsapi/query.c index 9abb09d28e1..d6170f143a9 100644 --- a/reactos/lib/dnsapi/dnsapi/query.c +++ b/reactos/lib/dnsapi/dnsapi/query.c @@ -8,12 +8,10 @@ * 12/15/03 -- Created */ -#include -#include -#include -#include -#define NTOS_MODE_USER -#include +#include "precomp.h" + +#define NDEBUG +#include /* DnsQuery **************************** * Begin a DNS query, and allow the result to be placed in the application diff --git a/reactos/lib/dnsapi/dnsapi/stubs.c b/reactos/lib/dnsapi/dnsapi/stubs.c index 9b7f62d0096..798f506be3f 100644 --- a/reactos/lib/dnsapi/dnsapi/stubs.c +++ b/reactos/lib/dnsapi/dnsapi/stubs.c @@ -1,7 +1,9 @@ -#include -#include +/* Can't use precomp.h because these weren't stubbed properly */ +#define WIN32_NO_STATUS #define NTOS_MODE_USER +#include #include + #include typedef ULONG DNS_STATUS; diff --git a/reactos/lib/epsapi/enum/drivers.c b/reactos/lib/epsapi/enum/drivers.c index 42039f7e9f5..bfed1edc7d4 100644 --- a/reactos/lib/epsapi/enum/drivers.c +++ b/reactos/lib/epsapi/enum/drivers.c @@ -14,6 +14,7 @@ * and improve reusability */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/epsapi/enum/modules.c b/reactos/lib/epsapi/enum/modules.c index 5b1d00c334a..4ae83d958e4 100644 --- a/reactos/lib/epsapi/enum/modules.c +++ b/reactos/lib/epsapi/enum/modules.c @@ -18,6 +18,7 @@ * isolated in its own library to clear the confusion * and improve reusability */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/epsapi/enum/processes.c b/reactos/lib/epsapi/enum/processes.c index d023770c89c..f38b0ff3b19 100644 --- a/reactos/lib/epsapi/enum/processes.c +++ b/reactos/lib/epsapi/enum/processes.c @@ -30,7 +30,7 @@ * isolated in its own library to clear the confusion * and improve reusability */ - +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/fmifs/chkdsk.c b/reactos/lib/fmifs/chkdsk.c index b6310ab5d93..907dccc8efa 100644 --- a/reactos/lib/fmifs/chkdsk.c +++ b/reactos/lib/fmifs/chkdsk.c @@ -9,10 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include -#include +#include "precomp.h" /* FMIFS.1 */ VOID STDCALL diff --git a/reactos/lib/fmifs/compress.c b/reactos/lib/fmifs/compress.c index 99c47de768f..181112face1 100644 --- a/reactos/lib/fmifs/compress.c +++ b/reactos/lib/fmifs/compress.c @@ -9,10 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include -#include +#include "precomp.h" /* * @implemented diff --git a/reactos/lib/fmifs/diskcopy.c b/reactos/lib/fmifs/diskcopy.c index 6ec80416765..a821f45afe1 100644 --- a/reactos/lib/fmifs/diskcopy.c +++ b/reactos/lib/fmifs/diskcopy.c @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include +#include "precomp.h" /* FMIFS.3 */ VOID STDCALL diff --git a/reactos/lib/fmifs/extend.c b/reactos/lib/fmifs/extend.c index b6344e1478c..dcbbdea5235 100644 --- a/reactos/lib/fmifs/extend.c +++ b/reactos/lib/fmifs/extend.c @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include +#include "precomp.h" /* FMIFS.5 */ VOID STDCALL diff --git a/reactos/lib/fmifs/fmifs.xml b/reactos/lib/fmifs/fmifs.xml index a432b566078..f9e58f8bf75 100644 --- a/reactos/lib/fmifs/fmifs.xml +++ b/reactos/lib/fmifs/fmifs.xml @@ -15,4 +15,5 @@ label.c media.c fmifs.rc + precomp.h diff --git a/reactos/lib/fmifs/format.c b/reactos/lib/fmifs/format.c index 62003412598..1a31c84c1c3 100644 --- a/reactos/lib/fmifs/format.c +++ b/reactos/lib/fmifs/format.c @@ -9,14 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include -#define NTOS_MODE_USER -#include -#include -#include -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/lib/fmifs/init.c b/reactos/lib/fmifs/init.c index 2b62a1ed5ba..b0d5d230616 100644 --- a/reactos/lib/fmifs/init.c +++ b/reactos/lib/fmifs/init.c @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include +#include "precomp.h" static BOOL FmIfsInitialized = FALSE; diff --git a/reactos/lib/fmifs/label.c b/reactos/lib/fmifs/label.c index 084f3ab213b..1f150890ed9 100644 --- a/reactos/lib/fmifs/label.c +++ b/reactos/lib/fmifs/label.c @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include +#include "precomp.h" /* FMIFS.10 */ VOID STDCALL diff --git a/reactos/lib/fmifs/media.c b/reactos/lib/fmifs/media.c index 7a6846d85ba..d8086578a3e 100644 --- a/reactos/lib/fmifs/media.c +++ b/reactos/lib/fmifs/media.c @@ -9,9 +9,7 @@ * 1999-02-16 (Emanuele Aliberti) * Entry points added. */ -#define UNICODE -#define _UNICODE -#include +#include "precomp.h" /* FMIFS.9 */ VOID STDCALL diff --git a/reactos/lib/fmifs/precomp.h b/reactos/lib/fmifs/precomp.h new file mode 100644 index 00000000000..13ae56aa4d7 --- /dev/null +++ b/reactos/lib/fmifs/precomp.h @@ -0,0 +1,26 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/fmifs/precomp.h + * PURPOSE: Win32 FMIFS API Libary Header + * PROGRAMMER: Alex Ionescu (alex@relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#define UNICODE +#define _UNICODE + +/* PSDK/NDK Headers */ +#include +#include + +/* FMIFS Public Header */ +#include + +/* VFATLIB Public Header */ +#include + +/* EOF */ diff --git a/reactos/lib/fslib/vfatlib/vfatlib.h b/reactos/lib/fslib/vfatlib/vfatlib.h index eeed21eb376..cbc770f362e 100755 --- a/reactos/lib/fslib/vfatlib/vfatlib.h +++ b/reactos/lib/fslib/vfatlib/vfatlib.h @@ -4,6 +4,7 @@ * FILE: vfatlib.h */ +#define WIN32_NO_STATUS #include #include #define NTOS_MODE_USER diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.h b/reactos/lib/fslib/vfatxlib/vfatxlib.h index 4ebdb2ae6d3..9d358e1882e 100644 --- a/reactos/lib/fslib/vfatxlib/vfatxlib.h +++ b/reactos/lib/fslib/vfatxlib/vfatxlib.h @@ -3,6 +3,7 @@ * PROJECT: ReactOS VFAT filesystem library * FILE: vfatxlib.h */ +#define WIN32_NO_STATUS #include #include #define NTOS_MODE_USER diff --git a/reactos/lib/gdi32/include/precomp.h b/reactos/lib/gdi32/include/precomp.h index 092b9439f19..50750cb923e 100644 --- a/reactos/lib/gdi32/include/precomp.h +++ b/reactos/lib/gdi32/include/precomp.h @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS #define NTOS_MODE_USER #define __GDI32__ #include diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h index a977441fbd5..0ff28c9de17 100755 --- a/reactos/lib/kernel32/k32.h +++ b/reactos/lib/kernel32/k32.h @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #define NTOS_MODE_USER #define _KERNEL32_ #include diff --git a/reactos/lib/lsasrv/lsaport.c b/reactos/lib/lsasrv/lsaport.c index ced6d219d02..282f5e6709c 100644 --- a/reactos/lib/lsasrv/lsaport.c +++ b/reactos/lib/lsasrv/lsaport.c @@ -1,6 +1,7 @@ /* */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/lsasrv/lsasrv.c b/reactos/lib/lsasrv/lsasrv.c index 2431f0541ea..6f16a7c88fd 100644 --- a/reactos/lib/lsasrv/lsasrv.c +++ b/reactos/lib/lsasrv/lsasrv.c @@ -1,4 +1,4 @@ - +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/msafd/msafd.h b/reactos/lib/msafd/msafd.h index 1bb7497f9a0..8ba4188e109 100755 --- a/reactos/lib/msafd/msafd.h +++ b/reactos/lib/msafd/msafd.h @@ -8,8 +8,9 @@ #define __MSAFD_H #include - #include + +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/lib/nt/entry_point.c b/reactos/lib/nt/entry_point.c index 4de67ca9464..7f13aae5cc2 100644 --- a/reactos/lib/nt/entry_point.c +++ b/reactos/lib/nt/entry_point.c @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #include #include #define NTOS_MODE_USER diff --git a/reactos/lib/ntdll/inc/ntdll.h b/reactos/lib/ntdll/inc/ntdll.h index 73acc51dfad..7676b2b1edd 100644 --- a/reactos/lib/ntdll/inc/ntdll.h +++ b/reactos/lib/ntdll/inc/ntdll.h @@ -20,6 +20,7 @@ #include /* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/opengl32/gl.c b/reactos/lib/opengl32/gl.c index edf981423eb..dfb0c82c1e8 100644 --- a/reactos/lib/opengl32/gl.c +++ b/reactos/lib/opengl32/gl.c @@ -21,6 +21,7 @@ */ #define WIN32_LEANER_AND_MEANER +#define WIN32_NO_STATUS #include #include "teb.h" diff --git a/reactos/lib/opengl32/opengl32.c b/reactos/lib/opengl32/opengl32.c index 19d93ed0cb1..1125c870a6c 100644 --- a/reactos/lib/opengl32/opengl32.c +++ b/reactos/lib/opengl32/opengl32.c @@ -10,6 +10,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS #include #include #include "teb.h" diff --git a/reactos/lib/opengl32/teb.h b/reactos/lib/opengl32/teb.h index 07e15439b84..84d484b42b9 100644 --- a/reactos/lib/opengl32/teb.h +++ b/reactos/lib/opengl32/teb.h @@ -1,33 +1,5 @@ // teb.h -#ifdef _MSC_VER - -typedef struct _TEB -{ - char blah[0x7C4]; - PVOID glDispatchTable[0xA3]; /* 7C4h */ - PVOID glReserved1[0xA3]; /* A50h */ - PVOID glReserved2; /* BDCh */ - PVOID glSectionInfo; /* BE0h */ - PVOID glSection; /* BE4h */ - PVOID glTable; /* BE8h */ - PVOID glCurrentRC; /* BECh */ - PVOID glContext; /* BF0h */ -} TEB, *PTEB; - -#pragma warning ( disable : 4035 ) -static inline PTEB __declspec(naked) NtCurrentTeb(void) -{ - //struct _TEB * pTeb; - __asm mov eax, fs:0x18 - //__asm mov pTeb, eax - //return pTeb; -}; -#pragma warning ( default : 4035 ) - -#else/*_MSC_VER*/ - #define NTOS_MODE_USER #include -#endif/*_MSC_VER*/ diff --git a/reactos/lib/opengl32/wgl.c b/reactos/lib/opengl32/wgl.c index 098e362927e..b8c2671c1cf 100644 --- a/reactos/lib/opengl32/wgl.c +++ b/reactos/lib/opengl32/wgl.c @@ -9,6 +9,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/lib/psapi/precomp.h b/reactos/lib/psapi/precomp.h index 90be1713874..000b58f13c4 100644 --- a/reactos/lib/psapi/precomp.h +++ b/reactos/lib/psapi/precomp.h @@ -1,4 +1,4 @@ - +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/rtl/access.c b/reactos/lib/rtl/access.c index 96a677c9939..46e18409625 100644 --- a/reactos/lib/rtl/access.c +++ b/reactos/lib/rtl/access.c @@ -17,7 +17,8 @@ /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI RtlAreAllAccessesGranted(ACCESS_MASK GrantedAccess, ACCESS_MASK DesiredAccess) { @@ -25,41 +26,37 @@ RtlAreAllAccessesGranted(ACCESS_MASK GrantedAccess, return ((GrantedAccess & DesiredAccess) == DesiredAccess); } - /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI RtlAreAnyAccessesGranted(ACCESS_MASK GrantedAccess, ACCESS_MASK DesiredAccess) { - PAGED_CODE_RTL(); - return ((GrantedAccess & DesiredAccess) != 0); + PAGED_CODE_RTL(); + return ((GrantedAccess & DesiredAccess) != 0); } - /* * @implemented */ -VOID STDCALL +VOID +NTAPI RtlMapGenericMask(PACCESS_MASK AccessMask, PGENERIC_MAPPING GenericMapping) { - PAGED_CODE_RTL(); + PAGED_CODE_RTL(); - if (*AccessMask & GENERIC_READ) - *AccessMask |= GenericMapping->GenericRead; + if (*AccessMask & GENERIC_READ) *AccessMask |= GenericMapping->GenericRead; - if (*AccessMask & GENERIC_WRITE) - *AccessMask |= GenericMapping->GenericWrite; + if (*AccessMask & GENERIC_WRITE) *AccessMask |= GenericMapping->GenericWrite; - if (*AccessMask & GENERIC_EXECUTE) - *AccessMask |= GenericMapping->GenericExecute; + if (*AccessMask & GENERIC_EXECUTE) *AccessMask |= GenericMapping->GenericExecute; - if (*AccessMask & GENERIC_ALL) - *AccessMask |= GenericMapping->GenericAll; + if (*AccessMask & GENERIC_ALL) *AccessMask |= GenericMapping->GenericAll; - *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); + *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } /* EOF */ diff --git a/reactos/lib/rtl/acl.c b/reactos/lib/rtl/acl.c index 1f7e99bfab7..dd9711c7461 100644 --- a/reactos/lib/rtl/acl.c +++ b/reactos/lib/rtl/acl.c @@ -14,7 +14,7 @@ /* FUNCTIONS ***************************************************************/ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlFirstFreeAce(PACL Acl, PACE* Ace) { @@ -62,7 +62,7 @@ RtlFirstFreeAce(PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlGetAce(PACL Acl, ULONG AceIndex, PVOID *Ace) @@ -150,7 +150,7 @@ RtlpAddKnownAce (PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessAllowedAce (IN OUT PACL Acl, IN ULONG Revision, IN ACCESS_MASK AccessMask, @@ -170,7 +170,7 @@ RtlAddAccessAllowedAce (IN OUT PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessAllowedAceEx (IN OUT PACL Acl, IN ULONG Revision, IN ULONG Flags, @@ -191,7 +191,7 @@ RtlAddAccessAllowedAceEx (IN OUT PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessDeniedAce (PACL Acl, ULONG Revision, ACCESS_MASK AccessMask, @@ -211,7 +211,7 @@ RtlAddAccessDeniedAce (PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAccessDeniedAceEx (IN OUT PACL Acl, IN ULONG Revision, IN ULONG Flags, @@ -254,7 +254,7 @@ RtlpAddData(PVOID AceList, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAce(PACL Acl, ULONG AclRevision, ULONG StartingIndex, @@ -323,7 +323,7 @@ RtlAddAce(PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAuditAccessAce(PACL Acl, ULONG Revision, ACCESS_MASK AccessMask, @@ -390,7 +390,7 @@ RtlAddAuditAccessAce(PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAuditAccessAceEx(PACL Acl, ULONG Revision, ULONG Flags, @@ -477,7 +477,7 @@ RtlpDeleteData(PVOID Ace, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDeleteAce(PACL Acl, ULONG AceIndex) { @@ -513,7 +513,7 @@ RtlDeleteAce(PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateAcl(PACL Acl, ULONG AclSize, ULONG AclRevision) @@ -546,7 +546,7 @@ RtlCreateAcl(PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryInformationAcl(PACL Acl, PVOID Information, ULONG InformationLength, @@ -615,7 +615,7 @@ RtlQueryInformationAcl(PACL Acl, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlSetInformationAcl(PACL Acl, PVOID Information, ULONG InformationLength, @@ -660,7 +660,7 @@ RtlSetInformationAcl(PACL Acl, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlValidAcl (PACL Acl) { PACE Ace; diff --git a/reactos/lib/rtl/atom.c b/reactos/lib/rtl/atom.c index fc54bb3044e..4467f67bf08 100644 --- a/reactos/lib/rtl/atom.c +++ b/reactos/lib/rtl/atom.c @@ -135,7 +135,7 @@ RtlpCheckIntegerAtom(PWSTR AtomName, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateAtomTable(IN ULONG TableSize, IN OUT PRTL_ATOM_TABLE *AtomTable) { @@ -183,7 +183,7 @@ RtlCreateAtomTable(IN ULONG TableSize, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDestroyAtomTable(IN PRTL_ATOM_TABLE AtomTable) { PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; @@ -232,7 +232,7 @@ RtlDestroyAtomTable(IN PRTL_ATOM_TABLE AtomTable) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlEmptyAtomTable(PRTL_ATOM_TABLE AtomTable, BOOLEAN DeletePinned) { @@ -286,7 +286,7 @@ RtlEmptyAtomTable(PRTL_ATOM_TABLE AtomTable, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddAtomToAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN PWSTR AtomName, OUT PRTL_ATOM Atom) @@ -406,7 +406,7 @@ end: /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDeleteAtomFromAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN RTL_ATOM Atom) { @@ -478,7 +478,7 @@ RtlDeleteAtomFromAtomTable(IN PRTL_ATOM_TABLE AtomTable, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlLookupAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN PWSTR AtomName, OUT PRTL_ATOM Atom) @@ -535,7 +535,7 @@ RtlLookupAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlPinAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN RTL_ATOM Atom) { @@ -589,7 +589,7 @@ RtlPinAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, * (again EXCLUDING the null terminator) is returned in NameLength, at least * on Win2k, XP and ReactOS. NT4 will return 0 in that case. */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryAtomInAtomTable(PRTL_ATOM_TABLE AtomTable, RTL_ATOM Atom, PULONG RefCount, @@ -694,7 +694,7 @@ RtlQueryAtomInAtomTable(PRTL_ATOM_TABLE AtomTable, /* * @private - only used by NtQueryInformationAtom */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryAtomListInAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN ULONG MaxAtomCount, OUT ULONG *AtomCount, diff --git a/reactos/lib/rtl/bit.c b/reactos/lib/rtl/bit.c index 23519445cad..be7008831b1 100644 --- a/reactos/lib/rtl/bit.c +++ b/reactos/lib/rtl/bit.c @@ -16,7 +16,7 @@ /* * @implemented */ -CCHAR STDCALL +CCHAR NTAPI RtlFindLeastSignificantBit(IN ULONGLONG Set) { int i; @@ -37,7 +37,7 @@ RtlFindLeastSignificantBit(IN ULONGLONG Set) /* * @implemented */ -CCHAR STDCALL +CCHAR NTAPI RtlFindMostSignificantBit(IN ULONGLONG Set) { int i; diff --git a/reactos/lib/rtl/bitmap.c b/reactos/lib/rtl/bitmap.c index cb41c7de5c2..e8db64e36df 100644 --- a/reactos/lib/rtl/bitmap.c +++ b/reactos/lib/rtl/bitmap.c @@ -24,7 +24,7 @@ /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlInitializeBitMap(PRTL_BITMAP BitMapHeader, PULONG BitMapBuffer, ULONG SizeOfBitMap) @@ -37,7 +37,7 @@ RtlInitializeBitMap(PRTL_BITMAP BitMapHeader, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlAreBitsClear(PRTL_BITMAP BitMapHeader, ULONG StartingIndex, ULONG Length) @@ -77,7 +77,7 @@ RtlAreBitsClear(PRTL_BITMAP BitMapHeader, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlAreBitsSet(PRTL_BITMAP BitMapHeader, ULONG StartingIndex, ULONG Length) @@ -122,7 +122,7 @@ RtlAreBitsSet(PRTL_BITMAP BitMapHeader, * This function is exercised by the whole page allocator in npool.c * which is how i came across this error. */ -VOID STDCALL +VOID NTAPI RtlClearAllBits(IN OUT PRTL_BITMAP BitMapHeader) { memset(BitMapHeader->Buffer, @@ -134,7 +134,7 @@ RtlClearAllBits(IN OUT PRTL_BITMAP BitMapHeader) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlClearBit(PRTL_BITMAP BitMapHeader, ULONG BitNumber) { @@ -152,7 +152,7 @@ RtlClearBit(PRTL_BITMAP BitMapHeader, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlClearBits(PRTL_BITMAP BitMapHeader, ULONG StartingIndex, ULONG NumberToClear) @@ -188,7 +188,7 @@ RtlClearBits(PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindClearBits(PRTL_BITMAP BitMapHeader, ULONG NumberToFind, ULONG HintIndex) @@ -271,7 +271,7 @@ RtlFindClearBits(PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindClearBitsAndSet(PRTL_BITMAP BitMapHeader, ULONG NumberToFind, ULONG HintIndex) @@ -295,7 +295,7 @@ RtlFindClearBitsAndSet(PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindFirstRunClear(PRTL_BITMAP BitMapHeader, PULONG StartingIndex) { @@ -359,7 +359,7 @@ RtlFindFirstRunClear(PRTL_BITMAP BitMapHeader, /* * @unimplemented */ -ULONG STDCALL +ULONG NTAPI RtlFindClearRuns(PRTL_BITMAP BitMapHeader, PRTL_BITMAP_RUN RunArray, ULONG SizeOfRunArray, @@ -373,7 +373,7 @@ RtlFindClearRuns(PRTL_BITMAP BitMapHeader, /* * @unimplemented */ -ULONG STDCALL +ULONG NTAPI RtlFindLastBackwardRunClear(IN PRTL_BITMAP BitMapHeader, IN ULONG FromIndex, IN PULONG StartingRunIndex) @@ -386,7 +386,7 @@ RtlFindLastBackwardRunClear(IN PRTL_BITMAP BitMapHeader, /* * @unimplemented */ -ULONG STDCALL +ULONG NTAPI RtlFindNextForwardRunClear(IN PRTL_BITMAP BitMapHeader, IN ULONG FromIndex, IN PULONG StartingRunIndex) @@ -399,7 +399,7 @@ RtlFindNextForwardRunClear(IN PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindFirstRunSet(IN PRTL_BITMAP BitMapHeader, IN PULONG StartingIndex) { @@ -463,7 +463,7 @@ RtlFindFirstRunSet(IN PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindLongestRunClear(PRTL_BITMAP BitMapHeader, PULONG StartingIndex) { @@ -527,7 +527,7 @@ RtlFindLongestRunClear(PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindLongestRunSet(PRTL_BITMAP BitMapHeader, PULONG StartingIndex) { @@ -591,7 +591,7 @@ RtlFindLongestRunSet(PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindSetBits(PRTL_BITMAP BitMapHeader, ULONG NumberToFind, ULONG HintIndex) @@ -675,7 +675,7 @@ RtlFindSetBits(PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlFindSetBitsAndClear(PRTL_BITMAP BitMapHeader, ULONG NumberToFind, ULONG HintIndex) @@ -699,7 +699,7 @@ RtlFindSetBitsAndClear(PRTL_BITMAP BitMapHeader, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlNumberOfClearBits(PRTL_BITMAP BitMapHeader) { PULONG Ptr; @@ -731,7 +731,7 @@ RtlNumberOfClearBits(PRTL_BITMAP BitMapHeader) /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlNumberOfSetBits(PRTL_BITMAP BitMapHeader) { PULONG Ptr; @@ -768,7 +768,7 @@ RtlNumberOfSetBits(PRTL_BITMAP BitMapHeader) * The companion function, RtlClearAllBits, is exercised by the whole page * allocator in npool.c which is how i came across this error. */ -VOID STDCALL +VOID NTAPI RtlSetAllBits(IN OUT PRTL_BITMAP BitMapHeader) { memset(BitMapHeader->Buffer, @@ -780,7 +780,7 @@ RtlSetAllBits(IN OUT PRTL_BITMAP BitMapHeader) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlSetBit(PRTL_BITMAP BitMapHeader, ULONG BitNumber) { @@ -798,7 +798,7 @@ RtlSetBit(PRTL_BITMAP BitMapHeader, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlSetBits(PRTL_BITMAP BitMapHeader, ULONG StartingIndex, ULONG NumberToSet) @@ -834,7 +834,7 @@ RtlSetBits(PRTL_BITMAP BitMapHeader, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlTestBit(PRTL_BITMAP BitMapHeader, ULONG BitNumber) { diff --git a/reactos/lib/rtl/bootdata.c b/reactos/lib/rtl/bootdata.c index 1c5a339fb40..9ea7b14c85e 100644 --- a/reactos/lib/rtl/bootdata.c +++ b/reactos/lib/rtl/bootdata.c @@ -18,7 +18,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlCreateSystemVolumeInformationFolder( IN PUNICODE_STRING VolumeRootPath ) @@ -31,7 +31,7 @@ RtlCreateSystemVolumeInformationFolder( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlGetSetBootStatusData( HANDLE Filehandle, BOOLEAN WriteMode, @@ -49,7 +49,7 @@ RtlGetSetBootStatusData( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlLockBootStatusData( HANDLE Filehandle ) @@ -62,7 +62,7 @@ RtlLockBootStatusData( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlUnlockBootStatusData( HANDLE Filehandle ) diff --git a/reactos/lib/rtl/compress.c b/reactos/lib/rtl/compress.c index fbee7827eb1..654637128df 100644 --- a/reactos/lib/rtl/compress.c +++ b/reactos/lib/rtl/compress.c @@ -62,7 +62,7 @@ RtlpWorkSpaceSizeLZNT1(USHORT Engine, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCompressBuffer(IN USHORT CompressionFormatAndEngine, IN PUCHAR UncompressedBuffer, IN ULONG UncompressedBufferSize, @@ -96,7 +96,7 @@ RtlCompressBuffer(IN USHORT CompressionFormatAndEngine, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCompressChunks(IN PUCHAR UncompressedBuffer, IN ULONG UncompressedBufferSize, OUT PUCHAR CompressedBuffer, @@ -112,7 +112,7 @@ RtlCompressChunks(IN PUCHAR UncompressedBuffer, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDecompressBuffer(IN USHORT CompressionFormat, OUT PUCHAR UncompressedBuffer, IN ULONG UncompressedBufferSize, @@ -127,7 +127,7 @@ RtlDecompressBuffer(IN USHORT CompressionFormat, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDecompressChunks(OUT PUCHAR UncompressedBuffer, IN ULONG UncompressedBufferSize, IN PUCHAR CompressedBuffer, @@ -143,7 +143,7 @@ RtlDecompressChunks(OUT PUCHAR UncompressedBuffer, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDecompressFragment(IN USHORT CompressionFormat, OUT PUCHAR UncompressedFragment, IN ULONG UncompressedFragmentSize, @@ -160,7 +160,7 @@ RtlDecompressFragment(IN USHORT CompressionFormat, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDescribeChunk(IN USHORT CompressionFormat, IN OUT PUCHAR *CompressedBuffer, IN PUCHAR EndOfCompressedBufferPlus1, @@ -174,7 +174,7 @@ RtlDescribeChunk(IN USHORT CompressionFormat, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlGetCompressionWorkSpaceSize(IN USHORT CompressionFormatAndEngine, OUT PULONG CompressBufferAndWorkSpaceSize, OUT PULONG CompressFragmentWorkSpaceSize) @@ -199,7 +199,7 @@ RtlGetCompressionWorkSpaceSize(IN USHORT CompressionFormatAndEngine, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlReserveChunk(IN USHORT CompressionFormat, IN OUT PUCHAR *CompressedBuffer, IN PUCHAR EndOfCompressedBufferPlus1, diff --git a/reactos/lib/rtl/crc32.c b/reactos/lib/rtl/crc32.c index 4babe50db56..b491b7096ac 100644 --- a/reactos/lib/rtl/crc32.c +++ b/reactos/lib/rtl/crc32.c @@ -84,7 +84,7 @@ static const ULONG CrcTable[256] = * * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlComputeCrc32 (IN ULONG Initial, IN PUCHAR Data, IN ULONG Length) diff --git a/reactos/lib/rtl/critical.c b/reactos/lib/rtl/critical.c index aa4622ae465..43494f311f7 100644 --- a/reactos/lib/rtl/critical.c +++ b/reactos/lib/rtl/critical.c @@ -40,7 +40,7 @@ static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; * *--*/ VOID -STDCALL +NTAPI RtlpCreateCriticalSectionSem(PRTL_CRITICAL_SECTION CriticalSection) { HANDLE hEvent = CriticalSection->LockSemaphore; @@ -94,7 +94,7 @@ RtlpCreateCriticalSectionSem(PRTL_CRITICAL_SECTION CriticalSection) * *--*/ NTSTATUS -STDCALL +NTAPI RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { NTSTATUS Status; @@ -175,7 +175,7 @@ RtlpWaitForCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * *--*/ VOID -STDCALL +NTAPI RtlpUnWaitCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { NTSTATUS Status; @@ -218,7 +218,7 @@ RtlpUnWaitCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * *--*/ VOID -STDCALL +NTAPI RtlpInitDeferedCriticalSection(VOID) { @@ -249,7 +249,7 @@ RtlpInitDeferedCriticalSection(VOID) * *--*/ PRTL_CRITICAL_SECTION_DEBUG -STDCALL +NTAPI RtlpAllocateDebugInfo(VOID) { ULONG i; @@ -293,7 +293,7 @@ RtlpAllocateDebugInfo(VOID) * *--*/ VOID -STDCALL +NTAPI RtlpFreeDebugInfo(PRTL_CRITICAL_SECTION_DEBUG DebugInfo) { ULONG EntryId; @@ -341,7 +341,7 @@ RtlpFreeDebugInfo(PRTL_CRITICAL_SECTION_DEBUG DebugInfo) * *--*/ NTSTATUS -STDCALL +NTAPI RtlDeleteCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { NTSTATUS Status = STATUS_SUCCESS; @@ -393,7 +393,7 @@ RtlDeleteCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * *--*/ DWORD -STDCALL +NTAPI RtlSetCriticalSectionSpinCount(PRTL_CRITICAL_SECTION CriticalSection, ULONG SpinCount) { @@ -421,7 +421,7 @@ RtlSetCriticalSectionSpinCount(PRTL_CRITICAL_SECTION CriticalSection, * *--*/ NTSTATUS -STDCALL +NTAPI RtlEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; @@ -478,7 +478,7 @@ RtlEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * *--*/ NTSTATUS -STDCALL +NTAPI RtlInitializeCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Call the Main Function */ @@ -504,7 +504,7 @@ RtlInitializeCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * *--*/ NTSTATUS -STDCALL +NTAPI RtlInitializeCriticalSectionAndSpinCount(PRTL_CRITICAL_SECTION CriticalSection, ULONG SpinCount) { @@ -590,7 +590,7 @@ RtlInitializeCriticalSectionAndSpinCount(PRTL_CRITICAL_SECTION CriticalSection, * *--*/ NTSTATUS -STDCALL +NTAPI RtlLeaveCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { #ifndef NDEBUG @@ -648,7 +648,7 @@ RtlLeaveCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * *--*/ BOOLEAN -STDCALL +NTAPI RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ diff --git a/reactos/lib/rtl/dbgbuffer.c b/reactos/lib/rtl/dbgbuffer.c index a88fc849ce5..c90fedfbd84 100644 --- a/reactos/lib/rtl/dbgbuffer.c +++ b/reactos/lib/rtl/dbgbuffer.c @@ -16,7 +16,7 @@ /* * @unimplemented */ -PDEBUG_BUFFER STDCALL +PDEBUG_BUFFER NTAPI RtlCreateQueryDebugBuffer(IN ULONG Size, IN BOOLEAN EventPair) { @@ -46,7 +46,7 @@ RtlCreateQueryDebugBuffer(IN ULONG Size, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER Buf) { NTSTATUS Status = STATUS_SUCCESS; @@ -69,7 +69,7 @@ RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER Buf) * Based on lib/epsapi/enum/modules.c by KJK::Hyperion. * */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, IN PMODULE_INFORMATION ModuleInformation OPTIONAL, IN ULONG Size OPTIONAL, @@ -227,7 +227,7 @@ RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryProcessDebugInformation(IN ULONG ProcessId, IN ULONG DebugInfoMask, IN OUT PDEBUG_BUFFER Buf) diff --git a/reactos/lib/rtl/debug.c b/reactos/lib/rtl/debug.c index eb33c7f8139..b799dd06493 100644 --- a/reactos/lib/rtl/debug.c +++ b/reactos/lib/rtl/debug.c @@ -269,7 +269,7 @@ DbgPrintReturnControlC(PCH Format, * @implemented */ ULONG -STDCALL +NTAPI DbgPrompt(PCH OutputString, PCH InputString, USHORT InputSize) @@ -293,7 +293,7 @@ DbgPrompt(PCH OutputString, * @implemented */ BOOLEAN -STDCALL +NTAPI DbgQueryDebugFilterState(IN ULONG ComponentId, IN ULONG Level) { @@ -305,7 +305,7 @@ DbgQueryDebugFilterState(IN ULONG ComponentId, * @implemented */ NTSTATUS -STDCALL +NTAPI DbgSetDebugFilterState(IN ULONG ComponentId, IN ULONG Level, IN BOOLEAN State) @@ -318,7 +318,7 @@ DbgSetDebugFilterState(IN ULONG ComponentId, * @unimplemented */ NTSTATUS -STDCALL +NTAPI DbgLoadImageSymbols(IN PUNICODE_STRING Name, IN ULONG Base, IN ULONG Unknown3) diff --git a/reactos/lib/rtl/dos8dot3.c b/reactos/lib/rtl/dos8dot3.c index 358d88d7be4..ee83b97f929 100644 --- a/reactos/lib/rtl/dos8dot3.c +++ b/reactos/lib/rtl/dos8dot3.c @@ -59,7 +59,7 @@ RtlpGetIndexLength(ULONG Index) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlGenerate8dot3Name(IN PUNICODE_STRING Name, IN BOOLEAN AllowExtendedCharacters, IN OUT PGENERATE_NAME_CONTEXT Context, @@ -232,7 +232,7 @@ RtlGenerate8dot3Name(IN PUNICODE_STRING Name, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlIsNameLegalDOS8Dot3(IN PUNICODE_STRING UnicodeName, IN PANSI_STRING AnsiName, OUT PBOOLEAN SpacesFound) @@ -316,7 +316,7 @@ RtlIsNameLegalDOS8Dot3(IN PUNICODE_STRING UnicodeName, * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlVolumeDeviceToDosName( IN PVOID VolumeDeviceObject, OUT PUNICODE_STRING DosName diff --git a/reactos/lib/rtl/encode.c b/reactos/lib/rtl/encode.c index f6be26cd87a..c8961fe5a87 100644 --- a/reactos/lib/rtl/encode.c +++ b/reactos/lib/rtl/encode.c @@ -15,7 +15,7 @@ /* FUNCTIONS ***************************************************************/ -VOID STDCALL +VOID NTAPI RtlRunDecodeUnicodeString (IN UCHAR Hash, IN OUT PUNICODE_STRING String) { @@ -38,7 +38,7 @@ RtlRunDecodeUnicodeString (IN UCHAR Hash, } -VOID STDCALL +VOID NTAPI RtlRunEncodeUnicodeString (IN OUT PUCHAR Hash, IN OUT PUNICODE_STRING String) { diff --git a/reactos/lib/rtl/env.c b/reactos/lib/rtl/env.c index 8a3a60a1349..e3ba839f2f8 100644 --- a/reactos/lib/rtl/env.c +++ b/reactos/lib/rtl/env.c @@ -12,13 +12,13 @@ #define NDEBUG #include -PPEB STDCALL RtlpCurrentPeb(VOID); +PPEB NTAPI RtlpCurrentPeb(VOID); /* FUNCTIONS *****************************************************************/ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateEnvironment(BOOLEAN Inherit, PWSTR *Environment) { @@ -93,7 +93,7 @@ RtlCreateEnvironment(BOOLEAN Inherit, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlDestroyEnvironment(PWSTR Environment) { ULONG Size = 0; @@ -108,7 +108,7 @@ RtlDestroyEnvironment(PWSTR Environment) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlExpandEnvironmentStrings_U(PWSTR Environment, PUNICODE_STRING Source, PUNICODE_STRING Destination, @@ -241,7 +241,7 @@ RtlExpandEnvironmentStrings_U(PWSTR Environment, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlSetCurrentEnvironment(PWSTR NewEnvironment, PWSTR *OldEnvironment) { @@ -265,7 +265,7 @@ RtlSetCurrentEnvironment(PWSTR NewEnvironment, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlSetEnvironmentVariable(PWSTR *Environment, PUNICODE_STRING Name, PUNICODE_STRING Value) @@ -488,7 +488,7 @@ found: /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryEnvironmentVariable_U(PWSTR Environment, PUNICODE_STRING Name, PUNICODE_STRING Value) diff --git a/reactos/lib/rtl/error.c b/reactos/lib/rtl/error.c index 00b87a9b35d..c143c5825f9 100644 --- a/reactos/lib/rtl/error.c +++ b/reactos/lib/rtl/error.c @@ -813,7 +813,7 @@ static const ERROR_TABLE ErrorTable[] = * @implemented */ VOID -STDCALL +NTAPI RtlAssert(PVOID FailedAssertion, PVOID FileName, ULONG LineNumber, @@ -842,7 +842,7 @@ RtlAssert(PVOID FailedAssertion, * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlMapSecurityErrorToNtStatus( IN ULONG SecurityError ) @@ -870,7 +870,7 @@ RtlMapSecurityErrorToNtStatus( * * @implemented */ -DWORD STDCALL +DWORD NTAPI RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status) { PERROR_TABLE Table = (PERROR_TABLE)ErrorTable; @@ -932,7 +932,7 @@ RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status) * * @implemented */ -DWORD STDCALL +DWORD NTAPI RtlNtStatusToDosError(IN NTSTATUS Status) { PTEB Teb = NtCurrentTeb (); @@ -966,7 +966,7 @@ RtlNtStatusToDosError(IN NTSTATUS Status) * REVISIONS * 1999-11-30 ea */ -INT STDCALL +INT NTAPI RtlNtStatusToPsxErrno(IN NTSTATUS Status) { #if 0 @@ -981,7 +981,7 @@ RtlNtStatusToPsxErrno(IN NTSTATUS Status) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlGetLastNtStatus(VOID) { return NtCurrentTeb()->LastStatusValue; @@ -991,7 +991,7 @@ RtlGetLastNtStatus(VOID) /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlGetLastWin32Error(VOID) { return NtCurrentTeb()->LastErrorValue; @@ -1001,7 +1001,7 @@ RtlGetLastWin32Error(VOID) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlSetLastWin32Error(IN ULONG Error) { NtCurrentTeb()->LastErrorValue = Error; @@ -1011,7 +1011,7 @@ RtlSetLastWin32Error(IN ULONG Error) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(IN NTSTATUS Status) { NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError(Status); diff --git a/reactos/lib/rtl/exception.c b/reactos/lib/rtl/exception.c index cd1230c90f4..e350cbf071d 100644 --- a/reactos/lib/rtl/exception.c +++ b/reactos/lib/rtl/exception.c @@ -21,7 +21,7 @@ * @implemented */ VOID -STDCALL +NTAPI RtlRaiseException(PEXCEPTION_RECORD ExceptionRecord) { CONTEXT Context; @@ -67,7 +67,7 @@ RtlRaiseException(PEXCEPTION_RECORD ExceptionRecord) * @implemented */ VOID -STDCALL +NTAPI RtlRaiseStatus(NTSTATUS Status) { EXCEPTION_RECORD ExceptionRecord; @@ -113,7 +113,7 @@ RtlRaiseStatus(NTSTATUS Status) * @unimplemented */ USHORT -STDCALL +NTAPI RtlCaptureStackBackTrace(IN ULONG FramesToSkip, IN ULONG FramesToCapture, OUT PVOID *BackTrace, @@ -127,7 +127,7 @@ RtlCaptureStackBackTrace(IN ULONG FramesToSkip, * @unimplemented */ ULONG -STDCALL +NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags) diff --git a/reactos/lib/rtl/generictable.c b/reactos/lib/rtl/generictable.c index c0e17cfa201..6c19107b52f 100644 --- a/reactos/lib/rtl/generictable.c +++ b/reactos/lib/rtl/generictable.c @@ -18,7 +18,7 @@ * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlDeleteElementGenericTable ( PRTL_GENERIC_TABLE Table, PVOID Buffer @@ -32,7 +32,7 @@ RtlDeleteElementGenericTable ( * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlDeleteElementGenericTableAvl ( PRTL_AVL_TABLE Table, PVOID Buffer @@ -46,7 +46,7 @@ RtlDeleteElementGenericTableAvl ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlEnumerateGenericTable ( PRTL_GENERIC_TABLE Table, BOOLEAN Restart @@ -60,7 +60,7 @@ RtlEnumerateGenericTable ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlEnumerateGenericTableAvl ( PRTL_AVL_TABLE Table, BOOLEAN Restart @@ -74,7 +74,7 @@ RtlEnumerateGenericTableAvl ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlEnumerateGenericTableLikeADirectory ( IN PRTL_AVL_TABLE Table, IN PRTL_AVL_MATCH_FUNCTION MatchFunction, @@ -93,7 +93,7 @@ RtlEnumerateGenericTableLikeADirectory ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlEnumerateGenericTableWithoutSplaying ( PRTL_GENERIC_TABLE Table, PVOID *RestartKey @@ -107,7 +107,7 @@ RtlEnumerateGenericTableWithoutSplaying ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlEnumerateGenericTableWithoutSplayingAvl ( PRTL_AVL_TABLE Table, PVOID *RestartKey @@ -121,7 +121,7 @@ RtlEnumerateGenericTableWithoutSplayingAvl ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlGetElementGenericTable( PRTL_GENERIC_TABLE Table, ULONG I @@ -135,7 +135,7 @@ RtlGetElementGenericTable( * @unimplemented */ PVOID -STDCALL +NTAPI RtlGetElementGenericTableAvl ( PRTL_AVL_TABLE Table, ULONG I @@ -149,7 +149,7 @@ RtlGetElementGenericTableAvl ( * @unimplemented */ VOID -STDCALL +NTAPI RtlInitializeGenericTable ( PRTL_GENERIC_TABLE Table, PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, @@ -165,7 +165,7 @@ RtlInitializeGenericTable ( /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlInitializeGenericTableAvl(IN OUT PRTL_AVL_TABLE Table, IN PRTL_AVL_COMPARE_ROUTINE CompareRoutine, IN PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine, @@ -187,7 +187,7 @@ RtlInitializeGenericTableAvl(IN OUT PRTL_AVL_TABLE Table, * @unimplemented */ PVOID -STDCALL +NTAPI RtlInsertElementGenericTable ( PRTL_GENERIC_TABLE Table, PVOID Buffer, @@ -203,7 +203,7 @@ RtlInsertElementGenericTable ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlInsertElementGenericTableAvl ( PRTL_AVL_TABLE Table, PVOID Buffer, @@ -219,7 +219,7 @@ RtlInsertElementGenericTableAvl ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlInsertElementGenericTableFull ( PRTL_GENERIC_TABLE Table, PVOID Buffer, @@ -237,7 +237,7 @@ RtlInsertElementGenericTableFull ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlInsertElementGenericTableFullAvl ( PRTL_AVL_TABLE Table, PVOID Buffer, @@ -256,7 +256,7 @@ RtlInsertElementGenericTableFullAvl ( * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlIsGenericTableEmpty ( PRTL_GENERIC_TABLE Table ) @@ -269,7 +269,7 @@ RtlIsGenericTableEmpty ( * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlIsGenericTableEmptyAvl ( PRTL_AVL_TABLE Table ) @@ -283,7 +283,7 @@ RtlIsGenericTableEmptyAvl ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlLookupElementGenericTable ( PRTL_GENERIC_TABLE Table, PVOID Buffer @@ -297,7 +297,7 @@ RtlLookupElementGenericTable ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlLookupElementGenericTableAvl ( PRTL_AVL_TABLE Table, PVOID Buffer @@ -311,7 +311,7 @@ RtlLookupElementGenericTableAvl ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlLookupElementGenericTableFull ( PRTL_GENERIC_TABLE Table, PVOID Buffer, @@ -327,7 +327,7 @@ RtlLookupElementGenericTableFull ( * @unimplemented */ PVOID -STDCALL +NTAPI RtlLookupElementGenericTableFullAvl ( PRTL_AVL_TABLE Table, PVOID Buffer, @@ -343,7 +343,7 @@ RtlLookupElementGenericTableFullAvl ( /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlNumberGenericTableElements(IN PRTL_GENERIC_TABLE Table) { return Table->NumberGenericTableElements; @@ -353,7 +353,7 @@ RtlNumberGenericTableElements(IN PRTL_GENERIC_TABLE Table) /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlNumberGenericTableElementsAvl(IN PRTL_AVL_TABLE Table) { return Table->NumberGenericTableElements; diff --git a/reactos/lib/rtl/handle.c b/reactos/lib/rtl/handle.c index 9d77efc4ba9..c0c2b799dc9 100644 --- a/reactos/lib/rtl/handle.c +++ b/reactos/lib/rtl/handle.c @@ -14,7 +14,7 @@ /* GLOBALS ******************************************************************/ -VOID STDCALL +VOID NTAPI RtlInitializeHandleTable(ULONG TableSize, ULONG HandleSize, PRTL_HANDLE_TABLE HandleTable) @@ -31,7 +31,7 @@ RtlInitializeHandleTable(ULONG TableSize, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlDestroyHandleTable(PRTL_HANDLE_TABLE HandleTable) { PVOID ArrayPointer; @@ -53,7 +53,7 @@ RtlDestroyHandleTable(PRTL_HANDLE_TABLE HandleTable) /* * @implemented */ -PRTL_HANDLE_TABLE_ENTRY STDCALL +PRTL_HANDLE_TABLE_ENTRY NTAPI RtlAllocateHandle(PRTL_HANDLE_TABLE HandleTable, PULONG Index) { @@ -121,7 +121,7 @@ RtlAllocateHandle(PRTL_HANDLE_TABLE HandleTable, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable, PRTL_HANDLE_TABLE_ENTRY Handle) { @@ -145,7 +145,7 @@ RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlIsValidHandle(PRTL_HANDLE_TABLE HandleTable, PRTL_HANDLE_TABLE_ENTRY Handle) { @@ -161,7 +161,7 @@ RtlIsValidHandle(PRTL_HANDLE_TABLE HandleTable, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlIsValidIndexHandle(IN PRTL_HANDLE_TABLE HandleTable, IN ULONG Index, OUT PRTL_HANDLE_TABLE_ENTRY *Handle) diff --git a/reactos/lib/rtl/heap.c b/reactos/lib/rtl/heap.c index fce1c3ae81e..e639dd2786a 100644 --- a/reactos/lib/rtl/heap.c +++ b/reactos/lib/rtl/heap.c @@ -286,7 +286,7 @@ HEAP_FindSubHeap(HEAP *heap, /* [in] Heap pointer */ * * Make sure the heap storage is committed up to (not including) ptr. */ -static inline BOOLEAN +static __inline BOOLEAN HEAP_Commit(SUBHEAP *subheap, PVOID ptr, ULONG flags) @@ -1078,7 +1078,7 @@ static BOOLEAN HEAP_IsRealArena( * * @implemented */ -HANDLE STDCALL +HANDLE NTAPI RtlCreateHeap(ULONG flags, PVOID BaseAddress, SIZE_T maxSize, @@ -1130,7 +1130,7 @@ RtlCreateHeap(ULONG flags, * Success: A NULL HANDLE, if heap is NULL or it was destroyed * Failure: The Heap handle, if heap is the process heap. */ -HANDLE STDCALL +HANDLE NTAPI RtlDestroyHeap(HANDLE heap) /* [in] Handle of heap */ { HEAP *heapPtr = HEAP_GetPtr( heap ); @@ -1186,7 +1186,7 @@ RtlDestroyHeap(HANDLE heap) /* [in] Handle of heap */ * 0x7d030f60--invalid flags in RtlHeapAllocate * @implemented */ -PVOID STDCALL +PVOID NTAPI RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */ ULONG flags, /* [in] Heap allocation control flags */ ULONG size) /* [in] Number of bytes to allocate */ @@ -1264,7 +1264,7 @@ RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */ * * @implemented */ -BOOLEAN STDCALL RtlFreeHeap( +BOOLEAN NTAPI RtlFreeHeap( HANDLE heap, /* [in] Handle of heap */ ULONG flags, /* [in] Heap freeing flags */ PVOID ptr /* [in] Address of memory to free */ @@ -1327,7 +1327,7 @@ BOOLEAN STDCALL RtlFreeHeap( * 0x7d030f60--invalid flags in RtlHeapAllocate * @implemented */ -PVOID STDCALL RtlReAllocateHeap( +PVOID NTAPI RtlReAllocateHeap( HANDLE Heap, ULONG Flags, PVOID Ptr, @@ -1463,7 +1463,7 @@ PVOID STDCALL RtlReAllocateHeap( * * @unimplemented */ -ULONG STDCALL +ULONG NTAPI RtlCompactHeap(HANDLE Heap, ULONG Flags) { @@ -1485,7 +1485,7 @@ RtlCompactHeap(HANDLE Heap, * * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlLockHeap(IN HANDLE Heap) { HEAP *heapPtr = HEAP_GetPtr( Heap ); @@ -1509,7 +1509,7 @@ RtlLockHeap(IN HANDLE Heap) * * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlUnlockHeap(HANDLE Heap) { HEAP *heapPtr = HEAP_GetPtr( Heap ); @@ -1533,7 +1533,7 @@ RtlUnlockHeap(HANDLE Heap) * * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlSizeHeap( HANDLE Heap, ULONG Flags, @@ -1585,7 +1585,7 @@ RtlSizeHeap( * * @implemented */ -BOOLEAN STDCALL RtlValidateHeap( +BOOLEAN NTAPI RtlValidateHeap( HANDLE Heap, ULONG Flags, PVOID Block @@ -1612,7 +1612,7 @@ BOOLEAN STDCALL RtlValidateHeap( * FALSE: Failure */ #if 0 -BOOLEAN STDCALL HeapWalk( +BOOLEAN NTAPI HeapWalk( HANDLE heap, /* [in] Handle to heap to enumerate */ LPPROCESS_HEAP_ENTRY entry /* [out] Pointer to structure of enumeration info */ ) @@ -1742,7 +1742,7 @@ RtlInitializeHeapManager(VOID) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, PVOID lParam) { @@ -1767,7 +1767,7 @@ RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlGetProcessHeaps(ULONG HeapCount, HANDLE *HeapArray) { @@ -1796,7 +1796,7 @@ RtlGetProcessHeaps(ULONG HeapCount, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlValidateProcessHeaps(VOID) { BOOLEAN Result = TRUE; @@ -1822,7 +1822,7 @@ RtlValidateProcessHeaps(VOID) /* * @unimplemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlZeroHeap( IN PVOID HeapHandle, IN ULONG Flags diff --git a/reactos/lib/rtl/i386/exception.c b/reactos/lib/rtl/i386/exception.c index 894065d0815..7317b288967 100644 --- a/reactos/lib/rtl/i386/exception.c +++ b/reactos/lib/rtl/i386/exception.c @@ -17,16 +17,16 @@ /* PRIVATE FUNCTIONS *********************************************************/ VOID -STDCALL +NTAPI RtlpGetStackLimits(PULONG_PTR StackBase, PULONG_PTR StackLimit); PEXCEPTION_REGISTRATION_RECORD -STDCALL +NTAPI RtlpGetExceptionList(VOID); VOID -STDCALL +NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); /* PUBLIC FUNCTIONS **********************************************************/ @@ -35,7 +35,7 @@ RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); * @unimplemented */ VOID -STDCALL +NTAPI RtlGetCallersAddress(OUT PVOID *CallersAddress, OUT PVOID *CallersCaller) { @@ -46,7 +46,7 @@ RtlGetCallersAddress(OUT PVOID *CallersAddress, * @implemented */ BOOLEAN -STDCALL +NTAPI RtlDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, IN PCONTEXT Context) { @@ -174,7 +174,7 @@ RtlDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, * @implemented */ VOID -STDCALL +NTAPI RtlUnwind(PVOID RegistrationFrame OPTIONAL, PVOID ReturnAddress OPTIONAL, PEXCEPTION_RECORD ExceptionRecord OPTIONAL, diff --git a/reactos/lib/rtl/image.c b/reactos/lib/rtl/image.c index 9d14b4947ba..aa782c6b8b6 100644 --- a/reactos/lib/rtl/image.c +++ b/reactos/lib/rtl/image.c @@ -17,7 +17,7 @@ /* * @implemented */ -PIMAGE_NT_HEADERS STDCALL +PIMAGE_NT_HEADERS NTAPI RtlImageNtHeader (IN PVOID BaseAddress) { PIMAGE_NT_HEADERS NtHeader; @@ -44,7 +44,7 @@ RtlImageNtHeader (IN PVOID BaseAddress) * @implemented */ PVOID -STDCALL +NTAPI RtlImageDirectoryEntryToData ( PVOID BaseAddress, BOOLEAN bMappedAsImage, @@ -88,7 +88,7 @@ RtlImageDirectoryEntryToData ( * @implemented */ PIMAGE_SECTION_HEADER -STDCALL +NTAPI RtlImageRvaToSection ( PIMAGE_NT_HEADERS NtHeader, PVOID BaseAddress, @@ -118,7 +118,7 @@ RtlImageRvaToSection ( * @implemented */ ULONG -STDCALL +NTAPI RtlImageRvaToVa ( PIMAGE_NT_HEADERS NtHeader, PVOID BaseAddress, diff --git a/reactos/lib/rtl/largeint.c b/reactos/lib/rtl/largeint.c index 2c7bdbbb49b..af9f3061048 100644 --- a/reactos/lib/rtl/largeint.c +++ b/reactos/lib/rtl/largeint.c @@ -19,7 +19,7 @@ * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlConvertLongToLargeInteger ( LONG SignedInteger ) @@ -35,7 +35,7 @@ RtlConvertLongToLargeInteger ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlConvertUlongToLargeInteger ( ULONG UnsignedInteger ) @@ -51,7 +51,7 @@ RtlConvertUlongToLargeInteger ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlEnlargedIntegerMultiply ( LONG Multiplicand, LONG Multiplier @@ -68,7 +68,7 @@ RtlEnlargedIntegerMultiply ( * @implemented */ ULONG -STDCALL +NTAPI RtlEnlargedUnsignedDivide ( ULARGE_INTEGER Dividend, ULONG Divisor, @@ -85,7 +85,7 @@ RtlEnlargedUnsignedDivide ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlEnlargedUnsignedMultiply ( ULONG Multiplicand, ULONG Multiplier @@ -102,7 +102,7 @@ RtlEnlargedUnsignedMultiply ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlExtendedIntegerMultiply ( LARGE_INTEGER Multiplicand, LONG Multiplier @@ -119,7 +119,7 @@ RtlExtendedIntegerMultiply ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlExtendedLargeIntegerDivide ( LARGE_INTEGER Dividend, ULONG Divisor, @@ -164,7 +164,7 @@ RtlExtendedLargeIntegerDivide ( /* * @implemented */ -LARGE_INTEGER STDCALL +LARGE_INTEGER NTAPI RtlExtendedMagicDivide (LARGE_INTEGER Dividend, LARGE_INTEGER MagicDivisor, CCHAR ShiftCount) @@ -215,7 +215,7 @@ RtlExtendedMagicDivide (LARGE_INTEGER Dividend, * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlLargeIntegerAdd ( LARGE_INTEGER Addend1, LARGE_INTEGER Addend2 @@ -232,7 +232,7 @@ RtlLargeIntegerAdd ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlLargeIntegerArithmeticShift ( LARGE_INTEGER LargeInteger, CCHAR ShiftCount @@ -261,7 +261,7 @@ RtlLargeIntegerArithmeticShift ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlLargeIntegerDivide ( LARGE_INTEGER Dividend, LARGE_INTEGER Divisor, @@ -282,7 +282,7 @@ RtlLargeIntegerDivide ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlLargeIntegerNegate ( LARGE_INTEGER Subtrahend ) @@ -298,7 +298,7 @@ RtlLargeIntegerNegate ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlLargeIntegerShiftLeft ( LARGE_INTEGER LargeInteger, CCHAR ShiftCount @@ -317,7 +317,7 @@ RtlLargeIntegerShiftLeft ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlLargeIntegerShiftRight ( LARGE_INTEGER LargeInteger, CCHAR ShiftCount @@ -336,7 +336,7 @@ RtlLargeIntegerShiftRight ( * @implemented */ LARGE_INTEGER -STDCALL +NTAPI RtlLargeIntegerSubtract ( LARGE_INTEGER Minuend, LARGE_INTEGER Subtrahend diff --git a/reactos/lib/rtl/luid.c b/reactos/lib/rtl/luid.c index 612231462ea..0b3476b3408 100644 --- a/reactos/lib/rtl/luid.c +++ b/reactos/lib/rtl/luid.c @@ -14,7 +14,7 @@ /* FUNCTIONS *****************************************************************/ -VOID STDCALL +VOID NTAPI RtlCopyLuid(PLUID LuidDest, PLUID LuidSrc) { @@ -28,7 +28,7 @@ RtlCopyLuid(PLUID LuidDest, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlCopyLuidAndAttributesArray(ULONG Count, PLUID_AND_ATTRIBUTES Src, PLUID_AND_ATTRIBUTES Dest) @@ -50,7 +50,7 @@ RtlCopyLuidAndAttributesArray(ULONG Count, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlEqualLuid(PLUID Luid1, PLUID Luid2) { diff --git a/reactos/lib/rtl/mem.c b/reactos/lib/rtl/mem.c index 746253adac4..85ceba3fec1 100644 --- a/reactos/lib/rtl/mem.c +++ b/reactos/lib/rtl/mem.c @@ -12,6 +12,10 @@ #define NDEBUG #include +#undef RtlUlonglongByteSwap +#undef RtlUlongByteSwap +#undef RtlUshortByteSwap + /* FUNCTIONS *****************************************************************/ /****************************************************************************** @@ -30,7 +34,7 @@ * * @implemented */ -SIZE_T STDCALL +SIZE_T NTAPI RtlCompareMemory(IN const VOID *Source1, IN const VOID *Source2, IN SIZE_T Length) @@ -46,7 +50,7 @@ RtlCompareMemory(IN const VOID *Source1, * @implemented */ ULONG -STDCALL +NTAPI RtlCompareMemoryUlong ( PVOID Source, ULONG Length, @@ -81,7 +85,7 @@ RtlCompareMemoryUlong ( * @implemented */ VOID -STDCALL +NTAPI RtlFillMemory ( PVOID Destination, ULONG Length, @@ -97,7 +101,7 @@ RtlFillMemory ( * @implemented */ VOID -STDCALL +NTAPI RtlFillMemoryUlong ( PVOID Destination, ULONG Length, @@ -121,7 +125,7 @@ RtlFillMemoryUlong ( * @implemented */ VOID -STDCALL +NTAPI RtlMoveMemory ( PVOID Destination, CONST VOID * Source, @@ -154,7 +158,7 @@ RtlPrefetchMemoryNonTemporal( * @implemented */ VOID -STDCALL +NTAPI RtlZeroMemory ( PVOID Destination, ULONG Length diff --git a/reactos/lib/rtl/message.c b/reactos/lib/rtl/message.c index e6a74662a36..5ee73e526e8 100644 --- a/reactos/lib/rtl/message.c +++ b/reactos/lib/rtl/message.c @@ -17,7 +17,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlFindMessage(PVOID BaseAddress, ULONG Type, ULONG Language, @@ -134,7 +134,7 @@ RtlFindMessage(PVOID BaseAddress, * * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlFormatMessage(PWSTR Message, UCHAR MaxWidth, BOOLEAN IgnoreInserts, diff --git a/reactos/lib/rtl/network.c b/reactos/lib/rtl/network.c index d799280cb0e..9c5832dd500 100644 --- a/reactos/lib/rtl/network.c +++ b/reactos/lib/rtl/network.c @@ -40,7 +40,7 @@ typedef struct * @implemented */ LPSTR -STDCALL +NTAPI RtlIpv4AddressToStringA( PULONG IP, LPSTR Buffer @@ -58,7 +58,7 @@ RtlIpv4AddressToStringA( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv4AddressToStringExA( PULONG IP, PULONG Port, @@ -74,7 +74,7 @@ RtlIpv4AddressToStringExA( * @implemented */ LPWSTR -STDCALL +NTAPI RtlIpv4AddressToStringW( PULONG IP, LPWSTR Buffer @@ -92,7 +92,7 @@ RtlIpv4AddressToStringW( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv4AddressToStringExW( PULONG IP, PULONG Port, @@ -108,7 +108,7 @@ RtlIpv4AddressToStringExW( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv4StringToAddressA( IN LPSTR IpString, IN ULONG Base, @@ -124,7 +124,7 @@ RtlIpv4StringToAddressA( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv4StringToAddressExA( IN LPSTR IpString, IN ULONG Base, @@ -140,12 +140,12 @@ RtlIpv4StringToAddressExA( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv4StringToAddressW( IN LPWSTR IpString, IN ULONG Base, - OUT PVOID PtrToIpAddr, - OUT ULONG IpAddr + OUT PULONG PtrToIpAddr, + OUT PULONG IpAddr ) { UNIMPLEMENTED; @@ -156,7 +156,7 @@ RtlIpv4StringToAddressW( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv4StringToAddressExW( IN LPWSTR IpString, IN ULONG Base, @@ -172,7 +172,7 @@ RtlIpv4StringToAddressExW( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6AddressToStringA( PULONG IP, LPSTR Buffer @@ -186,7 +186,7 @@ RtlIpv6AddressToStringA( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6AddressToStringExA( PULONG IP, PULONG Port, @@ -202,7 +202,7 @@ RtlIpv6AddressToStringExA( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6AddressToStringW( PULONG IP, LPWSTR Buffer @@ -216,7 +216,7 @@ RtlIpv6AddressToStringW( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6AddressToStringExW( PULONG IP, PULONG Port, @@ -232,7 +232,7 @@ RtlIpv6AddressToStringExW( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6StringToAddressA( IN LPSTR IpString, IN ULONG Base, @@ -248,7 +248,7 @@ RtlIpv6StringToAddressA( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6StringToAddressExA( IN LPSTR IpString, IN ULONG Base, @@ -264,7 +264,7 @@ RtlIpv6StringToAddressExA( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6StringToAddressW( IN LPWSTR IpString, IN ULONG Base, @@ -280,7 +280,7 @@ RtlIpv6StringToAddressW( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlIpv6StringToAddressExW( IN LPWSTR IpString, IN ULONG Base, diff --git a/reactos/lib/rtl/nls.c b/reactos/lib/rtl/nls.c index 568887f0cb8..9923dbcde5f 100644 --- a/reactos/lib/rtl/nls.c +++ b/reactos/lib/rtl/nls.c @@ -40,7 +40,7 @@ PUSHORT NlsOemLeadByteInfo = NULL; /* exported */ /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCustomCPToUnicodeN(IN PCPTABLEINFO CustomCP, PWCHAR UnicodeString, ULONG UnicodeSize, @@ -81,7 +81,7 @@ RtlCustomCPToUnicodeN(IN PCPTABLEINFO CustomCP, -WCHAR STDCALL +WCHAR NTAPI RtlDowncaseUnicodeChar (IN WCHAR Source) { USHORT Offset; @@ -124,7 +124,7 @@ RtlDowncaseUnicodeChar (IN WCHAR Source) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlGetDefaultCodePage(OUT PUSHORT AnsiCodePage, OUT PUSHORT OemCodePage) { @@ -138,7 +138,7 @@ RtlGetDefaultCodePage(OUT PUSHORT AnsiCodePage, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlInitCodePageTable(IN PUSHORT TableBase, OUT PCPTABLEINFO CodePageTable) { @@ -198,7 +198,7 @@ RtlInitCodePageTable(IN PUSHORT TableBase, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlInitNlsTables(IN PUSHORT AnsiTableBase, IN PUSHORT OemTableBase, IN PUSHORT CaseTableBase, @@ -225,7 +225,7 @@ RtlInitNlsTables(IN PUSHORT AnsiTableBase, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlMultiByteToUnicodeN( IN PWCHAR UnicodeString, IN ULONG UnicodeSize, @@ -266,7 +266,7 @@ RtlMultiByteToUnicodeN( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlMultiByteToUnicodeSize(PULONG UnicodeSize, PCSTR MbString, ULONG MbSize) @@ -316,7 +316,7 @@ RtlMultiByteToUnicodeSize(PULONG UnicodeSize, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlOemToUnicodeN (PWCHAR UnicodeString, ULONG UnicodeSize, PULONG ResultSize, @@ -359,7 +359,7 @@ RtlOemToUnicodeN (PWCHAR UnicodeString, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable) { DPRINT("RtlResetRtlTranslations() called\n"); @@ -392,7 +392,7 @@ RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable) /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlUnicodeToCustomCPN(IN PCPTABLEINFO CustomCP, PCHAR CustomString, ULONG CustomSize, @@ -436,7 +436,7 @@ RtlUnicodeToCustomCPN(IN PCPTABLEINFO CustomCP, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlUnicodeToMultiByteN (PCHAR MbString, ULONG MbSize, PULONG ResultSize, @@ -477,7 +477,7 @@ RtlUnicodeToMultiByteN (PCHAR MbString, * @implemented */ NTSTATUS -STDCALL +NTAPI RtlUnicodeToMultiByteSize(PULONG MbSize, PWCHAR UnicodeString, ULONG UnicodeSize) @@ -515,7 +515,7 @@ RtlUnicodeToMultiByteSize(PULONG MbSize, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlUnicodeToOemN (PCHAR OemString, ULONG OemSize, PULONG ResultSize, @@ -559,7 +559,7 @@ RtlUnicodeToOemN (PCHAR OemString, /* * @implemented */ -WCHAR STDCALL +WCHAR NTAPI RtlUpcaseUnicodeChar(IN WCHAR Source) { USHORT Offset; @@ -587,7 +587,7 @@ RtlUpcaseUnicodeChar(IN WCHAR Source) /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlUpcaseUnicodeToCustomCPN (IN PCPTABLEINFO CustomCP, PCHAR CustomString, ULONG CustomSize, @@ -632,7 +632,7 @@ RtlUpcaseUnicodeToCustomCPN (IN PCPTABLEINFO CustomCP, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlUpcaseUnicodeToMultiByteN (PCHAR MbString, ULONG MbSize, PULONG ResultSize, @@ -676,7 +676,7 @@ RtlUpcaseUnicodeToMultiByteN (PCHAR MbString, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlUpcaseUnicodeToOemN (PCHAR OemString, ULONG OemSize, PULONG ResultSize, @@ -721,7 +721,7 @@ RtlUpcaseUnicodeToOemN (PCHAR OemString, /* * @unimplemented */ -CHAR STDCALL +CHAR NTAPI RtlUpperChar (IN CHAR Source) { WCHAR Unicode; diff --git a/reactos/lib/rtl/path.c b/reactos/lib/rtl/path.c index 3e55ad7876c..bb1dd0979e4 100644 --- a/reactos/lib/rtl/path.c +++ b/reactos/lib/rtl/path.c @@ -44,7 +44,7 @@ static const UNICODE_STRING _nul = RTL_CONSTANT_STRING(L"NUL"); /* * @implemented */ -ULONG STDCALL RtlGetLongestNtPathLength (VOID) +ULONG NTAPI RtlGetLongestNtPathLength (VOID) { return (MAX_PATH + 9); } @@ -54,7 +54,7 @@ ULONG STDCALL RtlGetLongestNtPathLength (VOID) * @implemented * */ -ULONG STDCALL +ULONG NTAPI RtlDetermineDosPathNameType_U(PCWSTR Path) { DPRINT("RtlDetermineDosPathNameType_U %S\n", Path); @@ -95,7 +95,7 @@ RtlDetermineDosPathNameType_U(PCWSTR Path) /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlIsDosDeviceName_U(PWSTR DeviceName) { ULONG Type; @@ -188,7 +188,7 @@ RtlIsDosDeviceName_U(PWSTR DeviceName) /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlGetCurrentDirectory_U(ULONG MaximumLength, PWSTR Buffer) { @@ -231,7 +231,7 @@ RtlGetCurrentDirectory_U(ULONG MaximumLength, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlSetCurrentDirectory_U(PUNICODE_STRING dir) { UNICODE_STRING full; @@ -677,7 +677,7 @@ done: * * @implemented */ -DWORD STDCALL RtlGetFullPathName_U( +DWORD NTAPI RtlGetFullPathName_U( const WCHAR* name, ULONG size, WCHAR* buffer, @@ -733,7 +733,7 @@ DWORD STDCALL RtlGetFullPathName_U( /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlDosPathNameToNtPathName_U(PWSTR dosname, PUNICODE_STRING ntname, PWSTR *FilePart, @@ -858,7 +858,7 @@ RtlDosPathNameToNtPathName_U(PWSTR dosname, * @implemented */ ULONG -STDCALL +NTAPI RtlDosSearchPath_U ( WCHAR *sp, WCHAR *name, @@ -934,7 +934,7 @@ RtlDosSearchPath_U ( /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlDoesFileExists_U(IN PWSTR FileName) { UNICODE_STRING NtFileName; @@ -978,7 +978,7 @@ RtlDoesFileExists_U(IN PWSTR FileName) /* * @unimplemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlDosPathNameToRelativeNtPathName_U(PVOID Unknown1, PVOID Unknown2, PVOID Unknown3, @@ -993,20 +993,20 @@ RtlDosPathNameToRelativeNtPathName_U(PVOID Unknown1, /* * @unimplemented */ -VOID STDCALL +VOID NTAPI RtlReleaseRelativeName(PVOID Unknown) { DPRINT1("RtlReleaseRelativeName(0x%p) UNIMPLEMENTED\n", Unknown); } -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpEnsureBufferSize(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3) { DPRINT1("RtlpEnsureBufferSize: stub\n"); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS STDCALL +NTSTATUS NTAPI RtlNtPathNameToDosPathName(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4) { DPRINT1("RtlNtPathNameToDosPathName: stub\n"); diff --git a/reactos/lib/rtl/ppb.c b/reactos/lib/rtl/ppb.c index 6c7993093eb..349a361062b 100644 --- a/reactos/lib/rtl/ppb.c +++ b/reactos/lib/rtl/ppb.c @@ -22,7 +22,7 @@ /* FUNCTIONS ****************************************************************/ -static inline VOID +static __inline VOID RtlpCopyParameterString(PWCHAR *Ptr, PUNICODE_STRING Destination, PUNICODE_STRING Source, @@ -41,7 +41,7 @@ RtlpCopyParameterString(PWCHAR *Ptr, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateProcessParameters(PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, PUNICODE_STRING ImagePathName, PUNICODE_STRING DllPath, @@ -219,7 +219,7 @@ RtlCreateProcessParameters(PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDestroyProcessParameters(PRTL_USER_PROCESS_PARAMETERS ProcessParameters) { ULONG RegionSize = 0; @@ -235,7 +235,7 @@ RtlDestroyProcessParameters(PRTL_USER_PROCESS_PARAMETERS ProcessParameters) * * @implemented */ -PRTL_USER_PROCESS_PARAMETERS STDCALL +PRTL_USER_PROCESS_PARAMETERS NTAPI RtlDeNormalizeProcessParams(PRTL_USER_PROCESS_PARAMETERS Params) { if (Params && (Params->Flags & PPF_NORMALIZED)) @@ -260,7 +260,7 @@ RtlDeNormalizeProcessParams(PRTL_USER_PROCESS_PARAMETERS Params) * * @implemented */ -PRTL_USER_PROCESS_PARAMETERS STDCALL +PRTL_USER_PROCESS_PARAMETERS NTAPI RtlNormalizeProcessParams(PRTL_USER_PROCESS_PARAMETERS Params) { if (Params && !(Params->Flags & PPF_NORMALIZED)) diff --git a/reactos/lib/rtl/process.c b/reactos/lib/rtl/process.c index 88a81995ea8..c833180fe21 100644 --- a/reactos/lib/rtl/process.c +++ b/reactos/lib/rtl/process.c @@ -17,7 +17,7 @@ /* INTERNAL FUNCTIONS *******************************************************/ NTSTATUS -STDCALL +NTAPI RtlpMapFile(PUNICODE_STRING ImageFileName, ULONG Attributes, PHANDLE Section) @@ -65,7 +65,7 @@ RtlpMapFile(PUNICODE_STRING ImageFileName, /* FUNCTIONS ****************************************************************/ NTSTATUS -STDCALL +NTAPI RtlpInitEnvironment(HANDLE ProcessHandle, PPEB Peb, PRTL_USER_PROCESS_PARAMETERS ProcessParameters) @@ -184,7 +184,7 @@ RtlpInitEnvironment(HANDLE ProcessHandle, * -Gunnar */ NTSTATUS -STDCALL +NTAPI RtlCreateUserProcess(IN PUNICODE_STRING ImageFileName, IN ULONG Attributes, IN OUT PRTL_USER_PROCESS_PARAMETERS ProcessParameters, @@ -319,7 +319,7 @@ RtlCreateUserProcess(IN PUNICODE_STRING ImageFileName, * @implemented */ PVOID -STDCALL +NTAPI RtlEncodePointer(IN PVOID Pointer) { ULONG Cookie; diff --git a/reactos/lib/rtl/propvar.c b/reactos/lib/rtl/propvar.c index 38091678e50..2066ef339fc 100644 --- a/reactos/lib/rtl/propvar.c +++ b/reactos/lib/rtl/propvar.c @@ -19,7 +19,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI PropertyLengthAsVariant ( DWORD Unknown0, DWORD Unknown1, @@ -34,7 +34,7 @@ PropertyLengthAsVariant ( * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlCompareVariants ( DWORD Unknown0, DWORD Unknown1, @@ -48,7 +48,7 @@ RtlCompareVariants ( * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlConvertPropertyToVariant ( DWORD Unknown0, DWORD Unknown1, @@ -63,7 +63,7 @@ RtlConvertPropertyToVariant ( * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlConvertVariantToProperty ( DWORD Unknown0, DWORD Unknown1, diff --git a/reactos/lib/rtl/random.c b/reactos/lib/rtl/random.c index 3bfe4f46fea..0b266d251c5 100644 --- a/reactos/lib/rtl/random.c +++ b/reactos/lib/rtl/random.c @@ -64,7 +64,7 @@ static ULONG SavedValue[128] = /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlRandom (IN OUT PULONG Seed) { ULONG Rand; @@ -86,7 +86,7 @@ RtlRandom (IN OUT PULONG Seed) * @unimplemented */ ULONG -STDCALL +NTAPI RtlRandomEx( PULONG Seed ) @@ -122,7 +122,7 @@ RtlRandomEx( * function and our function return a random number uniformly * distributed over [0..MAXLONG-1]. */ -ULONG STDCALL +ULONG NTAPI RtlUniform (PULONG Seed) { ULONG Result; diff --git a/reactos/lib/rtl/rangelist.c b/reactos/lib/rtl/rangelist.c index 6956786bdfc..4730bbb8392 100644 --- a/reactos/lib/rtl/rangelist.c +++ b/reactos/lib/rtl/rangelist.c @@ -47,7 +47,7 @@ typedef struct _RTL_RANGE_ENTRY * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAddRange (IN OUT PRTL_RANGE_LIST RangeList, IN ULONGLONG Start, IN ULONGLONG End, @@ -142,7 +142,7 @@ RtlAddRange (IN OUT PRTL_RANGE_LIST RangeList, * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCopyRangeList (OUT PRTL_RANGE_LIST CopyRangeList, IN PRTL_RANGE_LIST RangeList) { @@ -196,7 +196,7 @@ RtlCopyRangeList (OUT PRTL_RANGE_LIST CopyRangeList, * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDeleteOwnersRanges (IN OUT PRTL_RANGE_LIST RangeList, IN PVOID Owner) { @@ -241,7 +241,7 @@ RtlDeleteOwnersRanges (IN OUT PRTL_RANGE_LIST RangeList, * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDeleteRange (IN OUT PRTL_RANGE_LIST RangeList, IN ULONGLONG Start, IN ULONGLONG End, @@ -301,7 +301,7 @@ RtlDeleteRange (IN OUT PRTL_RANGE_LIST RangeList, * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlFindRange (IN PRTL_RANGE_LIST RangeList, IN ULONGLONG Minimum, IN ULONGLONG Maximum, @@ -399,7 +399,7 @@ RtlFindRange (IN PRTL_RANGE_LIST RangeList, * * @implemented */ -VOID STDCALL +VOID NTAPI RtlFreeRangeList (IN PRTL_RANGE_LIST RangeList) { PLIST_ENTRY Entry; @@ -438,7 +438,7 @@ RtlFreeRangeList (IN PRTL_RANGE_LIST RangeList) * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlGetFirstRange (IN PRTL_RANGE_LIST RangeList, OUT PRTL_RANGE_LIST_ITERATOR Iterator, OUT PRTL_RANGE *Range) @@ -478,7 +478,7 @@ RtlGetFirstRange (IN PRTL_RANGE_LIST RangeList, * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlGetNextRange (IN OUT PRTL_RANGE_LIST_ITERATOR Iterator, OUT PRTL_RANGE *Range, IN BOOLEAN MoveForwards) @@ -524,7 +524,7 @@ RtlGetNextRange (IN OUT PRTL_RANGE_LIST_ITERATOR Iterator, * * @implemented */ -VOID STDCALL +VOID NTAPI RtlInitializeRangeList (IN OUT PRTL_RANGE_LIST RangeList) { InitializeListHead (&RangeList->ListHead); @@ -550,7 +550,7 @@ RtlInitializeRangeList (IN OUT PRTL_RANGE_LIST RangeList) * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlInvertRangeList (OUT PRTL_RANGE_LIST InvertedRangeList, IN PRTL_RANGE_LIST RangeList) { @@ -650,7 +650,7 @@ RtlInvertRangeList (OUT PRTL_RANGE_LIST InvertedRangeList, * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlIsRangeAvailable (IN PRTL_RANGE_LIST RangeList, IN ULONGLONG Start, IN ULONGLONG End, @@ -710,7 +710,7 @@ RtlIsRangeAvailable (IN PRTL_RANGE_LIST RangeList, * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlMergeRangeLists (OUT PRTL_RANGE_LIST MergedRangeList, IN PRTL_RANGE_LIST RangeList1, IN PRTL_RANGE_LIST RangeList2, diff --git a/reactos/lib/rtl/registry.c b/reactos/lib/rtl/registry.c index e4a23423744..4ded6dc1414 100644 --- a/reactos/lib/rtl/registry.c +++ b/reactos/lib/rtl/registry.c @@ -154,7 +154,7 @@ RtlpGetRegistryHandle(ULONG RelativeTo, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path) { @@ -179,7 +179,7 @@ RtlCheckRegistryKey(IN ULONG RelativeTo, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateRegistryKey(IN ULONG RelativeTo, IN PWSTR Path) { @@ -204,7 +204,7 @@ RtlCreateRegistryKey(IN ULONG RelativeTo, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlDeleteRegistryValue(IN ULONG RelativeTo, IN PCWSTR Path, IN PCWSTR ValueName) @@ -237,7 +237,7 @@ RtlDeleteRegistryValue(IN ULONG RelativeTo, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlFormatCurrentUserKeyPath (OUT PUNICODE_STRING KeyPath) { HANDLE TokenHandle; @@ -323,7 +323,7 @@ RtlFormatCurrentUserKeyPath (OUT PUNICODE_STRING KeyPath) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlOpenCurrentUser(IN ACCESS_MASK DesiredAccess, OUT PHANDLE KeyHandle) { @@ -369,7 +369,7 @@ RtlOpenCurrentUser(IN ACCESS_MASK DesiredAccess, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, IN PRTL_QUERY_REGISTRY_TABLE QueryTable, @@ -873,7 +873,7 @@ RtlQueryRegistryValues(IN ULONG RelativeTo, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlWriteRegistryValue(IN ULONG RelativeTo, IN PCWSTR Path, IN PCWSTR ValueName, @@ -920,7 +920,7 @@ RtlWriteRegistryValue(IN ULONG RelativeTo, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpNtCreateKey(OUT HANDLE KeyHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -944,7 +944,7 @@ RtlpNtCreateKey(OUT HANDLE KeyHandle, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpNtEnumerateSubKey(IN HANDLE KeyHandle, OUT PUNICODE_STRING SubKeyName, IN ULONG Index, @@ -998,7 +998,7 @@ RtlpNtEnumerateSubKey(IN HANDLE KeyHandle, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpNtMakeTemporaryKey(IN HANDLE KeyHandle) { return(ZwDeleteKey(KeyHandle)); @@ -1008,7 +1008,7 @@ RtlpNtMakeTemporaryKey(IN HANDLE KeyHandle) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpNtOpenKey(OUT HANDLE KeyHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -1026,7 +1026,7 @@ RtlpNtOpenKey(OUT HANDLE KeyHandle, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpNtQueryValueKey(IN HANDLE KeyHandle, OUT PULONG Type OPTIONAL, OUT PVOID Data OPTIONAL, @@ -1081,7 +1081,7 @@ RtlpNtQueryValueKey(IN HANDLE KeyHandle, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlpNtSetValueKey(IN HANDLE KeyHandle, IN ULONG Type, IN PVOID Data, diff --git a/reactos/lib/rtl/resource.c b/reactos/lib/rtl/resource.c index a170db8a1d4..2861b6bc8b4 100644 --- a/reactos/lib/rtl/resource.c +++ b/reactos/lib/rtl/resource.c @@ -20,7 +20,7 @@ /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlInitializeResource(PRTL_RESOURCE Resource) { NTSTATUS Status; @@ -62,7 +62,7 @@ RtlInitializeResource(PRTL_RESOURCE Resource) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlDeleteResource(PRTL_RESOURCE Resource) { RtlDeleteCriticalSection(&Resource->Lock); @@ -78,7 +78,7 @@ RtlDeleteResource(PRTL_RESOURCE Resource) /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlAcquireResourceExclusive(PRTL_RESOURCE Resource, BOOLEAN Wait) { @@ -130,7 +130,7 @@ done: /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlAcquireResourceShared(PRTL_RESOURCE Resource, BOOLEAN Wait) { @@ -175,7 +175,7 @@ done: /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlConvertExclusiveToShared(PRTL_RESOURCE Resource) { RtlEnterCriticalSection(&Resource->Lock); @@ -209,7 +209,7 @@ RtlConvertExclusiveToShared(PRTL_RESOURCE Resource) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlConvertSharedToExclusive(PRTL_RESOURCE Resource) { NTSTATUS Status; @@ -243,7 +243,7 @@ RtlConvertSharedToExclusive(PRTL_RESOURCE Resource) /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlReleaseResource(PRTL_RESOURCE Resource) { RtlEnterCriticalSection(&Resource->Lock); @@ -297,7 +297,7 @@ wake_exclusive: /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlDumpResource(PRTL_RESOURCE Resource) { DbgPrint("RtlDumpResource(%p):\n\tactive count = %i\n\twaiting readers = %i\n\twaiting writers = %i\n", diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h index 367b8fdefe6..14cb71fcdf6 100644 --- a/reactos/lib/rtl/rtl.h +++ b/reactos/lib/rtl/rtl.h @@ -11,18 +11,17 @@ /* We're a core NT DLL, we don't import syscalls */ #define _NTSYSTEM_ #define _NTDLLBUILD_ +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#define _INC_SWPRINTF_INL_ /* C Headers */ #include /* PSDK/NDK Headers */ #include -#define NTOS_MODE_USER #include -/* Helper Header */ -#include - /* Internal RTL header */ #include "rtlp.h" diff --git a/reactos/lib/rtl/rtlp.h b/reactos/lib/rtl/rtlp.h index 25625e012a9..37f9c028f35 100644 --- a/reactos/lib/rtl/rtlp.h +++ b/reactos/lib/rtl/rtlp.h @@ -18,35 +18,35 @@ extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line); /* These provide support for sharing code between User and Kernel RTL */ PVOID -STDCALL +NTAPI RtlpAllocateMemory( ULONG Bytes, ULONG Tag); VOID -STDCALL +NTAPI RtlpFreeMemory( PVOID Mem, ULONG Tag); KPROCESSOR_MODE -STDCALL +NTAPI RtlpGetMode(VOID); NTSTATUS -STDCALL +NTAPI RtlDeleteHeapLock(PRTL_CRITICAL_SECTION CriticalSection); NTSTATUS -STDCALL +NTAPI RtlEnterHeapLock(PRTL_CRITICAL_SECTION CriticalSection); NTSTATUS -STDCALL +NTAPI RtlInitializeHeapLock(PRTL_CRITICAL_SECTION CriticalSection); NTSTATUS -STDCALL +NTAPI RtlLeaveHeapLock(PRTL_CRITICAL_SECTION CriticalSection); BOOLEAN @@ -70,7 +70,7 @@ RtlpSetInDbgPrint(IN BOOLEAN NewValue); /* i386/except.S */ EXCEPTION_DISPOSITION -STDCALL +NTAPI RtlpExecuteHandlerForException(PEXCEPTION_RECORD ExceptionRecord, PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, @@ -78,7 +78,7 @@ RtlpExecuteHandlerForException(PEXCEPTION_RECORD ExceptionRecord, PEXCEPTION_HANDLER ExceptionHandler); EXCEPTION_DISPOSITION -STDCALL +NTAPI RtlpExecuteHandlerForUnwind(PEXCEPTION_RECORD ExceptionRecord, PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, diff --git a/reactos/lib/rtl/sd.c b/reactos/lib/rtl/sd.c index 8bd2ef1d163..0c0b26368c8 100644 --- a/reactos/lib/rtl/sd.c +++ b/reactos/lib/rtl/sd.c @@ -17,7 +17,7 @@ static VOID -RtlpQuerySecurityDescriptorPointers(IN PSECURITY_DESCRIPTOR SecurityDescriptor, +RtlpQuerySecurityDescriptorPointers(IN PISECURITY_DESCRIPTOR SecurityDescriptor, OUT PSID *Owner OPTIONAL, OUT PSID *Group OPTIONAL, OUT PACL *Sacl OPTIONAL, @@ -107,8 +107,8 @@ RtlpQuerySecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlCreateSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, ULONG Revision) { PAGED_CODE_RTL(); @@ -130,7 +130,7 @@ RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, } -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCreateSecurityDescriptorRelative (PISECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, ULONG Revision) { @@ -156,7 +156,7 @@ RtlCreateSecurityDescriptorRelative (PISECURITY_DESCRIPTOR_RELATIVE SecurityDesc /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor) { PSID Owner, Group; @@ -198,8 +198,8 @@ RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor) /* * @implemented */ -NTSTATUS STDCALL -RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlGetDaclSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, PBOOLEAN DaclPresent, PACL* Dacl, PBOOLEAN DaclDefaulted) @@ -233,8 +233,8 @@ RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlSetDaclSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, BOOLEAN DaclPresent, PACL Dacl, BOOLEAN DaclDefaulted) @@ -273,8 +273,8 @@ RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -BOOLEAN STDCALL -RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor) +BOOLEAN NTAPI +RtlValidSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor) { PSID Owner, Group; PACL Sacl, Dacl; @@ -307,8 +307,8 @@ RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor) /* * @implemented */ -NTSTATUS STDCALL -RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlSetOwnerSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, PSID Owner, BOOLEAN OwnerDefaulted) { @@ -339,8 +339,8 @@ RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlGetOwnerSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, PSID* Owner, PBOOLEAN OwnerDefaulted) { @@ -366,8 +366,8 @@ RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlSetGroupSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, PSID Group, BOOLEAN GroupDefaulted) { @@ -397,8 +397,8 @@ RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlGetGroupSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, PSID* Group, PBOOLEAN GroupDefaulted) { @@ -424,8 +424,8 @@ RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR AbsSD, +NTSTATUS NTAPI +RtlMakeSelfRelativeSD(PISECURITY_DESCRIPTOR AbsSD, PISECURITY_DESCRIPTOR_RELATIVE RelSD, PULONG BufferLength) { @@ -509,9 +509,9 @@ RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR AbsSD, /* * @implemented */ -NTSTATUS STDCALL -RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR AbsSD, - PSECURITY_DESCRIPTOR RelSD, +NTSTATUS NTAPI +RtlAbsoluteToSelfRelativeSD(PISECURITY_DESCRIPTOR AbsSD, + PISECURITY_DESCRIPTOR RelSD, PULONG BufferLength) { PAGED_CODE_RTL(); @@ -528,8 +528,8 @@ RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR AbsSD, /* * @implemented */ -NTSTATUS STDCALL -RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlGetControlSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, PSECURITY_DESCRIPTOR_CONTROL Control, PULONG Revision) { @@ -551,8 +551,8 @@ RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlSetControlSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlSetControlSecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptor, IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { @@ -576,8 +576,8 @@ RtlSetControlSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlGetSaclSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, PBOOLEAN SaclPresent, PACL *Sacl, PBOOLEAN SaclDefaulted) @@ -611,8 +611,8 @@ RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlSetSaclSecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, BOOLEAN SaclPresent, PACL Sacl, BOOLEAN SaclDefaulted) @@ -651,9 +651,9 @@ RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlSelfRelativeToAbsoluteSD(PSECURITY_DESCRIPTOR RelSD, - PSECURITY_DESCRIPTOR AbsSD, +NTSTATUS NTAPI +RtlSelfRelativeToAbsoluteSD(PISECURITY_DESCRIPTOR RelSD, + PISECURITY_DESCRIPTOR AbsSD, PDWORD AbsSDSize, PACL Dacl, PDWORD DaclSize, @@ -728,7 +728,7 @@ RtlSelfRelativeToAbsoluteSD(PSECURITY_DESCRIPTOR RelSD, /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlSelfRelativeToAbsoluteSD2(PISECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurityDescriptor, PULONG BufferSize) { @@ -740,8 +740,8 @@ RtlSelfRelativeToAbsoluteSD2(PISECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurity /* * @implemented */ -BOOLEAN STDCALL -RtlValidRelativeSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptorInput, +BOOLEAN NTAPI +RtlValidRelativeSecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptorInput, IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation) { @@ -813,8 +813,8 @@ RtlValidRelativeSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptorInp /* * @implemented */ -BOOLEAN STDCALL -RtlGetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor, +BOOLEAN NTAPI +RtlGetSecurityDescriptorRMControl(PISECURITY_DESCRIPTOR SecurityDescriptor, PUCHAR RMControl) { PAGED_CODE_RTL(); @@ -834,8 +834,8 @@ RtlGetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -VOID STDCALL -RtlSetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor, +VOID NTAPI +RtlSetSecurityDescriptorRMControl(PISECURITY_DESCRIPTOR SecurityDescriptor, PUCHAR RMControl) { PAGED_CODE_RTL(); @@ -856,8 +856,8 @@ RtlSetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor, /* * @implemented */ -NTSTATUS STDCALL -RtlSetAttributesSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, +NTSTATUS NTAPI +RtlSetAttributesSecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptor, IN SECURITY_DESCRIPTOR_CONTROL Control, OUT PULONG Revision) { diff --git a/reactos/lib/rtl/security.c b/reactos/lib/rtl/security.c index 579463332ed..6c6857165bc 100644 --- a/reactos/lib/rtl/security.c +++ b/reactos/lib/rtl/security.c @@ -18,7 +18,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { HANDLE ProcessToken; @@ -85,7 +85,7 @@ RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAdjustPrivilege(IN ULONG Privilege, IN BOOLEAN Enable, IN BOOLEAN CurrentThread, @@ -164,7 +164,7 @@ RtlAdjustPrivilege(IN ULONG Privilege, * @implemented */ NTSTATUS -STDCALL +NTAPI RtlDeleteSecurityObject(IN PSECURITY_DESCRIPTOR *ObjectDescriptor) { DPRINT("RtlDeleteSecurityObject(%p)\n", ObjectDescriptor); @@ -181,7 +181,7 @@ RtlDeleteSecurityObject(IN PSECURITY_DESCRIPTOR *ObjectDescriptor) * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlNewSecurityObject(IN PSECURITY_DESCRIPTOR ParentDescriptor, IN PSECURITY_DESCRIPTOR CreatorDescriptor, OUT PSECURITY_DESCRIPTOR *NewDescriptor, @@ -198,7 +198,7 @@ RtlNewSecurityObject(IN PSECURITY_DESCRIPTOR ParentDescriptor, * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlQuerySecurityObject(IN PSECURITY_DESCRIPTOR ObjectDescriptor, IN SECURITY_INFORMATION SecurityInformation, OUT PSECURITY_DESCRIPTOR ResultantDescriptor, @@ -214,7 +214,7 @@ RtlQuerySecurityObject(IN PSECURITY_DESCRIPTOR ObjectDescriptor, * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlSetSecurityObject(IN SECURITY_INFORMATION SecurityInformation, IN PSECURITY_DESCRIPTOR ModificationDescriptor, OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, diff --git a/reactos/lib/rtl/sid.c b/reactos/lib/rtl/sid.c index 896520a5c49..d461c45ab1a 100644 --- a/reactos/lib/rtl/sid.c +++ b/reactos/lib/rtl/sid.c @@ -17,7 +17,7 @@ /* FUNCTIONS ***************************************************************/ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlValidSid(IN PSID Sid_) { PISID Sid = Sid_; @@ -37,7 +37,7 @@ RtlValidSid(IN PSID Sid_) /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlLengthRequiredSid(IN ULONG SubAuthorityCount) { PAGED_CODE_RTL(); @@ -50,7 +50,7 @@ RtlLengthRequiredSid(IN ULONG SubAuthorityCount) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlInitializeSid(IN PSID Sid_, IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, IN UCHAR SubAuthorityCount) @@ -72,7 +72,7 @@ RtlInitializeSid(IN PSID Sid_, /* * @implemented */ -PULONG STDCALL +PULONG NTAPI RtlSubAuthoritySid(IN PSID Sid_, IN ULONG SubAuthority) { @@ -87,7 +87,7 @@ RtlSubAuthoritySid(IN PSID Sid_, /* * @implemented */ -PUCHAR STDCALL +PUCHAR NTAPI RtlSubAuthorityCountSid(IN PSID Sid_) { PISID Sid = Sid_; @@ -101,7 +101,7 @@ RtlSubAuthorityCountSid(IN PSID Sid_) /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlEqualSid(IN PSID Sid1_, IN PSID Sid2_) { @@ -125,7 +125,7 @@ RtlEqualSid(IN PSID Sid1_, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlLengthSid(IN PSID Sid_) { PISID Sid = Sid_; @@ -140,7 +140,7 @@ RtlLengthSid(IN PSID Sid_) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCopySid(ULONG BufferLength, PSID Dest, PSID Src) @@ -163,7 +163,7 @@ RtlCopySid(ULONG BufferLength, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlCopySidAndAttributesArray(ULONG Count, PSID_AND_ATTRIBUTES Src, ULONG SidAreaSize, @@ -204,7 +204,7 @@ RtlCopySidAndAttributesArray(ULONG Count, /* * @implemented */ -PSID_IDENTIFIER_AUTHORITY STDCALL +PSID_IDENTIFIER_AUTHORITY NTAPI RtlIdentifierAuthoritySid(IN PSID Sid_) { PISID Sid = Sid_; @@ -218,7 +218,7 @@ RtlIdentifierAuthoritySid(IN PSID Sid_) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, UCHAR SubAuthorityCount, ULONG SubAuthority0, @@ -286,7 +286,7 @@ RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, * Docs says FreeSid does NOT return a value * even thou it's defined to return a PVOID... */ -PVOID STDCALL +PVOID NTAPI RtlFreeSid(IN PSID Sid) { PAGED_CODE_RTL(); @@ -299,7 +299,7 @@ RtlFreeSid(IN PSID Sid) /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlEqualPrefixSid(IN PSID Sid1_, IN PSID Sid2_) { @@ -317,7 +317,7 @@ RtlEqualPrefixSid(IN PSID Sid1_, /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlConvertSidToUnicodeString(PUNICODE_STRING String, PSID Sid_, BOOLEAN AllocateBuffer) diff --git a/reactos/lib/rtl/splaytree.c b/reactos/lib/rtl/splaytree.c index 97373105b2d..83ff4c0136c 100644 --- a/reactos/lib/rtl/splaytree.c +++ b/reactos/lib/rtl/splaytree.c @@ -19,7 +19,7 @@ * @unimplemented */ PRTL_SPLAY_LINKS -STDCALL +NTAPI RtlDelete ( PRTL_SPLAY_LINKS Links ) @@ -32,7 +32,7 @@ RtlDelete ( * @unimplemented */ VOID -STDCALL +NTAPI RtlDeleteNoSplay ( PRTL_SPLAY_LINKS Links, PRTL_SPLAY_LINKS *Root @@ -46,7 +46,7 @@ RtlDeleteNoSplay ( * @unimplemented */ PRTL_SPLAY_LINKS -STDCALL +NTAPI RtlRealPredecessor ( PRTL_SPLAY_LINKS Links ) @@ -59,7 +59,7 @@ RtlRealPredecessor ( * @unimplemented */ PRTL_SPLAY_LINKS -STDCALL +NTAPI RtlRealSuccessor ( PRTL_SPLAY_LINKS Links ) @@ -72,7 +72,7 @@ RtlRealSuccessor ( * @unimplemented */ PRTL_SPLAY_LINKS -STDCALL +NTAPI RtlSplay ( PRTL_SPLAY_LINKS Links ) @@ -85,7 +85,7 @@ RtlSplay ( /* * @implemented */ -PRTL_SPLAY_LINKS STDCALL +PRTL_SPLAY_LINKS NTAPI RtlSubtreePredecessor (IN PRTL_SPLAY_LINKS Links) { PRTL_SPLAY_LINKS Child; @@ -107,7 +107,7 @@ RtlSubtreePredecessor (IN PRTL_SPLAY_LINKS Links) /* * @implemented */ -PRTL_SPLAY_LINKS STDCALL +PRTL_SPLAY_LINKS NTAPI RtlSubtreeSuccessor (IN PRTL_SPLAY_LINKS Links) { PRTL_SPLAY_LINKS Child; diff --git a/reactos/lib/rtl/thread.c b/reactos/lib/rtl/thread.c index 3ecdf6c9f7d..ca5b023a204 100644 --- a/reactos/lib/rtl/thread.c +++ b/reactos/lib/rtl/thread.c @@ -19,7 +19,7 @@ /* PRIVATE FUNCTIONS *******************************************************/ NTSTATUS -STDCALL +NTAPI RtlpCreateUserStack(HANDLE hProcess, ULONG StackReserve, ULONG StackCommit, @@ -154,7 +154,7 @@ RtlpCreateUserStack(HANDLE hProcess, } NTSTATUS -STDCALL +NTAPI RtlpFreeUserStack(HANDLE hProcess, PINITIAL_TEB InitialTeb) { @@ -173,7 +173,7 @@ RtlpFreeUserStack(HANDLE hProcess, @implemented */ NTSTATUS -STDCALL +NTAPI RtlCreateUserThread(HANDLE ProcessHandle, PSECURITY_DESCRIPTOR SecurityDescriptor, BOOLEAN CreateSuspended, @@ -254,7 +254,7 @@ RtlCreateUserThread(HANDLE ProcessHandle, @implemented */ VOID -STDCALL +NTAPI RtlInitializeContext(IN HANDLE ProcessHandle, OUT PCONTEXT ThreadContext, IN PVOID ThreadStartParam OPTIONAL, @@ -312,7 +312,7 @@ RtlInitializeContext(IN HANDLE ProcessHandle, * @implemented */ VOID -STDCALL +NTAPI RtlExitUserThread(NTSTATUS Status) { /* Call the Loader and tell him to notify the DLLs */ @@ -327,7 +327,7 @@ RtlExitUserThread(NTSTATUS Status) @implemented */ VOID -STDCALL +NTAPI RtlFreeUserThreadStack(HANDLE ProcessHandle, HANDLE ThreadHandle) { @@ -366,7 +366,7 @@ RtlFreeUserThreadStack(HANDLE ProcessHandle, } PTEB -STDCALL +NTAPI _NtCurrentTeb(VOID) { /* Return the TEB */ diff --git a/reactos/lib/rtl/time.c b/reactos/lib/rtl/time.c index ea1e4987c38..1207e92c51d 100644 --- a/reactos/lib/rtl/time.c +++ b/reactos/lib/rtl/time.c @@ -65,7 +65,7 @@ static __inline void NormalizeTimeFields(CSHORT *FieldToNormalize, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI RtlCutoverTimeToSystemTime(IN PTIME_FIELDS CutoverTimeFields, OUT PLARGE_INTEGER SystemTime, IN PLARGE_INTEGER CurrentTime, @@ -165,7 +165,7 @@ RtlCutoverTimeToSystemTime(IN PTIME_FIELDS CutoverTimeFields, * @implemented */ BOOLEAN -STDCALL +NTAPI RtlTimeFieldsToTime( IN PTIME_FIELDS TimeFields, OUT PLARGE_INTEGER Time) @@ -236,7 +236,7 @@ RtlTimeFieldsToTime( * @implemented */ VOID -STDCALL +NTAPI RtlTimeToElapsedTimeFields(IN PLARGE_INTEGER Time, OUT PTIME_FIELDS TimeFields) { @@ -274,7 +274,7 @@ RtlTimeToElapsedTimeFields(IN PLARGE_INTEGER Time, * @implemented */ VOID -STDCALL +NTAPI RtlTimeToTimeFields( IN PLARGE_INTEGER Time, OUT PTIME_FIELDS TimeFields) @@ -348,7 +348,7 @@ RtlTimeToTimeFields( * @implemented */ BOOLEAN -STDCALL +NTAPI RtlTimeToSecondsSince1970( IN PLARGE_INTEGER Time, OUT PULONG SecondsSince1970) @@ -371,7 +371,7 @@ RtlTimeToSecondsSince1970( * @implemented */ BOOLEAN -STDCALL +NTAPI RtlTimeToSecondsSince1980( IN PLARGE_INTEGER Time, OUT PULONG SecondsSince1980) @@ -394,7 +394,7 @@ RtlTimeToSecondsSince1980( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlLocalTimeToSystemTime(IN PLARGE_INTEGER LocalTime, OUT PLARGE_INTEGER SystemTime) { @@ -419,7 +419,7 @@ RtlLocalTimeToSystemTime(IN PLARGE_INTEGER LocalTime, * @implemented */ NTSTATUS -STDCALL +NTAPI RtlSystemTimeToLocalTime(IN PLARGE_INTEGER SystemTime, OUT PLARGE_INTEGER LocalTime) { @@ -443,7 +443,7 @@ RtlSystemTimeToLocalTime(IN PLARGE_INTEGER SystemTime, /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlSecondsSince1970ToTime( IN ULONG SecondsSince1970, OUT PLARGE_INTEGER Time) @@ -455,7 +455,7 @@ RtlSecondsSince1970ToTime( /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlSecondsSince1980ToTime( IN ULONG SecondsSince1980, OUT PLARGE_INTEGER Time) diff --git a/reactos/lib/rtl/timerqueue.c b/reactos/lib/rtl/timerqueue.c index 269c9b2d3a1..4cc24491de4 100644 --- a/reactos/lib/rtl/timerqueue.c +++ b/reactos/lib/rtl/timerqueue.c @@ -21,7 +21,7 @@ typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlCreateTimer(HANDLE TimerQueue, PHANDLE phNewTimer, WAITORTIMERCALLBACKFUNC Callback, @@ -39,7 +39,7 @@ RtlCreateTimer(HANDLE TimerQueue, * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlCreateTimerQueue(PHANDLE TimerQueue) { DPRINT1("RtlCreateTimerQueue: stub\n"); @@ -51,7 +51,7 @@ RtlCreateTimerQueue(PHANDLE TimerQueue) * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, HANDLE CompletionEvent) @@ -65,7 +65,7 @@ RtlDeleteTimer(HANDLE TimerQueue, * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlDeleteTimerQueue(HANDLE TimerQueue) { DPRINT1("RtlDeleteTimerQueue: stub\n"); @@ -77,7 +77,7 @@ RtlDeleteTimerQueue(HANDLE TimerQueue) * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) { @@ -90,7 +90,7 @@ RtlDeleteTimerQueueEx(HANDLE TimerQueue, * @unimplemented */ NTSTATUS -STDCALL +NTAPI RtlUpdateTimer(HANDLE TimerQueue, HANDLE Timer, ULONG DueTime, diff --git a/reactos/lib/rtl/timezone.c b/reactos/lib/rtl/timezone.c index 82821a2a16f..c66f96bd64a 100644 --- a/reactos/lib/rtl/timezone.c +++ b/reactos/lib/rtl/timezone.c @@ -18,7 +18,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation) { RTL_QUERY_REGISTRY_TABLE QueryTable[8]; @@ -82,7 +82,7 @@ RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation) /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlSetTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation) { ULONG Length; diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c index 995d889bd32..cf17c36bd99 100644 --- a/reactos/lib/rtl/unicode.c +++ b/reactos/lib/rtl/unicode.c @@ -27,7 +27,7 @@ extern PUSHORT NlsLeadByteInfo; * @implemented */ WCHAR -STDCALL +NTAPI RtlAnsiCharToUnicodeChar(IN PUCHAR *AnsiChar) { ULONG Size; @@ -59,7 +59,7 @@ RtlAnsiCharToUnicodeChar(IN PUCHAR *AnsiChar) * If the dest buffer is too small a partial copy is NOT performed! */ NTSTATUS -STDCALL +NTAPI RtlAnsiStringToUnicodeString( IN OUT PUNICODE_STRING UniDest, IN PANSI_STRING AnsiSource, @@ -107,7 +107,7 @@ RtlAnsiStringToUnicodeString( * The calculated size in bytes including nullterm. */ ULONG -STDCALL +NTAPI RtlxAnsiStringToUnicodeSize(IN PCANSI_STRING AnsiString) { ULONG Size; @@ -129,7 +129,7 @@ RtlxAnsiStringToUnicodeSize(IN PCANSI_STRING AnsiString) * Dest is never nullterminated. */ NTSTATUS -STDCALL +NTAPI RtlAppendStringToString(IN PSTRING Destination, IN PSTRING Source) { @@ -161,7 +161,7 @@ RtlAppendStringToString(IN PSTRING Destination, * When dest fits exactly in MaximumLength characters the nullterm is ommitted. */ NTSTATUS -STDCALL +NTAPI RtlAppendUnicodeStringToString( IN OUT PUNICODE_STRING Destination, IN PCUNICODE_STRING Source) @@ -211,7 +211,7 @@ RtlAppendUnicodeStringToString( * This function does not read garbage behind '\0' as the native version does. */ NTSTATUS -STDCALL +NTAPI RtlCharToInteger( PCSZ str, /* [I] '\0' terminated single-byte string containing a number */ ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ @@ -283,7 +283,7 @@ RtlCharToInteger( * @implemented */ LONG -STDCALL +NTAPI RtlCompareString( IN PSTRING s1, IN PSTRING s2, @@ -316,7 +316,7 @@ RtlCompareString( * TRUE if strings are equal. */ BOOLEAN -STDCALL +NTAPI RtlEqualString( IN PSTRING s1, IN PSTRING s2, @@ -333,7 +333,7 @@ RtlEqualString( * TRUE if strings are equal. */ BOOLEAN -STDCALL +NTAPI RtlEqualUnicodeString( IN CONST UNICODE_STRING *s1, IN CONST UNICODE_STRING *s2, @@ -347,7 +347,7 @@ RtlEqualUnicodeString( * @implemented */ VOID -STDCALL +NTAPI RtlFreeAnsiString(IN PANSI_STRING AnsiString) { if (AnsiString->Buffer) @@ -361,7 +361,7 @@ RtlFreeAnsiString(IN PANSI_STRING AnsiString) * @implemented */ VOID -STDCALL +NTAPI RtlFreeOemString(IN POEM_STRING OemString) { if (OemString->Buffer) RtlpFreeStringMemory(OemString->Buffer, TAG_OSTR); @@ -371,7 +371,7 @@ RtlFreeOemString(IN POEM_STRING OemString) * @implemented */ VOID -STDCALL +NTAPI RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString) { if (UnicodeString->Buffer) @@ -385,7 +385,7 @@ RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString) * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlIsValidOemCharacter(IN PWCHAR Char) { UNIMPLEMENTED; @@ -399,7 +399,7 @@ RtlIsValidOemCharacter(IN PWCHAR Char) * If source is NULL the length of source is assumed to be 0. */ VOID -STDCALL +NTAPI RtlInitAnsiString(IN OUT PANSI_STRING DestinationString, IN PCSZ SourceString) { @@ -427,7 +427,7 @@ RtlInitAnsiString(IN OUT PANSI_STRING DestinationString, * If source is NULL the length of source is assumed to be 0. */ VOID -STDCALL +NTAPI RtlInitString( IN OUT PSTRING DestinationString, IN PCSZ SourceString) @@ -442,7 +442,7 @@ RtlInitString( * If source is NULL the length of source is assumed to be 0. */ VOID -STDCALL +NTAPI RtlInitUnicodeString(IN OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString) { @@ -467,7 +467,7 @@ RtlInitUnicodeString(IN OUT PUNICODE_STRING DestinationString, * @implemented */ NTSTATUS -STDCALL +NTAPI RtlInitUnicodeStringEx(OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString) { @@ -499,7 +499,7 @@ RtlInitUnicodeStringEx(OUT PUNICODE_STRING DestinationString, * When str fits exactly in length characters the nullterm is ommitted. */ NTSTATUS -STDCALL +NTAPI RtlIntegerToChar( IN ULONG Value, IN ULONG Base, @@ -552,7 +552,7 @@ RtlIntegerToChar( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlIntegerToUnicode( IN ULONG Value, IN ULONG Base OPTIONAL, @@ -606,7 +606,7 @@ RtlIntegerToUnicode( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlIntegerToUnicodeString( IN ULONG Value, IN ULONG Base OPTIONAL, @@ -633,7 +633,7 @@ RtlIntegerToUnicodeString( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlInt64ToUnicodeString ( IN ULONGLONG Value, IN ULONG Base OPTIONAL, @@ -666,7 +666,7 @@ RtlInt64ToUnicodeString ( * TRUE if String2 contains String1 as a prefix. */ BOOLEAN -STDCALL +NTAPI RtlPrefixString( PANSI_STRING String1, PANSI_STRING String2, @@ -713,7 +713,7 @@ RtlPrefixString( * TRUE if String2 contains String1 as a prefix. */ BOOLEAN -STDCALL +NTAPI RtlPrefixUnicodeString( PCUNICODE_STRING String1, PCUNICODE_STRING String2, @@ -781,7 +781,7 @@ RtlPrefixUnicodeString( * version does. */ NTSTATUS -STDCALL +NTAPI RtlUnicodeStringToInteger( PCUNICODE_STRING str, /* [I] Unicode string to be converted */ ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ @@ -872,7 +872,7 @@ RtlUnicodeStringToInteger( * Bytes necessary for the conversion including nullterm. */ ULONG -STDCALL +NTAPI RtlxUnicodeStringToOemSize(IN PCUNICODE_STRING UnicodeString) { ULONG Size; @@ -894,7 +894,7 @@ RtlxUnicodeStringToOemSize(IN PCUNICODE_STRING UnicodeString) * It performs a partial copy if ansi is too small. */ NTSTATUS -STDCALL +NTAPI RtlUnicodeStringToAnsiString( IN OUT PANSI_STRING AnsiDest, IN PCUNICODE_STRING UniSource, @@ -948,7 +948,7 @@ RtlUnicodeStringToAnsiString( * Does NOT perform a partial copy if unicode is too small! */ NTSTATUS -STDCALL +NTAPI RtlOemStringToUnicodeString( IN OUT PUNICODE_STRING UniDest, IN PCOEM_STRING OemSource, @@ -998,7 +998,7 @@ RtlOemStringToUnicodeString( * This function always '\0' terminates the string returned. */ NTSTATUS -STDCALL +NTAPI RtlUnicodeStringToOemString( IN OUT POEM_STRING OemDest, IN PCUNICODE_STRING UniSource, @@ -1049,7 +1049,7 @@ RtlUnicodeStringToOemString( * RETURNS * The length of the string if all tests were passed, 0 otherwise. */ -ULONG STDCALL +ULONG NTAPI RtlIsTextUnicode (PVOID Buffer, ULONG Length, ULONG *Flags) @@ -1109,7 +1109,7 @@ done: * A partial copy is NOT performed if the dest buffer is too small! */ NTSTATUS -STDCALL +NTAPI RtlOemStringToCountedUnicodeString( IN OUT PUNICODE_STRING UniDest, IN PCOEM_STRING OemSource, @@ -1168,7 +1168,7 @@ RtlOemStringToCountedUnicodeString( * The comparison is case insensitive. */ BOOLEAN -STDCALL +NTAPI RtlEqualComputerName( IN PUNICODE_STRING ComputerName1, IN PUNICODE_STRING ComputerName2) @@ -1204,7 +1204,7 @@ RtlEqualComputerName( * The comparison is case insensitive. */ BOOLEAN -STDCALL +NTAPI RtlEqualDomainName ( IN PUNICODE_STRING DomainName1, IN PUNICODE_STRING DomainName2 @@ -1232,7 +1232,7 @@ RtlEqualDomainName ( * See RtlStringFromGUID. */ NTSTATUS -STDCALL +NTAPI RtlGUIDFromString( IN UNICODE_STRING *str, OUT GUID* guid @@ -1346,7 +1346,7 @@ RtlGUIDFromString( * @implemented */ VOID -STDCALL +NTAPI RtlEraseUnicodeString( IN PUNICODE_STRING String) { @@ -1361,7 +1361,7 @@ RtlEraseUnicodeString( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlHashUnicodeString( IN CONST UNICODE_STRING *String, IN BOOLEAN CaseInSensitive, @@ -1417,7 +1417,7 @@ RtlHashUnicodeString( * Does a partial copy if the dest buffer is too small */ NTSTATUS -STDCALL +NTAPI RtlUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, IN PUNICODE_STRING UniSource, @@ -1471,7 +1471,7 @@ RtlUnicodeStringToCountedOemString( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlLargeIntegerToChar( IN PLARGE_INTEGER Value, IN ULONG Base, @@ -1524,7 +1524,7 @@ RtlLargeIntegerToChar( * might not be '\0' terminated. dest->Length is only set upon success. */ NTSTATUS -STDCALL +NTAPI RtlUpcaseUnicodeString( IN OUT PUNICODE_STRING UniDest, IN PCUNICODE_STRING UniSource, @@ -1562,7 +1562,7 @@ RtlUpcaseUnicodeString( * It performs a partial copy if ansi is too small. */ NTSTATUS -STDCALL +NTAPI RtlUpcaseUnicodeStringToAnsiString( IN OUT PANSI_STRING AnsiDest, IN PUNICODE_STRING UniSource, @@ -1613,7 +1613,7 @@ RtlUpcaseUnicodeStringToAnsiString( * It performs a partial copy if ansi is too small. */ NTSTATUS -STDCALL +NTAPI RtlUpcaseUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, IN PCUNICODE_STRING UniSource, @@ -1670,7 +1670,7 @@ RtlUpcaseUnicodeStringToCountedOemString( * It performs a partial copy if oem is too small. */ NTSTATUS -STDCALL +NTAPI RtlUpcaseUnicodeStringToOemString ( IN OUT POEM_STRING OemDest, IN PCUNICODE_STRING UniSource, @@ -1722,7 +1722,7 @@ RtlUpcaseUnicodeStringToOemString ( * Bytes calculated including nullterm */ ULONG -STDCALL +NTAPI RtlxOemStringToUnicodeSize(IN PCOEM_STRING OemString) { ULONG Size; @@ -1740,7 +1740,7 @@ RtlxOemStringToUnicodeSize(IN PCOEM_STRING OemString) * @implemented */ NTSTATUS -STDCALL +NTAPI RtlStringFromGUID (IN REFGUID Guid, OUT PUNICODE_STRING GuidString) { @@ -1783,7 +1783,7 @@ RtlStringFromGUID (IN REFGUID Guid, * Bytes calculated including nullterm */ ULONG -STDCALL +NTAPI RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString) { ULONG Size; @@ -1801,7 +1801,7 @@ RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString) * @implemented */ LONG -STDCALL +NTAPI RtlCompareUnicodeString( IN PCUNICODE_STRING s1, IN PCUNICODE_STRING s2, @@ -1831,7 +1831,7 @@ RtlCompareUnicodeString( * @implemented */ VOID -STDCALL +NTAPI RtlCopyString( IN OUT PSTRING DestinationString, IN PSTRING SourceString OPTIONAL) @@ -1872,7 +1872,7 @@ RtlCopyString( * @implemented */ VOID -STDCALL +NTAPI RtlCopyUnicodeString( IN OUT PUNICODE_STRING DestinationString, IN PCUNICODE_STRING SourceString) @@ -1907,7 +1907,7 @@ RtlCopyUnicodeString( * Creates a nullterminated UNICODE_STRING */ BOOLEAN -STDCALL +NTAPI RtlCreateUnicodeString( IN OUT PUNICODE_STRING UniDest, IN PCWSTR Source) @@ -1930,7 +1930,7 @@ RtlCreateUnicodeString( * @implemented */ BOOLEAN -STDCALL +NTAPI RtlCreateUnicodeStringFromAsciiz( OUT PUNICODE_STRING Destination, IN PCSZ Source) @@ -1956,7 +1956,7 @@ RtlCreateUnicodeStringFromAsciiz( * Dest->Length is only set upon success. */ NTSTATUS -STDCALL +NTAPI RtlDowncaseUnicodeString( IN OUT PUNICODE_STRING UniDest, IN PCUNICODE_STRING UniSource, @@ -2007,7 +2007,7 @@ RtlDowncaseUnicodeString( * When dest fits exactly in MaximumLength characters the '\0' is ommitted. */ NTSTATUS -STDCALL +NTAPI RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination, IN PCWSTR Source) { @@ -2048,7 +2048,7 @@ RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination, * dest is never '\0' terminated. */ NTSTATUS -STDCALL +NTAPI RtlAppendAsciizToString( IN OUT PSTRING Destination, IN PCSZ Source) @@ -2075,7 +2075,7 @@ RtlAppendAsciizToString( * @implemented */ VOID -STDCALL +NTAPI RtlUpperString(PSTRING DestinationString, PSTRING SourceString) { @@ -2102,7 +2102,7 @@ RtlUpperString(PSTRING DestinationString, * See RtlpDuplicateUnicodeString */ NTSTATUS -STDCALL +NTAPI RtlDuplicateUnicodeString( IN ULONG Flags, IN PCUNICODE_STRING SourceString, @@ -2145,7 +2145,7 @@ RtlDuplicateUnicodeString( /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlValidateUnicodeString(IN ULONG Flags, IN PUNICODE_STRING UnicodeString) { diff --git a/reactos/lib/rtl/unicodeprefix.c b/reactos/lib/rtl/unicodeprefix.c index 1ee569fa7c3..a5096704c2d 100644 --- a/reactos/lib/rtl/unicodeprefix.c +++ b/reactos/lib/rtl/unicodeprefix.c @@ -19,7 +19,7 @@ * @unimplemented */ PUNICODE_PREFIX_TABLE_ENTRY -STDCALL +NTAPI RtlFindUnicodePrefix ( PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_STRING FullName, @@ -34,7 +34,7 @@ RtlFindUnicodePrefix ( * @unimplemented */ VOID -STDCALL +NTAPI RtlInitializeUnicodePrefix ( PUNICODE_PREFIX_TABLE PrefixTable ) @@ -46,7 +46,7 @@ RtlInitializeUnicodePrefix ( * @unimplemented */ BOOLEAN -STDCALL +NTAPI RtlInsertUnicodePrefix ( PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_STRING Prefix, @@ -61,7 +61,7 @@ RtlInsertUnicodePrefix ( * @unimplemented */ PUNICODE_PREFIX_TABLE_ENTRY -STDCALL +NTAPI RtlNextUnicodePrefix ( PUNICODE_PREFIX_TABLE PrefixTable, BOOLEAN Restart @@ -75,7 +75,7 @@ RtlNextUnicodePrefix ( * @unimplemented */ VOID -STDCALL +NTAPI RtlRemoveUnicodePrefix ( PUNICODE_PREFIX_TABLE PrefixTable, PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry diff --git a/reactos/lib/rtl/vectoreh.c b/reactos/lib/rtl/vectoreh.c index ffab68b8b53..771dbb4b83b 100644 --- a/reactos/lib/rtl/vectoreh.c +++ b/reactos/lib/rtl/vectoreh.c @@ -74,7 +74,7 @@ RtlpInitializeVectoredExceptionHandling(VOID) /* * @implemented */ -PVOID STDCALL +PVOID NTAPI RtlAddVectoredExceptionHandler(IN ULONG FirstHandler, IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) { @@ -107,7 +107,7 @@ RtlAddVectoredExceptionHandler(IN ULONG FirstHandler, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI RtlRemoveVectoredExceptionHandler(IN PVOID VectoredHandlerHandle) { PLIST_ENTRY CurrentEntry; diff --git a/reactos/lib/rtl/version.c b/reactos/lib/rtl/version.c index ee890709217..22069957aae 100644 --- a/reactos/lib/rtl/version.c +++ b/reactos/lib/rtl/version.c @@ -15,7 +15,7 @@ /* GLOBALS ******************************************************************/ NTSTATUS -STDCALL +NTAPI RtlGetVersion( OUT PRTL_OSVERSIONINFOW lpVersionInformation ); @@ -26,7 +26,7 @@ RtlGetVersion( * @implemented */ NTSTATUS -STDCALL +NTAPI RtlVerifyVersionInfo( IN PRTL_OSVERSIONINFOEXW VersionInfo, IN ULONG TypeMask, diff --git a/reactos/lib/samlib/samlib.c b/reactos/lib/samlib/samlib.c index fa3bc08fadf..8b9fc2f9e74 100644 --- a/reactos/lib/samlib/samlib.c +++ b/reactos/lib/samlib/samlib.c @@ -26,7 +26,7 @@ */ /* INCLUDES *****************************************************************/ - +#define WIN32_NO_STATUS #include #include #define NTOS_MODE_USER diff --git a/reactos/lib/secur32/dllmain.c b/reactos/lib/secur32/dllmain.c index 07e11dca836..ce85eb7f3fe 100644 --- a/reactos/lib/secur32/dllmain.c +++ b/reactos/lib/secur32/dllmain.c @@ -9,10 +9,7 @@ */ /* INCLUDES ******************************************************************/ - -#include -#define NTOS_MODE_USER -#include +#include "precomp.h" /* GLOBALS *******************************************************************/ diff --git a/reactos/lib/secur32/lsa.c b/reactos/lib/secur32/lsa.c index 1a14d04e9c6..1c5434a059e 100644 --- a/reactos/lib/secur32/lsa.c +++ b/reactos/lib/secur32/lsa.c @@ -10,12 +10,7 @@ /* INCLUDES ******************************************************************/ -#include -#define NTOS_MODE_USER -#include -#include - -#include +#include "precomp.h" /* GLOBALS *******************************************************************/ diff --git a/reactos/lib/secur32/precomp.h b/reactos/lib/secur32/precomp.h new file mode 100644 index 00000000000..6de28a6e237 --- /dev/null +++ b/reactos/lib/secur32/precomp.h @@ -0,0 +1,18 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/secur32/precomp.h + * PURPOSE: Security Library Header + * PROGRAMMER: Alex Ionescu (alex@relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS +#include +#define NTOS_MODE_USER +#include +#include + +#include diff --git a/reactos/lib/secur32/secur32.xml b/reactos/lib/secur32/secur32.xml index 45c1c69957e..a3b2317341f 100644 --- a/reactos/lib/secur32/secur32.xml +++ b/reactos/lib/secur32/secur32.xml @@ -12,4 +12,5 @@ secext.c sspi.c secur32.rc + precomp.h diff --git a/reactos/lib/smdll/query.c b/reactos/lib/smdll/query.c index 5ee23e5b081..665f42dba08 100644 --- a/reactos/lib/smdll/query.c +++ b/reactos/lib/smdll/query.c @@ -5,6 +5,7 @@ * FILE: lib/smdll/query.c * PURPOSE: Call SM API SM_API_QUERY_INFORMATION (not in NT) */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/smlib/compses.c b/reactos/lib/smlib/compses.c index e2cde91af29..9a93177ccb1 100644 --- a/reactos/lib/smlib/compses.c +++ b/reactos/lib/smlib/compses.c @@ -5,11 +5,7 @@ * FILE: lib/smlib/compses.c * PURPOSE: Call SM API SM_API_COMPLETE_SESSION */ -#include -#define NTOS_MODE_USER -#include - -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/lib/smlib/connect.c b/reactos/lib/smlib/connect.c index 09041987261..0c68e7e51b9 100644 --- a/reactos/lib/smlib/connect.c +++ b/reactos/lib/smlib/connect.c @@ -5,11 +5,8 @@ * FILE: reactos/lib/smlib/connect.c * PURPOSE: Connect to the API LPC port exposed by the SM */ -#include -#define NTOS_MODE_USER -#include -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/lib/smlib/execpgm.c b/reactos/lib/smlib/execpgm.c index d8c0b4b1e7c..b32c210ec56 100644 --- a/reactos/lib/smlib/execpgm.c +++ b/reactos/lib/smlib/execpgm.c @@ -5,11 +5,7 @@ * FILE: lib/smlib/execpgm.c * PURPOSE: Call SM API SM_API_EXECPGM */ -#include -#define NTOS_MODE_USER -#include - -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/lib/smlib/lookupss.c b/reactos/lib/smlib/lookupss.c index 134cf828e86..d1d994c89c4 100644 --- a/reactos/lib/smlib/lookupss.c +++ b/reactos/lib/smlib/lookupss.c @@ -4,11 +4,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/smlib/lookupss.c */ -#include -#define NTOS_MODE_USER -#include - -#include +#include "precomp.h" #define NDEBUG #include diff --git a/reactos/lib/smlib/precomp.h b/reactos/lib/smlib/precomp.h new file mode 100644 index 00000000000..0bc1aa8ec2a --- /dev/null +++ b/reactos/lib/smlib/precomp.h @@ -0,0 +1,18 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/smlib/precomp.h + * PURPOSE: SMLIB Library Header + * PROGRAMMER: Alex Ionescu (alex@relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +/* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS +#include +#define NTOS_MODE_USER +#include + +#include + diff --git a/reactos/lib/smlib/smlib.xml b/reactos/lib/smlib/smlib.xml index 0ffd9947703..d5da77a6de1 100644 --- a/reactos/lib/smlib/smlib.xml +++ b/reactos/lib/smlib/smlib.xml @@ -6,4 +6,5 @@ execpgm.c compses.c lookupss.c + precomp.h diff --git a/reactos/lib/string/mbstowcs.c b/reactos/lib/string/mbstowcs.c index a403f7f7255..62f6add9b78 100644 --- a/reactos/lib/string/mbstowcs.c +++ b/reactos/lib/string/mbstowcs.c @@ -1,3 +1,4 @@ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #define _NTSYSTEM_ diff --git a/reactos/lib/string/sscanf.c b/reactos/lib/string/sscanf.c index aa4ea837989..da10574c5a8 100644 --- a/reactos/lib/string/sscanf.c +++ b/reactos/lib/string/sscanf.c @@ -1,5 +1,5 @@ /**/ - +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #define _NTSYSTEM_ diff --git a/reactos/lib/string/wcstombs.c b/reactos/lib/string/wcstombs.c index 2922a9cf861..d7cf1b7bd82 100644 --- a/reactos/lib/string/wcstombs.c +++ b/reactos/lib/string/wcstombs.c @@ -1,3 +1,4 @@ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #define _NTSYSTEM_ diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c index 38d29c82935..bb3a817c20b 100644 --- a/reactos/lib/syssetup/install.c +++ b/reactos/lib/syssetup/install.c @@ -27,6 +27,7 @@ /* INCLUDES *****************************************************************/ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/syssetup/logfile.c b/reactos/lib/syssetup/logfile.c index 5a232f2ce22..6f0aa3be8af 100644 --- a/reactos/lib/syssetup/logfile.c +++ b/reactos/lib/syssetup/logfile.c @@ -26,7 +26,7 @@ */ /* INCLUDES *****************************************************************/ - +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/userenv/precomp.h b/reactos/lib/userenv/precomp.h index f2b05eb4c0b..129e2cfc13f 100644 --- a/reactos/lib/userenv/precomp.h +++ b/reactos/lib/userenv/precomp.h @@ -1,4 +1,5 @@ #include +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/ws2_32/include/ws2_32.h b/reactos/lib/ws2_32/include/ws2_32.h index 9934df69d7e..2b66f02668d 100644 --- a/reactos/lib/ws2_32/include/ws2_32.h +++ b/reactos/lib/ws2_32/include/ws2_32.h @@ -7,6 +7,7 @@ #ifndef __WS2_32_H #define __WS2_32_H +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/lib/ws2help/ws2help.h b/reactos/lib/ws2help/ws2help.h index 17480c4f700..798e3a7530c 100644 --- a/reactos/lib/ws2help/ws2help.h +++ b/reactos/lib/ws2help/ws2help.h @@ -7,6 +7,7 @@ #ifndef __WS2HELP_H #define __WS2HELP_H +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/lib/wshirda/wshirda.h b/reactos/lib/wshirda/wshirda.h index 3f202c75c65..60ab3d6f81d 100644 --- a/reactos/lib/wshirda/wshirda.h +++ b/reactos/lib/wshirda/wshirda.h @@ -7,6 +7,7 @@ #ifndef __WSHIRDA_H #define __WSHIRDA_H +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/regtests/shared/regtests.c b/reactos/regtests/shared/regtests.c index 0068b41236b..bda7595aa0e 100755 --- a/reactos/regtests/shared/regtests.c +++ b/reactos/regtests/shared/regtests.c @@ -6,6 +6,7 @@ * UPDATE HISTORY: * 06-07-2003 CSH Created */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/services/eventlog/eventlog.h b/reactos/services/eventlog/eventlog.h index 4ecb0f2d213..77368580722 100644 --- a/reactos/services/eventlog/eventlog.h +++ b/reactos/services/eventlog/eventlog.h @@ -9,6 +9,7 @@ #ifndef __EVENTLOG_H__ #define __EVENTLOG_H__ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/services/eventlog/eventlog.xml b/reactos/services/eventlog/eventlog.xml index 4742091d324..b228200dae5 100644 --- a/reactos/services/eventlog/eventlog.xml +++ b/reactos/services/eventlog/eventlog.xml @@ -14,4 +14,5 @@ eventlog.rc rpc.c file.c + eventlog.h diff --git a/reactos/services/rpcss/endpoint.c b/reactos/services/rpcss/endpoint.c index 39c806c2b22..dbdf8d17499 100644 --- a/reactos/services/rpcss/endpoint.c +++ b/reactos/services/rpcss/endpoint.c @@ -27,8 +27,7 @@ /* INCLUDES *****************************************************************/ -#include -//#include +#include "rpc.h" /* FUNCTIONS ****************************************************************/ diff --git a/reactos/services/rpcss/rpcss.c b/reactos/services/rpcss/rpcss.c index ae6788e1016..c6df9d6e28a 100644 --- a/reactos/services/rpcss/rpcss.c +++ b/reactos/services/rpcss/rpcss.c @@ -27,16 +27,8 @@ /* INCLUDES *****************************************************************/ -#define UNICODE - -#include -#include -#define NTOS_MODE_USER -#include #include "rpcss.h" -//#include "services.h" - #define NDEBUG #include diff --git a/reactos/services/rpcss/rpcss.h b/reactos/services/rpcss/rpcss.h index c2f03cff0a6..f1ca318bf3b 100644 --- a/reactos/services/rpcss/rpcss.h +++ b/reactos/services/rpcss/rpcss.h @@ -1,6 +1,14 @@ #ifndef __RPCSS_H__ #define __RPCSS_H__ +#define UNICODE + +#include +#define WIN32_NO_STATUS +#include +#define NTOS_MODE_USER +#include + VOID StartEndpointMapper(VOID); diff --git a/reactos/services/umpnpmgr/umpnpmgr.c b/reactos/services/umpnpmgr/umpnpmgr.c index b6d6e9df290..c5fd3689bc0 100644 --- a/reactos/services/umpnpmgr/umpnpmgr.c +++ b/reactos/services/umpnpmgr/umpnpmgr.c @@ -26,7 +26,7 @@ */ /* INCLUDES *****************************************************************/ - +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/csrss/csrss.h b/reactos/subsys/csrss/csrss.h index d920d30626d..686c4adea12 100644 --- a/reactos/subsys/csrss/csrss.h +++ b/reactos/subsys/csrss/csrss.h @@ -1,5 +1,6 @@ /* PSDK/NDK Headers */ #include +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/csrss/win32csr/w32csr.h b/reactos/subsys/csrss/win32csr/w32csr.h index 01a79947462..c06de33abdc 100644 --- a/reactos/subsys/csrss/win32csr/w32csr.h +++ b/reactos/subsys/csrss/win32csr/w32csr.h @@ -1,4 +1,5 @@ /* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/ntvdm/ntvdm.c b/reactos/subsys/ntvdm/ntvdm.c index 80b139adf8b..97accab52c5 100644 --- a/reactos/subsys/ntvdm/ntvdm.c +++ b/reactos/subsys/ntvdm/ntvdm.c @@ -10,7 +10,7 @@ */ /* INCLUDES *****************************************************************/ - +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/subsys/smss/smss.h b/reactos/subsys/smss/smss.h index 7d2a26bf7db..b5000dcac24 100644 --- a/reactos/subsys/smss/smss.h +++ b/reactos/subsys/smss/smss.h @@ -2,6 +2,7 @@ #define _SMSS_H_INCLUDED_ #include +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/system/autochk/autochk.c b/reactos/subsys/system/autochk/autochk.c index de339263bfe..99e7a7ee4e4 100644 --- a/reactos/subsys/system/autochk/autochk.c +++ b/reactos/subsys/system/autochk/autochk.c @@ -28,6 +28,7 @@ /* INCLUDES *****************************************************************/ #include +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/system/cmd/precomp.h b/reactos/subsys/system/cmd/precomp.h index d7fedf908eb..5aa02334d69 100644 --- a/reactos/subsys/system/cmd/precomp.h +++ b/reactos/subsys/system/cmd/precomp.h @@ -3,7 +3,7 @@ #endif//_MSC_VER #include - +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/subsys/system/lsass/lsass.c b/reactos/subsys/system/lsass/lsass.c index b9a1fc218d7..ec35a8ed0ec 100644 --- a/reactos/subsys/system/lsass/lsass.c +++ b/reactos/subsys/system/lsass/lsass.c @@ -25,6 +25,7 @@ * 19990704 (Emanuele Aliberti) * Compiled successfully with egcs 1.1.2 */ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/system/services/database.c b/reactos/subsys/system/services/database.c index 8310327319a..55e167bf212 100644 --- a/reactos/subsys/system/services/database.c +++ b/reactos/subsys/system/services/database.c @@ -25,12 +25,6 @@ /* INCLUDES *****************************************************************/ -#include -#define NTOS_MODE_USER -#include - -#include - #include "services.h" #define NDEBUG diff --git a/reactos/subsys/system/services/rpcserver.c b/reactos/subsys/system/services/rpcserver.c index d735dcacebc..f207f5b9b02 100644 --- a/reactos/subsys/system/services/rpcserver.c +++ b/reactos/subsys/system/services/rpcserver.c @@ -4,10 +4,6 @@ /* INCLUDES ****************************************************************/ -#include -#define NTOS_MODE_USER -#include - #include "services.h" #include "svcctl_s.h" diff --git a/reactos/subsys/system/services/services.c b/reactos/subsys/system/services/services.c index 8235c503718..feb56658294 100644 --- a/reactos/subsys/system/services/services.c +++ b/reactos/subsys/system/services/services.c @@ -28,10 +28,6 @@ /* INCLUDES *****************************************************************/ -#include -#define NTOS_MODE_USER -#include - #include "services.h" #define NDEBUG diff --git a/reactos/subsys/system/services/services.h b/reactos/subsys/system/services/services.h index 489343eb046..c01a0a9be9f 100644 --- a/reactos/subsys/system/services/services.h +++ b/reactos/subsys/system/services/services.h @@ -3,9 +3,11 @@ */ #include +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include +#include typedef struct _SERVICE { diff --git a/reactos/subsys/system/services/services.xml b/reactos/subsys/system/services/services.xml index e05c7e79e5c..6139f5cbeaa 100644 --- a/reactos/subsys/system/services/services.xml +++ b/reactos/subsys/system/services/services.xml @@ -14,4 +14,5 @@ rpcserver.c services.c services.rc + services.h diff --git a/reactos/subsys/system/setup/setup.c b/reactos/subsys/system/setup/setup.c index 1d236eac402..a68531dc244 100644 --- a/reactos/subsys/system/setup/setup.c +++ b/reactos/subsys/system/setup/setup.c @@ -23,7 +23,7 @@ * PURPOSE: Second stage setup * PROGRAMMER: Eric Kohl */ - +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/subsys/system/sm/sm.c b/reactos/subsys/system/sm/sm.c index a54b5dfb00e..e6942422f3b 100644 --- a/reactos/subsys/system/sm/sm.c +++ b/reactos/subsys/system/sm/sm.c @@ -29,6 +29,7 @@ #include #include "resource.h" +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/system/taskmgr/precomp.h b/reactos/subsys/system/taskmgr/precomp.h index e5ab0f15e2f..d45339a4c06 100644 --- a/reactos/subsys/system/taskmgr/precomp.h +++ b/reactos/subsys/system/taskmgr/precomp.h @@ -1,3 +1,4 @@ +#define WIN32_NO_STATUS #include #define NTOS_MODE_USER #include diff --git a/reactos/subsys/system/winlogon/setup.c b/reactos/subsys/system/winlogon/setup.c index 38d4572f1e1..6af03f89a49 100644 --- a/reactos/subsys/system/winlogon/setup.c +++ b/reactos/subsys/system/winlogon/setup.c @@ -26,14 +26,7 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - -#include "setup.h" - -#define NTOS_MODE_USER -#include +#include "winlogon.h" #define NDEBUG #include diff --git a/reactos/subsys/system/winlogon/winlogon.h b/reactos/subsys/system/winlogon/winlogon.h index 35ec0548c70..74aa2c5e6a7 100644 --- a/reactos/subsys/system/winlogon/winlogon.h +++ b/reactos/subsys/system/winlogon/winlogon.h @@ -27,6 +27,7 @@ #ifndef __WINLOGON_MAIN_H__ #define __WINLOGON_MAIN_H__ +#define WIN32_NO_STATUS #include #include #include diff --git a/reactos/subsys/system/winlogon/winlogon.xml b/reactos/subsys/system/winlogon/winlogon.xml index 81e2fa031b7..496764b2d5a 100644 --- a/reactos/subsys/system/winlogon/winlogon.xml +++ b/reactos/subsys/system/winlogon/winlogon.xml @@ -14,4 +14,5 @@ winlogon.c wlx.c winlogon.rc + winlogon.h diff --git a/reactos/w32api/include/winnt.h b/reactos/w32api/include/winnt.h index 3e28543a0c7..11f067c6861 100644 --- a/reactos/w32api/include/winnt.h +++ b/reactos/w32api/include/winnt.h @@ -1254,9 +1254,11 @@ typedef enum #define DBG_CONTINUE 0x10002 #define DBG_TERMINATE_THREAD 0x40010003 #define DBG_TERMINATE_PROCESS 0x40010004 +#ifndef WIN32_NO_STATUS #define DBG_CONTROL_C 0x40010005 #define DBG_CONTROL_BREAK 0x40010008 #define DBG_EXCEPTION_NOT_HANDLED 0x80010001 +#endif #define TAPE_ABSOLUTE_POSITION 0 #define TAPE_LOGICAL_POSITION 1 #define TAPE_PSEUDO_LOGICAL_POSITION 2