- Get green to compile with msvc/ddk.

svn path=/trunk/; revision=20646

diff --git a/reactos/drivers/dd/green/green.h b/reactos/drivers/dd/green/green.h
index cf52c8d..0915ee7 100644 (file)
--- a/reactos/drivers/dd/green/green.h
+++ b/reactos/drivers/dd/green/green.h
@@ -1,37 +1,16 @@
+#include <stdarg.h>
 #include <ntddk.h>
+#include <ndk/iotypes.h>
+#include <windef.h>
+#define WINBASEAPI
+typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES;
 #include <ntddser.h>
 #include <kbdmou.h>
 #include <wincon.h>
-#include <stdarg.h>
-
-#if defined(__GNUC__)
-  #include <drivers/blue/ntddblue.h>
-
-  #define INFINITE 0xFFFFFFFF
-
-  NTSTATUS NTAPI
-  ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
-    ULONG Attributes,
-    PACCESS_STATE PassedAccessState,
-    ACCESS_MASK DesiredAccess,
-    POBJECT_TYPE ObjectType,
-    KPROCESSOR_MODE AccessMode,
-    PVOID ParseContext,
-    PVOID* ObjectPtr);
-
-  typedef struct _CLASS_INFORMATION
-  {
-    PDEVICE_OBJECT DeviceObject;
-    PVOID CallBack;
-  } CLASS_INFORMATION, *PCLASS_INFORMATION;
-
-  #define KEYBOARD_BUFFER_SIZE 100
+#include <drivers/blue/ntddblue.h>
 
-#elif defined(_MSC_VER)
-  /* Nothing more to do */
-#else
-  #error Unknown compiler!
-#endif
+#define INFINITE -1
+#define KEYBOARD_BUFFER_SIZE 100
 
 typedef enum
 {
@@ -50,7 +29,7 @@ typedef struct _KEYBOARD_DEVICE_EXTENSION
        COMMON_DEVICE_EXTENSION Common;
        PDEVICE_OBJECT Green;
 
-       CLASS_INFORMATION ClassInformation;
+       CONNECT_DATA ClassInformation;
        HANDLE WorkerThreadHandle;
        KDPC KeyboardDpc;
 

diff --git a/reactos/drivers/dd/green/green.xml b/reactos/drivers/dd/green/green.xml
index 92f36af..39f0e66 100644 (file)
--- a/reactos/drivers/dd/green/green.xml
+++ b/reactos/drivers/dd/green/green.xml
@@ -11,4 +11,5 @@
        <file>pnp.c</file>
        <file>screen.c</file>
        <file>green.rc</file>
+       <pch>green.h</pch>
 </module>

diff --git a/reactos/drivers/dd/green/keyboard.c b/reactos/drivers/dd/green/keyboard.c
index 46b565f..16c86cd 100644 (file)
--- a/reactos/drivers/dd/green/keyboard.c
+++ b/reactos/drivers/dd/green/keyboard.c
@@ -154,8 +154,8 @@ KeyboardDpcSendData(
 
        Queue = DeviceExtension->ActiveQueue % 2;
        InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue);
-       (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack)(
-                       DeviceExtension->ClassInformation.DeviceObject,
+       (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.ClassService)(
+                       DeviceExtension->ClassInformation.ClassDeviceObject,
                        DeviceExtension->KeyboardInputData[Queue],
                        &DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCount[Queue]],
                        &InputDataConsumed);
@@ -300,7 +300,7 @@ KeyboardInternalDeviceControl(
                        }
 
                        DeviceExtension->ClassInformation =
-                               *((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer);
+                               *((PCONNECT_DATA)Stack->Parameters.DeviceIoControl.Type3InputBuffer);
 
                        /* Initialize serial port */
                        Fcr = 0;