diff --git a/reactos/drivers/dd/green/createclose.c b/reactos/drivers/dd/green/createclose.c index fea2d1d4bd9..0d63f2b8a7f 100644 --- 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 + #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 fcced05bb01..0d10708b3ec 100644 --- 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 + #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 a83db8f1529..a30ab3e022b 100644 --- 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 + #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 c4a2ffe42ad..dcc3fd255bb 100644 --- a/reactos/drivers/dd/green/green.h +++ b/reactos/drivers/dd/green/green.h @@ -1,24 +1,15 @@ +#include +#include +#include +#include + #if defined(__GNUC__) - #include - #include #include #include - #include /* should be in kbdmou.h */ - #include - #include + #define INFINITE 0xFFFFFFFF - /* 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) - - 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 - #include - #include - - #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 40335312d11..93d40a76e34 100644 --- 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 + #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 28a0d475598..de9bdd0ec76 100644 --- 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 + #include "green.h" NTSTATUS diff --git a/reactos/drivers/dd/green/pnp.c b/reactos/drivers/dd/green/pnp.c index 554d12f4725..1da5b86bdc7 100644 --- 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 + #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 834c31a06ae..6f8f7e97797 100644 --- 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 + #include "green.h" -#include #define ESC ((UCHAR)0x1b)