Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace STDCALL by NTAPI

Browse source 
Some 64 bits fixes

svn path=/trunk/; revision=22274
This commit is contained in:
Hervé Poussineau 2006-06-07 17:31:43 +00:00
parent 7e07a60d3a
commit 9a844e2247
5 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/drivers/bus/serenum/detect.c
View file

@ -17,9 +17,9 @@ DeviceIoControl(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN ULONG CtlCode, IN ULONG CtlCode,
IN PVOID InputBuffer OPTIONAL, IN PVOID InputBuffer OPTIONAL,
IN ULONG InputBufferSize, IN ULONG_PTR InputBufferSize,
IN OUT PVOID OutputBuffer OPTIONAL, IN OUT PVOID OutputBuffer OPTIONAL,
IN OUT PULONG OutputBufferSize) IN OUT PULONG_PTR OutputBufferSize)
{ {
KEVENT Event; KEVENT Event;
PIRP Irp; PIRP Irp;
@ -103,7 +103,7 @@ ReadBytes(
IN PDEVICE_OBJECT LowerDevice, IN PDEVICE_OBJECT LowerDevice,
OUT PUCHAR Buffer, OUT PUCHAR Buffer,
IN ULONG BufferSize, IN ULONG BufferSize,
OUT PULONG FilledBytes) OUT PULONG_PTR FilledBytes)
{ {
PIRP Irp; PIRP Irp;
IO_STATUS_BLOCK ioStatus; IO_STATUS_BLOCK ioStatus;
@ -258,8 +258,8 @@ SerenumDetectPnpDevice(
{ {
UCHAR Buffer[256]; UCHAR Buffer[256];
ULONG BaudRate; ULONG BaudRate;
ULONG TotalBytesReceived = 0; ULONG_PTR TotalBytesReceived = 0;
ULONG Size; ULONG_PTR Size;
ULONG Msr, Purge; ULONG Msr, Purge;
ULONG i; ULONG i;
BOOLEAN BufferContainsBeginId = FALSE; BOOLEAN BufferContainsBeginId = FALSE;

4
reactos/drivers/bus/serenum/fdo.c
View file

@ -10,7 +10,7 @@
#define NDEBUG #define NDEBUG
#include "serenum.h" #include "serenum.h"
NTSTATUS STDCALL NTSTATUS NTAPI
SerenumAddDevice( SerenumAddDevice(
IN PDRIVER_OBJECT DriverObject, IN PDRIVER_OBJECT DriverObject,
IN PDEVICE_OBJECT Pdo) IN PDEVICE_OBJECT Pdo)
@ -68,7 +68,7 @@ SerenumAddDevice(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static NTSTATUS STDCALL static NTSTATUS NTAPI
SerenumFdoStartDevice( SerenumFdoStartDevice(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)

8
reactos/drivers/bus/serenum/misc.c
View file

@ -86,7 +86,7 @@ SerenumInitMultiSzString(
return Status; return Status;
} }
static NTSTATUS STDCALL static NTSTATUS NTAPI
ForwardIrpAndWaitCompletion( ForwardIrpAndWaitCompletion(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp, IN PIRP Irp,
@ -128,7 +128,7 @@ ForwardIrpAndWait(
return Status; return Status;
} }
NTSTATUS STDCALL NTSTATUS NTAPI
ForwardIrpToLowerDeviceAndForget( ForwardIrpToLowerDeviceAndForget(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
@ -147,7 +147,7 @@ ForwardIrpToLowerDeviceAndForget(
return IoCallDriver(LowerDevice, Irp); return IoCallDriver(LowerDevice, Irp);
} }
NTSTATUS STDCALL NTSTATUS NTAPI
ForwardIrpToAttachedFdoAndForget( ForwardIrpToAttachedFdoAndForget(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
@ -166,7 +166,7 @@ ForwardIrpToAttachedFdoAndForget(
return IoCallDriver(Fdo, Irp); return IoCallDriver(Fdo, Irp);
} }
NTSTATUS STDCALL NTSTATUS NTAPI
ForwardIrpAndForget( ForwardIrpAndForget(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)

8
reactos/drivers/bus/serenum/serenum.c
View file

@ -11,7 +11,7 @@
#define INITGUID #define INITGUID
#include "serenum.h" #include "serenum.h"
static NTSTATUS STDCALL static NTSTATUS NTAPI
SerenumPnp( SerenumPnp(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
@ -22,13 +22,13 @@ SerenumPnp(
return SerenumPdoPnp(DeviceObject, Irp); return SerenumPdoPnp(DeviceObject, Irp);
} }
static VOID STDCALL static VOID NTAPI
DriverUnload(IN PDRIVER_OBJECT DriverObject) DriverUnload(IN PDRIVER_OBJECT DriverObject)
{ {
// nothing to do here yet // nothing to do here yet
} }
static NTSTATUS STDCALL static NTSTATUS NTAPI
IrpStub( IrpStub(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
@ -90,7 +90,7 @@ IrpStub(
/* /*
* Standard DriverEntry method. * Standard DriverEntry method.
*/ */
NTSTATUS STDCALL NTSTATUS NTAPI
DriverEntry( DriverEntry(
IN PDRIVER_OBJECT DriverObject, IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegPath) IN PUNICODE_STRING RegPath)

12
reactos/drivers/bus/serenum/serenum.h
View file

@ -15,8 +15,6 @@
#if defined(__GNUC__) #if defined(__GNUC__)
#include <debug.h> #include <debug.h>
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#define STDCALL
#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint
#define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__)
#define DPRINT DPRINT1 #define DPRINT DPRINT1
@ -88,7 +86,7 @@ SerenumDetectLegacyDevice(
/************************************ fdo.c */ /************************************ fdo.c */
NTSTATUS STDCALL NTSTATUS NTAPI
SerenumAddDevice( SerenumAddDevice(
IN PDRIVER_OBJECT DriverObject, IN PDRIVER_OBJECT DriverObject,
IN PDEVICE_OBJECT Pdo); IN PDEVICE_OBJECT Pdo);
@ -110,17 +108,17 @@ ForwardIrpAndWait(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp); IN PIRP Irp);
NTSTATUS STDCALL NTSTATUS NTAPI
ForwardIrpToLowerDeviceAndForget( ForwardIrpToLowerDeviceAndForget(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp); IN PIRP Irp);
NTSTATUS STDCALL NTSTATUS NTAPI
ForwardIrpToAttachedFdoAndForget( ForwardIrpToAttachedFdoAndForget(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp); IN PIRP Irp);
NTSTATUS STDCALL NTSTATUS NTAPI
ForwardIrpAndForget( ForwardIrpAndForget(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp); IN PIRP Irp);
@ -134,7 +132,7 @@ SerenumPdoPnp(
/************************************ serenum.c */ /************************************ serenum.c */
NTSTATUS STDCALL NTSTATUS NTAPI
DriverEntry( DriverEntry(
IN PDRIVER_OBJECT DriverObject, IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegPath); IN PUNICODE_STRING RegPath);