STDCALL -> NTAPI

Update headers to minimize differences between GCC and MSVC
Move the #include <debug.h> to each file to be able to use precompiled headers
Remove $Id tags

svn path=/trunk/; revision=18826

diff --git a/reactos/drivers/dd/green/createclose.c b/reactos/drivers/dd/green/createclose.c
index fea2d1d..0d63f2b 100644 (file)
--- a/reactos/drivers/dd/green/createclose.c
+++ b/reactos/drivers/dd/green/createclose.c
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS VT100 emulator
  * FILE:            drivers/dd/green/createclose.c
  * PURPOSE:         IRP_MJ_CREATE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP operations
  *
- * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
 //#define NDEBUG
+#include <debug.h>
+
 #include "green.h"
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 GreenCreate(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp)
@@ -24,7 +25,7 @@ GreenCreate(
        return STATUS_SUCCESS;
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 GreenClose(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp)

diff --git a/reactos/drivers/dd/green/dispatch.c b/reactos/drivers/dd/green/dispatch.c
index fcced05..0d10708 100644 (file)
--- a/reactos/drivers/dd/green/dispatch.c
+++ b/reactos/drivers/dd/green/dispatch.c
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS VT100 emulator
  * FILE:            drivers/dd/green/dispatch.c
  * PURPOSE:         Dispatch routines
  *
- * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
 #define NDEBUG
+#include <debug.h>
+
 #include "green.h"
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 GreenDispatch(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp)

diff --git a/reactos/drivers/dd/green/green.c b/reactos/drivers/dd/green/green.c
index a83db8f..a30ab3e 100644 (file)
--- a/reactos/drivers/dd/green/green.c
+++ b/reactos/drivers/dd/green/green.c
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS VT100 emulator
  * FILE:            drivers/dd/green/green.c
  * PURPOSE:         Driver entry point
  *
- * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
 //#define NDEBUG
+#include <debug.h>
+
 #include "green.h"
 
-VOID STDCALL
+VOID NTAPI
 DriverUnload(IN PDRIVER_OBJECT DriverObject)
 {
        // nothing to do here yet
@@ -20,7 +21,7 @@ DriverUnload(IN PDRIVER_OBJECT DriverObject)
 /*
  * Standard DriverEntry method.
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(
        IN PDRIVER_OBJECT DriverObject,
        IN PUNICODE_STRING RegPath)

diff --git a/reactos/drivers/dd/green/green.h b/reactos/drivers/dd/green/green.h
index c4a2ffe..dcc3fd2 100644 (file)
--- a/reactos/drivers/dd/green/green.h
+++ b/reactos/drivers/dd/green/green.h
@@ -1,24 +1,15 @@
+#include <ntddk.h>
+#include <ntddser.h>
+#include <kbdmou.h>
+#include <stdarg.h>
+
 #if defined(__GNUC__)
-  #include <ddk/ntddk.h>
-  #include <ddk/ntddser.h>
   #include <wincon.h>
   #include <drivers/blue/ntddblue.h>
-  #include <ddk/ntddkbd.h> /* should be in kbdmou.h */
-  #include <winbase.h>
-
-  #include <debug.h>
-
-  /* FIXME: should be in kbdmou.h */
-  typedef struct _CONNECT_DATA {
-    PDEVICE_OBJECT ClassDeviceObject;
-    PVOID ClassService;
-  } CONNECT_DATA, *PCONNECT_DATA;
 
-  /* FIXME: should be in kbdmou.h */
-  #define IOCTL_INTERNAL_KEYBOARD_CONNECT \
-    CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS)
+  #define INFINITE 0xFFFFFFFF
 
-  NTSTATUS STDCALL
+  NTSTATUS NTAPI
   ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
     ULONG Attributes,
     PACCESS_STATE PassedAccessState,
@@ -28,9 +19,6 @@
     PVOID ParseContext,
     PVOID* ObjectPtr);
 
