[DDK]

- d4drvif.h : Introduce pragma once, apply a consistent formatting, group related definitions and add several missing ones.
- d4iface.h : Introduce pragma once, apply a consistent formatting and group related definitions.
- dderror.h : Introduce pragma once and apply a consistent formatting.
- dxapi.h : Apply consistent formatting.
- fltsafe.h : Guard FLOATSAFE inside the proper NTDDI_VERSION and apply a consistent formatting.
- kbdmou.h : Introduce pragma once, apply a consistent formatting and add a missing wmidata.h inclusion.
- ntddmou.h : Move to PSDK, introduce pragma once, apply a consistent formatting and add several missing definitions.
[PSDK]
- ntddkbd.h : Introduce pragma once, apply a consistent formatting and add several missing definitions.

svn path=/branches/header-work/; revision=46889

include/ddk/d4drvif.h

@@ -20,17 +20,34 @@
  *
  */
 
-#ifndef __D4DRVIF_H
-#define __D4DRVIF_H
-
-#include "d4iface.h"
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define MAX_SERVICE_LENGTH                40
+
+#ifndef CTL_CODE
+
+#define CTL_CODE( DeviceType, Function, Method, Access ) (                 \
+    ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \
+)
+
+#define METHOD_BUFFERED                0
+#define METHOD_IN_DIRECT               1
+#define METHOD_OUT_DIRECT              2
+#define METHOD_NEITHER                 3
+
+#define FILE_ANY_ACCESS                0
+#define FILE_READ_ACCESS               0x0001
+#define FILE_WRITE_ACCESS              0x0002
+
+#endif /* CTL_CODE */
+
 #define FILE_DEVICE_DOT4               0x3a
 #define IOCTL_DOT4_USER_BASE           2049
+#define IOCTL_DOT4_LAST                IOCTL_DOT4_USER_BASE + 9
 
 #define IOCTL_DOT4_ADD_ACTIVITY_BROADCAST \
   CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
@@ -63,8 +80,6 @@ extern "C" {
   CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 3, METHOD_IN_DIRECT, FILE_ANY_ACCESS)
 
 
