Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:13:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix compile with msvc/psdk.

Browse source 
svn path=/trunk/; revision=18615
This commit is contained in:
Alex Ionescu 2005-10-19 23:08:12 +00:00
parent 986feb9eea
commit f2ec008f69
9 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/lib/ntdll/dbg/dbgui.c
View file

@ -40,7 +40,7 @@ DebugPrint(IN PANSI_STRING DebugString,
* @implemented * @implemented
*/ */
NTSTATUS NTSTATUS
STDCALL NTAPI
DbgUiConnectToDbg(VOID) DbgUiConnectToDbg(VOID)
{ {
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
@ -66,7 +66,7 @@ DbgUiConnectToDbg(VOID)
* @implemented * @implemented
*/ */
NTSTATUS NTSTATUS
STDCALL NTAPI
DbgUiContinue(PCLIENT_ID ClientId, DbgUiContinue(PCLIENT_ID ClientId,
ULONG ContinueStatus) ULONG ContinueStatus)
{ {
@ -95,7 +95,7 @@ DbgUiWaitStateChange(PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange,
* @implemented * @implemented
*/ */
VOID VOID
STDCALL NTAPI
DbgUiRemoteBreakin(VOID) DbgUiRemoteBreakin(VOID)
{ {
/* Make sure a debugger is enabled; if so, breakpoint */ /* Make sure a debugger is enabled; if so, breakpoint */
@ -109,7 +109,7 @@ DbgUiRemoteBreakin(VOID)
* @implemented * @implemented
*/ */
NTSTATUS NTSTATUS
STDCALL NTAPI
DbgUiIssueRemoteBreakin(HANDLE Process) DbgUiIssueRemoteBreakin(HANDLE Process)
{ {
HANDLE hThread; HANDLE hThread;

1
reactos/lib/ntdll/inc/ntdll.h
View file

@ -14,6 +14,7 @@
/* C Headers */ /* C Headers */
#define _CTYPE_DISABLE_MACROS #define _CTYPE_DISABLE_MACROS
#define _CRT_SECURE_NO_DEPRECATE
#define _INC_SWPRINTF_INL_ #define _INC_SWPRINTF_INL_
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>

4
reactos/lib/ntdll/inc/ntdllp.h
View file

@ -9,7 +9,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
/* FIXME: Cleanup this mess */ /* FIXME: Cleanup this mess */
typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB); typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB);
NTSTATUS LdrMapSections(HANDLE ProcessHandle, NTSTATUS LdrMapSections(HANDLE ProcessHandle,
PVOID ImageBase, PVOID ImageBase,
HANDLE SectionHandle, HANDLE SectionHandle,
@ -24,7 +24,7 @@ PEPFUNC LdrPEStartup (PVOID ImageBase,
PLDR_DATA_TABLE_ENTRY* Module, PLDR_DATA_TABLE_ENTRY* Module,
PWSTR FullDosName); PWSTR FullDosName);
typedef BOOL typedef BOOL
(STDCALL *PDLLMAIN_FUNC)(HANDLE hInst, (NTAPI *PDLLMAIN_FUNC)(HANDLE hInst,
ULONG ul_reason_for_call, ULONG ul_reason_for_call,
LPVOID lpReserved); LPVOID lpReserved);

6
reactos/lib/ntdll/ldr/res.c
View file

@ -85,7 +85,7 @@ PushLanguage(WORD *list, int pos, WORD lang)
RESOURCE_DATA_LEVEL, RESOURCE_DATA_LEVEL,
&ResourceDataEntry); &ResourceDataEntry);
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrFindResource_U(PVOID BaseAddress, LdrFindResource_U(PVOID BaseAddress,
PLDR_RESOURCE_INFO ResourceInfo, PLDR_RESOURCE_INFO ResourceInfo,
ULONG Level, ULONG Level,
@ -260,7 +260,7 @@ found:;
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrAccessResource(IN PVOID BaseAddress, LdrAccessResource(IN PVOID BaseAddress,
IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry,
OUT PVOID* Resource OPTIONAL, OUT PVOID* Resource OPTIONAL,
@ -311,7 +311,7 @@ LdrAccessResource(IN PVOID BaseAddress,
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrFindResourceDirectory_U(IN PVOID BaseAddress, LdrFindResourceDirectory_U(IN PVOID BaseAddress,
IN PLDR_RESOURCE_INFO info, IN PLDR_RESOURCE_INFO info,
IN ULONG level, IN ULONG level,

4
reactos/lib/ntdll/ldr/startup.c
View file

@ -17,7 +17,7 @@
VOID RtlInitializeHeapManager (VOID); VOID RtlInitializeHeapManager (VOID);
VOID LdrpInitLoader(VOID); VOID LdrpInitLoader(VOID);
VOID STDCALL RtlpInitDeferedCriticalSection(VOID); VOID NTAPI RtlpInitDeferedCriticalSection(VOID);
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
@ -240,7 +240,7 @@ finish:
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
VOID VOID
STDCALL NTAPI
LdrpInit(PCONTEXT Context, LdrpInit(PCONTEXT Context,
PVOID SystemArgument1, PVOID SystemArgument1,
PVOID SystemArgument2) PVOID SystemArgument2)

26
reactos/lib/ntdll/ldr/utils.c
View file

@ -271,7 +271,7 @@ LdrpInitializeTlsForProccess(VOID)
TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData; TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData;
TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill; TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill;
if (TlsDirectory->AddressOfCallBacks) if (TlsDirectory->AddressOfCallBacks)
TlsData->TlsAddressOfCallBacks = *TlsDirectory->AddressOfCallBacks; TlsData->TlsAddressOfCallBacks = *(PIMAGE_TLS_CALLBACK*)TlsDirectory->AddressOfCallBacks;
else else
TlsData->TlsAddressOfCallBacks = NULL; TlsData->TlsAddressOfCallBacks = NULL;
TlsData->Module = Module; TlsData->Module = Module;
@ -722,7 +722,7 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
* *
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrLoadDll (IN PWSTR SearchPath OPTIONAL, LdrLoadDll (IN PWSTR SearchPath OPTIONAL,
IN ULONG LoadFlags, IN ULONG LoadFlags,
IN PUNICODE_STRING Name, IN PUNICODE_STRING Name,
@ -775,7 +775,7 @@ LdrLoadDll (IN PWSTR SearchPath OPTIONAL,
* *
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrFindEntryForAddress(PVOID Address, LdrFindEntryForAddress(PVOID Address,
PLDR_DATA_TABLE_ENTRY *Module) PLDR_DATA_TABLE_ENTRY *Module)
{ {
@ -2217,7 +2217,7 @@ LdrpUnloadModule(PLDR_DATA_TABLE_ENTRY Module,
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrUnloadDll (IN PVOID BaseAddress) LdrUnloadDll (IN PVOID BaseAddress)
{ {
PLDR_DATA_TABLE_ENTRY Module; PLDR_DATA_TABLE_ENTRY Module;
@ -2246,7 +2246,7 @@ LdrUnloadDll (IN PVOID BaseAddress)
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress) LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress)
{ {
PLIST_ENTRY ModuleListHead; PLIST_ENTRY ModuleListHead;
@ -2284,7 +2284,7 @@ LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress)
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrGetDllHandle(IN PWSTR DllPath OPTIONAL, LdrGetDllHandle(IN PWSTR DllPath OPTIONAL,
IN PULONG DllCharacteristics, IN PULONG DllCharacteristics,
IN PUNICODE_STRING DllName, IN PUNICODE_STRING DllName,
@ -2320,7 +2320,7 @@ LdrGetDllHandle(IN PWSTR DllPath OPTIONAL,
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrGetProcedureAddress (IN PVOID BaseAddress, LdrGetProcedureAddress (IN PVOID BaseAddress,
IN PANSI_STRING Name, IN PANSI_STRING Name,
IN ULONG Ordinal, IN ULONG Ordinal,
@ -2523,7 +2523,7 @@ LdrpAttachProcess(VOID)
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrShutdownProcess (VOID) LdrShutdownProcess (VOID)
{ {
LdrpDetachProcess(TRUE); LdrpDetachProcess(TRUE);
@ -2584,7 +2584,7 @@ LdrpAttachThread (VOID)
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrShutdownThread (VOID) LdrShutdownThread (VOID)
{ {
PLIST_ENTRY ModuleListHead; PLIST_ENTRY ModuleListHead;
@ -2642,7 +2642,7 @@ LdrShutdownThread (VOID)
* *
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrQueryProcessModuleInformation(IN PMODULE_INFORMATION ModuleInformation OPTIONAL, LdrQueryProcessModuleInformation(IN PMODULE_INFORMATION ModuleInformation OPTIONAL,
IN ULONG Size OPTIONAL, IN ULONG Size OPTIONAL,
OUT PULONG ReturnedSize) OUT PULONG ReturnedSize)
@ -2839,7 +2839,7 @@ LdrpGetResidentSize(PIMAGE_NT_HEADERS NTHeaders)
* *
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle, LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle,
ULONG Unknown1, ULONG Unknown1,
ULONG Unknown2, ULONG Unknown2,
@ -2933,7 +2933,7 @@ LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle,
* *
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey, LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey,
IN PCWSTR ValueName, IN PCWSTR ValueName,
IN ULONG Type, IN ULONG Type,
@ -3064,7 +3064,7 @@ LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey,
} }
PIMAGE_BASE_RELOCATION STDCALL PIMAGE_BASE_RELOCATION NTAPI
LdrProcessRelocationBlock(IN PVOID Address, LdrProcessRelocationBlock(IN PVOID Address,
IN USHORT Count, IN USHORT Count,
IN PUSHORT TypeOffset, IN PUSHORT TypeOffset,

8
reactos/lib/ntdll/main/dispatch.c
View file

@ -12,7 +12,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
typedef NTSTATUS (STDCALL *USER_CALL)(PVOID Argument, ULONG ArgumentLength); typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength);
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
@ -20,7 +20,7 @@ typedef NTSTATUS (STDCALL *USER_CALL)(PVOID Argument, ULONG ArgumentLength);
* @implemented * @implemented
*/ */
VOID VOID
STDCALL NTAPI
KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord, KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord,
PCONTEXT Context) PCONTEXT Context)
{ {
@ -53,7 +53,7 @@ KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord,
* @implemented * @implemented
*/ */
VOID VOID
STDCALL NTAPI
KiRaiseUserExceptionDispatcher(VOID) KiRaiseUserExceptionDispatcher(VOID)
{ {
EXCEPTION_RECORD ExceptionRecord; EXCEPTION_RECORD ExceptionRecord;
@ -72,7 +72,7 @@ KiRaiseUserExceptionDispatcher(VOID)
* @implemented * @implemented
*/ */
VOID VOID
STDCALL NTAPI
KiUserCallbackDispatcher(ULONG Index, KiUserCallbackDispatcher(ULONG Index,
PVOID Argument, PVOID Argument,
ULONG ArgumentLength) ULONG ArgumentLength)

22
reactos/lib/ntdll/rtl/libsupp.c
View file

@ -42,14 +42,14 @@ RtlpSetInDbgPrint(IN BOOLEAN NewValue)
} }
KPROCESSOR_MODE KPROCESSOR_MODE
STDCALL NTAPI
RtlpGetMode() RtlpGetMode()
{ {
return UserMode; return UserMode;
} }
PPEB PPEB
STDCALL NTAPI
RtlpCurrentPeb(VOID) RtlpCurrentPeb(VOID)
{ {
return NtCurrentPeb(); return NtCurrentPeb();
@ -58,7 +58,7 @@ RtlpCurrentPeb(VOID)
/* /*
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
RtlAcquirePebLock(VOID) RtlAcquirePebLock(VOID)
{ {
PPEB Peb = NtCurrentPeb (); PPEB Peb = NtCurrentPeb ();
@ -68,7 +68,7 @@ RtlAcquirePebLock(VOID)
/* /*
* @implemented * @implemented
*/ */
VOID STDCALL VOID NTAPI
RtlReleasePebLock(VOID) RtlReleasePebLock(VOID)
{ {
PPEB Peb = NtCurrentPeb (); PPEB Peb = NtCurrentPeb ();
@ -79,7 +79,7 @@ RtlReleasePebLock(VOID)
* @implemented * @implemented
*/ */
ULONG ULONG
STDCALL NTAPI
RtlGetNtGlobalFlags(VOID) RtlGetNtGlobalFlags(VOID)
{ {
PPEB pPeb = NtCurrentPeb(); PPEB pPeb = NtCurrentPeb();
@ -87,7 +87,7 @@ RtlGetNtGlobalFlags(VOID)
} }
NTSTATUS NTSTATUS
STDCALL NTAPI
RtlDeleteHeapLock( RtlDeleteHeapLock(
PRTL_CRITICAL_SECTION CriticalSection) PRTL_CRITICAL_SECTION CriticalSection)
{ {
@ -95,7 +95,7 @@ RtlDeleteHeapLock(
} }
NTSTATUS NTSTATUS
STDCALL NTAPI
RtlEnterHeapLock( RtlEnterHeapLock(
PRTL_CRITICAL_SECTION CriticalSection) PRTL_CRITICAL_SECTION CriticalSection)
{ {
@ -103,7 +103,7 @@ RtlEnterHeapLock(
} }
NTSTATUS NTSTATUS
STDCALL NTAPI
RtlInitializeHeapLock( RtlInitializeHeapLock(
PRTL_CRITICAL_SECTION CriticalSection) PRTL_CRITICAL_SECTION CriticalSection)
{ {
@ -111,7 +111,7 @@ RtlInitializeHeapLock(
} }
NTSTATUS NTSTATUS
STDCALL NTAPI
RtlLeaveHeapLock( RtlLeaveHeapLock(
PRTL_CRITICAL_SECTION CriticalSection) PRTL_CRITICAL_SECTION CriticalSection)
{ {
@ -119,7 +119,7 @@ RtlLeaveHeapLock(
} }
PVOID PVOID
STDCALL NTAPI
RtlpAllocateMemory(UINT Bytes, RtlpAllocateMemory(UINT Bytes,
ULONG Tag) ULONG Tag)
{ {
@ -132,7 +132,7 @@ RtlpAllocateMemory(UINT Bytes,
VOID VOID
STDCALL NTAPI
RtlpFreeMemory(PVOID Mem, RtlpFreeMemory(PVOID Mem,
ULONG Tag) ULONG Tag)
{ {

6
reactos/lib/ntdll/rtl/version.c
View file

@ -42,7 +42,7 @@
* @implemented * @implemented
*/ */
BOOLEAN STDCALL BOOLEAN NTAPI
RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType) RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType)
{ {
*ProductType = SharedUserData->NtProductType; *ProductType = SharedUserData->NtProductType;
@ -70,7 +70,7 @@ RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType)
* @implemented * @implemented
*/ */
void STDCALL void NTAPI
RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build) RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build)
{ {
PPEB pPeb = NtCurrentPeb(); PPEB pPeb = NtCurrentPeb();
@ -102,7 +102,7 @@ RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build)
/* /*
* @implemented * @implemented
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
RtlGetVersion(RTL_OSVERSIONINFOW *Info) RtlGetVersion(RTL_OSVERSIONINFOW *Info)
{ {
if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) ||