- Fix compile with msvc/psdk. Modified: trunk/reactos/lib/ntdll/dbg/dbgui.c Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/ntdll/inc/ntdllp.h Modified: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/lib/ntdll/main/dispatch.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/ntdll/rtl/version.c _____
Modified: trunk/reactos/lib/ntdll/dbg/dbgui.c --- trunk/reactos/lib/ntdll/dbg/dbgui.c 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/dbg/dbgui.c 2005-10-19 23:08:12 UTC (rev 18615) @@ -40,7 +40,7 @@
* @implemented */ NTSTATUS -STDCALL +NTAPI DbgUiConnectToDbg(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -66,7 +66,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI DbgUiContinue(PCLIENT_ID ClientId, ULONG ContinueStatus) { @@ -95,7 +95,7 @@ * @implemented */ VOID -STDCALL +NTAPI DbgUiRemoteBreakin(VOID) { /* Make sure a debugger is enabled; if so, breakpoint */ @@ -109,7 +109,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI DbgUiIssueRemoteBreakin(HANDLE Process) { HANDLE hThread; _____
Modified: trunk/reactos/lib/ntdll/inc/ntdll.h --- trunk/reactos/lib/ntdll/inc/ntdll.h 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/inc/ntdll.h 2005-10-19 23:08:12 UTC (rev 18615) @@ -14,6 +14,7 @@
/* C Headers */ #define _CTYPE_DISABLE_MACROS +#define _CRT_SECURE_NO_DEPRECATE #define _INC_SWPRINTF_INL_ #include <limits.h> #include <stdio.h> _____
Modified: trunk/reactos/lib/ntdll/inc/ntdllp.h --- trunk/reactos/lib/ntdll/inc/ntdllp.h 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/inc/ntdllp.h 2005-10-19 23:08:12 UTC (rev 18615) @@ -9,7 +9,7 @@
/* INCLUDES ******************************************************************/
/* FIXME: Cleanup this mess */ -typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB); +typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB); NTSTATUS LdrMapSections(HANDLE ProcessHandle, PVOID ImageBase, HANDLE SectionHandle, @@ -24,7 +24,7 @@ PLDR_DATA_TABLE_ENTRY* Module, PWSTR FullDosName); typedef BOOL -(STDCALL *PDLLMAIN_FUNC)(HANDLE hInst, +(NTAPI *PDLLMAIN_FUNC)(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved);
_____
Modified: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-10-19 23:08:12 UTC (rev 18615) @@ -85,7 +85,7 @@
RESOURCE_DATA_LEVEL, &ResourceDataEntry); */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrFindResource_U(PVOID BaseAddress, PLDR_RESOURCE_INFO ResourceInfo, ULONG Level, @@ -260,7 +260,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrAccessResource(IN PVOID BaseAddress, IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, OUT PVOID* Resource OPTIONAL, @@ -311,7 +311,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrFindResourceDirectory_U(IN PVOID BaseAddress, IN PLDR_RESOURCE_INFO info, IN ULONG level, _____
Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-10-19 23:08:12 UTC (rev 18615) @@ -17,7 +17,7 @@
VOID RtlInitializeHeapManager (VOID); VOID LdrpInitLoader(VOID); -VOID STDCALL RtlpInitDeferedCriticalSection(VOID); +VOID NTAPI RtlpInitDeferedCriticalSection(VOID);
/* GLOBALS *******************************************************************/
@@ -240,7 +240,7 @@ /* FUNCTIONS *****************************************************************/
VOID -STDCALL +NTAPI LdrpInit(PCONTEXT Context, PVOID SystemArgument1, PVOID SystemArgument2) _____
Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-10-19 23:08:12 UTC (rev 18615) @@ -271,7 +271,7 @@
TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData; TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill; if (TlsDirectory->AddressOfCallBacks) - TlsData->TlsAddressOfCallBacks = *TlsDirectory->AddressOfCallBacks; + TlsData->TlsAddressOfCallBacks = *(PIMAGE_TLS_CALLBACK*)TlsDirectory->AddressOfCallBacks; else TlsData->TlsAddressOfCallBacks = NULL; TlsData->Module = Module; @@ -722,7 +722,7 @@ * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrLoadDll (IN PWSTR SearchPath OPTIONAL, IN ULONG LoadFlags, IN PUNICODE_STRING Name, @@ -775,7 +775,7 @@ * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrFindEntryForAddress(PVOID Address, PLDR_DATA_TABLE_ENTRY *Module) { @@ -2217,7 +2217,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrUnloadDll (IN PVOID BaseAddress) { PLDR_DATA_TABLE_ENTRY Module; @@ -2246,7 +2246,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress) { PLIST_ENTRY ModuleListHead; @@ -2284,7 +2284,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrGetDllHandle(IN PWSTR DllPath OPTIONAL, IN PULONG DllCharacteristics, IN PUNICODE_STRING DllName, @@ -2320,7 +2320,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrGetProcedureAddress (IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, @@ -2523,7 +2523,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrShutdownProcess (VOID) { LdrpDetachProcess(TRUE); @@ -2584,7 +2584,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrShutdownThread (VOID) { PLIST_ENTRY ModuleListHead; @@ -2642,7 +2642,7 @@ * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrQueryProcessModuleInformation(IN PMODULE_INFORMATION ModuleInformation OPTIONAL, IN ULONG Size OPTIONAL, OUT PULONG ReturnedSize) @@ -2839,7 +2839,7 @@ * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle, ULONG Unknown1, ULONG Unknown2, @@ -2933,7 +2933,7 @@ * * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey, IN PCWSTR ValueName, IN ULONG Type, @@ -3064,7 +3064,7 @@ }
-PIMAGE_BASE_RELOCATION STDCALL +PIMAGE_BASE_RELOCATION NTAPI LdrProcessRelocationBlock(IN PVOID Address, IN USHORT Count, IN PUSHORT TypeOffset, _____
Modified: trunk/reactos/lib/ntdll/main/dispatch.c --- trunk/reactos/lib/ntdll/main/dispatch.c 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/main/dispatch.c 2005-10-19 23:08:12 UTC (rev 18615) @@ -12,7 +12,7 @@
#define NDEBUG #include <debug.h>
-typedef NTSTATUS (STDCALL *USER_CALL)(PVOID Argument, ULONG ArgumentLength); +typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength);
/* FUNCTIONS ****************************************************************/
@@ -20,7 +20,7 @@ * @implemented */ VOID -STDCALL +NTAPI KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord, PCONTEXT Context) { @@ -53,7 +53,7 @@ * @implemented */ VOID -STDCALL +NTAPI KiRaiseUserExceptionDispatcher(VOID) { EXCEPTION_RECORD ExceptionRecord; @@ -72,7 +72,7 @@ * @implemented */ VOID -STDCALL +NTAPI KiUserCallbackDispatcher(ULONG Index, PVOID Argument, ULONG ArgumentLength) _____
Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-10-19 23:08:12 UTC (rev 18615) @@ -42,14 +42,14 @@
}
KPROCESSOR_MODE -STDCALL +NTAPI RtlpGetMode() { return UserMode; }
PPEB -STDCALL +NTAPI RtlpCurrentPeb(VOID) { return NtCurrentPeb(); @@ -58,7 +58,7 @@ /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlAcquirePebLock(VOID) { PPEB Peb = NtCurrentPeb (); @@ -68,7 +68,7 @@ /* * @implemented */ -VOID STDCALL +VOID NTAPI RtlReleasePebLock(VOID) { PPEB Peb = NtCurrentPeb (); @@ -79,7 +79,7 @@ * @implemented */ ULONG -STDCALL +NTAPI RtlGetNtGlobalFlags(VOID) { PPEB pPeb = NtCurrentPeb(); @@ -87,7 +87,7 @@ }
NTSTATUS -STDCALL +NTAPI RtlDeleteHeapLock( PRTL_CRITICAL_SECTION CriticalSection) { @@ -95,7 +95,7 @@ }
NTSTATUS -STDCALL +NTAPI RtlEnterHeapLock( PRTL_CRITICAL_SECTION CriticalSection) { @@ -103,7 +103,7 @@ }
NTSTATUS -STDCALL +NTAPI RtlInitializeHeapLock( PRTL_CRITICAL_SECTION CriticalSection) { @@ -111,7 +111,7 @@ }
NTSTATUS -STDCALL +NTAPI RtlLeaveHeapLock( PRTL_CRITICAL_SECTION CriticalSection) { @@ -119,7 +119,7 @@ }
PVOID -STDCALL +NTAPI RtlpAllocateMemory(UINT Bytes, ULONG Tag) { @@ -132,7 +132,7 @@
VOID -STDCALL +NTAPI RtlpFreeMemory(PVOID Mem, ULONG Tag) { _____
Modified: trunk/reactos/lib/ntdll/rtl/version.c --- trunk/reactos/lib/ntdll/rtl/version.c 2005-10-19 22:51:21 UTC (rev 18614) +++ trunk/reactos/lib/ntdll/rtl/version.c 2005-10-19 23:08:12 UTC (rev 18615) @@ -42,7 +42,7 @@
* @implemented */
-BOOLEAN STDCALL +BOOLEAN NTAPI RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType) { *ProductType = SharedUserData->NtProductType; @@ -70,7 +70,7 @@ * @implemented */
-void STDCALL +void NTAPI RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build) { PPEB pPeb = NtCurrentPeb(); @@ -102,7 +102,7 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS NTAPI RtlGetVersion(RTL_OSVERSIONINFOW *Info) { if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) ||