-#define MAX_SERVICE_LENGTH                40
-
 typedef struct _DOT4_DC_CREATE_DATA {
   unsigned char bPsid;
   CHAR pServiceName[MAX_SERVICE_LENGTH + 1];
@@ -95,5 +110,3 @@ typedef struct _DOT4_DRIVER_CMD {
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __D4DRVIF_H */

include/ddk/d4iface.h

@@ -1,20 +1,9 @@
-#ifndef _DOT4_IFACE_H
-#define _DOT4_IFACE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef unsigned long CHANNEL_HANDLE;
-typedef CHANNEL_HANDLE *PCHANNEL_HANDLE;
-
-typedef struct _DOT4_ACTIVITY
-{
-  ULONG ulMessage;
-  ULONG ulByteCount;
-  CHANNEL_HANDLE hChannel;
-} DOT4_ACTIVITY, *PDOT4_ACTIVITY;
-
 #define DOT4_MAX_CHANNELS                 128
 #define NO_TIMEOUT                          0
 #define STREAM_TYPE_CHANNEL                 1
@@ -40,8 +29,14 @@ typedef struct _DOT4_ACTIVITY
 #define CONFIG_UPLOAD                   14
 #define CONFIG_DOWNLOAD                 15
 
+typedef unsigned long CHANNEL_HANDLE, *PCHANNEL_HANDLE;
+
+typedef struct _DOT4_ACTIVITY {
+  ULONG ulMessage;
+  ULONG ulByteCount;
+  CHANNEL_HANDLE hChannel;
+} DOT4_ACTIVITY, *PDOT4_ACTIVITY;
+
 #ifdef __cplusplus
 }
 #endif
-#endif
-

include/ddk/dderror.h

@@ -1,7 +1,7 @@
+#pragma once
 
-#ifndef _DDERROR_
-#define _DDERROR_
 #define _WINERROR_
+
 #define NO_ERROR                                 0
 #define ERROR_INVALID_FUNCTION                   1
 #define ERROR_NOT_ENOUGH_MEMORY                  8
@@ -16,5 +16,3 @@
 #define ERROR_DEVICE_REINITIALIZATION_NEEDED     1164
 #define ERROR_CONTINUE                           1246
 #define ERROR_NO_MORE_DEVICES                    1248
-#endif
-

include/ddk/dxapi.h

@@ -1,4 +1,10 @@
+ULONG
+DxApiGetVersion();
 
-ULONG DxApiGetVersion();
-ULONG DxApi( IN ULONG dwFunctionNum,IN PVOID lpvInBuffer, IN ULONG cbInBuffer,
-             IN PVOID lpvOutBuffer, IN ULONG cbOutBuffer);
+ULONG
+DxApi(
+  IN ULONG dwFunctionNum,
+  IN PVOID lpvInBuffer,
+  IN ULONG cbInBuffer,
+  IN PVOID lpvOutBuffer,
+  IN ULONG cbOutBuffer);

include/ddk/fltsafe.h

@@ -1,19 +1,14 @@
-
-struct FLOATSAFE
-{
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+struct FLOATSAFE {
   KFLOATING_SAVE FloatSave;
   NTSTATUS ntStatus;
-
-   FLOATSAFE::FLOATSAFE(void)
-   {
+  FLOATSAFE::FLOATSAFE(void) {
     ntStatus = KeSaveFloatingPointState(&FloatSave);
   }
-
-   FLOATSAFE::~FLOATSAFE(void)
-   {
-     if (NT_SUCCESS(ntStatus))
-     {
+  FLOATSAFE::~FLOATSAFE(void) {
+    if (NT_SUCCESS(ntStatus)) {
       KeRestoreFloatingPointState(&FloatSave);
     }
   }
 };
+#endif

include/ddk/kbdmou.h

@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef __KBDMOU_H
-#define __KBDMOU_H
+#pragma once
 
 #include <ntddkbd.h>
 #include <ntddmou.h>
@@ -88,4 +87,4 @@ typedef VOID
   IN PVOID SystemArgument2,
   IN OUT PVOID SystemArgument3);
 
-#endif /* __KBDMOU_H */
+#include <wmidata.h>

include/psdk/ntddkbd.h

@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef __NTDDKBD_H
-#define __NTDDKBD_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,10 +47,20 @@ extern "C" {
 #define IOCTL_KEYBOARD_SET_INDICATORS \
   CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0002, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
+#define IOCTL_KEYBOARD_INSERT_DATA \
+  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0040, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_KEYBOARD_QUERY_IME_STATUS \
+  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0400, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_KEYBOARD_SET_IME_STATUS \
+  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0401, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 DEFINE_GUID(GUID_DEVINTERFACE_KEYBOARD, \
   0x884b96c3, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd);
 
+#define GUID_CLASS_KEYBOARD GUID_DEVINTERFACE_KEYBOARD /* Obsolete */
+
 #define KEYBOARD_ERROR_VALUE_BASE         10000
 
 /* KEYBOARD_INPUT_DATA.MakeCode constants */
@@ -62,6 +71,9 @@ DEFINE_GUID(GUID_DEVINTERFACE_KEYBOARD, \
 #define KEY_BREAK                      1
 #define KEY_E0                         2
 #define KEY_E1                         4
+#define KEY_TERMSRV_SET_LED            8
+#define KEY_TERMSRV_SHADOW             0x10
+#define KEY_TERMSRV_VKPACKET           0x20
 
 #define KEYBOARD_LED_INJECTED     0x8000
 #define KEYBOARD_SHADOW           0x4000
@@ -132,5 +144,3 @@ typedef struct _KEYBOARD_IME_STATUS {
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __NTDDKBD_H */

include/psdk/ntddmou.h

@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef __NTDDMOU_H
-#define __NTDDMOU_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,9 +32,14 @@ extern "C" {
 #define IOCTL_MOUSE_QUERY_ATTRIBUTES \
   CTL_CODE(FILE_DEVICE_MOUSE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
+#define IOCTL_MOUSE_INSERT_DATA \
+  CTL_CODE(FILE_DEVICE_MOUSE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
 DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \
   0x378de44c, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd);
 
+#define GUID_CLASS_MOUSE GUID_DEVINTERFACE_MOUSE /* Obsolete */
+
 #define MOUSE_ERROR_VALUE_BASE            20000
 
 /* MOUSE_INPUT_DATA.ButtonFlags constants */
@@ -50,6 +54,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \
 #define MOUSE_BUTTON_5_DOWN               0x0100
 #define MOUSE_BUTTON_5_UP                 0x0200
 #define MOUSE_WHEEL                       0x0400
+#define MOUSE_HWHEEL                      0x0800
 
 #define MOUSE_BUTTON_1_DOWN               MOUSE_LEFT_BUTTON_DOWN
 #define MOUSE_BUTTON_1_UP                 MOUSE_LEFT_BUTTON_UP
@@ -63,6 +68,10 @@ DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \
 #define MOUSE_MOVE_ABSOLUTE               1
 #define MOUSE_VIRTUAL_DESKTOP             0x02
 #define MOUSE_ATTRIBUTES_CHANGED          0x04
+#if(_WIN32_WINNT >= 0x0600)
+#define MOUSE_MOVE_NOCOALESCE             0x08
+#endif
+#define MOUSE_TERMSRV_SRC_SHADOW          0x100
 
 typedef struct _MOUSE_INPUT_DATA {
   USHORT UnitId;
@@ -94,6 +103,7 @@ typedef struct _MOUSE_UNIT_ID_PARAMETER {
 #define WHEELMOUSE_SERIAL_HARDWARE        0x0040
 #define MOUSE_HID_HARDWARE                0x0080
 #define WHEELMOUSE_HID_HARDWARE           0x0100
+#define HORIZONTAL_WHEEL_PRESENT          0x8000
 
 typedef struct _MOUSE_ATTRIBUTES {
   USHORT MouseIdentifier;
@@ -105,5 +115,3 @@ typedef struct _MOUSE_ATTRIBUTES {
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __NTDDMOU_H */