-  /* FIXME: should be in kbdmou.h */
-  typedef VOID (*PSERVICE_CALLBACK_ROUTINE)(PDEVICE_OBJECT, PKEYBOARD_INPUT_DATA, PKEYBOARD_INPUT_DATA, PULONG);
-
   typedef struct _CLASS_INFORMATION
   {
     PDEVICE_OBJECT DeviceObject;
@@ -40,16 +28,7 @@
   #define KEYBOARD_BUFFER_SIZE 100
 
 #elif defined(_MSC_VER)
-  #include <ntddk.h>
-  #include <ntddser.h>
-  #include <kbdmou.h>
-
-  #define STDCALL
-
-  #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint
-  #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__)
-  #define DPRINT DPRINT1
-  #define CHECKPOINT CHECKPOINT1
+  /* Nothing more to do */
 #else
   #error Unknown compiler!
 #endif

diff --git a/reactos/drivers/dd/green/keyboard.c b/reactos/drivers/dd/green/keyboard.c
index 4033531..93d40a7 100644 (file)
--- a/reactos/drivers/dd/green/keyboard.c
+++ b/reactos/drivers/dd/green/keyboard.c
@@ -1,14 +1,15 @@
-/* $Id:
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS VT100 emulator
  * FILE:            drivers/dd/green/keyboard.c
  * PURPOSE:         Keyboard part of green management
  *
- * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
 #define NDEBUG
+#include <debug.h>
+
 #include "green.h"
 
 static BOOLEAN
@@ -138,7 +139,7 @@ KeyboardInitialize(
        return STATUS_SUCCESS;
 }
 
-static VOID STDCALL
+static VOID NTAPI
 KeyboardDpcSendData(
        IN PKDPC Dpc,
        IN PVOID pDeviceExtension, /* real type PKEYBOARD_DEVICE_EXTENSION */
@@ -161,7 +162,7 @@ KeyboardDpcSendData(
 
        DeviceExtension->InputDataCount[Queue] = 0;
 }
-static VOID STDCALL
+static VOID NTAPI
 KeyboardDeviceWorker(
        PVOID Context)
 {

diff --git a/reactos/drivers/dd/green/misc.c b/reactos/drivers/dd/green/misc.c
index 28a0d47..de9bdd0 100644 (file)
--- a/reactos/drivers/dd/green/misc.c
+++ b/reactos/drivers/dd/green/misc.c
@@ -1,14 +1,15 @@
-/* $Id:
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS VT100 emulator
  * FILE:            drivers/dd/green/misc.c
  * PURPOSE:         Misceallenous operations
  *
- * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
 //#define NDEBUG
+#include <debug.h>
+
 #include "green.h"
 
 NTSTATUS

diff --git a/reactos/drivers/dd/green/pnp.c b/reactos/drivers/dd/green/pnp.c
index 554d12f..1da5b86 100644 (file)
--- a/reactos/drivers/dd/green/pnp.c
+++ b/reactos/drivers/dd/green/pnp.c
@@ -1,17 +1,18 @@
-/* $Id:
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS VT100 emulator
  * FILE:            drivers/dd/green/pnp.c
  * PURPOSE:         IRP_MJ_PNP operations
  *
- * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.com)
+ * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
 #define NDEBUG
+#include <debug.h>
+
 #include "green.h"
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 GreenAddDevice(
        IN PDRIVER_OBJECT DriverObject,
        IN PDEVICE_OBJECT Pdo)

diff --git a/reactos/drivers/dd/green/screen.c b/reactos/drivers/dd/green/screen.c
index 834c31a..6f8f7e9 100644 (file)
--- a/reactos/drivers/dd/green/screen.c
+++ b/reactos/drivers/dd/green/screen.c
@@ -1,5 +1,4 @@
-/* $Id:
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS VT100 emulator
  * FILE:            drivers/dd/green/screen.c
@@ -7,12 +6,13 @@
  *
  * PROGRAMMERS:     Eric Kohl (ekohl@abo.rhein-zeitung.de)
  *                  Art Yerkes
- *                  Hervé Poussineau (hpoussin@reactos.com)
+ *                  Hervé Poussineau (hpoussin@reactos.org)
  */
 
 #define NDEBUG
+#include <debug.h>
+
 #include "green.h"
-#include <stdarg.h>
 
 #define ESC       ((UCHAR)0x1b)