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
This commit is contained in:
Hervé Poussineau 2005-10-28 07:49:16 +00:00
parent e78968e133
commit 2c54e857c6
8 changed files with 44 additions and 59 deletions

View file

@ -1,17 +1,18 @@
/* $Id: /*
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator * PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/createclose.c * FILE: drivers/dd/green/createclose.c
* PURPOSE: IRP_MJ_CREATE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP operations * 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 //#define NDEBUG
#include <debug.h>
#include "green.h" #include "green.h"
NTSTATUS STDCALL NTSTATUS NTAPI
GreenCreate( GreenCreate(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
@ -24,7 +25,7 @@ GreenCreate(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS STDCALL NTSTATUS NTAPI
GreenClose( GreenClose(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)

View file

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

View file

@ -1,17 +1,18 @@
/* $Id: /*
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VT100 emulator * PROJECT: ReactOS VT100 emulator
* FILE: drivers/dd/green/green.c * FILE: drivers/dd/green/green.c
* PURPOSE: Driver entry point * PURPOSE: Driver entry point
* *
* PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.com) * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org)
*/ */
//#define NDEBUG //#define NDEBUG
#include <debug.h>
#include "green.h" #include "green.h"
VOID STDCALL VOID NTAPI
DriverUnload(IN PDRIVER_OBJECT DriverObject) DriverUnload(IN PDRIVER_OBJECT DriverObject)
{ {
// nothing to do here yet // nothing to do here yet
@ -20,7 +21,7 @@ DriverUnload(IN PDRIVER_OBJECT DriverObject)
/* /*
* 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)

View file

@ -1,24 +1,15 @@
#include <ntddk.h>
#include <ntddser.h>
#include <kbdmou.h>
#include <stdarg.h>
#if defined(__GNUC__) #if defined(__GNUC__)
#include <ddk/ntddk.h>
#include <ddk/ntddser.h>
#include <wincon.h> #include <wincon.h>
#include <drivers/blue/ntddblue.h> #include <drivers/blue/ntddblue.h>
#include <ddk/ntddkbd.h> /* should be in kbdmou.h */
#include <winbase.h>
#include <debug.h> #define INFINITE 0xFFFFFFFF
/* FIXME: should be in kbdmou.h */ NTSTATUS NTAPI
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
ObReferenceObjectByName(PUNICODE_STRING ObjectPath, ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
ULONG Attributes, ULONG Attributes,
PACCESS_STATE PassedAccessState, PACCESS_STATE PassedAccessState,
@ -28,9 +19,6 @@
PVOID ParseContext, PVOID ParseContext,
PVOID* ObjectPtr); 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 typedef struct _CLASS_INFORMATION
{ {
PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT DeviceObject;
@ -40,16 +28,7 @@
#define KEYBOARD_BUFFER_SIZE 100 #define KEYBOARD_BUFFER_SIZE 100
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#include <ntddk.h> /* Nothing more to do */
#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
#else #else
#error Unknown compiler! #error Unknown compiler!
#endif #endif

View file

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

View file

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

View file

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

View file

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