[ros-diffs] [hpoussin] 22274: Replace STDCALL by NTAPI Some 64 bits fixes

Author: hpoussin
Date: Wed Jun  7 21:31:43 2006
New Revision: 22274

URL: http://svn.reactos.ru/svn/reactos?rev=22274&view=rev
Log:
Replace STDCALL by NTAPI
Some 64 bits fixes

Modified:
    trunk/reactos/drivers/bus/serenum/detect.c
    trunk/reactos/drivers/bus/serenum/fdo.c
    trunk/reactos/drivers/bus/serenum/misc.c
    trunk/reactos/drivers/bus/serenum/serenum.c
    trunk/reactos/drivers/bus/serenum/serenum.h

Modified: trunk/reactos/drivers/bus/serenum/detect.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/detect.c...
==============================================================================
--- trunk/reactos/drivers/bus/serenum/detect.c (original)
+++ trunk/reactos/drivers/bus/serenum/detect.c Wed Jun  7 21:31:43 2006
@@ -17,9 +17,9 @@
    IN PDEVICE_OBJECT DeviceObject,
    IN ULONG CtlCode,
    IN PVOID InputBuffer OPTIONAL,
-	IN ULONG InputBufferSize,
+	IN ULONG_PTR InputBufferSize,
    IN OUT PVOID OutputBuffer OPTIONAL,
-	IN OUT PULONG OutputBufferSize)
+	IN OUT PULONG_PTR OutputBufferSize)
 {
    KEVENT Event;
    PIRP Irp;
@@ -103,7 +103,7 @@
    IN PDEVICE_OBJECT LowerDevice,
    OUT PUCHAR Buffer,
    IN ULONG BufferSize,
-	OUT PULONG FilledBytes)
+	OUT PULONG_PTR FilledBytes)
 {
    PIRP Irp;
    IO_STATUS_BLOCK ioStatus;
@@ -258,8 +258,8 @@
 {
    UCHAR Buffer[256];
    ULONG BaudRate;
-	ULONG TotalBytesReceived = 0;
-	ULONG Size;
+	ULONG_PTR TotalBytesReceived = 0;
+	ULONG_PTR Size;
    ULONG Msr, Purge;
    ULONG i;
    BOOLEAN BufferContainsBeginId = FALSE;

Modified: trunk/reactos/drivers/bus/serenum/fdo.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/fdo.c?re...
==============================================================================
--- trunk/reactos/drivers/bus/serenum/fdo.c (original)
+++ trunk/reactos/drivers/bus/serenum/fdo.c Wed Jun  7 21:31:43 2006
@@ -10,7 +10,7 @@
 #define NDEBUG
 #include "serenum.h"

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SerenumAddDevice(
    IN PDRIVER_OBJECT DriverObject,
    IN PDEVICE_OBJECT Pdo)
@@ -68,7 +68,7 @@
    return STATUS_SUCCESS;
 }

-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 SerenumFdoStartDevice(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp)

Modified: trunk/reactos/drivers/bus/serenum/misc.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/misc.c?r...
==============================================================================
--- trunk/reactos/drivers/bus/serenum/misc.c (original)
+++ trunk/reactos/drivers/bus/serenum/misc.c Wed Jun  7 21:31:43 2006
@@ -86,7 +86,7 @@
    return Status;
 }

-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 ForwardIrpAndWaitCompletion(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp,
@@ -128,7 +128,7 @@
    return Status;
 }

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 ForwardIrpToLowerDeviceAndForget(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp)
@@ -147,7 +147,7 @@
    return IoCallDriver(LowerDevice, Irp);
 }

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 ForwardIrpToAttachedFdoAndForget(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp)
@@ -166,7 +166,7 @@
    return IoCallDriver(Fdo, Irp);
 }

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 ForwardIrpAndForget(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp)

Modified: trunk/reactos/drivers/bus/serenum/serenum.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/serenum....
==============================================================================
--- trunk/reactos/drivers/bus/serenum/serenum.c (original)
+++ trunk/reactos/drivers/bus/serenum/serenum.c Wed Jun  7 21:31:43 2006
@@ -11,7 +11,7 @@
 #define INITGUID
 #include "serenum.h"

-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 SerenumPnp(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp)
@@ -22,13 +22,13 @@
    	return SerenumPdoPnp(DeviceObject, Irp);
 }

-static VOID STDCALL
+static VOID NTAPI
 DriverUnload(IN PDRIVER_OBJECT DriverObject)
 {
    // nothing to do here yet
 }

-static NTSTATUS STDCALL
+static NTSTATUS NTAPI
 IrpStub(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp)
@@ -90,7 +90,7 @@
 /*
  * Standard DriverEntry method.
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(
    IN PDRIVER_OBJECT DriverObject,
    IN PUNICODE_STRING RegPath)

Modified: trunk/reactos/drivers/bus/serenum/serenum.h
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/serenum....
==============================================================================
--- trunk/reactos/drivers/bus/serenum/serenum.h (original)
+++ trunk/reactos/drivers/bus/serenum/serenum.h Wed Jun  7 21:31:43 2006
@@ -15,8 +15,6 @@
 #if defined(__GNUC__)
   #include <debug.h>
 #elif defined(_MSC_VER)
-  #define STDCALL
-
   #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint
   #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__)
   #define DPRINT DPRINT1
@@ -88,7 +86,7 @@

/************************************ fdo.c */

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 SerenumAddDevice(
    IN PDRIVER_OBJECT DriverObject,
    IN PDEVICE_OBJECT Pdo);
@@ -110,17 +108,17 @@
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp);

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 ForwardIrpToLowerDeviceAndForget(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp);

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 ForwardIrpToAttachedFdoAndForget(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp);

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 ForwardIrpAndForget(
    IN PDEVICE_OBJECT DeviceObject,
    IN PIRP Irp);
@@ -134,7 +132,7 @@

/************************************ serenum.c */

-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(
    IN PDRIVER_OBJECT DriverObject,
    IN PUNICODE_STRING RegPath);