- Welcome to rosapps NTAPI/WINAPI, farewell STDCALL

svn path=/trunk/; revision=37749
This commit is contained in:
Stefan Ginsberg 2008-11-29 21:23:45 +00:00
parent 256458f8ad
commit 5cbe280085
10 changed files with 45 additions and 47 deletions

View file

@ -892,9 +892,7 @@ VOID TdiUnload(
NTSTATUS NTSTATUS
#ifndef _MSC_VER NTAPI
STDCALL
#endif
DriverEntry( DriverEntry(
PDRIVER_OBJECT DriverObject, PDRIVER_OBJECT DriverObject,
PUNICODE_STRING RegistryPath) PUNICODE_STRING RegistryPath)

View file

@ -205,7 +205,7 @@ ParseCommandLine(
// //
//---------------------------------------------------------------------- //----------------------------------------------------------------------
BOOLEAN BOOLEAN
STDCALL WINAPI
ChkdskCallback( ChkdskCallback(
CALLBACKCOMMAND Command, CALLBACKCOMMAND Command,
DWORD Modifier, DWORD Modifier,

View file

@ -31,7 +31,7 @@ static char DeviceName [DEVICE_SIZE];
BOOL BOOL
STDCALL WINAPI
GetNextString ( GetNextString (
char * BufferIn, char * BufferIn,
char * BufferOut, char * BufferOut,

View file

@ -68,7 +68,7 @@ INT (* COMMAND_CALL) (INT ArgC,LPCSTR ArgV []);
VOID STDCALL PrintStatus (NTSTATUS Status); VOID WINAPI PrintStatus (NTSTATUS Status);
#define CMD_REF(n) CMD_##n #define CMD_REF(n) CMD_##n
#define CMD_DEF(n) INT CMD_REF(n) (INT argc, LPCSTR argv []) #define CMD_DEF(n) INT CMD_REF(n) (INT argc, LPCSTR argv [])
@ -88,7 +88,7 @@ struct _COMMAND_DESCRIPTOR
#define BIT(n,m) (((n)&(m))?'1':'0') #define BIT(n,m) (((n)&(m))?'1':'0')
LPSTR LPSTR
STDCALL WINAPI
ByteToBinaryString ( ByteToBinaryString (
BYTE Byte, BYTE Byte,
CHAR Binary [8] CHAR Binary [8]
@ -107,7 +107,7 @@ ByteToBinaryString (
/* --- */ /* --- */
VOID VOID
STDCALL WINAPI
DumpData (int Size, PVOID pData ) DumpData (int Size, PVOID pData )
{ {
PBYTE Buffer = (PBYTE) pData; PBYTE Buffer = (PBYTE) pData;
@ -200,7 +200,7 @@ KernelObjectName [] =
LPTSTR LPTSTR
STDCALL WINAPI
HandleTypeToObjectName ( HandleTypeToObjectName (
DWORD HandleType DWORD HandleType
) )
@ -216,7 +216,7 @@ HandleTypeToObjectName (
/* --- */ /* --- */
int int
STDCALL WINAPI
FindRequiredBufferSize (int i, int step) FindRequiredBufferSize (int i, int step)
{ {
NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH;
@ -263,7 +263,7 @@ FindRequiredBufferSize (int i, int step)
VOID VOID
STDCALL WINAPI
PrintStatus (NTSTATUS Status) PrintStatus (NTSTATUS Status)
{ {
LPCSTR StatusName = NULL; LPCSTR StatusName = NULL;
@ -310,7 +310,7 @@ DaysOfWeek [] =
}; };
VOID VOID
STDCALL WINAPI
PrintUtcDateTime (LPCSTR Template, PTIME UtcTime) PrintUtcDateTime (LPCSTR Template, PTIME UtcTime)
{ {
CHAR UtcTimeString [64]; CHAR UtcTimeString [64];

View file

@ -63,14 +63,14 @@ void PsaiFree(void *ptr)
NtFreeVirtualMemory(NtCurrentProcess(), &ptr, &nSize, MEM_RELEASE); NtFreeVirtualMemory(NtCurrentProcess(), &ptr, &nSize, MEM_RELEASE);
} }
int STDCALL PrintBanner (VOID) int WINAPI PrintBanner (VOID)
{ {
printf ("ReactOS "KERNEL_RELEASE_STR" T(ask)List\n"); printf ("ReactOS "KERNEL_RELEASE_STR" T(ask)List\n");
printf ("Copyright (c) 2000,2001 Emanuele Aliberti\n\n"); printf ("Copyright (c) 2000,2001 Emanuele Aliberti\n\n");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
int STDCALL PrintSynopsys (int nRetVal) int WINAPI PrintSynopsys (int nRetVal)
{ {
PrintBanner (); PrintBanner ();
printf ("Usage: tlist [-t | PID | -l]\n\n" printf ("Usage: tlist [-t | PID | -l]\n\n"
@ -80,7 +80,7 @@ int STDCALL PrintSynopsys (int nRetVal)
return nRetVal; return nRetVal;
} }
int STDCALL PrintLicense (VOID) int WINAPI PrintLicense (VOID)
{ {
PrintBanner (); PrintBanner ();
printf ( printf (
@ -100,13 +100,13 @@ int STDCALL PrintLicense (VOID)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
BOOL STDCALL AcquirePrivileges (VOID) BOOL WINAPI AcquirePrivileges (VOID)
{ {
/* TODO: implement it */ /* TODO: implement it */
return TRUE; return TRUE;
} }
int STDCALL int WINAPI
ProcessHasDescendants ( ProcessHasDescendants (
HANDLE Pid, HANDLE Pid,
PSYSTEM_PROCESS_INFORMATION pInfo PSYSTEM_PROCESS_INFORMATION pInfo
@ -132,7 +132,7 @@ ProcessHasDescendants (
} }
BOOL STDCALL BOOL WINAPI
GetProcessInfo ( GetProcessInfo (
PSYSTEM_PROCESS_INFORMATION pInfo, PSYSTEM_PROCESS_INFORMATION pInfo,
LPWSTR * Module, LPWSTR * Module,
@ -144,7 +144,7 @@ GetProcessInfo (
return TRUE; return TRUE;
} }
int STDCALL PrintProcessInfoDepth ( int WINAPI PrintProcessInfoDepth (
PSYSTEM_PROCESS_INFORMATION pInfo, PSYSTEM_PROCESS_INFORMATION pInfo,
LONG Depth LONG Depth
) )
@ -165,7 +165,7 @@ int STDCALL PrintProcessInfoDepth (
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
int STDCALL int WINAPI
PrintProcessAndDescendants ( PrintProcessAndDescendants (
PSYSTEM_PROCESS_INFORMATION pInfo, PSYSTEM_PROCESS_INFORMATION pInfo,
PSYSTEM_PROCESS_INFORMATION pInfoBase, PSYSTEM_PROCESS_INFORMATION pInfoBase,
@ -209,7 +209,7 @@ PrintProcessAndDescendants (
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
int STDCALL PrintProcessList (BOOL DisplayTree) int WINAPI PrintProcessList (BOOL DisplayTree)
{ {
PSYSTEM_PROCESS_INFORMATION pInfo = NULL; PSYSTEM_PROCESS_INFORMATION pInfo = NULL;
PSYSTEM_PROCESS_INFORMATION pInfoBase = NULL; PSYSTEM_PROCESS_INFORMATION pInfoBase = NULL;
@ -251,7 +251,7 @@ int STDCALL PrintProcessList (BOOL DisplayTree)
} }
int STDCALL PrintThreads (PSYSTEM_PROCESS_INFORMATION pInfo) int WINAPI PrintThreads (PSYSTEM_PROCESS_INFORMATION pInfo)
{ {
ULONG i = 0; ULONG i = 0;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
@ -320,13 +320,13 @@ int STDCALL PrintThreads (PSYSTEM_PROCESS_INFORMATION pInfo)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
int STDCALL PrintModules (VOID) int WINAPI PrintModules (VOID)
{ {
/* TODO */ /* TODO */
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
PSYSTEM_PROCESS_INFORMATION STDCALL PSYSTEM_PROCESS_INFORMATION WINAPI
GetProcessInfoPid ( GetProcessInfoPid (
PSYSTEM_PROCESS_INFORMATION pInfoBase, PSYSTEM_PROCESS_INFORMATION pInfoBase,
HANDLE Pid HANDLE Pid
@ -349,7 +349,7 @@ GetProcessInfoPid (
return NULL; return NULL;
} }
int STDCALL PrintProcess (char * PidStr) int WINAPI PrintProcess (char * PidStr)
{ {
NTSTATUS Status = 0; NTSTATUS Status = 0;
HANDLE hProcess = 0; HANDLE hProcess = 0;

View file

@ -28,7 +28,7 @@
static static
PCHAR PCHAR
STDCALL WINAPI
RawUszAsz ( RawUszAsz (
PWCHAR szU, PWCHAR szU,
PCHAR szA PCHAR szA
@ -44,7 +44,7 @@ RawUszAsz (
static static
PWCHAR PWCHAR
STDCALL WINAPI
RawAszUsz ( RawAszUsz (
PCHAR szA, PCHAR szA,
PWCHAR szW PWCHAR szW
@ -60,7 +60,7 @@ RawAszUsz (
static static
const char * const char *
STDCALL WINAPI
StatusToName (NTSTATUS Status) StatusToName (NTSTATUS Status)
{ {
static char RawValue [16]; static char RawValue [16];
@ -94,7 +94,7 @@ StatusToName (NTSTATUS Status)
BOOL BOOL
STDCALL WINAPI
ExpandSymbolicLink ( ExpandSymbolicLink (
IN PUNICODE_STRING DirectoryName, IN PUNICODE_STRING DirectoryName,
IN PUNICODE_STRING SymbolicLinkName, IN PUNICODE_STRING SymbolicLinkName,
@ -167,7 +167,7 @@ ExpandSymbolicLink (
BOOL BOOL
STDCALL WINAPI
ListDirectory ( ListDirectory (
IN PUNICODE_STRING DirectoryNameW, IN PUNICODE_STRING DirectoryNameW,
IN BOOL Recurse IN BOOL Recurse

View file

@ -69,7 +69,7 @@ char tempPICE[1024];
// //
//************************************************************************* //*************************************************************************
NTSTATUS STDCALL pice_open(PDEVICE_OBJECT DeviceObject, PIRP Irp) NTSTATUS NTAPI pice_open(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{ {
DPRINT((0,"pice_open\n")); DPRINT((0,"pice_open\n"));
@ -89,7 +89,7 @@ NTSTATUS STDCALL pice_open(PDEVICE_OBJECT DeviceObject, PIRP Irp)
// pice_close() // pice_close()
// //
//************************************************************************* //*************************************************************************
NTSTATUS STDCALL pice_close(PDEVICE_OBJECT DeviceObject, PIRP Irp) NTSTATUS NTAPI pice_close(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{ {
DPRINT((0,"pice_close\n")); DPRINT((0,"pice_close\n"));
@ -108,7 +108,7 @@ NTSTATUS STDCALL pice_close(PDEVICE_OBJECT DeviceObject, PIRP Irp)
// //
//************************************************************************* //*************************************************************************
NTSTATUS STDCALL pice_ioctl(PDEVICE_OBJECT DeviceObject, PIRP Irp) NTSTATUS NTAPI pice_ioctl(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{ {
// char* pFilename = (char*) ioctl_param; // char* pFilename = (char*) ioctl_param;
@ -160,7 +160,7 @@ NTSTATUS STDCALL pice_ioctl(PDEVICE_OBJECT DeviceObject, PIRP Irp)
} }
NTSTATUS STDCALL DriverEntry(PDRIVER_OBJECT DriverObject, NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject,
PUNICODE_STRING RegistryPath) PUNICODE_STRING RegistryPath)
/* /*
* FUNCTION: Module entry point * FUNCTION: Module entry point

View file

@ -2331,7 +2331,7 @@ size_t PICE_len( HANDLE hFile )
*/ */
INT INT
STDCALL WINAPI
PICE_MultiByteToWideChar ( PICE_MultiByteToWideChar (
UINT CodePage, UINT CodePage,
DWORD dwFlags, DWORD dwFlags,

View file

@ -314,7 +314,7 @@ int PICE_close (HANDLE hFile);
size_t PICE_len( HANDLE hFile ); size_t PICE_len( HANDLE hFile );
WCHAR * PICE_wcscpy(WCHAR * str1,const WCHAR * str2); WCHAR * PICE_wcscpy(WCHAR * str1,const WCHAR * str2);
INT INT
STDCALL WINAPI
PICE_MultiByteToWideChar ( PICE_MultiByteToWideChar (
UINT CodePage, UINT CodePage,
DWORD dwFlags, DWORD dwFlags,

View file

@ -44,7 +44,7 @@ static PDRIVER_OBJECT DriverObject;
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
NTSTATUS STDCALL NTSTATUS NTAPI
FsdCloseFile(PDEVICE_EXTENSION DeviceExt, FsdCloseFile(PDEVICE_EXTENSION DeviceExt,
PFILE_OBJECT FileObject) PFILE_OBJECT FileObject)
/* /*
@ -55,7 +55,7 @@ FsdCloseFile(PDEVICE_EXTENSION DeviceExt,
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdOpenFile(PDEVICE_EXTENSION DeviceExt, FsdOpenFile(PDEVICE_EXTENSION DeviceExt,
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PWSTR FileName) PWSTR FileName)
@ -67,7 +67,7 @@ FsdOpenFile(PDEVICE_EXTENSION DeviceExt,
} }
BOOLEAN STDCALL BOOLEAN NTAPI
FsdHasFileSystem(PDEVICE_OBJECT DeviceToMount) FsdHasFileSystem(PDEVICE_OBJECT DeviceToMount)
/* /*
* FUNCTION: Tests if the device contains a filesystem that can be mounted * FUNCTION: Tests if the device contains a filesystem that can be mounted
@ -78,7 +78,7 @@ FsdHasFileSystem(PDEVICE_OBJECT DeviceToMount)
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdMountDevice(PDEVICE_EXTENSION DeviceExt, FsdMountDevice(PDEVICE_EXTENSION DeviceExt,
PDEVICE_OBJECT DeviceToMount) PDEVICE_OBJECT DeviceToMount)
/* /*
@ -89,7 +89,7 @@ FsdMountDevice(PDEVICE_EXTENSION DeviceExt,
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdReadFile(PDEVICE_EXTENSION DeviceExt, FsdReadFile(PDEVICE_EXTENSION DeviceExt,
PFILE_OBJECT FileObject, PFILE_OBJECT FileObject,
PVOID Buffer, PVOID Buffer,
@ -103,7 +103,7 @@ FsdReadFile(PDEVICE_EXTENSION DeviceExt,
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdClose(PDEVICE_OBJECT DeviceObject, FsdClose(PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
@ -122,7 +122,7 @@ FsdClose(PDEVICE_OBJECT DeviceObject,
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdCreate(PDEVICE_OBJECT DeviceObject, FsdCreate(PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
@ -142,7 +142,7 @@ FsdCreate(PDEVICE_OBJECT DeviceObject,
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdWrite(PDEVICE_OBJECT DeviceObject, FsdWrite(PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
@ -153,7 +153,7 @@ FsdWrite(PDEVICE_OBJECT DeviceObject,
return(STATUS_UNSUCCESSFUL); return(STATUS_UNSUCCESSFUL);
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdRead(PDEVICE_OBJECT DeviceObject, FsdRead(PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
@ -210,7 +210,7 @@ FsdMount(PDEVICE_OBJECT DeviceToMount)
} }
NTSTATUS STDCALL NTSTATUS NTAPI
FsdFileSystemControl(PDEVICE_OBJECT DeviceObject, FsdFileSystemControl(PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
@ -236,7 +236,7 @@ FsdFileSystemControl(PDEVICE_OBJECT DeviceObject,
} }
NTSTATUS STDCALL NTSTATUS NTAPI
DriverEntry(PDRIVER_OBJECT _DriverObject, DriverEntry(PDRIVER_OBJECT _DriverObject,
PUNICODE_STRING RegistryPath) PUNICODE_STRING RegistryPath)
/* /*