[ros-diffs] [ion] 20646: - Get green to compile with msvc/ddk.

- Get green to compile with msvc/ddk.
Modified: trunk/reactos/drivers/dd/green/green.h
Modified: trunk/reactos/drivers/dd/green/green.xml
Modified: trunk/reactos/drivers/dd/green/keyboard.c
  _____  

Modified: trunk/reactos/drivers/dd/green/green.h
--- trunk/reactos/drivers/dd/green/green.h	2006-01-07 03:29:02 UTC
(rev 20645)
+++ trunk/reactos/drivers/dd/green/green.h	2006-01-07 05:11:32 UTC
(rev 20646)
@@ -1,38 +1,17 @@

+#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>
+#include <drivers/blue/ntddblue.h>
 
-#if defined(__GNUC__)
-  #include <drivers/blue/ntddblue.h>
+#define INFINITE -1
+#define KEYBOARD_BUFFER_SIZE 100
 
-  #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
-
-#elif defined(_MSC_VER)
-  /* Nothing more to do */
-#else
-  #error Unknown compiler!
-#endif
-
 typedef enum
 {
 	Green,
@@ -50,7 +29,7 @@
 	COMMON_DEVICE_EXTENSION Common;
 	PDEVICE_OBJECT Green;
 
-	CLASS_INFORMATION ClassInformation;
+	CONNECT_DATA ClassInformation;
 	HANDLE WorkerThreadHandle;
 	KDPC KeyboardDpc;
 
  _____  

Modified: trunk/reactos/drivers/dd/green/green.xml
--- trunk/reactos/drivers/dd/green/green.xml	2006-01-07 03:29:02 UTC
(rev 20645)
+++ trunk/reactos/drivers/dd/green/green.xml	2006-01-07 05:11:32 UTC
(rev 20646)
@@ -11,4 +11,5 @@

 	<file>pnp.c</file>
 	<file>screen.c</file>
 	<file>green.rc</file>
+	<pch>green.h</pch>
 </module>
  _____  

Modified: trunk/reactos/drivers/dd/green/keyboard.c
--- trunk/reactos/drivers/dd/green/keyboard.c	2006-01-07 03:29:02 UTC
(rev 20645)
+++ trunk/reactos/drivers/dd/green/keyboard.c	2006-01-07 05:11:32 UTC
(rev 20646)
@@ -154,8 +154,8 @@

 
 	Queue = DeviceExtension->ActiveQueue % 2;
 	InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue);
-
(*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack)
(
-			DeviceExtension->ClassInformation.DeviceObject,
+
(*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.ClassServ
ice)(
+
DeviceExtension->ClassInformation.ClassDeviceObject,
 			DeviceExtension->KeyboardInputData[Queue],
 
&DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCou
nt[Queue]],
 			&InputDataConsumed);
@@ -300,7 +300,7 @@
 			}
 
 			DeviceExtension->ClassInformation =
-
*((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer
);
+
*((PCONNECT_DATA)Stack->Parameters.DeviceIoControl.Type3InputBuffer);
 
 			/* Initialize serial port */
 			Fcr = 0;