diff -ru w32api-3.6.orig/include/ddk/batclass.h w32api-3.6/include/ddk/batclass.h
--- w32api-3.6.orig/include/ddk/batclass.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/batclass.h	2006-02-06 16:41:14.000000000 +1030
@@ -98,9 +98,9 @@
 } BATTERY_MANUFACTURE_DATE, *PBATTERY_MANUFACTURE_DATE;
 
 typedef struct _BATTERY_NOTIFY {
-	ULONG  PowerState;
-	ULONG  LowCapacity;
-	ULONG  HighCapacity;
+  ULONG  PowerState;
+  ULONG  LowCapacity;
+  ULONG  HighCapacity;
 } BATTERY_NOTIFY, *PBATTERY_NOTIFY;
 
 /* BATTERY_STATUS.PowerState flags */
@@ -158,17 +158,17 @@
 #define MAX_BATTERY_STRING_SIZE           128
 
 typedef struct _BATTERY_SET_INFORMATION {
-	ULONG  BatteryTag;
-	BATTERY_SET_INFORMATION_LEVEL  InformationLevel;
-	UCHAR  Buffer[1];
+  ULONG  BatteryTag;
+  BATTERY_SET_INFORMATION_LEVEL  InformationLevel;
+  UCHAR  Buffer[1];
 } BATTERY_SET_INFORMATION, *PBATTERY_SET_INFORMATION;
 
 typedef struct _BATTERY_WAIT_STATUS {
-	ULONG  BatteryTag;
-	ULONG  Timeout;
-	ULONG  PowerState;
-	ULONG  LowCapacity;
-	ULONG  HighCapacity;
+  ULONG  BatteryTag;
+  ULONG  Timeout;
+  ULONG  PowerState;
+  ULONG  LowCapacity;
+  ULONG  HighCapacity;
 } BATTERY_WAIT_STATUS, *PBATTERY_WAIT_STATUS;
 
 
@@ -187,41 +187,41 @@
 
 typedef NTSTATUS DDKAPI
 (*BCLASS_DISABLE_STATUS_NOTIFY)(
-  IN PVOID  Context);
+  __W32_IN PVOID  Context);
 
 typedef NTSTATUS DDKAPI
 (*BCLASS_QUERY_INFORMATION)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  IN BATTERY_QUERY_INFORMATION_LEVEL  Level,
-  IN LONG  AtRate  OPTIONAL,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLength,
-  OUT PULONG  ReturnedLength);
+  __W32_IN PVOID  Context,
+  __W32_IN ULONG  BatteryTag,
+  __W32_IN BATTERY_QUERY_INFORMATION_LEVEL  Level,
+  __W32_IN LONG  AtRate  __W32_OPTIONAL,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PULONG  ReturnedLength);
 
 typedef NTSTATUS DDKAPI
 (*BCLASS_QUERY_STATUS)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  OUT PBATTERY_STATUS  BatteryStatus);
+  __W32_IN PVOID  Context,
+  __W32_IN ULONG  BatteryTag,
+  __W32_OUT PBATTERY_STATUS  BatteryStatus);
 
 typedef NTSTATUS DDKAPI
 (*BCLASS_QUERY_TAG)(
-  IN PVOID  Context,
-  OUT PULONG  BatteryTag);
+  __W32_IN PVOID  Context,
+  __W32_OUT PULONG  BatteryTag);
 
 typedef NTSTATUS DDKAPI
 (*BCLASS_SET_INFORMATION)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  IN BATTERY_SET_INFORMATION_LEVEL  Level,
-  IN PVOID  Buffer  OPTIONAL);
+  __W32_IN PVOID  Context,
+  __W32_IN ULONG  BatteryTag,
+  __W32_IN BATTERY_SET_INFORMATION_LEVEL  Level,
+  __W32_IN PVOID  Buffer  __W32_OPTIONAL);
 
 typedef NTSTATUS DDKAPI
 (*BCLASS_SET_STATUS_NOTIFY)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  IN PBATTERY_NOTIFY  BatteryNotify);
+  __W32_IN PVOID  Context,
+  __W32_IN ULONG  BatteryTag,
+  __W32_IN PBATTERY_NOTIFY  BatteryNotify);
 
 
 typedef struct _BATTERY_MINIPORT_INFO {
@@ -247,49 +247,49 @@
 NTSTATUS
 DDKAPI
 BatteryClassInitializeDevice(
-  IN PBATTERY_MINIPORT_INFO  MiniportInfo,
-  IN PVOID  *ClassData);
+  __W32_IN PBATTERY_MINIPORT_INFO  MiniportInfo,
+  __W32_IN PVOID  *ClassData);
 
 BCLASSAPI
 NTSTATUS
 DDKAPI
 BatteryClassIoctl(
-  IN PVOID  ClassData,
-  IN PIRP  Irp);
+  __W32_IN PVOID  ClassData,
+  __W32_IN PIRP  Irp);
 
 BCLASSAPI
 NTSTATUS
 DDKAPI
 BatteryClassQueryWmiDataBlock(
-  IN PVOID  ClassData,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN ULONG  GuidIndex,
-  IN OUT PULONG  InstanceLengthArray,
-  IN ULONG  OutBufferSize,
-  OUT PUCHAR  Buffer);
+  __W32_IN PVOID  ClassData,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp,
+  __W32_IN ULONG  GuidIndex,
+  __W32_IN __W32_OUT PULONG  InstanceLengthArray,
+  __W32_IN ULONG  OutBufferSize,
+  __W32_OUT PUCHAR  Buffer);
 
 BCLASSAPI
 NTSTATUS
 DDKAPI
 BatteryClassStatusNotify(
-  IN PVOID  ClassData);
+  __W32_IN PVOID  ClassData);
 
 BCLASSAPI
 NTSTATUS
 DDKAPI
 BatteryClassSystemControl(
-  IN  PVOID  ClassData,
-  IN  PWMILIB_CONTEXT  WmiLibContext,
-  IN  PDEVICE_OBJECT  DeviceObject,
-  IN  PIRP  Irp,
-  OUT PSYSCTL_IRP_DISPOSITION  Disposition);
+  __W32_IN  PVOID  ClassData,
+  __W32_IN  PWMILIB_CONTEXT  WmiLibContext,
+  __W32_IN  PDEVICE_OBJECT  DeviceObject,
+  __W32_IN  PIRP  Irp,
+  __W32_OUT PSYSCTL_IRP_DISPOSITION  Disposition);
 
 BCLASSAPI
 NTSTATUS
 DDKAPI
 BatteryClassUnload(
-  IN PVOID  ClassData);
+  __W32_IN PVOID  ClassData);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/cfgmgr32.h w32api-3.6/include/ddk/cfgmgr32.h
--- w32api-3.6.orig/include/ddk/cfgmgr32.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/cfgmgr32.h	2006-02-06 16:41:14.000000000 +1030
@@ -571,20 +571,20 @@
 CONFIGRET
 WINAPI
 CM_Add_Empty_Log_Conf(
-  OUT PLOG_CONF  plcLogConf,
-  IN DEVINST  dnDevInst,
-  IN PRIORITY  Priority,
-  IN ULONG  ulFlags);
+  __W32_OUT PLOG_CONF  plcLogConf,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN PRIORITY  Priority,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Add_Empty_Log_Conf_Ex(
-  OUT PLOG_CONF  plcLogConf,
-  IN DEVINST  dnDevInst,
-  IN PRIORITY  Priority,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PLOG_CONF  plcLogConf,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN PRIORITY  Priority,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 /* CM_Add_ID.ulFlags constants */
 #define CM_ADD_ID_HARDWARE              	0x00000000
@@ -595,37 +595,37 @@
 CONFIGRET
 WINAPI
 CM_Add_IDA(
-  IN DEVINST  dnDevInst,
-  IN PSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN PSTR  pszID,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Add_ID_ExA(
-  IN DEVINST  dnDevInst,
-  IN PSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN PSTR  pszID,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Add_ID_ExW(
-  IN DEVINST  dnDevInst,
-  IN PWSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN PWSTR  pszID,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Add_IDW(
-  IN DEVINST  dnDevInst,
-  IN PWSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN PWSTR  pszID,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 #ifdef UNICODE
 #define CM_Add_ID CM_Add_IDW
@@ -641,38 +641,38 @@
 CONFIGRET
 WINAPI
 CM_Add_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN LOG_CONF  lcLogConf,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN LOG_CONF  lcLogConf,
+  __W32_IN RESOURCEID  ResourceID,
+  __W32_IN PCVOID  ResourceData,
+  __W32_IN ULONG  ResourceLen,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Add_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN LOG_CONF  lcLogConf,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN LOG_CONF  lcLogConf,
+  __W32_IN RESOURCEID  ResourceID,
+  __W32_IN PCVOID  ResourceData,
+  __W32_IN ULONG  ResourceLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Connect_MachineA(
-  IN PCSTR  UNCServerName,
-  OUT PHMACHINE  phMachine);
+  __W32_IN PCSTR  UNCServerName,
+  __W32_OUT PHMACHINE  phMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Connect_MachineW(
-  IN PCWSTR  UNCServerName,
-  OUT PHMACHINE  phMachine);
+  __W32_IN PCWSTR  UNCServerName,
+  __W32_OUT PHMACHINE  phMachine);
 
 #ifdef UNICODE
 #define CM_Connect_Machine CM_Connect_MachineW
@@ -697,7 +697,7 @@
 CONFIGRET
 WINAPI
 CM_Disconnect_Machine(
-  IN HMACHINE  hMachine); 
+  __W32_IN HMACHINE  hMachine); 
 
 /* FIXME: Obsolete CM_Enable_DevNode */
 /* FIXME: Obsolete CM_Enable_DevNodeEx */
@@ -706,56 +706,56 @@
 CONFIGRET
 WINAPI
 CM_Enumerate_Classes(
-  IN ULONG  ulClassIndex,
-  OUT LPGUID  ClassGuid,
-  IN ULONG  ulFlags);
+  __W32_IN ULONG  ulClassIndex,
+  __W32_OUT LPGUID  ClassGuid,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Enumerate_Classes_Ex(
-  IN ULONG  ulClassIndex,
-  OUT LPGUID  ClassGuid,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN ULONG  ulClassIndex,
+  __W32_OUT LPGUID  ClassGuid,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Enumerate_EnumeratorsA(
-  IN ULONG  ulEnumIndex,
-  OUT PCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags);
+  __W32_IN ULONG  ulEnumIndex,
+  __W32_OUT PCHAR  Buffer,
+  __W32_IN __W32_OUT PULONG  pulLength,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Enumerate_Enumerators_ExA(
-  IN ULONG  ulEnumIndex,
-  OUT PCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN ULONG  ulEnumIndex,
+  __W32_OUT PCHAR  Buffer,
+  __W32_IN __W32_OUT PULONG  pulLength,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Enumerate_Enumerators_ExW(
-  IN ULONG  ulEnumIndex,
-  OUT PWCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN ULONG  ulEnumIndex,
+  __W32_OUT PWCHAR  Buffer,
+  __W32_IN __W32_OUT PULONG  pulLength,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Enumerate_EnumeratorsW(
-  IN ULONG  ulEnumIndex,
-  OUT PWCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags);
+  __W32_IN ULONG  ulEnumIndex,
+  __W32_OUT PWCHAR  Buffer,
+  __W32_IN __W32_OUT PULONG  pulLength,
+  __W32_IN ULONG  ulFlags);
 
 #ifdef UNICODE
 #define CM_Enumerate_Enumerators CM_Enumerate_EnumeratorsW
@@ -772,22 +772,22 @@
 CONFIGRET
 WINAPI
 CM_Free_Log_Conf(
-  IN LOG_CONF  lcLogConfToBeFreed,
-  IN ULONG  ulFlags);
+  __W32_IN LOG_CONF  lcLogConfToBeFreed,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Free_Log_Conf_Ex(
-  IN LOG_CONF  lcLogConfToBeFreed,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN LOG_CONF  lcLogConfToBeFreed,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Free_Log_Conf_Handle(
-  IN LOG_CONF  lcLogConf);
+  __W32_IN LOG_CONF  lcLogConf);
 
 /* FIXME: Obsolete CM_Free_Range_List */
 
@@ -795,47 +795,47 @@
 CONFIGRET
 WINAPI
 CM_Free_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Free_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Free_Res_Des_Handle(
-  IN RES_DES  rdResDes);
+  __W32_IN RES_DES  rdResDes);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Free_Resource_Conflict_Handle(
-  IN CONFLICT_LIST  clConflictList);
+  __W32_IN CONFLICT_LIST  clConflictList);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Child(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Child_Ex(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 /* FIXME: Obsolete CM_Get_Class_Name */
 /* FIXME: Obsolete CM_Get_Class_Name_Ex */
@@ -847,56 +847,56 @@
 CONFIGRET
 WINAPI
 CM_Get_Depth(
-  OUT PULONG  pulDepth,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
+  __W32_OUT PULONG  pulDepth,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Depth_Ex(
-  OUT PULONG  pulDepth,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PULONG  pulDepth,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_IDA(
-  IN DEVINST  dnDevInst,
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_ExA(
-  IN DEVINST  dnDevInst,
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_ExW(
-  IN DEVINST  dnDevInst,
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PWCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_IDW(
-  IN DEVINST  dnDevInst,
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PWCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags);
 
 #ifdef UNICODE
 #define CM_Get_Device_ID CM_Get_Device_IDW
@@ -910,39 +910,39 @@
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_ListA(
-  IN PCSTR  pszFilter,  OPTIONAL
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
+  __W32_IN PCSTR  pszFilter,  __W32_OPTIONAL
+  __W32_OUT PCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_List_ExA(
-  IN PCSTR  pszFilter,  OPTIONAL
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN PCSTR  pszFilter,  __W32_OPTIONAL
+  __W32_OUT PCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_List_ExW(
-  IN PCWSTR  pszFilter,  OPTIONAL
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN PCWSTR  pszFilter,  __W32_OPTIONAL
+  __W32_OUT PWCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_ListW(
-  IN PCWSTR  pszFilter,  OPTIONAL
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
+  __W32_IN PCWSTR  pszFilter,  __W32_OPTIONAL
+  __W32_OUT PWCHAR  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags);
 
 #ifdef UNICODE
 #define CM_Get_Device_ID_List CM_Get_Device_ID_ListW
@@ -956,35 +956,35 @@
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_List_SizeA(
-  OUT PULONG  pulLen,
-  IN PCSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags);
+  __W32_OUT PULONG  pulLen,
+  __W32_IN PCSTR  pszFilter,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_List_Size_ExA(
-  OUT PULONG  pulLen,
-  IN PCSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PULONG  pulLen,
+  __W32_IN PCSTR  pszFilter,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_List_Size_ExW(
-  OUT PULONG  pulLen,
-  IN PCWSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PULONG  pulLen,
+  __W32_IN PCWSTR  pszFilter,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_List_SizeW(
-  OUT PULONG  pulLen,
-  IN PCWSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags);
+  __W32_OUT PULONG  pulLen,
+  __W32_IN PCWSTR  pszFilter,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags);
 
 #ifdef UNICODE
 #define CM_Get_Device_ID_List_Size CM_Get_Device_ID_List_SizeW
@@ -998,18 +998,18 @@
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_Size(
-  OUT PULONG  pulLen,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
+  __W32_OUT PULONG  pulLen,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Device_ID_Size_Ex(
-  OUT PULONG  pulLen,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PULONG  pulLen,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 /* FIXME: Obsolete CM_Get_Device_Interface_Alias */
 /* FIXME: Obsolete CM_Get_Device_Interface_Alias_Ex */
@@ -1025,20 +1025,20 @@
 CONFIGRET
 WINAPI
 CM_Get_DevNode_Status(
-  OUT PULONG  pulStatus,
-  OUT PULONG  pulProblemNumber,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
+  __W32_OUT PULONG  pulStatus,
+  __W32_OUT PULONG  pulProblemNumber,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_DevNode_Status_Ex(
-  OUT PULONG  pulStatus,
-  OUT PULONG  pulProblemNumber,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PULONG  pulStatus,
+  __W32_OUT PULONG  pulProblemNumber,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 #define CM_Get_DevInst_Status CM_Get_DevNode_Status
 #define CM_Get_DevInst_Status_Ex CM_Get_DevNode_Status_Ex
@@ -1057,18 +1057,18 @@
 CONFIGRET
 WINAPI
 CM_Get_First_Log_Conf(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
+  __W32_OUT PLOG_CONF  plcLogConf,  __W32_OPTIONAL
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_First_Log_Conf_Ex(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PLOG_CONF  plcLogConf,  __W32_OPTIONAL
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 /* FIXME: Obsolete CM_Get_Global_State */
 /* FIXME: Obsolete CM_Get_Global_State_Ex */
@@ -1081,132 +1081,132 @@
 CONFIGRET
 WINAPI
 CM_Get_Log_Conf_Priority(
-  IN LOG_CONF  lcLogConf,
-  OUT PPRIORITY  pPriority,
-  IN ULONG  ulFlags);
+  __W32_IN LOG_CONF  lcLogConf,
+  __W32_OUT PPRIORITY  pPriority,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Log_Conf_Priority_Ex(
-  IN LOG_CONF  lcLogConf,
-  OUT PPRIORITY  pPriority,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN LOG_CONF  lcLogConf,
+  __W32_OUT PPRIORITY  pPriority,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Next_Log_Conf(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN LOG_CONF  lcLogConf,
-  IN ULONG  ulFlags);
+  __W32_OUT PLOG_CONF  plcLogConf,  __W32_OPTIONAL
+  __W32_IN LOG_CONF  lcLogConf,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Next_Log_Conf_Ex(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN LOG_CONF  lcLogConf,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PLOG_CONF  plcLogConf,  __W32_OPTIONAL
+  __W32_IN LOG_CONF  lcLogConf,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Next_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ForResource,
-  OUT PRESOURCEID  pResourceID,
-  IN ULONG  ulFlags);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN RESOURCEID  ForResource,
+  __W32_OUT PRESOURCEID  pResourceID,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Next_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ForResource,
-  OUT PRESOURCEID  pResourceID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN RESOURCEID  ForResource,
+  __W32_OUT PRESOURCEID  pResourceID,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Parent(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Parent_Ex(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Res_Des_Data(
-  IN RES_DES  rdResDes,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
+  __W32_IN RES_DES  rdResDes,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Res_Des_Data_Ex(
-  IN RES_DES  rdResDes,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN RES_DES  rdResDes,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Res_Des_Data_Size(
-  OUT PULONG  pulSize,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags);
+  __W32_OUT PULONG  pulSize,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Res_Des_Data_Size_Ex(
-  OUT PULONG  pulSize,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PULONG  pulSize,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Resource_Conflict_Count(
-  IN CONFLICT_LIST  clConflictList,
-  OUT PULONG  pulCount);
+  __W32_IN CONFLICT_LIST  clConflictList,
+  __W32_OUT PULONG  pulCount);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Resource_Conflict_DetailsA(
-  IN CONFLICT_LIST  clConflictList,
-  IN ULONG  ulIndex,
-  IN OUT PCONFLICT_DETAILS_A  pConflictDetails);
+  __W32_IN CONFLICT_LIST  clConflictList,
+  __W32_IN ULONG  ulIndex,
+  __W32_IN __W32_OUT PCONFLICT_DETAILS_A  pConflictDetails);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Resource_Conflict_DetailsW(
-  IN CONFLICT_LIST  clConflictList,
-  IN ULONG  ulIndex,
-  IN OUT PCONFLICT_DETAILS_W  pConflictDetails);
+  __W32_IN CONFLICT_LIST  clConflictList,
+  __W32_IN ULONG  ulIndex,
+  __W32_IN __W32_OUT PCONFLICT_DETAILS_W  pConflictDetails);
 
 #ifdef UNICODE
 #define CM_Get_Resource_Conflict_Details CM_Get_Resource_Conflict_DetailsW
@@ -1218,18 +1218,18 @@
 CONFIGRET
 WINAPI
 CM_Get_Sibling(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  DevInst,
-  IN ULONG  ulFlags);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINST  DevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Get_Sibling_Ex(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  DevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINST  DevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 WORD
@@ -1241,7 +1241,7 @@
 WORD
 WINAPI
 CM_Get_Version_Ex(
-  IN HMACHINE  hMachine);
+  __W32_IN HMACHINE  hMachine);
 
 /* FIXME: Obsolete CM_Intersect_Range_List */
 /* FIXME: Obsolete CM_Invert_Range_List */
@@ -1265,35 +1265,35 @@
 CONFIGRET
 WINAPI
 CM_Locate_DevNodeA(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_A  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINSTID_A  pDeviceID,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Locate_DevNode_ExA(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_A  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINSTID_A  pDeviceID,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Locate_DevNode_ExW(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_W  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINSTID_W  pDeviceID,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Locate_DevNodeW(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_W  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags);
+  __W32_OUT PDEVINST  pdnDevInst,
+  __W32_IN DEVINSTID_W  pDeviceID,  __W32_OPTIONAL
+  __W32_IN ULONG  ulFlags);
 
 #define CM_Locate_DevInstA CM_Locate_DevNodeA
 #define CM_Locate_DevInstW CM_Locate_DevNodeW
@@ -1318,24 +1318,24 @@
 CONFIGRET
 WINAPI
 CM_Modify_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN RESOURCEID  ResourceID,
+  __W32_IN PCVOID  ResourceData,
+  __W32_IN ULONG  ResourceLen,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Modify_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PRES_DES  prdResDes,
+  __W32_IN RES_DES  rdResDes,
+  __W32_IN RESOURCEID  ResourceID,
+  __W32_IN PCVOID  ResourceData,
+  __W32_IN ULONG  ResourceLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 /* FIXME: Obsolete CM_Move_DevNode */
 /* FIXME: Obsolete CM_Move_DevNode_Ex */
@@ -1355,43 +1355,43 @@
 CONFIGRET
 WINAPI
 CM_Query_And_Remove_SubTreeA(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags);
+  __W32_IN  DEVINST dnAncestor,
+  __W32_OUT PPNP_VETO_TYPE pVetoType,
+  __W32_OUT LPSTR pszVetoName,
+  __W32_IN  ULONG ulNameLength,
+  __W32_IN  ULONG ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Query_And_Remove_SubTreeW(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPWSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags);
+  __W32_IN  DEVINST dnAncestor,
+  __W32_OUT PPNP_VETO_TYPE pVetoType,
+  __W32_OUT LPWSTR pszVetoName,
+  __W32_IN  ULONG ulNameLength,
+  __W32_IN  ULONG ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Query_And_Remove_SubTree_ExA(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags,
-  IN  HMACHINE hMachine);
+  __W32_IN  DEVINST dnAncestor,
+  __W32_OUT PPNP_VETO_TYPE pVetoType,
+  __W32_OUT LPSTR pszVetoName,
+  __W32_IN  ULONG ulNameLength,
+  __W32_IN  ULONG ulFlags,
+  __W32_IN  HMACHINE hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Query_And_Remove_SubTree_ExW(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPWSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags,
-  IN  HMACHINE hMachine);
+  __W32_IN  DEVINST dnAncestor,
+  __W32_OUT PPNP_VETO_TYPE pVetoType,
+  __W32_OUT LPWSTR pszVetoName,
+  __W32_IN  ULONG ulNameLength,
+  __W32_IN  ULONG ulFlags,
+  __W32_IN  HMACHINE hMachine);
 
 /* FIXME: Obsolete CM_Query_Arbitrator_Free_Data */
 /* FIXME: Obsolete CM_Query_Arbitrator_Free_Data_Ex */
@@ -1405,13 +1405,13 @@
 CONFIGRET
 WINAPI
 CM_Query_Resource_Conflict_List(
-  OUT PCONFLICT_LIST  pclConflictList,
-  IN DEVINST  dnDevInst,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_OUT PCONFLICT_LIST  pclConflictList,
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN RESOURCEID  ResourceID,
+  __W32_IN PCVOID  ResourceData,
+  __W32_IN ULONG  ResourceLen,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 /* CM_Reenumerate_DevNode.ulFlags constants */
 #define CM_REENUMERATE_NORMAL             0x00000000
@@ -1424,16 +1424,16 @@
 CONFIGRET
 WINAPI
 CM_Reenumerate_DevNode(
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Reenumerate_DevNode_Ex(
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 #define CM_Reenumerate_DevInst CM_Reenumerate_DevNode
 #define CM_Reenumerate_DevInst_Ex CM_Reenumerate_DevNode_Ex
@@ -1449,43 +1449,43 @@
 CONFIGRET
 WINAPI
 CM_Request_Device_EjectA(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PPNP_VETO_TYPE  pVetoType,
+  __W32_OUT LPSTR  pszVetoName,
+  __W32_IN ULONG  ulNameLength,
+  __W32_IN ULONG  ulFlags);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Request_Device_Eject_ExW(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPWSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PPNP_VETO_TYPE  pVetoType,
+  __W32_OUT LPWSTR  pszVetoName,
+  __W32_IN ULONG  ulNameLength,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Request_Device_Eject_ExA(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PPNP_VETO_TYPE  pVetoType,
+  __W32_OUT LPSTR  pszVetoName,
+  __W32_IN ULONG  ulNameLength,
+  __W32_IN ULONG  ulFlags,
+  __W32_IN HMACHINE  hMachine);
 
 CMAPI
 CONFIGRET
 WINAPI
 CM_Request_Device_EjectW(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPWSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags);
+  __W32_IN DEVINST  dnDevInst,
+  __W32_OUT PPNP_VETO_TYPE  pVetoType,
+  __W32_OUT LPWSTR  pszVetoName,
+  __W32_IN ULONG  ulNameLength,
+  __W32_IN ULONG  ulFlags);
 
 #ifdef UNICODE
 #define CM_Request_Device_Eject CM_Request_Device_EjectW
@@ -1522,7 +1522,7 @@
 DWORD
 WINAPI
 CMP_WaitNoPendingInstallEvents(
-  IN DWORD dwTimeout);
+  __W32_IN DWORD dwTimeout);
 
 #include <poppack.h>
 
diff -ru w32api-3.6.orig/include/ddk/ddkmapi.h w32api-3.6/include/ddk/ddkmapi.h
--- w32api-3.6.orig/include/ddk/ddkmapi.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/ddkmapi.h	2006-02-06 16:41:14.000000000 +1030
@@ -43,11 +43,11 @@
 DWORD
 FAR PASCAL
 DxApi(
-  IN DWORD  dwFunctionNum,
-  IN LPVOID  lpvInBuffer,
-  IN DWORD  cbInBuffer,
-  OUT LPVOID  lpvOutBuffer,
-  OUT DWORD  cbOutBuffer);
+  __W32_IN DWORD  dwFunctionNum,
+  __W32_IN LPVOID  lpvInBuffer,
+  __W32_IN DWORD  cbInBuffer,
+  __W32_OUT LPVOID  lpvOutBuffer,
+  __W32_OUT DWORD  cbOutBuffer);
 
 typedef DWORD (FAR PASCAL *LPDXAPI)(
   DWORD  dwFunctionNum,
diff -ru w32api-3.6.orig/include/ddk/hidclass.h w32api-3.6/include/ddk/hidclass.h
--- w32api-3.6.orig/include/ddk/hidclass.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/hidclass.h	2006-02-06 16:41:14.000000000 +1030
@@ -92,8 +92,8 @@
   enum DeviceObjectState  State);
 
 typedef NTSTATUS DDKAPI (*PHIDP_GETCAPS)(
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PHIDP_CAPS  Capabilities);
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_OUT PHIDP_CAPS  Capabilities);
 
 typedef struct _HID_COLLECTION_INFORMATION {
   ULONG  DescriptorSize;
diff -ru w32api-3.6.orig/include/ddk/hidpi.h w32api-3.6/include/ddk/hidpi.h
--- w32api-3.6.orig/include/ddk/hidpi.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/hidpi.h	2006-02-06 16:41:14.000000000 +1030
@@ -75,9 +75,9 @@
 } HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE;
 
 typedef BOOLEAN (DDKAPI *PHIDP_INSERT_SCANCODES)(
-  IN PVOID  Context,
-  IN PCHAR  NewScanCodes,
-  IN ULONG  Length);
+  __W32_IN PVOID  Context,
+  __W32_IN PCHAR  NewScanCodes,
+  __W32_IN ULONG  Length);
 
 typedef struct _USAGE_AND_PAGE {
   USAGE  Usage;
@@ -88,23 +88,23 @@
 NTSTATUS
 DDKAPI
 HidP_TranslateUsageAndPagesToI8042ScanCodes(
-  IN PUSAGE_AND_PAGE  ChangedUsageList,
-  IN ULONG  UsageListLength,
-  IN HIDP_KEYBOARD_DIRECTION  KeyAction,
-  IN OUT PHIDP_KEYBOARD_MODIFIER_STATE  ModifierState,
-  IN PHIDP_INSERT_SCANCODES  InsertCodesProcedure,
-  IN PVOID  InsertCodesContext);
+  __W32_IN PUSAGE_AND_PAGE  ChangedUsageList,
+  __W32_IN ULONG  UsageListLength,
+  __W32_IN HIDP_KEYBOARD_DIRECTION  KeyAction,
+  __W32_IN __W32_OUT PHIDP_KEYBOARD_MODIFIER_STATE  ModifierState,
+  __W32_IN PHIDP_INSERT_SCANCODES  InsertCodesProcedure,
+  __W32_IN PVOID  InsertCodesContext);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_TranslateUsagesToI8042ScanCodes(
-  IN PUSAGE  ChangedUsageList,
-  IN ULONG  UsageListLength,
-  IN HIDP_KEYBOARD_DIRECTION  KeyAction,
-  IN OUT PHIDP_KEYBOARD_MODIFIER_STATE  ModifierState,
-  IN PHIDP_INSERT_SCANCODES  InsertCodesProcedure,
-  IN PVOID  InsertCodesContext);
+  __W32_IN PUSAGE  ChangedUsageList,
+  __W32_IN ULONG  UsageListLength,
+  __W32_IN HIDP_KEYBOARD_DIRECTION  KeyAction,
+  __W32_IN __W32_OUT PHIDP_KEYBOARD_MODIFIER_STATE  ModifierState,
+  __W32_IN PHIDP_INSERT_SCANCODES  InsertCodesProcedure,
+  __W32_IN PVOID  InsertCodesContext);
 
 typedef struct _HIDP_BUTTON_CAPS {
   USAGE  UsagePage;
@@ -260,10 +260,10 @@
 /*
  * NTSTATUS
  * HidP_GetButtonCaps(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   OUT PHIDP_BUTTON_CAPS  ButtonCaps,
- *   IN OUT PULONG  ButtonCapsLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData);
+ *   __W32_IN HIDP_REPORT_TYPE  ReportType,
+ *   __W32_OUT PHIDP_BUTTON_CAPS  ButtonCaps,
+ *   __W32_IN __W32_OUT PULONG  ButtonCapsLength,
+ *   __W32_IN PHIDP_PREPARSED_DATA  PreparsedData);
  */
 #define HidP_GetButtonCaps(_Type_, _Caps_, _Len_, _Data_) \
   HidP_GetSpecificButtonCaps(_Type_, 0, 0, 0, _Caps_, _Len_, _Data_)
@@ -271,14 +271,14 @@
 /*
  * NTSTATUS
  * HidP_GetButtons(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USAGE  UsagePage,
- *   IN USHORT  LinkCollection,
- *   OUT USAGE  *UsageList,
- *   IN OUT ULONG  *UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN PCHAR  Report,
- *   IN ULONG  ReportLength);
+ *   __W32_IN HIDP_REPORT_TYPE  ReportType,
+ *   __W32_IN USAGE  UsagePage,
+ *   __W32_IN USHORT  LinkCollection,
+ *   __W32_OUT USAGE  *UsageList,
+ *   __W32_IN __W32_OUT ULONG  *UsageLength,
+ *   __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+ *   __W32_IN PCHAR  Report,
+ *   __W32_IN ULONG  ReportLength);
  */
 #define HidP_GetButtons(Rty, UPa, LCo, ULi, ULe, Ppd, Rep, RLe) \
   HidP_GetUsages(Rty, UPa, LCo, ULi, ULe, Ppd, Rep, RLe)
@@ -290,13 +290,13 @@
 /*
  * NTSTATUS
  * HidP_GetButtonsEx(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USHORT  LinkCollection,
- *   OUT PUSAGE_AND_PAGE  ButtonList,
- *   IN OUT ULONG  *UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN PCHAR  Report,
- *   IN ULONG  ReportLength);
+ *   __W32_IN HIDP_REPORT_TYPE  ReportType,
+ *   __W32_IN USHORT  LinkCollection,
+ *   __W32_OUT PUSAGE_AND_PAGE  ButtonList,
+ *   __W32_IN __W32_OUT ULONG  *UsageLength,
+ *   __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+ *   __W32_IN PCHAR  Report,
+ *   __W32_IN ULONG  ReportLength);
  */
 #define HidP_GetButtonsEx(RT, LC, BL, UL, PD, R, RL)  \
   HidP_GetUsagesEx(RT, LC, BL, UL, PD, R, RL)
@@ -305,134 +305,134 @@
 NTSTATUS
 DDKAPI
 HidP_GetCaps(
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PHIDP_CAPS  Capabilities);
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_OUT PHIDP_CAPS  Capabilities);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetData(
-  IN HIDP_REPORT_TYPE  ReportType,
-  OUT PHIDP_DATA  DataList,
-  IN OUT PULONG  DataLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_OUT PHIDP_DATA  DataList,
+  __W32_IN __W32_OUT PULONG  DataLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetExtendedAttributes(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USHORT  DataIndex,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PHIDP_EXTENDED_ATTRIBUTES  Attributes,
-  IN OUT PULONG  LengthAttributes);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USHORT  DataIndex,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_OUT PHIDP_EXTENDED_ATTRIBUTES  Attributes,
+  __W32_IN __W32_OUT PULONG  LengthAttributes);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetLinkCollectionNodes(
-  OUT PHIDP_LINK_COLLECTION_NODE  LinkCollectionNodes,
-  IN OUT PULONG  LinkCollectionNodesLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
+  __W32_OUT PHIDP_LINK_COLLECTION_NODE  LinkCollectionNodes,
+  __W32_IN __W32_OUT PULONG  LinkCollectionNodesLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetScaledUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  OUT PLONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection  __W32_OPTIONAL,
+  __W32_IN USAGE  Usage,
+  __W32_OUT PLONG  UsageValue,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetSpecificButtonCaps(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  OUT PHIDP_BUTTON_CAPS  ButtonCaps,
-  IN OUT PULONG  ButtonCapsLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection,
+  __W32_IN USAGE  Usage,
+  __W32_OUT PHIDP_BUTTON_CAPS  ButtonCaps,
+  __W32_IN __W32_OUT PULONG  ButtonCapsLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetSpecificValueCaps(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  OUT PHIDP_VALUE_CAPS  ValueCaps,
-  IN OUT PULONG  ValueCapsLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection,
+  __W32_IN USAGE  Usage,
+  __W32_OUT PHIDP_VALUE_CAPS  ValueCaps,
+  __W32_IN __W32_OUT PULONG  ValueCapsLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetUsages(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  OUT USAGE  *UsageList,
-  IN OUT ULONG  *UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection  __W32_OPTIONAL,
+  __W32_OUT USAGE  *UsageList,
+  __W32_IN __W32_OUT ULONG  *UsageLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetUsagesEx(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USHORT  LinkCollection,
-  OUT PUSAGE_AND_PAGE  ButtonList,
-  IN OUT ULONG  *UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USHORT  LinkCollection,
+  __W32_OUT PUSAGE_AND_PAGE  ButtonList,
+  __W32_IN __W32_OUT ULONG  *UsageLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  OUT PULONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection,
+  __W32_IN USAGE  Usage,
+  __W32_OUT PULONG  UsageValue,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_GetUsageValueArray(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  OUT PCHAR  UsageValue,
-  IN USHORT  UsageValueByteLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection  __W32_OPTIONAL,
+  __W32_IN USAGE  Usage,
+  __W32_OUT PCHAR  UsageValue,
+  __W32_IN USHORT  UsageValueByteLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 /*
  * NTSTATUS
  * HidP_GetValueCaps(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   OUT PHIDP_VALUE_CAPS  ValueCaps,
- *   IN OUT PULONG  ValueCapsLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData);
+ *   __W32_IN HIDP_REPORT_TYPE  ReportType,
+ *   __W32_OUT PHIDP_VALUE_CAPS  ValueCaps,
+ *   __W32_IN __W32_OUT PULONG  ValueCapsLength,
+ *   __W32_IN PHIDP_PREPARSED_DATA  PreparsedData);
  */
 #define HidP_GetValueCaps(_Type_, _Caps_, _Len_, _Data_) \
   HidP_GetSpecificValueCaps (_Type_, 0, 0, 0, _Caps_, _Len_, _Data_)
@@ -441,11 +441,11 @@
 NTSTATUS
 DDKAPI
 HidP_InitializeReportForID(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN UCHAR  ReportID,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN UCHAR  ReportID,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN __W32_OUT PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 /*
  * BOOLEAN
@@ -459,28 +459,28 @@
 ULONG
 DDKAPI
 HidP_MaxDataListLength(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData);
 
 HIDAPI
 ULONG
 DDKAPI
 HidP_MaxUsageListLength(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage  OPTIONAL,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage  __W32_OPTIONAL,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData);
 
 /*
  * NTSTATUS
  * HidP_SetButtons(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USAGE  UsagePage,
- *   IN USHORT  LinkCollection,
- *   IN PUSAGE  UsageList,
- *   IN OUT PULONG  UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN OUT PCHAR  Report,
- *   IN ULONG  ReportLength);
+ *   __W32_IN HIDP_REPORT_TYPE  ReportType,
+ *   __W32_IN USAGE  UsagePage,
+ *   __W32_IN USHORT  LinkCollection,
+ *   __W32_IN PUSAGE  UsageList,
+ *   __W32_IN __W32_OUT PULONG  UsageLength,
+ *   __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+ *   __W32_IN __W32_OUT PCHAR  Report,
+ *   __W32_IN ULONG  ReportLength);
  */
 #define HidP_SetButtons(RT, UP, LC, UL1, UL2, PD, R, RL) \
   HidP_SetUsages(RT, UP, LC, UL1, UL2, PD, R, RL)
@@ -489,77 +489,77 @@
 NTSTATUS
 DDKAPI
 HidP_SetData(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN PHIDP_DATA  DataList,
-  IN OUT PULONG  DataLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN PHIDP_DATA  DataList,
+  __W32_IN __W32_OUT PULONG  DataLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN __W32_OUT PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_SetScaledUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage, 
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  IN LONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage, 
+  __W32_IN USHORT  LinkCollection  __W32_OPTIONAL,
+  __W32_IN USAGE  Usage,
+  __W32_IN LONG  UsageValue,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN __W32_OUT PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_SetUsages(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection, /* Optional */
-  IN PUSAGE  UsageList,
-  IN OUT PULONG  UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection, /* Optional */
+  __W32_IN PUSAGE  UsageList,
+  __W32_IN __W32_OUT PULONG  UsageLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN __W32_OUT PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_SetUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  IN ULONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection,
+  __W32_IN USAGE  Usage,
+  __W32_IN ULONG  UsageValue,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN __W32_OUT PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_SetUsageValueArray(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  IN PCHAR  UsageValue,
-  IN USHORT  UsageValueByteLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection  __W32_OPTIONAL,
+  __W32_IN USAGE  Usage,
+  __W32_IN PCHAR  UsageValue,
+  __W32_IN USHORT  UsageValueByteLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_OUT PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 /*
  * NTSTATUS
  * HidP_UnsetButtons(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USAGE  UsagePage,
- *   IN USHORT  LinkCollection,
- *   IN PUSAGE  UsageList,
- *   IN OUT PULONG  UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN OUT PCHAR  Report,
- *   IN ULONG  ReportLength);
+ *   __W32_IN HIDP_REPORT_TYPE  ReportType,
+ *   __W32_IN USAGE  UsagePage,
+ *   __W32_IN USHORT  LinkCollection,
+ *   __W32_IN PUSAGE  UsageList,
+ *   __W32_IN __W32_OUT PULONG  UsageLength,
+ *   __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+ *   __W32_IN __W32_OUT PCHAR  Report,
+ *   __W32_IN ULONG  ReportLength);
  */
 #define HidP_UnsetButtons(RT, UP, LC, UL1, UL2, PD, R, RL) \
   HidP_UnsetUsages(RT, UP, LC, UL1, UL2, PD, R, RL)
@@ -568,34 +568,34 @@
 NTSTATUS
 DDKAPI
 HidP_UnsetUsages(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN PUSAGE  UsageList,
-  IN OUT PULONG  UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
+  __W32_IN HIDP_REPORT_TYPE  ReportType,
+  __W32_IN USAGE  UsagePage,
+  __W32_IN USHORT  LinkCollection,
+  __W32_IN PUSAGE  UsageList,
+  __W32_IN __W32_OUT PULONG  UsageLength,
+  __W32_IN PHIDP_PREPARSED_DATA  PreparsedData,
+  __W32_IN __W32_OUT PCHAR  Report,
+  __W32_IN ULONG  ReportLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_UsageAndPageListDifference(
-  IN PUSAGE_AND_PAGE  PreviousUsageList,
-  IN PUSAGE_AND_PAGE  CurrentUsageList,
-  OUT PUSAGE_AND_PAGE  BreakUsageList,
-  OUT PUSAGE_AND_PAGE  MakeUsageList,
-  IN ULONG  UsageListLength);
+  __W32_IN PUSAGE_AND_PAGE  PreviousUsageList,
+  __W32_IN PUSAGE_AND_PAGE  CurrentUsageList,
+  __W32_OUT PUSAGE_AND_PAGE  BreakUsageList,
+  __W32_OUT PUSAGE_AND_PAGE  MakeUsageList,
+  __W32_IN ULONG  UsageListLength);
 
 HIDAPI
 NTSTATUS
 DDKAPI
 HidP_UsageListDifference(
-  IN PUSAGE  PreviousUsageList,
-  IN PUSAGE  CurrentUsageList,
-  OUT PUSAGE  BreakUsageList,
-  OUT PUSAGE  MakeUsageList,
-  IN ULONG  UsageListLength);
+  __W32_IN PUSAGE  PreviousUsageList,
+  __W32_IN PUSAGE  CurrentUsageList,
+  __W32_OUT PUSAGE  BreakUsageList,
+  __W32_OUT PUSAGE  MakeUsageList,
+  __W32_IN ULONG  UsageListLength);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/kbdmou.h w32api-3.6/include/ddk/kbdmou.h
--- w32api-3.6.orig/include/ddk/kbdmou.h	2004-09-06 00:53:56.000000000 +0930
+++ w32api-3.6/include/ddk/kbdmou.h	2006-02-06 16:41:14.000000000 +1030
@@ -77,15 +77,15 @@
   CTL_CODE(FILE_DEVICE_MOUSE, 0x0400, METHOD_NEITHER, FILE_ANY_ACCESS)
 
 typedef struct _CONNECT_DATA {
-	PDEVICE_OBJECT  ClassDeviceObject;
-	PVOID  ClassService;
+  PDEVICE_OBJECT  ClassDeviceObject;
+  PVOID  ClassService;
 } CONNECT_DATA, *PCONNECT_DATA;
 
 typedef VOID
 (STDAPICALLTYPE *PSERVICE_CALLBACK_ROUTINE)(
-	IN PVOID NormalContext,
-	IN PVOID SystemArgument1,
-	IN PVOID SystemArgument2,
-	IN OUT PVOID SystemArgument3);
+  __W32_IN PVOID NormalContext,
+  __W32_IN PVOID SystemArgument1,
+  __W32_IN PVOID SystemArgument2,
+  __W32_IN __W32_OUT PVOID SystemArgument3);
 
 #endif /* __KBDMOU_H */
diff -ru w32api-3.6.orig/include/ddk/mcd.h w32api-3.6/include/ddk/mcd.h
--- w32api-3.6.orig/include/ddk/mcd.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/mcd.h	2006-02-06 16:41:14.000000000 +1030
@@ -58,8 +58,8 @@
 PVOID
 DDKAPI
 ChangerClassAllocatePool(
-  IN POOL_TYPE  PoolType,
-  IN ULONG  NumberOfBytes);
+  __W32_IN POOL_TYPE  PoolType,
+  __W32_IN ULONG  NumberOfBytes);
 
 VOID
 ChangerClassDebugPrint(
@@ -71,22 +71,22 @@
 PVOID
 DDKAPI
 ChangerClassFreePool(
-  IN PVOID  PoolToFree);
+  __W32_IN PVOID  PoolToFree);
 
 CHANGERAPI
 NTSTATUS
 DDKAPI
 ChangerClassSendSrbSynchronous(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PSCSI_REQUEST_BLOCK  Srb,
-  IN PVOID  Buffer,
-  IN ULONG  BufferSize,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  BufferSize,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 
 typedef NTSTATUS DDKAPI
 (*CHANGER_INITIALIZE)(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 typedef ULONG DDKAPI
 (*CHANGER_EXTENSION_SIZE)(
@@ -101,13 +101,13 @@
 
 typedef NTSTATUS DDKAPI
 (*CHANGER_COMMAND_ROUTINE)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp);
 
 typedef NTSTATUS DDKAPI
 (*CHANGER_PERFORM_DIAGNOSTICS)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  OUT PWMI_CHANGER_PROBLEM_DEVICE_ERROR  ChangerDeviceError);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_OUT PWMI_CHANGER_PROBLEM_DEVICE_ERROR  ChangerDeviceError);
 
 typedef struct _MCD_INIT_DATA {
   ULONG  InitDataSize;
@@ -132,9 +132,9 @@
 NTSTATUS
 DDKAPI
 ChangerClassInitialize(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PUNICODE_STRING  RegistryPath,
-  IN PMCD_INIT_DATA  MCDInitData);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PUNICODE_STRING  RegistryPath,
+  __W32_IN PMCD_INIT_DATA  MCDInitData);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/miniport.h w32api-3.6/include/ddk/miniport.h
--- w32api-3.6.orig/include/ddk/miniport.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/miniport.h	2006-02-06 16:41:14.000000000 +1030
@@ -37,9 +37,9 @@
 #define EMULATOR_WRITE_ACCESS             0x02
 
 typedef enum _EMULATOR_PORT_ACCESS_TYPE {
-	Uchar,
-	Ushort,
-	Ulong
+  Uchar,
+  Ushort,
+  Ulong
 } EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE;
 
 
@@ -66,9 +66,9 @@
 
 typedef VOID DDKAPI
 (*PBANKED_SECTION_ROUTINE)(
-  IN ULONG  ReadBank,
-  IN ULONG  WriteBank,
-  IN PVOID  Context);
+  __W32_IN ULONG  ReadBank,
+  __W32_IN ULONG  WriteBank,
+  __W32_IN PVOID  Context);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/minitape.h w32api-3.6/include/ddk/minitape.h
--- w32api-3.6.orig/include/ddk/minitape.h	2002-12-21 04:21:09.000000000 +1030
+++ w32api-3.6/include/ddk/minitape.h	2006-02-06 16:41:14.000000000 +1030
@@ -42,176 +42,176 @@
 #define MEDIA_CURRENTLY_MOUNTED           0x80000000
 
 typedef enum _TAPE_STATUS {
-	TAPE_STATUS_SEND_SRB_AND_CALLBACK,
-	TAPE_STATUS_CALLBACK,
-	TAPE_STATUS_CHECK_TEST_UNIT_READY,
-	TAPE_STATUS_SUCCESS,
-	TAPE_STATUS_INSUFFICIENT_RESOURCES,
-	TAPE_STATUS_NOT_IMPLEMENTED,
-	TAPE_STATUS_INVALID_DEVICE_REQUEST,
-	TAPE_STATUS_INVALID_PARAMETER,	
-	TAPE_STATUS_MEDIA_CHANGED,
-	TAPE_STATUS_BUS_RESET,
-	TAPE_STATUS_SETMARK_DETECTED,
-	TAPE_STATUS_FILEMARK_DETECTED,
-	TAPE_STATUS_BEGINNING_OF_MEDIA,
-	TAPE_STATUS_END_OF_MEDIA,
-	TAPE_STATUS_BUFFER_OVERFLOW,
-	TAPE_STATUS_NO_DATA_DETECTED,
-	TAPE_STATUS_EOM_OVERFLOW,
-	TAPE_STATUS_NO_MEDIA,
-	TAPE_STATUS_IO_DEVICE_ERROR,
-	TAPE_STATUS_UNRECOGNIZED_MEDIA,
-	TAPE_STATUS_DEVICE_NOT_READY,
-	TAPE_STATUS_MEDIA_WRITE_PROTECTED,
-	TAPE_STATUS_DEVICE_DATA_ERROR,
-	TAPE_STATUS_NO_SUCH_DEVICE,
-	TAPE_STATUS_INVALID_BLOCK_LENGTH,
-	TAPE_STATUS_IO_TIMEOUT,
-	TAPE_STATUS_DEVICE_NOT_CONNECTED,
-	TAPE_STATUS_DATA_OVERRUN,
-	TAPE_STATUS_DEVICE_BUSY,
-	TAPE_STATUS_REQUIRES_CLEANING,
-	TAPE_STATUS_CLEANER_CARTRIDGE_INSTALLED
+  TAPE_STATUS_SEND_SRB_AND_CALLBACK,
+  TAPE_STATUS_CALLBACK,
+  TAPE_STATUS_CHECK_TEST_UNIT_READY,
+  TAPE_STATUS_SUCCESS,
+  TAPE_STATUS_INSUFFICIENT_RESOURCES,
+  TAPE_STATUS_NOT_IMPLEMENTED,
+  TAPE_STATUS_INVALID_DEVICE_REQUEST,
+  TAPE_STATUS_INVALID_PARAMETER,
+  TAPE_STATUS_MEDIA_CHANGED,
+  TAPE_STATUS_BUS_RESET,
+  TAPE_STATUS_SETMARK_DETECTED,
+  TAPE_STATUS_FILEMARK_DETECTED,
+  TAPE_STATUS_BEGINNING_OF_MEDIA,
+  TAPE_STATUS_END_OF_MEDIA,
+  TAPE_STATUS_BUFFER_OVERFLOW,
+  TAPE_STATUS_NO_DATA_DETECTED,
+  TAPE_STATUS_EOM_OVERFLOW,
+  TAPE_STATUS_NO_MEDIA,
+  TAPE_STATUS_IO_DEVICE_ERROR,
+  TAPE_STATUS_UNRECOGNIZED_MEDIA,
+  TAPE_STATUS_DEVICE_NOT_READY,
+  TAPE_STATUS_MEDIA_WRITE_PROTECTED,
+  TAPE_STATUS_DEVICE_DATA_ERROR,
+  TAPE_STATUS_NO_SUCH_DEVICE,
+  TAPE_STATUS_INVALID_BLOCK_LENGTH,
+  TAPE_STATUS_IO_TIMEOUT,
+  TAPE_STATUS_DEVICE_NOT_CONNECTED,
+  TAPE_STATUS_DATA_OVERRUN,
+  TAPE_STATUS_DEVICE_BUSY,
+  TAPE_STATUS_REQUIRES_CLEANING,
+  TAPE_STATUS_CLEANER_CARTRIDGE_INSTALLED
 } TAPE_STATUS, *PTAPE_STATUS;
 
 #define INQUIRYDATABUFFERSIZE 36
 #ifndef _INQUIRYDATA_DEFINED /* also in scsi.h */
 #define _INQUIRYDATA_DEFINED
 typedef struct _INQUIRYDATA {
-	UCHAR  DeviceType : 5;
-	UCHAR  DeviceTypeQualifier : 3;
-	UCHAR  DeviceTypeModifier : 7;
-	UCHAR  RemovableMedia : 1;
-	union {
-		UCHAR  Versions;
-		struct {
-			UCHAR  ANSIVersion : 3;
-			UCHAR  ECMAVersion : 3;
-			UCHAR  ISOVersion : 2;
-		};
-	};
-	UCHAR  ResponseDataFormat : 4;
-	UCHAR  HiSupport : 1;
-	UCHAR  NormACA : 1;
-	UCHAR  TerminateTask : 1;
-	UCHAR  AERC : 1;
-	UCHAR  AdditionalLength;
-	UCHAR  Reserved;
-	UCHAR  Addr16 : 1;
-	UCHAR  Addr32 : 1;
-	UCHAR  AckReqQ: 1;
-	UCHAR  MediumChanger : 1;
-	UCHAR  MultiPort : 1;
-	UCHAR  ReservedBit2 : 1;
-	UCHAR  EnclosureServices : 1;
-	UCHAR  ReservedBit3 : 1;
-	UCHAR  SoftReset : 1;
-	UCHAR  CommandQueue : 1;
-	UCHAR  TransferDisable : 1;
-	UCHAR  LinkedCommands : 1;
-	UCHAR  Synchronous : 1;
-	UCHAR  Wide16Bit : 1;
-	UCHAR  Wide32Bit : 1;
-	UCHAR  RelativeAddressing : 1;
-	UCHAR  VendorId[8];
-	UCHAR  ProductId[16];
-	UCHAR  ProductRevisionLevel[4];
-	UCHAR  VendorSpecific[20];
-	UCHAR  Reserved3[40];
+  UCHAR  DeviceType : 5;
+  UCHAR  DeviceTypeQualifier : 3;
+  UCHAR  DeviceTypeModifier : 7;
+  UCHAR  RemovableMedia : 1;
+  union {
+    UCHAR  Versions;
+    struct {
+      UCHAR  ANSIVersion : 3;
+      UCHAR  ECMAVersion : 3;
+      UCHAR  ISOVersion : 2;
+    };
+  };
+  UCHAR  ResponseDataFormat : 4;
+  UCHAR  HiSupport : 1;
+  UCHAR  NormACA : 1;
+  UCHAR  TerminateTask : 1;
+  UCHAR  AERC : 1;
+  UCHAR  AdditionalLength;
+  UCHAR  Reserved;
+  UCHAR  Addr16 : 1;
+  UCHAR  Addr32 : 1;
+  UCHAR  AckReqQ: 1;
+  UCHAR  MediumChanger : 1;
+  UCHAR  MultiPort : 1;
+  UCHAR  ReservedBit2 : 1;
+  UCHAR  EnclosureServices : 1;
+  UCHAR  ReservedBit3 : 1;
+  UCHAR  SoftReset : 1;
+  UCHAR  CommandQueue : 1;
+  UCHAR  TransferDisable : 1;
+  UCHAR  LinkedCommands : 1;
+  UCHAR  Synchronous : 1;
+  UCHAR  Wide16Bit : 1;
+  UCHAR  Wide32Bit : 1;
+  UCHAR  RelativeAddressing : 1;
+  UCHAR  VendorId[8];
+  UCHAR  ProductId[16];
+  UCHAR  ProductRevisionLevel[4];
+  UCHAR  VendorSpecific[20];
+  UCHAR  Reserved3[40];
 } INQUIRYDATA, *PINQUIRYDATA;
 #endif
 
 typedef struct _MODE_CAPABILITIES_PAGE {
-	UCHAR PageCode : 6;
-	UCHAR Reserved1 : 2;
-	UCHAR PageLength;
-	UCHAR Reserved2[2];
-	UCHAR RO : 1;
-	UCHAR Reserved3 : 4;
-	UCHAR SPREV : 1;
-	UCHAR Reserved4 : 2;
-	UCHAR Reserved5 : 3;
-	UCHAR EFMT : 1;
-	UCHAR Reserved6 : 1;
-	UCHAR QFA : 1;
-	UCHAR Reserved7 : 2;
-	UCHAR LOCK : 1;
-	UCHAR LOCKED : 1;
-	UCHAR PREVENT : 1;
-	UCHAR UNLOAD : 1;
-	UCHAR Reserved8 : 2;
-	UCHAR ECC : 1;
-	UCHAR CMPRS : 1;
-	UCHAR Reserved9 : 1;
-	UCHAR BLK512 : 1;
-	UCHAR BLK1024 : 1;
-	UCHAR Reserved10 : 4;
-	UCHAR SLOWB : 1;
-	UCHAR MaximumSpeedSupported[2];
-	UCHAR MaximumStoredDefectedListEntries[2];
-	UCHAR ContinuousTransferLimit[2];
-	UCHAR CurrentSpeedSelected[2];
-	UCHAR BufferSize[2];
-	UCHAR Reserved11[2];
+  UCHAR PageCode : 6;
+  UCHAR Reserved1 : 2;
+  UCHAR PageLength;
+  UCHAR Reserved2[2];
+  UCHAR RO : 1;
+  UCHAR Reserved3 : 4;
+  UCHAR SPREV : 1;
+  UCHAR Reserved4 : 2;
+  UCHAR Reserved5 : 3;
+  UCHAR EFMT : 1;
+  UCHAR Reserved6 : 1;
+  UCHAR QFA : 1;
+  UCHAR Reserved7 : 2;
+  UCHAR LOCK : 1;
+  UCHAR LOCKED : 1;
+  UCHAR PREVENT : 1;
+  UCHAR UNLOAD : 1;
+  UCHAR Reserved8 : 2;
+  UCHAR ECC : 1;
+  UCHAR CMPRS : 1;
+  UCHAR Reserved9 : 1;
+  UCHAR BLK512 : 1;
+  UCHAR BLK1024 : 1;
+  UCHAR Reserved10 : 4;
+  UCHAR SLOWB : 1;
+  UCHAR MaximumSpeedSupported[2];
+  UCHAR MaximumStoredDefectedListEntries[2];
+  UCHAR ContinuousTransferLimit[2];
+  UCHAR CurrentSpeedSelected[2];
+  UCHAR BufferSize[2];
+  UCHAR Reserved11[2];
 } MODE_CAPABILITIES_PAGE, *PMODE_CAPABILITIES_PAGE;
 
 typedef BOOLEAN DDKAPI
 (*TAPE_VERIFY_INQUIRY_ROUTINE)(
-	IN PINQUIRYDATA  InquiryData,
-	IN PMODE_CAPABILITIES_PAGE ModeCapabilitiesPage);
+  __W32_IN PINQUIRYDATA  InquiryData,
+  __W32_IN PMODE_CAPABILITIES_PAGE ModeCapabilitiesPage);
 
 typedef VOID DDKAPI
 (*TAPE_EXTENSION_INIT_ROUTINE)(
-  IN PVOID  MinitapeExtension,
-  IN PINQUIRYDATA  InquiryData,
-  IN PMODE_CAPABILITIES_PAGE  ModeCapabilitiesPage);
+  __W32_IN PVOID  MinitapeExtension,
+  __W32_IN PINQUIRYDATA  InquiryData,
+  __W32_IN PMODE_CAPABILITIES_PAGE  ModeCapabilitiesPage);
 
 typedef VOID DDKAPI
 (*TAPE_ERROR_ROUTINE)(
-    IN PVOID  MinitapeExtension,
-    IN PSCSI_REQUEST_BLOCK  Srb,
-    IN OUT PTAPE_STATUS  TapeStatus);
+  __W32_IN PVOID  MinitapeExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb,
+  __W32_IN __W32_OUT PTAPE_STATUS  TapeStatus);
 
 typedef TAPE_STATUS DDKAPI
 (*TAPE_PROCESS_COMMAND_ROUTINE)(
-  IN OUT PVOID  MinitapeExtension,
-  IN OUT PVOID  CommandExtension,
-  IN OUT PVOID  CommandParameters,
-  IN OUT PSCSI_REQUEST_BLOCK  Srb,
-  IN ULONG  CallNumber,
-  IN TAPE_STATUS  StatusOfLastCommand,
-  IN OUT PULONG  RetryFlags);
+  __W32_IN __W32_OUT PVOID  MinitapeExtension,
+  __W32_IN __W32_OUT PVOID  CommandExtension,
+  __W32_IN __W32_OUT PVOID  CommandParameters,
+  __W32_IN __W32_OUT PSCSI_REQUEST_BLOCK  Srb,
+  __W32_IN ULONG  CallNumber,
+  __W32_IN TAPE_STATUS  StatusOfLastCommand,
+  __W32_IN __W32_OUT PULONG  RetryFlags);
 
 #define TAPE_RETRY_MASK                   0x0000FFFF
 #define IGNORE_ERRORS                     0x00010000
 #define RETURN_ERRORS                     0x00020000
 
-typedef struct _TAPE_INIT_DATA { 
+typedef struct _TAPE_INIT_DATA {
   TAPE_VERIFY_INQUIRY_ROUTINE  VerifyInquiry;
-  BOOLEAN  QueryModeCapabilitiesPage; 
-  ULONG  MinitapeExtensionSize; 
+  BOOLEAN  QueryModeCapabilitiesPage;
+  ULONG  MinitapeExtensionSize;
   TAPE_EXTENSION_INIT_ROUTINE  ExtensionInit;
   ULONG  DefaultTimeOutValue;
   TAPE_ERROR_ROUTINE  TapeError;
   ULONG  CommandExtensionSize;
-  TAPE_PROCESS_COMMAND_ROUTINE  CreatePartition; 
-  TAPE_PROCESS_COMMAND_ROUTINE  Erase; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetDriveParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetMediaParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetPosition; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetStatus; 
-  TAPE_PROCESS_COMMAND_ROUTINE  Prepare; 
-  TAPE_PROCESS_COMMAND_ROUTINE  SetDriveParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  SetMediaParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  SetPosition; 
-  TAPE_PROCESS_COMMAND_ROUTINE  WriteMarks; 
+  TAPE_PROCESS_COMMAND_ROUTINE  CreatePartition;
+  TAPE_PROCESS_COMMAND_ROUTINE  Erase;
+  TAPE_PROCESS_COMMAND_ROUTINE  GetDriveParameters;
+  TAPE_PROCESS_COMMAND_ROUTINE  GetMediaParameters;
+  TAPE_PROCESS_COMMAND_ROUTINE  GetPosition;
+  TAPE_PROCESS_COMMAND_ROUTINE  GetStatus;
+  TAPE_PROCESS_COMMAND_ROUTINE  Prepare;
+  TAPE_PROCESS_COMMAND_ROUTINE  SetDriveParameters;
+  TAPE_PROCESS_COMMAND_ROUTINE  SetMediaParameters;
+  TAPE_PROCESS_COMMAND_ROUTINE  SetPosition;
+  TAPE_PROCESS_COMMAND_ROUTINE  WriteMarks;
   TAPE_PROCESS_COMMAND_ROUTINE  PreProcessReadWrite; /* optional */
-} TAPE_INIT_DATA, *PTAPE_INIT_DATA; 
+} TAPE_INIT_DATA, *PTAPE_INIT_DATA;
 
 typedef struct _TAPE_PHYS_POSITION {
-	ULONG  SeekBlockAddress;
-	ULONG  SpaceBlockCount;
+  ULONG  SeekBlockAddress;
+  ULONG  SpaceBlockCount;
 } TAPE_PHYS_POSITION, PTAPE_PHYS_POSITION;
 
 #pragma pack(pop)
diff -ru w32api-3.6.orig/include/ddk/ndis.h w32api-3.6/include/ddk/ndis.h
--- w32api-3.6.orig/include/ddk/ndis.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/ndis.h	2006-02-06 16:41:14.000000000 +1030
@@ -78,9 +78,9 @@
 typedef struct _X_FILTER NULL_FILTER, *PNULL_FILTER;
 
 typedef struct _REFERENCE {
-	KSPIN_LOCK  SpinLock;
-	USHORT  ReferenceCount;
-	BOOLEAN  Closing;
+  KSPIN_LOCK  SpinLock;
+  USHORT  ReferenceCount;
+  BOOLEAN  Closing;
 } REFERENCE, * PREFERENCE;
 
 
@@ -120,8 +120,8 @@
 #define NDIS_STATUS_WAN_LINE_UP                 ((NDIS_STATUS)0x40010008L)
 #define NDIS_STATUS_WAN_LINE_DOWN               ((NDIS_STATUS)0x40010009L)
 #define NDIS_STATUS_WAN_FRAGMENT                ((NDIS_STATUS)0x4001000AL)
-#define	NDIS_STATUS_MEDIA_CONNECT               ((NDIS_STATUS)0x4001000BL)
-#define	NDIS_STATUS_MEDIA_DISCONNECT            ((NDIS_STATUS)0x4001000CL)
+#define NDIS_STATUS_MEDIA_CONNECT               ((NDIS_STATUS)0x4001000BL)
+#define NDIS_STATUS_MEDIA_DISCONNECT            ((NDIS_STATUS)0x4001000CL)
 #define NDIS_STATUS_HARDWARE_LINE_UP            ((NDIS_STATUS)0x4001000DL)
 #define NDIS_STATUS_HARDWARE_LINE_DOWN          ((NDIS_STATUS)0x4001000EL)
 #define NDIS_STATUS_INTERFACE_UP                ((NDIS_STATUS)0x4001000FL)
@@ -135,22 +135,22 @@
 #define NDIS_STATUS_WAN_CO_LINKPARAMS           ((NDIS_STATUS)0x40010016L)
 
 #define NDIS_STATUS_NOT_RESETTABLE              ((NDIS_STATUS)0x80010001L)
-#define NDIS_STATUS_SOFT_ERRORS	                ((NDIS_STATUS)0x80010003L)
+#define NDIS_STATUS_SOFT_ERRORS                 ((NDIS_STATUS)0x80010003L)
 #define NDIS_STATUS_HARD_ERRORS                 ((NDIS_STATUS)0x80010004L)
-#define NDIS_STATUS_BUFFER_OVERFLOW	            ((NDIS_STATUS)STATUS_BUFFER_OVERFLOW)
+#define NDIS_STATUS_BUFFER_OVERFLOW             ((NDIS_STATUS)STATUS_BUFFER_OVERFLOW)
 
-#define NDIS_STATUS_FAILURE	                    ((NDIS_STATUS)STATUS_UNSUCCESSFUL)
+#define NDIS_STATUS_FAILURE                     ((NDIS_STATUS)STATUS_UNSUCCESSFUL)
 #define NDIS_STATUS_RESOURCES                   ((NDIS_STATUS)STATUS_INSUFFICIENT_RESOURCES)
-#define NDIS_STATUS_CLOSING	                    ((NDIS_STATUS)0xC0010002L)
-#define NDIS_STATUS_BAD_VERSION	                ((NDIS_STATUS)0xC0010004L)
+#define NDIS_STATUS_CLOSING                     ((NDIS_STATUS)0xC0010002L)
+#define NDIS_STATUS_BAD_VERSION                 ((NDIS_STATUS)0xC0010004L)
 #define NDIS_STATUS_BAD_CHARACTERISTICS         ((NDIS_STATUS)0xC0010005L)
 #define NDIS_STATUS_ADAPTER_NOT_FOUND           ((NDIS_STATUS)0xC0010006L)
-#define NDIS_STATUS_OPEN_FAILED	                ((NDIS_STATUS)0xC0010007L)
+#define NDIS_STATUS_OPEN_FAILED                 ((NDIS_STATUS)0xC0010007L)
 #define NDIS_STATUS_DEVICE_FAILED               ((NDIS_STATUS)0xC0010008L)
 #define NDIS_STATUS_MULTICAST_FULL              ((NDIS_STATUS)0xC0010009L)
 #define NDIS_STATUS_MULTICAST_EXISTS            ((NDIS_STATUS)0xC001000AL)
-#define NDIS_STATUS_MULTICAST_NOT_FOUND	        ((NDIS_STATUS)0xC001000BL)
-#define NDIS_STATUS_REQUEST_ABORTED	            ((NDIS_STATUS)0xC001000CL)
+#define NDIS_STATUS_MULTICAST_NOT_FOUND         ((NDIS_STATUS)0xC001000BL)
+#define NDIS_STATUS_REQUEST_ABORTED             ((NDIS_STATUS)0xC001000CL)
 #define NDIS_STATUS_RESET_IN_PROGRESS           ((NDIS_STATUS)0xC001000DL)
 #define NDIS_STATUS_CLOSING_INDICATING          ((NDIS_STATUS)0xC001000EL)
 #define NDIS_STATUS_NOT_SUPPORTED               ((NDIS_STATUS)STATUS_NOT_SUPPORTED)
@@ -162,8 +162,8 @@
 #define NDIS_STATUS_INVALID_LENGTH              ((NDIS_STATUS)0xC0010014L)
 #define NDIS_STATUS_INVALID_DATA                ((NDIS_STATUS)0xC0010015L)
 #define NDIS_STATUS_BUFFER_TOO_SHORT            ((NDIS_STATUS)0xC0010016L)
-#define NDIS_STATUS_INVALID_OID	                ((NDIS_STATUS)0xC0010017L)
-#define NDIS_STATUS_ADAPTER_REMOVED	            ((NDIS_STATUS)0xC0010018L)
+#define NDIS_STATUS_INVALID_OID                 ((NDIS_STATUS)0xC0010017L)
+#define NDIS_STATUS_ADAPTER_REMOVED             ((NDIS_STATUS)0xC0010018L)
 #define NDIS_STATUS_UNSUPPORTED_MEDIA           ((NDIS_STATUS)0xC0010019L)
 #define NDIS_STATUS_GROUP_ADDRESS_IN_USE        ((NDIS_STATUS)0xC001001AL)
 #define NDIS_STATUS_FILE_NOT_FOUND              ((NDIS_STATUS)0xC001001BL)
@@ -172,7 +172,7 @@
 #define NDIS_STATUS_RESOURCE_CONFLICT           ((NDIS_STATUS)0xC001001EL)
 #define NDIS_STATUS_NO_CABLE                    ((NDIS_STATUS)0xC001001FL)
 
-#define NDIS_STATUS_INVALID_SAP	                ((NDIS_STATUS)0xC0010020L)
+#define NDIS_STATUS_INVALID_SAP                 ((NDIS_STATUS)0xC0010020L)
 #define NDIS_STATUS_SAP_IN_USE                  ((NDIS_STATUS)0xC0010021L)
 #define NDIS_STATUS_INVALID_ADDRESS             ((NDIS_STATUS)0xC0010022L)
 #define NDIS_STATUS_VC_NOT_ACTIVATED            ((NDIS_STATUS)0xC0010023L)
@@ -190,21 +190,21 @@
 
 /* NDIS error codes for error logging */
 
-#define NDIS_ERROR_CODE_RESOURCE_CONFLICT			            EVENT_NDIS_RESOURCE_CONFLICT
-#define NDIS_ERROR_CODE_OUT_OF_RESOURCES			            EVENT_NDIS_OUT_OF_RESOURCE
-#define NDIS_ERROR_CODE_HARDWARE_FAILURE			            EVENT_NDIS_HARDWARE_FAILURE
-#define NDIS_ERROR_CODE_ADAPTER_NOT_FOUND			            EVENT_NDIS_ADAPTER_NOT_FOUND
-#define NDIS_ERROR_CODE_INTERRUPT_CONNECT			            EVENT_NDIS_INTERRUPT_CONNECT
-#define NDIS_ERROR_CODE_DRIVER_FAILURE				            EVENT_NDIS_DRIVER_FAILURE
-#define NDIS_ERROR_CODE_BAD_VERSION					              EVENT_NDIS_BAD_VERSION
-#define NDIS_ERROR_CODE_TIMEOUT						                EVENT_NDIS_TIMEOUT
-#define NDIS_ERROR_CODE_NETWORK_ADDRESS				            EVENT_NDIS_NETWORK_ADDRESS
-#define NDIS_ERROR_CODE_UNSUPPORTED_CONFIGURATION	        EVENT_NDIS_UNSUPPORTED_CONFIGURATION
-#define NDIS_ERROR_CODE_INVALID_VALUE_FROM_ADAPTER	      EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER
-#define NDIS_ERROR_CODE_MISSING_CONFIGURATION_PARAMETER	  EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER
-#define NDIS_ERROR_CODE_BAD_IO_BASE_ADDRESS			          EVENT_NDIS_BAD_IO_BASE_ADDRESS
-#define NDIS_ERROR_CODE_RECEIVE_SPACE_SMALL			          EVENT_NDIS_RECEIVE_SPACE_SMALL
-#define NDIS_ERROR_CODE_ADAPTER_DISABLED			            EVENT_NDIS_ADAPTER_DISABLED
+#define NDIS_ERROR_CODE_RESOURCE_CONFLICT                 EVENT_NDIS_RESOURCE_CONFLICT
+#define NDIS_ERROR_CODE_OUT_OF_RESOURCES                  EVENT_NDIS_OUT_OF_RESOURCE
+#define NDIS_ERROR_CODE_HARDWARE_FAILURE                  EVENT_NDIS_HARDWARE_FAILURE
+#define NDIS_ERROR_CODE_ADAPTER_NOT_FOUND                 EVENT_NDIS_ADAPTER_NOT_FOUND
+#define NDIS_ERROR_CODE_INTERRUPT_CONNECT                 EVENT_NDIS_INTERRUPT_CONNECT
+#define NDIS_ERROR_CODE_DRIVER_FAILURE                    EVENT_NDIS_DRIVER_FAILURE
+#define NDIS_ERROR_CODE_BAD_VERSION                       EVENT_NDIS_BAD_VERSION
+#define NDIS_ERROR_CODE_TIMEOUT                           EVENT_NDIS_TIMEOUT
+#define NDIS_ERROR_CODE_NETWORK_ADDRESS                   EVENT_NDIS_NETWORK_ADDRESS
+#define NDIS_ERROR_CODE_UNSUPPORTED_CONFIGURATION         EVENT_NDIS_UNSUPPORTED_CONFIGURATION
+#define NDIS_ERROR_CODE_INVALID_VALUE_FROM_ADAPTER        EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER
+#define NDIS_ERROR_CODE_MISSING_CONFIGURATION_PARAMETER   EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER
+#define NDIS_ERROR_CODE_BAD_IO_BASE_ADDRESS               EVENT_NDIS_BAD_IO_BASE_ADDRESS
+#define NDIS_ERROR_CODE_RECEIVE_SPACE_SMALL               EVENT_NDIS_RECEIVE_SPACE_SMALL
+#define NDIS_ERROR_CODE_ADAPTER_DISABLED                  EVENT_NDIS_ADAPTER_DISABLED
 
 
 /* Memory allocation flags. Used by Ndis[Allocate|Free]Memory */
@@ -212,7 +212,7 @@
 #define NDIS_MEMORY_NONCACHED             0x00000002
 
 /* NIC attribute flags. Used by NdisMSetAttributes(Ex) */
-#define	NDIS_ATTRIBUTE_IGNORE_PACKET_TIMEOUT    0x00000001
+#define NDIS_ATTRIBUTE_IGNORE_PACKET_TIMEOUT    0x00000001
 #define NDIS_ATTRIBUTE_IGNORE_REQUEST_TIMEOUT   0x00000002
 #define NDIS_ATTRIBUTE_IGNORE_TOKEN_RING_ERRORS 0x00000004
 #define NDIS_ATTRIBUTE_BUS_MASTER               0x00000008
@@ -254,10 +254,10 @@
 
 typedef VOID DDKAPI
 (*PNDIS_TIMER_FUNCTION)(
-	IN PVOID  SystemSpecific1,
-	IN PVOID  FunctionContext,
-	IN PVOID  SystemSpecific2,
-	IN PVOID  SystemSpecific3);
+  __W32_IN PVOID  SystemSpecific1,
+  __W32_IN PVOID  FunctionContext,
+  __W32_IN PVOID  SystemSpecific2,
+  __W32_IN PVOID  SystemSpecific3);
 
 typedef struct _NDIS_TIMER {
   KTIMER  Timer;
@@ -289,12 +289,12 @@
 } GEN_GET_TIME_CAPS, *PGEN_GET_TIME_CAPS;
 
 /* Flag bits */
-#define	READABLE_LOCAL_CLOCK                    0x00000001
-#define	CLOCK_NETWORK_DERIVED                   0x00000002
-#define	CLOCK_PRECISION                         0x00000004
-#define	RECEIVE_TIME_INDICATION_CAPABLE         0x00000008
-#define	TIMED_SEND_CAPABLE                      0x00000010
-#define	TIME_STAMP_CAPABLE                      0x00000020
+#define READABLE_LOCAL_CLOCK                    0x00000001
+#define CLOCK_NETWORK_DERIVED                   0x00000002
+#define CLOCK_PRECISION                         0x00000004
+#define RECEIVE_TIME_INDICATION_CAPABLE         0x00000008
+#define TIMED_SEND_CAPABLE                      0x00000010
+#define TIME_STAMP_CAPABLE                      0x00000020
 
 /* OID_GEN_GET_NETCARD_TIME */
 typedef struct _GEN_GET_NETCARD_TIME {
@@ -345,32 +345,32 @@
 #define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND      0x00000004
 #define NDIS_MAC_OPTION_NO_LOOPBACK             0x00000008
 #define NDIS_MAC_OPTION_FULL_DUPLEX             0x00000010
-#define	NDIS_MAC_OPTION_EOTX_INDICATION         0x00000020
-#define	NDIS_MAC_OPTION_8021P_PRIORITY          0x00000040
+#define NDIS_MAC_OPTION_EOTX_INDICATION         0x00000020
+#define NDIS_MAC_OPTION_8021P_PRIORITY          0x00000040
 #define NDIS_MAC_OPTION_RESERVED                0x80000000
 
 /* State of the LAN media (OID_GEN_MEDIA_CONNECT_STATUS) */
 typedef enum _NDIS_MEDIA_STATE {
-	NdisMediaStateConnected,
-	NdisMediaStateDisconnected
+  NdisMediaStateConnected,
+  NdisMediaStateDisconnected
 } NDIS_MEDIA_STATE, *PNDIS_MEDIA_STATE;
 
 /* OID_GEN_SUPPORTED_GUIDS */
 typedef struct _NDIS_GUID {
-	GUID  Guid;
-	union {
-		NDIS_OID  Oid;
-		NDIS_STATUS  Status;
-	} u;
-	ULONG  Size;
-	ULONG  Flags;
+  GUID  Guid;
+  union {
+    NDIS_OID  Oid;
+    NDIS_STATUS  Status;
+  } u;
+  ULONG  Size;
+  ULONG  Flags;
 } NDIS_GUID, *PNDIS_GUID;
 
-#define	NDIS_GUID_TO_OID                  0x00000001
-#define	NDIS_GUID_TO_STATUS               0x00000002
-#define	NDIS_GUID_ANSI_STRING             0x00000004
-#define	NDIS_GUID_UNICODE_STRING          0x00000008
-#define	NDIS_GUID_ARRAY	                  0x00000010
+#define NDIS_GUID_TO_OID                  0x00000001
+#define NDIS_GUID_TO_STATUS               0x00000002
+#define NDIS_GUID_ANSI_STRING             0x00000004
+#define NDIS_GUID_UNICODE_STRING          0x00000008
+#define NDIS_GUID_ARRAY                   0x00000010
 
 
 typedef struct _NDIS_PACKET_POOL {
@@ -392,7 +392,7 @@
   PNDIS_PACKET_POOL  Pool;
   UINT  Count;
   ULONG  Flags;
-  BOOLEAN	 ValidCounts;
+  BOOLEAN   ValidCounts;
   UCHAR  NdisPacketFlags;
   USHORT  NdisPacketOobOffset;
 } NDIS_PACKET_PRIVATE, * PNDIS_PACKET_PRIVATE;
@@ -417,10 +417,10 @@
 } NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET;
 
 typedef enum _NDIS_CLASS_ID {
-	NdisClass802_3Priority,
-	NdisClassWirelessWanMbxMailbox,
-	NdisClassIrdaPacketInfo,
-	NdisClassAtmAALInfo
+  NdisClass802_3Priority,
+  NdisClassWirelessWanMbxMailbox,
+  NdisClassIrdaPacketInfo,
+  NdisClassAtmAALInfo
 } NDIS_CLASS_ID;
 
 typedef struct MediaSpecificInformation {
@@ -542,21 +542,21 @@
 
 /* Possible hardware architecture */
 typedef enum _NDIS_INTERFACE_TYPE {
-	NdisInterfaceInternal = Internal,
-	NdisInterfaceIsa = Isa,
-	NdisInterfaceEisa = Eisa,
-	NdisInterfaceMca = MicroChannel,
-	NdisInterfaceTurboChannel = TurboChannel,
-	NdisInterfacePci = PCIBus,
-	NdisInterfacePcMcia = PCMCIABus,
-	NdisInterfaceCBus = CBus,
-	NdisInterfaceMPIBus = MPIBus,
-	NdisInterfaceMPSABus = MPSABus,
-	NdisInterfaceProcessorInternal = ProcessorInternal,
-	NdisInterfaceInternalPowerBus = InternalPowerBus,
-	NdisInterfacePNPISABus = PNPISABus,
-	NdisInterfacePNPBus = PNPBus,
-	NdisMaximumInterfaceType
+  NdisInterfaceInternal = Internal,
+  NdisInterfaceIsa = Isa,
+  NdisInterfaceEisa = Eisa,
+  NdisInterfaceMca = MicroChannel,
+  NdisInterfaceTurboChannel = TurboChannel,
+  NdisInterfacePci = PCIBus,
+  NdisInterfacePcMcia = PCMCIABus,
+  NdisInterfaceCBus = CBus,
+  NdisInterfaceMPIBus = MPIBus,
+  NdisInterfaceMPSABus = MPSABus,
+  NdisInterfaceProcessorInternal = ProcessorInternal,
+  NdisInterfaceInternalPowerBus = InternalPowerBus,
+  NdisInterfacePNPISABus = PNPISABus,
+  NdisInterfacePNPBus = PNPBus,
+  NdisMaximumInterfaceType
 } NDIS_INTERFACE_TYPE, *PNDIS_INTERFACE_TYPE;
 
 #define NdisInterruptLevelSensitive       LevelSensitive
@@ -573,8 +573,8 @@
 } NDIS_PARAMETER_TYPE, *PNDIS_PARAMETER_TYPE;
 
 typedef struct {
-	USHORT  Length;
-	PVOID  Buffer;
+  USHORT  Length;
+  PVOID  Buffer;
 } BINARY_DATA;
 
 typedef struct _NDIS_CONFIGURATION_PARAMETER {
@@ -605,7 +605,7 @@
   NDIS_WAN_QUALITY  Quality;
   USHORT  SendWindow;
   UCHAR  RemoteAddress[6];
-  OUT UCHAR  LocalAddress[6];
+  __W32_OUT UCHAR  LocalAddress[6];
   ULONG  ProtocolBufferLength;
   PUCHAR  ProtocolBuffer;
   USHORT  ProtocolType;
@@ -615,7 +615,7 @@
 
 typedef VOID DDKAPI
 (*ADAPTER_SHUTDOWN_HANDLER)(
-  IN PVOID  ShutdownContext);
+  __W32_IN PVOID  ShutdownContext);
 
 
 typedef struct _OID_LIST    OID_LIST, *POID_LIST;
@@ -632,9 +632,9 @@
   NdisPnPDeviceSurpriseRemoved
 } NDIS_PNP_DEVICE_STATE;
 
-#define	NDIS_DEVICE_NOT_STOPPABLE                 0x00000001
-#define	NDIS_DEVICE_NOT_REMOVEABLE                0x00000002
-#define	NDIS_DEVICE_NOT_SUSPENDABLE	              0x00000004
+#define NDIS_DEVICE_NOT_STOPPABLE                 0x00000001
+#define NDIS_DEVICE_NOT_REMOVEABLE                0x00000002
+#define NDIS_DEVICE_NOT_SUSPENDABLE               0x00000004
 #define NDIS_DEVICE_DISABLE_PM                    0x00000008
 #define NDIS_DEVICE_DISABLE_WAKE_UP               0x00000010
 #define NDIS_DEVICE_DISABLE_WAKE_ON_RECONNECT     0x00000020
@@ -645,30 +645,30 @@
 
 /* OID_GEN_NETWORK_LAYER_ADDRESSES */
 typedef struct _NETWORK_ADDRESS {
-  USHORT  AddressLength; 
-  USHORT  AddressType; 
-  UCHAR  Address[1]; 
+  USHORT  AddressLength;
+  USHORT  AddressType;
+  UCHAR  Address[1];
 } NETWORK_ADDRESS, *PNETWORK_ADDRESS;
 
 typedef struct _NETWORK_ADDRESS_LIST {
-	LONG  AddressCount; 
-	USHORT  AddressType; 
-	NETWORK_ADDRESS  Address[1]; 
+  LONG  AddressCount;
+  USHORT  AddressType;
+  NETWORK_ADDRESS  Address[1];
 } NETWORK_ADDRESS_LIST, *PNETWORK_ADDRESS_LIST;
 
 /* Protocol types supported by NDIS */
-#define	NDIS_PROTOCOL_ID_DEFAULT        0x00
-#define	NDIS_PROTOCOL_ID_TCP_IP         0x02
-#define	NDIS_PROTOCOL_ID_IPX            0x06
-#define	NDIS_PROTOCOL_ID_NBF            0x07
-#define	NDIS_PROTOCOL_ID_MAX            0x0F
-#define	NDIS_PROTOCOL_ID_MASK           0x0F
+#define NDIS_PROTOCOL_ID_DEFAULT        0x00
+#define NDIS_PROTOCOL_ID_TCP_IP         0x02
+#define NDIS_PROTOCOL_ID_IPX            0x06
+#define NDIS_PROTOCOL_ID_NBF            0x07
+#define NDIS_PROTOCOL_ID_MAX            0x0F
+#define NDIS_PROTOCOL_ID_MASK           0x0F
 
 
 /* OID_GEN_TRANSPORT_HEADER_OFFSET */
 typedef struct _TRANSPORT_HEADER_OFFSET {
-	USHORT  ProtocolType; 
-	USHORT  HeaderOffset; 
+  USHORT  ProtocolType;
+  USHORT  HeaderOffset;
 } TRANSPORT_HEADER_OFFSET, *PTRANSPORT_HEADER_OFFSET;
 
 
@@ -722,13 +722,13 @@
 /* CO_MEDIA_PARAMETERS.Flags constants */
 #define RECEIVE_TIME_INDICATION           0x00000001
 #define USE_TIME_STAMPS                   0x00000002
-#define TRANSMIT_VC	                      0x00000004
+#define TRANSMIT_VC                       0x00000004
 #define RECEIVE_VC                        0x00000008
 #define INDICATE_ERRED_PACKETS            0x00000010
 #define INDICATE_END_OF_TX                0x00000020
 #define RESERVE_RESOURCES_VC              0x00000040
-#define	ROUND_DOWN_FLOW	                  0x00000080
-#define	ROUND_UP_FLOW                     0x00000100
+#define ROUND_DOWN_FLOW                   0x00000080
+#define ROUND_UP_FLOW                     0x00000100
 
 typedef struct _CO_MEDIA_PARAMETERS {
   ULONG  Flags;
@@ -772,12 +772,12 @@
 } NDIS_IPSEC_PACKET_INFO, *PNDIS_IPSEC_PACKET_INFO;
 
 /* NDIS_MAC_FRAGMENT.Errors constants */
-#define WAN_ERROR_CRC               			0x00000001
-#define WAN_ERROR_FRAMING           			0x00000002
-#define WAN_ERROR_HARDWAREOVERRUN   			0x00000004
-#define WAN_ERROR_BUFFEROVERRUN     			0x00000008
-#define WAN_ERROR_TIMEOUT           			0x00000010
-#define WAN_ERROR_ALIGNMENT         			0x00000020
+#define WAN_ERROR_CRC                     0x00000001
+#define WAN_ERROR_FRAMING                 0x00000002
+#define WAN_ERROR_HARDWAREOVERRUN         0x00000004
+#define WAN_ERROR_BUFFEROVERRUN           0x00000008
+#define WAN_ERROR_TIMEOUT                 0x00000010
+#define WAN_ERROR_ALIGNMENT               0x00000020
 
 typedef struct _NDIS_MAC_FRAGMENT {
   NDIS_HANDLE  NdisLinkContext;
@@ -798,28 +798,28 @@
 } NDIS_MAC_LINE_UP, *PNDIS_MAC_LINE_UP;
 
 typedef struct _NDIS_PACKET_8021Q_INFO {
-	_ANONYMOUS_UNION union {
-		struct {
-			UINT32  UserPriority : 3;
-			UINT32  CanonicalFormatId : 1;
-			UINT32  VlanId : 12;
-			UINT32  Reserved : 16;
-		} TagHeader;
-		PVOID  Value;
-	} DUMMYUNIONNAME;
+  _ANONYMOUS_UNION union {
+    struct {
+      UINT32  UserPriority : 3;
+      UINT32  CanonicalFormatId : 1;
+      UINT32  VlanId : 12;
+      UINT32  Reserved : 16;
+    } TagHeader;
+    PVOID  Value;
+  } DUMMYUNIONNAME;
 } NDIS_PACKET_8021Q_INFO, *PNDIS_PACKET_8021Q_INFO;
 
 typedef enum _NDIS_PER_PACKET_INFO {
-	TcpIpChecksumPacketInfo,
-	IpSecPacketInfo,
-	TcpLargeSendPacketInfo,
-	ClassificationHandlePacketInfo,
-	NdisReserved,
-	ScatterGatherListPacketInfo,
-	Ieee8021QInfo,
-	OriginalPacketInfo,
-	PacketCancelId,
-	MaxPerPacketInfo
+  TcpIpChecksumPacketInfo,
+  IpSecPacketInfo,
+  TcpLargeSendPacketInfo,
+  ClassificationHandlePacketInfo,
+  NdisReserved,
+  ScatterGatherListPacketInfo,
+  Ieee8021QInfo,
+  OriginalPacketInfo,
+  PacketCancelId,
+  MaxPerPacketInfo
 } NDIS_PER_PACKET_INFO, *PNDIS_PER_PACKET_INFO;
 
 typedef struct _NDIS_PACKET_EXTENSION {
@@ -829,7 +829,7 @@
 /*
  * PNDIS_PACKET
  * NDIS_GET_ORIGINAL_PACKET(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_ORIGINAL_PACKET(Packet) \
   NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, OriginalPacketInfo)
@@ -837,7 +837,7 @@
 /*
  * PVOID
  * NDIS_GET_PACKET_CANCEL_ID(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_PACKET_CANCEL_ID(Packet) \
   NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, PacketCancelId)
@@ -845,7 +845,7 @@
 /*
  * PNDIS_PACKET_EXTENSION
  * NDIS_PACKET_EXTENSION_FROM_PACKET(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_PACKET_EXTENSION_FROM_PACKET(Packet) \
   ((PNDIS_PACKET_EXTENSION)((PUCHAR)(Packet) \
@@ -854,8 +854,8 @@
 /*
  * PVOID
  * NDIS_PER_PACKET_INFO_FROM_PACKET(
- *   IN OUT  PNDIS_PACKET  Packet,
- *   IN NDIS_PER_PACKET_INFO  InfoType);
+ *   __W32_IN __W32_OUT  PNDIS_PACKET  Packet,
+ *   __W32_IN NDIS_PER_PACKET_INFO  InfoType);
  */
 #define NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, InfoType) \
   ((PNDIS_PACKET_EXTENSION)((PUCHAR)(Packet) + (Packet)->Private.NdisPacketOobOffset \
@@ -864,8 +864,8 @@
 /*
  * VOID
  * NDIS_SET_ORIGINAL_PACKET(
- *   IN OUT  PNDIS_PACKET  Packet,
- *   IN PNDIS_PACKET  OriginalPacket);
+ *   __W32_IN __W32_OUT  PNDIS_PACKET  Packet,
+ *   __W32_IN PNDIS_PACKET  OriginalPacket);
  */
 #define NDIS_SET_ORIGINAL_PACKET(Packet, OriginalPacket) \
   NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, OriginalPacketInfo) = (OriginalPacket)
@@ -873,8 +873,8 @@
 /*
  * VOID
  * NDIS_SET_PACKET_CANCEL_ID(
- *  IN PNDIS_PACKET  Packet
- *  IN ULONG_PTR  CancelId);
+ *  __W32_IN PNDIS_PACKET  Packet
+ *  __W32_IN ULONG_PTR  CancelId);
  */
 #define NDIS_SET_PACKET_CANCEL_ID(Packet, CancelId) \
   NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, PacketCancelId) = (CancelId)
@@ -893,7 +893,7 @@
     ULONG  V4_OPTIONS;
     ULONG  RESERVED;
   } Supported;
- 
+
   struct {
     ULONG  MD5 : 1;
     ULONG  SHA_1 : 1;
@@ -902,7 +902,7 @@
     ULONG  Send : 1;
     ULONG  Receive : 1;
   } V4AH;
- 
+
   struct {
     ULONG  DES : 1;
     ULONG  RESERVED : 1;
@@ -953,7 +953,7 @@
     ULONG  UdpChecksum:1;
     ULONG  IpChecksum:1;
   } V4Transmit;
- 
+
   struct {
     ULONG  IpOptionsSupported : 1;
     ULONG  TcpOptionsSupported : 1;
@@ -961,14 +961,14 @@
     ULONG  UdpChecksum : 1;
     ULONG  IpChecksum : 1;
   } V4Receive;
- 
+
   struct {
     ULONG  IpOptionsSupported : 1;
     ULONG  TcpOptionsSupported : 1;
     ULONG  TcpChecksum : 1;
     ULONG  UdpChecksum : 1;
   } V6Transmit;
- 
+
   struct {
     ULONG  IpOptionsSupported : 1;
     ULONG  TcpOptionsSupported : 1;
@@ -994,7 +994,7 @@
       ULONG  NdisPacketUdpChecksum : 1;
       ULONG  NdisPacketIpChecksum : 1;
       } Transmit;
- 
+
     struct {
       ULONG  NdisPacketTcpChecksumFailed : 1;
       ULONG  NdisPacketUdpChecksumFailed : 1;
@@ -1018,9 +1018,9 @@
 } NDIS_WAN_FRAGMENT, *PNDIS_WAN_FRAGMENT;
 
 typedef struct _WAN_CO_LINKPARAMS {
-  ULONG  TransmitSpeed; 
-  ULONG  ReceiveSpeed; 
-  ULONG  SendWindow; 
+  ULONG  TransmitSpeed;
+  ULONG  ReceiveSpeed;
+  ULONG  SendWindow;
 } WAN_CO_LINKPARAMS, *PWAN_CO_LINKPARAMS;
 
 
@@ -1028,121 +1028,121 @@
 
 typedef VOID DDKAPI
 (*CM_ACTIVATE_VC_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  CallMgrVcContext,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_ADD_PARTY_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  OUT PNDIS_HANDLE  CallMgrPartyContext);
+  __W32_IN NDIS_HANDLE  CallMgrVcContext,
+  __W32_IN __W32_OUT PCO_CALL_PARAMETERS  CallParameters,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle,
+  __W32_OUT PNDIS_HANDLE  CallMgrPartyContext);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_CLOSE_AF_HANDLER)(
-  IN NDIS_HANDLE  CallMgrAfContext);
+  __W32_IN NDIS_HANDLE  CallMgrAfContext);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_CLOSE_CALL_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN NDIS_HANDLE  CallMgrPartyContext  OPTIONAL,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
+  __W32_IN NDIS_HANDLE  CallMgrVcContext,
+  __W32_IN NDIS_HANDLE  CallMgrPartyContext  __W32_OPTIONAL,
+  __W32_IN PVOID  CloseData  __W32_OPTIONAL,
+  __W32_IN UINT  Size  __W32_OPTIONAL);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_DEREG_SAP_HANDLER)(
-  IN NDIS_HANDLE  CallMgrSapContext);
+  __W32_IN NDIS_HANDLE  CallMgrSapContext);
 
 typedef VOID DDKAPI
 (*CM_DEACTIVATE_VC_COMPLETE_HANDLER)(
-	IN NDIS_STATUS  Status,
-	IN NDIS_HANDLE  CallMgrVcContext);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  CallMgrVcContext);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_DROP_PARTY_HANDLER)(
-  IN NDIS_HANDLE  CallMgrPartyContext,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
+  __W32_IN NDIS_HANDLE  CallMgrPartyContext,
+  __W32_IN PVOID  CloseData  __W32_OPTIONAL,
+  __W32_IN UINT  Size  __W32_OPTIONAL);
 
 typedef VOID DDKAPI
 (*CM_INCOMING_CALL_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  CallMgrVcContext,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_MAKE_CALL_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  IN NDIS_HANDLE  NdisPartyHandle	OPTIONAL,
-  OUT PNDIS_HANDLE  CallMgrPartyContext  OPTIONAL);
+  __W32_IN NDIS_HANDLE  CallMgrVcContext,
+  __W32_IN __W32_OUT PCO_CALL_PARAMETERS  CallParameters,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL,
+  __W32_OUT PNDIS_HANDLE  CallMgrPartyContext  __W32_OPTIONAL);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_MODIFY_CALL_QOS_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  CallMgrVcContext,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_OPEN_AF_HANDLER)(
-	IN NDIS_HANDLE  CallMgrBindingContext,
-	IN PCO_ADDRESS_FAMILY  AddressFamily,
-	IN NDIS_HANDLE  NdisAfHandle,
-	OUT PNDIS_HANDLE  CallMgrAfContext);
+  __W32_IN NDIS_HANDLE  CallMgrBindingContext,
+  __W32_IN PCO_ADDRESS_FAMILY  AddressFamily,
+  __W32_IN NDIS_HANDLE  NdisAfHandle,
+  __W32_OUT PNDIS_HANDLE  CallMgrAfContext);
 
 typedef NDIS_STATUS DDKAPI
 (*CM_REG_SAP_HANDLER)(
-  IN NDIS_HANDLE  CallMgrAfContext,
-  IN PCO_SAP  Sap,
-  IN NDIS_HANDLE  NdisSapHandle,
-  OUT	PNDIS_HANDLE  CallMgrSapContext);
+  __W32_IN NDIS_HANDLE  CallMgrAfContext,
+  __W32_IN PCO_SAP  Sap,
+  __W32_IN NDIS_HANDLE  NdisSapHandle,
+  __W32_OUT  PNDIS_HANDLE  CallMgrSapContext);
 
 typedef NDIS_STATUS DDKAPI
 (*CO_CREATE_VC_HANDLER)(
-  IN NDIS_HANDLE  ProtocolAfContext,
-  IN NDIS_HANDLE  NdisVcHandle,
-  OUT PNDIS_HANDLE  ProtocolVcContext);
+  __W32_IN NDIS_HANDLE  ProtocolAfContext,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_OUT PNDIS_HANDLE  ProtocolVcContext);
 
 typedef NDIS_STATUS DDKAPI
 (*CO_DELETE_VC_HANDLER)(
-  IN NDIS_HANDLE  ProtocolVcContext);
+  __W32_IN NDIS_HANDLE  ProtocolVcContext);
 
 typedef VOID DDKAPI
 (*CO_REQUEST_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolAfContext  OPTIONAL,
-  IN NDIS_HANDLE  ProtocolVcContext  OPTIONAL,
-  IN NDIS_HANDLE  ProtocolPartyContext  OPTIONAL,
-  IN PNDIS_REQUEST  NdisRequest);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolAfContext  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext  __W32_OPTIONAL,
+  __W32_IN PNDIS_REQUEST  NdisRequest);
 
 typedef NDIS_STATUS DDKAPI
 (*CO_REQUEST_HANDLER)(
-  IN NDIS_HANDLE  ProtocolAfContext,
-  IN NDIS_HANDLE  ProtocolVcContext  OPTIONAL,
-  IN NDIS_HANDLE	ProtocolPartyContext  OPTIONAL,
-  IN OUT PNDIS_REQUEST  NdisRequest);
+  __W32_IN NDIS_HANDLE  ProtocolAfContext,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PNDIS_REQUEST  NdisRequest);
 
 typedef struct _NDIS_CALL_MANAGER_CHARACTERISTICS {
-	UCHAR  MajorVersion;
-	UCHAR  MinorVersion;
-	USHORT  Filler;
-	UINT  Reserved;
-	CO_CREATE_VC_HANDLER  CmCreateVcHandler;
-	CO_DELETE_VC_HANDLER  CmDeleteVcHandler;
-	CM_OPEN_AF_HANDLER  CmOpenAfHandler;
-	CM_CLOSE_AF_HANDLER	 CmCloseAfHandler;
-	CM_REG_SAP_HANDLER  CmRegisterSapHandler;
-	CM_DEREG_SAP_HANDLER  CmDeregisterSapHandler;
-	CM_MAKE_CALL_HANDLER  CmMakeCallHandler;
-	CM_CLOSE_CALL_HANDLER  CmCloseCallHandler;
-	CM_INCOMING_CALL_COMPLETE_HANDLER  CmIncomingCallCompleteHandler;
-	CM_ADD_PARTY_HANDLER  CmAddPartyHandler;
-	CM_DROP_PARTY_HANDLER  CmDropPartyHandler;
-	CM_ACTIVATE_VC_COMPLETE_HANDLER  CmActivateVcCompleteHandler;
-	CM_DEACTIVATE_VC_COMPLETE_HANDLER  CmDeactivateVcCompleteHandler;
-	CM_MODIFY_CALL_QOS_HANDLER  CmModifyCallQoSHandler;
-	CO_REQUEST_HANDLER  CmRequestHandler;
-	CO_REQUEST_COMPLETE_HANDLER  CmRequestCompleteHandler;
+  UCHAR  MajorVersion;
+  UCHAR  MinorVersion;
+  USHORT  Filler;
+  UINT  Reserved;
+  CO_CREATE_VC_HANDLER  CmCreateVcHandler;
+  CO_DELETE_VC_HANDLER  CmDeleteVcHandler;
+  CM_OPEN_AF_HANDLER  CmOpenAfHandler;
+  CM_CLOSE_AF_HANDLER   CmCloseAfHandler;
+  CM_REG_SAP_HANDLER  CmRegisterSapHandler;
+  CM_DEREG_SAP_HANDLER  CmDeregisterSapHandler;
+  CM_MAKE_CALL_HANDLER  CmMakeCallHandler;
+  CM_CLOSE_CALL_HANDLER  CmCloseCallHandler;
+  CM_INCOMING_CALL_COMPLETE_HANDLER  CmIncomingCallCompleteHandler;
+  CM_ADD_PARTY_HANDLER  CmAddPartyHandler;
+  CM_DROP_PARTY_HANDLER  CmDropPartyHandler;
+  CM_ACTIVATE_VC_COMPLETE_HANDLER  CmActivateVcCompleteHandler;
+  CM_DEACTIVATE_VC_COMPLETE_HANDLER  CmDeactivateVcCompleteHandler;
+  CM_MODIFY_CALL_QOS_HANDLER  CmModifyCallQoSHandler;
+  CO_REQUEST_HANDLER  CmRequestHandler;
+  CO_REQUEST_COMPLETE_HANDLER  CmRequestCompleteHandler;
 } NDIS_CALL_MANAGER_CHARACTERISTICS, *PNDIS_CALL_MANAGER_CHARACTERISTICS;
 
 
@@ -1150,86 +1150,86 @@
 /* Call Manager clients */
 
 typedef VOID (*CL_OPEN_AF_COMPLETE_HANDLER)(
-  IN NDIS_STATUS Status,
-  IN NDIS_HANDLE ProtocolAfContext,
-  IN NDIS_HANDLE NdisAfHandle);
+  __W32_IN NDIS_STATUS Status,
+  __W32_IN NDIS_HANDLE ProtocolAfContext,
+  __W32_IN NDIS_HANDLE NdisAfHandle);
 
 typedef VOID DDKAPI
 (*CL_CLOSE_AF_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolAfContext);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolAfContext);
 
 typedef VOID DDKAPI
 (*CL_REG_SAP_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolSapContext,
-  IN PCO_SAP  Sap,
-  IN NDIS_HANDLE  NdisSapHandle);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolSapContext,
+  __W32_IN PCO_SAP  Sap,
+  __W32_IN NDIS_HANDLE  NdisSapHandle);
 
 typedef VOID DDKAPI
 (*CL_DEREG_SAP_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolSapContext);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolSapContext);
 
 typedef VOID DDKAPI
 (*CL_MAKE_CALL_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 typedef VOID DDKAPI
 (*CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 typedef VOID DDKAPI
 (*CL_CLOSE_CALL_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN NDIS_HANDLE  ProtocolPartyContext  OPTIONAL);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext  __W32_OPTIONAL);
 
 typedef VOID DDKAPI
 (*CL_ADD_PARTY_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolPartyContext,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 typedef VOID DDKAPI
 (*CL_DROP_PARTY_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolPartyContext);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext);
 
 typedef NDIS_STATUS DDKAPI
 (*CL_INCOMING_CALL_HANDLER)(
-  IN NDIS_HANDLE  ProtocolSapContext,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  ProtocolSapContext,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN __W32_OUT PCO_CALL_PARAMETERS  CallParameters);
 
 typedef VOID DDKAPI
 (*CL_INCOMING_CALL_QOS_CHANGE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 typedef VOID DDKAPI
 (*CL_INCOMING_CLOSE_CALL_HANDLER)(
-  IN NDIS_STATUS  CloseStatus,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
+  __W32_IN NDIS_STATUS  CloseStatus,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN PVOID  CloseData  __W32_OPTIONAL,
+  __W32_IN UINT  Size  __W32_OPTIONAL);
 
 typedef VOID DDKAPI
 (*CL_INCOMING_DROP_PARTY_HANDLER)(
-  IN NDIS_STATUS  DropStatus,
-  IN NDIS_HANDLE  ProtocolPartyContext,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
+  __W32_IN NDIS_STATUS  DropStatus,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext,
+  __W32_IN PVOID  CloseData  __W32_OPTIONAL,
+  __W32_IN UINT  Size  __W32_OPTIONAL);
 
 typedef VOID DDKAPI
 (*CL_CALL_CONNECTED_HANDLER)(
-  IN NDIS_HANDLE  ProtocolVcContext);
+  __W32_IN NDIS_HANDLE  ProtocolVcContext);
 
 
 typedef struct _NDIS_CLIENT_CHARACTERISTICS {
@@ -1246,7 +1246,7 @@
   CL_REG_SAP_COMPLETE_HANDLER  ClRegisterSapCompleteHandler;
   CL_DEREG_SAP_COMPLETE_HANDLER  ClDeregisterSapCompleteHandler;
   CL_MAKE_CALL_COMPLETE_HANDLER  ClMakeCallCompleteHandler;
-  CL_MODIFY_CALL_QOS_COMPLETE_HANDLER	 ClModifyCallQoSCompleteHandler;
+  CL_MODIFY_CALL_QOS_COMPLETE_HANDLER   ClModifyCallQoSCompleteHandler;
   CL_CLOSE_CALL_COMPLETE_HANDLER  ClCloseCallCompleteHandler;
   CL_ADD_PARTY_COMPLETE_HANDLER  ClAddPartyCompleteHandler;
   CL_DROP_PARTY_COMPLETE_HANDLER  ClDropPartyCompleteHandler;
@@ -1264,55 +1264,55 @@
 
 typedef VOID DDKAPI
 (*OPEN_ADAPTER_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  Status,
-  IN NDIS_STATUS  OpenErrorStatus);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_STATUS  OpenErrorStatus);
 
 typedef VOID DDKAPI
 (*CLOSE_ADAPTER_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_STATUS  Status);
 
 typedef VOID DDKAPI
 (*RESET_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_STATUS  Status);
 
 typedef VOID DDKAPI
 (*REQUEST_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_REQUEST  NdisRequest,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PNDIS_REQUEST  NdisRequest,
+  __W32_IN NDIS_STATUS  Status);
 
 typedef VOID DDKAPI
 (*STATUS_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  GeneralStatus,
-  IN PVOID  StatusBuffer,
-  IN UINT  StatusBufferSize);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_STATUS  GeneralStatus,
+  __W32_IN PVOID  StatusBuffer,
+  __W32_IN UINT  StatusBufferSize);
 
 typedef VOID DDKAPI
 (*STATUS_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext);
 
 typedef VOID DDKAPI
 (*SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PNDIS_PACKET  Packet,
+  __W32_IN NDIS_STATUS  Status);
 
 typedef VOID DDKAPI
 (*WAN_SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_WAN_PACKET  Packet,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PNDIS_WAN_PACKET  Packet,
+  __W32_IN NDIS_STATUS  Status);
 
 typedef VOID DDKAPI
 (*TRANSFER_DATA_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status,
-  IN UINT  BytesTransferred);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PNDIS_PACKET  Packet,
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN UINT  BytesTransferred);
 
 typedef VOID DDKAPI
 (*WAN_TRANSFER_DATA_COMPLETE_HANDLER)(
@@ -1321,23 +1321,23 @@
 
 typedef NDIS_STATUS DDKAPI
 (*RECEIVE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookAheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_HANDLE  MacReceiveContext,
+  __W32_IN PVOID  HeaderBuffer,
+  __W32_IN UINT  HeaderBufferSize,
+  __W32_IN PVOID  LookAheadBuffer,
+  __W32_IN UINT  LookaheadBufferSize,
+  __W32_IN UINT  PacketSize);
 
 typedef NDIS_STATUS DDKAPI
 (*WAN_RECEIVE_HANDLER)(
-  IN NDIS_HANDLE  NdisLinkHandle,
-  IN PUCHAR  Packet,
-  IN ULONG  PacketSize);
+  __W32_IN NDIS_HANDLE  NdisLinkHandle,
+  __W32_IN PUCHAR  Packet,
+  __W32_IN ULONG  PacketSize);
 
 typedef VOID DDKAPI
 (*RECEIVE_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext);
 
 
 /* Protocol characteristics for NDIS 3.0 protocols */
@@ -1362,7 +1362,7 @@
   RESET_COMPLETE_HANDLER  ResetCompleteHandler; \
   REQUEST_COMPLETE_HANDLER  RequestCompleteHandler; \
   _ANONYMOUS_UNION union { \
-    RECEIVE_HANDLER	 ReceiveHandler; \
+    RECEIVE_HANDLER   ReceiveHandler; \
     WAN_RECEIVE_HANDLER  WanReceiveHandler; \
   } DUMMYUNIONNAME4; \
   RECEIVE_COMPLETE_HANDLER  ReceiveCompleteHandler; \
@@ -1379,27 +1379,27 @@
 
 typedef INT DDKAPI
 (*RECEIVE_PACKET_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_PACKET  Packet);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PNDIS_PACKET  Packet);
 
 typedef VOID DDKAPI
 (*BIND_HANDLER)(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  BindContext,
-  IN PNDIS_STRING  DeviceName,
-  IN PVOID  SystemSpecific1,
-  IN PVOID  SystemSpecific2);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  BindContext,
+  __W32_IN PNDIS_STRING  DeviceName,
+  __W32_IN PVOID  SystemSpecific1,
+  __W32_IN PVOID  SystemSpecific2);
 
 typedef VOID DDKAPI
 (*UNBIND_HANDLER)(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_HANDLE  UnbindContext);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_HANDLE  UnbindContext);
 
 typedef NDIS_STATUS DDKAPI
 (*PNP_EVENT_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNET_PNP_EVENT  NetPnPEvent);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PNET_PNP_EVENT  NetPnPEvent);
 
 typedef VOID DDKAPI
 (*UNLOAD_PROTOCOL_HANDLER)(
@@ -1416,7 +1416,7 @@
   BIND_HANDLER  BindAdapterHandler; \
   UNBIND_HANDLER  UnbindAdapterHandler; \
   PNP_EVENT_HANDLER  PnPEventHandler; \
-  UNLOAD_PROTOCOL_HANDLER  UnloadHandler; 
+  UNLOAD_PROTOCOL_HANDLER  UnloadHandler;
 
 #else /* !__cplusplus */
 
@@ -1426,7 +1426,7 @@
   BIND_HANDLER  BindAdapterHandler; \
   UNBIND_HANDLER  UnbindAdapterHandler; \
   PNP_EVENT_HANDLER  PnPEventHandler; \
-  UNLOAD_PROTOCOL_HANDLER  UnloadHandler; 
+  UNLOAD_PROTOCOL_HANDLER  UnloadHandler;
 
 #endif /* __cplusplus */
 
@@ -1438,28 +1438,28 @@
 
 typedef VOID DDKAPI
 (*CO_SEND_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PNDIS_PACKET  Packet);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN PNDIS_PACKET  Packet);
 
 typedef VOID DDKAPI
 (*CO_STATUS_HANDLER)(
-	IN NDIS_HANDLE  ProtocolBindingContext,
-	IN NDIS_HANDLE  ProtocolVcContext  OPTIONAL,
-	IN NDIS_STATUS  GeneralStatus,
-	IN PVOID  StatusBuffer,
-	IN UINT  StatusBufferSize);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext  __W32_OPTIONAL,
+  __W32_IN NDIS_STATUS  GeneralStatus,
+  __W32_IN PVOID  StatusBuffer,
+  __W32_IN UINT  StatusBufferSize);
 
 typedef UINT DDKAPI
 (*CO_RECEIVE_PACKET_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PNDIS_PACKET  Packet);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN PNDIS_PACKET  Packet);
 
 typedef VOID DDKAPI
 (*CO_AF_REGISTER_NOTIFY_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PCO_ADDRESS_FAMILY  AddressFamily);
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PCO_ADDRESS_FAMILY  AddressFamily);
 
 #ifdef __cplusplus \
 
@@ -1511,203 +1511,203 @@
 VOID
 DDKAPI
 NdisAllocateBuffer(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_BUFFER  *Buffer,
-  IN NDIS_HANDLE  PoolHandle,
-  IN PVOID  VirtualAddress,
-  IN UINT  Length);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_BUFFER  *Buffer,
+  __W32_IN NDIS_HANDLE  PoolHandle,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN UINT  Length);
 
 
 NDISAPI
 VOID
 DDKAPI
 NdisAllocateBufferPool(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  PoolHandle,
-  IN UINT  NumberOfDescriptors);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_HANDLE  PoolHandle,
+  __W32_IN UINT  NumberOfDescriptors);
 
 NDISAPI
 VOID
 DDKAPI
 NdisAllocatePacket(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_PACKET  *Packet,
-  IN NDIS_HANDLE  PoolHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_PACKET  *Packet,
+  __W32_IN NDIS_HANDLE  PoolHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisAllocatePacketPool(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  PoolHandle,
-  IN UINT  NumberOfDescriptors,
-  IN UINT  ProtocolReservedLength);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_HANDLE  PoolHandle,
+  __W32_IN UINT  NumberOfDescriptors,
+  __W32_IN UINT  ProtocolReservedLength);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCopyBuffer(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_BUFFER  *Buffer,
-  IN NDIS_HANDLE  PoolHandle,
-  IN PVOID  MemoryDescriptor,
-  IN UINT  Offset,
-  IN UINT  Length);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_BUFFER  *Buffer,
+  __W32_IN NDIS_HANDLE  PoolHandle,
+  __W32_IN PVOID  MemoryDescriptor,
+  __W32_IN UINT  Offset,
+  __W32_IN UINT  Length);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCopyFromPacketToPacket(
-  IN PNDIS_PACKET  Destination,
-  IN UINT  DestinationOffset,
-  IN UINT  BytesToCopy,
-  IN PNDIS_PACKET  Source,
-  IN UINT  SourceOffset,
-  OUT PUINT  BytesCopied);
+  __W32_IN PNDIS_PACKET  Destination,
+  __W32_IN UINT  DestinationOffset,
+  __W32_IN UINT  BytesToCopy,
+  __W32_IN PNDIS_PACKET  Source,
+  __W32_IN UINT  SourceOffset,
+  __W32_OUT PUINT  BytesCopied);
 
 NDISAPI
 VOID
 DDKAPI
 NdisDprAllocatePacket(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_PACKET  *Packet,
-  IN NDIS_HANDLE  PoolHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_PACKET  *Packet,
+  __W32_IN NDIS_HANDLE  PoolHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisDprAllocatePacketNonInterlocked(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_PACKET  *Packet,
-  IN NDIS_HANDLE  PoolHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_PACKET  *Packet,
+  __W32_IN NDIS_HANDLE  PoolHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisDprFreePacket(
-  IN PNDIS_PACKET  Packet);
+  __W32_IN PNDIS_PACKET  Packet);
 
 NDISAPI
 VOID
 DDKAPI
 NdisDprFreePacketNonInterlocked(
-  IN PNDIS_PACKET  Packet);
+  __W32_IN PNDIS_PACKET  Packet);
 
 NDISAPI
 VOID
 DDKAPI
 NdisFreeBufferPool(
-  IN NDIS_HANDLE  PoolHandle);
+  __W32_IN NDIS_HANDLE  PoolHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisFreePacket(
-  IN PNDIS_PACKET  Packet);
+  __W32_IN PNDIS_PACKET  Packet);
 
 NDISAPI
 VOID
 DDKAPI
 NdisFreePacketPool(
-  IN NDIS_HANDLE  PoolHandle);
+  __W32_IN NDIS_HANDLE  PoolHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisReturnPackets(
-  IN PNDIS_PACKET  *PacketsToReturn,
-  IN UINT  NumberOfPackets);
+  __W32_IN PNDIS_PACKET  *PacketsToReturn,
+  __W32_IN UINT  NumberOfPackets);
 
 NDISAPI
 VOID
 DDKAPI
 NdisUnchainBufferAtBack(
-  IN OUT PNDIS_PACKET  Packet,
-  OUT PNDIS_BUFFER  *Buffer);
+  __W32_IN __W32_OUT PNDIS_PACKET  Packet,
+  __W32_OUT PNDIS_BUFFER  *Buffer);
 
 NDISAPI
 VOID
 DDKAPI
 NdisUnchainBufferAtFront(
-  IN OUT PNDIS_PACKET  Packet,
-  OUT PNDIS_BUFFER  *Buffer);
+  __W32_IN __W32_OUT PNDIS_PACKET  Packet,
+  __W32_OUT PNDIS_BUFFER  *Buffer);
 
 NDISAPI
 VOID
 DDKAPI
 NdisAdjustBufferLength(
-  IN PNDIS_BUFFER  Buffer,
-  IN UINT  Length);
+  __W32_IN PNDIS_BUFFER  Buffer,
+  __W32_IN UINT  Length);
 
 NDISAPI
 ULONG
 DDKAPI
 NdisBufferLength(
-  IN PNDIS_BUFFER  Buffer);
+  __W32_IN PNDIS_BUFFER  Buffer);
 
 NDISAPI
 PVOID
 DDKAPI
 NdisBufferVirtualAddress(
-  IN PNDIS_BUFFER  Buffer);
+  __W32_IN PNDIS_BUFFER  Buffer);
 
 NDISAPI
 ULONG
 DDKAPI
 NDIS_BUFFER_TO_SPAN_PAGES(
-  IN PNDIS_BUFFER  Buffer);
+  __W32_IN PNDIS_BUFFER  Buffer);
 
 NDISAPI
 VOID
 DDKAPI
 NdisFreeBuffer(
-  IN PNDIS_BUFFER  Buffer);
+  __W32_IN PNDIS_BUFFER  Buffer);
 
 NDISAPI
 VOID
 DDKAPI
 NdisGetBufferPhysicalArraySize(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PUINT  ArraySize);
+  __W32_IN PNDIS_BUFFER  Buffer,
+  __W32_OUT PUINT  ArraySize);
 
 NDISAPI
 VOID
 DDKAPI
 NdisGetFirstBufferFromPacket(
-  IN PNDIS_PACKET  _Packet,
-  OUT PNDIS_BUFFER  *_FirstBuffer,
-  OUT PVOID  *_FirstBufferVA,
-  OUT PUINT  _FirstBufferLength,
-  OUT PUINT  _TotalBufferLength);
+  __W32_IN PNDIS_PACKET  _Packet,
+  __W32_OUT PNDIS_BUFFER  *_FirstBuffer,
+  __W32_OUT PVOID  *_FirstBufferVA,
+  __W32_OUT PUINT  _FirstBufferLength,
+  __W32_OUT PUINT  _TotalBufferLength);
 
 NDISAPI
 VOID
 DDKAPI
 NdisQueryBuffer(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PVOID  *VirtualAddress OPTIONAL,
-  OUT PUINT  Length);
+  __W32_IN PNDIS_BUFFER  Buffer,
+  __W32_OUT PVOID  *VirtualAddress __W32_OPTIONAL,
+  __W32_OUT PUINT  Length);
 
 NDISAPI
 VOID
 DDKAPI
 NdisQueryBufferOffset(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PUINT  Offset,
-  OUT PUINT  Length);
+  __W32_IN PNDIS_BUFFER  Buffer,
+  __W32_OUT PUINT  Offset,
+  __W32_OUT PUINT  Length);
 
 NDISAPI
 VOID
 DDKAPI
 NdisFreeBuffer(
-  IN PNDIS_BUFFER  Buffer);
+  __W32_IN PNDIS_BUFFER  Buffer);
 
 
 /*
  * VOID
  * NdisGetBufferPhysicalArraySize(
- *   IN PNDIS_BUFFER  Buffer,
- *   OUT PUINT  ArraySize);
+ *   __W32_IN PNDIS_BUFFER  Buffer,
+ *   __W32_OUT PUINT  ArraySize);
  */
 #define NdisGetBufferPhysicalArraySize(Buffer,        \
                                        ArraySize)     \
@@ -1719,13 +1719,13 @@
 /*
  * VOID
  * NdisGetFirstBufferFromPacket(
- *   IN PNDIS_PACKET  _Packet,
- *   OUT PNDIS_BUFFER  * _FirstBuffer,
- *   OUT PVOID  * _FirstBufferVA,
- *   OUT PUINT  _FirstBufferLength,
- *   OUT PUINT  _TotalBufferLength)
+ *   __W32_IN PNDIS_PACKET  _Packet,
+ *   __W32_OUT PNDIS_BUFFER  * _FirstBuffer,
+ *   __W32_OUT PVOID  * _FirstBufferVA,
+ *   __W32_OUT PUINT  _FirstBufferLength,
+ *   __W32_OUT PUINT  _TotalBufferLength)
  */
-#define	NdisGetFirstBufferFromPacket(_Packet,             \
+#define  NdisGetFirstBufferFromPacket(_Packet,            \
                                      _FirstBuffer,        \
                                      _FirstBufferVA,      \
                                      _FirstBufferLength,  \
@@ -1737,14 +1737,14 @@
   *(_FirstBuffer) = _Buffer;                              \
   if (_Buffer != NULL)                                    \
     {                                                     \
-	    *(_FirstBufferVA)     = MmGetSystemAddressForMdl(_Buffer);  \
-	    *(_FirstBufferLength) = MmGetMdlByteCount(_Buffer);	        \
-	    _Buffer = _Buffer->Next;                                    \
-		  *(_TotalBufferLength) = *(_FirstBufferLength);              \
-		  while (_Buffer != NULL) {                                   \
-		    *(_TotalBufferLength) += MmGetMdlByteCount(_Buffer);      \
-		    _Buffer = _Buffer->Next;                                  \
-		  }                                                           \
+      *(_FirstBufferVA)     = MmGetSystemAddressForMdl(_Buffer);  \
+      *(_FirstBufferLength) = MmGetMdlByteCount(_Buffer);         \
+      _Buffer = _Buffer->Next;                                    \
+      *(_TotalBufferLength) = *(_FirstBufferLength);              \
+      while (_Buffer != NULL) {                                   \
+        *(_TotalBufferLength) += MmGetMdlByteCount(_Buffer);      \
+        _Buffer = _Buffer->Next;                                  \
+      }                                                           \
     }                             \
   else                            \
     {                             \
@@ -1757,27 +1757,27 @@
 /*
  * VOID
  * NdisQueryBuffer(
- *   IN PNDIS_BUFFER  Buffer,
- *   OUT PVOID  *VirtualAddress OPTIONAL,
- *   OUT PUINT  Length)
+ *   __W32_IN PNDIS_BUFFER  Buffer,
+ *   __W32_OUT PVOID  *VirtualAddress __W32_OPTIONAL,
+ *   __W32_OUT PUINT  Length)
  */
 #define NdisQueryBuffer(Buffer,         \
                         VirtualAddress, \
                         Length)         \
 {                                       \
-	if (VirtualAddress)                   \
-		*((PVOID*)VirtualAddress) = MmGetSystemAddressForMdl(Buffer); \
+  if (VirtualAddress)                   \
+    *((PVOID*)VirtualAddress) = MmGetSystemAddressForMdl(Buffer); \
                                         \
-	*((PUINT)Length) = MmGetMdlByteCount(Buffer); \
+  *((PUINT)Length) = MmGetMdlByteCount(Buffer); \
 }
 
 
 /*
  * VOID
  * NdisQueryBufferOffset(
- *   IN PNDIS_BUFFER  Buffer,
- *   OUT PUINT  Offset,
- *   OUT PUINT  Length);
+ *   __W32_IN PNDIS_BUFFER  Buffer,
+ *   __W32_OUT PUINT  Offset,
+ *   __W32_OUT PUINT  Length);
  */
 #define NdisQueryBufferOffset(Buffer,             \
                               Offset,             \
@@ -1791,7 +1791,7 @@
 /*
  * PVOID
  * NDIS_BUFFER_LINKAGE(
- *   IN PNDIS_BUFFER  Buffer);
+ *   __W32_IN PNDIS_BUFFER  Buffer);
  */
 #define NDIS_BUFFER_LINKAGE(Buffer)(Buffer)->Next;
 
@@ -1799,39 +1799,39 @@
 /*
  * VOID
  * NdisChainBufferAtBack(
- *   IN OUT PNDIS_PACKET  Packet,
- *   IN OUT PNDIS_BUFFER  Buffer)
+ *   __W32_IN __W32_OUT PNDIS_PACKET  Packet,
+ *   __W32_IN __W32_OUT PNDIS_BUFFER  Buffer)
  */
 #define NdisChainBufferAtBack(Packet,           \
                               Buffer)           \
 {                                               \
-	PNDIS_BUFFER NdisBuffer = (Buffer);           \
+  PNDIS_BUFFER NdisBuffer = (Buffer);           \
                                                 \
-	while (NdisBuffer->Next != NULL)              \
+  while (NdisBuffer->Next != NULL)              \
    NdisBuffer = NdisBuffer->Next;               \
-	                                              \
-	NdisBuffer->Next = NULL;                      \
-	                                              \
-	if ((Packet)->Private.Head != NULL)           \
+                                                \
+  NdisBuffer->Next = NULL;                      \
+                                                \
+  if ((Packet)->Private.Head != NULL)           \
     (Packet)->Private.Tail->Next = (Buffer);    \
-	else                                          \
+  else                                          \
     (Packet)->Private.Head = (Buffer);          \
-	                                              \
-	(Packet)->Private.Tail = NdisBuffer;          \
-	(Packet)->Private.ValidCounts = FALSE;        \
+                                                \
+  (Packet)->Private.Tail = NdisBuffer;          \
+  (Packet)->Private.ValidCounts = FALSE;        \
 }
 
 
 /*
  * VOID
  * NdisChainBufferAtFront(
- *   IN OUT PNDIS_PACKET  Packet,
- *   IN OUT PNDIS_BUFFER  Buffer)
+ *   __W32_IN __W32_OUT PNDIS_PACKET  Packet,
+ *   __W32_IN __W32_OUT PNDIS_BUFFER  Buffer)
  */
 #define NdisChainBufferAtFront(Packet,        \
                                Buffer)        \
 {                                             \
-	PNDIS_BUFFER _NdisBuffer = (Buffer);        \
+  PNDIS_BUFFER _NdisBuffer = (Buffer);        \
                                               \
   while (_NdisBuffer->Next != NULL)           \
     _NdisBuffer = _NdisBuffer->Next;          \
@@ -1839,17 +1839,17 @@
   if ((Packet)->Private.Head == NULL)         \
     (Packet)->Private.Tail = _NdisBuffer;     \
                                               \
-	_NdisBuffer->Next = (Packet)->Private.Head; \
-	(Packet)->Private.Head = (Buffer);          \
-	(Packet)->Private.ValidCounts = FALSE;      \
+  _NdisBuffer->Next = (Packet)->Private.Head; \
+  (Packet)->Private.Head = (Buffer);          \
+  (Packet)->Private.ValidCounts = FALSE;      \
 }
 
 
 /*
  * VOID
  * NdisGetNextBuffer(
- *   IN PNDIS_BUFFER  CurrentBuffer,
- *   OUT PNDIS_BUFFER  * NextBuffer)
+ *   __W32_IN PNDIS_BUFFER  CurrentBuffer,
+ *   __W32_OUT PNDIS_BUFFER  * NextBuffer)
  */
 #define NdisGetNextBuffer(CurrentBuffer,  \
                           NextBuffer)     \
@@ -1861,7 +1861,7 @@
 /*
  * UINT
  * NdisGetPacketFlags(
- *   IN PNDIS_PACKET  Packet); 
+ *   __W32_IN PNDIS_PACKET  Packet); 
  */
 #define NdisGetPacketFlags(Packet)(Packet)->Private.Flags;
 
@@ -1869,8 +1869,8 @@
 /*
  * VOID
  * NdisClearPacketFlags(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  Flags);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN UINT  Flags);
  */
 #define NdisClearPacketFlags(Packet, Flags) \
   (Packet)->Private.Flags &= ~(Flags)
@@ -1879,9 +1879,9 @@
 /*
  * VOID
  * NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO(
- *   IN PNDIS_PACKET    Packet,
- *   IN PPVOID          pMediaSpecificInfo,
- *   IN PUINT           pSizeMediaSpecificInfo);
+ *   __W32_IN PNDIS_PACKET    Packet,
+ *   __W32_IN PPVOID          pMediaSpecificInfo,
+ *   __W32_IN PUINT           pSizeMediaSpecificInfo);
  */
 #define NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO(_Packet,                                  \
                                             _pMediaSpecificInfo,                      \
@@ -1889,24 +1889,24 @@
 {                                                                                     \
   if (!((_Packet)->Private.NdisPacketFlags & fPACKET_ALLOCATED_BY_NDIS) ||            \
       !((_Packet)->Private.NdisPacketFlags & fPACKET_CONTAINS_MEDIA_SPECIFIC_INFO))   \
-	  {                                                                                 \
-	    *(_pMediaSpecificInfo) = NULL;                                                  \
-	    *(_pSizeMediaSpecificInfo) = 0;                                                 \
-	  }                                                                                 \
+    {                                                                                 \
+      *(_pMediaSpecificInfo) = NULL;                                                  \
+      *(_pSizeMediaSpecificInfo) = 0;                                                 \
+    }                                                                                 \
   else                                                                                \
-	  {                                                                                 \
-	    *(_pMediaSpecificInfo) = ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +           \
+    {                                                                                 \
+      *(_pMediaSpecificInfo) = ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +           \
         (_Packet)->Private.NdisPacketOobOffset))->MediaSpecificInformation;           \
-	    *(_pSizeMediaSpecificInfo) = ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +       \
-	      (_Packet)->Private.NdisPacketOobOffset))->SizeMediaSpecificInfo;              \
-	  }                                                                                 \
+      *(_pSizeMediaSpecificInfo) = ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +       \
+        (_Packet)->Private.NdisPacketOobOffset))->SizeMediaSpecificInfo;              \
+    }                                                                                 \
 }
 
 
 /*
  * ULONG
  * NDIS_GET_PACKET_PROTOCOL_TYPE(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_PACKET_PROTOCOL_TYPE(_Packet) \
   ((_Packet)->Private.Flags & NDIS_PROTOCOL_ID_MASK)
@@ -1914,71 +1914,71 @@
 /*
  * ULONG
  * NDIS_GET_PACKET_HEADER_SIZE(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_PACKET_HEADER_SIZE(_Packet) \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
-	(_Packet)->Private.NdisPacketOobOffset))->HeaderSize
+  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
+  (_Packet)->Private.NdisPacketOobOffset))->HeaderSize
 
 
 /*
  * NDIS_STATUS
  * NDIS_GET_PACKET_STATUS(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_PACKET_STATUS(_Packet) \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
-	(_Packet)->Private.NdisPacketOobOffset))->Status
+  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
+  (_Packet)->Private.NdisPacketOobOffset))->Status
 
 
 /*
  * ULONGLONG
  * NDIS_GET_PACKET_TIME_RECEIVED(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_PACKET_TIME_RECEIVED(_Packet)  \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
-	(_Packet)->Private.NdisPacketOobOffset))->TimeReceived
+  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
+  (_Packet)->Private.NdisPacketOobOffset))->TimeReceived
 
 
 /*
  * ULONGLONG
  * NDIS_GET_PACKET_TIME_SENT(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_PACKET_TIME_SENT(_Packet)      \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
-	(_Packet)->Private.NdisPacketOobOffset))->TimeSent
+  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
+  (_Packet)->Private.NdisPacketOobOffset))->TimeSent
 
 
 /*
  * ULONGLONG
  * NDIS_GET_PACKET_TIME_TO_SEND(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_GET_PACKET_TIME_TO_SEND(_Packet)   \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
-	(_Packet)->Private.NdisPacketOobOffset))->TimeToSend
+  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
+  (_Packet)->Private.NdisPacketOobOffset))->TimeToSend
 
 
 /*
  * PNDIS_PACKET_OOB_DATA
  * NDIS_OOB_DATA_FROM_PACKET(
- *   IN PNDIS_PACKET  Packet);
+ *   __W32_IN PNDIS_PACKET  Packet);
  */
 #define NDIS_OOB_DATA_FROM_PACKET(_Packet)    \
   (PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
   (_Packet)->Private.NdisPacketOobOffset)
 
- 
+
 /*
  * VOID
  * NdisQueryPacket(
- *   IN PNDIS_PACKET  Packet,
- *   OUT PUINT  PhysicalBufferCount  OPTIONAL,
- *   OUT PUINT  BufferCount  OPTIONAL,
- *   OUT PNDIS_BUFFER  *FirstBuffer  OPTIONAL,
- *   OUT PUINT  TotalPacketLength  OPTIONAL);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_OUT PUINT  PhysicalBufferCount  __W32_OPTIONAL,
+ *   __W32_OUT PUINT  BufferCount  __W32_OPTIONAL,
+ *   __W32_OUT PNDIS_BUFFER  *FirstBuffer  __W32_OPTIONAL,
+ *   __W32_OUT PUINT  TotalPacketLength  __W32_OPTIONAL);
  */
 #define NdisQueryPacket(Packet,                                           \
                         PhysicalBufferCount,                              \
@@ -2011,7 +2011,7 @@
       (Packet)->Private.TotalLength   = _TotalPacketLength;               \
       (Packet)->Private.Count         = _Count;                           \
       (Packet)->Private.ValidCounts   = TRUE;                             \
-	}                                                                       \
+  }                                                                       \
                                                                           \
   if (PhysicalBufferCount)                                                \
       *((PUINT)PhysicalBufferCount) = (Packet)->Private.PhysicalCount;    \
@@ -2027,11 +2027,11 @@
 /*
  * VOID
  * NdisQueryPacketLength(
- *   IN PNDIS_PACKET  Packet,
- *   OUT PUINT  PhysicalBufferCount  OPTIONAL,
- *   OUT PUINT  BufferCount  OPTIONAL,
- *   OUT PNDIS_BUFFER  *FirstBuffer  OPTIONAL,
- *   OUT PUINT  TotalPacketLength  OPTIONAL);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_OUT PUINT  PhysicalBufferCount  __W32_OPTIONAL,
+ *   __W32_OUT PUINT  BufferCount  __W32_OPTIONAL,
+ *   __W32_OUT PNDIS_BUFFER  *FirstBuffer  __W32_OPTIONAL,
+ *   __W32_OUT PUINT  TotalPacketLength  __W32_OPTIONAL);
  */
 #define NdisQueryPacketLength(Packet,                                     \
                               TotalPacketLength)                          \
@@ -2070,7 +2070,7 @@
 /*
  * VOID
  * NdisRecalculatePacketCounts(
- *   IN OUT  PNDIS_PACKET  Packet);
+ *   __W32_IN __W32_OUT  PNDIS_PACKET  Packet);
  */
 #define NdisRecalculatePacketCounts(Packet)       \
 {                                                 \
@@ -2090,20 +2090,20 @@
 /*
  * VOID
  * NdisReinitializePacket(
- *   IN OUT  PNDIS_PACKET  Packet);
+ *   __W32_IN __W32_OUT  PNDIS_PACKET  Packet);
  */
 #define NdisReinitializePacketCounts(Packet)    \
 {                                               \
-	(Packet)->Private.Head = (PNDIS_BUFFER)NULL;  \
-	(Packet)->Private.ValidCounts = FALSE;        \
+  (Packet)->Private.Head = (PNDIS_BUFFER)NULL;  \
+  (Packet)->Private.ValidCounts = FALSE;        \
 }
 
 
 /*
  * VOID
  * NdisSetPacketFlags(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  Flags); 
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN UINT  Flags); 
  */
 #define NdisSetPacketFlags(Packet, Flags) \
   (Packet)->Private.Flags |= (Flags);
@@ -2112,8 +2112,8 @@
 /*
  * VOID
  * NDIS_SET_PACKET_HEADER_SIZE(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  HdrSize);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN UINT  HdrSize);
  */
 #define NDIS_SET_PACKET_HEADER_SIZE(_Packet, _HdrSize)              \
   ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                      \
@@ -2123,16 +2123,16 @@
 /*
  * VOID
  * NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO(
- *   IN PNDIS_PACKET  Packet,
- *   IN PVOID  MediaSpecificInfo,
- *   IN UINT  SizeMediaSpecificInfo);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN PVOID  MediaSpecificInfo,
+ *   __W32_IN UINT  SizeMediaSpecificInfo);
  */
 #define NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO(_Packet,                      \
                                             _MediaSpecificInfo,           \
                                             _SizeMediaSpecificInfo)       \
 {                                                                         \
   if ((_Packet)->Private.NdisPacketFlags & fPACKET_ALLOCATED_BY_NDIS)     \
-	  {                                                                     \
+    {                                                                     \
       (_Packet)->Private.NdisPacketFlags |= fPACKET_CONTAINS_MEDIA_SPECIFIC_INFO; \
       ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                        \
         (_Packet)->Private.NdisPacketOobOffset))->MediaSpecificInformation = \
@@ -2140,15 +2140,15 @@
       ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                        \
         (_Packet)->Private.NdisPacketOobOffset))->SizeMediaSpecificInfo = \
           (_SizeMediaSpecificInfo);                                       \
-	  }                                                                     \
+    }                                                                     \
 }
 
 
 /*
  * VOID
  * NDIS_SET_PACKET_STATUS(
- *   IN PNDIS_PACKET    Packet,
- *   IN NDIS_STATUS     Status);
+ *   __W32_IN PNDIS_PACKET    Packet,
+ *   __W32_IN NDIS_STATUS     Status);
  */
 #define NDIS_SET_PACKET_STATUS(_Packet, _Status)  \
   ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +    \
@@ -2158,8 +2158,8 @@
 /*
  * VOID
  * NDIS_SET_PACKET_TIME_RECEIVED(
- *   IN PNDIS_PACKET  Packet,
- *   IN ULONGLONG  TimeReceived);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN ULONGLONG  TimeReceived);
  */
 #define NDIS_SET_PACKET_TIME_RECEIVED(_Packet, _TimeReceived) \
   ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                \
@@ -2169,8 +2169,8 @@
 /*
  * VOID
  * NDIS_SET_PACKET_TIME_SENT(
- *   IN PNDIS_PACKET  Packet,
- *   IN ULONGLONG  TimeSent);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN ULONGLONG  TimeSent);
  */
 #define NDIS_SET_PACKET_TIME_SENT(_Packet, _TimeSent) \
   ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +        \
@@ -2180,8 +2180,8 @@
 /*
  * VOID
  * NDIS_SET_PACKET_TIME_TO_SEND(
- *   IN PNDIS_PACKET  Packet,
- *   IN ULONGLONG  TimeToSend);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN ULONGLONG  TimeToSend);
  */
 #define NDIS_SET_PACKET_TIME_TO_SEND(_Packet, _TimeToSend)  \
   ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +              \
@@ -2191,8 +2191,8 @@
 /*
  * VOID
  * NdisSetSendFlags(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  Flags);
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN UINT  Flags);
  */
 #define NdisSetSendFlags(_Packet,_Flags)(_Packet)->Private.Flags = (_Flags)
 
@@ -2203,9 +2203,9 @@
 /*
  * VOID
  * NdisCreateLookaheadBufferFromSharedMemory(
- *   IN PVOID  pSharedMemory,
- *   IN UINT  LookaheadLength,
- *   OUT PVOID  *pLookaheadBuffer)
+ *   __W32_IN PVOID  pSharedMemory,
+ *   __W32_IN UINT  LookaheadLength,
+ *   __W32_OUT PVOID  *pLookaheadBuffer)
  */
 #define NdisCreateLookaheadBufferFromSharedMemory(_pSharedMemory,     \
                                                   _LookaheadLength,   \
@@ -2215,7 +2215,7 @@
 /*
  * VOID
  * NdisDestroyLookaheadBufferFromSharedMemory(
- *   IN PVOID  pLookaheadBuffer)
+ *   __W32_IN PVOID  pLookaheadBuffer)
  */
 #define NdisDestroyLookaheadBufferFromSharedMemory(_pLookaheadBuffer)
 
@@ -2224,9 +2224,9 @@
 /*
  * VOID
  * NdisMoveFromMappedMemory(
- *   OUT PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
+ *   __W32_OUT PVOID  Destination,
+ *   __W32_IN PVOID  Source,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisMoveFromMappedMemory(Destination, Source, Length) \
   NdisMoveMappedMemory(Destination, Source, Length)
@@ -2234,9 +2234,9 @@
 /*
  * VOID
  * NdisMoveMappedMemory(
- *   OUT PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
+ *   __W32_OUT PVOID  Destination,
+ *   __W32_IN PVOID  Source,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisMoveMappedMemory(Destination, Source, Length) \
   RtlCopyMemory(Destination, Source, Length)
@@ -2244,9 +2244,9 @@
 /*
  * VOID
  * NdisMoveToMappedMemory(
- *   OUT PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
+ *   __W32_OUT PVOID  Destination,
+ *   __W32_IN PVOID  Source,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisMoveToMappedMemory(Destination, Source, Length) \
   NdisMoveMappedMemory(Destination, Source, Length)
@@ -2256,10 +2256,10 @@
 /*
  * VOID
  * NdisMUpdateSharedMemory(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN ULONG  Length,
- *   IN PVOID  VirtualAddress,
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN ULONG  Length,
+ *   __W32_IN PVOID  VirtualAddress,
+ *   __W32_IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
  */
 #define NdisMUpdateSharedMemory(_H, _L, _V, _P) \
   NdisUpdateSharedMemory(_H, _L, _V, _P)
@@ -2268,55 +2268,55 @@
 NDIS_STATUS
 DDKAPI
 NdisAllocateMemory(
-  OUT  PVOID  *VirtualAddress,
-  IN UINT  Length,
-  IN UINT  MemoryFlags,
-  IN NDIS_PHYSICAL_ADDRESS  HighestAcceptableAddress);
+  __W32_OUT  PVOID  *VirtualAddress,
+  __W32_IN UINT  Length,
+  __W32_IN UINT  MemoryFlags,
+  __W32_IN NDIS_PHYSICAL_ADDRESS  HighestAcceptableAddress);
 
 NDISAPI
 VOID
 DDKAPI
 NdisFreeMemory(
-  IN PVOID  VirtualAddress,
-  IN UINT  Length,
-  IN UINT  MemoryFlags);
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN UINT  Length,
+  __W32_IN UINT  MemoryFlags);
 
 NDISAPI
 VOID
 DDKAPI
 NdisImmediateReadSharedMemory(
-  IN NDIS_HANDLE WrapperConfigurationContext,
-  IN ULONG       SharedMemoryAddress,
-  OUT PUCHAR      Buffer,
-  IN ULONG       Length);
+  __W32_IN NDIS_HANDLE WrapperConfigurationContext,
+  __W32_IN ULONG       SharedMemoryAddress,
+  __W32_OUT PUCHAR      Buffer,
+  __W32_IN ULONG       Length);
 
 NDISAPI
 VOID
 DDKAPI
 NdisImmediateWriteSharedMemory(
-  IN NDIS_HANDLE WrapperConfigurationContext,
-  IN ULONG       SharedMemoryAddress,
-  IN PUCHAR      Buffer,
-  IN ULONG       Length);
+  __W32_IN NDIS_HANDLE WrapperConfigurationContext,
+  __W32_IN ULONG       SharedMemoryAddress,
+  __W32_IN PUCHAR      Buffer,
+  __W32_IN ULONG       Length);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMAllocateSharedMemory(
-  IN	NDIS_HANDLE  MiniportAdapterHandle,
-  IN	ULONG  Length,
-  IN	BOOLEAN  Cached,
-  OUT	 PVOID  *VirtualAddress,
-  OUT	 PNDIS_PHYSICAL_ADDRESS  PhysicalAddress);
+  __W32_IN  NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN  ULONG  Length,
+  __W32_IN  BOOLEAN  Cached,
+  __W32_OUT   PVOID  *VirtualAddress,
+  __W32_OUT   PNDIS_PHYSICAL_ADDRESS  PhysicalAddress);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMAllocateSharedMemoryAsync(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN ULONG  Length,
-  IN BOOLEAN  Cached,
-  IN PVOID  Context);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  Cached,
+  __W32_IN PVOID  Context);
 
 #if defined(NDIS50)
 
@@ -2331,17 +2331,17 @@
 VOID
 DDKAPI
 NdisUpdateSharedMemory(
-  IN NDIS_HANDLE             NdisAdapterHandle,
-  IN ULONG                   Length,
-  IN PVOID                   VirtualAddress,
-  IN NDIS_PHYSICAL_ADDRESS   PhysicalAddress);
+  __W32_IN NDIS_HANDLE             NdisAdapterHandle,
+  __W32_IN ULONG                   Length,
+  __W32_IN PVOID                   VirtualAddress,
+  __W32_IN NDIS_PHYSICAL_ADDRESS   PhysicalAddress);
 
 #endif /* defined(NDIS50) */
 
 /*
  * ULONG
  * NdisGetPhysicalAddressHigh(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
+ *   __W32_IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
  */
 #define NdisGetPhysicalAddressHigh(PhysicalAddress) \
   ((PhysicalAddress).HighPart)
@@ -2349,8 +2349,8 @@
 /*
  * VOID
  * NdisSetPhysicalAddressHigh(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
- *   IN ULONG  Value);
+ *   __W32_IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
+ *   __W32_IN ULONG  Value);
  */
 #define NdisSetPhysicalAddressHigh(PhysicalAddress, Value) \
   ((PhysicalAddress).HighPart) = (Value)
@@ -2358,7 +2358,7 @@
 /*
  * ULONG
  * NdisGetPhysicalAddressLow(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
+ *   __W32_IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
  */
 #define NdisGetPhysicalAddressLow(PhysicalAddress) \
   ((PhysicalAddress).LowPart)
@@ -2367,8 +2367,8 @@
 /*
  * VOID
  * NdisSetPhysicalAddressLow(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
- *   IN ULONG  Value);
+ *   __W32_IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
+ *   __W32_IN ULONG  Value);
  */
 #define NdisSetPhysicalAddressLow(PhysicalAddress, Value) \
   ((PhysicalAddress).LowPart) = (Value)
@@ -2376,8 +2376,8 @@
 /*
  * VOID
  * NDIS_PHYSICAL_ADDRESS_CONST(
- *   IN ULONG  Low,
- *   IN LONG  High); 
+ *   __W32_IN ULONG  Low,
+ *   __W32_IN LONG  High); 
  */
 #define NDIS_PHYSICAL_ADDRESS_CONST(Low, High)  \
     { {(ULONG)(Low), (LONG)(High)} }
@@ -2385,9 +2385,9 @@
 /*
  * ULONG
  * NdisEqualMemory(
- *  IN CONST VOID  *Source1,
- *  IN CONST VOID  *Source2,
- *  IN ULONG  Length);
+ *  __W32_IN CONST VOID  *Source1,
+ *  __W32_IN CONST VOID  *Source2,
+ *  __W32_IN ULONG  Length);
  */
 #define NdisEqualMemory(Source1, Source2, Length) \
   RtlEqualMemory(Source1, Source2, Length)
@@ -2395,9 +2395,9 @@
 /*
  * VOID
  * NdisFillMemory(
- *   IN PVOID  Destination,
- *   IN ULONG  Length,
- *   IN UCHAR  Fill);
+ *   __W32_IN PVOID  Destination,
+ *   __W32_IN ULONG  Length,
+ *   __W32_IN UCHAR  Fill);
  */
 #define NdisFillMemory(Destination, Length, Fill) \
   RtlFillMemory(Destination, Length, Fill)
@@ -2405,8 +2405,8 @@
 /*
  * VOID
  * NdisZeroMappedMemory(
- *   IN PVOID  Destination,
- *   IN ULONG  Length);
+ *   __W32_IN PVOID  Destination,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisZeroMappedMemory(Destination, Length) \
   RtlZeroMemory(Destination, Length)
@@ -2414,9 +2414,9 @@
 /*
  * VOID
  * NdisMoveMemory(
- *   OUT  PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
+ *   __W32_OUT  PVOID  Destination,
+ *   __W32_IN PVOID  Source,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisMoveMemory(Destination, Source, Length) \
   RtlCopyMemory(Destination, Source, Length)
@@ -2425,8 +2425,8 @@
 /*
  * VOID
  * NdisRetrieveUlong(
- *   IN PULONG  DestinationAddress,
- *   IN PULONG  SourceAddress);
+ *   __W32_IN PULONG  DestinationAddress,
+ *   __W32_IN PULONG  SourceAddress);
  */
 #define NdisRetrieveUlong(DestinationAddress, SourceAddress) \
   RtlRetrieveUlong(DestinationAddress, SourceAddress)
@@ -2435,8 +2435,8 @@
 /*
  * VOID
  * NdisStoreUlong(
- *   IN PULONG  DestinationAddress,
- *   IN ULONG  Value); 
+ *   __W32_IN PULONG  DestinationAddress,
+ *   __W32_IN ULONG  Value); 
  */
 #define NdisStoreUlong(DestinationAddress, Value) \
   RtlStoreUlong(DestinationAddress, Value)
@@ -2445,8 +2445,8 @@
 /*
  * VOID
  * NdisZeroMemory(
- *   IN PVOID  Destination,
- *   IN ULONG  Length)
+ *   __W32_IN PVOID  Destination,
+ *   __W32_IN ULONG  Length)
  */
 #define NdisZeroMemory(Destination, Length) \
   RtlZeroMemory(Destination, Length)
@@ -2459,57 +2459,57 @@
 VOID
 DDKAPI
 NdisOpenConfiguration(
-  OUT  PNDIS_STATUS  Status,
-  OUT  PNDIS_HANDLE  ConfigurationHandle,
-  IN NDIS_HANDLE  WrapperConfigurationContext);
+  __W32_OUT  PNDIS_STATUS  Status,
+  __W32_OUT  PNDIS_HANDLE  ConfigurationHandle,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext);
 
 NDISAPI
 VOID
 DDKAPI
 NdisReadNetworkAddress(
-  OUT PNDIS_STATUS  Status,
-  OUT PVOID  *NetworkAddress,
-  OUT PUINT  NetworkAddressLength,
-  IN NDIS_HANDLE  ConfigurationHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PVOID  *NetworkAddress,
+  __W32_OUT PUINT  NetworkAddressLength,
+  __W32_IN NDIS_HANDLE  ConfigurationHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisReadEisaSlotInformation(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  OUT PUINT  SlotNumber,
-  OUT PNDIS_EISA_FUNCTION_INFORMATION  EisaData);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext,
+  __W32_OUT PUINT  SlotNumber,
+  __W32_OUT PNDIS_EISA_FUNCTION_INFORMATION  EisaData);
 
 NDISAPI
 VOID
 DDKAPI
 NdisReadEisaSlotInformationEx(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  OUT PUINT  SlotNumber,
-  OUT PNDIS_EISA_FUNCTION_INFORMATION  *EisaData,
-  OUT PUINT  NumberOfFunctions);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext,
+  __W32_OUT PUINT  SlotNumber,
+  __W32_OUT PNDIS_EISA_FUNCTION_INFORMATION  *EisaData,
+  __W32_OUT PUINT  NumberOfFunctions);
 
 NDISAPI
 ULONG
 DDKAPI
 NdisReadPciSlotInformation(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  SlotNumber,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN NDIS_HANDLE  NdisAdapterHandle,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN ULONG  Offset,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 NDISAPI
-ULONG 
+ULONG
 DDKAPI
 NdisWritePciSlotInformation(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  SlotNumber,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN NDIS_HANDLE  NdisAdapterHandle,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN ULONG  Offset,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 
 
@@ -2519,15 +2519,15 @@
 NDIS_STATUS
 DDKAPI
 NdisAnsiStringToUnicodeString(
-  IN OUT PNDIS_STRING  DestinationString,
-  IN PNDIS_ANSI_STRING  SourceString);
+  __W32_IN __W32_OUT PNDIS_STRING  DestinationString,
+  __W32_IN PNDIS_ANSI_STRING  SourceString);
 
 /*
  * BOOLEAN
  * NdisEqualString(
- *   IN PNDIS_STRING  String1,
- *   IN PNDIS_STRING  String2,
- *   IN BOOLEAN  CaseInsensitive);
+ *   __W32_IN PNDIS_STRING  String1,
+ *   __W32_IN PNDIS_STRING  String2,
+ *   __W32_IN BOOLEAN  CaseInsensitive);
  */
 #define NdisEqualString(_String1, _String2, _CaseInsensitive) \
   RtlEqualUnicodeString(_String1, _String2, _CaseInsensitive)
@@ -2536,22 +2536,22 @@
 VOID
 DDKAPI
 NdisInitAnsiString(
-  IN OUT PNDIS_ANSI_STRING  DestinationString,
-  IN PCSTR  SourceString);
+  __W32_IN __W32_OUT PNDIS_ANSI_STRING  DestinationString,
+  __W32_IN PCSTR  SourceString);
 
 NDISAPI
 VOID
 DDKAPI
 NdisInitUnicodeString(
-  IN OUT PNDIS_STRING  DestinationString,
-  IN PCWSTR  SourceString);
+  __W32_IN __W32_OUT PNDIS_STRING  DestinationString,
+  __W32_IN PCWSTR  SourceString);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisUnicodeStringToAnsiString(
-  IN OUT PNDIS_ANSI_STRING  DestinationString,
-  IN PNDIS_STRING  SourceString);
+  __W32_IN __W32_OUT PNDIS_ANSI_STRING  DestinationString,
+  __W32_IN PNDIS_STRING  SourceString);
 
 #define NdisFreeString(_s)  NdisFreeMemory((_s).Buffer, (_s).MaximumLength, 0)
 #define NdisPrintString(_s) DbgPrint("%ls", (_s).Buffer)
@@ -2562,7 +2562,7 @@
 /*
  * VOID
  * NdisAllocateSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisAllocateSpinLock(_SpinLock) \
   KeInitializeSpinLock(&(_SpinLock)->SpinLock)
@@ -2570,14 +2570,14 @@
 /*
  * VOID
  * NdisFreeSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisFreeSpinLock(_SpinLock)
 
 /*
  * VOID
  * NdisAcquireSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisAcquireSpinLock(_SpinLock) \
   KeAcquireSpinLock(&(_SpinLock)->SpinLock, &(_SpinLock)->OldIrql)
@@ -2585,7 +2585,7 @@
 /*
  * VOID
  * NdisReleaseSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisReleaseSpinLock(_SpinLock) \
   KeReleaseSpinLock(&(_SpinLock)->SpinLock, (_SpinLock)->OldIrql)
@@ -2593,7 +2593,7 @@
 /*
  * VOID
  * NdisDprAcquireSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisDprAcquireSpinLock(_SpinLock)                \
 {                                                       \
@@ -2604,7 +2604,7 @@
 /*
  * VOID
  * NdisDprReleaseSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisDprReleaseSpinLock(_SpinLock) \
   KeReleaseSpinLockFromDpcLevel(&(_SpinLock)->SpinLock)
@@ -2616,9 +2616,9 @@
 /*
  * VOID
  * NdisRawReadPortBufferUchar(
- *   IN ULONG  Port,
- *   OUT PUCHAR  Buffer,
- *   IN ULONG  Length);
+ *   __W32_IN ULONG  Port,
+ *   __W32_OUT PUCHAR  Buffer,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisRawReadPortBufferUchar(Port, Buffer, Length)    \
   READ_PORT_BUFFER_UCHAR((PUCHAR)(Port), (PUCHAR)(Buffer), (Length))
@@ -2626,9 +2626,9 @@
 /*
  * VOID
  * NdisRawReadPortBufferUlong(
- *   IN ULONG  Port,
- *   OUT PULONG  Buffer,
- *   IN ULONG  Length);
+ *   __W32_IN ULONG  Port,
+ *   __W32_OUT PULONG  Buffer,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisRawReadPortBufferUlong(Port, Buffer, Length)  \
   READ_PORT_BUFFER_ULONG((PULONG)(Port), (PULONG)(Buffer), (Length))
@@ -2636,9 +2636,9 @@
 /*
  * VOID
  * NdisRawReadPortBufferUshort(
- *   IN ULONG  Port,
- *   OUT PUSHORT  Buffer,
- *   IN ULONG  Length);
+ *   __W32_IN ULONG  Port,
+ *   __W32_OUT PUSHORT  Buffer,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisRawReadPortBufferUshort(Port, Buffer, Length) \
   READ_PORT_BUFFER_USHORT((PUSHORT)(Port), (PUSHORT)(Buffer), (Length))
@@ -2647,8 +2647,8 @@
 /*
  * VOID
  * NdisRawReadPortUchar(
- *   IN ULONG  Port,
- *   OUT PUCHAR  Data);
+ *   __W32_IN ULONG  Port,
+ *   __W32_OUT PUCHAR  Data);
  */
 #define NdisRawReadPortUchar(Port, Data) \
   *(Data) = READ_PORT_UCHAR((PUCHAR)(Port))
@@ -2656,8 +2656,8 @@
 /*
  * VOID
  * NdisRawReadPortUlong(
- *   IN ULONG  Port,
- *   OUT PULONG  Data);
+ *   __W32_IN ULONG  Port,
+ *   __W32_OUT PULONG  Data);
  */
 #define NdisRawReadPortUlong(Port, Data) \
   *(Data) = READ_PORT_ULONG((PULONG)(Port))
@@ -2665,8 +2665,8 @@
 /*
  * VOID
  * NdisRawReadPortUshort(
- *   IN ULONG   Port,
- *   OUT PUSHORT Data);
+ *   __W32_IN ULONG   Port,
+ *   __W32_OUT PUSHORT Data);
  */
 #define NdisRawReadPortUshort(Port, Data) \
   *(Data) = READ_PORT_USHORT((PUSHORT)(Port))
@@ -2675,9 +2675,9 @@
 /*
  * VOID
  * NdisRawWritePortBufferUchar(
- *   IN ULONG  Port,
- *   IN PUCHAR  Buffer,
- *   IN ULONG  Length);
+ *   __W32_IN ULONG  Port,
+ *   __W32_IN PUCHAR  Buffer,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisRawWritePortBufferUchar(Port, Buffer, Length) \
   WRITE_PORT_BUFFER_UCHAR((PUCHAR)(Port), (PUCHAR)(Buffer), (Length))
@@ -2685,9 +2685,9 @@
 /*
  * VOID
  * NdisRawWritePortBufferUlong(
- *   IN ULONG  Port,
- *   IN PULONG  Buffer,
- *   IN ULONG  Length);
+ *   __W32_IN ULONG  Port,
+ *   __W32_IN PULONG  Buffer,
+ *   __W32_IN ULONG  Length);
  */
 #define NdisRawWritePortBufferUlong(Port, Buffer, Length) \
   WRITE_PORT_BUFFER_ULONG((PULONG)(Port), (PULONG)(Buffer), (Length))
@@ -2695,9 +2695,9 @@
 /*
  * VOID
  * NdisRawWritePortBufferUshort(
- *   IN ULONG   Port,
- *   IN PUSHORT Buffer,
- *   IN ULONG   Length);
+ *   __W32_IN ULONG   Port,
+ *   __W32_IN PUSHORT Buffer,
+ *   __W32_IN ULONG   Length);
  */
 #define NdisRawWritePortBufferUshort(Port, Buffer, Length) \
   WRITE_PORT_BUFFER_USHORT((PUSHORT)(Port), (PUSHORT)(Buffer), (Length))
@@ -2706,8 +2706,8 @@
 /*
  * VOID
  * NdisRawWritePortUchar(
- *   IN ULONG  Port,
- *   IN UCHAR  Data);
+ *   __W32_IN ULONG  Port,
+ *   __W32_IN UCHAR  Data);
  */
 #define NdisRawWritePortUchar(Port, Data) \
   WRITE_PORT_UCHAR((PUCHAR)(Port), (UCHAR)(Data))
@@ -2715,8 +2715,8 @@
 /*
  * VOID
  * NdisRawWritePortUlong(
- *   IN ULONG  Port,
- *   IN ULONG  Data);
+ *   __W32_IN ULONG  Port,
+ *   __W32_IN ULONG  Data);
  */
 #define NdisRawWritePortUlong(Port, Data)   \
   WRITE_PORT_ULONG((PULONG)(Port), (ULONG)(Data))
@@ -2724,8 +2724,8 @@
 /*
  * VOID
  * NdisRawWritePortUshort(
- *   IN ULONG  Port,
- *   IN USHORT  Data);
+ *   __W32_IN ULONG  Port,
+ *   __W32_IN USHORT  Data);
  */
 #define NdisRawWritePortUshort(Port, Data) \
   WRITE_PORT_USHORT((PUSHORT)(Port), (USHORT)(Data))
@@ -2734,8 +2734,8 @@
 /*
  * VOID
  * NdisReadRegisterUchar(
- *   IN PUCHAR  Register,
- *   OUT PUCHAR  Data);
+ *   __W32_IN PUCHAR  Register,
+ *   __W32_OUT PUCHAR  Data);
  */
 #define NdisReadRegisterUchar(Register, Data) \
   *(Data) = *(Register)
@@ -2743,8 +2743,8 @@
 /*
  * VOID
  * NdisReadRegisterUlong(
- *   IN PULONG  Register,
- *   OUT PULONG  Data);
+ *   __W32_IN PULONG  Register,
+ *   __W32_OUT PULONG  Data);
  */
 #define NdisReadRegisterUlong(Register, Data)   \
   *(Data) = *(Register)
@@ -2752,8 +2752,8 @@
 /*
  * VOID
  * NdisReadRegisterUshort(
- *   IN PUSHORT  Register,
- *   OUT PUSHORT  Data);
+ *   __W32_IN PUSHORT  Register,
+ *   __W32_OUT PUSHORT  Data);
  */
 #define NdisReadRegisterUshort(Register, Data)  \
     *(Data) = *(Register)
@@ -2761,8 +2761,8 @@
 /*
  * VOID
  * NdisReadRegisterUchar(
- *   IN PUCHAR  Register,
- *   IN UCHAR  Data);
+ *   __W32_IN PUCHAR  Register,
+ *   __W32_IN UCHAR  Data);
  */
 #define NdisWriteRegisterUchar(Register, Data) \
   WRITE_REGISTER_UCHAR((Register), (Data))
@@ -2770,8 +2770,8 @@
 /*
  * VOID
  * NdisReadRegisterUlong(
- *   IN PULONG  Register,
- *   IN ULONG  Data);
+ *   __W32_IN PULONG  Register,
+ *   __W32_IN ULONG  Data);
  */
 #define NdisWriteRegisterUlong(Register, Data) \
   WRITE_REGISTER_ULONG((Register), (Data))
@@ -2779,8 +2779,8 @@
 /*
  * VOID
  * NdisReadRegisterUshort(
- *   IN PUSHORT  Register,
- *   IN USHORT  Data);
+ *   __W32_IN PUSHORT  Register,
+ *   __W32_IN USHORT  Data);
  */
 #define NdisWriteRegisterUshort(Register, Data) \
   WRITE_REGISTER_USHORT((Register), (Data))
@@ -2791,7 +2791,7 @@
 /*
  * VOID
  * NdisInitializeListHead(
- *   IN PLIST_ENTRY  ListHead);
+ *   __W32_IN PLIST_ENTRY  ListHead);
  */
 #define NdisInitializeListHead(_ListHead) \
   InitializeListHead(_ListHead)
@@ -2799,9 +2799,9 @@
 /*
  * PLIST_ENTRY
  * NdisInterlockedInsertHeadList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  ListEntry,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PLIST_ENTRY  ListHead,
+ *   __W32_IN PLIST_ENTRY  ListEntry,
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisInterlockedInsertHeadList(_ListHead, _ListEntry, _SpinLock) \
   ExInterlockedInsertHeadList(_ListHead, _ListEntry, &(_SpinLock)->SpinLock)
@@ -2809,9 +2809,9 @@
 /*
  * PLIST_ENTRY
  * NdisInterlockedInsertTailList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  ListEntry,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PLIST_ENTRY  ListHead,
+ *   __W32_IN PLIST_ENTRY  ListEntry,
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisInterlockedInsertTailList(_ListHead, _ListEntry, _SpinLock) \
   ExInterlockedInsertTailList(_ListHead, _ListEntry, &(_SpinLock)->SpinLock)
@@ -2819,8 +2819,8 @@
 /*
  * PLIST_ENTRY
  * NdisInterlockedRemoveHeadList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PLIST_ENTRY  ListHead,
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
 */
 #define NdisInterlockedRemoveHeadList(_ListHead, _SpinLock) \
   ExInterlockedRemoveHeadList(_ListHead, &(_SpinLock)->SpinLock)
@@ -2828,13 +2828,13 @@
 /*
  * VOID
  * NdisInitializeSListHead(
- *   IN PSLIST_HEADER  SListHead);
+ *   __W32_IN PSLIST_HEADER  SListHead);
  */
 #define NdisInitializeSListHead(SListHead) ExInitializeSListHead(SListHead)
 
 /*
  * USHORT NdisQueryDepthSList(
- *   IN PSLIST_HEADER  SListHead);
+ *   __W32_IN PSLIST_HEADER  SListHead);
  */
 #define NdisQueryDepthSList(SListHead) ExQueryDepthSList(SListHead)
 
@@ -2845,23 +2845,23 @@
 /*
  * LONG
  * NdisInterlockedDecrement(
- *   IN PLONG  Addend);
+ *   __W32_IN PLONG  Addend);
  */
 #define NdisInterlockedDecrement(Addend) InterlockedDecrement(Addend)
 
 /*
  * LONG
  * NdisInterlockedIncrement(
- *   IN PLONG  Addend);
+ *   __W32_IN PLONG  Addend);
  */
 #define NdisInterlockedIncrement(Addend) InterlockedIncrement(Addend)
 
 /*
  * VOID
  * NdisInterlockedAddUlong(
- *   IN PULONG  Addend,
- *   IN ULONG  Increment,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
+ *   __W32_IN PULONG  Addend,
+ *   __W32_IN ULONG  Increment,
+ *   __W32_IN PNDIS_SPIN_LOCK  SpinLock);
  */
 #define NdisInterlockedAddUlong(_Addend, _Increment, _SpinLock) \
   ExInterlockedAddUlong(_Addend, _Increment, &(_SpinLock)->SpinLock)
@@ -2874,47 +2874,47 @@
 VOID
 DDKAPI
 NdisCloseConfiguration(
-  IN NDIS_HANDLE  ConfigurationHandle);
+  __W32_IN NDIS_HANDLE  ConfigurationHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisReadConfiguration(
-  OUT  PNDIS_STATUS  Status,
-  OUT  PNDIS_CONFIGURATION_PARAMETER  *ParameterValue,
-  IN NDIS_HANDLE  ConfigurationHandle,
-  IN PNDIS_STRING  Keyword,
-  IN NDIS_PARAMETER_TYPE  ParameterType);
+  __W32_OUT  PNDIS_STATUS  Status,
+  __W32_OUT  PNDIS_CONFIGURATION_PARAMETER  *ParameterValue,
+  __W32_IN NDIS_HANDLE  ConfigurationHandle,
+  __W32_IN PNDIS_STRING  Keyword,
+  __W32_IN NDIS_PARAMETER_TYPE  ParameterType);
 
 NDISAPI
 VOID
 DDKAPI
 NdisWriteConfiguration(
-  OUT  PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  IN PNDIS_STRING  Keyword,
-  IN PNDIS_CONFIGURATION_PARAMETER  *ParameterValue);
+  __W32_OUT  PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext,
+  __W32_IN PNDIS_STRING  Keyword,
+  __W32_IN PNDIS_CONFIGURATION_PARAMETER  *ParameterValue);
 
 NDISAPI
 VOID
 DDKCDECLAPI
 NdisWriteErrorLogEntry(
-	IN NDIS_HANDLE  NdisAdapterHandle,
-	IN NDIS_ERROR_CODE  ErrorCode,
-	IN ULONG  NumberOfErrorValues,
-	IN ...);
+  __W32_IN NDIS_HANDLE  NdisAdapterHandle,
+  __W32_IN NDIS_ERROR_CODE  ErrorCode,
+  __W32_IN ULONG  NumberOfErrorValues,
+  __W32_IN ...);
 
 /*
  * VOID
  * NdisStallExecution(
- *   IN UINT  MicrosecondsToStall)
+ *   __W32_IN UINT  MicrosecondsToStall)
  */
 #define NdisStallExecution KeStallExecutionProcessor
 
 /*
  * VOID
  * NdisGetCurrentSystemTime(
- *   IN PLARGE_INTEGER  pSystemTime);
+ *   __W32_IN PLARGE_INTEGER  pSystemTime);
  */
 #define NdisGetCurrentSystemTime KeQuerySystemTime
 
@@ -2922,7 +2922,7 @@
 VOID
 DDKAPI
 NdisGetCurrentProcessorCpuUsage(
-  OUT PULONG  pCpuUsage);
+  __W32_OUT PULONG  pCpuUsage);
 
 
 
@@ -2951,45 +2951,45 @@
 VOID
 DDKAPI
 NdisMFreeSharedMemory(
-	IN NDIS_HANDLE  MiniportAdapterHandle,
-	IN ULONG  Length,
-	IN BOOLEAN  Cached,
-	IN PVOID  VirtualAddress,
-	IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  Cached,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMWanIndicateReceive(
-	OUT PNDIS_STATUS  Status,
-	IN NDIS_HANDLE  MiniportAdapterHandle,
-	IN NDIS_HANDLE  NdisLinkContext,
-	IN PUCHAR  PacketBuffer,
-	IN UINT  PacketSize);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_HANDLE  NdisLinkContext,
+  __W32_IN PUCHAR  PacketBuffer,
+  __W32_IN UINT  PacketSize);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMWanIndicateReceiveComplete(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMWanSendComplete(
-	IN NDIS_HANDLE  MiniportAdapterHandle,
-	IN PNDIS_WAN_PACKET  Packet,
-	IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN PNDIS_WAN_PACKET  Packet,
+  __W32_IN NDIS_STATUS  Status);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisPciAssignResources(
-	IN NDIS_HANDLE  NdisMacHandle,
-	IN NDIS_HANDLE  NdisWrapperHandle,
-	IN NDIS_HANDLE  WrapperConfigurationContext,
-	IN ULONG  SlotNumber,
-	OUT PNDIS_RESOURCE_LIST  *AssignedResources);
+  __W32_IN NDIS_HANDLE  NdisMacHandle,
+  __W32_IN NDIS_HANDLE  NdisWrapperHandle,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext,
+  __W32_IN ULONG  SlotNumber,
+  __W32_OUT PNDIS_RESOURCE_LIST  *AssignedResources);
 
 
 /* NDIS 5.0 extensions */
@@ -2998,207 +2998,207 @@
 VOID
 DDKAPI
 NdisAcquireReadWriteLock(
-  IN PNDIS_RW_LOCK  Lock,
-  IN BOOLEAN  fWrite,
-  IN PLOCK_STATE  LockState);
+  __W32_IN PNDIS_RW_LOCK  Lock,
+  __W32_IN BOOLEAN  fWrite,
+  __W32_IN PLOCK_STATE  LockState);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisAllocateMemoryWithTag(
-  OUT PVOID  *VirtualAddress,
-  IN UINT  Length,
-  IN ULONG  Tag);
+  __W32_OUT PVOID  *VirtualAddress,
+  __W32_IN UINT  Length,
+  __W32_IN ULONG  Tag);
 
 NDISAPI
 VOID
 DDKAPI
 NdisAllocatePacketPoolEx(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  PoolHandle,
-  IN UINT  NumberOfDescriptors,
-  IN UINT  NumberOfOverflowDescriptors,
-  IN UINT  ProtocolReservedLength);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_HANDLE  PoolHandle,
+  __W32_IN UINT  NumberOfDescriptors,
+  __W32_IN UINT  NumberOfOverflowDescriptors,
+  __W32_IN UINT  ProtocolReservedLength);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCompletePnPEvent(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PNET_PNP_EVENT  NetPnPEvent);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN PNET_PNP_EVENT  NetPnPEvent);
 
 NDISAPI
 VOID
 DDKAPI
 NdisGetCurrentProcessorCounts(
-  OUT PULONG  pIdleCount,
-  OUT PULONG  pKernelAndUser,
-  OUT PULONG  pIndex);
+  __W32_OUT PULONG  pIdleCount,
+  __W32_OUT PULONG  pKernelAndUser,
+  __W32_OUT PULONG  pIndex);
 
 NDISAPI
 VOID
 DDKAPI
 NdisGetDriverHandle(
-  IN PNDIS_HANDLE  NdisBindingHandle,
-  OUT PNDIS_HANDLE  NdisDriverHandle);
+  __W32_IN PNDIS_HANDLE  NdisBindingHandle,
+  __W32_OUT PNDIS_HANDLE  NdisDriverHandle);
 
 NDISAPI
 PNDIS_PACKET
 DDKAPI
 NdisGetReceivedPacket(
-  IN PNDIS_HANDLE  NdisBindingHandle,
-  IN PNDIS_HANDLE  MacContext);
+  __W32_IN PNDIS_HANDLE  NdisBindingHandle,
+  __W32_IN PNDIS_HANDLE  MacContext);
 
 NDISAPI
 VOID
 DDKAPI
 NdisGetSystemUptime(
-  OUT PULONG  pSystemUpTime);
+  __W32_OUT PULONG  pSystemUpTime);
 
 NDISAPI
 VOID
 DDKAPI
 NdisInitializeReadWriteLock(
-  IN PNDIS_RW_LOCK  Lock);
+  __W32_IN PNDIS_RW_LOCK  Lock);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMDeregisterDevice(
-  IN NDIS_HANDLE  NdisDeviceHandle);
+  __W32_IN NDIS_HANDLE  NdisDeviceHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMGetDeviceProperty(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN OUT PDEVICE_OBJECT  *PhysicalDeviceObject  OPTIONAL,
-  IN OUT PDEVICE_OBJECT  *FunctionalDeviceObject  OPTIONAL,
-  IN OUT PDEVICE_OBJECT  *NextDeviceObject  OPTIONAL,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResources  OPTIONAL,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResourcesTranslated  OPTIONAL);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN __W32_OUT PDEVICE_OBJECT  *PhysicalDeviceObject  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PDEVICE_OBJECT  *FunctionalDeviceObject  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PDEVICE_OBJECT  *NextDeviceObject  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PCM_RESOURCE_LIST  *AllocatedResources  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PCM_RESOURCE_LIST  *AllocatedResourcesTranslated  __W32_OPTIONAL);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMInitializeScatterGatherDma(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN BOOLEAN  Dma64BitAddresses,
-  IN ULONG  MaximumPhysicalMapping);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN BOOLEAN  Dma64BitAddresses,
+  __W32_IN ULONG  MaximumPhysicalMapping);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMPromoteMiniport(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMQueryAdapterInstanceName(
-  OUT PNDIS_STRING  AdapterInstanceName,
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_OUT PNDIS_STRING  AdapterInstanceName,
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMRegisterDevice(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PNDIS_STRING  DeviceName,
-  IN PNDIS_STRING  SymbolicName,
-  IN PDRIVER_DISPATCH  MajorFunctions[],
-  OUT PDEVICE_OBJECT  *pDeviceObject,
-  OUT NDIS_HANDLE  *NdisDeviceHandle);
+  __W32_IN NDIS_HANDLE  NdisWrapperHandle,
+  __W32_IN PNDIS_STRING  DeviceName,
+  __W32_IN PNDIS_STRING  SymbolicName,
+  __W32_IN PDRIVER_DISPATCH  MajorFunctions[],
+  __W32_OUT PDEVICE_OBJECT  *pDeviceObject,
+  __W32_OUT NDIS_HANDLE  *NdisDeviceHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMRegisterUnloadHandler(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PDRIVER_UNLOAD  UnloadHandler);
+  __W32_IN NDIS_HANDLE  NdisWrapperHandle,
+  __W32_IN PDRIVER_UNLOAD  UnloadHandler);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMRemoveMiniport(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMSetMiniportSecondary(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  PrimaryMiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_HANDLE  PrimaryMiniportAdapterHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisOpenConfigurationKeyByIndex(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  ConfigurationHandle,
-  IN ULONG  Index,
-  OUT PNDIS_STRING  KeyName,
-  OUT PNDIS_HANDLE  KeyHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ConfigurationHandle,
+  __W32_IN ULONG  Index,
+  __W32_OUT PNDIS_STRING  KeyName,
+  __W32_OUT PNDIS_HANDLE  KeyHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisOpenConfigurationKeyByName(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  ConfigurationHandle,
-  IN PNDIS_STRING  SubKeyName,
-  OUT PNDIS_HANDLE  SubKeyHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  ConfigurationHandle,
+  __W32_IN PNDIS_STRING  SubKeyName,
+  __W32_OUT PNDIS_HANDLE  SubKeyHandle);
 
 NDISAPI
 UINT
 DDKAPI
 NdisPacketPoolUsage(
-  IN NDIS_HANDLE  PoolHandle);
+  __W32_IN NDIS_HANDLE  PoolHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisQueryAdapterInstanceName(
-  OUT PNDIS_STRING  AdapterInstanceName,
-  IN NDIS_HANDLE  NdisBindingHandle);
+  __W32_OUT PNDIS_STRING  AdapterInstanceName,
+  __W32_IN NDIS_HANDLE  NdisBindingHandle);
 
 NDISAPI
 ULONG
 DDKAPI
 NdisReadPcmciaAttributeMemory(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN NDIS_HANDLE  NdisAdapterHandle,
+  __W32_IN ULONG  Offset,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 NDISAPI
 VOID
 DDKAPI
 NdisReleaseReadWriteLock(
-  IN PNDIS_RW_LOCK  Lock,
-  IN PLOCK_STATE  LockState);
+  __W32_IN PNDIS_RW_LOCK  Lock,
+  __W32_IN PLOCK_STATE  LockState);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisWriteEventLogEntry(
-  IN PVOID  LogHandle,
-  IN NDIS_STATUS  EventCode,
-  IN ULONG  UniqueEventValue,
-  IN USHORT  NumStrings,
-  IN PVOID  StringsList  OPTIONAL,
-  IN ULONG  DataSize,
-  IN PVOID  Data  OPTIONAL);
+  __W32_IN PVOID  LogHandle,
+  __W32_IN NDIS_STATUS  EventCode,
+  __W32_IN ULONG  UniqueEventValue,
+  __W32_IN USHORT  NumStrings,
+  __W32_IN PVOID  StringsList  __W32_OPTIONAL,
+  __W32_IN ULONG  DataSize,
+  __W32_IN PVOID  Data  __W32_OPTIONAL);
 
 NDISAPI
 ULONG
 DDKAPI
 NdisWritePcmciaAttributeMemory(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN NDIS_HANDLE  NdisAdapterHandle,
+  __W32_IN ULONG  Offset,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 
 /* Connectionless services */
@@ -3207,84 +3207,84 @@
 NDIS_STATUS
 DDKAPI
 NdisClAddParty(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN NDIS_HANDLE  ProtocolPartyContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  OUT PNDIS_HANDLE  NdisPartyHandle);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext,
+  __W32_IN __W32_OUT PCO_CALL_PARAMETERS  CallParameters,
+  __W32_OUT PNDIS_HANDLE  NdisPartyHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisClCloseAddressFamily(
-  IN NDIS_HANDLE  NdisAfHandle);
+  __W32_IN NDIS_HANDLE  NdisAfHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisClCloseCall(
-  IN NDIS_HANDLE NdisVcHandle,
-  IN NDIS_HANDLE NdisPartyHandle  OPTIONAL,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
+  __W32_IN NDIS_HANDLE NdisVcHandle,
+  __W32_IN NDIS_HANDLE NdisPartyHandle  __W32_OPTIONAL,
+  __W32_IN PVOID  Buffer  __W32_OPTIONAL,
+  __W32_IN UINT  Size);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisClDeregisterSap(
-  IN NDIS_HANDLE  NdisSapHandle);
+  __W32_IN NDIS_HANDLE  NdisSapHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisClDropParty(
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
+  __W32_IN NDIS_HANDLE  NdisPartyHandle,
+  __W32_IN PVOID  Buffer  __W32_OPTIONAL,
+  __W32_IN UINT  Size);
 
 NDISAPI
 VOID
 DDKAPI
 NdisClIncomingCallComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisClMakeCall(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  IN NDIS_HANDLE  ProtocolPartyContext  OPTIONAL,
-  OUT PNDIS_HANDLE  NdisPartyHandle  OPTIONAL);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN __W32_OUT PCO_CALL_PARAMETERS  CallParameters,
+  __W32_IN NDIS_HANDLE  ProtocolPartyContext  __W32_OPTIONAL,
+  __W32_OUT PNDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL);
 
 NDISAPI
-NDIS_STATUS 
+NDIS_STATUS
 DDKAPI
 NdisClModifyCallQoS(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisClOpenAddressFamily(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PCO_ADDRESS_FAMILY  AddressFamily,
-  IN NDIS_HANDLE  ProtocolAfContext,
-  IN PNDIS_CLIENT_CHARACTERISTICS  ClCharacteristics,
-  IN UINT  SizeOfClCharacteristics,
-  OUT PNDIS_HANDLE  NdisAfHandle);
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN PCO_ADDRESS_FAMILY  AddressFamily,
+  __W32_IN NDIS_HANDLE  ProtocolAfContext,
+  __W32_IN PNDIS_CLIENT_CHARACTERISTICS  ClCharacteristics,
+  __W32_IN UINT  SizeOfClCharacteristics,
+  __W32_OUT PNDIS_HANDLE  NdisAfHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisClRegisterSap(
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  ProtocolSapContext,
-  IN PCO_SAP  Sap,
-  OUT PNDIS_HANDLE  NdisSapHandle);
+  __W32_IN NDIS_HANDLE  NdisAfHandle,
+  __W32_IN NDIS_HANDLE  ProtocolSapContext,
+  __W32_IN PCO_SAP  Sap,
+  __W32_OUT PNDIS_HANDLE  NdisSapHandle);
 
 
 /* Call Manager services */
@@ -3293,181 +3293,181 @@
 NDIS_STATUS
 DDKAPI
 NdisCmActivateVc(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN __W32_OUT PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmAddPartyComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN NDIS_HANDLE  CallMgrPartyContext  OPTIONAL,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle,
+  __W32_IN NDIS_HANDLE  CallMgrPartyContext  __W32_OPTIONAL,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmCloseAddressFamilyComplete(
-  IN NDIS_STATUS Status,
-  IN NDIS_HANDLE NdisAfHandle);
+  __W32_IN NDIS_STATUS Status,
+  __W32_IN NDIS_HANDLE NdisAfHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmCloseCallComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisCmDeactivateVc(
-  IN NDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmDeregisterSapComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisSapHandle);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisSapHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmDispatchCallConnected(
-  IN NDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisCmDispatchIncomingCall(
-  IN NDIS_HANDLE  NdisSapHandle,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  NdisSapHandle,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmDispatchIncomingCallQoSChange(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmDispatchIncomingCloseCall(
-  IN NDIS_STATUS  CloseStatus,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
+  __W32_IN NDIS_STATUS  CloseStatus,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PVOID  Buffer  __W32_OPTIONAL,
+  __W32_IN UINT  Size);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmDispatchIncomingDropParty(
-  IN NDIS_STATUS  DropStatus,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
+  __W32_IN NDIS_STATUS  DropStatus,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle,
+  __W32_IN PVOID  Buffer  __W32_OPTIONAL,
+  __W32_IN UINT  Size);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmDropPartyComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisPartyHandle);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmMakeCallComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN NDIS_HANDLE  CallMgrPartyContext  OPTIONAL,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  CallMgrPartyContext  __W32_OPTIONAL,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmModifyCallQoSComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmOpenAddressFamilyComplete(
-  IN NDIS_STATUS Status,
-  IN NDIS_HANDLE NdisAfHandle,
-  IN NDIS_HANDLE CallMgrAfContext);
+  __W32_IN NDIS_STATUS Status,
+  __W32_IN NDIS_HANDLE NdisAfHandle,
+  __W32_IN NDIS_HANDLE CallMgrAfContext);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisCmRegisterAddressFamily(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PCO_ADDRESS_FAMILY  AddressFamily,
-  IN PNDIS_CALL_MANAGER_CHARACTERISTICS  CmCharacteristics,
-  IN UINT  SizeOfCmCharacteristics);
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN PCO_ADDRESS_FAMILY  AddressFamily,
+  __W32_IN PNDIS_CALL_MANAGER_CHARACTERISTICS  CmCharacteristics,
+  __W32_IN UINT  SizeOfCmCharacteristics);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCmRegisterSapComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisSapHandle,
-  IN NDIS_HANDLE  CallMgrSapContext);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisSapHandle,
+  __W32_IN NDIS_HANDLE  CallMgrSapContext);
 
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMCmActivateVc(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMCmCreateVc(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  MiniportVcContext,
-  OUT  PNDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_HANDLE  NdisAfHandle,
+  __W32_IN NDIS_HANDLE  MiniportVcContext,
+  __W32_OUT  PNDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMCmDeactivateVc(
-  IN NDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMCmDeleteVc(
-  IN NDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMCmRegisterAddressFamily(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PCO_ADDRESS_FAMILY  AddressFamily,
-  IN PNDIS_CALL_MANAGER_CHARACTERISTICS  CmCharacteristics,
-  IN UINT  SizeOfCmCharacteristics);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN PCO_ADDRESS_FAMILY  AddressFamily,
+  __W32_IN PNDIS_CALL_MANAGER_CHARACTERISTICS  CmCharacteristics,
+  __W32_IN UINT  SizeOfCmCharacteristics);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMCmRequest(
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN OUT  PNDIS_REQUEST  NdisRequest);
+  __W32_IN NDIS_HANDLE  NdisAfHandle,
+  __W32_IN NDIS_HANDLE  NdisVcHandle  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL,
+  __W32_IN __W32_OUT  PNDIS_REQUEST  NdisRequest);
 
 
 /* Connection-oriented services */
@@ -3476,99 +3476,99 @@
 NDIS_STATUS
 DDKAPI
 NdisCoCreateVc(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN NDIS_HANDLE  NdisAfHandle  OPTIONAL,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN OUT PNDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN NDIS_HANDLE  NdisAfHandle  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  ProtocolVcContext,
+  __W32_IN __W32_OUT PNDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisCoDeleteVc(
-  IN NDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisCoRequest(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN NDIS_HANDLE  NdisAfHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN OUT  PNDIS_REQUEST  NdisRequest);
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN NDIS_HANDLE  NdisAfHandle  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  NdisVcHandle  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL,
+  __W32_IN __W32_OUT  PNDIS_REQUEST  NdisRequest);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCoRequestComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN PNDIS_REQUEST  NdisRequest);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisAfHandle,
+  __W32_IN NDIS_HANDLE  NdisVcHandle  __W32_OPTIONAL,
+  __W32_IN NDIS_HANDLE  NdisPartyHandle  __W32_OPTIONAL,
+  __W32_IN PNDIS_REQUEST  NdisRequest);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCoSendPackets(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PPNDIS_PACKET  PacketArray,
+  __W32_IN UINT  NumberOfPackets);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMCoActivateVcComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PCO_CALL_PARAMETERS  CallParameters);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMCoDeactivateVcComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisVcHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMCoIndicateReceivePacket(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PPNDIS_PACKET  PacketArray,
+  __W32_IN UINT  NumberOfPackets);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMCoIndicateStatus(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_STATUS  GeneralStatus,
-  IN PVOID  StatusBuffer  OPTIONAL,
-  IN ULONG  StatusBufferSize);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_HANDLE  NdisVcHandle  __W32_OPTIONAL,
+  __W32_IN NDIS_STATUS  GeneralStatus,
+  __W32_IN PVOID  StatusBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  StatusBufferSize);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMCoReceiveComplete(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMCoRequestComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PNDIS_REQUEST  Request);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN PNDIS_REQUEST  Request);
 
 NDISAPI
-VOID 
+VOID
 DDKAPI
 NdisMCoSendComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PNDIS_PACKET  Packet);
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_IN PNDIS_PACKET  Packet);
 
 
 /* NDIS 5.0 extensions for intermediate drivers */
@@ -3577,167 +3577,167 @@
 VOID
 DDKAPI
 NdisIMAssociateMiniport(
-  IN NDIS_HANDLE  DriverHandle,
-  IN NDIS_HANDLE  ProtocolHandle);
+  __W32_IN NDIS_HANDLE  DriverHandle,
+  __W32_IN NDIS_HANDLE  ProtocolHandle);
 
 NDISAPI
-NDIS_STATUS 
+NDIS_STATUS
 DDKAPI
 NdisIMCancelInitializeDeviceInstance(
-  IN NDIS_HANDLE  DriverHandle,
-  IN PNDIS_STRING  DeviceInstance);
+  __W32_IN NDIS_HANDLE  DriverHandle,
+  __W32_IN PNDIS_STRING  DeviceInstance);
 
 NDISAPI
 VOID
 DDKAPI
 NdisIMCopySendCompletePerPacketInfo(
-  IN PNDIS_PACKET  DstPacket,
-  IN PNDIS_PACKET  SrcPacket);
+  __W32_IN PNDIS_PACKET  DstPacket,
+  __W32_IN PNDIS_PACKET  SrcPacket);
 
 NDISAPI
 VOID
 DDKAPI
 NdisIMCopySendPerPacketInfo(
-  IN PNDIS_PACKET  DstPacket,
-  IN PNDIS_PACKET  SrcPacket);
+  __W32_IN PNDIS_PACKET  DstPacket,
+  __W32_IN PNDIS_PACKET  SrcPacket);
 
 NDISAPI
 VOID
 DDKAPI
 NdisIMDeregisterLayeredMiniport(
-  IN NDIS_HANDLE  DriverHandle);
+  __W32_IN NDIS_HANDLE  DriverHandle);
 
 NDISAPI
 NDIS_HANDLE
 DDKAPI
 NdisIMGetBindingContext(
-  IN NDIS_HANDLE  NdisBindingHandle);
+  __W32_IN NDIS_HANDLE  NdisBindingHandle);
 
 NDISAPI
 NDIS_HANDLE
 DDKAPI
 NdisIMGetDeviceContext(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisIMInitializeDeviceInstanceEx(
-  IN NDIS_HANDLE  DriverHandle,
-  IN PNDIS_STRING  DriverInstance,
-  IN NDIS_HANDLE  DeviceContext  OPTIONAL);
+  __W32_IN NDIS_HANDLE  DriverHandle,
+  __W32_IN PNDIS_STRING  DriverInstance,
+  __W32_IN NDIS_HANDLE  DeviceContext  __W32_OPTIONAL);
 
 NDISAPI
 PSINGLE_LIST_ENTRY
 DDKAPI
 NdisInterlockedPopEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSLIST_HEADER  ListHead,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NDISAPI
 PSINGLE_LIST_ENTRY
 DDKAPI
 NdisInterlockedPushEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PSINGLE_LIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSLIST_HEADER  ListHead,
+  __W32_IN PSINGLE_LIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NDISAPI
 VOID
 DDKAPI
 NdisQueryBufferSafe(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PVOID  *VirtualAddress  OPTIONAL,
-  OUT PUINT  Length,
-  IN UINT  Priority);
+  __W32_IN PNDIS_BUFFER  Buffer,
+  __W32_OUT PVOID  *VirtualAddress  __W32_OPTIONAL,
+  __W32_OUT PUINT  Length,
+  __W32_IN UINT  Priority);
 
 
 /* Prototypes for NDIS_MINIPORT_CHARACTERISTICS */
 
 typedef BOOLEAN DDKAPI
 (*W_CHECK_FOR_HANG_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext);
 
 typedef VOID DDKAPI
 (*W_DISABLE_INTERRUPT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext);
 
 typedef VOID DDKAPI
 (*W_ENABLE_INTERRUPT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext);
 
 typedef VOID DDKAPI
 (*W_HALT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext);
 
 typedef VOID DDKAPI
 (*W_HANDLE_INTERRUPT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext);
 
 typedef NDIS_STATUS DDKAPI
 (*W_INITIALIZE_HANDLER)(
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  OUT PUINT  SelectedMediumIndex,
-  IN PNDIS_MEDIUM  MediumArray,
-  IN UINT  MediumArraySize,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  WrapperConfigurationContext);
+  __W32_OUT PNDIS_STATUS  OpenErrorStatus,
+  __W32_OUT PUINT  SelectedMediumIndex,
+  __W32_IN PNDIS_MEDIUM  MediumArray,
+  __W32_IN UINT  MediumArraySize,
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext);
 
 typedef VOID DDKAPI
 (*W_ISR_HANDLER)(
-  OUT PBOOLEAN  InterruptRecognized,
-  OUT PBOOLEAN  QueueMiniportHandleInterrupt,
-  IN	NDIS_HANDLE  MiniportAdapterContext);
+  __W32_OUT PBOOLEAN  InterruptRecognized,
+  __W32_OUT PBOOLEAN  QueueMiniportHandleInterrupt,
+  __W32_IN  NDIS_HANDLE  MiniportAdapterContext);
 
 typedef NDIS_STATUS DDKAPI
 (*W_QUERY_INFORMATION_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_OID  Oid,
-  IN PVOID  InformationBuffer,
-  IN ULONG  InformationBufferLength,
-  OUT PULONG  BytesWritten,
-  OUT PULONG  BytesNeeded);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_OID  Oid,
+  __W32_IN PVOID  InformationBuffer,
+  __W32_IN ULONG  InformationBufferLength,
+  __W32_OUT PULONG  BytesWritten,
+  __W32_OUT PULONG  BytesNeeded);
 
 typedef NDIS_STATUS DDKAPI
 (*W_RECONFIGURE_HANDLER)(
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE	WrapperConfigurationContext);
+  __W32_OUT PNDIS_STATUS  OpenErrorStatus,
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext);
 
 typedef NDIS_STATUS DDKAPI
 (*W_RESET_HANDLER)(
-  OUT PBOOLEAN  AddressingReset,
-  IN NDIS_HANDLE  MiniportAdapterContext);
+  __W32_OUT PBOOLEAN  AddressingReset,
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext);
 
 typedef NDIS_STATUS DDKAPI
 (*W_SEND_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PNDIS_PACKET  Packet,
-  IN UINT  Flags);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN PNDIS_PACKET  Packet,
+  __W32_IN UINT  Flags);
 
 typedef NDIS_STATUS DDKAPI
 (*WM_SEND_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  NdisLinkHandle,
-  IN PNDIS_WAN_PACKET  Packet);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_HANDLE  NdisLinkHandle,
+  __W32_IN PNDIS_WAN_PACKET  Packet);
 
 typedef NDIS_STATUS DDKAPI
 (*W_SET_INFORMATION_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_OID  Oid,
-  IN PVOID  InformationBuffer,
-  IN ULONG  InformationBufferLength,
-  OUT PULONG  BytesRead,
-  OUT PULONG  BytesNeeded);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_OID  Oid,
+  __W32_IN PVOID  InformationBuffer,
+  __W32_IN ULONG  InformationBufferLength,
+  __W32_OUT PULONG  BytesRead,
+  __W32_OUT PULONG  BytesNeeded);
 
 typedef NDIS_STATUS DDKAPI
 (*W_TRANSFER_DATA_HANDLER)(
-  OUT PNDIS_PACKET  Packet,
-  OUT PUINT  BytesTransferred,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  MiniportReceiveContext,
-  IN UINT  ByteOffset,
-  IN UINT  BytesToTransfer);
+  __W32_OUT PNDIS_PACKET  Packet,
+  __W32_OUT PUINT  BytesTransferred,
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_HANDLE  MiniportReceiveContext,
+  __W32_IN UINT  ByteOffset,
+  __W32_IN UINT  BytesToTransfer);
 
 typedef NDIS_STATUS DDKAPI
 (*WM_TRANSFER_DATA_HANDLER)(
@@ -3779,22 +3779,22 @@
 
 typedef VOID DDKAPI
 (*W_SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN PPNDIS_PACKET  PacketArray,
+  __W32_IN UINT  NumberOfPackets);
 
 typedef VOID DDKAPI
 (*W_RETURN_PACKET_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PNDIS_PACKET  Packet);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN PNDIS_PACKET  Packet);
 
 typedef VOID DDKAPI
 (*W_ALLOCATE_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PVOID  VirtualAddress,
-  IN PNDIS_PHYSICAL_ADDRESS  PhysicalAddress,
-  IN ULONG  Length,
-  IN PVOID  Context);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN PNDIS_PHYSICAL_ADDRESS  PhysicalAddress,
+  __W32_IN ULONG  Length,
+  __W32_IN PVOID  Context);
 
 #ifdef __cplusplus
 
@@ -3823,34 +3823,34 @@
 
 typedef NDIS_STATUS DDKAPI
 (*W_CO_CREATE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  NdisVcHandle,
-  OUT PNDIS_HANDLE  MiniportVcContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_HANDLE  NdisVcHandle,
+  __W32_OUT PNDIS_HANDLE  MiniportVcContext);
 
 typedef NDIS_STATUS DDKAPI
 (*W_CO_DELETE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext);
+  __W32_IN NDIS_HANDLE  MiniportVcContext);
 
 typedef NDIS_STATUS DDKAPI
 (*W_CO_ACTIVATE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters);
+  __W32_IN NDIS_HANDLE  MiniportVcContext,
+  __W32_IN __W32_OUT PCO_CALL_PARAMETERS  CallParameters);
 
 typedef NDIS_STATUS DDKAPI
 (*W_CO_DEACTIVATE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext);
+  __W32_IN NDIS_HANDLE  MiniportVcContext);
 
 typedef VOID DDKAPI
 (*W_CO_SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
+  __W32_IN NDIS_HANDLE  MiniportVcContext,
+  __W32_IN PPNDIS_PACKET  PacketArray,
+  __W32_IN UINT  NumberOfPackets);
 
 typedef NDIS_STATUS DDKAPI
 (*W_CO_REQUEST_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  MiniportVcContext  OPTIONAL,
-  IN OUT PNDIS_REQUEST  NdisRequest);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN NDIS_HANDLE  MiniportVcContext  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PNDIS_REQUEST  NdisRequest);
 
 #ifdef __cplusplus
 
@@ -3885,8 +3885,8 @@
 
 typedef VOID DDKAPI
 (*W_CANCEL_SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PVOID  CancelId);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN PVOID  CancelId);
 
 
 #if defined(NDIS51)
@@ -3910,26 +3910,26 @@
 
 typedef NDIS_STATUS DDKAPI
 (*SEND_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle,
-  IN PNDIS_PACKET  Packet);
+  __W32_IN NDIS_HANDLE  MacBindingHandle,
+  __W32_IN PNDIS_PACKET  Packet);
 
 typedef NDIS_STATUS DDKAPI
 (*TRANSFER_DATA_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN UINT  ByteOffset,
-  IN UINT  BytesToTransfer,
-  OUT PNDIS_PACKET  Packet,
-  OUT PUINT  BytesTransferred);
+  __W32_IN NDIS_HANDLE  MacBindingHandle,
+  __W32_IN NDIS_HANDLE  MacReceiveContext,
+  __W32_IN UINT  ByteOffset,
+  __W32_IN UINT  BytesToTransfer,
+  __W32_OUT PNDIS_PACKET  Packet,
+  __W32_OUT PUINT  BytesTransferred);
 
 typedef NDIS_STATUS DDKAPI
 (*RESET_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle);
+  __W32_IN NDIS_HANDLE  MacBindingHandle);
 
 typedef NDIS_STATUS DDKAPI
 (*REQUEST_HANDLER)(
-  IN NDIS_HANDLE   MacBindingHandle,
-  IN PNDIS_REQUEST   NdisRequest);
+  __W32_IN NDIS_HANDLE   MacBindingHandle,
+  __W32_IN PNDIS_REQUEST   NdisRequest);
 
 
 
@@ -3937,22 +3937,22 @@
 
 typedef BOOLEAN DDKAPI
 (*PNDIS_INTERRUPT_SERVICE)(
-  IN PVOID  InterruptContext);
+  __W32_IN PVOID  InterruptContext);
 
 typedef VOID DDKAPI
 (*PNDIS_DEFERRED_PROCESSING)(
-  IN PVOID  SystemSpecific1,
-  IN PVOID  InterruptContext,
-  IN PVOID  SystemSpecific2,
-  IN PVOID  SystemSpecific3);
+  __W32_IN PVOID  SystemSpecific1,
+  __W32_IN PVOID  InterruptContext,
+  __W32_IN PVOID  SystemSpecific2,
+  __W32_IN PVOID  SystemSpecific3);
 
 
 
 typedef struct _NDIS_MINIPORT_BLOCK NDIS_MINIPORT_BLOCK, *PNDIS_MINIPORT_BLOCK;
 typedef struct _NDIS_PROTOCOL_BLOCK NDIS_PROTOCOL_BLOCK, *PNDIS_PROTOCOL_BLOCK;
-typedef struct _NDIS_OPEN_BLOCK		NDIS_OPEN_BLOCK,     *PNDIS_OPEN_BLOCK;
+typedef struct _NDIS_OPEN_BLOCK    NDIS_OPEN_BLOCK,     *PNDIS_OPEN_BLOCK;
 typedef struct _NDIS_M_DRIVER_BLOCK NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK;
-typedef	struct _NDIS_AF_LIST        NDIS_AF_LIST,        *PNDIS_AF_LIST;
+typedef  struct _NDIS_AF_LIST        NDIS_AF_LIST,        *PNDIS_AF_LIST;
 
 
 typedef struct _NDIS_MINIPORT_INTERRUPT {
@@ -3967,7 +3967,7 @@
   BOOLEAN  Filler1;
   KEVENT  DpcsCompletedEvent;
   BOOLEAN  SharedInterrupt;
-  BOOLEAN	 IsrRequested;
+  BOOLEAN   IsrRequested;
 } NDIS_MINIPORT_INTERRUPT, *PNDIS_MINIPORT_INTERRUPT;
 
 typedef struct _NDIS_MINIPORT_TIMER {
@@ -3987,14 +3987,14 @@
   KDPC  InterruptDpc;
   PVOID  InterruptContext;
   UCHAR  DpcCount;
-  BOOLEAN	 Removing;
+  BOOLEAN   Removing;
   KEVENT  DpcsCompletedEvent;
 } NDIS_INTERRUPT, *PNDIS_INTERRUPT;
 
 
 typedef struct _MAP_REGISTER_ENTRY {
-	PVOID  MapRegister;
-	BOOLEAN  WriteToDevice;
+  PVOID  MapRegister;
+  BOOLEAN  WriteToDevice;
 } MAP_REGISTER_ENTRY, *PMAP_REGISTER_ENTRY;
 
 
@@ -4010,19 +4010,19 @@
   NdisMaxWorkItems
 } NDIS_WORK_ITEM_TYPE, *PNDIS_WORK_ITEM_TYPE;
 
-#define	NUMBER_OF_WORK_ITEM_TYPES         NdisMaxWorkItems
-#define	NUMBER_OF_SINGLE_WORK_ITEMS       6
+#define NUMBER_OF_WORK_ITEM_TYPES         NdisMaxWorkItems
+#define NUMBER_OF_SINGLE_WORK_ITEMS       6
 
 typedef struct _NDIS_MINIPORT_WORK_ITEM {
-	SINGLE_LIST_ENTRY  Link;
-	NDIS_WORK_ITEM_TYPE  WorkItemType;
-	PVOID  WorkItemContext;
+  SINGLE_LIST_ENTRY  Link;
+  NDIS_WORK_ITEM_TYPE  WorkItemType;
+  PVOID  WorkItemContext;
 } NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM;
 
 
 typedef struct _NDIS_BIND_PATHS {
-	UINT  Number;
-	NDIS_STRING  Paths[1];
+  UINT  Number;
+  NDIS_STRING  Paths[1];
 } NDIS_BIND_PATHS, *PNDIS_BIND_PATHS;
 
 #define DECLARE_UNKNOWN_STRUCT(BaseName) \
@@ -4065,133 +4065,133 @@
 
 typedef VOID DDKAPI
 (*ETH_RCV_COMPLETE_HANDLER)(
-  IN PETH_FILTER  Filter);
+  __W32_IN PETH_FILTER  Filter);
 
 typedef VOID DDKAPI
 (*ETH_RCV_INDICATE_HANDLER)(
-  IN PETH_FILTER  Filter,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PCHAR  Address,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookaheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
+  __W32_IN PETH_FILTER  Filter,
+  __W32_IN NDIS_HANDLE  MacReceiveContext,
+  __W32_IN PCHAR  Address,
+  __W32_IN PVOID  HeaderBuffer,
+  __W32_IN UINT  HeaderBufferSize,
+  __W32_IN PVOID  LookaheadBuffer,
+  __W32_IN UINT  LookaheadBufferSize,
+  __W32_IN UINT  PacketSize);
 
 typedef VOID DDKAPI
 (*FDDI_RCV_COMPLETE_HANDLER)(
-  IN PFDDI_FILTER  Filter);
+  __W32_IN PFDDI_FILTER  Filter);
 
 typedef VOID DDKAPI
 (*FDDI_RCV_INDICATE_HANDLER)(
-  IN PFDDI_FILTER  Filter,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PCHAR  Address,
-  IN UINT  AddressLength,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookaheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
+  __W32_IN PFDDI_FILTER  Filter,
+  __W32_IN NDIS_HANDLE  MacReceiveContext,
+  __W32_IN PCHAR  Address,
+  __W32_IN UINT  AddressLength,
+  __W32_IN PVOID  HeaderBuffer,
+  __W32_IN UINT  HeaderBufferSize,
+  __W32_IN PVOID  LookaheadBuffer,
+  __W32_IN UINT  LookaheadBufferSize,
+  __W32_IN UINT  PacketSize);
 
 typedef VOID DDKAPI
 (*FILTER_PACKET_INDICATION_HANDLER)(
-  IN NDIS_HANDLE  Miniport,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
+  __W32_IN NDIS_HANDLE  Miniport,
+  __W32_IN PPNDIS_PACKET  PacketArray,
+  __W32_IN UINT  NumberOfPackets);
 
 typedef VOID DDKAPI
 (*TR_RCV_COMPLETE_HANDLER)(
-  IN PTR_FILTER  Filter);
+  __W32_IN PTR_FILTER  Filter);
 
 typedef VOID DDKAPI
 (*TR_RCV_INDICATE_HANDLER)(
-  IN PTR_FILTER  Filter,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookaheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
+  __W32_IN PTR_FILTER  Filter,
+  __W32_IN NDIS_HANDLE  MacReceiveContext,
+  __W32_IN PVOID  HeaderBuffer,
+  __W32_IN UINT  HeaderBufferSize,
+  __W32_IN PVOID  LookaheadBuffer,
+  __W32_IN UINT  LookaheadBufferSize,
+  __W32_IN UINT  PacketSize);
 
 typedef VOID DDKAPI
 (*WAN_RCV_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisLinkContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_HANDLE  NdisLinkContext);
 
 typedef VOID DDKAPI
 (*WAN_RCV_HANDLER)(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisLinkContext,
-  IN PUCHAR  Packet,
-  IN ULONG  PacketSize);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_HANDLE  NdisLinkContext,
+  __W32_IN PUCHAR  Packet,
+  __W32_IN ULONG  PacketSize);
 
 typedef VOID DDKFASTAPI
 (*NDIS_M_DEQUEUE_WORK_ITEM)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport,
-  IN NDIS_WORK_ITEM_TYPE  WorkItemType,
-  OUT PVOID  *WorkItemContext);
+  __W32_IN PNDIS_MINIPORT_BLOCK  Miniport,
+  __W32_IN NDIS_WORK_ITEM_TYPE  WorkItemType,
+  __W32_OUT PVOID  *WorkItemContext);
 
 typedef NDIS_STATUS DDKFASTAPI
 (*NDIS_M_QUEUE_NEW_WORK_ITEM)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport,
-  IN NDIS_WORK_ITEM_TYPE  WorkItemType,
-  IN PVOID  WorkItemContext);
+  __W32_IN PNDIS_MINIPORT_BLOCK  Miniport,
+  __W32_IN NDIS_WORK_ITEM_TYPE  WorkItemType,
+  __W32_IN PVOID  WorkItemContext);
 
 typedef NDIS_STATUS DDKFASTAPI
 (*NDIS_M_QUEUE_WORK_ITEM)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport,
-  IN NDIS_WORK_ITEM_TYPE  WorkItemType,
-  IN PVOID  WorkItemContext);
+  __W32_IN PNDIS_MINIPORT_BLOCK  Miniport,
+  __W32_IN NDIS_WORK_ITEM_TYPE  WorkItemType,
+  __W32_IN PVOID  WorkItemContext);
 
 typedef VOID DDKAPI
 (*NDIS_M_REQ_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_STATUS  Status);
 
 typedef VOID DDKAPI
 (*NDIS_M_RESET_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_STATUS  Status,
-  IN BOOLEAN  AddressingReset);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN BOOLEAN  AddressingReset);
 
 typedef VOID DDKAPI
 (*NDIS_M_SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN PNDIS_PACKET  Packet,
+  __W32_IN NDIS_STATUS  Status);
 
 typedef VOID DDKAPI
 (*NDIS_M_SEND_RESOURCES_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 typedef BOOLEAN DDKFASTAPI
 (*NDIS_M_START_SENDS)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport);
+  __W32_IN PNDIS_MINIPORT_BLOCK  Miniport);
 
 typedef VOID DDKAPI
 (*NDIS_M_STATUS_HANDLER)(
-  IN NDIS_HANDLE  MiniportHandle,
-  IN NDIS_STATUS  GeneralStatus,
-  IN PVOID  StatusBuffer,
-  IN UINT  StatusBufferSize);
+  __W32_IN NDIS_HANDLE  MiniportHandle,
+  __W32_IN NDIS_STATUS  GeneralStatus,
+  __W32_IN PVOID  StatusBuffer,
+  __W32_IN UINT  StatusBufferSize);
 
 typedef VOID DDKAPI
 (*NDIS_M_STS_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 typedef VOID DDKAPI
 (*NDIS_M_TD_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status,
-  IN UINT  BytesTransferred);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN PNDIS_PACKET  Packet,
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN UINT  BytesTransferred);
 
 typedef VOID (DDKAPI *NDIS_WM_SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PVOID  Packet,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN PVOID  Packet,
+  __W32_IN NDIS_STATUS  Status);
 
 
 #if ARCNET
@@ -4394,11 +4394,11 @@
   } DUMMYUNIONNAME2;
   PVOID  SavedSendPacketsHandler;
   PVOID  SavedCancelSendPacketsHandler;
-  W_SEND_PACKETS_HANDLER  WSendPacketsHandler;                
+  W_SEND_PACKETS_HANDLER  WSendPacketsHandler;
   ULONG  MiniportAttributes;
   PDMA_ADAPTER  SavedSystemAdapterObject;
   USHORT  NumOpens;
-  USHORT  CFHangXTicks; 
+  USHORT  CFHangXTicks;
   ULONG  RequestCount;
   ULONG  IndicatedPacketsCount;
   ULONG  PhysicalMediumType;
@@ -4424,16 +4424,16 @@
 /* Handler prototypes for NDIS_OPEN_BLOCK */
 
 typedef NDIS_STATUS (DDKAPI *WAN_SEND_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle,
-  IN NDIS_HANDLE  LinkHandle,
-  IN PVOID  Packet);
+  __W32_IN NDIS_HANDLE  MacBindingHandle,
+  __W32_IN NDIS_HANDLE  LinkHandle,
+  __W32_IN PVOID  Packet);
 
 /* NDIS 4.0 extension */
 
 typedef VOID (DDKAPI *SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN PPNDIS_PACKET  PacketArray,
+  __W32_IN UINT  NumberOfPackets);
 
 
 typedef struct _NDIS_COMMON_OPEN_BLOCK {
@@ -4521,28 +4521,28 @@
 VOID
 DDKAPI
 NdisInitializeWrapper(
-  OUT PNDIS_HANDLE  NdisWrapperHandle,
-  IN PVOID  SystemSpecific1,
-  IN PVOID  SystemSpecific2,
-  IN PVOID  SystemSpecific3);
+  __W32_OUT PNDIS_HANDLE  NdisWrapperHandle,
+  __W32_IN PVOID  SystemSpecific1,
+  __W32_IN PVOID  SystemSpecific2,
+  __W32_IN PVOID  SystemSpecific3);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMAllocateMapRegisters(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  DmaChannel,
-  IN BOOLEAN  Dma32BitAddresses,
-  IN ULONG  PhysicalMapRegistersNeeded,
-  IN ULONG  MaximumPhysicalMapping);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN UINT  DmaChannel,
+  __W32_IN BOOLEAN  Dma32BitAddresses,
+  __W32_IN ULONG  PhysicalMapRegistersNeeded,
+  __W32_IN ULONG  MaximumPhysicalMapping);
 
 /*
  * VOID
  * NdisMArcIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN PUCHAR  HeaderBuffer,
- *   IN PUCHAR  DataBuffer,
- *   IN UINT  Length);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN PUCHAR  HeaderBuffer,
+ *   __W32_IN PUCHAR  DataBuffer,
+ *   __W32_IN UINT  Length);
  */
 #define NdisMArcIndicateReceive(MiniportAdapterHandle, \
                                 HeaderBuffer,          \
@@ -4559,14 +4559,14 @@
 /*
  * VOID
  * NdisMArcIndicateReceiveComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
  */
 #define NdisMArcIndicateReceiveComplete(MiniportAdapterHandle) \
 {                                                              \
     if (((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->EthDB)  \
-	    {                                                        \
-	        NdisMEthIndicateReceiveComplete(_H);                 \
-	    }                                                        \
+      {                                                        \
+          NdisMEthIndicateReceiveComplete(_H);                 \
+      }                                                        \
                                                                \
     ArcFilterDprIndicateReceiveComplete(                       \
       ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->ArcDB);   \
@@ -4576,47 +4576,47 @@
 VOID
 DDKAPI
 NdisMCloseLog(
-  IN NDIS_HANDLE  LogHandle);
+  __W32_IN NDIS_HANDLE  LogHandle);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMCreateLog(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  Size,
-  OUT PNDIS_HANDLE  LogHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN UINT  Size,
+  __W32_OUT PNDIS_HANDLE  LogHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMDeregisterAdapterShutdownHandler(
-  IN NDIS_HANDLE  MiniportHandle);
+  __W32_IN NDIS_HANDLE  MiniportHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMDeregisterInterrupt(
-  IN PNDIS_MINIPORT_INTERRUPT  Interrupt);
+  __W32_IN PNDIS_MINIPORT_INTERRUPT  Interrupt);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMDeregisterIoPortRange(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  InitialPort,
-  IN UINT  NumberOfPorts,
-  IN PVOID  PortOffset);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN UINT  InitialPort,
+  __W32_IN UINT  NumberOfPorts,
+  __W32_IN PVOID  PortOffset);
 
 /*
  * VOID
  * NdisMEthIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_HANDLE  MiniportReceiveContext,
- *   IN PVOID  HeaderBuffer,
- *   IN UINT  HeaderBufferSize,
- *   IN PVOID  LookaheadBuffer,
- *   IN UINT  LookaheadBufferSize,
- *   IN UINT  PacketSize);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN NDIS_HANDLE  MiniportReceiveContext,
+ *   __W32_IN PVOID  HeaderBuffer,
+ *   __W32_IN UINT  HeaderBufferSize,
+ *   __W32_IN PVOID  LookaheadBuffer,
+ *   __W32_IN UINT  LookaheadBufferSize,
+ *   __W32_IN UINT  PacketSize);
  */
 #define NdisMEthIndicateReceive(MiniportAdapterHandle,  \
                                 MiniportReceiveContext, \
@@ -4628,19 +4628,19 @@
 {                                                       \
     (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthRxIndicateHandler)( \
         (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.EthDB), \
-		(MiniportReceiveContext), \
-		(HeaderBuffer),           \
-		(HeaderBuffer),           \
-		(HeaderBufferSize),       \
-		(LookaheadBuffer),        \
-		(LookaheadBufferSize),    \
-		(PacketSize));            \
+    (MiniportReceiveContext), \
+    (HeaderBuffer),           \
+    (HeaderBuffer),           \
+    (HeaderBufferSize),       \
+    (LookaheadBuffer),        \
+    (LookaheadBufferSize),    \
+    (PacketSize));            \
 }
 
 /*
  * VOID
  * NdisMEthIndicateReceiveComplete(
- *   IN NDIS_HANDLE MiniportAdapterHandle);
+ *   __W32_IN NDIS_HANDLE MiniportAdapterHandle);
  */
 #define NdisMEthIndicateReceiveComplete(MiniportAdapterHandle) \
 {                                                              \
@@ -4651,13 +4651,13 @@
 /*
  * VOID
  * NdisMFddiIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_HANDLE  MiniportReceiveContext,
- *   IN PVOID  HeaderBuffer,
- *   IN UINT  HeaderBufferSize,
- *   IN PVOID  LookaheadBuffer,
- *   IN UINT  LookaheadBufferSize,
- *   IN UINT  PacketSize);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN NDIS_HANDLE  MiniportReceiveContext,
+ *   __W32_IN PVOID  HeaderBuffer,
+ *   __W32_IN UINT  HeaderBufferSize,
+ *   __W32_IN PVOID  LookaheadBuffer,
+ *   __W32_IN UINT  LookaheadBufferSize,
+ *   __W32_IN UINT  PacketSize);
  */
 #define NdisMFddiIndicateReceive(MiniportAdapterHandle,  \
                                  MiniportReceiveContext, \
@@ -4673,7 +4673,7 @@
         (PUCHAR)(HeaderBuffer) + 1,            \
         (((*(PUCHAR*)(HeaderBuffer)) & 0x40) ? \
             FDDI_LENGTH_OF_LONG_ADDRESS :      \
-		    FDDI_LENGTH_OF_SHORT_ADDRESS),     \
+        FDDI_LENGTH_OF_SHORT_ADDRESS),     \
         (HeaderBuffer),                        \
         (HeaderBufferSize),                    \
         (LookaheadBuffer),                     \
@@ -4686,7 +4686,7 @@
 /*
  * VOID
  * NdisMFddiIndicateReceiveComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
  */
 #define NdisMFddiIndicateReceiveComplete(MiniportAdapterHandle) \
 {                                                               \
@@ -4698,21 +4698,21 @@
 VOID
 DDKAPI
 NdisMFlushLog(
-  IN NDIS_HANDLE  LogHandle);
+  __W32_IN NDIS_HANDLE  LogHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMFreeMapRegisters(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
 
 /*
  * VOID
  * NdisMIndicateStatus(
- *  IN NDIS_HANDLE  MiniportAdapterHandle,
- *  IN NDIS_STATUS  GeneralStatus,
- *  IN PVOID  StatusBuffer,
- *  IN UINT  StatusBufferSize);
+ *  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *  __W32_IN NDIS_STATUS  GeneralStatus,
+ *  __W32_IN PVOID  StatusBuffer,
+ *  __W32_IN UINT  StatusBufferSize);
  */
 
 #define NdisMIndicateStatus(MiniportAdapterHandle,  \
@@ -4723,7 +4723,7 @@
 /*
  * VOID
  * NdisMIndicateStatusComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
  */
 #define NdisMIndicateStatusComplete(MiniportAdapterHandle) \
   (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->StatusCompleteHandler)( \
@@ -4732,10 +4732,10 @@
 /*
  * VOID
  * NdisMInitializeWrapper(
- *   OUT PNDIS_HANDLE  NdisWrapperHandle,
- *   IN PVOID  SystemSpecific1,
- *   IN PVOID  SystemSpecific2,
- *   IN PVOID  SystemSpecific3);
+ *   __W32_OUT PNDIS_HANDLE  NdisWrapperHandle,
+ *   __W32_IN PVOID  SystemSpecific1,
+ *   __W32_IN PVOID  SystemSpecific2,
+ *   __W32_IN PVOID  SystemSpecific3);
  */
 #define NdisMInitializeWrapper(NdisWrapperHandle, \
                                SystemSpecific1,   \
@@ -4750,16 +4750,16 @@
 NDIS_STATUS
 DDKAPI
 NdisMMapIoSpace(
-  OUT PVOID  *VirtualAddress,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
-  IN UINT  Length);
+  __W32_OUT PVOID  *VirtualAddress,
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
+  __W32_IN UINT  Length);
 
 /*
  * VOID
  * NdisMQueryInformationComplete(
- *  IN NDIS_HANDLE  MiniportAdapterHandle,
- *  IN NDIS_STATUS  Status);
+ *  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *  __W32_IN NDIS_STATUS  Status);
  */
 #define NdisMQueryInformationComplete(MiniportAdapterHandle, Status) \
   (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->QueryCompleteHandler)(MiniportAdapterHandle, Status)
@@ -4768,38 +4768,38 @@
 VOID
 DDKAPI
 NdisMRegisterAdapterShutdownHandler(
-  IN NDIS_HANDLE  MiniportHandle,
-  IN PVOID  ShutdownContext,
-  IN ADAPTER_SHUTDOWN_HANDLER  ShutdownHandler);
+  __W32_IN NDIS_HANDLE  MiniportHandle,
+  __W32_IN PVOID  ShutdownContext,
+  __W32_IN ADAPTER_SHUTDOWN_HANDLER  ShutdownHandler);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMRegisterInterrupt(
-  OUT PNDIS_MINIPORT_INTERRUPT  Interrupt,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  InterruptVector,
-  IN UINT  InterruptLevel,
-  IN BOOLEAN  RequestIsr,
-  IN BOOLEAN  SharedInterrupt,
-  IN NDIS_INTERRUPT_MODE  InterruptMode);
+  __W32_OUT PNDIS_MINIPORT_INTERRUPT  Interrupt,
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN UINT  InterruptVector,
+  __W32_IN UINT  InterruptLevel,
+  __W32_IN BOOLEAN  RequestIsr,
+  __W32_IN BOOLEAN  SharedInterrupt,
+  __W32_IN NDIS_INTERRUPT_MODE  InterruptMode);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMRegisterIoPortRange(
-  OUT PVOID  *PortOffset,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  InitialPort,
-  IN UINT  NumberOfPorts);
+  __W32_OUT PVOID  *PortOffset,
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN UINT  InitialPort,
+  __W32_IN UINT  NumberOfPorts);
 
 NDISAPI
 NDIS_STATUS
 DDKAPI
 NdisMRegisterMiniport(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PNDIS_MINIPORT_CHARACTERISTICS  MiniportCharacteristics,
-  IN UINT  CharacteristicsLength);
+  __W32_IN NDIS_HANDLE  NdisWrapperHandle,
+  __W32_IN PNDIS_MINIPORT_CHARACTERISTICS  MiniportCharacteristics,
+  __W32_IN UINT  CharacteristicsLength);
 
 
 #if !defined(_NDIS_)
@@ -4807,11 +4807,11 @@
 /*
  * VOID
  * NdisMResetComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_STATUS  Status,
- *   IN BOOLEAN  AddressingReset);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN NDIS_STATUS  Status,
+ *   __W32_IN BOOLEAN  AddressingReset);
  */
-#define	NdisMResetComplete(MiniportAdapterHandle, \
+#define  NdisMResetComplete(MiniportAdapterHandle, \
                            Status,                \
                            AddressingReset)       \
 {                                                 \
@@ -4822,11 +4822,11 @@
 /*
  * VOID
  * NdisMSendComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN PNDIS_PACKET  Packet,
- *   IN NDIS_STATUS  Status);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN NDIS_STATUS  Status);
  */
-#define	NdisMSendComplete(MiniportAdapterHandle, \
+#define  NdisMSendComplete(MiniportAdapterHandle, \
                           Packet,                \
                           Status)                \
 {                                                \
@@ -4837,9 +4837,9 @@
 /*
  * VOID
  * NdisMSendResourcesAvailable(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
  */
-#define	NdisMSendResourcesAvailable(MiniportAdapterHandle) \
+#define  NdisMSendResourcesAvailable(MiniportAdapterHandle) \
 {                                                \
     (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->SendResourcesHandler)( \
         MiniportAdapterHandle); \
@@ -4848,12 +4848,12 @@
 /*
  * VOID
  * NdisMTransferDataComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN PNDIS_PACKET  Packet,
- *   IN NDIS_STATUS  Status,
- *   IN UINT  BytesTransferred);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN PNDIS_PACKET  Packet,
+ *   __W32_IN NDIS_STATUS  Status,
+ *   __W32_IN UINT  BytesTransferred);
  */
-#define	NdisMTransferDataComplete(MiniportAdapterHandle, \
+#define  NdisMTransferDataComplete(MiniportAdapterHandle, \
                                   Packet,                \
                                   Status,                \
                                   BytesTransferred)      \
@@ -4868,10 +4868,10 @@
 /*
  * VOID
  * NdisMSetAttributes(
- *  IN NDIS_HANDLE  MiniportAdapterHandle,
- *  IN NDIS_HANDLE  MiniportAdapterContext,
- *  IN BOOLEAN  BusMaster,
- *  IN NDIS_INTERFACE_TYPE  AdapterType);
+ *  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+ *  __W32_IN BOOLEAN  BusMaster,
+ *  __W32_IN NDIS_INTERFACE_TYPE  AdapterType);
  */
 #define NdisMSetAttributes(MiniportAdapterHandle,   \
                            MiniportAdapterContext,  \
@@ -4884,20 +4884,20 @@
     AdapterType)
 
 NDISAPI
-VOID 
+VOID
 DDKAPI
 NdisMSetAttributesEx(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN UINT  CheckForHangTimeInSeconds   OPTIONAL,
-  IN ULONG  AttributeFlags,
-  IN NDIS_INTERFACE_TYPE AdapterType); 
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN UINT  CheckForHangTimeInSeconds   __W32_OPTIONAL,
+  __W32_IN ULONG  AttributeFlags,
+  __W32_IN NDIS_INTERFACE_TYPE AdapterType);
 
 /*
  * VOID
  * NdisMSetInformationComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_STATUS  Status);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN NDIS_STATUS  Status);
  */
 #define NdisMSetInformationComplete(MiniportAdapterHandle, \
                                     Status) \
@@ -4908,26 +4908,26 @@
 VOID
 DDKAPI
 NdisMSleep(
-  IN ULONG  MicrosecondsToSleep);
+  __W32_IN ULONG  MicrosecondsToSleep);
 
 NDISAPI
 BOOLEAN
 DDKAPI
 NdisMSynchronizeWithInterrupt(
-  IN PNDIS_MINIPORT_INTERRUPT  Interrupt,
-  IN PVOID  SynchronizeFunction,
-  IN PVOID  SynchronizeContext);
+  __W32_IN PNDIS_MINIPORT_INTERRUPT  Interrupt,
+  __W32_IN PVOID  SynchronizeFunction,
+  __W32_IN PVOID  SynchronizeContext);
 
 /*
  * VOID
  * NdisMTrIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_HANDLE  MiniportReceiveContext,
- *   IN PVOID  HeaderBuffer,
- *   IN UINT  HeaderBufferSize,
- *   IN PVOID  LookaheadBuffer,
- *   IN UINT  LookaheadBufferSize,
- *   IN UINT  PacketSize);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+ *   __W32_IN NDIS_HANDLE  MiniportReceiveContext,
+ *   __W32_IN PVOID  HeaderBuffer,
+ *   __W32_IN UINT  HeaderBufferSize,
+ *   __W32_IN PVOID  LookaheadBuffer,
+ *   __W32_IN UINT  LookaheadBufferSize,
+ *   __W32_IN UINT  PacketSize);
  */
 #define NdisMTrIndicateReceive(MiniportAdapterHandle,  \
                                MiniportReceiveContext, \
@@ -4939,23 +4939,23 @@
 {                                                      \
     (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxIndicateHandler)( \
       (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.TrDB),     \
-		(MiniportReceiveContext), \
-		(HeaderBuffer),           \
-		(HeaderBuffer),           \
-		(HeaderBufferSize),       \
-		(LookaheadBuffer),        \
-		(LookaheadBufferSize),    \
-		(PacketSize));            \
+    (MiniportReceiveContext), \
+    (HeaderBuffer),           \
+    (HeaderBuffer),           \
+    (HeaderBufferSize),       \
+    (LookaheadBuffer),        \
+    (LookaheadBufferSize),    \
+    (PacketSize));            \
 }
 
 /*
  * VOID
  * NdisMTrIndicateReceiveComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
+ *   __W32_IN NDIS_HANDLE  MiniportAdapterHandle);
  */
 #define NdisMTrIndicateReceiveComplete(MiniportAdapterHandle) \
 {                                                             \
-	(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxCompleteHandler)( \
+  (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxCompleteHandler)( \
     ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FilterDbs.TrDB);    \
 }
 
@@ -4963,41 +4963,41 @@
 NDIS_STATUS
 DDKAPI
 NdisMWriteLogData(
-  IN NDIS_HANDLE  LogHandle,
-  IN PVOID  LogBuffer,
-  IN UINT  LogBufferSize);
+  __W32_IN NDIS_HANDLE  LogHandle,
+  __W32_IN PVOID  LogBuffer,
+  __W32_IN UINT  LogBufferSize);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMQueryAdapterResources(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  OUT PNDIS_RESOURCE_LIST  ResourceList,
-  IN OUT PUINT  BufferSize);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext,
+  __W32_OUT PNDIS_RESOURCE_LIST  ResourceList,
+  __W32_IN __W32_OUT PUINT  BufferSize);
 
 NDISAPI
 VOID
 DDKAPI
 NdisTerminateWrapper(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PVOID  SystemSpecific);
+  __W32_IN NDIS_HANDLE  NdisWrapperHandle,
+  __W32_IN PVOID  SystemSpecific);
 
 NDISAPI
 VOID
 DDKAPI
 NdisMUnmapIoSpace(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PVOID  VirtualAddress,
-  IN UINT  Length);
+  __W32_IN NDIS_HANDLE  MiniportAdapterHandle,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN UINT  Length);
 
 
 
 /* NDIS intermediate miniport structures */
 
 typedef VOID (DDKAPI *W_MINIPORT_CALLBACK)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PVOID  CallbackContext);
+  __W32_IN NDIS_HANDLE  MiniportAdapterContext,
+  __W32_IN PVOID  CallbackContext);
 
 
 
@@ -5007,13 +5007,13 @@
 NDIS_STATUS
 DDKAPI
 NdisIMDeInitializeDeviceInstance(
-  IN NDIS_HANDLE NdisMiniportHandle);
+  __W32_IN NDIS_HANDLE NdisMiniportHandle);
 
 /*
  * NDIS_STATUS
  * NdisIMInitializeDeviceInstance(
- *   IN NDIS_HANDLE  DriverHandle,
- *   IN PNDIS_STRING  DeviceInstance);
+ *   __W32_IN NDIS_HANDLE  DriverHandle,
+ *   __W32_IN PNDIS_STRING  DeviceInstance);
  */
 #define NdisIMInitializeDeviceInstance(DriverHandle, DeviceInstance) \
   NdisIMInitializeDeviceInstanceEx(DriverHandle, DeviceInstance, NULL)
@@ -5022,10 +5022,10 @@
 NDIS_STATUS
 DDKAPI
 NdisIMRegisterLayeredMiniport(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PNDIS_MINIPORT_CHARACTERISTICS  MiniportCharacteristics,
-  IN UINT  CharacteristicsLength,
-  OUT PNDIS_HANDLE  DriverHandle);
+  __W32_IN NDIS_HANDLE  NdisWrapperHandle,
+  __W32_IN PNDIS_MINIPORT_CHARACTERISTICS  MiniportCharacteristics,
+  __W32_IN UINT  CharacteristicsLength,
+  __W32_OUT PNDIS_HANDLE  DriverHandle);
 
 
 /* Functions obsoleted by NDIS 5.0 */
@@ -5034,25 +5034,25 @@
 VOID
 DDKAPI
 NdisFreeDmaChannel(
-  IN PNDIS_HANDLE  NdisDmaHandle);
+  __W32_IN PNDIS_HANDLE  NdisDmaHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisSetupDmaTransfer(
-  OUT PNDIS_STATUS  Status,
-  IN PNDIS_HANDLE  NdisDmaHandle,
-  IN PNDIS_BUFFER  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length,
-  IN BOOLEAN  WriteToDevice);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN PNDIS_HANDLE  NdisDmaHandle,
+  __W32_IN PNDIS_BUFFER  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 NDISAPI
 NTSTATUS
 DDKAPI
 NdisUpcaseUnicodeString(
-  OUT PUNICODE_STRING  DestinationString,  
-  IN PUNICODE_STRING  SourceString);
+  __W32_OUT PUNICODE_STRING  DestinationString,
+  __W32_IN PUNICODE_STRING  SourceString);
 
 
 /* Routines for NDIS protocol drivers */
@@ -5061,142 +5061,142 @@
 VOID
 DDKAPI
 NdisRequest(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PNDIS_REQUEST  NdisRequest);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN PNDIS_REQUEST  NdisRequest);
 
 NDISAPI
 VOID
 DDKAPI
 NdisReset(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisBindingHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisSend(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PNDIS_PACKET  Packet);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN PNDIS_PACKET  Packet);
 
 NDISAPI
 VOID
 DDKAPI
 NdisSendPackets(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN PPNDIS_PACKET  PacketArray,
+  __W32_IN UINT  NumberOfPackets);
 
 NDISAPI
 VOID
 DDKAPI
 NdisTransferData(
-  OUT PNDIS_STATUS        Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN UINT  ByteOffset,
-  IN UINT  BytesToTransfer,
-  IN OUT PNDIS_PACKET  Packet,
-  OUT PUINT  BytesTransferred);
+  __W32_OUT PNDIS_STATUS        Status,
+  __W32_IN NDIS_HANDLE  NdisBindingHandle,
+  __W32_IN NDIS_HANDLE  MacReceiveContext,
+  __W32_IN UINT  ByteOffset,
+  __W32_IN UINT  BytesToTransfer,
+  __W32_IN __W32_OUT PNDIS_PACKET  Packet,
+  __W32_OUT PUINT  BytesTransferred);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCloseAdapter(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisBindingHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCompleteBindAdapter(
-  IN NDIS_HANDLE  BindAdapterContext,
-  IN NDIS_STATUS  Status,
-  IN NDIS_STATUS  OpenStatus);
+  __W32_IN NDIS_HANDLE  BindAdapterContext,
+  __W32_IN NDIS_STATUS  Status,
+  __W32_IN NDIS_STATUS  OpenStatus);
 
 NDISAPI
 VOID
 DDKAPI
 NdisCompleteUnbindAdapter(
-  IN NDIS_HANDLE  UnbindAdapterContext,
-  IN NDIS_STATUS  Status);
+  __W32_IN NDIS_HANDLE  UnbindAdapterContext,
+  __W32_IN NDIS_STATUS  Status);
 
 NDISAPI
 VOID
 DDKAPI
 NdisDeregisterProtocol(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisProtocolHandle);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_IN NDIS_HANDLE  NdisProtocolHandle);
 
 NDISAPI
 VOID
 DDKAPI
 NdisOpenAdapter(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  OUT PNDIS_HANDLE  NdisBindingHandle,
-  OUT PUINT  SelectedMediumIndex,
-  IN PNDIS_MEDIUM  MediumArray,
-  IN UINT  MediumArraySize,
-  IN NDIS_HANDLE  NdisProtocolHandle,
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_STRING  AdapterName,
-  IN UINT  OpenOptions,
-  IN PSTRING  AddressingInformation);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_STATUS  OpenErrorStatus,
+  __W32_OUT PNDIS_HANDLE  NdisBindingHandle,
+  __W32_OUT PUINT  SelectedMediumIndex,
+  __W32_IN PNDIS_MEDIUM  MediumArray,
+  __W32_IN UINT  MediumArraySize,
+  __W32_IN NDIS_HANDLE  NdisProtocolHandle,
+  __W32_IN NDIS_HANDLE  ProtocolBindingContext,
+  __W32_IN PNDIS_STRING  AdapterName,
+  __W32_IN UINT  OpenOptions,
+  __W32_IN PSTRING  AddressingInformation);
 
 NDISAPI
 VOID
 DDKAPI
 NdisOpenProtocolConfiguration(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  ConfigurationHandle,
-  IN PNDIS_STRING  ProtocolSection);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_HANDLE  ConfigurationHandle,
+  __W32_IN PNDIS_STRING  ProtocolSection);
 
 NDISAPI
 VOID
 DDKAPI
 NdisRegisterProtocol(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  NdisProtocolHandle,
-  IN PNDIS_PROTOCOL_CHARACTERISTICS  ProtocolCharacteristics,
-  IN UINT  CharacteristicsLength);
+  __W32_OUT PNDIS_STATUS  Status,
+  __W32_OUT PNDIS_HANDLE  NdisProtocolHandle,
+  __W32_IN PNDIS_PROTOCOL_CHARACTERISTICS  ProtocolCharacteristics,
+  __W32_IN UINT  CharacteristicsLength);
 
 /* Obsoleted in Windows XP */
 
 /* Prototypes for NDIS_MAC_CHARACTERISTICS */
 
 typedef NDIS_STATUS (*OPEN_ADAPTER_HANDLER)(
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  OUT NDIS_HANDLE  *MacBindingHandle,
-  OUT PUINT  SelectedMediumIndex,
-  IN PNDIS_MEDIUM  MediumArray,
-  IN UINT  MediumArraySize,
-  IN NDIS_HANDLE  NdisBindingContext,
-  IN NDIS_HANDLE  MacAdapterContext,
-  IN UINT  OpenOptions,
-  IN PSTRING  AddressingInformation  OPTIONAL);
+  __W32_OUT PNDIS_STATUS  OpenErrorStatus,
+  __W32_OUT NDIS_HANDLE  *MacBindingHandle,
+  __W32_OUT PUINT  SelectedMediumIndex,
+  __W32_IN PNDIS_MEDIUM  MediumArray,
+  __W32_IN UINT  MediumArraySize,
+  __W32_IN NDIS_HANDLE  NdisBindingContext,
+  __W32_IN NDIS_HANDLE  MacAdapterContext,
+  __W32_IN UINT  OpenOptions,
+  __W32_IN PSTRING  AddressingInformation  __W32_OPTIONAL);
 
 typedef NDIS_STATUS (DDKAPI *CLOSE_ADAPTER_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle);
+  __W32_IN NDIS_HANDLE  MacBindingHandle);
 
 typedef NDIS_STATUS (DDKAPI *WAN_TRANSFER_DATA_HANDLER)(
   VOID);
 
 typedef NDIS_STATUS (DDKAPI *QUERY_GLOBAL_STATISTICS_HANDLER)(
-  IN NDIS_HANDLE  MacAdapterContext,
-  IN PNDIS_REQUEST  NdisRequest);
+  __W32_IN NDIS_HANDLE  MacAdapterContext,
+  __W32_IN PNDIS_REQUEST  NdisRequest);
 
 typedef VOID (DDKAPI *UNLOAD_MAC_HANDLER)(
-  IN NDIS_HANDLE  MacMacContext);
+  __W32_IN NDIS_HANDLE  MacMacContext);
 
 typedef NDIS_STATUS (DDKAPI *ADD_ADAPTER_HANDLER)(
-  IN NDIS_HANDLE  MacMacContext,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  IN PNDIS_STRING  AdapterName);
+  __W32_IN NDIS_HANDLE  MacMacContext,
+  __W32_IN NDIS_HANDLE  WrapperConfigurationContext,
+  __W32_IN PNDIS_STRING  AdapterName);
 
 typedef VOID (*REMOVE_ADAPTER_HANDLER)(
-  IN NDIS_HANDLE  MacAdapterContext);
+  __W32_IN NDIS_HANDLE  MacAdapterContext);
 
 typedef struct _NDIS_MAC_CHARACTERISTICS {
   UCHAR  MajorNdisVersion;
@@ -5215,8 +5215,8 @@
   NDIS_STRING  Name;
 } NDIS_MAC_CHARACTERISTICS, *PNDIS_MAC_CHARACTERISTICS;
 
-typedef	NDIS_MAC_CHARACTERISTICS        NDIS_WAN_MAC_CHARACTERISTICS;
-typedef	NDIS_WAN_MAC_CHARACTERISTICS    *PNDIS_WAN_MAC_CHARACTERISTICS;
+typedef NDIS_MAC_CHARACTERISTICS        NDIS_WAN_MAC_CHARACTERISTICS;
+typedef NDIS_WAN_MAC_CHARACTERISTICS    *PNDIS_WAN_MAC_CHARACTERISTICS;
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/ndistapi.h w32api-3.6/include/ddk/ndistapi.h
--- w32api-3.6.orig/include/ddk/ndistapi.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/ndistapi.h	2006-02-06 16:41:14.000000000 +1030
@@ -85,7 +85,7 @@
 #define NDIS_STATUS_TAPI_DISCONNECTMODE_CONGESTION    ((NDIS_STATUS)0xC0012029L)
 #define NDIS_STATUS_TAPI_DISCONNECTMODE_INCOMPATIBLE  ((NDIS_STATUS)0xC001202AL)
 #define NDIS_STATUS_TAPI_DISCONNECTMODE_UNAVAIL       ((NDIS_STATUS)0xC001202BL)
-#define NDIS_STATUS_TAPI_RECV_DIGIT					          ((NDIS_STATUS)0x40010020L)
+#define NDIS_STATUS_TAPI_RECV_DIGIT                    ((NDIS_STATUS)0x40010020L)
 
 #define LINE_ADDRESSSTATE                 0L
 #define LINE_CALLINFO                     1L
@@ -603,240 +603,240 @@
 #define LINETRANSLATERESULT_VOICEDETECT   0x00000400
 #endif
 
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)                                           
+#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
 #define LINETRANSLATERESULT_NOTRANSLATION 0x00000800
-#endif              
+#endif
 
 
 typedef struct  _NDIS_VAR_DATA_DESC {
-	USHORT  Length;
-	USHORT  MaximumLength;
-	LONG  Offset;
+  USHORT  Length;
+  USHORT  MaximumLength;
+  LONG  Offset;
 } NDIS_VAR_DATA_DESC, *PNDIS_VAR_DATA_DESC;
 
 typedef struct _LINE_DIAL_PARAMS {
-	ULONG  ulDialPause;
-	ULONG  ulDialSpeed;
-	ULONG  ulDigitDuration;
-	ULONG  ulWaitForDialtone;
+  ULONG  ulDialPause;
+  ULONG  ulDialSpeed;
+  ULONG  ulDigitDuration;
+  ULONG  ulWaitForDialtone;
 } LINE_DIAL_PARAMS, *PLINE_DIAL_PARAMS;
 
 typedef struct _LINE_ADDRESS_CAPS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulLineDeviceID;
-	ULONG  ulAddressSize;
-	ULONG  ulAddressOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-	ULONG  ulAddressSharing;
-	ULONG  ulAddressStates;
-	ULONG  ulCallInfoStates;
-	ULONG  ulCallerIDFlags;
-	ULONG  ulCalledIDFlags;
-	ULONG  ulConnectedIDFlags;
-	ULONG  ulRedirectionIDFlags;
-	ULONG  ulRedirectingIDFlags;
-	ULONG  ulCallStates;
-	ULONG  ulDialToneModes;
-	ULONG  ulBusyModes;
-	ULONG  ulSpecialInfo;
-	ULONG  ulDisconnectModes;
-	ULONG  ulMaxNumActiveCalls;
-	ULONG  ulMaxNumOnHoldCalls;
-	ULONG  ulMaxNumOnHoldPendingCalls;
-	ULONG  ulMaxNumConference;
-	ULONG  ulMaxNumTransConf;
-	ULONG  ulAddrCapFlags;
-	ULONG  ulCallFeatures;
-	ULONG  ulRemoveFromConfCaps;
-	ULONG  ulRemoveFromConfState;
-	ULONG  ulTransferModes;
-	ULONG  ulParkModes;
-	ULONG  ulForwardModes;
-	ULONG  ulMaxForwardEntries;
-	ULONG  ulMaxSpecificEntries;
-	ULONG  ulMinFwdNumRings;
-	ULONG  ulMaxFwdNumRings;
-	ULONG  ulMaxCallCompletions;
-	ULONG  ulCallCompletionConds;
-	ULONG  ulCallCompletionModes;
-	ULONG  ulNumCompletionMessages;
-	ULONG  ulCompletionMsgTextEntrySize;
-	ULONG  ulCompletionMsgTextSize;
-	ULONG  ulCompletionMsgTextOffset;
+  ULONG  ulTotalSize;
+  ULONG  ulNeededSize;
+  ULONG  ulUsedSize;
+  ULONG  ulLineDeviceID;
+  ULONG  ulAddressSize;
+  ULONG  ulAddressOffset;
+  ULONG  ulDevSpecificSize;
+  ULONG  ulDevSpecificOffset;
+  ULONG  ulAddressSharing;
+  ULONG  ulAddressStates;
+  ULONG  ulCallInfoStates;
+  ULONG  ulCallerIDFlags;
+  ULONG  ulCalledIDFlags;
+  ULONG  ulConnectedIDFlags;
+  ULONG  ulRedirectionIDFlags;
+  ULONG  ulRedirectingIDFlags;
+  ULONG  ulCallStates;
+  ULONG  ulDialToneModes;
+  ULONG  ulBusyModes;
+  ULONG  ulSpecialInfo;
+  ULONG  ulDisconnectModes;
+  ULONG  ulMaxNumActiveCalls;
+  ULONG  ulMaxNumOnHoldCalls;
+  ULONG  ulMaxNumOnHoldPendingCalls;
+  ULONG  ulMaxNumConference;
+  ULONG  ulMaxNumTransConf;
+  ULONG  ulAddrCapFlags;
+  ULONG  ulCallFeatures;
+  ULONG  ulRemoveFromConfCaps;
+  ULONG  ulRemoveFromConfState;
+  ULONG  ulTransferModes;
+  ULONG  ulParkModes;
+  ULONG  ulForwardModes;
+  ULONG  ulMaxForwardEntries;
+  ULONG  ulMaxSpecificEntries;
+  ULONG  ulMinFwdNumRings;
+  ULONG  ulMaxFwdNumRings;
+  ULONG  ulMaxCallCompletions;
+  ULONG  ulCallCompletionConds;
+  ULONG  ulCallCompletionModes;
+  ULONG  ulNumCompletionMessages;
+  ULONG  ulCompletionMsgTextEntrySize;
+  ULONG  ulCompletionMsgTextSize;
+  ULONG  ulCompletionMsgTextOffset;
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00010004)
-	ULONG  ulAddressFeatures;
+  ULONG  ulAddressFeatures;
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulPredictiveAutoTransferStates;
-	ULONG  ulNumCallTreatments;
-	ULONG  ulCallTreatmentListSize;
-	ULONG  ulCallTreatmentListOffset;
-	ULONG  ulDeviceClassesSize;
-	ULONG  ulDeviceClassesOffset;
-	ULONG  ulMaxCallDataSize;
-	ULONG  ulCallFeatures2;
-	ULONG  ulMaxNoAnswerTimeout;
-	ULONG  ulConnectedModes;
-	ULONG  ulOfferingModes;
-	ULONG  ulAvailableMediaModes;
+  ULONG  ulPredictiveAutoTransferStates;
+  ULONG  ulNumCallTreatments;
+  ULONG  ulCallTreatmentListSize;
+  ULONG  ulCallTreatmentListOffset;
+  ULONG  ulDeviceClassesSize;
+  ULONG  ulDeviceClassesOffset;
+  ULONG  ulMaxCallDataSize;
+  ULONG  ulCallFeatures2;
+  ULONG  ulMaxNoAnswerTimeout;
+  ULONG  ulConnectedModes;
+  ULONG  ulOfferingModes;
+  ULONG  ulAvailableMediaModes;
 #endif
 #endif
 } LINE_ADDRESS_CAPS, *PLINE_ADDRESS_CAPS;
 
 typedef struct _LINE_ADDRESS_STATUS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulNumInUse;
-	ULONG  ulNumActiveCalls;
-	ULONG  ulNumOnHoldCalls;
-	ULONG  ulNumOnHoldPendCalls;
-	ULONG  ulAddressFeatures;
-	ULONG  ulNumRingsNoAnswer;
-	ULONG  ulForwardNumEntries;
-	ULONG  ulForwardSize;
-	ULONG  ulForwardOffset;
-	ULONG  ulTerminalModesSize;
-	ULONG  ulTerminalModesOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
+  ULONG  ulTotalSize;
+  ULONG  ulNeededSize;
+  ULONG  ulUsedSize;
+  ULONG  ulNumInUse;
+  ULONG  ulNumActiveCalls;
+  ULONG  ulNumOnHoldCalls;
+  ULONG  ulNumOnHoldPendCalls;
+  ULONG  ulAddressFeatures;
+  ULONG  ulNumRingsNoAnswer;
+  ULONG  ulForwardNumEntries;
+  ULONG  ulForwardSize;
+  ULONG  ulForwardOffset;
+  ULONG  ulTerminalModesSize;
+  ULONG  ulTerminalModesOffset;
+  ULONG  ulDevSpecificSize;
+  ULONG  ulDevSpecificOffset;
 } LINE_ADDRESS_STATUS, *PLINE_ADDRESS_STATUS;
 
 typedef struct _LINE_CALL_INFO {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  hLine;
-	ULONG  ulLineDeviceID;
-	ULONG  ulAddressID;
-	ULONG  ulBearerMode;
-	ULONG  ulRate;
-	ULONG  ulMediaMode;
-	ULONG  ulAppSpecific;
-	ULONG  ulCallID;
-	ULONG  ulRelatedCallID;
-	ULONG  ulCallParamFlags;
-	ULONG  ulCallStates;
-	ULONG  ulMonitorDigitModes;
-	ULONG  ulMonitorMediaModes;
-	LINE_DIAL_PARAMS  DialParams;
-	ULONG  ulOrigin;
-	ULONG  ulReason;
-	ULONG  ulCompletionID;
-	ULONG  ulNumOwners;
-	ULONG  ulNumMonitors;
-	ULONG  ulCountryCode;
-	ULONG  ulTrunk;
-	ULONG  ulCallerIDFlags;
-	ULONG  ulCallerIDSize;
-	ULONG  ulCallerIDOffset;
-	ULONG  ulCallerIDNameSize;
-	ULONG  ulCallerIDNameOffset;
-	ULONG  ulCalledIDFlags;
-	ULONG  ulCalledIDSize;
-	ULONG  ulCalledIDOffset;
-	ULONG  ulCalledIDNameSize;
-	ULONG  ulCalledIDNameOffset;
-	ULONG  ulConnectedIDFlags;
-	ULONG  ulConnectedIDSize;
-	ULONG  ulConnectedIDOffset;
-	ULONG  ulConnectedIDNameSize;
-	ULONG  ulConnectedIDNameOffset;
-	ULONG  ulRedirectionIDFlags;
-	ULONG  ulRedirectionIDSize;
-	ULONG  ulRedirectionIDOffset;
-	ULONG  ulRedirectionIDNameSize;
-	ULONG  ulRedirectionIDNameOffset;
-	ULONG  ulRedirectingIDFlags;
-	ULONG  ulRedirectingIDSize;
-	ULONG  ulRedirectingIDOffset;
-	ULONG  ulRedirectingIDNameSize;
-	ULONG  ulRedirectingIDNameOffset;
-	ULONG  ulAppNameSize;
-	ULONG  ulAppNameOffset;
-	ULONG  ulDisplayableAddressSize;
-	ULONG  ulDisplayableAddressOffset;
-	ULONG  ulCalledPartySize;
-	ULONG  ulCalledPartyOffset;
-	ULONG  ulCommentSize;
-	ULONG  ulCommentOffset;
-	ULONG  ulDisplaySize;
-	ULONG  ulDisplayOffset;
-	ULONG  ulUserUserInfoSize;
-	ULONG  ulUserUserInfoOffset;
-	ULONG  ulHighLevelCompSize;
-	ULONG  ulHighLevelCompOffset;
-	ULONG  ulLowLevelCompSize;
-	ULONG  ulLowLevelCompOffset;
-	ULONG  ulChargingInfoSize;
-	ULONG  ulChargingInfoOffset;
-	ULONG  ulTerminalModesSize;
-	ULONG  ulTerminalModesOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
+  ULONG  ulTotalSize;
+  ULONG  ulNeededSize;
+  ULONG  ulUsedSize;
+  ULONG  hLine;
+  ULONG  ulLineDeviceID;
+  ULONG  ulAddressID;
+  ULONG  ulBearerMode;
+  ULONG  ulRate;
+  ULONG  ulMediaMode;
+  ULONG  ulAppSpecific;
+  ULONG  ulCallID;
+  ULONG  ulRelatedCallID;
+  ULONG  ulCallParamFlags;
+  ULONG  ulCallStates;
+  ULONG  ulMonitorDigitModes;
+  ULONG  ulMonitorMediaModes;
+  LINE_DIAL_PARAMS  DialParams;
+  ULONG  ulOrigin;
+  ULONG  ulReason;
+  ULONG  ulCompletionID;
+  ULONG  ulNumOwners;
+  ULONG  ulNumMonitors;
+  ULONG  ulCountryCode;
+  ULONG  ulTrunk;
+  ULONG  ulCallerIDFlags;
+  ULONG  ulCallerIDSize;
+  ULONG  ulCallerIDOffset;
+  ULONG  ulCallerIDNameSize;
+  ULONG  ulCallerIDNameOffset;
+  ULONG  ulCalledIDFlags;
+  ULONG  ulCalledIDSize;
+  ULONG  ulCalledIDOffset;
+  ULONG  ulCalledIDNameSize;
+  ULONG  ulCalledIDNameOffset;
+  ULONG  ulConnectedIDFlags;
+  ULONG  ulConnectedIDSize;
+  ULONG  ulConnectedIDOffset;
+  ULONG  ulConnectedIDNameSize;
+  ULONG  ulConnectedIDNameOffset;
+  ULONG  ulRedirectionIDFlags;
+  ULONG  ulRedirectionIDSize;
+  ULONG  ulRedirectionIDOffset;
+  ULONG  ulRedirectionIDNameSize;
+  ULONG  ulRedirectionIDNameOffset;
+  ULONG  ulRedirectingIDFlags;
+  ULONG  ulRedirectingIDSize;
+  ULONG  ulRedirectingIDOffset;
+  ULONG  ulRedirectingIDNameSize;
+  ULONG  ulRedirectingIDNameOffset;
+  ULONG  ulAppNameSize;
+  ULONG  ulAppNameOffset;
+  ULONG  ulDisplayableAddressSize;
+  ULONG  ulDisplayableAddressOffset;
+  ULONG  ulCalledPartySize;
+  ULONG  ulCalledPartyOffset;
+  ULONG  ulCommentSize;
+  ULONG  ulCommentOffset;
+  ULONG  ulDisplaySize;
+  ULONG  ulDisplayOffset;
+  ULONG  ulUserUserInfoSize;
+  ULONG  ulUserUserInfoOffset;
+  ULONG  ulHighLevelCompSize;
+  ULONG  ulHighLevelCompOffset;
+  ULONG  ulLowLevelCompSize;
+  ULONG  ulLowLevelCompOffset;
+  ULONG  ulChargingInfoSize;
+  ULONG  ulChargingInfoOffset;
+  ULONG  ulTerminalModesSize;
+  ULONG  ulTerminalModesOffset;
+  ULONG  ulDevSpecificSize;
+  ULONG  ulDevSpecificOffset;
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulCallTreatment;
-	ULONG  ulCallDataSize;
-	ULONG  ulCallDataOffset;
-	ULONG  ulSendingFlowspecSize;
-	ULONG  ulSendingFlowspecOffset;
-	ULONG  ulReceivingFlowspecSize;
-	ULONG  ulReceivingFlowspecOffset;
+  ULONG  ulCallTreatment;
+  ULONG  ulCallDataSize;
+  ULONG  ulCallDataOffset;
+  ULONG  ulSendingFlowspecSize;
+  ULONG  ulSendingFlowspecOffset;
+  ULONG  ulReceivingFlowspecSize;
+  ULONG  ulReceivingFlowspecOffset;
 #endif
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-	ULONG  ulCallerIDAddressType;
-	ULONG  ulCalledIDAddressType;
-	ULONG  ulConnectedIDAddressType;
-	ULONG  ulRedirectionIDAddressType;
-	ULONG  ulRedirectingIDAddressType;
+  ULONG  ulCallerIDAddressType;
+  ULONG  ulCalledIDAddressType;
+  ULONG  ulConnectedIDAddressType;
+  ULONG  ulRedirectionIDAddressType;
+  ULONG  ulRedirectingIDAddressType;
 #endif
 } LINE_CALL_INFO, *PLINE_CALL_INFO;
 
 typedef struct _LINE_CALL_PARAMS {
   ULONG  ulTotalSize;
-	ULONG  ulBearerMode;
-	ULONG  ulMinRate;
-	ULONG  ulMaxRate;
-	ULONG  ulMediaMode;
-	ULONG  ulCallParamFlags;
-	ULONG  ulAddressMode;
-	ULONG  ulAddressID;
-	LINE_DIAL_PARAMS  DialParams;
-	ULONG  ulOrigAddressSize;
-	ULONG  ulOrigAddressOffset;
-	ULONG  ulDisplayableAddressSize;
-	ULONG  ulDisplayableAddressOffset;
-	ULONG  ulCalledPartySize;
-	ULONG  ulCalledPartyOffset;
-	ULONG  ulCommentSize;
-	ULONG  ulCommentOffset;
-	ULONG  ulUserUserInfoSize;
-	ULONG  ulUserUserInfoOffset;
-	ULONG  ulHighLevelCompSize;
-	ULONG  ulHighLevelCompOffset;
-	ULONG  ulLowLevelCompSize;
-	ULONG  ulLowLevelCompOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
+  ULONG  ulBearerMode;
+  ULONG  ulMinRate;
+  ULONG  ulMaxRate;
+  ULONG  ulMediaMode;
+  ULONG  ulCallParamFlags;
+  ULONG  ulAddressMode;
+  ULONG  ulAddressID;
+  LINE_DIAL_PARAMS  DialParams;
+  ULONG  ulOrigAddressSize;
+  ULONG  ulOrigAddressOffset;
+  ULONG  ulDisplayableAddressSize;
+  ULONG  ulDisplayableAddressOffset;
+  ULONG  ulCalledPartySize;
+  ULONG  ulCalledPartyOffset;
+  ULONG  ulCommentSize;
+  ULONG  ulCommentOffset;
+  ULONG  ulUserUserInfoSize;
+  ULONG  ulUserUserInfoOffset;
+  ULONG  ulHighLevelCompSize;
+  ULONG  ulHighLevelCompOffset;
+  ULONG  ulLowLevelCompSize;
+  ULONG  ulLowLevelCompOffset;
+  ULONG  ulDevSpecificSize;
+  ULONG  ulDevSpecificOffset;
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulPredictiveAutoTransferStates;
-	ULONG  ulTargetAddressSize;
-	ULONG  ulTargetAddressOffset;
-	ULONG  ulSendingFlowspecSize;
-	ULONG  ulSendingFlowspecOffset;
-	ULONG  ulReceivingFlowspecSize;
-	ULONG  ulReceivingFlowspecOffset;
-	ULONG  ulDeviceClassSize;
-	ULONG  ulDeviceClassOffset;
-	ULONG  ulDeviceConfigSize;
-	ULONG  ulDeviceConfigOffset;
-	ULONG  ulCallDataSize;
-	ULONG  ulCallDataOffset;
-	ULONG  ulNoAnswerTimeout;
-	ULONG  ulCallingPartyIDSize;
-	ULONG  ulCallingPartyIDOffset;
+  ULONG  ulPredictiveAutoTransferStates;
+  ULONG  ulTargetAddressSize;
+  ULONG  ulTargetAddressOffset;
+  ULONG  ulSendingFlowspecSize;
+  ULONG  ulSendingFlowspecOffset;
+  ULONG  ulReceivingFlowspecSize;
+  ULONG  ulReceivingFlowspecOffset;
+  ULONG  ulDeviceClassSize;
+  ULONG  ulDeviceClassOffset;
+  ULONG  ulDeviceConfigSize;
+  ULONG  ulDeviceConfigOffset;
+  ULONG  ulCallDataSize;
+  ULONG  ulCallDataOffset;
+  ULONG  ulNoAnswerTimeout;
+  ULONG  ulCallingPartyIDSize;
+  ULONG  ulCallingPartyIDOffset;
 #endif
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
   ULONG  ulAddressType;
@@ -844,406 +844,406 @@
 } LINE_CALL_PARAMS, *PLINE_CALL_PARAMS;
 
 typedef struct _LINE_CALL_STATUS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulCallState;
-	ULONG  ulCallStateMode;
-	ULONG  ulCallPrivilege;
-	ULONG  ulCallFeatures;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
+  ULONG  ulTotalSize;
+  ULONG  ulNeededSize;
+  ULONG  ulUsedSize;
+  ULONG  ulCallState;
+  ULONG  ulCallStateMode;
+  ULONG  ulCallPrivilege;
+  ULONG  ulCallFeatures;
+  ULONG  ulDevSpecificSize;
+  ULONG  ulDevSpecificOffset;
 } LINE_CALL_STATUS, *PLINE_CALL_STATUS;
 
 typedef struct _LINE_DEV_CAPS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulProviderInfoSize;
-	ULONG  ulProviderInfoOffset;
-	ULONG  ulSwitchInfoSize;
-	ULONG  ulSwitchInfoOffset;
-	ULONG  ulPermanentLineID;
-	ULONG  ulLineNameSize;
-	ULONG  ulLineNameOffset;
-	ULONG  ulStringFormat;
-	ULONG  ulAddressModes;
-	ULONG  ulNumAddresses;
-	ULONG  ulBearerModes;
-	ULONG  ulMaxRate;
-	ULONG  ulMediaModes;
-	ULONG  ulGenerateToneModes;
-	ULONG  ulGenerateToneMaxNumFreq;
-	ULONG  ulGenerateDigitModes;
-	ULONG  ulMonitorToneMaxNumFreq;
-	ULONG  ulMonitorToneMaxNumEntries;
-	ULONG  ulMonitorDigitModes;
-	ULONG  ulGatherDigitsMinTimeout;
-	ULONG  ulGatherDigitsMaxTimeout;
-	ULONG  ulMedCtlDigitMaxListSize;
-	ULONG  ulMedCtlMediaMaxListSize;
-	ULONG  ulMedCtlToneMaxListSize;
-	ULONG  ulMedCtlCallStateMaxListSize;
-	ULONG  ulDevCapFlags;
-	ULONG  ulMaxNumActiveCalls;
-	ULONG  ulAnswerMode;
-	ULONG  ulRingModes;
-	ULONG  ulLineStates;
-	ULONG  ulUUIAcceptSize;
-	ULONG  ulUUIAnswerSize;
-	ULONG  ulUUIMakeCallSize;
-	ULONG  ulUUIDropSize;
-	ULONG  ulUUISendUserUserInfoSize;
-	ULONG  ulUUICallInfoSize;
-	LINE_DIAL_PARAMS  MinDialParams;
-	LINE_DIAL_PARAMS  MaxDialParams;
-	LINE_DIAL_PARAMS  DefaultDialParams;
-	ULONG  ulNumTerminals;
-	ULONG  ulTerminalCapsSize;
-	ULONG  ulTerminalCapsOffset;
-	ULONG  ulTerminalTextEntrySize;
-	ULONG  ulTerminalTextSize;
-	ULONG  ulTerminalTextOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
+  ULONG  ulTotalSize;
+  ULONG  ulNeededSize;
+  ULONG  ulUsedSize;
+  ULONG  ulProviderInfoSize;
+  ULONG  ulProviderInfoOffset;
+  ULONG  ulSwitchInfoSize;
+  ULONG  ulSwitchInfoOffset;
+  ULONG  ulPermanentLineID;
+  ULONG  ulLineNameSize;
+  ULONG  ulLineNameOffset;
+  ULONG  ulStringFormat;
+  ULONG  ulAddressModes;
+  ULONG  ulNumAddresses;
+  ULONG  ulBearerModes;
+  ULONG  ulMaxRate;
+  ULONG  ulMediaModes;
+  ULONG  ulGenerateToneModes;
+  ULONG  ulGenerateToneMaxNumFreq;
+  ULONG  ulGenerateDigitModes;
+  ULONG  ulMonitorToneMaxNumFreq;
+  ULONG  ulMonitorToneMaxNumEntries;
+  ULONG  ulMonitorDigitModes;
+  ULONG  ulGatherDigitsMinTimeout;
+  ULONG  ulGatherDigitsMaxTimeout;
+  ULONG  ulMedCtlDigitMaxListSize;
+  ULONG  ulMedCtlMediaMaxListSize;
+  ULONG  ulMedCtlToneMaxListSize;
+  ULONG  ulMedCtlCallStateMaxListSize;
+  ULONG  ulDevCapFlags;
+  ULONG  ulMaxNumActiveCalls;
+  ULONG  ulAnswerMode;
+  ULONG  ulRingModes;
+  ULONG  ulLineStates;
+  ULONG  ulUUIAcceptSize;
+  ULONG  ulUUIAnswerSize;
+  ULONG  ulUUIMakeCallSize;
+  ULONG  ulUUIDropSize;
+  ULONG  ulUUISendUserUserInfoSize;
+  ULONG  ulUUICallInfoSize;
+  LINE_DIAL_PARAMS  MinDialParams;
+  LINE_DIAL_PARAMS  MaxDialParams;
+  LINE_DIAL_PARAMS  DefaultDialParams;
+  ULONG  ulNumTerminals;
+  ULONG  ulTerminalCapsSize;
+  ULONG  ulTerminalCapsOffset;
+  ULONG  ulTerminalTextEntrySize;
+  ULONG  ulTerminalTextSize;
+  ULONG  ulTerminalTextOffset;
+  ULONG  ulDevSpecificSize;
+  ULONG  ulDevSpecificOffset;
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00010004)
-	ULONG  ulLineFeatures;
+  ULONG  ulLineFeatures;
 #endif
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulSettableDevStatus;
-	ULONG  ulDeviceClassesSize;
-	ULONG  ulDeviceClassesOffset;
+  ULONG  ulSettableDevStatus;
+  ULONG  ulDeviceClassesSize;
+  ULONG  ulDeviceClassesOffset;
 #endif
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00020002)
   GUID  PermanentLineGuid;
 #endif
 #if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-	ULONG  ulAddressTypes;
-	GUID  ProtocolGuid;
-	ULONG  ulAvailableTracking;
+  ULONG  ulAddressTypes;
+  GUID  ProtocolGuid;
+  ULONG  ulAvailableTracking;
 #endif
 } LINE_DEV_CAPS, *PLINE_DEV_CAPS;
 
 typedef struct _LINE_DEV_STATUS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulNumOpens;
-	ULONG  ulOpenMediaModes;
-	ULONG  ulNumActiveCalls;
-	ULONG  ulNumOnHoldCalls;
-	ULONG  ulNumOnHoldPendCalls;
-	ULONG  ulLineFeatures;
-	ULONG  ulNumCallCompletions;
-	ULONG  ulRingMode;
-	ULONG  ulSignalLevel;
-	ULONG  ulBatteryLevel;
-	ULONG  ulRoamMode;
-	ULONG  ulDevStatusFlags;
-	ULONG  ulTerminalModesSize;
-	ULONG  ulTerminalModesOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
+  ULONG  ulTotalSize;
+  ULONG  ulNeededSize;
+  ULONG  ulUsedSize;
+  ULONG  ulNumOpens;
+  ULONG  ulOpenMediaModes;
+  ULONG  ulNumActiveCalls;
+  ULONG  ulNumOnHoldCalls;
+  ULONG  ulNumOnHoldPendCalls;
+  ULONG  ulLineFeatures;
+  ULONG  ulNumCallCompletions;
+  ULONG  ulRingMode;
+  ULONG  ulSignalLevel;
+  ULONG  ulBatteryLevel;
+  ULONG  ulRoamMode;
+  ULONG  ulDevStatusFlags;
+  ULONG  ulTerminalModesSize;
+  ULONG  ulTerminalModesOffset;
+  ULONG  ulDevSpecificSize;
+  ULONG  ulDevSpecificOffset;
 } LINE_DEV_STATUS, *PLINE_DEV_STATUS;
 
 typedef struct _LINE_EXTENSION_ID {
-	ULONG  ulExtensionID0;
-	ULONG  ulExtensionID1;
-	ULONG  ulExtensionID2;
-	ULONG  ulExtensionID3;
+  ULONG  ulExtensionID0;
+  ULONG  ulExtensionID1;
+  ULONG  ulExtensionID2;
+  ULONG  ulExtensionID3;
 } LINE_EXTENSION_ID, *PLINE_EXTENSION_ID;
 
 typedef struct _VAR_STRING {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;	
-	ULONG  ulStringFormat;
-	ULONG  ulStringSize;
-	ULONG  ulStringOffset;
+  ULONG  ulTotalSize;
+  ULONG  ulNeededSize;
+  ULONG  ulUsedSize;
+  ULONG  ulStringFormat;
+  ULONG  ulStringSize;
+  ULONG  ulStringOffset;
 } VAR_STRING, *PVAR_STRING;
 
-typedef struct _NDIS_TAPI_ANSWER { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_ANSWER, *PNDIS_TAPI_ANSWER; 
-
-typedef struct _NDIS_TAPI_CLOSE { 
-  IN ULONG  ulRequestID;
-  IN HDRV_LINE  hdLine;
+typedef struct _NDIS_TAPI_ANSWER {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulUserUserInfoSize;
+  __W32_IN UCHAR  UserUserInfo[1];
+} NDIS_TAPI_ANSWER, *PNDIS_TAPI_ANSWER;
+
+typedef struct _NDIS_TAPI_CLOSE {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
 } NDIS_TAPI_CLOSE, *PNDIS_TAPI_CLOSE;
 
-typedef struct _NDIS_TAPI_CLOSE_CALL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-} NDIS_TAPI_CLOSE_CALL, *PNDIS_TAPI_CLOSE_CALL; 
-
-typedef struct _NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulMediaModes; 
-  IN LINE_CALL_PARAMS  LineCallParams; 
-} NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION, *PNDIS_TAPI_CONDITIONAL_MEDIA_DETECTION; 
-
-typedef struct _NDIS_TAPI_DROP { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_DROP, *PNDIS_TAPI_DROP; 
-
-typedef struct _NDIS_TAPI_PROVIDER_SHUTDOWN { 
-  IN ULONG  ulRequestID; 
-} NDIS_TAPI_PROVIDER_SHUTDOWN, *PNDIS_TAPI_PROVIDER_SHUTDOWN; 
-
-typedef struct _NDIS_TAPI_SET_APP_SPECIFIC { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulAppSpecific; 
-} NDIS_TAPI_SET_APP_SPECIFIC, *PNDIS_TAPI_SET_APP_SPECIFIC; 
+typedef struct _NDIS_TAPI_CLOSE_CALL {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+} NDIS_TAPI_CLOSE_CALL, *PNDIS_TAPI_CLOSE_CALL;
+
+typedef struct _NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN ULONG  ulMediaModes;
+  __W32_IN LINE_CALL_PARAMS  LineCallParams;
+} NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION, *PNDIS_TAPI_CONDITIONAL_MEDIA_DETECTION;
+
+typedef struct _NDIS_TAPI_DROP {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulUserUserInfoSize;
+  __W32_IN UCHAR  UserUserInfo[1];
+} NDIS_TAPI_DROP, *PNDIS_TAPI_DROP;
+
+typedef struct _NDIS_TAPI_PROVIDER_SHUTDOWN {
+  __W32_IN ULONG  ulRequestID;
+} NDIS_TAPI_PROVIDER_SHUTDOWN, *PNDIS_TAPI_PROVIDER_SHUTDOWN;
+
+typedef struct _NDIS_TAPI_SET_APP_SPECIFIC {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulAppSpecific;
+} NDIS_TAPI_SET_APP_SPECIFIC, *PNDIS_TAPI_SET_APP_SPECIFIC;
 
 typedef struct _NDIS_TAPI_SET_CALL_PARAMS {
-  IN ULONG  ulRequestID;
-  IN HDRV_CALL  hdCall;
-  IN ULONG  ulBearerMode;
-  IN ULONG  ulMinRate;
-  IN ULONG  ulMaxRate;
-  IN BOOLEAN  bSetLineDialParams;
-  IN LINE_DIAL_PARAMS  LineDialParams;
-} NDIS_TAPI_SET_CALL_PARAMS, *PNDIS_TAPI_SET_CALL_PARAMS; 
-
-typedef struct _NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulMediaModes; 
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulBearerMode;
+  __W32_IN ULONG  ulMinRate;
+  __W32_IN ULONG  ulMaxRate;
+  __W32_IN BOOLEAN  bSetLineDialParams;
+  __W32_IN LINE_DIAL_PARAMS  LineDialParams;
+} NDIS_TAPI_SET_CALL_PARAMS, *PNDIS_TAPI_SET_CALL_PARAMS;
+
+typedef struct _NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN ULONG  ulMediaModes;
 } NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION, *PNDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION;
 
-typedef struct _NDIS_TAPI_SET_DEV_CONFIG { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  IN ULONG  ulDeviceConfigSize; 
-  IN UCHAR  DeviceConfig[1]; 
-} NDIS_TAPI_SET_DEV_CONFIG, *PNDIS_TAPI_SET_DEV_CONFIG; 
-
-typedef struct _NDIS_TAPI_SET_MEDIA_MODE { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulMediaMode; 
-} NDIS_TAPI_SET_MEDIA_MODE, *PNDIS_TAPI_SET_MEDIA_MODE; 
-
-typedef struct _NDIS_TAPI_SET_STATUS_MESSAGES { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulLineStates; 
-  IN ULONG  ulAddressStates; 
-} NDIS_TAPI_SET_STATUS_MESSAGES, *PNDIS_TAPI_SET_STATUS_MESSAGES; 
-
-typedef struct _NDIS_TAPI_ACCEPT { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_ACCEPT, *PNDIS_TAPI_ACCEPT; 
-
-typedef struct _NDIS_TAPI_DIAL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulDestAddressSize; 
-  IN CHAR  szDestAddress[1]; 
-} NDIS_TAPI_DIAL, *PNDIS_TAPI_DIAL; 
+typedef struct _NDIS_TAPI_SET_DEV_CONFIG {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_IN ULONG  ulDeviceClassSize;
+  __W32_IN ULONG  ulDeviceClassOffset;
+  __W32_IN ULONG  ulDeviceConfigSize;
+  __W32_IN UCHAR  DeviceConfig[1];
+} NDIS_TAPI_SET_DEV_CONFIG, *PNDIS_TAPI_SET_DEV_CONFIG;
+
+typedef struct _NDIS_TAPI_SET_MEDIA_MODE {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulMediaMode;
+} NDIS_TAPI_SET_MEDIA_MODE, *PNDIS_TAPI_SET_MEDIA_MODE;
+
+typedef struct _NDIS_TAPI_SET_STATUS_MESSAGES {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN ULONG  ulLineStates;
+  __W32_IN ULONG  ulAddressStates;
+} NDIS_TAPI_SET_STATUS_MESSAGES, *PNDIS_TAPI_SET_STATUS_MESSAGES;
+
+typedef struct _NDIS_TAPI_ACCEPT {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulUserUserInfoSize;
+  __W32_IN UCHAR  UserUserInfo[1];
+} NDIS_TAPI_ACCEPT, *PNDIS_TAPI_ACCEPT;
+
+typedef struct _NDIS_TAPI_DIAL {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulDestAddressSize;
+  __W32_IN CHAR  szDestAddress[1];
+} NDIS_TAPI_DIAL, *PNDIS_TAPI_DIAL;
 
 typedef struct _NDIS_TAPI_EVENT {
-  IN HTAPI_LINE  htLine;
-  IN HTAPI_CALL  htCall;
-  IN ULONG  ulMsg;
-  IN ULONG  ulParam1;
-  IN ULONG  ulParam2;
-  IN ULONG  ulParam3;
+  __W32_IN HTAPI_LINE  htLine;
+  __W32_IN HTAPI_CALL  htCall;
+  __W32_IN ULONG  ulMsg;
+  __W32_IN ULONG  ulParam1;
+  __W32_IN ULONG  ulParam2;
+  __W32_IN ULONG  ulParam3;
 } NDIS_TAPI_EVENT, *PNDIS_TAPI_EVENT;
 
-typedef struct _NDIS_TAPI_OPEN { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN HTAPI_LINE  htLine; 
-  OUT HDRV_LINE  hdLine; 
-} NDIS_TAPI_OPEN, *PNDIS_TAPI_OPEN; 
-
-typedef struct _NDIS_TAPI_SECURE_CALL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-} NDIS_TAPI_SECURE_CALL, *PNDIS_TAPI_SECURE_CALL; 
-
-typedef struct _NDIS_TAPI_SELECT_EXT_VERSION { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulExtVersion; 
-} NDIS_TAPI_SELECT_EXT_VERSION, *PNDIS_TAPI_SELECT_EXT_VERSION; 
-
-typedef struct _NDIS_TAPI_SEND_USER_USER_INFO { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_SEND_USER_USER_INFO, *PNDIS_TAPI_SEND_USER_USER_INFO; 
-
-
-typedef struct _NDIS_TAPI_CONFIG_DIALOG { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  IN ULONG  ulLibraryNameTotalSize; 
-  OUT ULONG ulLibraryNameNeededSize; 
-  OUT CHAR  szLibraryName[1]; 
-} NDIS_TAPI_CONFIG_DIALOG, *PNDIS_TAPI_CONFIG_DIALOG; 
-
-typedef struct _NDIS_TAPI_DEV_SPECIFIC { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulAddressID; 
-  IN HDRV_CALL  hdCall; 
-  IN OUT ULONG  ulParamsSize; 
-  IN OUT UCHAR  Params[1]; 
-} NDIS_TAPI_DEV_SPECIFIC, *PNDIS_TAPI_DEV_SPECIFIC; 
-
-typedef struct _NDIS_TAPI_GET_ADDRESS_CAPS { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulAddressID; 
-  IN ULONG  ulExtVersion; 
-  OUT LINE_ADDRESS_CAPS  LineAddressCaps; 
-} NDIS_TAPI_GET_ADDRESS_CAPS, *PNDIS_TAPI_GET_ADDRESS_CAPS; 
-
-typedef struct _NDIS_TAPI_GET_ADDRESS_ID { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  OUT ULONG  ulAddressID; 
-  IN ULONG  ulAddressMode; 
-  IN ULONG  ulAddressSize; 
-  IN CHAR  szAddress[1]; 
-} NDIS_TAPI_GET_ADDRESS_ID, *PNDIS_TAPI_GET_ADDRESS_ID; 
-
-typedef struct _NDIS_TAPI_GET_ADDRESS_STATUS { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulAddressID; 
-  OUT LINE_ADDRESS_STATUS  LineAddressStatus; 
-} NDIS_TAPI_GET_ADDRESS_STATUS, *PNDIS_TAPI_GET_ADDRESS_STATUS; 
-
-typedef struct _NDIS_TAPI_GET_CALL_ADDRESS_ID { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  OUT ULONG  ulAddressID; 
-} NDIS_TAPI_GET_CALL_ADDRESS_ID, *PNDIS_TAPI_GET_CALL_ADDRESS_ID; 
-
-typedef struct _NDIS_TAPI_GET_CALL_INFO { 
-  ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  OUT LINE_CALL_INFO  LineCallInfo; 
-} NDIS_TAPI_GET_CALL_INFO, *PNDIS_TAPI_GET_CALL_INFO; 
-
-typedef struct _NDIS_TAPI_GET_CALL_STATUS { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  OUT LINE_CALL_STATUS  LineCallStatus; 
-} NDIS_TAPI_GET_CALL_STATUS, *PNDIS_TAPI_GET_CALL_STATUS; 
-
-typedef struct _NDIS_TAPI_GET_DEV_CAPS { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulExtVersion; 
-  OUT LINE_DEV_CAPS  LineDevCaps; 
+typedef struct _NDIS_TAPI_OPEN {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_IN HTAPI_LINE  htLine;
+  __W32_OUT HDRV_LINE  hdLine;
+} NDIS_TAPI_OPEN, *PNDIS_TAPI_OPEN;
+
+typedef struct _NDIS_TAPI_SECURE_CALL {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+} NDIS_TAPI_SECURE_CALL, *PNDIS_TAPI_SECURE_CALL;
+
+typedef struct _NDIS_TAPI_SELECT_EXT_VERSION {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN ULONG  ulExtVersion;
+} NDIS_TAPI_SELECT_EXT_VERSION, *PNDIS_TAPI_SELECT_EXT_VERSION;
+
+typedef struct _NDIS_TAPI_SEND_USER_USER_INFO {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulUserUserInfoSize;
+  __W32_IN UCHAR  UserUserInfo[1];
+} NDIS_TAPI_SEND_USER_USER_INFO, *PNDIS_TAPI_SEND_USER_USER_INFO;
+
+
+typedef struct _NDIS_TAPI_CONFIG_DIALOG {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_IN ULONG  ulDeviceClassSize;
+  __W32_IN ULONG  ulDeviceClassOffset;
+  __W32_IN ULONG  ulLibraryNameTotalSize;
+  __W32_OUT ULONG ulLibraryNameNeededSize;
+  __W32_OUT CHAR  szLibraryName[1];
+} NDIS_TAPI_CONFIG_DIALOG, *PNDIS_TAPI_CONFIG_DIALOG;
+
+typedef struct _NDIS_TAPI_DEV_SPECIFIC {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN ULONG  ulAddressID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN __W32_OUT ULONG  ulParamsSize;
+  __W32_IN __W32_OUT UCHAR  Params[1];
+} NDIS_TAPI_DEV_SPECIFIC, *PNDIS_TAPI_DEV_SPECIFIC;
+
+typedef struct _NDIS_TAPI_GET_ADDRESS_CAPS {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_IN ULONG  ulAddressID;
+  __W32_IN ULONG  ulExtVersion;
+  __W32_OUT LINE_ADDRESS_CAPS  LineAddressCaps;
+} NDIS_TAPI_GET_ADDRESS_CAPS, *PNDIS_TAPI_GET_ADDRESS_CAPS;
+
+typedef struct _NDIS_TAPI_GET_ADDRESS_ID {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_OUT ULONG  ulAddressID;
+  __W32_IN ULONG  ulAddressMode;
+  __W32_IN ULONG  ulAddressSize;
+  __W32_IN CHAR  szAddress[1];
+} NDIS_TAPI_GET_ADDRESS_ID, *PNDIS_TAPI_GET_ADDRESS_ID;
+
+typedef struct _NDIS_TAPI_GET_ADDRESS_STATUS {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN ULONG  ulAddressID;
+  __W32_OUT LINE_ADDRESS_STATUS  LineAddressStatus;
+} NDIS_TAPI_GET_ADDRESS_STATUS, *PNDIS_TAPI_GET_ADDRESS_STATUS;
+
+typedef struct _NDIS_TAPI_GET_CALL_ADDRESS_ID {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_OUT ULONG  ulAddressID;
+} NDIS_TAPI_GET_CALL_ADDRESS_ID, *PNDIS_TAPI_GET_CALL_ADDRESS_ID;
+
+typedef struct _NDIS_TAPI_GET_CALL_INFO {
+  ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_OUT LINE_CALL_INFO  LineCallInfo;
+} NDIS_TAPI_GET_CALL_INFO, *PNDIS_TAPI_GET_CALL_INFO;
+
+typedef struct _NDIS_TAPI_GET_CALL_STATUS {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_OUT LINE_CALL_STATUS  LineCallStatus;
+} NDIS_TAPI_GET_CALL_STATUS, *PNDIS_TAPI_GET_CALL_STATUS;
+
+typedef struct _NDIS_TAPI_GET_DEV_CAPS {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_IN ULONG  ulExtVersion;
+  __W32_OUT LINE_DEV_CAPS  LineDevCaps;
 } NDIS_TAPI_GET_DEV_CAPS, *PNDIS_TAPI_GET_DEV_CAPS;
 
-typedef struct _NDIS_TAPI_GET_DEV_CONFIG { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  OUT VAR_STRING  DeviceConfig; 
-} NDIS_TAPI_GET_DEV_CONFIG, *PNDIS_TAPI_GET_DEV_CONFIG; 
-
-typedef struct _NDIS_TAPI_GET_EXTENSION_ID { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  OUT LINE_EXTENSION_ID  LineExtensionID; 
+typedef struct _NDIS_TAPI_GET_DEV_CONFIG {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_IN ULONG  ulDeviceClassSize;
+  __W32_IN ULONG  ulDeviceClassOffset;
+  __W32_OUT VAR_STRING  DeviceConfig;
+} NDIS_TAPI_GET_DEV_CONFIG, *PNDIS_TAPI_GET_DEV_CONFIG;
+
+typedef struct _NDIS_TAPI_GET_EXTENSION_ID {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_OUT LINE_EXTENSION_ID  LineExtensionID;
 } NDIS_TAPI_GET_EXTENSION_ID, *PNDIS_TAPI_GET_EXTENSION_ID;
 
-typedef struct _NDIS_TAPI_GET_ID { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulAddressID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulSelect; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  OUT VAR_STRING  DeviceID; 
-} NDIS_TAPI_GET_ID, *PNDIS_TAPI_GET_ID; 
-
-typedef struct _NDIS_TAPI_GET_LINE_DEV_STATUS { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  OUT LINE_DEV_STATUS  LineDevStatus; 
-} NDIS_TAPI_GET_LINE_DEV_STATUS, *PNDIS_TAPI_GET_LINE_DEV_STATUS; 
-
-typedef struct _NDIS_TAPI_MAKE_CALL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN HTAPI_CALL  htCall; 
-  OUT HDRV_CALL  hdCall; 
-  IN ULONG  ulDestAddressSize; 
-  IN ULONG  ulDestAddressOffset; 
-  IN BOOLEAN  bUseDefaultLineCallParams; 
-  IN LINE_CALL_PARAMS  LineCallParams; 
+typedef struct _NDIS_TAPI_GET_ID {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN ULONG  ulAddressID;
+  __W32_IN HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulSelect;
+  __W32_IN ULONG  ulDeviceClassSize;
+  __W32_IN ULONG  ulDeviceClassOffset;
+  __W32_OUT VAR_STRING  DeviceID;
+} NDIS_TAPI_GET_ID, *PNDIS_TAPI_GET_ID;
+
+typedef struct _NDIS_TAPI_GET_LINE_DEV_STATUS {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_OUT LINE_DEV_STATUS  LineDevStatus;
+} NDIS_TAPI_GET_LINE_DEV_STATUS, *PNDIS_TAPI_GET_LINE_DEV_STATUS;
+
+typedef struct _NDIS_TAPI_MAKE_CALL {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN HDRV_LINE  hdLine;
+  __W32_IN HTAPI_CALL  htCall;
+  __W32_OUT HDRV_CALL  hdCall;
+  __W32_IN ULONG  ulDestAddressSize;
+  __W32_IN ULONG  ulDestAddressOffset;
+  __W32_IN BOOLEAN  bUseDefaultLineCallParams;
+  __W32_IN LINE_CALL_PARAMS  LineCallParams;
 } NDIS_TAPI_MAKE_CALL, *PNDIS_TAPI_MAKE_CALL;
 
-typedef struct _NDIS_TAPI_NEGOTIATE_EXT_VERSION { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulLowVersion; 
-  IN ULONG  ulHighVersion; 
-  OUT ULONG  ulExtVersion; 
-} NDIS_TAPI_NEGOTIATE_EXT_VERSION, *PNDIS_TAPI_NEGOTIATE_EXT_VERSION; 
-
-typedef struct _NDIS_TAPI_PROVIDER_INITIALIZE { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceIDBase; 
-  OUT ULONG  ulNumLineDevs; 
-  OUT ULONG  ulProviderID; 
-} NDIS_TAPI_PROVIDER_INITIALIZE, *PNDIS_TAPI_PROVIDER_INITIALIZE; 
+typedef struct _NDIS_TAPI_NEGOTIATE_EXT_VERSION {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceID;
+  __W32_IN ULONG  ulLowVersion;
+  __W32_IN ULONG  ulHighVersion;
+  __W32_OUT ULONG  ulExtVersion;
+} NDIS_TAPI_NEGOTIATE_EXT_VERSION, *PNDIS_TAPI_NEGOTIATE_EXT_VERSION;
+
+typedef struct _NDIS_TAPI_PROVIDER_INITIALIZE {
+  __W32_IN ULONG  ulRequestID;
+  __W32_IN ULONG  ulDeviceIDBase;
+  __W32_OUT ULONG  ulNumLineDevs;
+  __W32_OUT ULONG  ulProviderID;
+} NDIS_TAPI_PROVIDER_INITIALIZE, *PNDIS_TAPI_PROVIDER_INITIALIZE;
 
 
 #define CO_TAPI_VERSION                   NDIS_TAPI_CURRENT_VERSION
 
 #define CO_TAPI_FLAG_OUTGOING_CALL          0x00000001
 #define CO_TAPI_FLAG_INCOMING_CALL          0x00000002
-#define CO_TAPI_FLAG_USE_DEFAULT_CALLPARAMS	0x00000004
+#define CO_TAPI_FLAG_USE_DEFAULT_CALLPARAMS 0x00000004
 
 #define AF_TAPI_SAP_TYPE                  0x00008000
 
 typedef struct _CO_TAPI_ADDRESS_CAPS {
-  IN ULONG  ulLineID;
-  IN ULONG  ulAddressID;
-  OUT ULONG  ulFlags;
-  OUT LINE_ADDRESS_CAPS  LineAddressCaps;
+  __W32_IN ULONG  ulLineID;
+  __W32_IN ULONG  ulAddressID;
+  __W32_OUT ULONG  ulFlags;
+  __W32_OUT LINE_ADDRESS_CAPS  LineAddressCaps;
 } CO_TAPI_ADDRESS_CAPS, *PCO_TAPI_ADDRESS_CAPS;
 
 /* CO_TAPI_CM_CAPS.ulFlags constants */
 #define CO_TAPI_FLAG_PER_LINE_CAPS        0x00000001
 
 typedef struct _CO_TAPI_CM_CAPS {
-  OUT ULONG  ulCoTapiVersion;
-  OUT ULONG  ulNumLines;
-  OUT ULONG  ulFlags;
+  __W32_OUT ULONG  ulCoTapiVersion;
+  __W32_OUT ULONG  ulNumLines;
+  __W32_OUT ULONG  ulFlags;
 } CO_TAPI_CM_CAPS, *PCO_TAPI_CM_CAPS;
 
 typedef struct _CO_TAPI_CALL_DIAGNOSTICS {
-  OUT ULONG  ulOrigin;
-  OUT ULONG  ulReason;
-  OUT NDIS_VAR_DATA_DESC  DiagInfo;
+  __W32_OUT ULONG  ulOrigin;
+  __W32_OUT ULONG  ulReason;
+  __W32_OUT NDIS_VAR_DATA_DESC  DiagInfo;
 } CO_TAPI_CALL_DIAGNOSTICS, *PCO_TAPI_CALL_DIAGNOSTICS;
 
 
@@ -1251,24 +1251,24 @@
 #define CO_TAPI_FLAG_PER_ADDRESS_CAPS     0x00000001
 
 typedef struct _CO_TAPI_LINE_CAPS {
-  IN ULONG  ulLineID;
-  OUT ULONG  ulFlags;
-  OUT LINE_DEV_CAPS  LineDevCaps;
+  __W32_IN ULONG  ulLineID;
+  __W32_OUT ULONG  ulFlags;
+  __W32_OUT LINE_DEV_CAPS  LineDevCaps;
 } CO_TAPI_LINE_CAPS, *PCO_TAPI_LINE_CAPS;
 
 typedef struct _CO_TAPI_TRANSLATE_NDIS_CALLPARAMS {
-  IN ULONG  ulFlags;
-  IN NDIS_VAR_DATA_DESC  NdisCallParams;
-  OUT NDIS_VAR_DATA_DESC  LineCallInfo;
+  __W32_IN ULONG  ulFlags;
+  __W32_IN NDIS_VAR_DATA_DESC  NdisCallParams;
+  __W32_OUT NDIS_VAR_DATA_DESC  LineCallInfo;
 } CO_TAPI_TRANSLATE_NDIS_CALLPARAMS, *PCO_TAPI_TRANSLATE_NDIS_CALLPARAMS;
 
 typedef struct _CO_TAPI_TRANSLATE_TAPI_CALLPARAMS {
-  IN ULONG  ulLineID;
-  IN ULONG  ulAddressID;
-  IN ULONG  ulFlags;
-  IN NDIS_VAR_DATA_DESC  DestAddress;
-  IN NDIS_VAR_DATA_DESC  LineCallParams;
-  OUT NDIS_VAR_DATA_DESC  NdisCallParams;
+  __W32_IN ULONG  ulLineID;
+  __W32_IN ULONG  ulAddressID;
+  __W32_IN ULONG  ulFlags;
+  __W32_IN NDIS_VAR_DATA_DESC  DestAddress;
+  __W32_IN NDIS_VAR_DATA_DESC  LineCallParams;
+  __W32_OUT NDIS_VAR_DATA_DESC  NdisCallParams;
 } CO_TAPI_TRANSLATE_TAPI_CALLPARAMS, *PCO_TAPI_TRANSLATE_TAPI_CALLPARAMS;
 
 /* CO_TAPI_TRANSLATE_SAP.ulLineID constants */
@@ -1278,27 +1278,27 @@
 #define CO_TAPI_ADDRESS_ID_UNSPECIFIED    0xFFFFFFFF
 
 typedef struct _CO_TAPI_TRANSLATE_SAP {
-  IN ULONG  ulLineID;
-  IN ULONG  ulAddressID;
-  IN ULONG  ulMediaModes;
-  IN ULONG  Reserved;
-  OUT ULONG  NumberOfSaps;
-  OUT NDIS_VAR_DATA_DESC  NdisSapParams[1];
+  __W32_IN ULONG  ulLineID;
+  __W32_IN ULONG  ulAddressID;
+  __W32_IN ULONG  ulMediaModes;
+  __W32_IN ULONG  Reserved;
+  __W32_OUT ULONG  NumberOfSaps;
+  __W32_OUT NDIS_VAR_DATA_DESC  NdisSapParams[1];
 } CO_AF_TAPI_SAP, *PCO_AF_TAPI_SAP;
 
 typedef struct _CO_AF_TAPI_INCOMING_CALL_PARAMETERS {
-  IN  ULONG  ulLineID;
-  IN  ULONG  ulAddressID;
-  IN  ULONG  ulFlags;
-  IN  NDIS_VAR_DATA_DESC  LineCallInfo;
+  __W32_IN  ULONG  ulLineID;
+  __W32_IN  ULONG  ulAddressID;
+  __W32_IN  ULONG  ulFlags;
+  __W32_IN  NDIS_VAR_DATA_DESC  LineCallInfo;
 } CO_AF_TAPI_INCOMING_CALL_PARAMETERS, *PCO_AF_TAPI_INCOMING_CALL_PARAMETERS;
 
 typedef struct _CO_AF_TAPI_MAKE_CALL_PARAMETERS {
-  IN  ULONG  ulLineID;
-  IN  ULONG  ulAddressID;
-  IN  ULONG  ulFlags;
-  IN  NDIS_VAR_DATA_DESC  DestAddress;
-  IN  NDIS_VAR_DATA_DESC  LineCallParams;
+  __W32_IN  ULONG  ulLineID;
+  __W32_IN  ULONG  ulAddressID;
+  __W32_IN  ULONG  ulFlags;
+  __W32_IN  NDIS_VAR_DATA_DESC  DestAddress;
+  __W32_IN  NDIS_VAR_DATA_DESC  LineCallParams;
 } CO_AF_TAPI_MAKE_CALL_PARAMETERS, *PCO_AF_TAPI_MAKE_CALL_PARAMETERS;
 
 #ifdef __cplusplus
diff -ru w32api-3.6.orig/include/ddk/ndiswan.h w32api-3.6/include/ddk/ndiswan.h
--- w32api-3.6.orig/include/ddk/ndiswan.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/ndiswan.h	2006-02-06 16:41:14.000000000 +1030
@@ -33,9 +33,9 @@
 
 #include "ndis.h"
 
-#define NDIS_USE_WAN_WRAPPER         			0x00000001
+#define NDIS_USE_WAN_WRAPPER            0x00000001
 
-#define NDIS_STATUS_TAPI_INDICATION 			((NDIS_STATUS)0x40010080L)
+#define NDIS_STATUS_TAPI_INDICATION     ((NDIS_STATUS)0x40010080L)
 
 /* NDIS_WAN_INFO.FramingBits constants */
 #define RAS_FRAMING                     0x00000001
@@ -76,172 +76,172 @@
 #define TAPI_PROVIDER                   0x80000000
 
 typedef struct _NDIS_WAN_INFO {
-  OUT ULONG  MaxFrameSize; 
-  OUT ULONG  MaxTransmit; 
-  OUT ULONG  HeaderPadding; 
-  OUT ULONG  TailPadding; 
-  OUT ULONG  Endpoints; 
-  OUT UINT  MemoryFlags; 
-  OUT NDIS_PHYSICAL_ADDRESS  HighestAcceptableAddress; 
-  OUT ULONG  FramingBits; 
-  OUT ULONG  DesiredACCM; 
+  __W32_OUT ULONG  MaxFrameSize;
+  __W32_OUT ULONG  MaxTransmit;
+  __W32_OUT ULONG  HeaderPadding;
+  __W32_OUT ULONG  TailPadding;
+  __W32_OUT ULONG  Endpoints;
+  __W32_OUT UINT  MemoryFlags;
+  __W32_OUT NDIS_PHYSICAL_ADDRESS  HighestAcceptableAddress;
+  __W32_OUT ULONG  FramingBits;
+  __W32_OUT ULONG  DesiredACCM;
 } NDIS_WAN_INFO, *PNDIS_WAN_INFO;
 
-typedef struct _NDIS_WAN_GET_LINK_INFO { 
-  IN NDIS_HANDLE  NdisLinkHandle; 
-  OUT ULONG  MaxSendFrameSize; 
-  OUT ULONG  MaxRecvFrameSize; 
-  OUT ULONG  HeaderPadding; 
-  OUT ULONG  TailPadding; 
-  OUT ULONG  SendFramingBits; 
-  OUT ULONG  RecvFramingBits; 
-  OUT ULONG  SendCompressionBits; 
-  OUT ULONG  RecvCompressionBits; 
-  OUT ULONG  SendACCM; 
-  OUT ULONG  RecvACCM; 
+typedef struct _NDIS_WAN_GET_LINK_INFO {
+  __W32_IN NDIS_HANDLE  NdisLinkHandle;
+  __W32_OUT ULONG  MaxSendFrameSize;
+  __W32_OUT ULONG  MaxRecvFrameSize;
+  __W32_OUT ULONG  HeaderPadding;
+  __W32_OUT ULONG  TailPadding;
+  __W32_OUT ULONG  SendFramingBits;
+  __W32_OUT ULONG  RecvFramingBits;
+  __W32_OUT ULONG  SendCompressionBits;
+  __W32_OUT ULONG  RecvCompressionBits;
+  __W32_OUT ULONG  SendACCM;
+  __W32_OUT ULONG  RecvACCM;
 } NDIS_WAN_GET_LINK_INFO, *PNDIS_WAN_GET_LINK_INFO;
 
-typedef struct _NDIS_WAN_SET_LINK_INFO { 
-  IN NDIS_HANDLE  NdisLinkHandle; 
-  IN ULONG  MaxSendFrameSize; 
-  IN ULONG  MaxRecvFrameSize; 
-  IN ULONG  HeaderPadding; 
-  IN ULONG  TailPadding; 
-  IN ULONG  SendFramingBits; 
-  IN ULONG  RecvFramingBits; 
-  IN ULONG  SendCompressionBits; 
-  IN ULONG  RecvCompressionBits; 
-  IN ULONG  SendACCM; 
-  IN ULONG  RecvACCM; 
-} NDIS_WAN_SET_LINK_INFO, *PNDIS_WAN_SET_LINK_INFO; 
+typedef struct _NDIS_WAN_SET_LINK_INFO {
+  __W32_IN NDIS_HANDLE  NdisLinkHandle;
+  __W32_IN ULONG  MaxSendFrameSize;
+  __W32_IN ULONG  MaxRecvFrameSize;
+  __W32_IN ULONG  HeaderPadding;
+  __W32_IN ULONG  TailPadding;
+  __W32_IN ULONG  SendFramingBits;
+  __W32_IN ULONG  RecvFramingBits;
+  __W32_IN ULONG  SendCompressionBits;
+  __W32_IN ULONG  RecvCompressionBits;
+  __W32_IN ULONG  SendACCM;
+  __W32_IN ULONG  RecvACCM;
+} NDIS_WAN_SET_LINK_INFO, *PNDIS_WAN_SET_LINK_INFO;
 
 /* NDIS_WAN_COMPRESS_INFO.MSCompType constants */
-#define NDISWAN_COMPRESSION            		0x00000001
-#define NDISWAN_ENCRYPTION              	0x00000010
-#define NDISWAN_40_ENCRYPTION           	0x00000020
-#define NDISWAN_128_ENCRYPTION          	0x00000040
-#define NDISWAN_56_ENCRYPTION           	0x00000080
-#define NDISWAN_HISTORY_LESS            	0x01000000
+#define NDISWAN_COMPRESSION               0x00000001
+#define NDISWAN_ENCRYPTION                0x00000010
+#define NDISWAN_40_ENCRYPTION             0x00000020
+#define NDISWAN_128_ENCRYPTION            0x00000040
+#define NDISWAN_56_ENCRYPTION             0x00000080
+#define NDISWAN_HISTORY_LESS              0x01000000
 
 /* NDIS_WAN_COMPRESS_INFO.CompType constants */
-#define COMPTYPE_OUI											0
-#define COMPTYPE_NT31RAS									254
-#define COMPTYPE_NONE											255
+#define COMPTYPE_OUI                      0
+#define COMPTYPE_NT31RAS                  254
+#define COMPTYPE_NONE                     255
 
 typedef struct _NDIS_WAN_COMPRESS_INFO {
-	UCHAR  SessionKey[8];
-	ULONG  MSCompType;
-	UCHAR  CompType;
-	USHORT  CompLength;
-	_ANONYMOUS_UNION union {
-		struct {
-			UCHAR  CompOUI[3];
-			UCHAR  CompSubType;
-			UCHAR  CompValues[32];
-		} Proprietary;
-		struct {
-			UCHAR  CompValues[32];
-		} Public;
-	} DUMMYUNIONNAME;
+  UCHAR  SessionKey[8];
+  ULONG  MSCompType;
+  UCHAR  CompType;
+  USHORT  CompLength;
+  _ANONYMOUS_UNION union {
+    struct {
+      UCHAR  CompOUI[3];
+      UCHAR  CompSubType;
+      UCHAR  CompValues[32];
+    } Proprietary;
+    struct {
+      UCHAR  CompValues[32];
+    } Public;
+  } DUMMYUNIONNAME;
 } NDIS_WAN_COMPRESS_INFO;
 
 typedef NDIS_WAN_COMPRESS_INFO *PNDIS_WAN_COMPRESS_INFO;
 
-typedef struct _NDIS_WAN_GET_COMP_INFO { 
-  IN NDIS_HANDLE  NdisLinkHandle; 
-  OUT NDIS_WAN_COMPRESS_INFO  SendCapabilities; 
-  OUT NDIS_WAN_COMPRESS_INFO  RecvCapabilities; 
+typedef struct _NDIS_WAN_GET_COMP_INFO {
+  __W32_IN NDIS_HANDLE  NdisLinkHandle;
+  __W32_OUT NDIS_WAN_COMPRESS_INFO  SendCapabilities;
+  __W32_OUT NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
 } NDIS_WAN_GET_COMP_INFO, *PNDIS_WAN_GET_COMP_INFO;
 
 typedef struct _NDIS_WAN_SET_COMP_INFO {
-  IN NDIS_HANDLE  NdisLinkHandle;
-  IN NDIS_WAN_COMPRESS_INFO  SendCapabilities;
-  IN NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
+  __W32_IN NDIS_HANDLE  NdisLinkHandle;
+  __W32_IN NDIS_WAN_COMPRESS_INFO  SendCapabilities;
+  __W32_IN NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
 } NDIS_WAN_SET_COMP_INFO, *PNDIS_WAN_SET_COMP_INFO;
 
 typedef struct _NDIS_WAN_GET_STATS_INFO {
-  IN NDIS_HANDLE  NdisLinkHandle;
-  OUT ULONG  BytesSent;
-  OUT ULONG  BytesRcvd;
-  OUT ULONG  FramesSent;
-  OUT ULONG  FramesRcvd;
-  OUT ULONG  CRCErrors;
-  OUT ULONG  TimeoutErrors;
-  OUT ULONG  AlignmentErrors;
-  OUT ULONG  SerialOverrunErrors;
-  OUT ULONG  FramingErrors;
-  OUT ULONG  BufferOverrunErrors;
-  OUT ULONG  BytesTransmittedUncompressed;
-  OUT ULONG  BytesReceivedUncompressed;
-  OUT ULONG  BytesTransmittedCompressed;
-  OUT ULONG  BytesReceivedCompressed;
+  __W32_IN NDIS_HANDLE  NdisLinkHandle;
+  __W32_OUT ULONG  BytesSent;
+  __W32_OUT ULONG  BytesRcvd;
+  __W32_OUT ULONG  FramesSent;
+  __W32_OUT ULONG  FramesRcvd;
+  __W32_OUT ULONG  CRCErrors;
+  __W32_OUT ULONG  TimeoutErrors;
+  __W32_OUT ULONG  AlignmentErrors;
+  __W32_OUT ULONG  SerialOverrunErrors;
+  __W32_OUT ULONG  FramingErrors;
+  __W32_OUT ULONG  BufferOverrunErrors;
+  __W32_OUT ULONG  BytesTransmittedUncompressed;
+  __W32_OUT ULONG  BytesReceivedUncompressed;
+  __W32_OUT ULONG  BytesTransmittedCompressed;
+  __W32_OUT ULONG  BytesReceivedCompressed;
 } NDIS_WAN_GET_STATS_INFO, *PNDIS_WAN_GET_STATS_INFO;
 
-#define NdisMWanInitializeWrapper(NdisWrapperHandle,	\
-                                  SystemSpecific1,		\
-                                  SystemSpecific2,		\
-                                  SystemSpecific3)		\
+#define NdisMWanInitializeWrapper(NdisWrapperHandle,  \
+                                  SystemSpecific1,    \
+                                  SystemSpecific2,    \
+                                  SystemSpecific3)    \
 {                                                     \
-	NdisMInitializeWrapper(NdisWrapperHandle,          	\
-                         SystemSpecific1,          		\
-                         SystemSpecific2,          		\
-                         SystemSpecific3);         		\
+  NdisMInitializeWrapper(NdisWrapperHandle,           \
+                         SystemSpecific1,             \
+                         SystemSpecific2,             \
+                         SystemSpecific3);            \
 }
 
 typedef struct _NDIS_WAN_CO_INFO {
-  OUT ULONG  MaxFrameSize;
-  OUT ULONG  MaxSendWindow;
-  OUT ULONG  FramingBits;
-  OUT ULONG  DesiredACCM;
+  __W32_OUT ULONG  MaxFrameSize;
+  __W32_OUT ULONG  MaxSendWindow;
+  __W32_OUT ULONG  FramingBits;
+  __W32_OUT ULONG  DesiredACCM;
 } NDIS_WAN_CO_INFO, *PNDIS_WAN_CO_INFO;
 
 typedef struct _NDIS_WAN_CO_GET_LINK_INFO {
-  OUT ULONG  MaxSendFrameSize;
-  OUT ULONG  MaxRecvFrameSize;
-  OUT ULONG  SendFramingBits;
-  OUT ULONG  RecvFramingBits;
-  OUT ULONG  SendCompressionBits;
-  OUT ULONG  RecvCompressionBits;
-  OUT ULONG  SendACCM;
-  OUT ULONG  RecvACCM;
+  __W32_OUT ULONG  MaxSendFrameSize;
+  __W32_OUT ULONG  MaxRecvFrameSize;
+  __W32_OUT ULONG  SendFramingBits;
+  __W32_OUT ULONG  RecvFramingBits;
+  __W32_OUT ULONG  SendCompressionBits;
+  __W32_OUT ULONG  RecvCompressionBits;
+  __W32_OUT ULONG  SendACCM;
+  __W32_OUT ULONG  RecvACCM;
 } NDIS_WAN_CO_GET_LINK_INFO, *PNDIS_WAN_CO_GET_LINK_INFO;
 
 typedef struct _NDIS_WAN_CO_SET_LINK_INFO {
-  IN ULONG  MaxSendFrameSize;
-  IN ULONG  MaxRecvFrameSize;
-  IN ULONG  SendFramingBits;
-  IN ULONG  RecvFramingBits;
-  IN ULONG  SendCompressionBits;
-  IN ULONG  RecvCompressionBits;
-  IN ULONG  SendACCM;
-  IN ULONG  RecvACCM;
+  __W32_IN ULONG  MaxSendFrameSize;
+  __W32_IN ULONG  MaxRecvFrameSize;
+  __W32_IN ULONG  SendFramingBits;
+  __W32_IN ULONG  RecvFramingBits;
+  __W32_IN ULONG  SendCompressionBits;
+  __W32_IN ULONG  RecvCompressionBits;
+  __W32_IN ULONG  SendACCM;
+  __W32_IN ULONG  RecvACCM;
 } NDIS_WAN_CO_SET_LINK_INFO, *PNDIS_WAN_CO_SET_LINK_INFO;
 
-typedef struct _NDIS_WAN_CO_GET_COMP_INFO { 
-  OUT NDIS_WAN_COMPRESS_INFO  SendCapabilities; 
-  OUT NDIS_WAN_COMPRESS_INFO  RecvCapabilities; 
-} NDIS_WAN_CO_GET_COMP_INFO, *PNDIS_WAN_CO_GET_COMP_INFO; 
+typedef struct _NDIS_WAN_CO_GET_COMP_INFO {
+  __W32_OUT NDIS_WAN_COMPRESS_INFO  SendCapabilities;
+  __W32_OUT NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
+} NDIS_WAN_CO_GET_COMP_INFO, *PNDIS_WAN_CO_GET_COMP_INFO;
 
 typedef struct _NDIS_WAN_CO_SET_COMP_INFO {
-  IN NDIS_WAN_COMPRESS_INFO  SendCapabilities;
-  IN NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
+  __W32_IN NDIS_WAN_COMPRESS_INFO  SendCapabilities;
+  __W32_IN NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
 } NDIS_WAN_CO_SET_COMP_INFO, *PNDIS_WAN_CO_SET_COMP_INFO;
 
 typedef struct _NDIS_WAN_CO_GET_STATS_INFO {
-  OUT ULONG  BytesSent;
-  OUT ULONG  BytesRcvd;
-  OUT ULONG  FramesSent;
-  OUT ULONG  FramesRcvd;
-  OUT ULONG  CRCErrors;
-  OUT ULONG  TimeoutErrors;
-  OUT ULONG  AlignmentErrors;
-  OUT ULONG  SerialOverrunErrors;
-  OUT ULONG  FramingErrors;
-  OUT ULONG  BufferOverrunErrors;
-  OUT ULONG  BytesTransmittedUncompressed;
-  OUT ULONG  BytesReceivedUncompressed;
-  OUT ULONG  BytesTransmittedCompressed;
-  OUT ULONG  BytesReceivedCompressed;
+  __W32_OUT ULONG  BytesSent;
+  __W32_OUT ULONG  BytesRcvd;
+  __W32_OUT ULONG  FramesSent;
+  __W32_OUT ULONG  FramesRcvd;
+  __W32_OUT ULONG  CRCErrors;
+  __W32_OUT ULONG  TimeoutErrors;
+  __W32_OUT ULONG  AlignmentErrors;
+  __W32_OUT ULONG  SerialOverrunErrors;
+  __W32_OUT ULONG  FramingErrors;
+  __W32_OUT ULONG  BufferOverrunErrors;
+  __W32_OUT ULONG  BytesTransmittedUncompressed;
+  __W32_OUT ULONG  BytesReceivedUncompressed;
+  __W32_OUT ULONG  BytesTransmittedCompressed;
+  __W32_OUT ULONG  BytesReceivedCompressed;
 } NDIS_WAN_CO_GET_STATS_INFO, *PNDIS_WAN_CO_GET_STATS_INFO;
 
 #ifdef __cplusplus
diff -ru w32api-3.6.orig/include/ddk/newdev.h w32api-3.6/include/ddk/newdev.h
--- w32api-3.6.orig/include/ddk/newdev.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/newdev.h	2006-02-06 16:41:14.000000000 +1030
@@ -43,7 +43,7 @@
   LPCSTR  HardwareId,
   LPCSTR  FullInfPath,
   DWORD  InstallFlags,
-  PBOOL  bRebootRequired  OPTIONAL);
+  PBOOL  bRebootRequired  __W32_OPTIONAL);
 
 BOOL WINAPI
 UpdateDriverForPlugAndPlayDevicesW(
@@ -51,7 +51,7 @@
   LPCWSTR  HardwareId,
   LPCWSTR  FullInfPath,
   DWORD  InstallFlags,
-  PBOOL  bRebootRequired  OPTIONAL);
+  PBOOL  bRebootRequired  __W32_OPTIONAL);
 
 #ifdef UNICODE
 #define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesW
diff -ru w32api-3.6.orig/include/ddk/ntapi.h w32api-3.6/include/ddk/ntapi.h
--- w32api-3.6.orig/include/ddk/ntapi.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/ntapi.h	2006-02-06 16:41:14.000000000 +1030
@@ -58,277 +58,277 @@
 /* System information and control */
 
 typedef enum _SYSTEM_INFORMATION_CLASS {
-	SystemInformationClassMin = 0,
-	SystemBasicInformation = 0,
-	SystemProcessorInformation = 1,
-	SystemPerformanceInformation = 2,
-	SystemTimeOfDayInformation = 3,
-	SystemPathInformation = 4,
-	SystemNotImplemented1 = 4,
-	SystemProcessInformation = 5,
-	SystemProcessesAndThreadsInformation = 5,
-	SystemCallCountInfoInformation = 6,
-	SystemCallCounts = 6,
-	SystemDeviceInformation = 7,
-	SystemConfigurationInformation = 7,
-	SystemProcessorPerformanceInformation = 8,
-	SystemProcessorTimes = 8,
-	SystemFlagsInformation = 9,
-	SystemGlobalFlag = 9,
-	SystemCallTimeInformation = 10,
-	SystemNotImplemented2 = 10,
-	SystemModuleInformation = 11,
-	SystemLocksInformation = 12,
-	SystemLockInformation = 12,
-	SystemStackTraceInformation = 13,
-	SystemNotImplemented3 = 13,
-	SystemPagedPoolInformation = 14,
-	SystemNotImplemented4 = 14,
-	SystemNonPagedPoolInformation = 15,
-	SystemNotImplemented5 = 15,
-	SystemHandleInformation = 16,
-	SystemObjectInformation = 17,
-	SystemPageFileInformation = 18,
-	SystemPagefileInformation = 18,
-	SystemVdmInstemulInformation = 19,
-	SystemInstructionEmulationCounts = 19,
-	SystemVdmBopInformation = 20,
-	SystemInvalidInfoClass1 = 20,	
-	SystemFileCacheInformation = 21,
-	SystemCacheInformation = 21,
-	SystemPoolTagInformation = 22,
-	SystemInterruptInformation = 23,
-	SystemProcessorStatistics = 23,
-	SystemDpcBehaviourInformation = 24,
-	SystemDpcInformation = 24,
-	SystemFullMemoryInformation = 25,
-	SystemNotImplemented6 = 25,
-	SystemLoadImage = 26,
-	SystemUnloadImage = 27,
-	SystemTimeAdjustmentInformation = 28,
-	SystemTimeAdjustment = 28,
-	SystemSummaryMemoryInformation = 29,
-	SystemNotImplemented7 = 29,
-	SystemNextEventIdInformation = 30,
-	SystemNotImplemented8 = 30,
-	SystemEventIdsInformation = 31,
-	SystemNotImplemented9 = 31,
-	SystemCrashDumpInformation = 32,
-	SystemExceptionInformation = 33,
-	SystemCrashDumpStateInformation = 34,
-	SystemKernelDebuggerInformation = 35,
-	SystemContextSwitchInformation = 36,
-	SystemRegistryQuotaInformation = 37,
-	SystemLoadAndCallImage = 38,
-	SystemPrioritySeparation = 39,
-	SystemPlugPlayBusInformation = 40,
-	SystemNotImplemented10 = 40,
-	SystemDockInformation = 41,
-	SystemNotImplemented11 = 41,
-	/* SystemPowerInformation = 42, Conflicts with POWER_INFORMATION_LEVEL 1 */
-	SystemInvalidInfoClass2 = 42,
-	SystemProcessorSpeedInformation = 43,
-	SystemInvalidInfoClass3 = 43,
-	SystemCurrentTimeZoneInformation = 44,
-	SystemTimeZoneInformation = 44,
-	SystemLookasideInformation = 45,
-	SystemSetTimeSlipEvent = 46,
-	SystemCreateSession = 47,
-	SystemDeleteSession = 48,
-	SystemInvalidInfoClass4 = 49,
-	SystemRangeStartInformation = 50,
-	SystemVerifierInformation = 51,
-	SystemAddVerifier = 52,
-	SystemSessionProcessesInformation	= 53,
-	SystemInformationClassMax
+  SystemInformationClassMin = 0,
+  SystemBasicInformation = 0,
+  SystemProcessorInformation = 1,
+  SystemPerformanceInformation = 2,
+  SystemTimeOfDayInformation = 3,
+  SystemPathInformation = 4,
+  SystemNotImplemented1 = 4,
+  SystemProcessInformation = 5,
+  SystemProcessesAndThreadsInformation = 5,
+  SystemCallCountInfoInformation = 6,
+  SystemCallCounts = 6,
+  SystemDeviceInformation = 7,
+  SystemConfigurationInformation = 7,
+  SystemProcessorPerformanceInformation = 8,
+  SystemProcessorTimes = 8,
+  SystemFlagsInformation = 9,
+  SystemGlobalFlag = 9,
+  SystemCallTimeInformation = 10,
+  SystemNotImplemented2 = 10,
+  SystemModuleInformation = 11,
+  SystemLocksInformation = 12,
+  SystemLockInformation = 12,
+  SystemStackTraceInformation = 13,
+  SystemNotImplemented3 = 13,
+  SystemPagedPoolInformation = 14,
+  SystemNotImplemented4 = 14,
+  SystemNonPagedPoolInformation = 15,
+  SystemNotImplemented5 = 15,
+  SystemHandleInformation = 16,
+  SystemObjectInformation = 17,
+  SystemPageFileInformation = 18,
+  SystemPagefileInformation = 18,
+  SystemVdmInstemulInformation = 19,
+  SystemInstructionEmulationCounts = 19,
+  SystemVdmBopInformation = 20,
+  SystemInvalidInfoClass1 = 20,
+  SystemFileCacheInformation = 21,
+  SystemCacheInformation = 21,
+  SystemPoolTagInformation = 22,
+  SystemInterruptInformation = 23,
+  SystemProcessorStatistics = 23,
+  SystemDpcBehaviourInformation = 24,
+  SystemDpcInformation = 24,
+  SystemFullMemoryInformation = 25,
+  SystemNotImplemented6 = 25,
+  SystemLoadImage = 26,
+  SystemUnloadImage = 27,
+  SystemTimeAdjustmentInformation = 28,
+  SystemTimeAdjustment = 28,
+  SystemSummaryMemoryInformation = 29,
+  SystemNotImplemented7 = 29,
+  SystemNextEventIdInformation = 30,
+  SystemNotImplemented8 = 30,
+  SystemEventIdsInformation = 31,
+  SystemNotImplemented9 = 31,
+  SystemCrashDumpInformation = 32,
+  SystemExceptionInformation = 33,
+  SystemCrashDumpStateInformation = 34,
+  SystemKernelDebuggerInformation = 35,
+  SystemContextSwitchInformation = 36,
+  SystemRegistryQuotaInformation = 37,
+  SystemLoadAndCallImage = 38,
+  SystemPrioritySeparation = 39,
+  SystemPlugPlayBusInformation = 40,
+  SystemNotImplemented10 = 40,
+  SystemDockInformation = 41,
+  SystemNotImplemented11 = 41,
+  /* SystemPowerInformation = 42, Conflicts with POWER_INFORMATION_LEVEL 1 */
+  SystemInvalidInfoClass2 = 42,
+  SystemProcessorSpeedInformation = 43,
+  SystemInvalidInfoClass3 = 43,
+  SystemCurrentTimeZoneInformation = 44,
+  SystemTimeZoneInformation = 44,
+  SystemLookasideInformation = 45,
+  SystemSetTimeSlipEvent = 46,
+  SystemCreateSession = 47,
+  SystemDeleteSession = 48,
+  SystemInvalidInfoClass4 = 49,
+  SystemRangeStartInformation = 50,
+  SystemVerifierInformation = 51,
+  SystemAddVerifier = 52,
+  SystemSessionProcessesInformation  = 53,
+  SystemInformationClassMax
 } SYSTEM_INFORMATION_CLASS;
 
 typedef struct _SYSTEM_BASIC_INFORMATION {
-	ULONG  Unknown;
-	ULONG  MaximumIncrement;
-	ULONG  PhysicalPageSize;
-	ULONG  NumberOfPhysicalPages;
-	ULONG  LowestPhysicalPage;
-	ULONG  HighestPhysicalPage;
-	ULONG  AllocationGranularity;
-	ULONG  LowestUserAddress;
-	ULONG  HighestUserAddress;
-	ULONG  ActiveProcessors;
-	UCHAR  NumberProcessors;
+  ULONG  Unknown;
+  ULONG  MaximumIncrement;
+  ULONG  PhysicalPageSize;
+  ULONG  NumberOfPhysicalPages;
+  ULONG  LowestPhysicalPage;
+  ULONG  HighestPhysicalPage;
+  ULONG  AllocationGranularity;
+  ULONG  LowestUserAddress;
+  ULONG  HighestUserAddress;
+  ULONG  ActiveProcessors;
+  UCHAR  NumberProcessors;
 } SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION;
 
 typedef struct _SYSTEM_PROCESSOR_INFORMATION {
-	USHORT  ProcessorArchitecture;
-	USHORT  ProcessorLevel;
-	USHORT  ProcessorRevision;
-	USHORT  Unknown;
-	ULONG  FeatureBits;
+  USHORT  ProcessorArchitecture;
+  USHORT  ProcessorLevel;
+  USHORT  ProcessorRevision;
+  USHORT  Unknown;
+  ULONG  FeatureBits;
 } SYSTEM_PROCESSOR_INFORMATION, *PSYSTEM_PROCESSOR_INFORMATION;
 
 typedef struct _SYSTEM_PERFORMANCE_INFORMATION {
-	LARGE_INTEGER  IdleTime;
-	LARGE_INTEGER  ReadTransferCount;
-	LARGE_INTEGER  WriteTransferCount;
-	LARGE_INTEGER  OtherTransferCount;
-	ULONG  ReadOperationCount;
-	ULONG  WriteOperationCount;
-	ULONG  OtherOperationCount;
-	ULONG  AvailablePages;
-	ULONG  TotalCommittedPages;
-	ULONG  TotalCommitLimit;
-	ULONG  PeakCommitment;
-	ULONG  PageFaults;
-	ULONG  WriteCopyFaults;
-	ULONG  TransitionFaults;
-	ULONG  CacheTransitionFaults;
-	ULONG  DemandZeroFaults;
-	ULONG  PagesRead;
-	ULONG  PageReadIos;
-	ULONG	 CacheReads;
-	ULONG	 CacheIos;
-	ULONG  PagefilePagesWritten;
-	ULONG  PagefilePageWriteIos;
-	ULONG  MappedFilePagesWritten;
-	ULONG  MappedFilePageWriteIos;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  PagedPoolAllocs;
-	ULONG  PagedPoolFrees;
-	ULONG  NonPagedPoolAllocs;
-	ULONG  NonPagedPoolFrees;
-	ULONG  TotalFreeSystemPtes;
-	ULONG  SystemCodePage;
-	ULONG  TotalSystemDriverPages;
-	ULONG  TotalSystemCodePages;
-	ULONG  SmallNonPagedLookasideListAllocateHits;
-	ULONG  SmallPagedLookasideListAllocateHits;
-	ULONG  Reserved3;
-	ULONG  MmSystemCachePage;
-	ULONG  PagedPoolPage;
-	ULONG  SystemDriverPage;
-	ULONG  FastReadNoWait;
-	ULONG  FastReadWait;
-	ULONG  FastReadResourceMiss;
-	ULONG  FastReadNotPossible;
-	ULONG  FastMdlReadNoWait;
-	ULONG  FastMdlReadWait;
-	ULONG  FastMdlReadResourceMiss;
-	ULONG  FastMdlReadNotPossible;
-	ULONG  MapDataNoWait;
-	ULONG  MapDataWait;
-	ULONG  MapDataNoWaitMiss;
-	ULONG  MapDataWaitMiss;
-	ULONG  PinMappedDataCount;
-	ULONG  PinReadNoWait;
-	ULONG  PinReadWait;
-	ULONG  PinReadNoWaitMiss;
-	ULONG  PinReadWaitMiss;
-	ULONG  CopyReadNoWait;
-	ULONG  CopyReadWait;
-	ULONG  CopyReadNoWaitMiss;
-	ULONG  CopyReadWaitMiss;
-	ULONG  MdlReadNoWait;
-	ULONG  MdlReadWait;
-	ULONG  MdlReadNoWaitMiss;
-	ULONG  MdlReadWaitMiss;
-	ULONG  ReadAheadIos;
-	ULONG  LazyWriteIos;
-	ULONG  LazyWritePages;
-	ULONG  DataFlushes;
-	ULONG  DataPages;
-	ULONG  ContextSwitches;
-	ULONG  FirstLevelTbFills;
-	ULONG  SecondLevelTbFills;
-	ULONG  SystemCalls;
+  LARGE_INTEGER  IdleTime;
+  LARGE_INTEGER  ReadTransferCount;
+  LARGE_INTEGER  WriteTransferCount;
+  LARGE_INTEGER  OtherTransferCount;
+  ULONG  ReadOperationCount;
+  ULONG  WriteOperationCount;
+  ULONG  OtherOperationCount;
+  ULONG  AvailablePages;
+  ULONG  TotalCommittedPages;
+  ULONG  TotalCommitLimit;
+  ULONG  PeakCommitment;
+  ULONG  PageFaults;
+  ULONG  WriteCopyFaults;
+  ULONG  TransitionFaults;
+  ULONG  CacheTransitionFaults;
+  ULONG  DemandZeroFaults;
+  ULONG  PagesRead;
+  ULONG  PageReadIos;
+  ULONG   CacheReads;
+  ULONG   CacheIos;
+  ULONG  PagefilePagesWritten;
+  ULONG  PagefilePageWriteIos;
+  ULONG  MappedFilePagesWritten;
+  ULONG  MappedFilePageWriteIos;
+  ULONG  PagedPoolUsage;
+  ULONG  NonPagedPoolUsage;
+  ULONG  PagedPoolAllocs;
+  ULONG  PagedPoolFrees;
+  ULONG  NonPagedPoolAllocs;
+  ULONG  NonPagedPoolFrees;
+  ULONG  TotalFreeSystemPtes;
+  ULONG  SystemCodePage;
+  ULONG  TotalSystemDriverPages;
+  ULONG  TotalSystemCodePages;
+  ULONG  SmallNonPagedLookasideListAllocateHits;
+  ULONG  SmallPagedLookasideListAllocateHits;
+  ULONG  Reserved3;
+  ULONG  MmSystemCachePage;
+  ULONG  PagedPoolPage;
+  ULONG  SystemDriverPage;
+  ULONG  FastReadNoWait;
+  ULONG  FastReadWait;
+  ULONG  FastReadResourceMiss;
+  ULONG  FastReadNotPossible;
+  ULONG  FastMdlReadNoWait;
+  ULONG  FastMdlReadWait;
+  ULONG  FastMdlReadResourceMiss;
+  ULONG  FastMdlReadNotPossible;
+  ULONG  MapDataNoWait;
+  ULONG  MapDataWait;
+  ULONG  MapDataNoWaitMiss;
+  ULONG  MapDataWaitMiss;
+  ULONG  PinMappedDataCount;
+  ULONG  PinReadNoWait;
+  ULONG  PinReadWait;
+  ULONG  PinReadNoWaitMiss;
+  ULONG  PinReadWaitMiss;
+  ULONG  CopyReadNoWait;
+  ULONG  CopyReadWait;
+  ULONG  CopyReadNoWaitMiss;
+  ULONG  CopyReadWaitMiss;
+  ULONG  MdlReadNoWait;
+  ULONG  MdlReadWait;
+  ULONG  MdlReadNoWaitMiss;
+  ULONG  MdlReadWaitMiss;
+  ULONG  ReadAheadIos;
+  ULONG  LazyWriteIos;
+  ULONG  LazyWritePages;
+  ULONG  DataFlushes;
+  ULONG  DataPages;
+  ULONG  ContextSwitches;
+  ULONG  FirstLevelTbFills;
+  ULONG  SecondLevelTbFills;
+  ULONG  SystemCalls;
 } SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION;
 
 typedef struct _SYSTEM_TIME_OF_DAY_INFORMATION {
-	LARGE_INTEGER  BootTime;
-	LARGE_INTEGER  CurrentTime;
-	LARGE_INTEGER  TimeZoneBias;
-	ULONG  CurrentTimeZoneId;
+  LARGE_INTEGER  BootTime;
+  LARGE_INTEGER  CurrentTime;
+  LARGE_INTEGER  TimeZoneBias;
+  ULONG  CurrentTimeZoneId;
 } SYSTEM_TIME_OF_DAY_INFORMATION, *PSYSTEM_TIME_OF_DAY_INFORMATION;
 
 typedef struct _VM_COUNTERS {
-	ULONG  PeakVirtualSize;
-	ULONG  VirtualSize;
-	ULONG  PageFaultCount;
-	ULONG  PeakWorkingSetSize;
-	ULONG  WorkingSetSize;
-	ULONG  QuotaPeakPagedPoolUsage;
-	ULONG  QuotaPagedPoolUsage;
-	ULONG  QuotaPeakNonPagedPoolUsage;
-	ULONG  QuotaNonPagedPoolUsage;
-	ULONG  PagefileUsage;
-	ULONG  PeakPagefileUsage;
+  ULONG  PeakVirtualSize;
+  ULONG  VirtualSize;
+  ULONG  PageFaultCount;
+  ULONG  PeakWorkingSetSize;
+  ULONG  WorkingSetSize;
+  ULONG  QuotaPeakPagedPoolUsage;
+  ULONG  QuotaPagedPoolUsage;
+  ULONG  QuotaPeakNonPagedPoolUsage;
+  ULONG  QuotaNonPagedPoolUsage;
+  ULONG  PagefileUsage;
+  ULONG  PeakPagefileUsage;
 } VM_COUNTERS;
 
 typedef enum _THREAD_STATE {
-	StateInitialized,
-	StateReady,
-	StateRunning,
-	StateStandby,
-	StateTerminated,
-	StateWait,
-	StateTransition,
-	StateUnknown
+  StateInitialized,
+  StateReady,
+  StateRunning,
+  StateStandby,
+  StateTerminated,
+  StateWait,
+  StateTransition,
+  StateUnknown
 } THREAD_STATE;
 
 typedef struct _SYSTEM_THREADS {
-	LARGE_INTEGER  KernelTime;
-	LARGE_INTEGER  UserTime;
-	LARGE_INTEGER  CreateTime;
-	ULONG  WaitTime;
-	PVOID  StartAddress;
-	CLIENT_ID  ClientId;
-	KPRIORITY  Priority;
-	KPRIORITY  BasePriority;
-	ULONG  ContextSwitchCount;
-	THREAD_STATE  State;
-	KWAIT_REASON  WaitReason;
+  LARGE_INTEGER  KernelTime;
+  LARGE_INTEGER  UserTime;
+  LARGE_INTEGER  CreateTime;
+  ULONG  WaitTime;
+  PVOID  StartAddress;
+  CLIENT_ID  ClientId;
+  KPRIORITY  Priority;
+  KPRIORITY  BasePriority;
+  ULONG  ContextSwitchCount;
+  THREAD_STATE  State;
+  KWAIT_REASON  WaitReason;
 } SYSTEM_THREADS, *PSYSTEM_THREADS;
 
 typedef struct _SYSTEM_PROCESSES {
-	ULONG  NextEntryDelta;
-	ULONG  ThreadCount;
-	ULONG  Reserved1[6];
-	LARGE_INTEGER  CreateTime;
-	LARGE_INTEGER  UserTime;
-	LARGE_INTEGER  KernelTime;
-	UNICODE_STRING  ProcessName;
-	KPRIORITY  BasePriority;
-	ULONG  ProcessId;
-	ULONG  InheritedFromProcessId;
-	ULONG  HandleCount;
-	ULONG  Reserved2[2];
-	VM_COUNTERS  VmCounters;
-	IO_COUNTERS  IoCounters;
-	SYSTEM_THREADS  Threads[1];
+  ULONG  NextEntryDelta;
+  ULONG  ThreadCount;
+  ULONG  Reserved1[6];
+  LARGE_INTEGER  CreateTime;
+  LARGE_INTEGER  UserTime;
+  LARGE_INTEGER  KernelTime;
+  UNICODE_STRING  ProcessName;
+  KPRIORITY  BasePriority;
+  ULONG  ProcessId;
+  ULONG  InheritedFromProcessId;
+  ULONG  HandleCount;
+  ULONG  Reserved2[2];
+  VM_COUNTERS  VmCounters;
+  IO_COUNTERS  IoCounters;
+  SYSTEM_THREADS  Threads[1];
 } SYSTEM_PROCESSES, *PSYSTEM_PROCESSES;
 
 typedef struct _SYSTEM_CALLS_INFORMATION {
-	ULONG  Size;
-	ULONG  NumberOfDescriptorTables;
-	ULONG  NumberOfRoutinesInTable[1];
-	ULONG  CallCounts[ANYSIZE_ARRAY];
+  ULONG  Size;
+  ULONG  NumberOfDescriptorTables;
+  ULONG  NumberOfRoutinesInTable[1];
+  ULONG  CallCounts[ANYSIZE_ARRAY];
 } SYSTEM_CALLS_INFORMATION, *PSYSTEM_CALLS_INFORMATION;
 
 typedef struct _SYSTEM_CONFIGURATION_INFORMATION {
-	ULONG  DiskCount;
-	ULONG  FloppyCount;
-	ULONG  CdRomCount;
-	ULONG  TapeCount;
-	ULONG  SerialCount;
-	ULONG  ParallelCount;
+  ULONG  DiskCount;
+  ULONG  FloppyCount;
+  ULONG  CdRomCount;
+  ULONG  TapeCount;
+  ULONG  SerialCount;
+  ULONG  ParallelCount;
 } SYSTEM_CONFIGURATION_INFORMATION, *PSYSTEM_CONFIGURATION_INFORMATION;
 
 typedef struct _SYSTEM_PROCESSOR_TIMES {
-	LARGE_INTEGER  IdleTime;
-	LARGE_INTEGER  KernelTime;
-	LARGE_INTEGER  UserTime;
-	LARGE_INTEGER  DpcTime;
-	LARGE_INTEGER  InterruptTime;
-	ULONG  InterruptCount;
+  LARGE_INTEGER  IdleTime;
+  LARGE_INTEGER  KernelTime;
+  LARGE_INTEGER  UserTime;
+  LARGE_INTEGER  DpcTime;
+  LARGE_INTEGER  InterruptTime;
+  ULONG  InterruptCount;
 } SYSTEM_PROCESSOR_TIMES, *PSYSTEM_PROCESSOR_TIMES;
 
 /* SYSTEM_GLOBAL_FLAG.GlobalFlag constants */
@@ -363,35 +363,35 @@
 } SYSTEM_GLOBAL_FLAG, *PSYSTEM_GLOBAL_FLAG;
 
 typedef struct _SYSTEM_MODULE_INFORMATION_ENTRY {
-	ULONG	 Unknown1;
-	ULONG	 Unknown2;
-	PVOID  Base;
-	ULONG  Size;
-	ULONG  Flags;
-	USHORT  Index;
+  ULONG   Unknown1;
+  ULONG   Unknown2;
+  PVOID  Base;
+  ULONG  Size;
+  ULONG  Flags;
+  USHORT  Index;
   /* Length of module name not including the path, this
      field contains valid value only for NTOSKRNL module */
-	USHORT	NameLength;
-	USHORT  LoadCount;
-	USHORT  PathLength;
-	CHAR  ImageName[256];
+  USHORT  NameLength;
+  USHORT  LoadCount;
+  USHORT  PathLength;
+  CHAR  ImageName[256];
 } SYSTEM_MODULE_INFORMATION_ENTRY, *PSYSTEM_MODULE_INFORMATION_ENTRY;
 
 typedef struct _SYSTEM_MODULE_INFORMATION {
-	ULONG  Count;
+  ULONG  Count;
   SYSTEM_MODULE_INFORMATION_ENTRY Module[1];
 } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
 
 typedef struct _SYSTEM_LOCK_INFORMATION {
-	PVOID  Address;
-	USHORT  Type;
-	USHORT  Reserved1;
-	ULONG  ExclusiveOwnerThreadId;
-	ULONG  ActiveCount;
-	ULONG  ContentionCount;
-	ULONG  Reserved2[2];
-	ULONG  NumberOfSharedWaiters;
-	ULONG  NumberOfExclusiveWaiters;
+  PVOID  Address;
+  USHORT  Type;
+  USHORT  Reserved1;
+  ULONG  ExclusiveOwnerThreadId;
+  ULONG  ActiveCount;
+  ULONG  ContentionCount;
+  ULONG  Reserved2[2];
+  ULONG  NumberOfSharedWaiters;
+  ULONG  NumberOfExclusiveWaiters;
 } SYSTEM_LOCK_INFORMATION, *PSYSTEM_LOCK_INFORMATION;
 
 /*SYSTEM_HANDLE_INFORMATION.Flags cosntants */
@@ -399,25 +399,25 @@
 #define INHERIT                           0x02
 
 typedef struct _SYSTEM_HANDLE_INFORMATION {
-	ULONG  ProcessId;
-	UCHAR  ObjectTypeNumber;
-	UCHAR  Flags;
-	USHORT  Handle;
-	PVOID  Object;
-	ACCESS_MASK  GrantedAccess;
+  ULONG  ProcessId;
+  UCHAR  ObjectTypeNumber;
+  UCHAR  Flags;
+  USHORT  Handle;
+  PVOID  Object;
+  ACCESS_MASK  GrantedAccess;
 } SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION;
 
 typedef struct _SYSTEM_OBJECT_TYPE_INFORMATION {
-	ULONG  NextEntryOffset;
-	ULONG  ObjectCount;
-	ULONG  HandleCount;
-	ULONG  TypeNumber;
-	ULONG  InvalidAttributes;
-	GENERIC_MAPPING  GenericMapping;
-	ACCESS_MASK  ValidAccessMask;
-	POOL_TYPE  PoolType;
-	UCHAR  Unknown;
-	UNICODE_STRING  Name;
+  ULONG  NextEntryOffset;
+  ULONG  ObjectCount;
+  ULONG  HandleCount;
+  ULONG  TypeNumber;
+  ULONG  InvalidAttributes;
+  GENERIC_MAPPING  GenericMapping;
+  ACCESS_MASK  ValidAccessMask;
+  POOL_TYPE  PoolType;
+  UCHAR  Unknown;
+  UNICODE_STRING  Name;
 } SYSTEM_OBJECT_TYPE_INFORMATION, *PSYSTEM_OBJECT_TYPE_INFORMATION;
 
 /* SYSTEM_OBJECT_INFORMATION.Flags constants */
@@ -429,98 +429,98 @@
 #define FLG_SYSOBJINFO_KERNEL_MODE            0x02
 
 typedef struct _SYSTEM_OBJECT_INFORMATION {
-	ULONG  NextEntryOffset;
-	PVOID  Object;
-	ULONG  CreatorProcessId;
-	USHORT  Unknown;
-	USHORT  Flags;
-	ULONG  PointerCount;
-	ULONG  HandleCount;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  ExclusiveProcessId;
-	PSECURITY_DESCRIPTOR  SecurityDescriptor;
-	UNICODE_STRING  Name;
+  ULONG  NextEntryOffset;
+  PVOID  Object;
+  ULONG  CreatorProcessId;
+  USHORT  Unknown;
+  USHORT  Flags;
+  ULONG  PointerCount;
+  ULONG  HandleCount;
+  ULONG  PagedPoolUsage;
+  ULONG  NonPagedPoolUsage;
+  ULONG  ExclusiveProcessId;
+  PSECURITY_DESCRIPTOR  SecurityDescriptor;
+  UNICODE_STRING  Name;
 } SYSTEM_OBJECT_INFORMATION, *PSYSTEM_OBJECT_INFORMATION;
 
 typedef struct _SYSTEM_PAGEFILE_INFORMATION {
-	ULONG  NextEntryOffset;
-	ULONG  CurrentSize;
-	ULONG  TotalUsed;
-	ULONG  PeakUsed;
-	UNICODE_STRING  FileName;
+  ULONG  NextEntryOffset;
+  ULONG  CurrentSize;
+  ULONG  TotalUsed;
+  ULONG  PeakUsed;
+  UNICODE_STRING  FileName;
 } SYSTEM_PAGEFILE_INFORMATION, *PSYSTEM_PAGEFILE_INFORMATION;
 
 typedef struct _SYSTEM_INSTRUCTION_EMULATION_INFORMATION {
-	ULONG  SegmentNotPresent;
-	ULONG  TwoByteOpcode;
-	ULONG  ESprefix;
-	ULONG  CSprefix;
-	ULONG  SSprefix;
-	ULONG  DSprefix;
-	ULONG  FSPrefix;
-	ULONG  GSprefix;
-	ULONG  OPER32prefix;
-	ULONG  ADDR32prefix;
-	ULONG  INSB;
-	ULONG  INSW;
-	ULONG  OUTSB;
-	ULONG  OUTSW;
-	ULONG  PUSHFD;
-	ULONG  POPFD;
-	ULONG  INTnn;
-	ULONG  INTO;
-	ULONG  IRETD;
-	ULONG  INBimm;
-	ULONG  INWimm;
-	ULONG  OUTBimm;
-	ULONG  OUTWimm;
-	ULONG  INB;
-	ULONG  INW;
-	ULONG  OUTB;
-	ULONG  OUTW;
-	ULONG  LOCKprefix;
-	ULONG  REPNEprefix;
-	ULONG  REPprefix;
-	ULONG  HLT;
-	ULONG  CLI;
-	ULONG  STI;
-	ULONG  GenericInvalidOpcode;
+  ULONG  SegmentNotPresent;
+  ULONG  TwoByteOpcode;
+  ULONG  ESprefix;
+  ULONG  CSprefix;
+  ULONG  SSprefix;
+  ULONG  DSprefix;
+  ULONG  FSPrefix;
+  ULONG  GSprefix;
+  ULONG  OPER32prefix;
+  ULONG  ADDR32prefix;
+  ULONG  INSB;
+  ULONG  INSW;
+  ULONG  OUTSB;
+  ULONG  OUTSW;
+  ULONG  PUSHFD;
+  ULONG  POPFD;
+  ULONG  INTnn;
+  ULONG  INTO;
+  ULONG  IRETD;
+  ULONG  INBimm;
+  ULONG  INWimm;
+  ULONG  OUTBimm;
+  ULONG  OUTWimm;
+  ULONG  INB;
+  ULONG  INW;
+  ULONG  OUTB;
+  ULONG  OUTW;
+  ULONG  LOCKprefix;
+  ULONG  REPNEprefix;
+  ULONG  REPprefix;
+  ULONG  HLT;
+  ULONG  CLI;
+  ULONG  STI;
+  ULONG  GenericInvalidOpcode;
 } SYSTEM_INSTRUCTION_EMULATION_INFORMATION, *PSYSTEM_INSTRUCTION_EMULATION_INFORMATION;
 
 typedef struct _SYSTEM_POOL_TAG_INFORMATION {
-	CHAR  Tag[4];
-	ULONG  PagedPoolAllocs;
-	ULONG  PagedPoolFrees;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolAllocs;
-	ULONG  NonPagedPoolFrees;
-	ULONG  NonPagedPoolUsage;
+  CHAR  Tag[4];
+  ULONG  PagedPoolAllocs;
+  ULONG  PagedPoolFrees;
+  ULONG  PagedPoolUsage;
+  ULONG  NonPagedPoolAllocs;
+  ULONG  NonPagedPoolFrees;
+  ULONG  NonPagedPoolUsage;
 } SYSTEM_POOL_TAG_INFORMATION, *PSYSTEM_POOL_TAG_INFORMATION;
 
 typedef struct _SYSTEM_PROCESSOR_STATISTICS {
-	ULONG  ContextSwitches;
-	ULONG  DpcCount;
-	ULONG  DpcRequestRate;
-	ULONG  TimeIncrement;
-	ULONG  DpcBypassCount;
-	ULONG  ApcBypassCount;
+  ULONG  ContextSwitches;
+  ULONG  DpcCount;
+  ULONG  DpcRequestRate;
+  ULONG  TimeIncrement;
+  ULONG  DpcBypassCount;
+  ULONG  ApcBypassCount;
 } SYSTEM_PROCESSOR_STATISTICS, *PSYSTEM_PROCESSOR_STATISTICS;
 
 typedef struct _SYSTEM_DPC_INFORMATION {
-	ULONG  Reserved;
-	ULONG  MaximumDpcQueueDepth;
-	ULONG  MinimumDpcRate;
-	ULONG  AdjustDpcThreshold;
-	ULONG  IdealDpcRate;
+  ULONG  Reserved;
+  ULONG  MaximumDpcQueueDepth;
+  ULONG  MinimumDpcRate;
+  ULONG  AdjustDpcThreshold;
+  ULONG  IdealDpcRate;
 } SYSTEM_DPC_INFORMATION, *PSYSTEM_DPC_INFORMATION;
 
 typedef struct _SYSTEM_LOAD_IMAGE {
-	UNICODE_STRING  ModuleName;
-	PVOID  ModuleBase;
-	PVOID  SectionPointer;
-	PVOID  EntryPoint;
-	PVOID  ExportDirectory;
+  UNICODE_STRING  ModuleName;
+  PVOID  ModuleBase;
+  PVOID  SectionPointer;
+  PVOID  EntryPoint;
+  PVOID  ExportDirectory;
 } SYSTEM_LOAD_IMAGE, *PSYSTEM_LOAD_IMAGE;
 
 typedef struct _SYSTEM_UNLOAD_IMAGE {
@@ -528,47 +528,47 @@
 } SYSTEM_UNLOAD_IMAGE, *PSYSTEM_UNLOAD_IMAGE;
 
 typedef struct _SYSTEM_QUERY_TIME_ADJUSTMENT {
-	ULONG  TimeAdjustment;
-	ULONG  MaximumIncrement;
-	BOOLEAN  TimeSynchronization;
+  ULONG  TimeAdjustment;
+  ULONG  MaximumIncrement;
+  BOOLEAN  TimeSynchronization;
 } SYSTEM_QUERY_TIME_ADJUSTMENT, *PSYSTEM_QUERY_TIME_ADJUSTMENT;
 
 typedef struct _SYSTEM_SET_TIME_ADJUSTMENT {
-	ULONG  TimeAdjustment;
-	BOOLEAN  TimeSynchronization;
+  ULONG  TimeAdjustment;
+  BOOLEAN  TimeSynchronization;
 } SYSTEM_SET_TIME_ADJUSTMENT, *PSYSTEM_SET_TIME_ADJUSTMENT;
 
 typedef struct _SYSTEM_CRASH_DUMP_INFORMATION {
-	HANDLE  CrashDumpSectionHandle;
-	HANDLE  Unknown;
+  HANDLE  CrashDumpSectionHandle;
+  HANDLE  Unknown;
 } SYSTEM_CRASH_DUMP_INFORMATION, *PSYSTEM_CRASH_DUMP_INFORMATION;
 
 typedef struct _SYSTEM_EXCEPTION_INFORMATION {
-	ULONG  AlignmentFixupCount;
-	ULONG  ExceptionDispatchCount;
-	ULONG  FloatingEmulationCount;
-	ULONG  Reserved;
+  ULONG  AlignmentFixupCount;
+  ULONG  ExceptionDispatchCount;
+  ULONG  FloatingEmulationCount;
+  ULONG  Reserved;
 } SYSTEM_EXCEPTION_INFORMATION, *PSYSTEM_EXCEPTION_INFORMATION;
 
 typedef struct _SYSTEM_CRASH_DUMP_STATE_INFORMATION {
-	ULONG  CrashDumpSectionExists;
-	ULONG  Unknown;
+  ULONG  CrashDumpSectionExists;
+  ULONG  Unknown;
 } SYSTEM_CRASH_DUMP_STATE_INFORMATION, *PSYSTEM_CRASH_DUMP_STATE_INFORMATION;
 
 typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION {
-	BOOLEAN  DebuggerEnabled;
-	BOOLEAN  DebuggerNotPresent;
+  BOOLEAN  DebuggerEnabled;
+  BOOLEAN  DebuggerNotPresent;
 } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION;
 
 typedef struct _SYSTEM_CONTEXT_SWITCH_INFORMATION {
-	ULONG  ContextSwitches;
-	ULONG  ContextSwitchCounters[11];
+  ULONG  ContextSwitches;
+  ULONG  ContextSwitchCounters[11];
 } SYSTEM_CONTEXT_SWITCH_INFORMATION, *PSYSTEM_CONTEXT_SWITCH_INFORMATION;
 
 typedef struct _SYSTEM_REGISTRY_QUOTA_INFORMATION {
-	ULONG  RegistryQuota;
-	ULONG  RegistryQuotaInUse;
-	ULONG  PagedPoolSize;
+  ULONG  RegistryQuota;
+  ULONG  RegistryQuotaInUse;
+  ULONG  PagedPoolSize;
 } SYSTEM_REGISTRY_QUOTA_INFORMATION, *PSYSTEM_REGISTRY_QUOTA_INFORMATION;
 
 typedef struct _SYSTEM_LOAD_AND_CALL_IMAGE {
@@ -580,25 +580,25 @@
 } SYSTEM_PRIORITY_SEPARATION, *PSYSTEM_PRIORITY_SEPARATION;
 
 typedef struct _SYSTEM_TIME_ZONE_INFORMATION {
-	LONG  Bias;
-	WCHAR  StandardName[32];
-	LARGE_INTEGER  StandardDate;
-	LONG  StandardBias;
-	WCHAR  DaylightName[32];
-	LARGE_INTEGER  DaylightDate;
-	LONG  DaylightBias;
+  LONG  Bias;
+  WCHAR  StandardName[32];
+  LARGE_INTEGER  StandardDate;
+  LONG  StandardBias;
+  WCHAR  DaylightName[32];
+  LARGE_INTEGER  DaylightDate;
+  LONG  DaylightBias;
 } SYSTEM_TIME_ZONE_INFORMATION, *PSYSTEM_TIME_ZONE_INFORMATION;
 
 typedef struct _SYSTEM_LOOKASIDE_INFORMATION {
-	USHORT  Depth;
-	USHORT  MaximumDepth;
-	ULONG  TotalAllocates;
-	ULONG  AllocateMisses;
-	ULONG  TotalFrees;
-	ULONG  FreeMisses;
-	POOL_TYPE  Type;
-	ULONG  Tag;
-	ULONG  Size;
+  USHORT  Depth;
+  USHORT  MaximumDepth;
+  ULONG  TotalAllocates;
+  ULONG  AllocateMisses;
+  ULONG  TotalFrees;
+  ULONG  FreeMisses;
+  POOL_TYPE  Type;
+  ULONG  Tag;
+  ULONG  Size;
 } SYSTEM_LOOKASIDE_INFORMATION, *PSYSTEM_LOOKASIDE_INFORMATION;
 
 typedef struct _SYSTEM_SET_TIME_SLIP_EVENT {
@@ -618,116 +618,116 @@
 } SYSTEM_RANGE_START_INFORMATION, *PSYSTEM_RANGE_START_INFORMATION;
 
 typedef struct _SYSTEM_SESSION_PROCESSES_INFORMATION {
-	ULONG  SessionId;
-	ULONG  BufferSize;
-	PVOID  Buffer;
+  ULONG  SessionId;
+  ULONG  BufferSize;
+  PVOID  Buffer;
 } SYSTEM_SESSION_PROCESSES_INFORMATION, *PSYSTEM_SESSION_PROCESSES_INFORMATION;
 
 typedef struct _SYSTEM_POOL_BLOCK {
-	BOOLEAN  Allocated;
-	USHORT  Unknown;
-	ULONG  Size;
-	CHAR  Tag[4];
+  BOOLEAN  Allocated;
+  USHORT  Unknown;
+  ULONG  Size;
+  CHAR  Tag[4];
 } SYSTEM_POOL_BLOCK, *PSYSTEM_POOL_BLOCK;
 
 typedef struct _SYSTEM_POOL_BLOCKS_INFORMATION {
-	ULONG  PoolSize;
-	PVOID  PoolBase;
-	USHORT  Unknown;
-	ULONG  NumberOfBlocks;
-	SYSTEM_POOL_BLOCK  PoolBlocks[1];
+  ULONG  PoolSize;
+  PVOID  PoolBase;
+  USHORT  Unknown;
+  ULONG  NumberOfBlocks;
+  SYSTEM_POOL_BLOCK  PoolBlocks[1];
 } SYSTEM_POOL_BLOCKS_INFORMATION, *PSYSTEM_POOL_BLOCKS_INFORMATION;
 
 typedef struct _SYSTEM_MEMORY_USAGE {
-	PVOID  Name;
-	USHORT  Valid;
-	USHORT  Standby;
-	USHORT  Modified;
-	USHORT  PageTables;
+  PVOID  Name;
+  USHORT  Valid;
+  USHORT  Standby;
+  USHORT  Modified;
+  USHORT  PageTables;
 } SYSTEM_MEMORY_USAGE, *PSYSTEM_MEMORY_USAGE;
 
 typedef struct _SYSTEM_MEMORY_USAGE_INFORMATION {
-  	ULONG  Reserved;
-	PVOID  EndOfData;
-	SYSTEM_MEMORY_USAGE  MemoryUsage[1];
+    ULONG  Reserved;
+  PVOID  EndOfData;
+  SYSTEM_MEMORY_USAGE  MemoryUsage[1];
 } SYSTEM_MEMORY_USAGE_INFORMATION, *PSYSTEM_MEMORY_USAGE_INFORMATION;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtQuerySystemInformation(
-  IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
-  IN OUT PVOID  SystemInformation,
-  IN ULONG  SystemInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
+  __W32_IN __W32_OUT PVOID  SystemInformation,
+  __W32_IN ULONG  SystemInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQuerySystemInformation(
-  IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
-  IN OUT PVOID  SystemInformation,
-  IN ULONG  SystemInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
+  __W32_IN __W32_OUT PVOID  SystemInformation,
+  __W32_IN ULONG  SystemInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTAPI
 NTSTATUS
 NtQueryFullAttributesFile(
-	IN POBJECT_ATTRIBUTES ObjectAttributes,
-	OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
+  __W32_IN POBJECT_ATTRIBUTES ObjectAttributes,
+  __W32_OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
 
 NTOSAPI
 NTAPI
 NTSTATUS
 ZwQueryFullAttributesFile(
-	IN POBJECT_ATTRIBUTES ObjectAttributes,
- 	OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
+  __W32_IN POBJECT_ATTRIBUTES ObjectAttributes,
+   __W32_OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetSystemInformation(
-	IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
-	IN OUT PVOID  SystemInformation,
-	IN ULONG  SystemInformationLength);
+  __W32_IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
+  __W32_IN __W32_OUT PVOID  SystemInformation,
+  __W32_IN ULONG  SystemInformationLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQuerySystemEnvironmentValue(
-	IN PUNICODE_STRING  Name,
-	OUT PVOID  Value,
-	IN ULONG  ValueLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN PUNICODE_STRING  Name,
+  __W32_OUT PVOID  Value,
+  __W32_IN ULONG  ValueLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetSystemEnvironmentValue(
-	IN PUNICODE_STRING  Name,
-	IN PUNICODE_STRING  Value);
+  __W32_IN PUNICODE_STRING  Name,
+  __W32_IN PUNICODE_STRING  Value);
 
 typedef enum _SHUTDOWN_ACTION {
-	ShutdownNoReboot,
-	ShutdownReboot,
-	ShutdownPowerOff
+  ShutdownNoReboot,
+  ShutdownReboot,
+  ShutdownPowerOff
 } SHUTDOWN_ACTION;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtShutdownSystem(
-  IN SHUTDOWN_ACTION  Action);
+  __W32_IN SHUTDOWN_ACTION  Action);
 
 typedef enum _DEBUG_CONTROL_CODE {
   DebugGetTraceInformation = 1,
-	DebugSetInternalBreakpoint,
-	DebugSetSpecialCall,
-	DebugClearSpecialCalls,
-	DebugQuerySpecialCalls,
-	DebugDbgBreakPoint,
-	DebugMaximum
+  DebugSetInternalBreakpoint,
+  DebugSetSpecialCall,
+  DebugClearSpecialCalls,
+  DebugQuerySpecialCalls,
+  DebugDbgBreakPoint,
+  DebugMaximum
 } DEBUG_CONTROL_CODE;
 
 
@@ -735,43 +735,43 @@
 NTSTATUS
 NTAPI
 ZwSystemDebugControl(
-	IN DEBUG_CONTROL_CODE  ControlCode,
-	IN PVOID  InputBuffer  OPTIONAL,
-	IN ULONG  InputBufferLength,
-	OUT PVOID  OutputBuffer  OPTIONAL,
-	IN ULONG  OutputBufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN DEBUG_CONTROL_CODE  ControlCode,
+  __W32_IN PVOID  InputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  InputBufferLength,
+  __W32_OUT PVOID  OutputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  OutputBufferLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 
 
 /* Objects, Object directories, and symbolic links */
 
 typedef enum _OBJECT_INFORMATION_CLASS {
-	ObjectBasicInformation,
-	ObjectNameInformation,
-	ObjectTypeInformation,
-	ObjectAllTypesInformation,
-	ObjectHandleInformation
+  ObjectBasicInformation,
+  ObjectNameInformation,
+  ObjectTypeInformation,
+  ObjectAllTypesInformation,
+  ObjectHandleInformation
 } OBJECT_INFORMATION_CLASS;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryObject(
-	IN HANDLE  ObjectHandle,
-	IN OBJECT_INFORMATION_CLASS  ObjectInformationClass,
-	OUT PVOID  ObjectInformation,
-	IN ULONG  ObjectInformationLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  ObjectHandle,
+  __W32_IN OBJECT_INFORMATION_CLASS  ObjectInformationClass,
+  __W32_OUT PVOID  ObjectInformation,
+  __W32_IN ULONG  ObjectInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetInformationObject(
-	IN HANDLE  ObjectHandle,
-	IN OBJECT_INFORMATION_CLASS  ObjectInformationClass,
-	IN PVOID  ObjectInformation,
-	IN ULONG  ObjectInformationLength);
+  __W32_IN HANDLE  ObjectHandle,
+  __W32_IN OBJECT_INFORMATION_CLASS  ObjectInformationClass,
+  __W32_IN PVOID  ObjectInformation,
+  __W32_IN ULONG  ObjectInformationLength);
 
 /* OBJECT_BASIC_INFORMATION.Attributes constants */
 /* also in winbase.h */
@@ -782,36 +782,36 @@
 #define EXCLUSIVE                         0x20
 
 typedef struct _OBJECT_BASIC_INFORMATION {
-	ULONG  Attributes;
-	ACCESS_MASK  GrantedAccess;
-	ULONG  HandleCount;
-	ULONG  PointerCount;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  Reserved[3];
-	ULONG  NameInformationLength;
-	ULONG  TypeInformationLength;
-	ULONG  SecurityDescriptorLength;
-	LARGE_INTEGER  CreateTime;
+  ULONG  Attributes;
+  ACCESS_MASK  GrantedAccess;
+  ULONG  HandleCount;
+  ULONG  PointerCount;
+  ULONG  PagedPoolUsage;
+  ULONG  NonPagedPoolUsage;
+  ULONG  Reserved[3];
+  ULONG  NameInformationLength;
+  ULONG  TypeInformationLength;
+  ULONG  SecurityDescriptorLength;
+  LARGE_INTEGER  CreateTime;
 } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION;
 #if 0
 /* FIXME: Enable later */
 typedef struct _OBJECT_TYPE_INFORMATION {
-	UNICODE_STRING  Name;
-	ULONG  ObjectCount;
-	ULONG  HandleCount;
-	ULONG  Reserved1[4];
-	ULONG  PeakObjectCount;
-	ULONG  PeakHandleCount;
-	ULONG  Reserved2[4];
-	ULONG  InvalidAttributes;
-	GENERIC_MAPPING  GenericMapping;
-	ULONG  ValidAccess;
-	UCHAR  Unknown;
-	BOOLEAN  MaintainHandleDatabase;
-	POOL_TYPE  PoolType;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
+  UNICODE_STRING  Name;
+  ULONG  ObjectCount;
+  ULONG  HandleCount;
+  ULONG  Reserved1[4];
+  ULONG  PeakObjectCount;
+  ULONG  PeakHandleCount;
+  ULONG  Reserved2[4];
+  ULONG  InvalidAttributes;
+  GENERIC_MAPPING  GenericMapping;
+  ULONG  ValidAccess;
+  UCHAR  Unknown;
+  BOOLEAN  MaintainHandleDatabase;
+  POOL_TYPE  PoolType;
+  ULONG  PagedPoolUsage;
+  ULONG  NonPagedPoolUsage;
 } OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION;
 
 typedef struct _OBJECT_ALL_TYPES_INFORMATION {
@@ -828,81 +828,81 @@
 NTSTATUS
 NTAPI
 NtDuplicateObject(
-  IN HANDLE  SourceProcessHandle,
-  IN HANDLE  SourceHandle,
-  IN HANDLE  TargetProcessHandle,
-  OUT PHANDLE  TargetHandle  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  Attributes,
-  IN ULONG  Options);
+  __W32_IN HANDLE  SourceProcessHandle,
+  __W32_IN HANDLE  SourceHandle,
+  __W32_IN HANDLE  TargetProcessHandle,
+  __W32_OUT PHANDLE  TargetHandle  __W32_OPTIONAL,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN ULONG  Attributes,
+  __W32_IN ULONG  Options);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwDuplicateObject(
-  IN HANDLE  SourceProcessHandle,
-  IN HANDLE  SourceHandle,
-  IN HANDLE  TargetProcessHandle,
-  OUT PHANDLE  TargetHandle  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  Attributes,
-  IN ULONG  Options);
+  __W32_IN HANDLE  SourceProcessHandle,
+  __W32_IN HANDLE  SourceHandle,
+  __W32_IN HANDLE  TargetProcessHandle,
+  __W32_OUT PHANDLE  TargetHandle  __W32_OPTIONAL,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN ULONG  Attributes,
+  __W32_IN ULONG  Options);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtQuerySecurityObject(
-  IN HANDLE Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  SecurityDescriptorLength,
-  OUT PULONG  ReturnLength);
+  __W32_IN HANDLE Handle,
+  __W32_IN SECURITY_INFORMATION  SecurityInformation,
+  __W32_OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN ULONG  SecurityDescriptorLength,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQuerySecurityObject(
-  IN HANDLE Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  SecurityDescriptorLength,
-  OUT PULONG  ReturnLength);
+  __W32_IN HANDLE Handle,
+  __W32_IN SECURITY_INFORMATION  SecurityInformation,
+  __W32_OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN ULONG  SecurityDescriptorLength,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtSetSecurityObject(
-  IN HANDLE  Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
+  __W32_IN HANDLE  Handle,
+  __W32_IN SECURITY_INFORMATION  SecurityInformation,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetSecurityObject(
-  IN HANDLE  Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
+  __W32_IN HANDLE  Handle,
+  __W32_IN SECURITY_INFORMATION  SecurityInformation,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwOpenDirectoryObject(
-  OUT PHANDLE  DirectoryHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  DirectoryHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryDirectoryObject(
-  IN HANDLE  DirectoryHandle,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLength,
-  IN BOOLEAN  ReturnSingleEntry,
-  IN BOOLEAN  RestartScan,
-  IN OUT PULONG  Context,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  DirectoryHandle,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_IN BOOLEAN  ReturnSingleEntry,
+  __W32_IN BOOLEAN  RestartScan,
+  __W32_IN __W32_OUT PULONG  Context,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 typedef struct _DIRECTORY_BASIC_INFORMATION {
   UNICODE_STRING  ObjectName;
@@ -913,10 +913,10 @@
 NTSTATUS
 NTAPI
 ZwCreateSymbolicLinkObject(
-  OUT PHANDLE  SymbolicLinkHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PUNICODE_STRING  TargetName);
+  __W32_OUT PHANDLE  SymbolicLinkHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN PUNICODE_STRING  TargetName);
 
 
 
@@ -934,52 +934,52 @@
 NTSTATUS
 NTAPI
 NtAllocateVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN OUT PULONG  AllocationSize,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN ULONG  ZeroBits,
+  __W32_IN __W32_OUT PULONG  AllocationSize,
+  __W32_IN ULONG  AllocationType,
+  __W32_IN ULONG  Protect);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAllocateVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN OUT PULONG  AllocationSize,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN ULONG  ZeroBits,
+  __W32_IN __W32_OUT PULONG  AllocationSize,
+  __W32_IN ULONG  AllocationType,
+  __W32_IN ULONG  Protect);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtFreeVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN OUT PULONG  FreeSize,
-  IN ULONG  FreeType);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN __W32_OUT PULONG  FreeSize,
+  __W32_IN ULONG  FreeType);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwFreeVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN OUT PULONG  FreeSize,
-  IN ULONG  FreeType);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN __W32_OUT PULONG  FreeSize,
+  __W32_IN ULONG  FreeType);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	IN MEMORY_INFORMATION_CLASS  MemoryInformationClass,
-	OUT PVOID  MemoryInformation,
-	IN ULONG  MemoryInformationLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN MEMORY_INFORMATION_CLASS  MemoryInformationClass,
+  __W32_OUT PVOID  MemoryInformation,
+  __W32_IN ULONG  MemoryInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 /* MEMORY_WORKING_SET_LIST.WorkingSetList constants */
 #define WSLE_PAGE_READONLY                0x001
@@ -1009,110 +1009,110 @@
 NTSTATUS
 NTAPI
 ZwLockVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  LockSize,
-	IN ULONG  LockType);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN __W32_OUT PULONG  LockSize,
+  __W32_IN ULONG  LockType);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwUnlockVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  LockSize,
-	IN ULONG  LockType);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN __W32_OUT PULONG  LockSize,
+  __W32_IN ULONG  LockType);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReadVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	OUT PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  BaseAddress,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwWriteVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwProtectVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  ProtectSize,
-	IN ULONG  NewProtect,
-	OUT PULONG  OldProtect);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN __W32_OUT PULONG  ProtectSize,
+  __W32_IN ULONG  NewProtect,
+  __W32_OUT PULONG  OldProtect);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwFlushVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  FlushSize,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN __W32_OUT PULONG  FlushSize,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAllocateUserPhysicalPages(
-	IN HANDLE  ProcessHandle,
-	IN PULONG  NumberOfPages,
-	OUT PULONG  PageFrameNumbers);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PULONG  NumberOfPages,
+  __W32_OUT PULONG  PageFrameNumbers);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwFreeUserPhysicalPages(
-	IN HANDLE  ProcessHandle,
-	IN OUT PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PULONG  NumberOfPages,
+  __W32_IN PULONG  PageFrameNumbers);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwMapUserPhysicalPages(
-	IN PVOID  BaseAddress,
-	IN PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN PULONG  NumberOfPages,
+  __W32_IN PULONG  PageFrameNumbers);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwMapUserPhysicalPagesScatter(
-	IN PVOID  *BaseAddresses,
-	IN PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
+  __W32_IN PVOID  *BaseAddresses,
+  __W32_IN PULONG  NumberOfPages,
+  __W32_IN PULONG  PageFrameNumbers);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwGetWriteWatch(
-	IN HANDLE  ProcessHandle,
-	IN ULONG  Flags,
-	IN PVOID  BaseAddress,
-	IN ULONG  RegionSize,
-	OUT PULONG  Buffer,
-	IN OUT PULONG  BufferEntries,
-	OUT PULONG  Granularity);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN ULONG  Flags,
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN ULONG  RegionSize,
+  __W32_OUT PULONG  Buffer,
+  __W32_IN __W32_OUT PULONG  BufferEntries,
+  __W32_OUT PULONG  Granularity);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwResetWriteWatch(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	IN ULONG  RegionSize);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN ULONG  RegionSize);
 
 
 
@@ -1128,49 +1128,49 @@
 NTSTATUS
 NTAPI
 NtCreateSection(
-  OUT PHANDLE  SectionHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PLARGE_INTEGER  SectionSize  OPTIONAL,
-  IN ULONG  Protect,
-  IN ULONG  Attributes,
-  IN HANDLE  FileHandle);
+  __W32_OUT PHANDLE  SectionHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN PLARGE_INTEGER  SectionSize  __W32_OPTIONAL,
+  __W32_IN ULONG  Protect,
+  __W32_IN ULONG  Attributes,
+  __W32_IN HANDLE  FileHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCreateSection(
-  OUT PHANDLE  SectionHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PLARGE_INTEGER  SectionSize  OPTIONAL,
-  IN ULONG  Protect,
-  IN ULONG  Attributes,
-  IN HANDLE  FileHandle);
+  __W32_OUT PHANDLE  SectionHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN PLARGE_INTEGER  SectionSize  __W32_OPTIONAL,
+  __W32_IN ULONG  Protect,
+  __W32_IN ULONG  Attributes,
+  __W32_IN HANDLE  FileHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQuerySection(
-	IN HANDLE  SectionHandle,
-	IN SECTION_INFORMATION_CLASS  SectionInformationClass,
-	OUT PVOID  SectionInformation,
-	IN ULONG  SectionInformationLength,
-  OUT PULONG  ResultLength  OPTIONAL);
+  __W32_IN HANDLE  SectionHandle,
+  __W32_IN SECTION_INFORMATION_CLASS  SectionInformationClass,
+  __W32_OUT PVOID  SectionInformation,
+  __W32_IN ULONG  SectionInformationLength,
+  __W32_OUT PULONG  ResultLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwExtendSection(
-	IN HANDLE  SectionHandle,
-	IN PLARGE_INTEGER  SectionSize);
+  __W32_IN HANDLE  SectionHandle,
+  __W32_IN PLARGE_INTEGER  SectionSize);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAreMappedFilesTheSame(
-	IN PVOID  Address1,
-	IN PVOID  Address2);
+  __W32_IN PVOID  Address1,
+  __W32_IN PVOID  Address2);
 
 
 
@@ -1178,133 +1178,133 @@
 /* Threads */
 
 typedef struct _USER_STACK {
-	PVOID  FixedStackBase;
-	PVOID  FixedStackLimit;
-	PVOID  ExpandableStackBase;
-	PVOID  ExpandableStackLimit;
-	PVOID  ExpandableStackBottom;
+  PVOID  FixedStackBase;
+  PVOID  FixedStackLimit;
+  PVOID  ExpandableStackBase;
+  PVOID  ExpandableStackLimit;
+  PVOID  ExpandableStackBottom;
 } USER_STACK, *PUSER_STACK;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCreateThread(
-	OUT PHANDLE  ThreadHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN HANDLE  ProcessHandle,
-	OUT PCLIENT_ID  ClientId,
-	IN PCONTEXT  ThreadContext,
-	IN PUSER_STACK  UserStack,
-	IN BOOLEAN  CreateSuspended);
+  __W32_OUT PHANDLE  ThreadHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_OUT PCLIENT_ID  ClientId,
+  __W32_IN PCONTEXT  ThreadContext,
+  __W32_IN PUSER_STACK  UserStack,
+  __W32_IN BOOLEAN  CreateSuspended);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtOpenThread(
-  OUT PHANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PCLIENT_ID  ClientId);
+  __W32_OUT PHANDLE  ThreadHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN PCLIENT_ID  ClientId);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwOpenThread(
-  OUT PHANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PCLIENT_ID  ClientId);
+  __W32_OUT PHANDLE  ThreadHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN PCLIENT_ID  ClientId);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwTerminateThread(
-	IN HANDLE  ThreadHandle  OPTIONAL,
-	IN NTSTATUS  ExitStatus);
+  __W32_IN HANDLE  ThreadHandle  __W32_OPTIONAL,
+  __W32_IN NTSTATUS  ExitStatus);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtQueryInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  OUT PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN THREADINFOCLASS  ThreadInformationClass,
+  __W32_OUT PVOID  ThreadInformation,
+  __W32_IN ULONG  ThreadInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  OUT PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN THREADINFOCLASS  ThreadInformationClass,
+  __W32_OUT PVOID  ThreadInformation,
+  __W32_IN ULONG  ThreadInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtSetInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  IN PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN THREADINFOCLASS  ThreadInformationClass,
+  __W32_IN PVOID  ThreadInformation,
+  __W32_IN ULONG  ThreadInformationLength);
 
 typedef struct _THREAD_BASIC_INFORMATION {
-	NTSTATUS  ExitStatus;
-	PNT_TIB  TebBaseAddress;
-	CLIENT_ID  ClientId;
-	KAFFINITY  AffinityMask;
-	KPRIORITY  Priority;
-	KPRIORITY  BasePriority;
+  NTSTATUS  ExitStatus;
+  PNT_TIB  TebBaseAddress;
+  CLIENT_ID  ClientId;
+  KAFFINITY  AffinityMask;
+  KPRIORITY  Priority;
+  KPRIORITY  BasePriority;
 } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION;
 
 typedef struct _KERNEL_USER_TIMES {
-	LARGE_INTEGER  CreateTime;
-	LARGE_INTEGER  ExitTime;
-	LARGE_INTEGER  KernelTime;
-	LARGE_INTEGER  UserTime;
+  LARGE_INTEGER  CreateTime;
+  LARGE_INTEGER  ExitTime;
+  LARGE_INTEGER  KernelTime;
+  LARGE_INTEGER  UserTime;
 } KERNEL_USER_TIMES, *PKERNEL_USER_TIMES;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSuspendThread(
-  IN HANDLE  ThreadHandle,
-  OUT PULONG  PreviousSuspendCount  OPTIONAL);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_OUT PULONG  PreviousSuspendCount  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwResumeThread(
-  IN HANDLE  ThreadHandle,
-  OUT PULONG  PreviousSuspendCount  OPTIONAL);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_OUT PULONG  PreviousSuspendCount  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwGetContextThread(
-  IN HANDLE  ThreadHandle,
-  OUT PCONTEXT  Context);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_OUT PCONTEXT  Context);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetContextThread(
-	IN HANDLE  ThreadHandle,
-	IN PCONTEXT  Context);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN PCONTEXT  Context);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueueApcThread(
-	IN HANDLE  ThreadHandle,
-	IN PKNORMAL_ROUTINE  ApcRoutine,
-	IN PVOID  ApcContext  OPTIONAL,
-	IN PVOID  Argument1  OPTIONAL,
-	IN PVOID  Argument2  OPTIONAL);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN PKNORMAL_ROUTINE  ApcRoutine,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_IN PVOID  Argument1  __W32_OPTIONAL,
+  __W32_IN PVOID  Argument2  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
@@ -1316,34 +1316,34 @@
 NTSTATUS
 NTAPI
 ZwAlertThread(
-  IN HANDLE  ThreadHandle);
+  __W32_IN HANDLE  ThreadHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAlertResumeThread(
-  IN HANDLE  ThreadHandle,
-  OUT PULONG  PreviousSuspendCount  OPTIONAL);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_OUT PULONG  PreviousSuspendCount  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwRegisterThreadTerminatePort(
-  IN HANDLE  PortHandle);
+  __W32_IN HANDLE  PortHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwImpersonateThread(
-	IN HANDLE  ThreadHandle,
-	IN HANDLE  TargetThreadHandle,
-	IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN HANDLE  TargetThreadHandle,
+  __W32_IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwImpersonateAnonymousToken(
-  IN HANDLE  ThreadHandle);
+  __W32_IN HANDLE  ThreadHandle);
 
 
 
@@ -1354,70 +1354,70 @@
 NTSTATUS
 NTAPI
 ZwCreateProcess(
-	OUT PHANDLE  ProcessHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN HANDLE  InheritFromProcessHandle,
-	IN BOOLEAN  InheritHandles,
-	IN HANDLE  SectionHandle  OPTIONAL,
-	IN HANDLE  DebugPort  OPTIONAL,
-	IN HANDLE  ExceptionPort  OPTIONAL);
+  __W32_OUT PHANDLE  ProcessHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN HANDLE  InheritFromProcessHandle,
+  __W32_IN BOOLEAN  InheritHandles,
+  __W32_IN HANDLE  SectionHandle  __W32_OPTIONAL,
+  __W32_IN HANDLE  DebugPort  __W32_OPTIONAL,
+  __W32_IN HANDLE  ExceptionPort  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCreateProcess(
-	OUT PHANDLE  ProcessHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN HANDLE  InheritFromProcessHandle,
-	IN BOOLEAN  InheritHandles,
-	IN HANDLE  SectionHandle  OPTIONAL,
-	IN HANDLE  DebugPort  OPTIONAL,
-	IN HANDLE  ExceptionPort  OPTIONAL);
+  __W32_OUT PHANDLE  ProcessHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN HANDLE  InheritFromProcessHandle,
+  __W32_IN BOOLEAN  InheritHandles,
+  __W32_IN HANDLE  SectionHandle  __W32_OPTIONAL,
+  __W32_IN HANDLE  DebugPort  __W32_OPTIONAL,
+  __W32_IN HANDLE  ExceptionPort  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwTerminateProcess(
-	IN HANDLE  ProcessHandle  OPTIONAL,
-	IN NTSTATUS  ExitStatus);
+  __W32_IN HANDLE  ProcessHandle  __W32_OPTIONAL,
+  __W32_IN NTSTATUS  ExitStatus);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  OUT PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PROCESSINFOCLASS  ProcessInformationClass,
+  __W32_OUT PVOID  ProcessInformation,
+  __W32_IN ULONG  ProcessInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtSetInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  IN PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PROCESSINFOCLASS  ProcessInformationClass,
+  __W32_IN PVOID  ProcessInformation,
+  __W32_IN ULONG  ProcessInformationLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  IN PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PROCESSINFOCLASS  ProcessInformationClass,
+  __W32_IN PVOID  ProcessInformation,
+  __W32_IN ULONG  ProcessInformationLength);
 
 typedef struct _PROCESS_BASIC_INFORMATION {
-	NTSTATUS  ExitStatus;
-	PPEB  PebBaseAddress;
-	KAFFINITY  AffinityMask;
-	KPRIORITY  BasePriority;
-	ULONG  UniqueProcessId;
-	ULONG  InheritedFromUniqueProcessId;
+  NTSTATUS  ExitStatus;
+  PPEB  PebBaseAddress;
+  KAFFINITY  AffinityMask;
+  KPRIORITY  BasePriority;
+  ULONG  UniqueProcessId;
+  ULONG  InheritedFromUniqueProcessId;
 } PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION;
 
 typedef struct _PROCESS_ACCESS_TOKEN {
@@ -1433,15 +1433,15 @@
 #define SEM_NOOPENFILEERRORBOX            0x8000
 /* end winbase.h */
 typedef struct _POOLED_USAGE_AND_LIMITS {
-	ULONG  PeakPagedPoolUsage;
-	ULONG  PagedPoolUsage;
-	ULONG  PagedPoolLimit;
-	ULONG  PeakNonPagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  NonPagedPoolLimit;
-	ULONG  PeakPagefileUsage;
-	ULONG  PagefileUsage;
-	ULONG  PagefileLimit;
+  ULONG  PeakPagedPoolUsage;
+  ULONG  PagedPoolUsage;
+  ULONG  PagedPoolLimit;
+  ULONG  PeakNonPagedPoolUsage;
+  ULONG  NonPagedPoolUsage;
+  ULONG  NonPagedPoolLimit;
+  ULONG  PeakPagefileUsage;
+  ULONG  PagefileUsage;
+  ULONG  PagefileLimit;
 } POOLED_USAGE_AND_LIMITS, *PPOOLED_USAGE_AND_LIMITS;
 
 typedef struct _PROCESS_WS_WATCH_INFORMATION {
@@ -1472,15 +1472,15 @@
 #define DRIVE_RAMDISK                     6
 
 typedef struct _PROCESS_DEVICEMAP_INFORMATION {
-	_ANONYMOUS_UNION union {
-		struct {
-		  HANDLE  DirectoryHandle;
-		} Set;
-		struct {
-		  ULONG  DriveMap;
-		  UCHAR  DriveType[32];
-		} Query;
-	} DUMMYUNIONNAME;
+  _ANONYMOUS_UNION union {
+    struct {
+      HANDLE  DirectoryHandle;
+    } Set;
+    struct {
+      ULONG  DriveMap;
+      UCHAR  DriveType[32];
+    } Query;
+  } DUMMYUNIONNAME;
 } PROCESS_DEVICEMAP_INFORMATION, *PPROCESS_DEVICEMAP_INFORMATION;
 
 typedef struct _PROCESS_SESSION_INFORMATION {
@@ -1488,79 +1488,79 @@
 } PROCESS_SESSION_INFORMATION, *PPROCESS_SESSION_INFORMATION;
 
 typedef struct _RTL_USER_PROCESS_PARAMETERS {
-	ULONG  AllocationSize;
-	ULONG  Size;
-	ULONG  Flags;
-	ULONG  DebugFlags;
-	HANDLE  hConsole;
-	ULONG  ProcessGroup;
-	HANDLE  hStdInput;
-	HANDLE  hStdOutput;
-	HANDLE  hStdError;
-	UNICODE_STRING  CurrentDirectoryName;
-	HANDLE  CurrentDirectoryHandle;
-	UNICODE_STRING  DllPath;
-	UNICODE_STRING  ImagePathName;
-	UNICODE_STRING  CommandLine;
-	PWSTR  Environment;
-	ULONG  dwX;
-	ULONG  dwY;
-	ULONG  dwXSize;
-	ULONG  dwYSize;
-	ULONG  dwXCountChars;
-	ULONG  dwYCountChars;
-	ULONG  dwFillAttribute;
-	ULONG  dwFlags;
-	ULONG  wShowWindow;
-	UNICODE_STRING  WindowTitle;
-	UNICODE_STRING  DesktopInfo;
-	UNICODE_STRING  ShellInfo;
-	UNICODE_STRING  RuntimeInfo;
+  ULONG  AllocationSize;
+  ULONG  Size;
+  ULONG  Flags;
+  ULONG  DebugFlags;
+  HANDLE  hConsole;
+  ULONG  ProcessGroup;
+  HANDLE  hStdInput;
+  HANDLE  hStdOutput;
+  HANDLE  hStdError;
+  UNICODE_STRING  CurrentDirectoryName;
+  HANDLE  CurrentDirectoryHandle;
+  UNICODE_STRING  DllPath;
+  UNICODE_STRING  ImagePathName;
+  UNICODE_STRING  CommandLine;
+  PWSTR  Environment;
+  ULONG  dwX;
+  ULONG  dwY;
+  ULONG  dwXSize;
+  ULONG  dwYSize;
+  ULONG  dwXCountChars;
+  ULONG  dwYCountChars;
+  ULONG  dwFillAttribute;
+  ULONG  dwFlags;
+  ULONG  wShowWindow;
+  UNICODE_STRING  WindowTitle;
+  UNICODE_STRING  DesktopInfo;
+  UNICODE_STRING  ShellInfo;
+  UNICODE_STRING  RuntimeInfo;
 } RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS;
 
 NTSTATUS
 NTAPI
 RtlCreateProcessParameters(
-	OUT PRTL_USER_PROCESS_PARAMETERS  *ProcessParameters,
-	IN PUNICODE_STRING  ImageFile,
-	IN PUNICODE_STRING  DllPath  OPTIONAL,
-	IN PUNICODE_STRING  CurrentDirectory  OPTIONAL,
-	IN PUNICODE_STRING  CommandLine  OPTIONAL,
-	IN PWSTR  Environment OPTIONAL,
-	IN PUNICODE_STRING  WindowTitle  OPTIONAL,
-	IN PUNICODE_STRING  DesktopInfo  OPTIONAL,
-	IN PUNICODE_STRING  ShellInfo  OPTIONAL,
-	IN PUNICODE_STRING  RuntimeInfo  OPTIONAL);
+  __W32_OUT PRTL_USER_PROCESS_PARAMETERS  *ProcessParameters,
+  __W32_IN PUNICODE_STRING  ImageFile,
+  __W32_IN PUNICODE_STRING  DllPath  __W32_OPTIONAL,
+  __W32_IN PUNICODE_STRING  CurrentDirectory  __W32_OPTIONAL,
+  __W32_IN PUNICODE_STRING  CommandLine  __W32_OPTIONAL,
+  __W32_IN PWSTR  Environment __W32_OPTIONAL,
+  __W32_IN PUNICODE_STRING  WindowTitle  __W32_OPTIONAL,
+  __W32_IN PUNICODE_STRING  DesktopInfo  __W32_OPTIONAL,
+  __W32_IN PUNICODE_STRING  ShellInfo  __W32_OPTIONAL,
+  __W32_IN PUNICODE_STRING  RuntimeInfo  __W32_OPTIONAL);
 
 NTSTATUS
 NTAPI
 RtlDestroyProcessParameters(
-  IN PRTL_USER_PROCESS_PARAMETERS  ProcessParameters);
+  __W32_IN PRTL_USER_PROCESS_PARAMETERS  ProcessParameters);
 
 typedef struct _DEBUG_BUFFER {
-	HANDLE  SectionHandle;
-	PVOID  SectionBase;
-	PVOID  RemoteSectionBase;
-	ULONG  SectionBaseDelta;
-	HANDLE  EventPairHandle;
-	ULONG  Unknown[2];
-	HANDLE  RemoteThreadHandle;
-	ULONG  InfoClassMask;
-	ULONG  SizeOfInfo;
-	ULONG  AllocatedSize;
-	ULONG  SectionSize;
-	PVOID  ModuleInformation;
-	PVOID  BackTraceInformation;
-	PVOID  HeapInformation;
-	PVOID  LockInformation;
-	PVOID  Reserved[8];
+  HANDLE  SectionHandle;
+  PVOID  SectionBase;
+  PVOID  RemoteSectionBase;
+  ULONG  SectionBaseDelta;
+  HANDLE  EventPairHandle;
+  ULONG  Unknown[2];
+  HANDLE  RemoteThreadHandle;
+  ULONG  InfoClassMask;
+  ULONG  SizeOfInfo;
+  ULONG  AllocatedSize;
+  ULONG  SectionSize;
+  PVOID  ModuleInformation;
+  PVOID  BackTraceInformation;
+  PVOID  HeapInformation;
+  PVOID  LockInformation;
+  PVOID  Reserved[8];
 } DEBUG_BUFFER, *PDEBUG_BUFFER;
 
 PDEBUG_BUFFER
 NTAPI
 RtlCreateQueryDebugBuffer(
-	IN ULONG  Size,
-	IN BOOLEAN  EventPair);
+  __W32_IN ULONG  Size,
+  __W32_IN BOOLEAN  EventPair);
 
 /* RtlQueryProcessDebugInformation.DebugInfoClassMask constants */
 #define PDI_MODULES                       0x01
@@ -1573,14 +1573,14 @@
 NTSTATUS
 NTAPI
 RtlQueryProcessDebugInformation(
-	IN ULONG  ProcessId,
-	IN ULONG  DebugInfoClassMask,
-	IN OUT PDEBUG_BUFFER  DebugBuffer);
+  __W32_IN ULONG  ProcessId,
+  __W32_IN ULONG  DebugInfoClassMask,
+  __W32_IN __W32_OUT PDEBUG_BUFFER  DebugBuffer);
 
 NTSTATUS
 NTAPI
 RtlDestroyQueryDebugBuffer(
-  IN PDEBUG_BUFFER  DebugBuffer);
+  __W32_IN PDEBUG_BUFFER  DebugBuffer);
 
 /* DEBUG_MODULE_INFORMATION.Flags constants */
 #define LDRP_STATIC_LINK                  0x00000002
@@ -1598,42 +1598,42 @@
 #define LDRP_WX86_IGNORE_MACHINETYPE      0x00400000
 
 typedef struct _DEBUG_MODULE_INFORMATION {
-	ULONG  Reserved[2];
-	ULONG  Base;
-	ULONG  Size;
-	ULONG  Flags;
-	USHORT  Index;
-	USHORT  Unknown;
-	USHORT  LoadCount;
-	USHORT  ModuleNameOffset;
-	CHAR  ImageName[256];
+  ULONG  Reserved[2];
+  ULONG  Base;
+  ULONG  Size;
+  ULONG  Flags;
+  USHORT  Index;
+  USHORT  Unknown;
+  USHORT  LoadCount;
+  USHORT  ModuleNameOffset;
+  CHAR  ImageName[256];
 } DEBUG_MODULE_INFORMATION, *PDEBUG_MODULE_INFORMATION;
 
 typedef struct _DEBUG_HEAP_INFORMATION {
-	ULONG  Base;
-	ULONG  Flags;
-	USHORT  Granularity;
-	USHORT  Unknown;
-	ULONG  Allocated;
-	ULONG  Committed;
-	ULONG  TagCount;
-	ULONG  BlockCount;
-	ULONG  Reserved[7];
-	PVOID  Tags;
-	PVOID  Blocks;
+  ULONG  Base;
+  ULONG  Flags;
+  USHORT  Granularity;
+  USHORT  Unknown;
+  ULONG  Allocated;
+  ULONG  Committed;
+  ULONG  TagCount;
+  ULONG  BlockCount;
+  ULONG  Reserved[7];
+  PVOID  Tags;
+  PVOID  Blocks;
 } DEBUG_HEAP_INFORMATION, *PDEBUG_HEAP_INFORMATION;
 
 typedef struct _DEBUG_LOCK_INFORMATION {
-	PVOID  Address;
-	USHORT  Type;
-	USHORT  CreatorBackTraceIndex;
-	ULONG  OwnerThreadId;
-	ULONG  ActiveCount;
-	ULONG  ContentionCount;
-	ULONG  EntryCount;
-	ULONG  RecursionCount;
-	ULONG  NumberOfSharedWaiters;
-	ULONG  NumberOfExclusiveWaiters;
+  PVOID  Address;
+  USHORT  Type;
+  USHORT  CreatorBackTraceIndex;
+  ULONG  OwnerThreadId;
+  ULONG  ActiveCount;
+  ULONG  ContentionCount;
+  ULONG  EntryCount;
+  ULONG  RecursionCount;
+  ULONG  NumberOfSharedWaiters;
+  ULONG  NumberOfExclusiveWaiters;
 } DEBUG_LOCK_INFORMATION, *PDEBUG_LOCK_INFORMATION;
 
 
@@ -1644,50 +1644,50 @@
 NTSTATUS
 NTAPI
 ZwCreateJobObject(
-	OUT PHANDLE  JobHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  JobHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwOpenJobObject(
-	OUT PHANDLE  JobHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  JobHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwTerminateJobObject(
-	IN HANDLE  JobHandle,
-	IN NTSTATUS  ExitStatus);
+  __W32_IN HANDLE  JobHandle,
+  __W32_IN NTSTATUS  ExitStatus);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAssignProcessToJobObject(
-	IN HANDLE  JobHandle,
-	IN HANDLE  ProcessHandle);
+  __W32_IN HANDLE  JobHandle,
+  __W32_IN HANDLE  ProcessHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryInformationJobObject(
-	IN HANDLE  JobHandle,
-	IN JOBOBJECTINFOCLASS  JobInformationClass,
-	OUT PVOID  JobInformation,
-	IN ULONG  JobInformationLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  JobHandle,
+  __W32_IN JOBOBJECTINFOCLASS  JobInformationClass,
+  __W32_OUT PVOID  JobInformation,
+  __W32_IN ULONG  JobInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetInformationJobObject(
-	IN HANDLE  JobHandle,
-	IN JOBOBJECTINFOCLASS  JobInformationClass,
-	IN PVOID  JobInformation,
-	IN ULONG  JobInformationLength);
+  __W32_IN HANDLE  JobHandle,
+  __W32_IN JOBOBJECTINFOCLASS  JobInformationClass,
+  __W32_IN PVOID  JobInformation,
+  __W32_IN ULONG  JobInformationLength);
 
 
 /* Tokens */
@@ -1696,149 +1696,149 @@
 NTSTATUS
 NTAPI
 ZwCreateToken(
-OUT PHANDLE TokenHandle,
-IN ACCESS_MASK DesiredAccess,
-IN POBJECT_ATTRIBUTES ObjectAttributes,
-IN TOKEN_TYPE Type,
-IN PLUID AuthenticationId,
-IN PLARGE_INTEGER ExpirationTime,
-IN PTOKEN_USER User,
-IN PTOKEN_GROUPS Groups,
-IN PTOKEN_PRIVILEGES Privileges,
-IN PTOKEN_OWNER Owner,
-IN PTOKEN_PRIMARY_GROUP PrimaryGroup,
-IN PTOKEN_DEFAULT_DACL DefaultDacl,
-IN PTOKEN_SOURCE Source
+  __W32_OUT PHANDLE TokenHandle,
+  __W32_IN ACCESS_MASK DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES ObjectAttributes,
+  __W32_IN TOKEN_TYPE Type,
+  __W32_IN PLUID AuthenticationId,
+  __W32_IN PLARGE_INTEGER ExpirationTime,
+  __W32_IN PTOKEN_USER User,
+  __W32_IN PTOKEN_GROUPS Groups,
+  __W32_IN PTOKEN_PRIVILEGES Privileges,
+  __W32_IN PTOKEN_OWNER Owner,
+  __W32_IN PTOKEN_PRIMARY_GROUP PrimaryGroup,
+  __W32_IN PTOKEN_DEFAULT_DACL DefaultDacl,
+  __W32_IN PTOKEN_SOURCE Source
 );
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtOpenProcessToken(
-  IN HANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  TokenHandle);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_OUT PHANDLE  TokenHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwOpenProcessToken(
-  IN HANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  TokenHandle);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_OUT PHANDLE  TokenHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtOpenThreadToken(
-  IN HANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN BOOLEAN  OpenAsSelf,
-  OUT PHANDLE  TokenHandle);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN BOOLEAN  OpenAsSelf,
+  __W32_OUT PHANDLE  TokenHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwOpenThreadToken(
-  IN HANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN BOOLEAN  OpenAsSelf,
-  OUT PHANDLE  TokenHandle);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN BOOLEAN  OpenAsSelf,
+  __W32_OUT PHANDLE  TokenHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtDuplicateToken(
-  IN HANDLE  ExistingTokenHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  EffectiveOnly,
-  IN TOKEN_TYPE  TokenType,
-  OUT PHANDLE  NewTokenHandle);
+  __W32_IN HANDLE  ExistingTokenHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN BOOLEAN  EffectiveOnly,
+  __W32_IN TOKEN_TYPE  TokenType,
+  __W32_OUT PHANDLE  NewTokenHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwDuplicateToken(
-  IN HANDLE  ExistingTokenHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  EffectiveOnly,
-  IN TOKEN_TYPE  TokenType,
-  OUT PHANDLE  NewTokenHandle);
+  __W32_IN HANDLE  ExistingTokenHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN BOOLEAN  EffectiveOnly,
+  __W32_IN TOKEN_TYPE  TokenType,
+  __W32_OUT PHANDLE  NewTokenHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwFilterToken(
-	IN HANDLE  ExistingTokenHandle,
-	IN ULONG  Flags,
-	IN PTOKEN_GROUPS  SidsToDisable,
-	IN PTOKEN_PRIVILEGES  PrivilegesToDelete,
-	IN PTOKEN_GROUPS  SidsToRestricted,
-	OUT PHANDLE  NewTokenHandle);
+  __W32_IN HANDLE  ExistingTokenHandle,
+  __W32_IN ULONG  Flags,
+  __W32_IN PTOKEN_GROUPS  SidsToDisable,
+  __W32_IN PTOKEN_PRIVILEGES  PrivilegesToDelete,
+  __W32_IN PTOKEN_GROUPS  SidsToRestricted,
+  __W32_OUT PHANDLE  NewTokenHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtAdjustPrivilegesToken(
-  IN HANDLE  TokenHandle,
-  IN BOOLEAN  DisableAllPrivileges,
-  IN PTOKEN_PRIVILEGES  NewState,
-  IN ULONG  BufferLength,
-  OUT PTOKEN_PRIVILEGES  PreviousState  OPTIONAL,
-  OUT PULONG  ReturnLength);
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN BOOLEAN  DisableAllPrivileges,
+  __W32_IN PTOKEN_PRIVILEGES  NewState,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PTOKEN_PRIVILEGES  PreviousState  __W32_OPTIONAL,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAdjustPrivilegesToken(
-  IN HANDLE  TokenHandle,
-  IN BOOLEAN  DisableAllPrivileges,
-  IN PTOKEN_PRIVILEGES  NewState,
-  IN ULONG  BufferLength,
-  OUT PTOKEN_PRIVILEGES  PreviousState  OPTIONAL,
-  OUT PULONG  ReturnLength);
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN BOOLEAN  DisableAllPrivileges,
+  __W32_IN PTOKEN_PRIVILEGES  NewState,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PTOKEN_PRIVILEGES  PreviousState  __W32_OPTIONAL,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAdjustGroupsToken(
-	IN HANDLE  TokenHandle,
-	IN BOOLEAN  ResetToDefault,
-	IN PTOKEN_GROUPS  NewState,
-	IN ULONG  BufferLength,
-	OUT PTOKEN_GROUPS  PreviousState  OPTIONAL,
-	OUT PULONG  ReturnLength);
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN BOOLEAN  ResetToDefault,
+  __W32_IN PTOKEN_GROUPS  NewState,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PTOKEN_GROUPS  PreviousState  __W32_OPTIONAL,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtQueryInformationToken(
-  IN HANDLE  TokenHandle,
-  IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-  OUT PVOID  TokenInformation,
-  IN ULONG  TokenInformationLength,
-  OUT PULONG  ReturnLength);
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
+  __W32_OUT PVOID  TokenInformation,
+  __W32_IN ULONG  TokenInformationLength,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryInformationToken(
-  IN HANDLE  TokenHandle,
-  IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-  OUT PVOID  TokenInformation,
-  IN ULONG  TokenInformationLength,
-  OUT PULONG  ReturnLength);
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
+  __W32_OUT PVOID  TokenInformation,
+  __W32_IN ULONG  TokenInformationLength,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetInformationToken(
-	IN HANDLE  TokenHandle,
-	IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-	IN PVOID  TokenInformation,
-  IN ULONG  TokenInformationLength);
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
+  __W32_IN PVOID  TokenInformation,
+  __W32_IN ULONG  TokenInformationLength);
 
 
 
@@ -1849,43 +1849,43 @@
 NTSTATUS
 NTAPI
 ZwQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
+  __W32_OUT PLARGE_INTEGER  CurrentTime);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetSystemTime(
-  IN PLARGE_INTEGER  NewTime,
-  OUT PLARGE_INTEGER  OldTime  OPTIONAL);
+  __W32_IN PLARGE_INTEGER  NewTime,
+  __W32_OUT PLARGE_INTEGER  OldTime  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryPerformanceCounter(
-  OUT PLARGE_INTEGER  PerformanceCount,
-  OUT PLARGE_INTEGER  PerformanceFrequency  OPTIONAL);
+  __W32_OUT PLARGE_INTEGER  PerformanceCount,
+  __W32_OUT PLARGE_INTEGER  PerformanceFrequency  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryPerformanceCounter(
-  OUT PLARGE_INTEGER  PerformanceCount,
-  OUT PLARGE_INTEGER  PerformanceFrequency  OPTIONAL);
+  __W32_OUT PLARGE_INTEGER  PerformanceCount,
+  __W32_OUT PLARGE_INTEGER  PerformanceFrequency  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryTimerResolution(
-	OUT PULONG  CoarsestResolution,
-	OUT PULONG  FinestResolution,
-	OUT PULONG  ActualResolution);
+  __W32_OUT PULONG  CoarsestResolution,
+  __W32_OUT PULONG  FinestResolution,
+  __W32_OUT PULONG  ActualResolution);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwDelayExecution(
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Interval);
+  __W32_IN BOOLEAN  Alertable,
+  __W32_IN PLARGE_INTEGER  Interval);
 
 NTOSAPI
 NTSTATUS
@@ -1908,248 +1908,248 @@
 NTSTATUS
 NTAPI
 ZwCreateProfile(
-	OUT PHANDLE  ProfileHandle,
-	IN HANDLE  ProcessHandle,
-	IN PVOID  Base,
-	IN ULONG  Size,
-	IN ULONG  BucketShift,
-	IN PULONG  Buffer,
-	IN ULONG  BufferLength,
-	IN KPROFILE_SOURCE  Source,
-	IN ULONG  ProcessorMask);
+  __W32_OUT PHANDLE  ProfileHandle,
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  Base,
+  __W32_IN ULONG  Size,
+  __W32_IN ULONG  BucketShift,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_IN KPROFILE_SOURCE  Source,
+  __W32_IN ULONG  ProcessorMask);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetIntervalProfile(
-  IN ULONG  Interval,
-  IN KPROFILE_SOURCE  Source);
+  __W32_IN ULONG  Interval,
+  __W32_IN KPROFILE_SOURCE  Source);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryIntervalProfile(
-	IN KPROFILE_SOURCE  Source,
-	OUT PULONG  Interval);
+  __W32_IN KPROFILE_SOURCE  Source,
+  __W32_OUT PULONG  Interval);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwStartProfile(
-  IN HANDLE  ProfileHandle);
+  __W32_IN HANDLE  ProfileHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwStopProfile(
-  IN HANDLE  ProfileHandle);
+  __W32_IN HANDLE  ProfileHandle);
 
 /* Local Procedure Call (LPC) */
 
 typedef struct _LPC_MESSAGE {
-	USHORT  DataSize;
-	USHORT  MessageSize;
-	USHORT  MessageType;
-	USHORT  VirtualRangesOffset;
-	CLIENT_ID  ClientId;
-	ULONG  MessageId;
-	ULONG  SectionSize;
-	UCHAR  Data[ANYSIZE_ARRAY];
+  USHORT  DataSize;
+  USHORT  MessageSize;
+  USHORT  MessageType;
+  USHORT  VirtualRangesOffset;
+  CLIENT_ID  ClientId;
+  ULONG  MessageId;
+  ULONG  SectionSize;
+  UCHAR  Data[ANYSIZE_ARRAY];
 } LPC_MESSAGE, *PLPC_MESSAGE;
 
-#define LPC_MESSAGE_BASE_SIZE	24
+#define LPC_MESSAGE_BASE_SIZE  24
 
 typedef enum _LPC_TYPE {
-	LPC_NEW_MESSAGE,
-	LPC_REQUEST,
-	LPC_REPLY,
-	LPC_DATAGRAM,
-	LPC_LOST_REPLY,
-	LPC_PORT_CLOSED,
-	LPC_CLIENT_DIED,
-	LPC_EXCEPTION,
-	LPC_DEBUG_EVENT,
-	LPC_ERROR_EVENT,
-	LPC_CONNECTION_REQUEST,
-	LPC_CONNECTION_REFUSED,
+  LPC_NEW_MESSAGE,
+  LPC_REQUEST,
+  LPC_REPLY,
+  LPC_DATAGRAM,
+  LPC_LOST_REPLY,
+  LPC_PORT_CLOSED,
+  LPC_CLIENT_DIED,
+  LPC_EXCEPTION,
+  LPC_DEBUG_EVENT,
+  LPC_ERROR_EVENT,
+  LPC_CONNECTION_REQUEST,
+  LPC_CONNECTION_REFUSED,
   LPC_MAXIMUM
 } LPC_TYPE;
 
 typedef struct _LPC_SECTION_WRITE {
-	ULONG  Length;
-	HANDLE  SectionHandle;
-	ULONG  SectionOffset;
-	ULONG  ViewSize;
-	PVOID  ViewBase;
-	PVOID  TargetViewBase;
+  ULONG  Length;
+  HANDLE  SectionHandle;
+  ULONG  SectionOffset;
+  ULONG  ViewSize;
+  PVOID  ViewBase;
+  PVOID  TargetViewBase;
 } LPC_SECTION_WRITE, *PLPC_SECTION_WRITE;
 
 typedef struct _LPC_SECTION_READ {
-	ULONG  Length;
-	ULONG  ViewSize;
-	PVOID  ViewBase;
+  ULONG  Length;
+  ULONG  ViewSize;
+  PVOID  ViewBase;
 } LPC_SECTION_READ, *PLPC_SECTION_READ;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCreatePort(
-	OUT PHANDLE  PortHandle,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN ULONG  MaxDataSize,
-	IN ULONG  MaxMessageSize,
-	IN ULONG  Reserved);
+  __W32_OUT PHANDLE  PortHandle,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN ULONG  MaxDataSize,
+  __W32_IN ULONG  MaxMessageSize,
+  __W32_IN ULONG  Reserved);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCreateWaitablePort(
-	OUT PHANDLE  PortHandle,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN ULONG  MaxDataSize,
-	IN ULONG  MaxMessageSize,
-	IN ULONG  Reserved);
+  __W32_OUT PHANDLE  PortHandle,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN ULONG  MaxDataSize,
+  __W32_IN ULONG  MaxMessageSize,
+  __W32_IN ULONG  Reserved);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtConnectPort(
-  OUT PHANDLE  PortHandle,
-  IN PUNICODE_STRING  PortName,
-  IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
-  IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-  IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL,
-  OUT PULONG  MaxMessageSize  OPTIONAL,
-  IN OUT PVOID  ConnectData  OPTIONAL,
-  IN OUT PULONG  ConnectDataLength  OPTIONAL);
+  __W32_OUT PHANDLE  PortHandle,
+  __W32_IN PUNICODE_STRING  PortName,
+  __W32_IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
+  __W32_IN __W32_OUT PLPC_SECTION_WRITE  WriteSection  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PLPC_SECTION_READ  ReadSection  __W32_OPTIONAL,
+  __W32_OUT PULONG  MaxMessageSize  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PVOID  ConnectData  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PULONG  ConnectDataLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwConnectPort(
-  OUT PHANDLE  PortHandle,
-  IN PUNICODE_STRING  PortName,
-  IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
-  IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-  IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL,
-  OUT PULONG  MaxMessageSize  OPTIONAL,
-  IN OUT PVOID  ConnectData  OPTIONAL,
-  IN OUT PULONG  ConnectDataLength  OPTIONAL);
+  __W32_OUT PHANDLE  PortHandle,
+  __W32_IN PUNICODE_STRING  PortName,
+  __W32_IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
+  __W32_IN __W32_OUT PLPC_SECTION_WRITE  WriteSection  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PLPC_SECTION_READ  ReadSection  __W32_OPTIONAL,
+  __W32_OUT PULONG  MaxMessageSize  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PVOID  ConnectData  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PULONG  ConnectDataLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwConnectPort(
-	OUT PHANDLE  PortHandle,
-	IN PUNICODE_STRING  PortName,
-	IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
-	IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-	IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL,
-	OUT PULONG  MaxMessageSize  OPTIONAL,
-	IN OUT PVOID  ConnectData  OPTIONAL,
-	IN OUT PULONG  ConnectDataLength  OPTIONAL);
+  __W32_OUT PHANDLE  PortHandle,
+  __W32_IN PUNICODE_STRING  PortName,
+  __W32_IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
+  __W32_IN __W32_OUT PLPC_SECTION_WRITE  WriteSection  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PLPC_SECTION_READ  ReadSection  __W32_OPTIONAL,
+  __W32_OUT PULONG  MaxMessageSize  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PVOID  ConnectData  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PULONG  ConnectDataLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwListenPort(
-  IN HANDLE  PortHandle,
-  OUT PLPC_MESSAGE  Message);
+  __W32_IN HANDLE  PortHandle,
+  __W32_OUT PLPC_MESSAGE  Message);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAcceptConnectPort(
-	OUT PHANDLE  PortHandle,
-	IN ULONG  PortIdentifier,
-	IN PLPC_MESSAGE  Message,
-	IN BOOLEAN  Accept,
-	IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-	IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL);
+  __W32_OUT PHANDLE  PortHandle,
+  __W32_IN ULONG  PortIdentifier,
+  __W32_IN PLPC_MESSAGE  Message,
+  __W32_IN BOOLEAN  Accept,
+  __W32_IN __W32_OUT PLPC_SECTION_WRITE  WriteSection  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PLPC_SECTION_READ  ReadSection  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCompleteConnectPort(
-  IN HANDLE  PortHandle);
+  __W32_IN HANDLE  PortHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtRequestPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  RequestMessage);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PLPC_MESSAGE  RequestMessage);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtRequestWaitReplyPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  RequestMessage,
-  OUT PLPC_MESSAGE  ReplyMessage);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PLPC_MESSAGE  RequestMessage,
+  __W32_OUT PLPC_MESSAGE  ReplyMessage);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwRequestWaitReplyPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  RequestMessage,
-  OUT PLPC_MESSAGE  ReplyMessage);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PLPC_MESSAGE  RequestMessage,
+  __W32_OUT PLPC_MESSAGE  ReplyMessage);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReplyPort(
-	IN HANDLE  PortHandle,
-	IN PLPC_MESSAGE  ReplyMessage);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PLPC_MESSAGE  ReplyMessage);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReplyWaitReplyPort(
-	IN HANDLE  PortHandle,
-	IN OUT PLPC_MESSAGE  ReplyMessage);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN __W32_OUT PLPC_MESSAGE  ReplyMessage);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReplyWaitReceivePort(
-	IN HANDLE  PortHandle,
-	OUT PULONG  PortIdentifier  OPTIONAL,
-	IN PLPC_MESSAGE  ReplyMessage  OPTIONAL,
-	OUT PLPC_MESSAGE  Message);
+  __W32_IN HANDLE  PortHandle,
+  __W32_OUT PULONG  PortIdentifier  __W32_OPTIONAL,
+  __W32_IN PLPC_MESSAGE  ReplyMessage  __W32_OPTIONAL,
+  __W32_OUT PLPC_MESSAGE  Message);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReplyWaitReceivePortEx(
-	IN HANDLE  PortHandle,
-	OUT PULONG  PortIdentifier  OPTIONAL,
-	IN PLPC_MESSAGE  ReplyMessage  OPTIONAL,
-	OUT PLPC_MESSAGE  Message,
-	IN PLARGE_INTEGER  Timeout);
+  __W32_IN HANDLE  PortHandle,
+  __W32_OUT PULONG  PortIdentifier  __W32_OPTIONAL,
+  __W32_IN PLPC_MESSAGE  ReplyMessage  __W32_OPTIONAL,
+  __W32_OUT PLPC_MESSAGE  Message,
+  __W32_IN PLARGE_INTEGER  Timeout);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReadRequestData(
-	IN HANDLE  PortHandle,
-	IN PLPC_MESSAGE  Message,
-	IN ULONG  Index,
-	OUT PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PLPC_MESSAGE  Message,
+  __W32_IN ULONG  Index,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwWriteRequestData(
-	IN HANDLE  PortHandle,
-	IN PLPC_MESSAGE  Message,
-	IN ULONG  Index,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PLPC_MESSAGE  Message,
+  __W32_IN ULONG  Index,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 typedef enum _PORT_INFORMATION_CLASS {
   PortBasicInformation
@@ -2159,18 +2159,18 @@
 NTSTATUS
 NTAPI
 ZwQueryInformationPort(
-	IN HANDLE  PortHandle,
-	IN PORT_INFORMATION_CLASS  PortInformationClass,
-	OUT PVOID  PortInformation,
-	IN ULONG  PortInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PORT_INFORMATION_CLASS  PortInformationClass,
+  __W32_OUT PVOID  PortInformation,
+  __W32_IN ULONG  PortInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwImpersonateClientOfPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  Message);
+  __W32_IN HANDLE  PortHandle,
+  __W32_IN PLPC_MESSAGE  Message);
 
 
 
@@ -2181,55 +2181,55 @@
 NTSTATUS
 NTAPI
 NtDeleteFile(
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwDeleteFile(
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwFlushBuffersFile(
-	IN HANDLE  FileHandle,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock);
+  __W32_IN HANDLE  FileHandle,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCancelIoFile(
-	IN HANDLE  FileHandle,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock);
+  __W32_IN HANDLE  FileHandle,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReadFileScatter(
-	IN HANDLE  FileHandle,
-	IN HANDLE  Event OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN PFILE_SEGMENT_ELEMENT  Buffer,
-	IN ULONG  Length,
-	IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-	IN PULONG  Key  OPTIONAL);
+  __W32_IN HANDLE  FileHandle,
+  __W32_IN HANDLE  Event __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN PFILE_SEGMENT_ELEMENT  Buffer,
+  __W32_IN ULONG  Length,
+  __W32_IN PLARGE_INTEGER  ByteOffset  __W32_OPTIONAL,
+  __W32_IN PULONG  Key  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwWriteFileGather(
-	IN HANDLE  FileHandle,
-	IN HANDLE  Event  OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN PFILE_SEGMENT_ELEMENT  Buffer,
-	IN ULONG  Length,
-	IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-	IN PULONG  Key  OPTIONAL);
+  __W32_IN HANDLE  FileHandle,
+  __W32_IN HANDLE  Event  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN PFILE_SEGMENT_ELEMENT  Buffer,
+  __W32_IN ULONG  Length,
+  __W32_IN PLARGE_INTEGER  ByteOffset  __W32_OPTIONAL,
+  __W32_IN PULONG  Key  __W32_OPTIONAL);
 
 
 
@@ -2240,60 +2240,60 @@
 NTSTATUS
 NTAPI
 ZwSaveKey(
-	IN HANDLE  KeyHandle,
-	IN HANDLE  FileHandle);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN HANDLE  FileHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSaveMergedKeys(
-	IN HANDLE  KeyHandle1,
-	IN HANDLE  KeyHandle2,
-	IN HANDLE  FileHandle);
+  __W32_IN HANDLE  KeyHandle1,
+  __W32_IN HANDLE  KeyHandle2,
+  __W32_IN HANDLE  FileHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwRestoreKey(
-  IN HANDLE  KeyHandle,
-  IN HANDLE  FileHandle,
-  IN ULONG  Flags);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN HANDLE  FileHandle,
+  __W32_IN ULONG  Flags);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwLoadKey(
-  IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-  IN POBJECT_ATTRIBUTES  FileObjectAttributes);
+  __W32_IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
+  __W32_IN POBJECT_ATTRIBUTES  FileObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwLoadKey2(
-	IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-	IN POBJECT_ATTRIBUTES  FileObjectAttributes,
-	IN ULONG  Flags);
+  __W32_IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
+  __W32_IN POBJECT_ATTRIBUTES  FileObjectAttributes,
+  __W32_IN ULONG  Flags);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwUnloadKey(
-  IN POBJECT_ATTRIBUTES  KeyObjectAttributes);
+  __W32_IN POBJECT_ATTRIBUTES  KeyObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryOpenSubKeys(
-	IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-	OUT PULONG  NumberOfKeys);
+  __W32_IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
+  __W32_OUT PULONG  NumberOfKeys);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwReplaceKey(
-	IN POBJECT_ATTRIBUTES  NewFileObjectAttributes,
-	IN HANDLE  KeyHandle,
-	IN POBJECT_ATTRIBUTES  OldFileObjectAttributes);
+  __W32_IN POBJECT_ATTRIBUTES  NewFileObjectAttributes,
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN POBJECT_ATTRIBUTES  OldFileObjectAttributes);
 
 typedef enum _KEY_SET_INFORMATION_CLASS {
   KeyLastWriteTimeInformation
@@ -2303,34 +2303,34 @@
 NTSTATUS
 NTAPI
 ZwSetInformationKey(
-	IN HANDLE  KeyHandle,
-	IN KEY_SET_INFORMATION_CLASS  KeyInformationClass,
-	IN PVOID  KeyInformation,
-	IN ULONG  KeyInformationLength);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN KEY_SET_INFORMATION_CLASS  KeyInformationClass,
+  __W32_IN PVOID  KeyInformation,
+  __W32_IN ULONG  KeyInformationLength);
 
 typedef struct _KEY_LAST_WRITE_TIME_INFORMATION {
   LARGE_INTEGER LastWriteTime;
 } KEY_LAST_WRITE_TIME_INFORMATION, *PKEY_LAST_WRITE_TIME_INFORMATION;
 
 typedef struct _KEY_NAME_INFORMATION {
-	ULONG NameLength;
-	WCHAR Name[1];
+  ULONG NameLength;
+  WCHAR Name[1];
 } KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwNotifyChangeKey(
-	IN HANDLE  KeyHandle,
-	IN HANDLE  EventHandle  OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN ULONG  NotifyFilter,
-	IN BOOLEAN  WatchSubtree,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	IN BOOLEAN  Asynchronous);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN HANDLE  EventHandle  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN ULONG  NotifyFilter,
+  __W32_IN BOOLEAN  WatchSubtree,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_IN BOOLEAN  Asynchronous);
 
 /* ZwNotifyChangeMultipleKeys.Flags constants */
 #define REG_MONITOR_SINGLE_KEY            0x00
@@ -2340,35 +2340,35 @@
 NTSTATUS
 NTAPI
 ZwNotifyChangeMultipleKeys(
-	IN HANDLE  KeyHandle,
-	IN ULONG  Flags,
-	IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-	IN HANDLE  EventHandle  OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN ULONG  NotifyFilter,
-	IN BOOLEAN  WatchSubtree,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	IN BOOLEAN  Asynchronous);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN ULONG  Flags,
+  __W32_IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
+  __W32_IN HANDLE  EventHandle  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN ULONG  NotifyFilter,
+  __W32_IN BOOLEAN  WatchSubtree,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_IN BOOLEAN  Asynchronous);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryMultipleValueKey(
-	IN HANDLE  KeyHandle,
-	IN OUT  PKEY_VALUE_ENTRY  ValueList,
-	IN ULONG  NumberOfValues,
-	OUT PVOID  Buffer,
-	IN OUT PULONG  Length,
-	OUT PULONG  ReturnLength);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN __W32_OUT  PKEY_VALUE_ENTRY  ValueList,
+  __W32_IN ULONG  NumberOfValues,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN __W32_OUT PULONG  Length,
+  __W32_OUT PULONG  ReturnLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwInitializeRegistry(
-  IN BOOLEAN  Setup);
+  __W32_IN BOOLEAN  Setup);
 
 
 
@@ -2379,194 +2379,194 @@
 NTSTATUS
 NTAPI
 ZwPrivilegeCheck(
-	IN HANDLE  TokenHandle,
-	IN PPRIVILEGE_SET  RequiredPrivileges,
-	OUT PBOOLEAN  Result);
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN PPRIVILEGE_SET  RequiredPrivileges,
+  __W32_OUT PBOOLEAN  Result);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwPrivilegeObjectAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PPRIVILEGE_SET  Privileges,
-	IN BOOLEAN  AccessGranted);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN PPRIVILEGE_SET  Privileges,
+  __W32_IN BOOLEAN  AccessGranted);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwPrivilegeObjectAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PPRIVILEGE_SET  Privileges,
-	IN BOOLEAN  AccessGranted);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN PPRIVILEGE_SET  Privileges,
+  __W32_IN BOOLEAN  AccessGranted);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheck(
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN PPRIVILEGE_SET  PrivilegeSet,
-	IN PULONG  PrivilegeSetLength,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PBOOLEAN  AccessStatus);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN PPRIVILEGE_SET  PrivilegeSet,
+  __W32_IN PULONG  PrivilegeSetLength,
+  __W32_OUT PACCESS_MASK  GrantedAccess,
+  __W32_OUT PBOOLEAN  AccessStatus);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheckAndAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PBOOLEAN  AccessStatus,
-	OUT PBOOLEAN  GenerateOnClose);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN PUNICODE_STRING  ObjectTypeName,
+  __W32_IN PUNICODE_STRING  ObjectName,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN BOOLEAN  ObjectCreation,
+  __W32_OUT PACCESS_MASK  GrantedAccess,
+  __W32_OUT PBOOLEAN  AccessStatus,
+  __W32_OUT PBOOLEAN  GenerateOnClose);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheckByType(
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN HANDLE  TokenHandle,
-	IN ULONG  DesiredAccess,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN PPRIVILEGE_SET  PrivilegeSet,
-	IN PULONG  PrivilegeSetLength,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PULONG  AccessStatus);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN PSID  PrincipalSelfSid,
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN ULONG  DesiredAccess,
+  __W32_IN POBJECT_TYPE_LIST  ObjectTypeList,
+  __W32_IN ULONG  ObjectTypeListLength,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN PPRIVILEGE_SET  PrivilegeSet,
+  __W32_IN PULONG  PrivilegeSetLength,
+  __W32_OUT PACCESS_MASK  GrantedAccess,
+  __W32_OUT PULONG  AccessStatus);
 
 typedef enum _AUDIT_EVENT_TYPE {
-	AuditEventObjectAccess,
-	AuditEventDirectoryServiceAccess
+  AuditEventObjectAccess,
+  AuditEventDirectoryServiceAccess
 } AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheckByTypeAndAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN ACCESS_MASK  DesiredAccess,
-	IN AUDIT_EVENT_TYPE  AuditType,
-	IN ULONG  Flags,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PULONG  AccessStatus,
-	OUT PBOOLEAN  GenerateOnClose);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN PUNICODE_STRING  ObjectTypeName,
+  __W32_IN PUNICODE_STRING  ObjectName,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN PSID  PrincipalSelfSid,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN AUDIT_EVENT_TYPE  AuditType,
+  __W32_IN ULONG  Flags,
+  __W32_IN POBJECT_TYPE_LIST  ObjectTypeList,
+  __W32_IN ULONG  ObjectTypeListLength,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN BOOLEAN  ObjectCreation,
+  __W32_OUT PACCESS_MASK  GrantedAccess,
+  __W32_OUT PULONG  AccessStatus,
+  __W32_OUT PBOOLEAN  GenerateOnClose);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheckByTypeResultList(
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN PPRIVILEGE_SET  PrivilegeSet,
-	IN PULONG  PrivilegeSetLength,
-	OUT PACCESS_MASK  GrantedAccessList,
-	OUT PULONG  AccessStatusList);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN PSID  PrincipalSelfSid,
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_TYPE_LIST  ObjectTypeList,
+  __W32_IN ULONG  ObjectTypeListLength,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN PPRIVILEGE_SET  PrivilegeSet,
+  __W32_IN PULONG  PrivilegeSetLength,
+  __W32_OUT PACCESS_MASK  GrantedAccessList,
+  __W32_OUT PULONG  AccessStatusList);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheckByTypeResultListAndAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN ACCESS_MASK  DesiredAccess,
-	IN AUDIT_EVENT_TYPE  AuditType,
-	IN ULONG  Flags,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccessList,
-	OUT PULONG  AccessStatusList,
-	OUT PULONG  GenerateOnClose);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN PUNICODE_STRING  ObjectTypeName,
+  __W32_IN PUNICODE_STRING  ObjectName,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN PSID  PrincipalSelfSid,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN AUDIT_EVENT_TYPE  AuditType,
+  __W32_IN ULONG  Flags,
+  __W32_IN POBJECT_TYPE_LIST  ObjectTypeList,
+  __W32_IN ULONG  ObjectTypeListLength,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN BOOLEAN  ObjectCreation,
+  __W32_OUT PACCESS_MASK  GrantedAccessList,
+  __W32_OUT PULONG  AccessStatusList,
+  __W32_OUT PULONG  GenerateOnClose);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheckByTypeResultListAndAuditAlarmByHandle(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN HANDLE  TokenHandle,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN ACCESS_MASK  DesiredAccess,
-	IN AUDIT_EVENT_TYPE  AuditType,
-	IN ULONG  Flags,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccessList,
-	OUT PULONG  AccessStatusList,
-	OUT PULONG  GenerateOnClose);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN PUNICODE_STRING  ObjectTypeName,
+  __W32_IN PUNICODE_STRING  ObjectName,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN PSID  PrincipalSelfSid,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN AUDIT_EVENT_TYPE  AuditType,
+  __W32_IN ULONG  Flags,
+  __W32_IN POBJECT_TYPE_LIST  ObjectTypeList,
+  __W32_IN ULONG  ObjectTypeListLength,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN BOOLEAN  ObjectCreation,
+  __W32_OUT PACCESS_MASK  GrantedAccessList,
+  __W32_OUT PULONG  AccessStatusList,
+  __W32_OUT PULONG  GenerateOnClose);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwOpenObjectAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  *HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN ACCESS_MASK  GrantedAccess,
-	IN PPRIVILEGE_SET  Privileges  OPTIONAL,
-	IN BOOLEAN  ObjectCreation,
-	IN BOOLEAN  AccessGranted,
-	OUT PBOOLEAN  GenerateOnClose);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  *HandleId,
+  __W32_IN PUNICODE_STRING  ObjectTypeName,
+  __W32_IN PUNICODE_STRING  ObjectName,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN HANDLE  TokenHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN ACCESS_MASK  GrantedAccess,
+  __W32_IN PPRIVILEGE_SET  Privileges  __W32_OPTIONAL,
+  __W32_IN BOOLEAN  ObjectCreation,
+  __W32_IN BOOLEAN  AccessGranted,
+  __W32_OUT PBOOLEAN  GenerateOnClose);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCloseObjectAuditAlarm(
-  IN PUNICODE_STRING  SubsystemName,
-  IN PVOID  HandleId,
-  IN BOOLEAN  GenerateOnClose);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN BOOLEAN  GenerateOnClose);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwDeleteObjectAuditAlarm(
-  IN PUNICODE_STRING  SubsystemName,
-  IN PVOID  HandleId,
-  IN BOOLEAN  GenerateOnClose);
+  __W32_IN PUNICODE_STRING  SubsystemName,
+  __W32_IN PVOID  HandleId,
+  __W32_IN BOOLEAN  GenerateOnClose);
 
 
 
@@ -2577,19 +2577,19 @@
 NTSTATUS
 NTAPI
 ZwRequestWakeupLatency(
-  IN LATENCY_TIME  Latency);
+  __W32_IN LATENCY_TIME  Latency);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwRequestDeviceWakeup(
-  IN HANDLE  DeviceHandle);
+  __W32_IN HANDLE  DeviceHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCancelDeviceWakeupRequest(
-  IN HANDLE  DeviceHandle);
+  __W32_IN HANDLE  DeviceHandle);
 
 NTOSAPI
 BOOLEAN
@@ -2601,59 +2601,59 @@
 NTSTATUS
 NTAPI
 ZwSetThreadExecutionState(
-	IN EXECUTION_STATE  ExecutionState,
-	OUT PEXECUTION_STATE  PreviousExecutionState);
+  __W32_IN EXECUTION_STATE  ExecutionState,
+  __W32_OUT PEXECUTION_STATE  PreviousExecutionState);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwGetDevicePowerState(
-  IN HANDLE  DeviceHandle,
-  OUT PDEVICE_POWER_STATE  DevicePowerState);
+  __W32_IN HANDLE  DeviceHandle,
+  __W32_OUT PDEVICE_POWER_STATE  DevicePowerState);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetSystemPowerState(
-	IN POWER_ACTION  SystemAction,
-	IN SYSTEM_POWER_STATE  MinSystemState,
-	IN ULONG  Flags);
+  __W32_IN POWER_ACTION  SystemAction,
+  __W32_IN SYSTEM_POWER_STATE  MinSystemState,
+  __W32_IN ULONG  Flags);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwInitiatePowerAction(
-	IN POWER_ACTION  SystemAction,
-	IN SYSTEM_POWER_STATE  MinSystemState,
-	IN ULONG  Flags,
-	IN BOOLEAN  Asynchronous);
+  __W32_IN POWER_ACTION  SystemAction,
+  __W32_IN SYSTEM_POWER_STATE  MinSystemState,
+  __W32_IN ULONG  Flags,
+  __W32_IN BOOLEAN  Asynchronous);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwPowerInformation(
-	IN POWER_INFORMATION_LEVEL  PowerInformationLevel,
-	IN PVOID  InputBuffer  OPTIONAL,
-	IN ULONG  InputBufferLength,
-	OUT PVOID  OutputBuffer  OPTIONAL,
-	IN ULONG  OutputBufferLength);
+  __W32_IN POWER_INFORMATION_LEVEL  PowerInformationLevel,
+  __W32_IN PVOID  InputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  InputBufferLength,
+  __W32_OUT PVOID  OutputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  OutputBufferLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwPlugPlayControl(
-  IN ULONG  ControlCode,
-  IN OUT PVOID  Buffer,
-  IN ULONG  BufferLength);
+  __W32_IN ULONG  ControlCode,
+  __W32_IN __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLength);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwGetPlugPlayEvent(
-	IN ULONG  Reserved1,
-	IN ULONG  Reserved2,
-	OUT PVOID  Buffer,
-	IN ULONG  BufferLength);
+  __W32_IN ULONG  Reserved1,
+  __W32_IN ULONG  Reserved2,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  BufferLength);
 
 
 
@@ -2664,26 +2664,26 @@
 NTSTATUS
 NTAPI
 ZwRaiseException(
-  IN PEXCEPTION_RECORD  ExceptionRecord,
-  IN PCONTEXT  Context,
-  IN BOOLEAN  SearchFrames);
+  __W32_IN PEXCEPTION_RECORD  ExceptionRecord,
+  __W32_IN PCONTEXT  Context,
+  __W32_IN BOOLEAN  SearchFrames);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwContinue(
-  IN PCONTEXT  Context,
-  IN BOOLEAN  TestAlert);
+  __W32_IN PCONTEXT  Context,
+  __W32_IN BOOLEAN  TestAlert);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwW32Call(
-	IN ULONG  RoutineIndex,
-	IN PVOID  Argument,
-	IN ULONG  ArgumentLength,
-	OUT PVOID  *Result  OPTIONAL,
-	OUT PULONG  ResultLength  OPTIONAL);
+  __W32_IN ULONG  RoutineIndex,
+  __W32_IN PVOID  Argument,
+  __W32_IN ULONG  ArgumentLength,
+  __W32_OUT PVOID  *Result  __W32_OPTIONAL,
+  __W32_OUT PULONG  ResultLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
@@ -2701,21 +2701,21 @@
 NTSTATUS
 NTAPI
 ZwLoadDriver(
-  IN PUNICODE_STRING  DriverServiceName);
+  __W32_IN PUNICODE_STRING  DriverServiceName);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwUnloadDriver(
-  IN PUNICODE_STRING  DriverServiceName);
+  __W32_IN PUNICODE_STRING  DriverServiceName);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwFlushInstructionCache(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress  OPTIONAL,
-	IN ULONG  FlushSize);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  BaseAddress  __W32_OPTIONAL,
+  __W32_IN ULONG  FlushSize);
 
 NTOSAPI
 NTSTATUS
@@ -2727,108 +2727,108 @@
 NTSTATUS
 NTAPI
 ZwQueryDefaultLocale(
-	IN BOOLEAN  ThreadOrSystem,
-	OUT PLCID  Locale);
+  __W32_IN BOOLEAN  ThreadOrSystem,
+  __W32_OUT PLCID  Locale);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetDefaultLocale(
-  IN BOOLEAN  ThreadOrSystem,
-  IN LCID  Locale);
+  __W32_IN BOOLEAN  ThreadOrSystem,
+  __W32_IN LCID  Locale);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryDefaultUILanguage(
-  OUT PLANGID  LanguageId);
+  __W32_OUT PLANGID  LanguageId);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetDefaultUILanguage(
-  IN LANGID  LanguageId);
+  __W32_IN LANGID  LanguageId);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwQueryInstallUILanguage(
-  OUT PLANGID  LanguageId);
+  __W32_OUT PLANGID  LanguageId);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtAllocateLocallyUniqueId(
-  OUT PLUID  Luid);
+  __W32_OUT PLUID  Luid);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtAllocateUuids(
-  OUT PLARGE_INTEGER  UuidLastTimeAllocated,
-  OUT PULONG  UuidDeltaTime,
-  OUT PULONG  UuidSequenceNumber,
-  OUT PUCHAR  UuidSeed);
+  __W32_OUT PLARGE_INTEGER  UuidLastTimeAllocated,
+  __W32_OUT PULONG  UuidDeltaTime,
+  __W32_OUT PULONG  UuidSequenceNumber,
+  __W32_OUT PUCHAR  UuidSeed);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetUuidSeed(
-  IN PUCHAR  UuidSeed);
+  __W32_IN PUCHAR  UuidSeed);
 
 typedef enum _HARDERROR_RESPONSE_OPTION {
-	OptionAbortRetryIgnore,
-	OptionOk,
-	OptionOkCancel,
-	OptionRetryCancel,
-	OptionYesNo,
-	OptionYesNoCancel,
-	OptionShutdownSystem
+  OptionAbortRetryIgnore,
+  OptionOk,
+  OptionOkCancel,
+  OptionRetryCancel,
+  OptionYesNo,
+  OptionYesNoCancel,
+  OptionShutdownSystem
 } HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION;
 
 typedef enum _HARDERROR_RESPONSE {
-	ResponseReturnToCaller,
-	ResponseNotHandled,
-	ResponseAbort,
-	ResponseCancel,
-	ResponseIgnore,
-	ResponseNo,
-	ResponseOk,
-	ResponseRetry,
-	ResponseYes
+  ResponseReturnToCaller,
+  ResponseNotHandled,
+  ResponseAbort,
+  ResponseCancel,
+  ResponseIgnore,
+  ResponseNo,
+  ResponseOk,
+  ResponseRetry,
+  ResponseYes
 } HARDERROR_RESPONSE, *PHARDERROR_RESPONSE;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwRaiseHardError(
-	IN NTSTATUS  Status,
-	IN ULONG  NumberOfArguments,
-	IN ULONG  StringArgumentsMask,
-	IN PULONG  Arguments,
-	IN HARDERROR_RESPONSE_OPTION  ResponseOption,
-	OUT PHARDERROR_RESPONSE  Response);
+  __W32_IN NTSTATUS  Status,
+  __W32_IN ULONG  NumberOfArguments,
+  __W32_IN ULONG  StringArgumentsMask,
+  __W32_IN PULONG  Arguments,
+  __W32_IN HARDERROR_RESPONSE_OPTION  ResponseOption,
+  __W32_OUT PHARDERROR_RESPONSE  Response);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwSetDefaultHardErrorPort(
-  IN HANDLE  PortHandle);
+  __W32_IN HANDLE  PortHandle);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwDisplayString(
-  IN PUNICODE_STRING  String);
+  __W32_IN PUNICODE_STRING  String);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwCreatePagingFile(
-  IN PUNICODE_STRING  FileName,
-  IN PULARGE_INTEGER  InitialSize,
-  IN PULARGE_INTEGER  MaximumSize,
-  IN ULONG  Reserved);
+  __W32_IN PUNICODE_STRING  FileName,
+  __W32_IN PULARGE_INTEGER  InitialSize,
+  __W32_IN PULARGE_INTEGER  MaximumSize,
+  __W32_IN ULONG  Reserved);
 
 typedef USHORT RTL_ATOM, *PRTL_ATOM;
 
@@ -2836,44 +2836,44 @@
 NTSTATUS
 NTAPI
 NtAddAtom(
-  IN PWSTR  AtomName,
-  IN ULONG  AtomNameLength,
-  OUT PRTL_ATOM  Atom);
+  __W32_IN PWSTR  AtomName,
+  __W32_IN ULONG  AtomNameLength,
+  __W32_OUT PRTL_ATOM  Atom);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtFindAtom(
-  IN PWSTR  AtomName,
-  IN ULONG  AtomNameLength,
-  OUT PRTL_ATOM  Atom);
+  __W32_IN PWSTR  AtomName,
+  __W32_IN ULONG  AtomNameLength,
+  __W32_OUT PRTL_ATOM  Atom);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtDeleteAtom(
-  IN RTL_ATOM  Atom);
+  __W32_IN RTL_ATOM  Atom);
 
 typedef enum _ATOM_INFORMATION_CLASS {
-	AtomBasicInformation,
-	AtomListInformation
+  AtomBasicInformation,
+  AtomListInformation
 } ATOM_INFORMATION_CLASS;
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtQueryInformationAtom(
-  IN RTL_ATOM  Atom,
-  IN ATOM_INFORMATION_CLASS  AtomInformationClass,
-  OUT PVOID  AtomInformation,
-  IN ULONG  AtomInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
+  __W32_IN RTL_ATOM  Atom,
+  __W32_IN ATOM_INFORMATION_CLASS  AtomInformationClass,
+  __W32_OUT PVOID  AtomInformation,
+  __W32_IN ULONG  AtomInformationLength,
+  __W32_OUT PULONG  ReturnLength  __W32_OPTIONAL);
 
 typedef struct _ATOM_BASIC_INFORMATION {
-	USHORT  ReferenceCount;
-	USHORT  Pinned;
-	USHORT  NameLength;
-	WCHAR  Name[1];
+  USHORT  ReferenceCount;
+  USHORT  Pinned;
+  USHORT  NameLength;
+  WCHAR  Name[1];
 } ATOM_BASIC_INFORMATION, *PATOM_BASIC_INFORMATION;
 
 typedef struct _ATOM_LIST_INFORMATION {
@@ -2885,17 +2885,17 @@
 NTSTATUS
 NTAPI
 ZwSetLdtEntries(
-	IN ULONG  Selector1,
-	IN LDT_ENTRY  LdtEntry1,
-	IN ULONG  Selector2,
-	IN LDT_ENTRY  LdtEntry2);
+  __W32_IN ULONG  Selector1,
+  __W32_IN LDT_ENTRY  LdtEntry1,
+  __W32_IN ULONG  Selector2,
+  __W32_IN LDT_ENTRY  LdtEntry2);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 NtVdmControl(
-  IN ULONG  ControlCode,
-  IN PVOID  ControlData);
+  __W32_IN ULONG  ControlCode,
+  __W32_IN PVOID  ControlData);
 
 #pragma pack(pop)
 
diff -ru w32api-3.6.orig/include/ddk/ntdd8042.h w32api-3.6/include/ddk/ntdd8042.h
--- w32api-3.6.orig/include/ddk/ntdd8042.h	2005-01-02 23:40:37.000000000 +1030
+++ w32api-3.6/include/ddk/ntdd8042.h	2006-02-06 16:41:14.000000000 +1030
@@ -91,45 +91,45 @@
 } MOUSE_STATE, *PMOUSE_STATE;
 
 typedef enum _MOUSE_RESET_SUBSTATE {
-	ExpectingReset,
-	ExpectingResetId,
-	ExpectingGetDeviceIdACK,
-	ExpectingGetDeviceIdValue,
-	ExpectingSetResolutionDefaultACK,
-	ExpectingSetResolutionDefaultValueACK,
-	ExpectingSetResolutionACK,
-	ExpectingSetResolutionValueACK,
-	ExpectingSetScaling1to1ACK,
-	ExpectingSetScaling1to1ACK2,
-	ExpectingSetScaling1to1ACK3,
-	ExpectingReadMouseStatusACK,
-	ExpectingReadMouseStatusByte1,
-	ExpectingReadMouseStatusByte2,
-	ExpectingReadMouseStatusByte3,
-	StartPnPIdDetection,
-	ExpectingLoopSetSamplingRateACK,
-	ExpectingLoopSetSamplingRateValueACK,
-	ExpectingPnpIdByte1,
-	ExpectingPnpIdByte2,
-	ExpectingPnpIdByte3,
-	ExpectingPnpIdByte4,
-	ExpectingPnpIdByte5,
-	ExpectingPnpIdByte6,
-	ExpectingPnpIdByte7,
-	EnableWheel,
-	Enable5Buttons,
-	ExpectingGetDeviceId2ACK,
-	ExpectingGetDeviceId2Value,
-	ExpectingSetSamplingRateACK,
-	ExpectingSetSamplingRateValueACK,
-	ExpectingEnableACK,
-	ExpectingFinalResolutionACK,
-	ExpectingFinalResolutionValueACK,
-	ExpectingGetDeviceIdDetectACK,
-	ExpectingGetDeviceIdDetectValue,
-	CustomHookStateMinimum = 100,
-	CustomHookStateMaximum = 999,
-	I8042ReservedMinimum = 1000
+  ExpectingReset,
+  ExpectingResetId,
+  ExpectingGetDeviceIdACK,
+  ExpectingGetDeviceIdValue,
+  ExpectingSetResolutionDefaultACK,
+  ExpectingSetResolutionDefaultValueACK,
+  ExpectingSetResolutionACK,
+  ExpectingSetResolutionValueACK,
+  ExpectingSetScaling1to1ACK,
+  ExpectingSetScaling1to1ACK2,
+  ExpectingSetScaling1to1ACK3,
+  ExpectingReadMouseStatusACK,
+  ExpectingReadMouseStatusByte1,
+  ExpectingReadMouseStatusByte2,
+  ExpectingReadMouseStatusByte3,
+  StartPnPIdDetection,
+  ExpectingLoopSetSamplingRateACK,
+  ExpectingLoopSetSamplingRateValueACK,
+  ExpectingPnpIdByte1,
+  ExpectingPnpIdByte2,
+  ExpectingPnpIdByte3,
+  ExpectingPnpIdByte4,
+  ExpectingPnpIdByte5,
+  ExpectingPnpIdByte6,
+  ExpectingPnpIdByte7,
+  EnableWheel,
+  Enable5Buttons,
+  ExpectingGetDeviceId2ACK,
+  ExpectingGetDeviceId2Value,
+  ExpectingSetSamplingRateACK,
+  ExpectingSetSamplingRateValueACK,
+  ExpectingEnableACK,
+  ExpectingFinalResolutionACK,
+  ExpectingFinalResolutionValueACK,
+  ExpectingGetDeviceIdDetectACK,
+  ExpectingGetDeviceIdDetectValue,
+  CustomHookStateMinimum = 100,
+  CustomHookStateMaximum = 999,
+  I8042ReservedMinimum = 1000
 } MOUSE_RESET_SUBSTATE, *PMOUSE_RESET_SUBSTATE;
 
 typedef struct _INTERNAL_I8042_START_INFORMATION {
@@ -140,33 +140,33 @@
 
 typedef VOID DDKAPI
 (*PI8042_ISR_WRITE_PORT)(
-  IN PVOID  Context,
-  IN UCHAR  Value);
+  __W32_IN PVOID  Context,
+  __W32_IN UCHAR  Value);
 
 typedef VOID DDKAPI
 (*PI8042_QUEUE_PACKET)(
-  IN PVOID  Context);
+  __W32_IN PVOID  Context);
 
 typedef NTSTATUS DDKAPI
 (*PI8042_SYNCH_READ_PORT) (
-  IN PVOID  Context,
-  OUT PUCHAR  Value,
-  IN BOOLEAN  WaitForACK);
+  __W32_IN PVOID  Context,
+  __W32_OUT PUCHAR  Value,
+  __W32_IN BOOLEAN  WaitForACK);
 
 typedef NTSTATUS DDKAPI
 (*PI8042_SYNCH_WRITE_PORT)(
-  IN PVOID  Context,
-  IN UCHAR  Value,
-  IN BOOLEAN  WaitForACK);
+  __W32_IN PVOID  Context,
+  __W32_IN UCHAR  Value,
+  __W32_IN BOOLEAN  WaitForACK);
 
 
 typedef NTSTATUS DDKAPI
 (*PI8042_KEYBOARD_INITIALIZATION_ROUTINE)(
-  IN PVOID  InitializationContext,
-  IN PVOID  SynchFuncContext,
-  IN PI8042_SYNCH_READ_PORT  ReadPort,
-  IN PI8042_SYNCH_WRITE_PORT  WritePort,
-  OUT PBOOLEAN  TurnTranslationOn);
+  __W32_IN PVOID  InitializationContext,
+  __W32_IN PVOID  SynchFuncContext,
+  __W32_IN PI8042_SYNCH_READ_PORT  ReadPort,
+  __W32_IN PI8042_SYNCH_WRITE_PORT  WritePort,
+  __W32_OUT PBOOLEAN  TurnTranslationOn);
 
 typedef BOOLEAN DDKAPI
 (*PI8042_KEYBOARD_ISR)(
@@ -179,12 +179,12 @@
   PKEYBOARD_SCAN_STATE  ScanState);
 
 typedef struct _INTERNAL_I8042_HOOK_KEYBOARD {
-	OUT PVOID  Context;
-	OUT PI8042_KEYBOARD_INITIALIZATION_ROUTINE  InitializationRoutine;
-	OUT PI8042_KEYBOARD_ISR  IsrRoutine;
-	IN PI8042_ISR_WRITE_PORT  IsrWritePort;
-	IN PI8042_QUEUE_PACKET  QueueKeyboardPacket;
-	IN PVOID  CallContext;
+  __W32_OUT PVOID  Context;
+  __W32_OUT PI8042_KEYBOARD_INITIALIZATION_ROUTINE  InitializationRoutine;
+  __W32_OUT PI8042_KEYBOARD_ISR  IsrRoutine;
+  __W32_IN PI8042_ISR_WRITE_PORT  IsrWritePort;
+  __W32_IN PI8042_QUEUE_PACKET  QueueKeyboardPacket;
+  __W32_IN PVOID  CallContext;
 } INTERNAL_I8042_HOOK_KEYBOARD, *PINTERNAL_I8042_HOOK_KEYBOARD;
 
 typedef BOOLEAN DDKAPI
@@ -199,11 +199,11 @@
   PMOUSE_RESET_SUBSTATE  ResetSubState);
 
 typedef struct _INTERNAL_I8042_HOOK_MOUSE {
-  OUT PVOID  Context;
-  OUT PI8042_MOUSE_ISR  IsrRoutine;
-  IN PI8042_ISR_WRITE_PORT  IsrWritePort;
-  IN PI8042_QUEUE_PACKET  QueueMousePacket;
-  IN PVOID  CallContext;
+  __W32_OUT PVOID  Context;
+  __W32_OUT PI8042_MOUSE_ISR  IsrRoutine;
+  __W32_IN PI8042_ISR_WRITE_PORT  IsrWritePort;
+  __W32_IN PI8042_QUEUE_PACKET  QueueMousePacket;
+  __W32_IN PVOID  CallContext;
 } INTERNAL_I8042_HOOK_MOUSE, *PINTERNAL_I8042_HOOK_MOUSE;
 
 #ifdef __cplusplus
diff -ru w32api-3.6.orig/include/ddk/ntddpcm.h w32api-3.6/include/ddk/ntddpcm.h
--- w32api-3.6.orig/include/ddk/ntddpcm.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/ntddpcm.h	2006-02-06 16:41:14.000000000 +1030
@@ -55,35 +55,35 @@
 } TUPLE_REQUEST, *PTUPLE_REQUEST;
 
 typedef enum _PCMCIA_CONTROLLER_CLASS {
-	PcmciaInvalidControllerClass = -1,
-	PcmciaIntelCompatible,
-	PcmciaCardBusCompatible,
-	PcmciaElcController,
-	PcmciaDatabook,     
-	PcmciaPciPcmciaBridge,
-	PcmciaCirrusLogic,  
-	PcmciaTI,           
-	PcmciaTopic,        
-	PcmciaRicoh,        
-	PcmciaDatabookCB,   
-	PcmciaOpti,         
-	PcmciaTrid,         
-	PcmciaO2Micro,      
-	PcmciaNEC,          
-	PcmciaNEC_98                
+  PcmciaInvalidControllerClass = -1,
+  PcmciaIntelCompatible,
+  PcmciaCardBusCompatible,
+  PcmciaElcController,
+  PcmciaDatabook,
+  PcmciaPciPcmciaBridge,
+  PcmciaCirrusLogic,
+  PcmciaTI,
+  PcmciaTopic,
+  PcmciaRicoh,
+  PcmciaDatabookCB,
+  PcmciaOpti,
+  PcmciaTrid,
+  PcmciaO2Micro,
+  PcmciaNEC,
+  PcmciaNEC_98
 } PCMCIA_CONTROLLER_CLASS, *PPCMCIA_CONTROLLER_CLASS;
 
 typedef struct _PCMCIA_SOCKET_INFORMATION {
-	USHORT  Socket;
-	USHORT  TupleCrc;
-	UCHAR  Manufacturer[MANUFACTURER_NAME_LENGTH];
-	UCHAR  Identifier[DEVICE_IDENTIFIER_LENGTH];
-	UCHAR  DriverName[DRIVER_NAME_LENGTH];
-	UCHAR  DeviceFunctionId;
-	UCHAR  Reserved;
-	UCHAR  CardInSocket;
-	UCHAR  CardEnabled;
-	ULONG  ControllerType;
+  USHORT  Socket;
+  USHORT  TupleCrc;
+  UCHAR  Manufacturer[MANUFACTURER_NAME_LENGTH];
+  UCHAR  Identifier[DEVICE_IDENTIFIER_LENGTH];
+  UCHAR  DriverName[DRIVER_NAME_LENGTH];
+  UCHAR  DeviceFunctionId;
+  UCHAR  Reserved;
+  UCHAR  CardInSocket;
+  UCHAR  CardEnabled;
+  ULONG  ControllerType;
 } PCMCIA_SOCKET_INFORMATION, *PPCMCIA_SOCKET_INFORMATION;
 
 #define PcmciaClassFromControllerType(type)     ((PCMCIA_CONTROLLER_CLASS)((type) & 0xff))
@@ -98,11 +98,11 @@
 
 typedef ULONG STDCALL
 (*PPCMCIA_READ_WRITE_CONFIG)(
-  IN PVOID  Context,
-  IN ULONG  WhichSpace,
-  IN PUCHAR  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN PVOID  Context,
+  __W32_IN ULONG  WhichSpace,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 #define PCCARD_PCI_CONFIGURATION_SPACE    0
 #define PCCARD_ATTRIBUTE_MEMORY           1
@@ -111,13 +111,13 @@
 #define PCCARD_COMMON_MEMORY_INDIRECT     4
 
 typedef struct _PCMCIA_BUS_INTERFACE_STANDARD {
-	USHORT  Size;
-	USHORT  Version;
-	PVOID  Context;
-	PINTERFACE_REFERENCE  InterfaceReference;
-	PINTERFACE_DEREFERENCE  InterfaceDereference;
-	PPCMCIA_READ_WRITE_CONFIG ReadConfig; 
-	PPCMCIA_READ_WRITE_CONFIG  WriteConfig;
+  USHORT  Size;
+  USHORT  Version;
+  PVOID  Context;
+  PINTERFACE_REFERENCE  InterfaceReference;
+  PINTERFACE_DEREFERENCE  InterfaceDereference;
+  PPCMCIA_READ_WRITE_CONFIG ReadConfig;
+  PPCMCIA_READ_WRITE_CONFIG  WriteConfig;
 } PCMCIA_BUS_INTERFACE_STANDARD, *PPCMCIA_BUS_INTERFACE_STANDARD;
 
 #define PCMCIA_MEMORY_8BIT_ACCESS         0
@@ -125,14 +125,14 @@
 
 typedef BOOLEAN STDCALL
 (*PPCMCIA_MODIFY_MEMORY_WINDOW)(
-  IN PVOID  Context,
-  IN ULONGLONG  HostBase,
-  IN ULONGLONG  CardBase,
-  IN BOOLEAN  Enable,
-  IN ULONG  WindowSize  OPTIONAL,
-  IN UCHAR  AccessSpeed  OPTIONAL,
-  IN UCHAR  BusWidth  OPTIONAL,
-  IN BOOLEAN  IsAttributeMemory  OPTIONAL);
+  __W32_IN PVOID  Context,
+  __W32_IN ULONGLONG  HostBase,
+  __W32_IN ULONGLONG  CardBase,
+  __W32_IN BOOLEAN  Enable,
+  __W32_IN ULONG  WindowSize  __W32_OPTIONAL,
+  __W32_IN UCHAR  AccessSpeed  __W32_OPTIONAL,
+  __W32_IN UCHAR  BusWidth  __W32_OPTIONAL,
+  __W32_IN BOOLEAN  IsAttributeMemory  __W32_OPTIONAL);
 
 #define PCMCIA_VPP_0V                     0
 #define PCMCIA_VPP_12V                    1
@@ -140,22 +140,22 @@
 
 typedef BOOLEAN STDCALL
 (*PPCMCIA_SET_VPP)(
-  IN PVOID  Context,
-  IN UCHAR  VppLevel);
+  __W32_IN PVOID  Context,
+  __W32_IN UCHAR  VppLevel);
 
 typedef BOOLEAN STDCALL
 (*PPCMCIA_IS_WRITE_PROTECTED)(
-  IN PVOID  Context);
+  __W32_IN PVOID  Context);
 
 typedef struct _PCMCIA_INTERFACE_STANDARD {
-	USHORT  Size;
-	USHORT  Version;
-	PINTERFACE_REFERENCE  InterfaceReference;
-	PINTERFACE_DEREFERENCE  InterfaceDereference;
-	PVOID  Context;
-	PPCMCIA_MODIFY_MEMORY_WINDOW  ModifyMemoryWindow;
-	PPCMCIA_SET_VPP  SetVpp;
-	PPCMCIA_IS_WRITE_PROTECTED  IsWriteProtected;
+  USHORT  Size;
+  USHORT  Version;
+  PINTERFACE_REFERENCE  InterfaceReference;
+  PINTERFACE_DEREFERENCE  InterfaceDereference;
+  PVOID  Context;
+  PPCMCIA_MODIFY_MEMORY_WINDOW  ModifyMemoryWindow;
+  PPCMCIA_SET_VPP  SetVpp;
+  PPCMCIA_IS_WRITE_PROTECTED  IsWriteProtected;
 } PCMCIA_INTERFACE_STANDARD, *PPCMCIA_INTERFACE_STANDARD;
 
 #ifdef __cplusplus
diff -ru w32api-3.6.orig/include/ddk/ntifs.h w32api-3.6/include/ddk/ntifs.h
--- w32api-3.6.orig/include/ddk/ntifs.h	2005-08-11 10:29:49.000000000 +0930
+++ w32api-3.6/include/ddk/ntifs.h	2006-02-06 16:41:14.000000000 +1030
@@ -67,7 +67,7 @@
 #define ACCESS_DENIED_ACE_TYPE          (0x1)
 #define SYSTEM_AUDIT_ACE_TYPE           (0x2)
 #define SYSTEM_ALARM_ACE_TYPE           (0x3)
- 
+
 #define COMPRESSION_FORMAT_NONE         (0x0000)
 #define COMPRESSION_FORMAT_DEFAULT      (0x0001)
 #define COMPRESSION_FORMAT_LZNT1        (0x0002)
@@ -259,7 +259,7 @@
 #define MEM_DOS_LIM                     0x40000000
 /* also in winnt.h */
 #define MEM_IMAGE                       SEC_IMAGE
-/* end winnt.h */ 
+/* end winnt.h */
 #define OB_TYPE_TYPE                    1
 #define OB_TYPE_DIRECTORY               2
 #define OB_TYPE_SYMBOLIC_LINK           3
@@ -293,14 +293,14 @@
 #define PORT_ALL_ACCESS                 (STANDARD_RIGHTS_ALL |\
                                          PORT_CONNECT)
 /* also in winnt.h */
-#define SEC_BASED	0x00200000
-#define SEC_NO_CHANGE	0x00400000
-#define SEC_FILE	0x00800000
-#define SEC_IMAGE	0x01000000
-#define SEC_VLM		0x02000000
-#define SEC_RESERVE	0x04000000
-#define SEC_COMMIT	0x08000000
-#define SEC_NOCACHE	0x10000000
+#define SEC_BASED                       0x00200000
+#define SEC_NO_CHANGE                   0x00400000
+#define SEC_FILE                        0x00800000
+#define SEC_IMAGE                       0x01000000
+#define SEC_VLM                         0x02000000
+#define SEC_RESERVE                     0x04000000
+#define SEC_COMMIT                      0x08000000
+#define SEC_NOCACHE                     0x10000000
 
 #define SECURITY_WORLD_SID_AUTHORITY    {0,0,0,0,0,1}
 #define SECURITY_WORLD_RID              (0x00000000L)
@@ -703,7 +703,7 @@
     ULONG               ReferenceCount;
     ULONG               DriveMap;
     UCHAR               DriveType[32];
-} DEVICE_MAP, *PDEVICE_MAP; 
+} DEVICE_MAP, *PDEVICE_MAP;
 
 #if (VER_PRODUCTBUILD >= 2600)
 
@@ -907,71 +907,71 @@
 } FILE_DIRECTORY_INFORMATION, *PFILE_DIRECTORY_INFORMATION;
 
 typedef struct _FILE_FULL_DIRECTORY_INFORMATION {
-		ULONG	          NextEntryOffset;
-		ULONG	          FileIndex;
-		LARGE_INTEGER   CreationTime;
-		LARGE_INTEGER   LastAccessTime;
-		LARGE_INTEGER   LastWriteTime;
-		LARGE_INTEGER   ChangeTime;
-		LARGE_INTEGER   EndOfFile;
-		LARGE_INTEGER   AllocationSize;
-		ULONG           FileAttributes;
-		ULONG           FileNameLength;
-		ULONG           EaSize;
-		WCHAR           FileName[0];
+    ULONG           NextEntryOffset;
+    ULONG           FileIndex;
+    LARGE_INTEGER   CreationTime;
+    LARGE_INTEGER   LastAccessTime;
+    LARGE_INTEGER   LastWriteTime;
+    LARGE_INTEGER   ChangeTime;
+    LARGE_INTEGER   EndOfFile;
+    LARGE_INTEGER   AllocationSize;
+    ULONG           FileAttributes;
+    ULONG           FileNameLength;
+    ULONG           EaSize;
+    WCHAR           FileName[0];
 } FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION;
 
 typedef struct _FILE_BOTH_DIRECTORY_INFORMATION {
-		ULONG         NextEntryOffset;
-		ULONG	        FileIndex;
-		LARGE_INTEGER CreationTime;
-		LARGE_INTEGER LastAccessTime;
-		LARGE_INTEGER LastWriteTime;
-		LARGE_INTEGER ChangeTime;
-		LARGE_INTEGER EndOfFile;
-		LARGE_INTEGER AllocationSize;
-		ULONG         FileAttributes;
-		ULONG         FileNameLength;
-		ULONG         EaSize;
-		CHAR          ShortNameLength;
-		WCHAR         ShortName[12];
-		WCHAR         FileName[0];
+    ULONG         NextEntryOffset;
+    ULONG         FileIndex;
+    LARGE_INTEGER CreationTime;
+    LARGE_INTEGER LastAccessTime;
+    LARGE_INTEGER LastWriteTime;
+    LARGE_INTEGER ChangeTime;
+    LARGE_INTEGER EndOfFile;
+    LARGE_INTEGER AllocationSize;
+    ULONG         FileAttributes;
+    ULONG         FileNameLength;
+    ULONG         EaSize;
+    CHAR          ShortNameLength;
+    WCHAR         ShortName[12];
+    WCHAR         FileName[0];
 } FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION;
 
 #if (VER_PRODUCTBUILD >= 2600)
 
 typedef struct _FILE_ID_FULL_DIRECTORY_INFORMATION {
-		ULONG	          NextEntryOffset;
-		ULONG	          FileIndex;
-		LARGE_INTEGER   CreationTime;
-		LARGE_INTEGER   LastAccessTime;
-		LARGE_INTEGER   LastWriteTime;
-		LARGE_INTEGER   ChangeTime;
-		LARGE_INTEGER   EndOfFile;
-		LARGE_INTEGER   AllocationSize;
-		ULONG           FileAttributes;
-		ULONG           FileNameLength;
-		ULONG           EaSize;
-		LARGE_INTEGER   FileId;
-		WCHAR           FileName[0];
+    ULONG            NextEntryOffset;
+    ULONG           FileIndex;
+    LARGE_INTEGER   CreationTime;
+    LARGE_INTEGER   LastAccessTime;
+    LARGE_INTEGER   LastWriteTime;
+    LARGE_INTEGER   ChangeTime;
+    LARGE_INTEGER   EndOfFile;
+    LARGE_INTEGER   AllocationSize;
+    ULONG           FileAttributes;
+    ULONG           FileNameLength;
+    ULONG           EaSize;
+    LARGE_INTEGER   FileId;
+    WCHAR           FileName[0];
 } FILE_ID_FULL_DIRECTORY_INFORMATION, *PFILE_ID_FULL_DIRECTORY_INFORMATION;
 
 typedef struct _FILE_ID_BOTH_DIRECTORY_INFORMATION {
-		ULONG         NextEntryOffset;
-		ULONG	        FileIndex;
-		LARGE_INTEGER CreationTime;
-		LARGE_INTEGER LastAccessTime;
-		LARGE_INTEGER LastWriteTime;
-		LARGE_INTEGER ChangeTime;
-		LARGE_INTEGER EndOfFile;
-		LARGE_INTEGER AllocationSize;
-		ULONG         FileAttributes;
-		ULONG         FileNameLength;
-		ULONG         EaSize;
-		CHAR          ShortNameLength;
-		WCHAR         ShortName[12];
-		LARGE_INTEGER FileId;
-		WCHAR         FileName[0];
+    ULONG         NextEntryOffset;
+    ULONG         FileIndex;
+    LARGE_INTEGER CreationTime;
+    LARGE_INTEGER LastAccessTime;
+    LARGE_INTEGER LastWriteTime;
+    LARGE_INTEGER ChangeTime;
+    LARGE_INTEGER EndOfFile;
+    LARGE_INTEGER AllocationSize;
+    ULONG         FileAttributes;
+    ULONG         FileNameLength;
+    ULONG         EaSize;
+    CHAR          ShortNameLength;
+    WCHAR         ShortName[12];
+    LARGE_INTEGER FileId;
+    WCHAR         FileName[0];
 } FILE_ID_BOTH_DIRECTORY_INFORMATION, *PFILE_ID_BOTH_DIRECTORY_INFORMATION;
 
 #endif
@@ -1097,13 +1097,13 @@
 } FILE_EXCLUSIVE_LOCK_ENTRY, *PFILE_EXCLUSIVE_LOCK_ENTRY;
 
 typedef NTSTATUS (*PCOMPLETE_LOCK_IRP_ROUTINE) (
-    IN PVOID    Context,
-    IN PIRP     Irp
+    __W32_IN PVOID    Context,
+    __W32_IN PIRP     Irp
 );
 
 typedef VOID (NTAPI *PUNLOCK_ROUTINE) (
-    IN PVOID            Context,
-    IN PFILE_LOCK_INFO  FileLockInfo
+    __W32_IN PVOID            Context,
+    __W32_IN PFILE_LOCK_INFO  FileLockInfo
 );
 
 typedef struct _FILE_LOCK {
@@ -1403,12 +1403,12 @@
 } MBCB, *PMBCB;
 
 typedef struct _MOVEFILE_DESCRIPTOR {
-     HANDLE         FileHandle; 
-     ULONG          Reserved;   
-     LARGE_INTEGER  StartVcn; 
+     HANDLE         FileHandle;
+     ULONG          Reserved;
+     LARGE_INTEGER  StartVcn;
      LARGE_INTEGER  TargetLcn;
-     ULONG          NumVcns; 
-     ULONG          Reserved1;  
+     ULONG          NumVcns;
+     ULONG          Reserved1;
 } MOVEFILE_DESCRIPTOR, *PMOVEFILE_DESCRIPTOR;
 
 typedef struct _NAMED_PIPE_CREATE_PARAMETERS {
@@ -1733,118 +1733,118 @@
 BOOLEAN
 NTAPI
 CcCanIWrite (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        BytesToWrite,
-    IN BOOLEAN      Wait,
-    IN BOOLEAN      Retrying
+    __W32_IN PFILE_OBJECT FileObject,
+    __W32_IN ULONG        BytesToWrite,
+    __W32_IN BOOLEAN      Wait,
+    __W32_IN BOOLEAN      Retrying
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 CcCopyRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    IN BOOLEAN              Wait,
-    OUT PVOID               Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN ULONG                Length,
+    __W32_IN BOOLEAN              Wait,
+    __W32_OUT PVOID               Buffer,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 CcCopyWrite (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN BOOLEAN          Wait,
-    IN PVOID            Buffer
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN ULONG            Length,
+    __W32_IN BOOLEAN          Wait,
+    __W32_IN PVOID            Buffer
 );
 
 #define CcCopyWriteWontFlush(FO, FOFF, LEN) ((LEN) <= 0x10000)
 
 typedef VOID (NTAPI *PCC_POST_DEFERRED_WRITE) (
-    IN PVOID Context1,
-    IN PVOID Context2
+    __W32_IN PVOID Context1,
+    __W32_IN PVOID Context2
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcDeferWrite (
-    IN PFILE_OBJECT             FileObject,
-    IN PCC_POST_DEFERRED_WRITE  PostRoutine,
-    IN PVOID                    Context1,
-    IN PVOID                    Context2,
-    IN ULONG                    BytesToWrite,
-    IN BOOLEAN                  Retrying
+    __W32_IN PFILE_OBJECT             FileObject,
+    __W32_IN PCC_POST_DEFERRED_WRITE  PostRoutine,
+    __W32_IN PVOID                    Context1,
+    __W32_IN PVOID                    Context2,
+    __W32_IN ULONG                    BytesToWrite,
+    __W32_IN BOOLEAN                  Retrying
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcFastCopyRead (
-    IN PFILE_OBJECT         FileObject,
-    IN ULONG                FileOffset,
-    IN ULONG                Length,
-    IN ULONG                PageCount,
-    OUT PVOID               Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN ULONG                FileOffset,
+    __W32_IN ULONG                Length,
+    __W32_IN ULONG                PageCount,
+    __W32_OUT PVOID               Buffer,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcFastCopyWrite (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        FileOffset,
-    IN ULONG        Length,
-    IN PVOID        Buffer
+    __W32_IN PFILE_OBJECT FileObject,
+    __W32_IN ULONG        FileOffset,
+    __W32_IN ULONG        Length,
+    __W32_IN PVOID        Buffer
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcFlushCache (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN PLARGE_INTEGER           FileOffset OPTIONAL,
-    IN ULONG                    Length,
-    OUT PIO_STATUS_BLOCK        IoStatus OPTIONAL
+    __W32_IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
+    __W32_IN PLARGE_INTEGER           FileOffset __W32_OPTIONAL,
+    __W32_IN ULONG                    Length,
+    __W32_OUT PIO_STATUS_BLOCK        IoStatus __W32_OPTIONAL
 );
 
 typedef VOID (*PDIRTY_PAGE_ROUTINE) (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN PLARGE_INTEGER   OldestLsn,
-    IN PLARGE_INTEGER   NewestLsn,
-    IN PVOID            Context1,
-    IN PVOID            Context2
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN ULONG            Length,
+    __W32_IN PLARGE_INTEGER   OldestLsn,
+    __W32_IN PLARGE_INTEGER   NewestLsn,
+    __W32_IN PVOID            Context1,
+    __W32_IN PVOID            Context2
 );
 
 NTKERNELAPI
 LARGE_INTEGER
 NTAPI
 CcGetDirtyPages (
-    IN PVOID                LogHandle,
-    IN PDIRTY_PAGE_ROUTINE  DirtyPageRoutine,
-    IN PVOID                Context1,
-    IN PVOID                Context2
+    __W32_IN PVOID                LogHandle,
+    __W32_IN PDIRTY_PAGE_ROUTINE  DirtyPageRoutine,
+    __W32_IN PVOID                Context1,
+    __W32_IN PVOID                Context2
 );
 
 NTKERNELAPI
 PFILE_OBJECT
 NTAPI
 CcGetFileObjectFromBcb (
-    IN PVOID Bcb
+    __W32_IN PVOID Bcb
 );
 
 NTKERNELAPI
 PFILE_OBJECT
 NTAPI
 CcGetFileObjectFromSectionPtrs (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer
+    __W32_IN PSECTION_OBJECT_POINTERS SectionObjectPointer
 );
 
 #define CcGetFileSizePointer(FO) (                                     \
@@ -1857,8 +1857,8 @@
 LARGE_INTEGER
 NTAPI
 CcGetFlushedValidData (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN BOOLEAN                  BcbListHeld
+    __W32_IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
+    __W32_IN BOOLEAN                  BcbListHeld
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -1866,26 +1866,26 @@
 NTKERNELAPI
 LARGE_INTEGER
 CcGetLsnForFileObject (
-    IN PFILE_OBJECT     FileObject,
-    OUT PLARGE_INTEGER  OldestLsn OPTIONAL
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_OUT PLARGE_INTEGER  OldestLsn __W32_OPTIONAL
 );
 
 typedef BOOLEAN (NTAPI *PACQUIRE_FOR_LAZY_WRITE) (
-    IN PVOID    Context,
-    IN BOOLEAN  Wait
+    __W32_IN PVOID    Context,
+    __W32_IN BOOLEAN  Wait
 );
 
 typedef VOID (NTAPI *PRELEASE_FROM_LAZY_WRITE) (
-    IN PVOID Context
+    __W32_IN PVOID Context
 );
 
 typedef BOOLEAN (NTAPI *PACQUIRE_FOR_READ_AHEAD) (
-    IN PVOID    Context,
-    IN BOOLEAN  Wait
+    __W32_IN PVOID    Context,
+    __W32_IN BOOLEAN  Wait
 );
 
 typedef VOID (NTAPI *PRELEASE_FROM_READ_AHEAD) (
-    IN PVOID Context
+    __W32_IN PVOID Context
 );
 
 typedef struct _CACHE_MANAGER_CALLBACKS {
@@ -1899,11 +1899,11 @@
 VOID
 NTAPI
 CcInitializeCacheMap (
-    IN PFILE_OBJECT             FileObject,
-    IN PCC_FILE_SIZES           FileSizes,
-    IN BOOLEAN                  PinAccess,
-    IN PCACHE_MANAGER_CALLBACKS Callbacks,
-    IN PVOID                    LazyWriteContext
+    __W32_IN PFILE_OBJECT             FileObject,
+    __W32_IN PCC_FILE_SIZES           FileSizes,
+    __W32_IN BOOLEAN                  PinAccess,
+    __W32_IN PCACHE_MANAGER_CALLBACKS Callbacks,
+    __W32_IN PVOID                    LazyWriteContext
 );
 
 #define CcIsFileCached(FO) (                                                         \
@@ -1915,116 +1915,116 @@
 BOOLEAN
 NTAPI
 CcIsThereDirtyData (
-    IN PVPB Vpb
+    __W32_IN PVPB Vpb
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 CcMapData (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN BOOLEAN          Wait,
-    OUT PVOID           *Bcb,
-    OUT PVOID           *Buffer
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN ULONG            Length,
+    __W32_IN BOOLEAN          Wait,
+    __W32_OUT PVOID           *Bcb,
+    __W32_OUT PVOID           *Buffer
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcMdlRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    OUT PMDL                *MdlChain,
-    OUT PIO_STATUS_BLOCK    IoStatus
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN ULONG                Length,
+    __W32_OUT PMDL                *MdlChain,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcMdlReadComplete (
-    IN PFILE_OBJECT FileObject,
-    IN PMDL         MdlChain
+    __W32_IN PFILE_OBJECT FileObject,
+    __W32_IN PMDL         MdlChain
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcMdlWriteComplete (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN PMDL             MdlChain
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN PMDL             MdlChain
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 CcPinMappedData (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN ULONG            Length,
 #if (VER_PRODUCTBUILD >= 2195)
-    IN ULONG            Flags,
+    __W32_IN ULONG            Flags,
 #else
-    IN BOOLEAN          Wait,
+    __W32_IN BOOLEAN          Wait,
 #endif
-    IN OUT PVOID        *Bcb
+    __W32_IN __W32_OUT PVOID        *Bcb
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 CcPinRead (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN ULONG            Length,
 #if (VER_PRODUCTBUILD >= 2195)
-    IN ULONG            Flags,
+    __W32_IN ULONG            Flags,
 #else
-    IN BOOLEAN          Wait,
+    __W32_IN BOOLEAN          Wait,
 #endif
-    OUT PVOID           *Bcb,
-    OUT PVOID           *Buffer
+    __W32_OUT PVOID           *Bcb,
+    __W32_OUT PVOID           *Buffer
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcPrepareMdlWrite (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    OUT PMDL                *MdlChain,
-    OUT PIO_STATUS_BLOCK    IoStatus
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN ULONG                Length,
+    __W32_OUT PMDL                *MdlChain,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 CcPreparePinWrite (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN BOOLEAN          Zero,
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN ULONG            Length,
+    __W32_IN BOOLEAN          Zero,
 #if (VER_PRODUCTBUILD >= 2195)
-    IN ULONG            Flags,
+    __W32_IN ULONG            Flags,
 #else
-    IN BOOLEAN          Wait,
+    __W32_IN BOOLEAN          Wait,
 #endif
-    OUT PVOID           *Bcb,
-    OUT PVOID           *Buffer
+    __W32_OUT PVOID           *Bcb,
+    __W32_OUT PVOID           *Buffer
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 CcPurgeCacheSection (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN PLARGE_INTEGER           FileOffset OPTIONAL,
-    IN ULONG                    Length,
-    IN BOOLEAN                  UninitializeCacheMaps
+    __W32_IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
+    __W32_IN PLARGE_INTEGER           FileOffset __W32_OPTIONAL,
+    __W32_IN ULONG                    Length,
+    __W32_IN BOOLEAN                  UninitializeCacheMaps
 );
 
 #define CcReadAhead(FO, FOFF, LEN) (                \
@@ -2039,7 +2039,7 @@
 PVOID
 NTAPI
 CcRemapBcb (
-    IN PVOID Bcb
+    __W32_IN PVOID Bcb
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2048,79 +2048,79 @@
 VOID
 NTAPI
 CcRepinBcb (
-    IN PVOID Bcb
+    __W32_IN PVOID Bcb
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcScheduleReadAhead (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN ULONG            Length
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcSetAdditionalCacheAttributes (
-    IN PFILE_OBJECT FileObject,
-    IN BOOLEAN      DisableReadAhead,
-    IN BOOLEAN      DisableWriteBehind
+    __W32_IN PFILE_OBJECT FileObject,
+    __W32_IN BOOLEAN      DisableReadAhead,
+    __W32_IN BOOLEAN      DisableWriteBehind
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcSetBcbOwnerPointer (
-    IN PVOID Bcb,
-    IN PVOID OwnerPointer
+    __W32_IN PVOID Bcb,
+    __W32_IN PVOID OwnerPointer
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcSetDirtyPageThreshold (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        DirtyPageThreshold
+    __W32_IN PFILE_OBJECT FileObject,
+    __W32_IN ULONG        DirtyPageThreshold
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcSetDirtyPinnedData (
-    IN PVOID            BcbVoid,
-    IN PLARGE_INTEGER   Lsn OPTIONAL
+    __W32_IN PVOID            BcbVoid,
+    __W32_IN PLARGE_INTEGER   Lsn __W32_OPTIONAL
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcSetFileSizes (
-    IN PFILE_OBJECT     FileObject,
-    IN PCC_FILE_SIZES   FileSizes
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PCC_FILE_SIZES   FileSizes
 );
 
 typedef VOID (NTAPI *PFLUSH_TO_LSN) (
-    IN PVOID            LogHandle,
-    IN PLARGE_INTEGER   Lsn
+    __W32_IN PVOID            LogHandle,
+    __W32_IN PLARGE_INTEGER   Lsn
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcSetLogHandleForFile (
-    IN PFILE_OBJECT     FileObject,
-    IN PVOID            LogHandle,
-    IN PFLUSH_TO_LSN    FlushToLsnRoutine
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PVOID            LogHandle,
+    __W32_IN PFLUSH_TO_LSN    FlushToLsnRoutine
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcSetReadAheadGranularity (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        Granularity     /* default: PAGE_SIZE */
+    __W32_IN PFILE_OBJECT FileObject,
+    __W32_IN ULONG        Granularity     /* default: PAGE_SIZE */
                                     /* allowed: 2^n * PAGE_SIZE */
 );
 
@@ -2128,33 +2128,33 @@
 BOOLEAN
 NTAPI
 CcUninitializeCacheMap (
-    IN PFILE_OBJECT                 FileObject,
-    IN PLARGE_INTEGER               TruncateSize OPTIONAL,
-    IN PCACHE_UNINITIALIZE_EVENT    UninitializeCompleteEvent OPTIONAL
+    __W32_IN PFILE_OBJECT                 FileObject,
+    __W32_IN PLARGE_INTEGER               TruncateSize __W32_OPTIONAL,
+    __W32_IN PCACHE_UNINITIALIZE_EVENT    UninitializeCompleteEvent __W32_OPTIONAL
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcUnpinData (
-    IN PVOID Bcb
+    __W32_IN PVOID Bcb
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcUnpinDataForThread (
-    IN PVOID            Bcb,
-    IN ERESOURCE_THREAD ResourceThreadId
+    __W32_IN PVOID            Bcb,
+    __W32_IN ERESOURCE_THREAD ResourceThreadId
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 CcUnpinRepinnedBcb (
-    IN PVOID                Bcb,
-    IN BOOLEAN              WriteThrough,
-    OUT PIO_STATUS_BLOCK    IoStatus
+    __W32_IN PVOID                Bcb,
+    __W32_IN BOOLEAN              WriteThrough,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2172,25 +2172,25 @@
 BOOLEAN
 NTAPI
 CcZeroData (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   StartOffset,
-    IN PLARGE_INTEGER   EndOffset,
-    IN BOOLEAN          Wait
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   StartOffset,
+    __W32_IN PLARGE_INTEGER   EndOffset,
+    __W32_IN BOOLEAN          Wait
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 ExDisableResourceBoostLite (
-    IN PERESOURCE Resource
+    __W32_IN PERESOURCE Resource
 );
 
 NTKERNELAPI
 ULONG
 NTAPI
 ExQueryPoolBlockSize (
-    IN PVOID        PoolBlock,
-    OUT PBOOLEAN    QuotaCharged
+    __W32_IN PVOID        PoolBlock,
+    __W32_OUT PBOOLEAN    QuotaCharged
 );
 
 #define FlagOn(x, f) ((x) & (f))
@@ -2199,13 +2199,13 @@
 VOID
 NTAPI
 FsRtlAddToTunnelCache (
-    IN PTUNNEL          Cache,
-    IN ULONGLONG        DirectoryKey,
-    IN PUNICODE_STRING  ShortName,
-    IN PUNICODE_STRING  LongName,
-    IN BOOLEAN          KeyByShortName,
-    IN ULONG            DataLength,
-    IN PVOID            Data
+    __W32_IN PTUNNEL          Cache,
+    __W32_IN ULONGLONG        DirectoryKey,
+    __W32_IN PUNICODE_STRING  ShortName,
+    __W32_IN PUNICODE_STRING  LongName,
+    __W32_IN BOOLEAN          KeyByShortName,
+    __W32_IN ULONG            DataLength,
+    __W32_IN PVOID            Data
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2213,8 +2213,8 @@
 PFILE_LOCK
 NTAPI
 FsRtlAllocateFileLock (
-    IN PCOMPLETE_LOCK_IRP_ROUTINE   CompleteLockIrpRoutine OPTIONAL,
-    IN PUNLOCK_ROUTINE              UnlockRoutine OPTIONAL
+    __W32_IN PCOMPLETE_LOCK_IRP_ROUTINE   CompleteLockIrpRoutine __W32_OPTIONAL,
+    __W32_IN PUNLOCK_ROUTINE              UnlockRoutine __W32_OPTIONAL
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2223,44 +2223,44 @@
 PVOID
 NTAPI
 FsRtlAllocatePool (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes
+    __W32_IN POOL_TYPE    PoolType,
+    __W32_IN ULONG        NumberOfBytes
 );
 
 NTKERNELAPI
 PVOID
 NTAPI
 FsRtlAllocatePoolWithQuota (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes
+    __W32_IN POOL_TYPE    PoolType,
+    __W32_IN ULONG        NumberOfBytes
 );
 
 NTKERNELAPI
 PVOID
 NTAPI
 FsRtlAllocatePoolWithQuotaTag (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes,
-    IN ULONG        Tag
+    __W32_IN POOL_TYPE    PoolType,
+    __W32_IN ULONG        NumberOfBytes,
+    __W32_IN ULONG        Tag
 );
 
 NTKERNELAPI
 PVOID
 NTAPI
 FsRtlAllocatePoolWithTag (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes,
-    IN ULONG        Tag
+    __W32_IN POOL_TYPE    PoolType,
+    __W32_IN ULONG        NumberOfBytes,
+    __W32_IN ULONG        Tag
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlAreNamesEqual (
-    IN PUNICODE_STRING  Name1,
-    IN PUNICODE_STRING  Name2,
-    IN BOOLEAN          IgnoreCase,
-    IN PWCHAR           UpcaseTable OPTIONAL
+    __W32_IN PUNICODE_STRING  Name1,
+    __W32_IN PUNICODE_STRING  Name2,
+    __W32_IN BOOLEAN          IgnoreCase,
+    __W32_IN PWCHAR           UpcaseTable __W32_OPTIONAL
 );
 
 #define FsRtlAreThereCurrentFileLocks(FL) ( \
@@ -2278,8 +2278,8 @@
 BOOLEAN
 NTAPI
 FsRtlCheckLockForReadAccess (
-    IN PFILE_LOCK   FileLock,
-    IN PIRP         Irp
+    __W32_IN PFILE_LOCK   FileLock,
+    __W32_IN PIRP         Irp
 );
 
 /*
@@ -2293,97 +2293,97 @@
 BOOLEAN
 NTAPI
 FsRtlCheckLockForWriteAccess (
-    IN PFILE_LOCK   FileLock,
-    IN PIRP         Irp
+    __W32_IN PFILE_LOCK   FileLock,
+    __W32_IN PIRP         Irp
 );
 
 typedef
 VOID NTAPI
 (*POPLOCK_WAIT_COMPLETE_ROUTINE) (
-    IN PVOID    Context,
-    IN PIRP     Irp
+    __W32_IN PVOID    Context,
+    __W32_IN PIRP     Irp
 );
 
 typedef
 VOID NTAPI
 (*POPLOCK_FS_PREPOST_IRP) (
-    IN PVOID    Context,
-    IN PIRP     Irp
+    __W32_IN PVOID    Context,
+    __W32_IN PIRP     Irp
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 FsRtlCheckOplock (
-    IN POPLOCK                          Oplock,
-    IN PIRP                             Irp,
-    IN PVOID                            Context,
-    IN POPLOCK_WAIT_COMPLETE_ROUTINE    CompletionRoutine OPTIONAL,
-    IN POPLOCK_FS_PREPOST_IRP           PostIrpRoutine OPTIONAL
+    __W32_IN POPLOCK                          Oplock,
+    __W32_IN PIRP                             Irp,
+    __W32_IN PVOID                            Context,
+    __W32_IN POPLOCK_WAIT_COMPLETE_ROUTINE    CompletionRoutine __W32_OPTIONAL,
+    __W32_IN POPLOCK_FS_PREPOST_IRP           PostIrpRoutine __W32_OPTIONAL
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlCopyRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    IN BOOLEAN              Wait,
-    IN ULONG                LockKey,
-    OUT PVOID               Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus,
-    IN PDEVICE_OBJECT       DeviceObject
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN ULONG                Length,
+    __W32_IN BOOLEAN              Wait,
+    __W32_IN ULONG                LockKey,
+    __W32_OUT PVOID               Buffer,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus,
+    __W32_IN PDEVICE_OBJECT       DeviceObject
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlCopyWrite (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    IN BOOLEAN              Wait,
-    IN ULONG                LockKey,
-    IN PVOID                Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus,
-    IN PDEVICE_OBJECT       DeviceObject
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN ULONG                Length,
+    __W32_IN BOOLEAN              Wait,
+    __W32_IN ULONG                LockKey,
+    __W32_IN PVOID                Buffer,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus,
+    __W32_IN PDEVICE_OBJECT       DeviceObject
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlCurrentBatchOplock (
-    IN POPLOCK Oplock
+    __W32_IN POPLOCK Oplock
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlDeleteKeyFromTunnelCache (
-    IN PTUNNEL      Cache,
-    IN ULONGLONG    DirectoryKey
+    __W32_IN PTUNNEL      Cache,
+    __W32_IN ULONGLONG    DirectoryKey
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlDeleteTunnelCache (
-    IN PTUNNEL Cache
+    __W32_IN PTUNNEL Cache
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlDeregisterUncProvider (
-    IN HANDLE Handle
+    __W32_IN HANDLE Handle
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlDoesNameContainWildCards (
-    IN PUNICODE_STRING Name
+    __W32_IN PUNICODE_STRING Name
 );
 
 #define FsRtlEnterFileSystem    KeEnterCriticalRegion
@@ -2394,24 +2394,24 @@
 BOOLEAN
 NTAPI
 FsRtlFastCheckLockForRead (
-    IN PFILE_LOCK           FileLock,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN ULONG                Key,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process
+    __W32_IN PFILE_LOCK           FileLock,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN PLARGE_INTEGER       Length,
+    __W32_IN ULONG                Key,
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PEPROCESS            Process
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlFastCheckLockForWrite (
-    IN PFILE_LOCK           FileLock,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN ULONG                Key,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process
+    __W32_IN PFILE_LOCK           FileLock,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN PLARGE_INTEGER       Length,
+    __W32_IN ULONG                Key,
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PEPROCESS            Process
 );
 
 #define FsRtlFastLock(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) (       \
@@ -2422,10 +2422,10 @@
 NTSTATUS
 NTAPI
 FsRtlFastUnlockAll (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process,
-    IN PVOID                Context OPTIONAL
+    __W32_IN PFILE_LOCK           FileLock,
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PEPROCESS            Process,
+    __W32_IN PVOID                Context __W32_OPTIONAL
 );
 /* ret: STATUS_RANGE_NOT_LOCKED */
 
@@ -2433,40 +2433,40 @@
 NTSTATUS
 NTAPI
 FsRtlFastUnlockAllByKey (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process,
-    IN ULONG                Key,
-    IN PVOID                Context OPTIONAL
-);  
+    __W32_IN PFILE_LOCK           FileLock,
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PEPROCESS            Process,
+    __W32_IN ULONG                Key,
+    __W32_IN PVOID                Context __W32_OPTIONAL
+);
 /* ret: STATUS_RANGE_NOT_LOCKED */
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 FsRtlFastUnlockSingle (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN PEPROCESS            Process,
-    IN ULONG                Key,
-    IN PVOID                Context OPTIONAL,
-    IN BOOLEAN              AlreadySynchronized
-);                      
+    __W32_IN PFILE_LOCK           FileLock,
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN PLARGE_INTEGER       Length,
+    __W32_IN PEPROCESS            Process,
+    __W32_IN ULONG                Key,
+    __W32_IN PVOID                Context __W32_OPTIONAL,
+    __W32_IN BOOLEAN              AlreadySynchronized
+);
 /* ret:  STATUS_RANGE_NOT_LOCKED */
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlFindInTunnelCache (
-    IN PTUNNEL          Cache,
-    IN ULONGLONG        DirectoryKey,
-    IN PUNICODE_STRING  Name,
-    OUT PUNICODE_STRING ShortName,
-    OUT PUNICODE_STRING LongName,
-    IN OUT PULONG       DataLength,
-    OUT PVOID           Data
+    __W32_IN PTUNNEL          Cache,
+    __W32_IN ULONGLONG        DirectoryKey,
+    __W32_IN PUNICODE_STRING  Name,
+    __W32_OUT PUNICODE_STRING ShortName,
+    __W32_OUT PUNICODE_STRING LongName,
+    __W32_IN __W32_OUT PULONG       DataLength,
+    __W32_OUT PVOID           Data
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2475,7 +2475,7 @@
 VOID
 NTAPI
 FsRtlFreeFileLock (
-    IN PFILE_LOCK FileLock
+    __W32_IN PFILE_LOCK FileLock
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2484,8 +2484,8 @@
 NTSTATUS
 NTAPI
 FsRtlGetFileSize (
-    IN PFILE_OBJECT         FileObject,
-    IN OUT PLARGE_INTEGER   FileSize
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN __W32_OUT PLARGE_INTEGER   FileSize
 );
 
 /*
@@ -2504,48 +2504,48 @@
 PFILE_LOCK_INFO
 NTAPI
 FsRtlGetNextFileLock (
-    IN PFILE_LOCK   FileLock,
-    IN BOOLEAN      Restart
+    __W32_IN PFILE_LOCK   FileLock,
+    __W32_IN BOOLEAN      Restart
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlInitializeFileLock (
-    IN PFILE_LOCK                   FileLock,
-    IN PCOMPLETE_LOCK_IRP_ROUTINE   CompleteLockIrpRoutine OPTIONAL,
-    IN PUNLOCK_ROUTINE              UnlockRoutine OPTIONAL
+    __W32_IN PFILE_LOCK                   FileLock,
+    __W32_IN PCOMPLETE_LOCK_IRP_ROUTINE   CompleteLockIrpRoutine __W32_OPTIONAL,
+    __W32_IN PUNLOCK_ROUTINE              UnlockRoutine __W32_OPTIONAL
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlInitializeOplock (
-    IN OUT POPLOCK Oplock
+    __W32_IN __W32_OUT POPLOCK Oplock
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlInitializeTunnelCache (
-    IN PTUNNEL Cache
+    __W32_IN PTUNNEL Cache
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlIsNameInExpression (
-    IN PUNICODE_STRING  Expression,
-    IN PUNICODE_STRING  Name,
-    IN BOOLEAN          IgnoreCase,
-    IN PWCHAR           UpcaseTable OPTIONAL
+    __W32_IN PUNICODE_STRING  Expression,
+    __W32_IN PUNICODE_STRING  Name,
+    __W32_IN BOOLEAN          IgnoreCase,
+    __W32_IN PWCHAR           UpcaseTable __W32_OPTIONAL
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlIsNtstatusExpected (
-    IN NTSTATUS Ntstatus
+    __W32_IN NTSTATUS Ntstatus
 );
 
 #define FsRtlIsUnicodeCharacterWild(C) (                                    \
@@ -2558,128 +2558,128 @@
 BOOLEAN
 NTAPI
 FsRtlMdlReadComplete (
-    IN PFILE_OBJECT     FileObject,
-    IN PMDL             MdlChain
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PMDL             MdlChain
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlMdlReadCompleteDev (
-    IN PFILE_OBJECT     FileObject,
-    IN PMDL             MdlChain,
-    IN PDEVICE_OBJECT   DeviceObject
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PMDL             MdlChain,
+    __W32_IN PDEVICE_OBJECT   DeviceObject
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlMdlWriteComplete (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN PMDL             MdlChain
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN PMDL             MdlChain
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlMdlWriteCompleteDev (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN PMDL             MdlChain,
-    IN PDEVICE_OBJECT   DeviceObject
+    __W32_IN PFILE_OBJECT     FileObject,
+    __W32_IN PLARGE_INTEGER   FileOffset,
+    __W32_IN PMDL             MdlChain,
+    __W32_IN PDEVICE_OBJECT   DeviceObject
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 FsRtlNormalizeNtstatus (
-    IN NTSTATUS Exception,
-    IN NTSTATUS GenericException
+    __W32_IN NTSTATUS Exception,
+    __W32_IN NTSTATUS GenericException
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlNotifyChangeDirectory (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PVOID        FsContext,
-    IN PSTRING      FullDirectoryName,
-    IN PLIST_ENTRY  NotifyList,
-    IN BOOLEAN      WatchTree,
-    IN ULONG        CompletionFilter,
-    IN PIRP         NotifyIrp
+    __W32_IN PNOTIFY_SYNC NotifySync,
+    __W32_IN PVOID        FsContext,
+    __W32_IN PSTRING      FullDirectoryName,
+    __W32_IN PLIST_ENTRY  NotifyList,
+    __W32_IN BOOLEAN      WatchTree,
+    __W32_IN ULONG        CompletionFilter,
+    __W32_IN PIRP         NotifyIrp
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlNotifyCleanup (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PLIST_ENTRY  NotifyList,
-    IN PVOID        FsContext
+    __W32_IN PNOTIFY_SYNC NotifySync,
+    __W32_IN PLIST_ENTRY  NotifyList,
+    __W32_IN PVOID        FsContext
 );
 
 typedef BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) (
-    IN PVOID                        NotifyContext,
-    IN PVOID                        TargetContext,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext
+    __W32_IN PVOID                        NotifyContext,
+    __W32_IN PVOID                        TargetContext,
+    __W32_IN PSECURITY_SUBJECT_CONTEXT    SubjectContext
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlNotifyFullChangeDirectory (
-    IN PNOTIFY_SYNC                 NotifySync,
-    IN PLIST_ENTRY                  NotifyList,
-    IN PVOID                        FsContext,
-    IN PSTRING                      FullDirectoryName,
-    IN BOOLEAN                      WatchTree,
-    IN BOOLEAN                      IgnoreBuffer,
-    IN ULONG                        CompletionFilter,
-    IN PIRP                         NotifyIrp,
-    IN PCHECK_FOR_TRAVERSE_ACCESS   TraverseCallback OPTIONAL,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext OPTIONAL
+    __W32_IN PNOTIFY_SYNC                 NotifySync,
+    __W32_IN PLIST_ENTRY                  NotifyList,
+    __W32_IN PVOID                        FsContext,
+    __W32_IN PSTRING                      FullDirectoryName,
+    __W32_IN BOOLEAN                      WatchTree,
+    __W32_IN BOOLEAN                      IgnoreBuffer,
+    __W32_IN ULONG                        CompletionFilter,
+    __W32_IN PIRP                         NotifyIrp,
+    __W32_IN PCHECK_FOR_TRAVERSE_ACCESS   TraverseCallback __W32_OPTIONAL,
+    __W32_IN PSECURITY_SUBJECT_CONTEXT    SubjectContext __W32_OPTIONAL
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlNotifyFullReportChange (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PLIST_ENTRY  NotifyList,
-    IN PSTRING      FullTargetName,
-    IN USHORT       TargetNameOffset,
-    IN PSTRING      StreamName OPTIONAL,
-    IN PSTRING      NormalizedParentName OPTIONAL,
-    IN ULONG        FilterMatch,
-    IN ULONG        Action,
-    IN PVOID        TargetContext
+    __W32_IN PNOTIFY_SYNC NotifySync,
+    __W32_IN PLIST_ENTRY  NotifyList,
+    __W32_IN PSTRING      FullTargetName,
+    __W32_IN USHORT       TargetNameOffset,
+    __W32_IN PSTRING      StreamName __W32_OPTIONAL,
+    __W32_IN PSTRING      NormalizedParentName __W32_OPTIONAL,
+    __W32_IN ULONG        FilterMatch,
+    __W32_IN ULONG        Action,
+    __W32_IN PVOID        TargetContext
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlNotifyInitializeSync (
-    IN PNOTIFY_SYNC NotifySync
+    __W32_IN PNOTIFY_SYNC NotifySync
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlNotifyReportChange (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PLIST_ENTRY  NotifyList,
-    IN PSTRING      FullTargetName,
-    IN PUSHORT      FileNamePartLength,
-    IN ULONG        FilterMatch
+    __W32_IN PNOTIFY_SYNC NotifySync,
+    __W32_IN PLIST_ENTRY  NotifyList,
+    __W32_IN PSTRING      FullTargetName,
+    __W32_IN PUSHORT      FileNamePartLength,
+    __W32_IN ULONG        FilterMatch
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlNotifyUninitializeSync (
-    IN PNOTIFY_SYNC NotifySync
+    __W32_IN PNOTIFY_SYNC NotifySync
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2688,8 +2688,8 @@
 NTSTATUS
 NTAPI
 FsRtlNotifyVolumeEvent (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        EventCode
+    __W32_IN PFILE_OBJECT FileObject,
+    __W32_IN ULONG        EventCode
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2698,16 +2698,16 @@
 NTSTATUS
 NTAPI
 FsRtlOplockFsctrl (
-    IN POPLOCK  Oplock,
-    IN PIRP     Irp,
-    IN ULONG    OpenCount
+    __W32_IN POPLOCK  Oplock,
+    __W32_IN PIRP     Irp,
+    __W32_IN ULONG    OpenCount
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 FsRtlOplockIsFastIoPossible (
-    IN POPLOCK Oplock
+    __W32_IN POPLOCK Oplock
 );
 
 /*
@@ -2715,7 +2715,7 @@
 
   ret: IoStatus->Status: STATUS_PENDING, STATUS_LOCK_NOT_GRANTED
 
-  Internals: 
+  Internals:
     -Calls IoCompleteRequest if Irp
     -Uses exception handling / ExRaiseStatus with STATUS_INSUFFICIENT_RESOURCES
 */
@@ -2723,18 +2723,18 @@
 BOOLEAN
 NTAPI
 FsRtlPrivateLock (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN PEPROCESS            Process,
-    IN ULONG                Key,
-    IN BOOLEAN              FailImmediately, 
-    IN BOOLEAN              ExclusiveLock,
-    OUT PIO_STATUS_BLOCK    IoStatus, 
-    IN PIRP                 Irp OPTIONAL,
-    IN PVOID                Context,
-    IN BOOLEAN              AlreadySynchronized
+    __W32_IN PFILE_LOCK           FileLock,
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN PLARGE_INTEGER       Length,
+    __W32_IN PEPROCESS            Process,
+    __W32_IN ULONG                Key,
+    __W32_IN BOOLEAN              FailImmediately,
+    __W32_IN BOOLEAN              ExclusiveLock,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatus,
+    __W32_IN PIRP                 Irp __W32_OPTIONAL,
+    __W32_IN PVOID                Context,
+    __W32_IN BOOLEAN              AlreadySynchronized
 );
 
 /*
@@ -2746,7 +2746,7 @@
     -STATUS_PENDING, STATUS_LOCK_NOT_GRANTED from FsRtlPrivateLock
     (redirected IoStatus->Status).
 
-  Internals: 
+  Internals:
     -switch ( Irp->CurrentStackLocation->MinorFunction )
         lock: return FsRtlPrivateLock;
         unlocksingle: return FsRtlFastUnlockSingle;
@@ -2762,53 +2762,53 @@
 NTSTATUS
 NTAPI
 FsRtlProcessFileLock (
-    IN PFILE_LOCK   FileLock,
-    IN PIRP         Irp,
-    IN PVOID        Context OPTIONAL
+    __W32_IN PFILE_LOCK   FileLock,
+    __W32_IN PIRP         Irp,
+    __W32_IN PVOID        Context __W32_OPTIONAL
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 FsRtlRegisterUncProvider (
-    IN OUT PHANDLE      MupHandle,
-    IN PUNICODE_STRING  RedirectorDeviceName,
-    IN BOOLEAN          MailslotsSupported
+    __W32_IN __W32_OUT PHANDLE      MupHandle,
+    __W32_IN PUNICODE_STRING  RedirectorDeviceName,
+    __W32_IN BOOLEAN          MailslotsSupported
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlUninitializeFileLock (
-    IN PFILE_LOCK FileLock
+    __W32_IN PFILE_LOCK FileLock
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 FsRtlUninitializeOplock (
-    IN OUT POPLOCK Oplock
+    __W32_IN __W32_OUT POPLOCK Oplock
 );
 
 NTSYSAPI
 VOID
 NTAPI
 HalDisplayString (
-    IN PCHAR String
+    __W32_IN PCHAR String
 );
 
 NTSYSAPI
 VOID
 NTAPI
 HalQueryRealTimeClock (
-    IN OUT PTIME_FIELDS TimeFields
+    __W32_IN __W32_OUT PTIME_FIELDS TimeFields
 );
 
 NTSYSAPI
 VOID
 NTAPI
 HalSetRealTimeClock (
-    IN PTIME_FIELDS TimeFields
+    __W32_IN PTIME_FIELDS TimeFields
 );
 
 #define InitializeMessageHeader(m, l, t) {                  \
@@ -2822,36 +2822,36 @@
 VOID
 NTAPI
 IoAcquireVpbSpinLock (
-    OUT PKIRQL Irql
+    __W32_OUT PKIRQL Irql
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoCheckDesiredAccess (
-    IN OUT PACCESS_MASK DesiredAccess,
-    IN ACCESS_MASK      GrantedAccess
+    __W32_IN __W32_OUT PACCESS_MASK DesiredAccess,
+    __W32_IN ACCESS_MASK      GrantedAccess
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoCheckEaBufferValidity (
-    IN PFILE_FULL_EA_INFORMATION    EaBuffer,
-    IN ULONG                        EaLength,
-    OUT PULONG                      ErrorOffset
+    __W32_IN PFILE_FULL_EA_INFORMATION    EaBuffer,
+    __W32_IN ULONG                        EaLength,
+    __W32_OUT PULONG                      ErrorOffset
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoCheckFunctionAccess (
-    IN ACCESS_MASK              GrantedAccess,
-    IN UCHAR                    MajorFunction,
-    IN UCHAR                    MinorFunction,
-    IN ULONG                    IoControlCode,
-    IN PFILE_INFORMATION_CLASS  FileInformationClass OPTIONAL,
-    IN PFS_INFORMATION_CLASS    FsInformationClass OPTIONAL
+    __W32_IN ACCESS_MASK              GrantedAccess,
+    __W32_IN UCHAR                    MajorFunction,
+    __W32_IN UCHAR                    MinorFunction,
+    __W32_IN ULONG                    IoControlCode,
+    __W32_IN PFILE_INFORMATION_CLASS  FileInformationClass __W32_OPTIONAL,
+    __W32_IN PFS_INFORMATION_CLASS    FsInformationClass __W32_OPTIONAL
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2860,9 +2860,9 @@
 NTSTATUS
 NTAPI
 IoCheckQuotaBufferValidity (
-    IN PFILE_QUOTA_INFORMATION  QuotaBuffer,
-    IN ULONG                    QuotaLength,
-    OUT PULONG                  ErrorOffset
+    __W32_IN PFILE_QUOTA_INFORMATION  QuotaBuffer,
+    __W32_IN ULONG                    QuotaLength,
+    __W32_OUT PULONG                  ErrorOffset
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2871,8 +2871,8 @@
 PFILE_OBJECT
 NTAPI
 IoCreateStreamFileObject (
-    IN PFILE_OBJECT     FileObject OPTIONAL,
-    IN PDEVICE_OBJECT   DeviceObject OPTIONAL
+    __W32_IN PFILE_OBJECT     FileObject __W32_OPTIONAL,
+    __W32_IN PDEVICE_OBJECT   DeviceObject __W32_OPTIONAL
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2881,8 +2881,8 @@
 PFILE_OBJECT
 NTAPI
 IoCreateStreamFileObjectLite (
-    IN PFILE_OBJECT     FileObject OPTIONAL,
-    IN PDEVICE_OBJECT   DeviceObject OPTIONAL
+    __W32_IN PFILE_OBJECT     FileObject __W32_OPTIONAL,
+    __W32_IN PDEVICE_OBJECT   DeviceObject __W32_OPTIONAL
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2891,32 +2891,32 @@
 BOOLEAN
 NTAPI
 IoFastQueryNetworkAttributes (
-    IN POBJECT_ATTRIBUTES               ObjectAttributes,
-    IN ACCESS_MASK                      DesiredAccess,
-    IN ULONG                            OpenOptions,
-    OUT PIO_STATUS_BLOCK                IoStatus,
-    OUT PFILE_NETWORK_OPEN_INFORMATION  Buffer
+    __W32_IN POBJECT_ATTRIBUTES               ObjectAttributes,
+    __W32_IN ACCESS_MASK                      DesiredAccess,
+    __W32_IN ULONG                            OpenOptions,
+    __W32_OUT PIO_STATUS_BLOCK                IoStatus,
+    __W32_OUT PFILE_NETWORK_OPEN_INFORMATION  Buffer
 );
 
 NTKERNELAPI
 PDEVICE_OBJECT
 NTAPI
 IoGetAttachedDevice (
-    IN PDEVICE_OBJECT DeviceObject
+    __W32_IN PDEVICE_OBJECT DeviceObject
 );
 
 NTKERNELAPI
 PDEVICE_OBJECT
 NTAPI
 IoGetBaseFileSystemDeviceObject (
-    IN PFILE_OBJECT FileObject
+    __W32_IN PFILE_OBJECT FileObject
 );
 
 NTKERNELAPI
 PEPROCESS
 NTAPI
 IoGetRequestorProcess (
-    IN PIRP Irp
+    __W32_IN PIRP Irp
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2925,7 +2925,7 @@
 ULONG
 NTAPI
 IoGetRequestorProcessId (
-    IN PIRP Irp
+    __W32_IN PIRP Irp
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2949,14 +2949,14 @@
 BOOLEAN
 NTAPI
 IoIsOperationSynchronous (
-    IN PIRP Irp
+    __W32_IN PIRP Irp
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 IoIsSystemThread (
-    IN PETHREAD Thread
+    __W32_IN PETHREAD Thread
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -2965,8 +2965,8 @@
 BOOLEAN
 NTAPI
 IoIsValidNameGraftingBuffer (
-    IN PIRP                 Irp,
-    IN PREPARSE_DATA_BUFFER ReparseBuffer
+    __W32_IN PIRP                 Irp,
+    __W32_IN PREPARSE_DATA_BUFFER ReparseBuffer
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -2975,55 +2975,55 @@
 NTSTATUS
 NTAPI
 IoPageRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PMDL                 Mdl,
-    IN PLARGE_INTEGER       Offset,
-    IN PKEVENT              Event,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PMDL                 Mdl,
+    __W32_IN PLARGE_INTEGER       Offset,
+    __W32_IN PKEVENT              Event,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoQueryFileInformation (
-    IN PFILE_OBJECT             FileObject,
-    IN FILE_INFORMATION_CLASS   FileInformationClass,
-    IN ULONG                    Length,
-    OUT PVOID                   FileInformation,
-    OUT PULONG                  ReturnedLength
+    __W32_IN PFILE_OBJECT             FileObject,
+    __W32_IN FILE_INFORMATION_CLASS   FileInformationClass,
+    __W32_IN ULONG                    Length,
+    __W32_OUT PVOID                   FileInformation,
+    __W32_OUT PULONG                  ReturnedLength
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoQueryVolumeInformation (
-    IN PFILE_OBJECT         FileObject,
-    IN FS_INFORMATION_CLASS FsInformationClass,
-    IN ULONG                Length,
-    OUT PVOID               FsInformation,
-    OUT PULONG              ReturnedLength
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN FS_INFORMATION_CLASS FsInformationClass,
+    __W32_IN ULONG                Length,
+    __W32_OUT PVOID               FsInformation,
+    __W32_OUT PULONG              ReturnedLength
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 IoRegisterFileSystem (
-    IN OUT PDEVICE_OBJECT DeviceObject
+    __W32_IN __W32_OUT PDEVICE_OBJECT DeviceObject
 );
 
 #if (VER_PRODUCTBUILD >= 1381)
 
 typedef VOID (NTAPI *PDRIVER_FS_NOTIFICATION) (
-    IN PDEVICE_OBJECT DeviceObject,
-    IN BOOLEAN        DriverActive
+    __W32_IN PDEVICE_OBJECT DeviceObject,
+    __W32_IN BOOLEAN        DriverActive
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoRegisterFsRegistrationChange (
-    IN PDRIVER_OBJECT           DriverObject,
-    IN PDRIVER_FS_NOTIFICATION  DriverNotificationRoutine
+    __W32_IN PDRIVER_OBJECT           DriverObject,
+    __W32_IN PDRIVER_FS_NOTIFICATION  DriverNotificationRoutine
 );
 
 #endif /* (VER_PRODUCTBUILD >= 1381) */
@@ -3032,57 +3032,57 @@
 VOID
 NTAPI
 IoReleaseVpbSpinLock (
-    IN KIRQL Irql
+    __W32_IN KIRQL Irql
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 IoSetDeviceToVerify (
-    IN PETHREAD         Thread,
-    IN PDEVICE_OBJECT   DeviceObject
+    __W32_IN PETHREAD         Thread,
+    __W32_IN PDEVICE_OBJECT   DeviceObject
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoSetInformation (
-    IN PFILE_OBJECT             FileObject,
-    IN FILE_INFORMATION_CLASS   FileInformationClass,
-    IN ULONG                    Length,
-    IN PVOID                    FileInformation
+    __W32_IN PFILE_OBJECT             FileObject,
+    __W32_IN FILE_INFORMATION_CLASS   FileInformationClass,
+    __W32_IN ULONG                    Length,
+    __W32_IN PVOID                    FileInformation
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 IoSetTopLevelIrp (
-    IN PIRP Irp
+    __W32_IN PIRP Irp
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 IoSynchronousPageWrite (
-    IN PFILE_OBJECT         FileObject,
-    IN PMDL                 Mdl,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PKEVENT              Event,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
+    __W32_IN PFILE_OBJECT         FileObject,
+    __W32_IN PMDL                 Mdl,
+    __W32_IN PLARGE_INTEGER       FileOffset,
+    __W32_IN PKEVENT              Event,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock
 );
 
 NTKERNELAPI
 PEPROCESS
 NTAPI
 IoThreadToProcess (
-    IN PETHREAD Thread
+    __W32_IN PETHREAD Thread
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 IoUnregisterFileSystem (
-    IN OUT PDEVICE_OBJECT DeviceObject
+    __W32_IN __W32_OUT PDEVICE_OBJECT DeviceObject
 );
 
 #if (VER_PRODUCTBUILD >= 1381)
@@ -3091,8 +3091,8 @@
 NTSTATUS
 NTAPI
 IoUnregisterFsRegistrationChange (
-    IN PDRIVER_OBJECT           DriverObject,
-    IN PDRIVER_FS_NOTIFICATION  DriverNotificationRoutine
+    __W32_IN PDRIVER_OBJECT           DriverObject,
+    __W32_IN PDRIVER_FS_NOTIFICATION  DriverNotificationRoutine
 );
 
 #endif /* (VER_PRODUCTBUILD >= 1381) */
@@ -3101,15 +3101,15 @@
 NTSTATUS
 NTAPI
 IoVerifyVolume (
-    IN PDEVICE_OBJECT   DeviceObject,
-    IN BOOLEAN          AllowRawMount
+    __W32_IN PDEVICE_OBJECT   DeviceObject,
+    __W32_IN BOOLEAN          AllowRawMount
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 KeAttachProcess (
-    IN PEPROCESS Process
+    __W32_IN PEPROCESS Process
 );
 
 NTKERNELAPI
@@ -3123,57 +3123,57 @@
 VOID
 NTAPI
 KeInitializeQueue (
-    IN PRKQUEUE Queue,
-    IN ULONG    Count OPTIONAL
+    __W32_IN PRKQUEUE Queue,
+    __W32_IN ULONG    Count __W32_OPTIONAL
 );
 
 NTKERNELAPI
 LONG
 NTAPI
 KeInsertHeadQueue (
-    IN PRKQUEUE     Queue,
-    IN PLIST_ENTRY  Entry
+    __W32_IN PRKQUEUE     Queue,
+    __W32_IN PLIST_ENTRY  Entry
 );
 
 NTKERNELAPI
 LONG
 NTAPI
 KeInsertQueue (
-    IN PRKQUEUE     Queue,
-    IN PLIST_ENTRY  Entry
+    __W32_IN PRKQUEUE     Queue,
+    __W32_IN PLIST_ENTRY  Entry
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 KeInsertQueueApc (
-    IN PKAPC      Apc,
-    IN PVOID      SystemArgument1,
-    IN PVOID      SystemArgument2,
-    IN KPRIORITY  PriorityBoost
+    __W32_IN PKAPC      Apc,
+    __W32_IN PVOID      SystemArgument1,
+    __W32_IN PVOID      SystemArgument2,
+    __W32_IN KPRIORITY  PriorityBoost
 );
 
 NTKERNELAPI
 LONG
 NTAPI
 KeReadStateQueue (
-    IN PRKQUEUE Queue
+    __W32_IN PRKQUEUE Queue
 );
 
 NTKERNELAPI
 PLIST_ENTRY
 NTAPI
 KeRemoveQueue (
-    IN PRKQUEUE         Queue,
-    IN KPROCESSOR_MODE  WaitMode,
-    IN PLARGE_INTEGER   Timeout OPTIONAL
+    __W32_IN PRKQUEUE         Queue,
+    __W32_IN KPROCESSOR_MODE  WaitMode,
+    __W32_IN PLARGE_INTEGER   Timeout __W32_OPTIONAL
 );
 
 NTKERNELAPI
 PLIST_ENTRY
 NTAPI
 KeRundownQueue (
-    IN PRKQUEUE Queue
+    __W32_IN PRKQUEUE Queue
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -3182,15 +3182,15 @@
 VOID
 NTAPI
 KeStackAttachProcess (
-    IN PKPROCESS    Process,
-    OUT PKAPC_STATE ApcState
+    __W32_IN PKPROCESS    Process,
+    __W32_OUT PKAPC_STATE ApcState
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 KeUnstackDetachProcess (
-    IN PKAPC_STATE ApcState
+    __W32_IN PKAPC_STATE ApcState
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -3199,24 +3199,24 @@
 BOOLEAN
 NTAPI
 MmCanFileBeTruncated (
-    IN PSECTION_OBJECT_POINTERS     SectionObjectPointer,
-    IN PLARGE_INTEGER               NewFileSize
+    __W32_IN PSECTION_OBJECT_POINTERS     SectionObjectPointer,
+    __W32_IN PLARGE_INTEGER               NewFileSize
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 MmFlushImageSection (
-    IN PSECTION_OBJECT_POINTERS     SectionObjectPointer,
-    IN MMFLUSH_TYPE                 FlushType
+    __W32_IN PSECTION_OBJECT_POINTERS     SectionObjectPointer,
+    __W32_IN MMFLUSH_TYPE                 FlushType
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 MmForceSectionClosed (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN BOOLEAN                  DelayClose
+    __W32_IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
+    __W32_IN BOOLEAN                  DelayClose
 );
 
 #if (VER_PRODUCTBUILD >= 1381)
@@ -3241,119 +3241,119 @@
 NTSTATUS
 NTAPI
 MmMapViewOfSection (
-    IN PVOID                SectionObject,
-    IN PEPROCESS            Process,
-    IN OUT PVOID            *BaseAddress,
-    IN ULONG                ZeroBits,
-    IN ULONG                CommitSize,
-    IN OUT PLARGE_INTEGER   SectionOffset OPTIONAL,
-    IN OUT PULONG           ViewSize,
-    IN SECTION_INHERIT      InheritDisposition,
-    IN ULONG                AllocationType,
-    IN ULONG                Protect
+    __W32_IN PVOID                SectionObject,
+    __W32_IN PEPROCESS            Process,
+    __W32_IN __W32_OUT PVOID            *BaseAddress,
+    __W32_IN ULONG                ZeroBits,
+    __W32_IN ULONG                CommitSize,
+    __W32_IN __W32_OUT PLARGE_INTEGER   SectionOffset __W32_OPTIONAL,
+    __W32_IN __W32_OUT PULONG           ViewSize,
+    __W32_IN SECTION_INHERIT      InheritDisposition,
+    __W32_IN ULONG                AllocationType,
+    __W32_IN ULONG                Protect
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 MmSetAddressRangeModified (
-    IN PVOID    Address,
-    IN ULONG    Length
+    __W32_IN PVOID    Address,
+    __W32_IN ULONG    Length
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 ObCreateObject (
-    IN KPROCESSOR_MODE      ObjectAttributesAccessMode OPTIONAL,
-    IN POBJECT_TYPE         ObjectType,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes OPTIONAL,
-    IN KPROCESSOR_MODE      AccessMode,
-    IN OUT PVOID            ParseContext OPTIONAL,
-    IN ULONG                ObjectSize,
-    IN ULONG                PagedPoolCharge OPTIONAL,
-    IN ULONG                NonPagedPoolCharge OPTIONAL,
-    OUT PVOID               *Object
+    __W32_IN KPROCESSOR_MODE      ObjectAttributesAccessMode __W32_OPTIONAL,
+    __W32_IN POBJECT_TYPE         ObjectType,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes __W32_OPTIONAL,
+    __W32_IN KPROCESSOR_MODE      AccessMode,
+    __W32_IN __W32_OUT PVOID            ParseContext __W32_OPTIONAL,
+    __W32_IN ULONG                ObjectSize,
+    __W32_IN ULONG                PagedPoolCharge __W32_OPTIONAL,
+    __W32_IN ULONG                NonPagedPoolCharge __W32_OPTIONAL,
+    __W32_OUT PVOID               *Object
 );
 
 NTKERNELAPI
 ULONG
 NTAPI
 ObGetObjectPointerCount (
-    IN PVOID Object
+    __W32_IN PVOID Object
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 ObInsertObject (
-    IN PVOID            Object,
-    IN PACCESS_STATE    PassedAccessState OPTIONAL,
-    IN ACCESS_MASK      DesiredAccess,
-    IN ULONG            AdditionalReferences,
-    OUT PVOID           *ReferencedObject OPTIONAL,
-    OUT PHANDLE         Handle
+    __W32_IN PVOID            Object,
+    __W32_IN PACCESS_STATE    PassedAccessState __W32_OPTIONAL,
+    __W32_IN ACCESS_MASK      DesiredAccess,
+    __W32_IN ULONG            AdditionalReferences,
+    __W32_OUT PVOID           *ReferencedObject __W32_OPTIONAL,
+    __W32_OUT PHANDLE         Handle
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 ObMakeTemporaryObject (
-    IN PVOID Object
+    __W32_IN PVOID Object
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 ObOpenObjectByPointer (
-    IN PVOID            Object,
-    IN ULONG            HandleAttributes,
-    IN PACCESS_STATE    PassedAccessState OPTIONAL,
-    IN ACCESS_MASK      DesiredAccess OPTIONAL,
-    IN POBJECT_TYPE     ObjectType OPTIONAL,
-    IN KPROCESSOR_MODE  AccessMode,
-    OUT PHANDLE         Handle
+    __W32_IN PVOID            Object,
+    __W32_IN ULONG            HandleAttributes,
+    __W32_IN PACCESS_STATE    PassedAccessState __W32_OPTIONAL,
+    __W32_IN ACCESS_MASK      DesiredAccess __W32_OPTIONAL,
+    __W32_IN POBJECT_TYPE     ObjectType __W32_OPTIONAL,
+    __W32_IN KPROCESSOR_MODE  AccessMode,
+    __W32_OUT PHANDLE         Handle
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 ObQueryNameString (
-    IN PVOID                        Object,
-    OUT POBJECT_NAME_INFORMATION    ObjectNameInfo,
-    IN ULONG                        Length,
-    OUT PULONG                      ReturnLength
+    __W32_IN PVOID                        Object,
+    __W32_OUT POBJECT_NAME_INFORMATION    ObjectNameInfo,
+    __W32_IN ULONG                        Length,
+    __W32_OUT PULONG                      ReturnLength
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 ObQueryObjectAuditingByHandle (
-    IN HANDLE       Handle,
-    OUT PBOOLEAN    GenerateOnClose
+    __W32_IN HANDLE       Handle,
+    __W32_OUT PBOOLEAN    GenerateOnClose
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 ObReferenceObjectByName (
-    IN PUNICODE_STRING  ObjectName,
-    IN ULONG            Attributes,
-    IN PACCESS_STATE    PassedAccessState OPTIONAL,
-    IN ACCESS_MASK      DesiredAccess OPTIONAL,
-    IN POBJECT_TYPE     ObjectType,
-    IN KPROCESSOR_MODE  AccessMode,
-    IN OUT PVOID        ParseContext OPTIONAL,
-    OUT PVOID           *Object
+    __W32_IN PUNICODE_STRING  ObjectName,
+    __W32_IN ULONG            Attributes,
+    __W32_IN PACCESS_STATE    PassedAccessState __W32_OPTIONAL,
+    __W32_IN ACCESS_MASK      DesiredAccess __W32_OPTIONAL,
+    __W32_IN POBJECT_TYPE     ObjectType,
+    __W32_IN KPROCESSOR_MODE  AccessMode,
+    __W32_IN __W32_OUT PVOID        ParseContext __W32_OPTIONAL,
+    __W32_OUT PVOID           *Object
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 PsChargePoolQuota (
-    IN PEPROCESS    Process,
-    IN POOL_TYPE    PoolType,
-    IN ULONG        Amount
+    __W32_IN PEPROCESS    Process,
+    __W32_IN POOL_TYPE    PoolType,
+    __W32_IN ULONG        Amount
 );
 
 #define PsDereferenceImpersonationToken(T)  \
@@ -3377,58 +3377,58 @@
 BOOLEAN
 NTAPI
 PsIsThreadTerminating (
-    IN PETHREAD Thread
+    __W32_IN PETHREAD Thread
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 PsLookupProcessByProcessId (
-    IN PVOID        ProcessId,
-    OUT PEPROCESS   *Process
+    __W32_IN PVOID        ProcessId,
+    __W32_OUT PEPROCESS   *Process
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 PsLookupProcessThreadByCid (
-    IN PCLIENT_ID   Cid,
-    OUT PEPROCESS   *Process OPTIONAL,
-    OUT PETHREAD    *Thread
+    __W32_IN PCLIENT_ID   Cid,
+    __W32_OUT PEPROCESS   *Process __W32_OPTIONAL,
+    __W32_OUT PETHREAD    *Thread
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 PsLookupThreadByThreadId (
-    IN PVOID        UniqueThreadId,
-    OUT PETHREAD    *Thread
+    __W32_IN PVOID        UniqueThreadId,
+    __W32_OUT PETHREAD    *Thread
 );
 
 NTKERNELAPI
 PACCESS_TOKEN
 NTAPI
 PsReferenceImpersonationToken (
-    IN PETHREAD                         Thread,
-    OUT PBOOLEAN                        CopyOnUse,
-    OUT PBOOLEAN                        EffectiveOnly,
-    OUT PSECURITY_IMPERSONATION_LEVEL   Level
+    __W32_IN PETHREAD                         Thread,
+    __W32_OUT PBOOLEAN                        CopyOnUse,
+    __W32_OUT PBOOLEAN                        EffectiveOnly,
+    __W32_OUT PSECURITY_IMPERSONATION_LEVEL   Level
 );
 
 NTKERNELAPI
 HANDLE
 NTAPI
 PsReferencePrimaryToken (
-    IN PEPROCESS Process
+    __W32_IN PEPROCESS Process
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 PsReturnPoolQuota (
-    IN PEPROCESS    Process,
-    IN POOL_TYPE    PoolType,
-    IN ULONG        Amount
+    __W32_IN PEPROCESS    Process,
+    __W32_IN POOL_TYPE    PoolType,
+    __W32_IN ULONG        Amount
 );
 
 NTKERNELAPI
@@ -3442,203 +3442,203 @@
 NTSTATUS
 NTAPI
 RtlAbsoluteToSelfRelativeSD (
-    IN PSECURITY_DESCRIPTOR     AbsoluteSecurityDescriptor,
-    IN OUT PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor,
-    IN PULONG                   BufferLength
+    __W32_IN PSECURITY_DESCRIPTOR     AbsoluteSecurityDescriptor,
+    __W32_IN __W32_OUT PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor,
+    __W32_IN PULONG                   BufferLength
 );
 
 NTSYSAPI
 PVOID
 NTAPI
 RtlAllocateHeap (
-    IN HANDLE  HeapHandle,
-    IN ULONG   Flags,
-    IN ULONG   Size
+    __W32_IN HANDLE  HeapHandle,
+    __W32_IN ULONG   Flags,
+    __W32_IN ULONG   Size
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlCompressBuffer (
-    IN USHORT   CompressionFormatAndEngine,
-    IN PUCHAR   UncompressedBuffer,
-    IN ULONG    UncompressedBufferSize,
-    OUT PUCHAR  CompressedBuffer,
-    IN ULONG    CompressedBufferSize,
-    IN ULONG    UncompressedChunkSize,
-    OUT PULONG  FinalCompressedSize,
-    IN PVOID    WorkSpace
+    __W32_IN USHORT   CompressionFormatAndEngine,
+    __W32_IN PUCHAR   UncompressedBuffer,
+    __W32_IN ULONG    UncompressedBufferSize,
+    __W32_OUT PUCHAR  CompressedBuffer,
+    __W32_IN ULONG    CompressedBufferSize,
+    __W32_IN ULONG    UncompressedChunkSize,
+    __W32_OUT PULONG  FinalCompressedSize,
+    __W32_IN PVOID    WorkSpace
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlCompressChunks (
-    IN PUCHAR                       UncompressedBuffer,
-    IN ULONG                        UncompressedBufferSize,
-    OUT PUCHAR                      CompressedBuffer,
-    IN ULONG                        CompressedBufferSize,
-    IN OUT PCOMPRESSED_DATA_INFO    CompressedDataInfo,
-    IN ULONG                        CompressedDataInfoLength,
-    IN PVOID                        WorkSpace
+    __W32_IN PUCHAR                       UncompressedBuffer,
+    __W32_IN ULONG                        UncompressedBufferSize,
+    __W32_OUT PUCHAR                      CompressedBuffer,
+    __W32_IN ULONG                        CompressedBufferSize,
+    __W32_IN __W32_OUT PCOMPRESSED_DATA_INFO    CompressedDataInfo,
+    __W32_IN ULONG                        CompressedDataInfoLength,
+    __W32_IN PVOID                        WorkSpace
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlConvertSidToUnicodeString (
-    OUT PUNICODE_STRING DestinationString,
-    IN PSID             Sid,
-    IN BOOLEAN          AllocateDestinationString
+    __W32_OUT PUNICODE_STRING DestinationString,
+    __W32_IN PSID             Sid,
+    __W32_IN BOOLEAN          AllocateDestinationString
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlCopySid (
-    IN ULONG   Length,
-    IN PSID    Destination,
-    IN PSID    Source
+    __W32_IN ULONG   Length,
+    __W32_IN PSID    Destination,
+    __W32_IN PSID    Source
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlDecompressBuffer (
-    IN USHORT   CompressionFormat,
-    OUT PUCHAR  UncompressedBuffer,
-    IN ULONG    UncompressedBufferSize,
-    IN PUCHAR   CompressedBuffer,
-    IN ULONG    CompressedBufferSize,
-    OUT PULONG  FinalUncompressedSize
+    __W32_IN USHORT   CompressionFormat,
+    __W32_OUT PUCHAR  UncompressedBuffer,
+    __W32_IN ULONG    UncompressedBufferSize,
+    __W32_IN PUCHAR   CompressedBuffer,
+    __W32_IN ULONG    CompressedBufferSize,
+    __W32_OUT PULONG  FinalUncompressedSize
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlDecompressChunks (
-    OUT PUCHAR                  UncompressedBuffer,
-    IN ULONG                    UncompressedBufferSize,
-    IN PUCHAR                   CompressedBuffer,
-    IN ULONG                    CompressedBufferSize,
-    IN PUCHAR                   CompressedTail,
-    IN ULONG                    CompressedTailSize,
-    IN PCOMPRESSED_DATA_INFO    CompressedDataInfo
+    __W32_OUT PUCHAR                  UncompressedBuffer,
+    __W32_IN ULONG                    UncompressedBufferSize,
+    __W32_IN PUCHAR                   CompressedBuffer,
+    __W32_IN ULONG                    CompressedBufferSize,
+    __W32_IN PUCHAR                   CompressedTail,
+    __W32_IN ULONG                    CompressedTailSize,
+    __W32_IN PCOMPRESSED_DATA_INFO    CompressedDataInfo
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlDecompressFragment (
-    IN USHORT   CompressionFormat,
-    OUT PUCHAR  UncompressedFragment,
-    IN ULONG    UncompressedFragmentSize,
-    IN PUCHAR   CompressedBuffer,
-    IN ULONG    CompressedBufferSize,
-    IN ULONG    FragmentOffset,
-    OUT PULONG  FinalUncompressedSize,
-    IN PVOID    WorkSpace
+    __W32_IN USHORT   CompressionFormat,
+    __W32_OUT PUCHAR  UncompressedFragment,
+    __W32_IN ULONG    UncompressedFragmentSize,
+    __W32_IN PUCHAR   CompressedBuffer,
+    __W32_IN ULONG    CompressedBufferSize,
+    __W32_IN ULONG    FragmentOffset,
+    __W32_OUT PULONG  FinalUncompressedSize,
+    __W32_IN PVOID    WorkSpace
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlDescribeChunk (
-    IN USHORT       CompressionFormat,
-    IN OUT PUCHAR   *CompressedBuffer,
-    IN PUCHAR       EndOfCompressedBufferPlus1,
-    OUT PUCHAR      *ChunkBuffer,
-    OUT PULONG      ChunkSize
+    __W32_IN USHORT       CompressionFormat,
+    __W32_IN __W32_OUT PUCHAR   *CompressedBuffer,
+    __W32_IN PUCHAR       EndOfCompressedBufferPlus1,
+    __W32_OUT PUCHAR      *ChunkBuffer,
+    __W32_OUT PULONG      ChunkSize
 );
 
 NTSYSAPI
 BOOLEAN
 NTAPI
 RtlEqualSid (
-    IN PSID Sid1,
-    IN PSID Sid2
+    __W32_IN PSID Sid1,
+    __W32_IN PSID Sid2
 );
 
 NTSYSAPI
 VOID
 NTAPI
 RtlFillMemoryUlong (
-    IN PVOID    Destination,
-    IN ULONG    Length,
-    IN ULONG    Fill
+    __W32_IN PVOID    Destination,
+    __W32_IN ULONG    Length,
+    __W32_IN ULONG    Fill
 );
 
 NTSYSAPI
 BOOLEAN
 NTAPI
 RtlFreeHeap (
-    IN HANDLE  HeapHandle,
-    IN ULONG   Flags,
-    IN PVOID   P
+    __W32_IN HANDLE  HeapHandle,
+    __W32_IN ULONG   Flags,
+    __W32_IN PVOID   P
 );
 
 NTSYSAPI
 VOID
 NTAPI
 RtlGenerate8dot3Name (
-    IN PUNICODE_STRING              Name,
-    IN BOOLEAN                      AllowExtendedCharacters,
-    IN OUT PGENERATE_NAME_CONTEXT   Context,
-    OUT PUNICODE_STRING             Name8dot3
+    __W32_IN PUNICODE_STRING              Name,
+    __W32_IN BOOLEAN                      AllowExtendedCharacters,
+    __W32_IN __W32_OUT PGENERATE_NAME_CONTEXT   Context,
+    __W32_OUT PUNICODE_STRING             Name8dot3
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlGetCompressionWorkSpaceSize (
-    IN USHORT   CompressionFormatAndEngine,
-    OUT PULONG  CompressBufferWorkSpaceSize,
-    OUT PULONG  CompressFragmentWorkSpaceSize
+    __W32_IN USHORT   CompressionFormatAndEngine,
+    __W32_OUT PULONG  CompressBufferWorkSpaceSize,
+    __W32_OUT PULONG  CompressFragmentWorkSpaceSize
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlGetDaclSecurityDescriptor (
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    OUT PBOOLEAN            DaclPresent,
-    OUT PACL                *Dacl,
-    OUT PBOOLEAN            DaclDefaulted
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_OUT PBOOLEAN            DaclPresent,
+    __W32_OUT PACL                *Dacl,
+    __W32_OUT PBOOLEAN            DaclDefaulted
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlGetGroupSecurityDescriptor (
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    OUT PSID                *Group,
-    OUT PBOOLEAN            GroupDefaulted
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_OUT PSID                *Group,
+    __W32_OUT PBOOLEAN            GroupDefaulted
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlGetOwnerSecurityDescriptor (
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    OUT PSID                *Owner,
-    OUT PBOOLEAN            OwnerDefaulted
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_OUT PSID                *Owner,
+    __W32_OUT PBOOLEAN            OwnerDefaulted
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlInitializeSid (
-    IN OUT PSID                     Sid,
-    IN PSID_IDENTIFIER_AUTHORITY    IdentifierAuthority,
-    IN UCHAR                        SubAuthorityCount
+    __W32_IN __W32_OUT PSID                     Sid,
+    __W32_IN PSID_IDENTIFIER_AUTHORITY    IdentifierAuthority,
+    __W32_IN UCHAR                        SubAuthorityCount
 );
 
 NTSYSAPI
 BOOLEAN
 NTAPI
 RtlIsNameLegalDOS8Dot3 (
-    IN PUNICODE_STRING UnicodeName,
-    IN PANSI_STRING    AnsiName,
+    __W32_IN PUNICODE_STRING UnicodeName,
+    __W32_IN PANSI_STRING    AnsiName,
     PBOOLEAN           Unknown
 );
 
@@ -3646,40 +3646,40 @@
 ULONG
 NTAPI
 RtlLengthRequiredSid (
-    IN UCHAR SubAuthorityCount
+    __W32_IN UCHAR SubAuthorityCount
 );
 
 NTSYSAPI
 ULONG
 NTAPI
 RtlLengthSid (
-    IN PSID Sid
+    __W32_IN PSID Sid
 );
 
 NTSYSAPI
 ULONG
 NTAPI
 RtlNtStatusToDosError (
-    IN NTSTATUS Status
+    __W32_IN NTSTATUS Status
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlReserveChunk (
-    IN USHORT       CompressionFormat,
-    IN OUT PUCHAR   *CompressedBuffer,
-    IN PUCHAR       EndOfCompressedBufferPlus1,
-    OUT PUCHAR      *ChunkBuffer,
-    IN ULONG        ChunkSize
+    __W32_IN USHORT       CompressionFormat,
+    __W32_IN __W32_OUT PUCHAR   *CompressedBuffer,
+    __W32_IN PUCHAR       EndOfCompressedBufferPlus1,
+    __W32_OUT PUCHAR      *ChunkBuffer,
+    __W32_IN ULONG        ChunkSize
 );
 
 NTSYSAPI
 VOID
 NTAPI
 RtlSecondsSince1970ToTime (
-    IN ULONG            SecondsSince1970,
-    OUT PLARGE_INTEGER  Time
+    __W32_IN ULONG            SecondsSince1970,
+    __W32_OUT PLARGE_INTEGER  Time
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -3688,17 +3688,17 @@
 NTSTATUS
 NTAPI
 RtlSelfRelativeToAbsoluteSD (
-    IN PSECURITY_DESCRIPTOR     SelfRelativeSD,
-    OUT PSECURITY_DESCRIPTOR    AbsoluteSD,
-    IN PULONG                   AbsoluteSDSize,
-    IN PACL                     Dacl,
-    IN PULONG                   DaclSize,
-    IN PACL                     Sacl,
-    IN PULONG                   SaclSize,
-    IN PSID                     Owner,
-    IN PULONG                   OwnerSize,
-    IN PSID                     PrimaryGroup,
-    IN PULONG                   PrimaryGroupSize
+    __W32_IN PSECURITY_DESCRIPTOR     SelfRelativeSD,
+    __W32_OUT PSECURITY_DESCRIPTOR    AbsoluteSD,
+    __W32_IN PULONG                   AbsoluteSDSize,
+    __W32_IN PACL                     Dacl,
+    __W32_IN PULONG                   DaclSize,
+    __W32_IN PACL                     Sacl,
+    __W32_IN PULONG                   SaclSize,
+    __W32_IN PSID                     Owner,
+    __W32_IN PULONG                   OwnerSize,
+    __W32_IN PSID                     PrimaryGroup,
+    __W32_IN PULONG                   PrimaryGroupSize
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -3707,50 +3707,50 @@
 NTSTATUS
 NTAPI
 RtlSetGroupSecurityDescriptor (
-    IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PSID                     Group,
-    IN BOOLEAN                  GroupDefaulted
+    __W32_IN __W32_OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_IN PSID                     Group,
+    __W32_IN BOOLEAN                  GroupDefaulted
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlSetOwnerSecurityDescriptor (
-    IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PSID                     Owner,
-    IN BOOLEAN                  OwnerDefaulted
+    __W32_IN __W32_OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_IN PSID                     Owner,
+    __W32_IN BOOLEAN                  OwnerDefaulted
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 RtlSetSaclSecurityDescriptor (
-    IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN BOOLEAN                  SaclPresent,
-    IN PACL                     Sacl,
-    IN BOOLEAN                  SaclDefaulted
+    __W32_IN __W32_OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_IN BOOLEAN                  SaclPresent,
+    __W32_IN PACL                     Sacl,
+    __W32_IN BOOLEAN                  SaclDefaulted
 );
 
 NTSYSAPI
 PUCHAR
 NTAPI
 RtlSubAuthorityCountSid (
-    IN PSID Sid
+    __W32_IN PSID Sid
 );
 
 NTSYSAPI
 PULONG
 NTAPI
 RtlSubAuthoritySid (
-    IN PSID    Sid,
-    IN ULONG   SubAuthority
+    __W32_IN PSID    Sid,
+    __W32_IN ULONG   SubAuthority
 );
 
 NTSYSAPI
 BOOLEAN
 NTAPI
 RtlValidSid (
-    IN PSID Sid
+    __W32_IN PSID Sid
 );
 
 NTKERNELAPI
@@ -3765,44 +3765,44 @@
 BOOLEAN
 NTAPI
 SeAuditingFileEvents (
-    IN BOOLEAN              AccessGranted,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor
+    __W32_IN BOOLEAN              AccessGranted,
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 SeAuditingFileOrGlobalEvents (
-    IN BOOLEAN                      AccessGranted,
-    IN PSECURITY_DESCRIPTOR         SecurityDescriptor,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext
+    __W32_IN BOOLEAN                      AccessGranted,
+    __W32_IN PSECURITY_DESCRIPTOR         SecurityDescriptor,
+    __W32_IN PSECURITY_SUBJECT_CONTEXT    SubjectContext
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 SeCaptureSubjectContext (
-    OUT PSECURITY_SUBJECT_CONTEXT SubjectContext
+    __W32_OUT PSECURITY_SUBJECT_CONTEXT SubjectContext
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 SeCreateAccessState (
-    OUT PACCESS_STATE   AccessState,
-    IN PVOID            AuxData,
-    IN ACCESS_MASK      AccessMask,
-    IN PGENERIC_MAPPING Mapping
+    __W32_OUT PACCESS_STATE   AccessState,
+    __W32_IN PVOID            AuxData,
+    __W32_IN ACCESS_MASK      AccessMask,
+    __W32_IN PGENERIC_MAPPING Mapping
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 SeCreateClientSecurity (
-    IN PETHREAD                     Thread,
-    IN PSECURITY_QUALITY_OF_SERVICE QualityOfService,
-    IN BOOLEAN                      RemoteClient,
-    OUT PSECURITY_CLIENT_CONTEXT    ClientContext
+    __W32_IN PETHREAD                     Thread,
+    __W32_IN PSECURITY_QUALITY_OF_SERVICE QualityOfService,
+    __W32_IN BOOLEAN                      RemoteClient,
+    __W32_OUT PSECURITY_CLIENT_CONTEXT    ClientContext
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -3811,10 +3811,10 @@
 NTSTATUS
 NTAPI
 SeCreateClientSecurityFromSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext,
-    IN PSECURITY_QUALITY_OF_SERVICE QualityOfService,
-    IN BOOLEAN                      ServerIsRemote,
-    OUT PSECURITY_CLIENT_CONTEXT    ClientContext
+    __W32_IN PSECURITY_SUBJECT_CONTEXT    SubjectContext,
+    __W32_IN PSECURITY_QUALITY_OF_SERVICE QualityOfService,
+    __W32_IN BOOLEAN                      ServerIsRemote,
+    __W32_OUT PSECURITY_CLIENT_CONTEXT    ClientContext
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -3831,8 +3831,8 @@
 VOID
 NTAPI
 SeDeleteObjectAuditAlarm (
-    IN PVOID    Object,
-    IN HANDLE   Handle
+    __W32_IN PVOID    Object,
+    __W32_IN HANDLE   Handle
 );
 
 #define SeEnableAccessToExports() SeExports = *(PSE_EXPORTS *)SeExports;
@@ -3841,15 +3841,15 @@
 VOID
 NTAPI
 SeFreePrivileges (
-    IN PPRIVILEGE_SET Privileges
+    __W32_IN PPRIVILEGE_SET Privileges
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 SeImpersonateClient (
-    IN PSECURITY_CLIENT_CONTEXT ClientContext,
-    IN PETHREAD                 ServerThread OPTIONAL
+    __W32_IN PSECURITY_CLIENT_CONTEXT ClientContext,
+    __W32_IN PETHREAD                 ServerThread __W32_OPTIONAL
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -3858,8 +3858,8 @@
 NTSTATUS
 NTAPI
 SeImpersonateClientEx (
-    IN PSECURITY_CLIENT_CONTEXT ClientContext,
-    IN PETHREAD                 ServerThread OPTIONAL
+    __W32_IN PSECURITY_CLIENT_CONTEXT ClientContext,
+    __W32_IN PETHREAD                 ServerThread __W32_OPTIONAL
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -3868,61 +3868,61 @@
 VOID
 NTAPI
 SeLockSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT SubjectContext
+    __W32_IN PSECURITY_SUBJECT_CONTEXT SubjectContext
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 SeMarkLogonSessionForTerminationNotification (
-    IN PLUID LogonId
+    __W32_IN PLUID LogonId
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 SeOpenObjectAuditAlarm (
-    IN PUNICODE_STRING      ObjectTypeName,
-    IN PVOID                Object OPTIONAL,
-    IN PUNICODE_STRING      AbsoluteObjectName OPTIONAL,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PACCESS_STATE        AccessState,
-    IN BOOLEAN              ObjectCreated,
-    IN BOOLEAN              AccessGranted,
-    IN KPROCESSOR_MODE      AccessMode,
-    OUT PBOOLEAN            GenerateOnClose
+    __W32_IN PUNICODE_STRING      ObjectTypeName,
+    __W32_IN PVOID                Object __W32_OPTIONAL,
+    __W32_IN PUNICODE_STRING      AbsoluteObjectName __W32_OPTIONAL,
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_IN PACCESS_STATE        AccessState,
+    __W32_IN BOOLEAN              ObjectCreated,
+    __W32_IN BOOLEAN              AccessGranted,
+    __W32_IN KPROCESSOR_MODE      AccessMode,
+    __W32_OUT PBOOLEAN            GenerateOnClose
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 SeOpenObjectForDeleteAuditAlarm (
-    IN PUNICODE_STRING      ObjectTypeName,
-    IN PVOID                Object OPTIONAL,
-    IN PUNICODE_STRING      AbsoluteObjectName OPTIONAL,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PACCESS_STATE        AccessState,
-    IN BOOLEAN              ObjectCreated,
-    IN BOOLEAN              AccessGranted,
-    IN KPROCESSOR_MODE      AccessMode,
-    OUT PBOOLEAN            GenerateOnClose
+    __W32_IN PUNICODE_STRING      ObjectTypeName,
+    __W32_IN PVOID                Object __W32_OPTIONAL,
+    __W32_IN PUNICODE_STRING      AbsoluteObjectName __W32_OPTIONAL,
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_IN PACCESS_STATE        AccessState,
+    __W32_IN BOOLEAN              ObjectCreated,
+    __W32_IN BOOLEAN              AccessGranted,
+    __W32_IN KPROCESSOR_MODE      AccessMode,
+    __W32_OUT PBOOLEAN            GenerateOnClose
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 SePrivilegeCheck (
-    IN OUT PPRIVILEGE_SET           RequiredPrivileges,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext,
-    IN KPROCESSOR_MODE              AccessMode
+    __W32_IN __W32_OUT PPRIVILEGE_SET           RequiredPrivileges,
+    __W32_IN PSECURITY_SUBJECT_CONTEXT    SubjectContext,
+    __W32_IN KPROCESSOR_MODE              AccessMode
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 SeQueryAuthenticationIdToken (
-    IN PACCESS_TOKEN    Token,
-    OUT PLUID           LogonId
+    __W32_IN PACCESS_TOKEN    Token,
+    __W32_OUT PLUID           LogonId
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -3931,9 +3931,9 @@
 NTSTATUS
 NTAPI
 SeQueryInformationToken (
-    IN PACCESS_TOKEN           Token,
-    IN TOKEN_INFORMATION_CLASS TokenInformationClass,
-    OUT PVOID                  *TokenInformation
+    __W32_IN PACCESS_TOKEN           Token,
+    __W32_IN TOKEN_INFORMATION_CLASS TokenInformationClass,
+    __W32_OUT PVOID                  *TokenInformation
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -3942,10 +3942,10 @@
 NTSTATUS
 NTAPI
 SeQuerySecurityDescriptorInfo (
-    IN PSECURITY_INFORMATION    SecurityInformation,
-    OUT PSECURITY_DESCRIPTOR    SecurityDescriptor,
-    IN OUT PULONG               Length,
-    IN PSECURITY_DESCRIPTOR     *ObjectsSecurityDescriptor
+    __W32_IN PSECURITY_INFORMATION    SecurityInformation,
+    __W32_OUT PSECURITY_DESCRIPTOR    SecurityDescriptor,
+    __W32_IN __W32_OUT PULONG               Length,
+    __W32_IN PSECURITY_DESCRIPTOR     *ObjectsSecurityDescriptor
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -3954,8 +3954,8 @@
 NTSTATUS
 NTAPI
 SeQuerySessionIdToken (
-    IN PACCESS_TOKEN    Token,
-    IN PULONG           SessionId
+    __W32_IN PACCESS_TOKEN    Token,
+    __W32_IN PULONG           SessionId
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -3968,21 +3968,21 @@
     ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->PrimaryToken )
 
 typedef NTSTATUS (*PSE_LOGON_SESSION_TERMINATED_ROUTINE) (
-    IN PLUID LogonId
+    __W32_IN PLUID LogonId
 );
 
 NTKERNELAPI
 NTSTATUS
 NTAPI
 SeRegisterLogonSessionTerminatedRoutine (
-    IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine
+    __W32_IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 SeReleaseSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT SubjectContext
+    __W32_IN PSECURITY_SUBJECT_CONTEXT SubjectContext
 );
 
 NTKERNELAPI
@@ -3997,12 +3997,12 @@
 NTSTATUS
 NTAPI
 SeSetSecurityDescriptorInfo (
-    IN PVOID                    Object OPTIONAL,
-    IN PSECURITY_INFORMATION    SecurityInformation,
-    IN PSECURITY_DESCRIPTOR     SecurityDescriptor,
-    IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
-    IN POOL_TYPE                PoolType,
-    IN PGENERIC_MAPPING         GenericMapping
+    __W32_IN PVOID                    Object __W32_OPTIONAL,
+    __W32_IN PSECURITY_INFORMATION    SecurityInformation,
+    __W32_IN PSECURITY_DESCRIPTOR     SecurityDescriptor,
+    __W32_IN __W32_OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
+    __W32_IN POOL_TYPE                PoolType,
+    __W32_IN PGENERIC_MAPPING         GenericMapping
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4011,27 +4011,27 @@
 NTSTATUS
 NTAPI
 SeSetSecurityDescriptorInfoEx (
-    IN PVOID                    Object OPTIONAL,
-    IN PSECURITY_INFORMATION    SecurityInformation,
-    IN PSECURITY_DESCRIPTOR     ModificationDescriptor,
-    IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
-    IN ULONG                    AutoInheritFlags,
-    IN POOL_TYPE                PoolType,
-    IN PGENERIC_MAPPING         GenericMapping
+    __W32_IN PVOID                    Object __W32_OPTIONAL,
+    __W32_IN PSECURITY_INFORMATION    SecurityInformation,
+    __W32_IN PSECURITY_DESCRIPTOR     ModificationDescriptor,
+    __W32_IN __W32_OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
+    __W32_IN ULONG                    AutoInheritFlags,
+    __W32_IN POOL_TYPE                PoolType,
+    __W32_IN PGENERIC_MAPPING         GenericMapping
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 SeTokenIsAdmin (
-    IN PACCESS_TOKEN Token
+    __W32_IN PACCESS_TOKEN Token
 );
 
 NTKERNELAPI
 BOOLEAN
 NTAPI
 SeTokenIsRestricted (
-    IN PACCESS_TOKEN Token
+    __W32_IN PACCESS_TOKEN Token
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4040,20 +4040,20 @@
 TOKEN_TYPE
 NTAPI
 SeTokenType (
-    IN PACCESS_TOKEN Token
+    __W32_IN PACCESS_TOKEN Token
 );
 
 NTKERNELAPI
 VOID
 NTAPI
 SeUnlockSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT SubjectContext
+    __W32_IN PSECURITY_SUBJECT_CONTEXT SubjectContext
 );
 
 NTKERNELAPI
 NTSTATUS
 SeUnregisterLogonSessionTerminatedRoutine (
-    IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine
+    __W32_IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4062,12 +4062,12 @@
 NTSTATUS
 NTAPI
 ZwAdjustPrivilegesToken (
-    IN HANDLE               TokenHandle,
-    IN BOOLEAN              DisableAllPrivileges,
-    IN PTOKEN_PRIVILEGES    NewState,
-    IN ULONG                BufferLength,
-    OUT PTOKEN_PRIVILEGES   PreviousState OPTIONAL,
-    OUT PULONG              ReturnLength
+    __W32_IN HANDLE               TokenHandle,
+    __W32_IN BOOLEAN              DisableAllPrivileges,
+    __W32_IN PTOKEN_PRIVILEGES    NewState,
+    __W32_IN ULONG                BufferLength,
+    __W32_OUT PTOKEN_PRIVILEGES   PreviousState __W32_OPTIONAL,
+    __W32_OUT PULONG              ReturnLength
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4076,36 +4076,36 @@
 NTSTATUS
 NTAPI
 ZwAlertThread (
-    IN HANDLE ThreadHandle
+    __W32_IN HANDLE ThreadHandle
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwAllocateVirtualMemory (
-    IN HANDLE       ProcessHandle,
-    IN OUT PVOID    *BaseAddress,
-    IN ULONG        ZeroBits,
-    IN OUT PULONG   RegionSize,
-    IN ULONG        AllocationType,
-    IN ULONG        Protect
+    __W32_IN HANDLE       ProcessHandle,
+    __W32_IN __W32_OUT PVOID    *BaseAddress,
+    __W32_IN ULONG        ZeroBits,
+    __W32_IN __W32_OUT PULONG   RegionSize,
+    __W32_IN ULONG        AllocationType,
+    __W32_IN ULONG        Protect
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwAccessCheckAndAuditAlarm (
-    IN PUNICODE_STRING      SubsystemName,
-    IN PVOID                HandleId,
-    IN PUNICODE_STRING      ObjectTypeName,
-    IN PUNICODE_STRING      ObjectName,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN ACCESS_MASK          DesiredAccess,
-    IN PGENERIC_MAPPING     GenericMapping,
-    IN BOOLEAN              ObjectCreation,
-    OUT PACCESS_MASK        GrantedAccess,
-    OUT PBOOLEAN            AccessStatus,
-    OUT PBOOLEAN            GenerateOnClose
+    __W32_IN PUNICODE_STRING      SubsystemName,
+    __W32_IN PVOID                HandleId,
+    __W32_IN PUNICODE_STRING      ObjectTypeName,
+    __W32_IN PUNICODE_STRING      ObjectName,
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN PGENERIC_MAPPING     GenericMapping,
+    __W32_IN BOOLEAN              ObjectCreation,
+    __W32_OUT PACCESS_MASK        GrantedAccess,
+    __W32_OUT PBOOLEAN            AccessStatus,
+    __W32_OUT PBOOLEAN            GenerateOnClose
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4114,8 +4114,8 @@
 NTSTATUS
 NTAPI
 ZwCancelIoFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
+    __W32_IN HANDLE               FileHandle,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4124,111 +4124,111 @@
 NTSTATUS
 NTAPI
 ZwClearEvent (
-    IN HANDLE EventHandle
+    __W32_IN HANDLE EventHandle
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwCloseObjectAuditAlarm (
-    IN PUNICODE_STRING  SubsystemName,
-    IN PVOID            HandleId,
-    IN BOOLEAN          GenerateOnClose
+    __W32_IN PUNICODE_STRING  SubsystemName,
+    __W32_IN PVOID            HandleId,
+    __W32_IN BOOLEAN          GenerateOnClose
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwCreateSection (
-    OUT PHANDLE             SectionHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes OPTIONAL,
-    IN PLARGE_INTEGER       MaximumSize OPTIONAL,
-    IN ULONG                SectionPageProtection,
-    IN ULONG                AllocationAttributes,
-    IN HANDLE               FileHandle OPTIONAL
+    __W32_OUT PHANDLE             SectionHandle,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes __W32_OPTIONAL,
+    __W32_IN PLARGE_INTEGER       MaximumSize __W32_OPTIONAL,
+    __W32_IN ULONG                SectionPageProtection,
+    __W32_IN ULONG                AllocationAttributes,
+    __W32_IN HANDLE               FileHandle __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwCreateSymbolicLinkObject (
-    OUT PHANDLE             SymbolicLinkHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN PUNICODE_STRING      TargetName
+    __W32_OUT PHANDLE             SymbolicLinkHandle,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes,
+    __W32_IN PUNICODE_STRING      TargetName
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwDeleteFile (
-    IN POBJECT_ATTRIBUTES ObjectAttributes
+    __W32_IN POBJECT_ATTRIBUTES ObjectAttributes
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwDeleteValueKey (
-    IN HANDLE           Handle,
-    IN PUNICODE_STRING  Name
+    __W32_IN HANDLE           Handle,
+    __W32_IN PUNICODE_STRING  Name
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwDeviceIoControlFile (
-    IN HANDLE               FileHandle,
-    IN HANDLE               Event OPTIONAL,
-    IN PIO_APC_ROUTINE      ApcRoutine OPTIONAL,
-    IN PVOID                ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN ULONG                IoControlCode,
-    IN PVOID                InputBuffer OPTIONAL,
-    IN ULONG                InputBufferLength,
-    OUT PVOID               OutputBuffer OPTIONAL,
-    IN ULONG                OutputBufferLength
+    __W32_IN HANDLE               FileHandle,
+    __W32_IN HANDLE               Event __W32_OPTIONAL,
+    __W32_IN PIO_APC_ROUTINE      ApcRoutine __W32_OPTIONAL,
+    __W32_IN PVOID                ApcContext __W32_OPTIONAL,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock,
+    __W32_IN ULONG                IoControlCode,
+    __W32_IN PVOID                InputBuffer __W32_OPTIONAL,
+    __W32_IN ULONG                InputBufferLength,
+    __W32_OUT PVOID               OutputBuffer __W32_OPTIONAL,
+    __W32_IN ULONG                OutputBufferLength
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwDisplayString (
-    IN PUNICODE_STRING String
+    __W32_IN PUNICODE_STRING String
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwDuplicateObject (
-    IN HANDLE       SourceProcessHandle,
-    IN HANDLE       SourceHandle,
-    IN HANDLE       TargetProcessHandle OPTIONAL,
-    OUT PHANDLE     TargetHandle OPTIONAL,
-    IN ACCESS_MASK  DesiredAccess,
-    IN ULONG        HandleAttributes,
-    IN ULONG        Options
+    __W32_IN HANDLE       SourceProcessHandle,
+    __W32_IN HANDLE       SourceHandle,
+    __W32_IN HANDLE       TargetProcessHandle __W32_OPTIONAL,
+    __W32_OUT PHANDLE     TargetHandle __W32_OPTIONAL,
+    __W32_IN ACCESS_MASK  DesiredAccess,
+    __W32_IN ULONG        HandleAttributes,
+    __W32_IN ULONG        Options
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwDuplicateToken (
-    IN HANDLE               ExistingTokenHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN BOOLEAN              EffectiveOnly,
-    IN TOKEN_TYPE           TokenType,
-    OUT PHANDLE             NewTokenHandle
+    __W32_IN HANDLE               ExistingTokenHandle,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes,
+    __W32_IN BOOLEAN              EffectiveOnly,
+    __W32_IN TOKEN_TYPE           TokenType,
+    __W32_OUT PHANDLE             NewTokenHandle
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwFlushInstructionCache (
-    IN HANDLE   ProcessHandle,
-    IN PVOID    BaseAddress OPTIONAL,
-    IN ULONG    FlushSize
+    __W32_IN HANDLE   ProcessHandle,
+    __W32_IN PVOID    BaseAddress __W32_OPTIONAL,
+    __W32_IN ULONG    FlushSize
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4237,10 +4237,10 @@
 NTSTATUS
 NTAPI
 ZwFlushVirtualMemory (
-    IN HANDLE               ProcessHandle,
-    IN OUT PVOID            *BaseAddress,
-    IN OUT PULONG           FlushSize,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
+    __W32_IN HANDLE               ProcessHandle,
+    __W32_IN __W32_OUT PVOID            *BaseAddress,
+    __W32_IN __W32_OUT PULONG           FlushSize,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4249,26 +4249,26 @@
 NTSTATUS
 NTAPI
 ZwFreeVirtualMemory (
-    IN HANDLE       ProcessHandle,
-    IN OUT PVOID    *BaseAddress,
-    IN OUT PULONG   RegionSize,
-    IN ULONG        FreeType
+    __W32_IN HANDLE       ProcessHandle,
+    __W32_IN __W32_OUT PVOID    *BaseAddress,
+    __W32_IN __W32_OUT PULONG   RegionSize,
+    __W32_IN ULONG        FreeType
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwFsControlFile (
-    IN HANDLE               FileHandle,
-    IN HANDLE               Event OPTIONAL,
-    IN PIO_APC_ROUTINE      ApcRoutine OPTIONAL,
-    IN PVOID                ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN ULONG                FsControlCode,
-    IN PVOID                InputBuffer OPTIONAL,
-    IN ULONG                InputBufferLength,
-    OUT PVOID               OutputBuffer OPTIONAL,
-    IN ULONG                OutputBufferLength
+    __W32_IN HANDLE               FileHandle,
+    __W32_IN HANDLE               Event __W32_OPTIONAL,
+    __W32_IN PIO_APC_ROUTINE      ApcRoutine __W32_OPTIONAL,
+    __W32_IN PVOID                ApcContext __W32_OPTIONAL,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock,
+    __W32_IN ULONG                FsControlCode,
+    __W32_IN PVOID                InputBuffer __W32_OPTIONAL,
+    __W32_IN ULONG                InputBufferLength,
+    __W32_OUT PVOID               OutputBuffer __W32_OPTIONAL,
+    __W32_IN ULONG                OutputBufferLength
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4277,10 +4277,10 @@
 NTSTATUS
 NTAPI
 ZwInitiatePowerAction (
-    IN POWER_ACTION         SystemAction,
-    IN SYSTEM_POWER_STATE   MinSystemState,
-    IN ULONG                Flags,
-    IN BOOLEAN              Asynchronous
+    __W32_IN POWER_ACTION         SystemAction,
+    __W32_IN SYSTEM_POWER_STATE   MinSystemState,
+    __W32_IN ULONG                Flags,
+    __W32_IN BOOLEAN              Asynchronous
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4290,88 +4290,88 @@
 NTAPI
 ZwLoadDriver (
     /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>" */
-    IN PUNICODE_STRING RegistryPath
+    __W32_IN PUNICODE_STRING RegistryPath
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwLoadKey (
-    IN POBJECT_ATTRIBUTES KeyObjectAttributes,
-    IN POBJECT_ATTRIBUTES FileObjectAttributes
+    __W32_IN POBJECT_ATTRIBUTES KeyObjectAttributes,
+    __W32_IN POBJECT_ATTRIBUTES FileObjectAttributes
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwNotifyChangeKey (
-    IN HANDLE               KeyHandle,
-    IN HANDLE               EventHandle OPTIONAL,
-    IN PIO_APC_ROUTINE      ApcRoutine OPTIONAL,
-    IN PVOID                ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN ULONG                NotifyFilter,
-    IN BOOLEAN              WatchSubtree,
-    IN PVOID                Buffer,
-    IN ULONG                BufferLength,
-    IN BOOLEAN              Asynchronous
+    __W32_IN HANDLE               KeyHandle,
+    __W32_IN HANDLE               EventHandle __W32_OPTIONAL,
+    __W32_IN PIO_APC_ROUTINE      ApcRoutine __W32_OPTIONAL,
+    __W32_IN PVOID                ApcContext __W32_OPTIONAL,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock,
+    __W32_IN ULONG                NotifyFilter,
+    __W32_IN BOOLEAN              WatchSubtree,
+    __W32_IN PVOID                Buffer,
+    __W32_IN ULONG                BufferLength,
+    __W32_IN BOOLEAN              Asynchronous
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwOpenDirectoryObject (
-    OUT PHANDLE             DirectoryHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes
+    __W32_OUT PHANDLE             DirectoryHandle,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwOpenEvent (
-    OUT PHANDLE             EventHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes
+    __W32_OUT PHANDLE             EventHandle,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwOpenProcess (
-    OUT PHANDLE             ProcessHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN PCLIENT_ID           ClientId OPTIONAL
+    __W32_OUT PHANDLE             ProcessHandle,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes,
+    __W32_IN PCLIENT_ID           ClientId __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwOpenProcessToken (
-    IN HANDLE       ProcessHandle,
-    IN ACCESS_MASK  DesiredAccess,
-    OUT PHANDLE     TokenHandle
+    __W32_IN HANDLE       ProcessHandle,
+    __W32_IN ACCESS_MASK  DesiredAccess,
+    __W32_OUT PHANDLE     TokenHandle
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwOpenThread (
-    OUT PHANDLE             ThreadHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN PCLIENT_ID           ClientId
+    __W32_OUT PHANDLE             ThreadHandle,
+    __W32_IN ACCESS_MASK          DesiredAccess,
+    __W32_IN POBJECT_ATTRIBUTES   ObjectAttributes,
+    __W32_IN PCLIENT_ID           ClientId
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwOpenThreadToken (
-    IN HANDLE       ThreadHandle,
-    IN ACCESS_MASK  DesiredAccess,
-    IN BOOLEAN      OpenAsSelf,
-    OUT PHANDLE     TokenHandle
+    __W32_IN HANDLE       ThreadHandle,
+    __W32_IN ACCESS_MASK  DesiredAccess,
+    __W32_IN BOOLEAN      OpenAsSelf,
+    __W32_OUT PHANDLE     TokenHandle
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4380,11 +4380,11 @@
 NTSTATUS
 NTAPI
 ZwPowerInformation (
-    IN POWER_INFORMATION_LEVEL  PowerInformationLevel,
-    IN PVOID                    InputBuffer OPTIONAL,
-    IN ULONG                    InputBufferLength,
-    OUT PVOID                   OutputBuffer OPTIONAL,
-    IN ULONG                    OutputBufferLength
+    __W32_IN POWER_INFORMATION_LEVEL  PowerInformationLevel,
+    __W32_IN PVOID                    InputBuffer __W32_OPTIONAL,
+    __W32_IN ULONG                    InputBufferLength,
+    __W32_OUT PVOID                   OutputBuffer __W32_OPTIONAL,
+    __W32_IN ULONG                    OutputBufferLength
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4393,33 +4393,33 @@
 NTSTATUS
 NTAPI
 ZwPulseEvent (
-    IN HANDLE   EventHandle,
-    OUT PULONG  PreviousState OPTIONAL
+    __W32_IN HANDLE   EventHandle,
+    __W32_OUT PULONG  PreviousState __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryDefaultLocale (
-    IN BOOLEAN  ThreadOrSystem,
-    OUT PLCID   Locale
+    __W32_IN BOOLEAN  ThreadOrSystem,
+    __W32_OUT PLCID   Locale
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryDirectoryFile (
-    IN HANDLE                   FileHandle,
-    IN HANDLE                   Event OPTIONAL,
-    IN PIO_APC_ROUTINE          ApcRoutine OPTIONAL,
-    IN PVOID                    ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK        IoStatusBlock,
-    OUT PVOID                   FileInformation,
-    IN ULONG                    Length,
-    IN FILE_INFORMATION_CLASS   FileInformationClass,
-    IN BOOLEAN                  ReturnSingleEntry,
-    IN PUNICODE_STRING          FileName OPTIONAL,
-    IN BOOLEAN                  RestartScan
+    __W32_IN HANDLE                   FileHandle,
+    __W32_IN HANDLE                   Event __W32_OPTIONAL,
+    __W32_IN PIO_APC_ROUTINE          ApcRoutine __W32_OPTIONAL,
+    __W32_IN PVOID                    ApcContext __W32_OPTIONAL,
+    __W32_OUT PIO_STATUS_BLOCK        IoStatusBlock,
+    __W32_OUT PVOID                   FileInformation,
+    __W32_IN ULONG                    Length,
+    __W32_IN FILE_INFORMATION_CLASS   FileInformationClass,
+    __W32_IN BOOLEAN                  ReturnSingleEntry,
+    __W32_IN PUNICODE_STRING          FileName __W32_OPTIONAL,
+    __W32_IN BOOLEAN                  RestartScan
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4428,28 +4428,28 @@
 NTSTATUS
 NTAPI
 ZwQueryDirectoryObject (
-    IN HANDLE       DirectoryHandle,
-    OUT PVOID       Buffer,
-    IN ULONG        Length,
-    IN BOOLEAN      ReturnSingleEntry,
-    IN BOOLEAN      RestartScan,
-    IN OUT PULONG   Context,
-    OUT PULONG      ReturnLength OPTIONAL
+    __W32_IN HANDLE       DirectoryHandle,
+    __W32_OUT PVOID       Buffer,
+    __W32_IN ULONG        Length,
+    __W32_IN BOOLEAN      ReturnSingleEntry,
+    __W32_IN BOOLEAN      RestartScan,
+    __W32_IN __W32_OUT PULONG   Context,
+    __W32_OUT PULONG      ReturnLength __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryEaFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    OUT PVOID               Buffer,
-    IN ULONG                Length,
-    IN BOOLEAN              ReturnSingleEntry,
-    IN PVOID                EaList OPTIONAL,
-    IN ULONG                EaListLength,
-    IN PULONG               EaIndex OPTIONAL,
-    IN BOOLEAN              RestartScan
+    __W32_IN HANDLE               FileHandle,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock,
+    __W32_OUT PVOID               Buffer,
+    __W32_IN ULONG                Length,
+    __W32_IN BOOLEAN              ReturnSingleEntry,
+    __W32_IN PVOID                EaList __W32_OPTIONAL,
+    __W32_IN ULONG                EaListLength,
+    __W32_IN PULONG               EaIndex __W32_OPTIONAL,
+    __W32_IN BOOLEAN              RestartScan
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4458,93 +4458,93 @@
 NTSTATUS
 NTAPI
 ZwQueryInformationProcess (
-    IN HANDLE           ProcessHandle,
-    IN PROCESSINFOCLASS ProcessInformationClass,
-    OUT PVOID           ProcessInformation,
-    IN ULONG            ProcessInformationLength,
-    OUT PULONG          ReturnLength OPTIONAL
+    __W32_IN HANDLE           ProcessHandle,
+    __W32_IN PROCESSINFOCLASS ProcessInformationClass,
+    __W32_OUT PVOID           ProcessInformation,
+    __W32_IN ULONG            ProcessInformationLength,
+    __W32_OUT PULONG          ReturnLength __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryInformationToken (
-    IN HANDLE                   TokenHandle,
-    IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-    OUT PVOID                   TokenInformation,
-    IN ULONG                    Length,
-    OUT PULONG                  ResultLength
+    __W32_IN HANDLE                   TokenHandle,
+    __W32_IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
+    __W32_OUT PVOID                   TokenInformation,
+    __W32_IN ULONG                    Length,
+    __W32_OUT PULONG                  ResultLength
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryObject (
-    IN HANDLE                      ObjectHandle,
-    IN OBJECT_INFORMATION_CLASS    ObjectInformationClass,
-    OUT PVOID                      ObjectInformation,
-    IN ULONG                       Length,
-    OUT PULONG                     ResultLength
+    __W32_IN HANDLE                      ObjectHandle,
+    __W32_IN OBJECT_INFORMATION_CLASS    ObjectInformationClass,
+    __W32_OUT PVOID                      ObjectInformation,
+    __W32_IN ULONG                       Length,
+    __W32_OUT PULONG                     ResultLength
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQuerySection (
-    IN HANDLE                       SectionHandle,
-    IN SECTION_INFORMATION_CLASS    SectionInformationClass,
-    OUT PVOID                       SectionInformation,
-    IN ULONG                        SectionInformationLength,
-    OUT PULONG                      ResultLength OPTIONAL
+    __W32_IN HANDLE                       SectionHandle,
+    __W32_IN SECTION_INFORMATION_CLASS    SectionInformationClass,
+    __W32_OUT PVOID                       SectionInformation,
+    __W32_IN ULONG                        SectionInformationLength,
+    __W32_OUT PULONG                      ResultLength __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQuerySecurityObject (
-    IN HANDLE                   FileHandle,
-    IN SECURITY_INFORMATION     SecurityInformation,
-    OUT PSECURITY_DESCRIPTOR    SecurityDescriptor,
-    IN ULONG                    Length,
-    OUT PULONG                  ResultLength
+    __W32_IN HANDLE                   FileHandle,
+    __W32_IN SECURITY_INFORMATION     SecurityInformation,
+    __W32_OUT PSECURITY_DESCRIPTOR    SecurityDescriptor,
+    __W32_IN ULONG                    Length,
+    __W32_OUT PULONG                  ResultLength
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQuerySystemInformation (
-    IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
-    OUT PVOID                   SystemInformation,
-    IN ULONG                    Length,
-    OUT PULONG                  ReturnLength
+    __W32_IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
+    __W32_OUT PVOID                   SystemInformation,
+    __W32_IN ULONG                    Length,
+    __W32_OUT PULONG                  ReturnLength
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwQueryVolumeInformationFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    OUT PVOID               FsInformation,
-    IN ULONG                Length,
-    IN FS_INFORMATION_CLASS FsInformationClass
+    __W32_IN HANDLE               FileHandle,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock,
+    __W32_OUT PVOID               FsInformation,
+    __W32_IN ULONG                Length,
+    __W32_IN FS_INFORMATION_CLASS FsInformationClass
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwReplaceKey (
-    IN POBJECT_ATTRIBUTES   NewFileObjectAttributes,
-    IN HANDLE               KeyHandle,
-    IN POBJECT_ATTRIBUTES   OldFileObjectAttributes
+    __W32_IN POBJECT_ATTRIBUTES   NewFileObjectAttributes,
+    __W32_IN HANDLE               KeyHandle,
+    __W32_IN POBJECT_ATTRIBUTES   OldFileObjectAttributes
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwResetEvent (
-    IN HANDLE   EventHandle,
-    OUT PULONG  PreviousState OPTIONAL
+    __W32_IN HANDLE   EventHandle,
+    __W32_OUT PULONG  PreviousState __W32_OPTIONAL
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4553,9 +4553,9 @@
 NTSTATUS
 NTAPI
 ZwRestoreKey (
-    IN HANDLE   KeyHandle,
-    IN HANDLE   FileHandle,
-    IN ULONG    Flags
+    __W32_IN HANDLE   KeyHandle,
+    __W32_IN HANDLE   FileHandle,
+    __W32_IN ULONG    Flags
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4564,16 +4564,16 @@
 NTSTATUS
 NTAPI
 ZwSaveKey (
-    IN HANDLE KeyHandle,
-    IN HANDLE FileHandle
+    __W32_IN HANDLE KeyHandle,
+    __W32_IN HANDLE FileHandle
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwSetDefaultLocale (
-    IN BOOLEAN  ThreadOrSystem,
-    IN LCID     Locale
+    __W32_IN BOOLEAN  ThreadOrSystem,
+    __W32_IN LCID     Locale
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4582,17 +4582,17 @@
 NTSTATUS
 NTAPI
 ZwSetDefaultUILanguage (
-    IN LANGID LanguageId
+    __W32_IN LANGID LanguageId
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwSetEaFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    OUT PVOID               Buffer,
-    IN ULONG                Length
+    __W32_IN HANDLE               FileHandle,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock,
+    __W32_OUT PVOID               Buffer,
+    __W32_IN ULONG                Length
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4601,28 +4601,28 @@
 NTSTATUS
 NTAPI
 ZwSetEvent (
-    IN HANDLE   EventHandle,
-    OUT PULONG  PreviousState OPTIONAL
+    __W32_IN HANDLE   EventHandle,
+    __W32_OUT PULONG  PreviousState __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwSetInformationObject (
-    IN HANDLE                       ObjectHandle,
-    IN OBJECT_INFORMATION_CLASS    ObjectInformationClass,
-    IN PVOID                        ObjectInformation,
-    IN ULONG                        ObjectInformationLength
+    __W32_IN HANDLE                       ObjectHandle,
+    __W32_IN OBJECT_INFORMATION_CLASS    ObjectInformationClass,
+    __W32_IN PVOID                        ObjectInformation,
+    __W32_IN ULONG                        ObjectInformationLength
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwSetInformationProcess (
-    IN HANDLE           ProcessHandle,
-    IN PROCESSINFOCLASS ProcessInformationClass,
-    IN PVOID            ProcessInformation,
-    IN ULONG            ProcessInformationLength
+    __W32_IN HANDLE           ProcessHandle,
+    __W32_IN PROCESSINFOCLASS ProcessInformationClass,
+    __W32_IN PVOID            ProcessInformation,
+    __W32_IN ULONG            ProcessInformationLength
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4631,9 +4631,9 @@
 NTSTATUS
 NTAPI
 ZwSetSecurityObject (
-    IN HANDLE               Handle,
-    IN SECURITY_INFORMATION SecurityInformation,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor
+    __W32_IN HANDLE               Handle,
+    __W32_IN SECURITY_INFORMATION SecurityInformation,
+    __W32_IN PSECURITY_DESCRIPTOR SecurityDescriptor
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4642,17 +4642,17 @@
 NTSTATUS
 NTAPI
 ZwSetSystemInformation (
-    IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
-    IN PVOID                    SystemInformation,
-    IN ULONG                    Length
+    __W32_IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
+    __W32_IN PVOID                    SystemInformation,
+    __W32_IN ULONG                    Length
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwSetSystemTime (
-    IN PLARGE_INTEGER   NewTime,
-    OUT PLARGE_INTEGER  OldTime OPTIONAL
+    __W32_IN PLARGE_INTEGER   NewTime,
+    __W32_OUT PLARGE_INTEGER  OldTime __W32_OPTIONAL
 );
 
 #if (VER_PRODUCTBUILD >= 2195)
@@ -4661,11 +4661,11 @@
 NTSTATUS
 NTAPI
 ZwSetVolumeInformationFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN PVOID                FsInformation,
-    IN ULONG                Length,
-    IN FS_INFORMATION_CLASS FsInformationClass
+    __W32_IN HANDLE               FileHandle,
+    __W32_OUT PIO_STATUS_BLOCK    IoStatusBlock,
+    __W32_IN PVOID                FsInformation,
+    __W32_IN ULONG                Length,
+    __W32_IN FS_INFORMATION_CLASS FsInformationClass
 );
 
 #endif /* (VER_PRODUCTBUILD >= 2195) */
@@ -4674,8 +4674,8 @@
 NTSTATUS
 NTAPI
 ZwTerminateProcess (
-    IN HANDLE   ProcessHandle OPTIONAL,
-    IN NTSTATUS ExitStatus
+    __W32_IN HANDLE   ProcessHandle __W32_OPTIONAL,
+    __W32_IN NTSTATUS ExitStatus
 );
 
 NTSYSAPI
@@ -4683,34 +4683,34 @@
 NTAPI
 ZwUnloadDriver (
     /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>" */
-    IN PUNICODE_STRING RegistryPath
+    __W32_IN PUNICODE_STRING RegistryPath
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwUnloadKey (
-    IN POBJECT_ATTRIBUTES KeyObjectAttributes
+    __W32_IN POBJECT_ATTRIBUTES KeyObjectAttributes
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwWaitForSingleObject (
-    IN HANDLE           Handle,
-    IN BOOLEAN          Alertable,
-    IN PLARGE_INTEGER   Timeout OPTIONAL
+    __W32_IN HANDLE           Handle,
+    __W32_IN BOOLEAN          Alertable,
+    __W32_IN PLARGE_INTEGER   Timeout __W32_OPTIONAL
 );
 
 NTSYSAPI
 NTSTATUS
 NTAPI
 ZwWaitForMultipleObjects (
-    IN ULONG            HandleCount,
-    IN PHANDLE          Handles,
-    IN WAIT_TYPE        WaitType,
-    IN BOOLEAN          Alertable,
-    IN PLARGE_INTEGER   Timeout OPTIONAL
+    __W32_IN ULONG            HandleCount,
+    __W32_IN PHANDLE          Handles,
+    __W32_IN WAIT_TYPE        WaitType,
+    __W32_IN BOOLEAN          Alertable,
+    __W32_IN PLARGE_INTEGER   Timeout __W32_OPTIONAL
 );
 
 NTSYSAPI
diff -ru w32api-3.6.orig/include/ddk/ntpoapi.h w32api-3.6/include/ddk/ntpoapi.h
--- w32api-3.6.orig/include/ddk/ntpoapi.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/ntpoapi.h	2006-02-06 16:41:14.000000000 +1030
@@ -39,14 +39,14 @@
 #define PERCENT_TO_PERF_LEVEL(x)          (((x) * POWER_PERF_SCALE * 10) / 1000)
 
 typedef struct _PROCESSOR_IDLE_TIMES {
-	ULONGLONG  StartTime;
-	ULONGLONG  EndTime;
-	ULONG  IdleHandlerReserved[4];
+  ULONGLONG  StartTime;
+  ULONGLONG  EndTime;
+  ULONG  IdleHandlerReserved[4];
 } PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES;
 
 typedef BOOLEAN DDKFASTAPI
 (*PPROCESSOR_IDLE_HANDLER)(
-  IN OUT PPROCESSOR_IDLE_TIMES IdleTimes);
+  __W32_IN __W32_OUT PPROCESSOR_IDLE_TIMES IdleTimes);
 
 typedef struct _PROCESSOR_IDLE_HANDLER_INFO {
   ULONG  HardwareLatency;
@@ -55,73 +55,73 @@
 
 typedef VOID DDKFASTAPI
 (*PSET_PROCESSOR_THROTTLE)(
-  IN UCHAR  Throttle);
+  __W32_IN UCHAR  Throttle);
 
 typedef NTSTATUS DDKFASTAPI
 (*PSET_PROCESSOR_THROTTLE2)(
-  IN UCHAR  Throttle);
+  __W32_IN UCHAR  Throttle);
 
 #define MAX_IDLE_HANDLERS                 3
 
 typedef struct _PROCESSOR_STATE_HANDLER {
-	UCHAR  ThrottleScale;
-	BOOLEAN  ThrottleOnIdle;
-	PSET_PROCESSOR_THROTTLE  SetThrottle;
-	ULONG  NumIdleHandlers;
-	PROCESSOR_IDLE_HANDLER_INFO  IdleHandler[MAX_IDLE_HANDLERS];
+  UCHAR  ThrottleScale;
+  BOOLEAN  ThrottleOnIdle;
+  PSET_PROCESSOR_THROTTLE  SetThrottle;
+  ULONG  NumIdleHandlers;
+  PROCESSOR_IDLE_HANDLER_INFO  IdleHandler[MAX_IDLE_HANDLERS];
 } PROCESSOR_STATE_HANDLER, *PPROCESSOR_STATE_HANDLER;
 
 typedef enum _POWER_STATE_HANDLER_TYPE {
-	PowerStateSleeping1,
-	PowerStateSleeping2,
-	PowerStateSleeping3,
-	PowerStateSleeping4,
-	PowerStateSleeping4Firmware,
-	PowerStateShutdownReset,
-	PowerStateShutdownOff,
-	PowerStateMaximum
+  PowerStateSleeping1,
+  PowerStateSleeping2,
+  PowerStateSleeping3,
+  PowerStateSleeping4,
+  PowerStateSleeping4Firmware,
+  PowerStateShutdownReset,
+  PowerStateShutdownOff,
+  PowerStateMaximum
 } POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE;
 
 typedef NTSTATUS DDKAPI
 (*PENTER_STATE_SYSTEM_HANDLER)(
-  IN PVOID  SystemContext);
+  __W32_IN PVOID  SystemContext);
 
 typedef NTSTATUS DDKAPI
 (*PENTER_STATE_HANDLER)(
-  IN PVOID  Context,
-  IN PENTER_STATE_SYSTEM_HANDLER  SystemHandler  OPTIONAL,
-  IN PVOID  SystemContext,
-  IN LONG  NumberProcessors,
-  IN VOLATILE PLONG  Number);
+  __W32_IN PVOID  Context,
+  __W32_IN PENTER_STATE_SYSTEM_HANDLER  SystemHandler  __W32_OPTIONAL,
+  __W32_IN PVOID  SystemContext,
+  __W32_IN LONG  NumberProcessors,
+  __W32_IN VOLATILE PLONG  Number);
 
 typedef struct _POWER_STATE_HANDLER {
-	POWER_STATE_HANDLER_TYPE  Type;
-	BOOLEAN  RtcWake;
-	UCHAR  Spare[3];
-	PENTER_STATE_HANDLER  Handler;
-	PVOID  Context;
+  POWER_STATE_HANDLER_TYPE  Type;
+  BOOLEAN  RtcWake;
+  UCHAR  Spare[3];
+  PENTER_STATE_HANDLER  Handler;
+  PVOID  Context;
 } POWER_STATE_HANDLER, *PPOWER_STATE_HANDLER;
 
 typedef NTSTATUS STDCALL
 (*PENTER_STATE_NOTIFY_HANDLER)(
-  IN POWER_STATE_HANDLER_TYPE  State,
-  IN PVOID  Context,
-  IN BOOLEAN  Entering);
+  __W32_IN POWER_STATE_HANDLER_TYPE  State,
+  __W32_IN PVOID  Context,
+  __W32_IN BOOLEAN  Entering);
 
 typedef struct _POWER_STATE_NOTIFY_HANDLER {
-	PENTER_STATE_NOTIFY_HANDLER  Handler;
-	PVOID  Context;
+  PENTER_STATE_NOTIFY_HANDLER  Handler;
+  PVOID  Context;
 } POWER_STATE_NOTIFY_HANDLER, *PPOWER_STATE_NOTIFY_HANDLER;
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtPowerInformation(
-  IN POWER_INFORMATION_LEVEL  InformationLevel,
-  IN PVOID  InputBuffer OPTIONAL,
-  IN ULONG  InputBufferLength,
-  OUT PVOID  OutputBuffer OPTIONAL,
-  IN ULONG  OutputBufferLength);
+  __W32_IN POWER_INFORMATION_LEVEL  InformationLevel,
+  __W32_IN PVOID  InputBuffer __W32_OPTIONAL,
+  __W32_IN ULONG  InputBufferLength,
+  __W32_OUT PVOID  OutputBuffer __W32_OPTIONAL,
+  __W32_IN ULONG  OutputBufferLength);
 
 #define PROCESSOR_STATE_TYPE_PERFORMANCE  1
 #define PROCESSOR_STATE_TYPE_THROTTLE     2
@@ -147,12 +147,12 @@
 } PROCESSOR_PERF_STATE, *PPROCESSOR_PERF_STATE;
 
 typedef struct _PROCESSOR_STATE_HANDLER2 {
-	ULONG  NumIdleHandlers;
-	PROCESSOR_IDLE_HANDLER_INFO  IdleHandler[MAX_IDLE_HANDLERS];
-	PSET_PROCESSOR_THROTTLE2  SetPerfLevel;
-	ULONG  HardwareLatency;
-	UCHAR  NumPerfStates;
-	PROCESSOR_PERF_LEVEL  PerfLevel[1];
+  ULONG  NumIdleHandlers;
+  PROCESSOR_IDLE_HANDLER_INFO  IdleHandler[MAX_IDLE_HANDLERS];
+  PSET_PROCESSOR_THROTTLE2  SetPerfLevel;
+  ULONG  HardwareLatency;
+  UCHAR  NumPerfStates;
+  PROCESSOR_PERF_LEVEL  PerfLevel[1];
 } PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2;
 
 
@@ -160,44 +160,44 @@
 NTSTATUS
 DDKAPI
 NtSetThreadExecutionState(
-  IN EXECUTION_STATE  esFlags,
-  OUT EXECUTION_STATE  *PreviousFlags);
+  __W32_IN EXECUTION_STATE  esFlags,
+  __W32_OUT EXECUTION_STATE  *PreviousFlags);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtRequestWakeupLatency(
-  IN LATENCY_TIME  latency);
+  __W32_IN LATENCY_TIME  latency);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtInitiatePowerAction(
-  IN POWER_ACTION  SystemAction,
-  IN SYSTEM_POWER_STATE  MinSystemState,
-  IN ULONG  Flags,
-  IN BOOLEAN  Asynchronous);
+  __W32_IN POWER_ACTION  SystemAction,
+  __W32_IN SYSTEM_POWER_STATE  MinSystemState,
+  __W32_IN ULONG  Flags,
+  __W32_IN BOOLEAN  Asynchronous);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtSetSystemPowerState(
-  IN POWER_ACTION SystemAction,
-  IN SYSTEM_POWER_STATE MinSystemState,
-  IN ULONG Flags);
+  __W32_IN POWER_ACTION SystemAction,
+  __W32_IN SYSTEM_POWER_STATE MinSystemState,
+  __W32_IN ULONG Flags);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtGetDevicePowerState(
-  IN HANDLE  Device,
-  OUT DEVICE_POWER_STATE  *State);
+  __W32_IN HANDLE  Device,
+  __W32_OUT DEVICE_POWER_STATE  *State);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtCancelDeviceWakeupRequest(
-  IN HANDLE  Device);
+  __W32_IN HANDLE  Device);
 
 NTOSAPI
 BOOLEAN
@@ -209,7 +209,7 @@
 NTSTATUS
 DDKAPI
 NtRequestDeviceWakeup(
-  IN HANDLE  Device);
+  __W32_IN HANDLE  Device);
 
 #define WINLOGON_LOCK_ON_SLEEP            0x00000001
 
diff -ru w32api-3.6.orig/include/ddk/parallel.h w32api-3.6/include/ddk/parallel.h
--- w32api-3.6.orig/include/ddk/parallel.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/parallel.h	2006-02-06 16:41:14.000000000 +1030
@@ -38,7 +38,7 @@
 #define DD_PARALLEL_PORT_BASE_NAME_U      L"ParallelPort"
 
 #define IOCTL_INTERNAL_DESELECT_DEVICE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) 
+  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 24, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_INTERNAL_GET_MORE_PARALLEL_PORT_INFO \
   CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 17, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_INTERNAL_GET_PARALLEL_PNP_INFO \
@@ -76,38 +76,38 @@
 #define PAR_HAVE_PORT_KEEP_PORT           0x00000002
 
 typedef struct _MORE_PARALLEL_PORT_INFORMATION {
-	INTERFACE_TYPE  InterfaceType;
-	ULONG  BusNumber;
-	ULONG  InterruptLevel;
-	ULONG  InterruptVector;
-	KAFFINITY  InterruptAffinity;
-	KINTERRUPT_MODE  InterruptMode;
+  INTERFACE_TYPE  InterfaceType;
+  ULONG  BusNumber;
+  ULONG  InterruptLevel;
+  ULONG  InterruptVector;
+  KAFFINITY  InterruptAffinity;
+  KINTERRUPT_MODE  InterruptMode;
 } MORE_PARALLEL_PORT_INFORMATION, *PMORE_PARALLEL_PORT_INFORMATION;
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_SET_CHIP_MODE)(
-	IN  PVOID  SetChipContext,
-	IN  UCHAR  ChipMode);
+  __W32_IN  PVOID  SetChipContext,
+  __W32_IN  UCHAR  ChipMode);
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_CLEAR_CHIP_MODE)(
-	IN  PVOID  ClearChipContext,
-	IN  UCHAR  ChipMode);
+  __W32_IN  PVOID  ClearChipContext,
+  __W32_IN  UCHAR  ChipMode);
 
 typedef NTSTATUS DDKAPI
 (*PPARCHIP_CLEAR_CHIP_MODE)(
-	IN  PVOID  ClearChipContext,
-	IN  UCHAR  ChipMode);
+  __W32_IN  PVOID  ClearChipContext,
+  __W32_IN  UCHAR  ChipMode);
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_TRY_SELECT_ROUTINE)(
-	IN  PVOID  TrySelectContext,
-	IN  PVOID  TrySelectCommand);
+  __W32_IN  PVOID  TrySelectContext,
+  __W32_IN  PVOID  TrySelectCommand);
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_DESELECT_ROUTINE)(
-	IN PVOID  DeselectContext,
-	IN PVOID  DeselectCommand);
+  __W32_IN PVOID  DeselectContext,
+  __W32_IN PVOID  DeselectCommand);
 
 /* PARALLEL_PNP_INFORMATION.HardwareCapabilities */
 #define PPT_NO_HARDWARE_PRESENT           0x00000000
@@ -140,15 +140,15 @@
 
 typedef BOOLEAN DDKAPI
 (*PPARALLEL_TRY_ALLOCATE_ROUTINE)(
-  IN  PVOID  TryAllocateContext);
+  __W32_IN  PVOID  TryAllocateContext);
 
 typedef VOID DDKAPI
 (*PPARALLEL_FREE_ROUTINE)(
-  IN  PVOID  FreeContext);
+  __W32_IN  PVOID  FreeContext);
 
 typedef ULONG DDKAPI
 (*PPARALLEL_QUERY_WAITERS_ROUTINE)(
-	IN  PVOID  QueryAllocsContext);
+  __W32_IN  PVOID  QueryAllocsContext);
 
 typedef struct _PARALLEL_PORT_INFORMATION {
   PHYSICAL_ADDRESS  OriginalController;
@@ -171,7 +171,7 @@
 
 typedef VOID DDKAPI
 (*PPARALLEL_DEFERRED_ROUTINE)(
-	IN  PVOID  DeferredContext);
+  __W32_IN  PVOID  DeferredContext);
 
 typedef struct _PARALLEL_INTERRUPT_SERVICE_ROUTINE {
   PKSERVICE_ROUTINE  InterruptServiceRoutine;
@@ -198,58 +198,58 @@
 
 typedef USHORT DDKAPI
 (*PDETERMINE_IEEE_MODES)(
-  IN PVOID  Context);
+  __W32_IN PVOID  Context);
 
 typedef enum _PARALLEL_SAFETY {
-	SAFE_MODE,
-	UNSAFE_MODE
+  SAFE_MODE,
+  UNSAFE_MODE
 } PARALLEL_SAFETY;
 
 typedef NTSTATUS DDKAPI
 (*PNEGOTIATE_IEEE_MODE)(
-  IN PVOID  Context,
-  IN USHORT  ModeMaskFwd,
-  IN USHORT  ModeMaskRev,
-  IN PARALLEL_SAFETY  ModeSafety,
-  IN BOOLEAN  IsForward);
+  __W32_IN PVOID  Context,
+  __W32_IN USHORT  ModeMaskFwd,
+  __W32_IN USHORT  ModeMaskRev,
+  __W32_IN PARALLEL_SAFETY  ModeSafety,
+  __W32_IN BOOLEAN  IsForward);
 
 typedef NTSTATUS DDKAPI
 (*PTERMINATE_IEEE_MODE)(
-	IN  PVOID  Context);
-	
+  __W32_IN  PVOID  Context);
+
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_IEEE_FWD_TO_REV)(
-  IN  PVOID  Context);
+  __W32_IN  PVOID  Context);
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_IEEE_REV_TO_FWD)(
-  IN  PVOID  Context);
+  __W32_IN  PVOID  Context);
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_READ)(
-	IN  PVOID  Context,
-	OUT PVOID  Buffer,
-	IN  ULONG  NumBytesToRead,
-	OUT PULONG  NumBytesRead,
-	IN  UCHAR  Channel);
-	
+  __W32_IN  PVOID  Context,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN  ULONG  NumBytesToRead,
+  __W32_OUT PULONG  NumBytesRead,
+  __W32_IN  UCHAR  Channel);
+
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_WRITE)(
-	IN  PVOID  Context,
-	OUT PVOID  Buffer,
-	IN  ULONG  NumBytesToWrite,
-	OUT PULONG  NumBytesWritten,
-	IN  UCHAR   Channel);
+  __W32_IN  PVOID  Context,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN  ULONG  NumBytesToWrite,
+  __W32_OUT PULONG  NumBytesWritten,
+  __W32_IN  UCHAR   Channel);
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_TRYSELECT_DEVICE)(
-  IN  PVOID  Context,
-  IN  PARALLEL_1284_COMMAND  Command);
+  __W32_IN  PVOID  Context,
+  __W32_IN  PARALLEL_1284_COMMAND  Command);
 
 typedef NTSTATUS DDKAPI
 (*PPARALLEL_DESELECT_DEVICE)(
-  IN  PVOID  Context,
-  IN  PARALLEL_1284_COMMAND  Command);
+  __W32_IN  PVOID  Context,
+  __W32_IN  PARALLEL_1284_COMMAND  Command);
 
 typedef struct _PARCLASS_INFORMATION {
   PUCHAR  Controller;
diff -ru w32api-3.6.orig/include/ddk/pfhook.h w32api-3.6/include/ddk/pfhook.h
--- w32api-3.6.orig/include/ddk/pfhook.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/pfhook.h	2006-02-06 16:41:14.000000000 +1030
@@ -41,24 +41,24 @@
 typedef ULONG IPAddr;
 
 typedef enum _PF_FORWARD_ACTION {
-	PF_FORWARD = 0,
-	PF_DROP = 1,
-	PF_PASS = 2,
-	PF_ICMP_ON_DROP = 3
+  PF_FORWARD = 0,
+  PF_DROP = 1,
+  PF_PASS = 2,
+  PF_ICMP_ON_DROP = 3
 } PF_FORWARD_ACTION;
 
 typedef PF_FORWARD_ACTION STDCALL
 (*PacketFilterExtensionPtr)(
-  IN unsigned char  *PacketHeader,
-  IN unsigned char  *Packet, 
-  IN unsigned int  PacketLength, 
-  IN unsigned int  RecvInterfaceIndex, 
-  IN unsigned int  SendInterfaceIndex, 
-  IN IPAddr  RecvLinkNextHop, 
-  IN IPAddr  SendLinkNextHop); 
+  __W32_IN unsigned char  *PacketHeader,
+  __W32_IN unsigned char  *Packet,
+  __W32_IN unsigned int  PacketLength,
+  __W32_IN unsigned int  RecvInterfaceIndex,
+  __W32_IN unsigned int  SendInterfaceIndex,
+  __W32_IN IPAddr  RecvLinkNextHop,
+  __W32_IN IPAddr  SendLinkNextHop);
 
 typedef struct _PF_SET_EXTENSION_HOOK_INFO {
-  PacketFilterExtensionPtr  ExtensionPointer; 
+  PacketFilterExtensionPtr  ExtensionPointer;
 } PF_SET_EXTENSION_HOOK_INFO, *PPF_SET_EXTENSION_HOOK_INFO;
 
 #define FSCTL_IPFLTRDRVR_BASE             FILE_DEVICE_NETWORK
diff -ru w32api-3.6.orig/include/ddk/scsiwmi.h w32api-3.6/include/ddk/scsiwmi.h
--- w32api-3.6.orig/include/ddk/scsiwmi.h	2003-02-06 04:14:09.000000000 +1030
+++ w32api-3.6/include/ddk/scsiwmi.h	2006-02-06 16:41:14.000000000 +1030
@@ -73,63 +73,63 @@
 
 typedef UCHAR DDKAPI
 (*PSCSIWMI_QUERY_REGINFO)(
-	IN PVOID  DeviceContext,
-	IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-	OUT PWCHAR  *MofResourceName);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
+  __W32_OUT PWCHAR  *MofResourceName);
 
 typedef BOOLEAN DDKAPI
 (*PSCSIWMI_QUERY_DATABLOCK)(
-  IN PVOID  Context,
-  IN PSCSIWMI_REQUEST_CONTEXT  DispatchContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  InstanceCount,
-  IN OUT PULONG  InstanceLengthArray,
-  IN ULONG  BufferAvail,
-  OUT PUCHAR  Buffer);
+  __W32_IN PVOID  Context,
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  DispatchContext,
+  __W32_IN ULONG  GuidIndex,
+  __W32_IN ULONG  InstanceIndex,
+  __W32_IN ULONG  InstanceCount,
+  __W32_IN __W32_OUT PULONG  InstanceLengthArray,
+  __W32_IN ULONG  BufferAvail,
+  __W32_OUT PUCHAR  Buffer);
 
 typedef BOOLEAN DDKAPI
 (*PSCSIWMI_SET_DATABLOCK)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  BufferSize,
-  IN PUCHAR  Buffer);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
+  __W32_IN ULONG  GuidIndex,
+  __W32_IN ULONG  InstanceIndex,
+  __W32_IN ULONG  BufferSize,
+  __W32_IN PUCHAR  Buffer);
 
 typedef BOOLEAN DDKAPI
 (*PSCSIWMI_SET_DATAITEM)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  DataItemId,
-  IN ULONG  BufferSize,
-  IN PUCHAR  Buffer);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
+  __W32_IN ULONG  GuidIndex,
+  __W32_IN ULONG  InstanceIndex,
+  __W32_IN ULONG  DataItemId,
+  __W32_IN ULONG  BufferSize,
+  __W32_IN PUCHAR  Buffer);
 
 typedef BOOLEAN DDKAPI
 (*PSCSIWMI_EXECUTE_METHOD)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  MethodId,
-  IN ULONG  InBufferSize,
-  IN ULONG  OutBufferSize,
-  IN OUT PUCHAR  Buffer);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
+  __W32_IN ULONG  GuidIndex,
+  __W32_IN ULONG  InstanceIndex,
+  __W32_IN ULONG  MethodId,
+  __W32_IN ULONG  InBufferSize,
+  __W32_IN ULONG  OutBufferSize,
+  __W32_IN __W32_OUT PUCHAR  Buffer);
 
 typedef enum _SCSIWMI_ENABLE_DISABLE_CONTROL {
-	ScsiWmiEventControl,
-	ScsiWmiDataBlockControl
+  ScsiWmiEventControl,
+  ScsiWmiDataBlockControl
 } SCSIWMI_ENABLE_DISABLE_CONTROL;
 
 typedef BOOLEAN DDKAPI
 (*PSCSIWMI_FUNCTION_CONTROL)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN SCSIWMI_ENABLE_DISABLE_CONTROL  Function,
-  IN BOOLEAN  Enable);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
+  __W32_IN ULONG  GuidIndex,
+  __W32_IN SCSIWMI_ENABLE_DISABLE_CONTROL  Function,
+  __W32_IN BOOLEAN  Enable);
 
 typedef struct _SCSIWMILIB_CONTEXT {
   ULONG  GuidCount;
@@ -146,13 +146,13 @@
 BOOLEAN
 DDKAPI
 ScsiPortWmiDispatchFunction(
-  IN PSCSI_WMILIB_CONTEXT  WmiLibInfo,
-  IN UCHAR  MinorFunction,
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN PVOID  DataPath,
-  IN ULONG  BufferSize,
-  IN PVOID  Buffer);
+  __W32_IN PSCSI_WMILIB_CONTEXT  WmiLibInfo,
+  __W32_IN UCHAR  MinorFunction,
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
+  __W32_IN PVOID  DataPath,
+  __W32_IN ULONG  BufferSize,
+  __W32_IN PVOID  Buffer);
 
 #define ScsiPortWmiFireAdapterEvent(  \
   HwDeviceExtension,                  \
@@ -161,14 +161,14 @@
   EventDataSize,                      \
   EventData)                          \
     ScsiPortWmiFireLogicalUnitEvent(  \
-	  HwDeviceExtension,                \
-	  0xff,                             \
-	  0,                                \
-	  0,                                \
-	  Guid,                             \
-	  InstanceIndex,                    \
-	  EventDataSize,                    \
-	  EventData)
+    HwDeviceExtension,                \
+    0xff,                             \
+    0,                                \
+    0,                                \
+    Guid,                             \
+    InstanceIndex,                    \
+    EventDataSize,                    \
+    EventData)
 
 /*
  * ULONG
@@ -178,10 +178,10 @@
 #define ScsiPortWmiGetReturnSize(RequestContext) \
   ((RequestContext)->ReturnSize)
 
-/* UCHAR 
+/* UCHAR
  * ScsiPortWmiGetReturnStatus(
  *   PSCSIWMI_REQUEST_CONTEXT  RequestContext);
- */ 
+ */
 #define ScsiPortWmiGetReturnStatus(RequestContext) \
   ((RequestContext)->ReturnStatus)
 
@@ -189,22 +189,22 @@
 VOID
 DDKAPI
 ScsiPortWmiPostProcess(
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN UCHAR  SrbStatus,
-  IN ULONG  BufferUsed);
+  __W32_IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
+  __W32_IN UCHAR  SrbStatus,
+  __W32_IN ULONG  BufferUsed);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWmiFireLogicalUnitEvent(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN LPGUID  Guid,
-  IN ULONG  InstanceIndex,
-  IN ULONG  EventDataSize,
-  IN PVOID  EventData);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN LPGUID  Guid,
+  __W32_IN ULONG  InstanceIndex,
+  __W32_IN ULONG  EventDataSize,
+  __W32_IN PVOID  EventData);
 
 #pragma pack(pop)
 
diff -ru w32api-3.6.orig/include/ddk/smbus.h w32api-3.6/include/ddk/smbus.h
--- w32api-3.6.orig/include/ddk/smbus.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/smbus.h	2006-02-06 16:41:14.000000000 +1030
@@ -105,18 +105,18 @@
 
 typedef NTSTATUS DDKAPI
 (*SMB_RESET_DEVICE)(
-  IN struct _SMB_CLASS  *SmbClass,
-  IN PVOID  SmbMiniport);
+  __W32_IN struct _SMB_CLASS  *SmbClass,
+  __W32_IN PVOID  SmbMiniport);
 
 typedef VOID DDKAPI
 (*SMB_START_IO)(
-  IN struct _SMB_CLASS  *SmbClass,
-  IN PVOID  SmbMiniport);
+  __W32_IN struct _SMB_CLASS  *SmbClass,
+  __W32_IN PVOID  SmbMiniport);
 
 typedef NTSTATUS DDKAPI
 (*SMB_STOP_DEVICE)(
-  IN struct _SMB_CLASS  *SmbClass,
-  IN PVOID  SmbMiniport);
+  __W32_IN struct _SMB_CLASS  *SmbClass,
+  __W32_IN PVOID  SmbMiniport);
 
 typedef struct _SMB_CLASS {
   USHORT  MajorVersion;
@@ -136,52 +136,52 @@
 VOID
 DDKAPI
 SmbClassAlarm(
-  IN PSMB_CLASS  SmbClass,
-  IN UCHAR  Address,
-  IN USHORT  Data);
+  __W32_IN PSMB_CLASS  SmbClass,
+  __W32_IN UCHAR  Address,
+  __W32_IN USHORT  Data);
 
 SMBCLASSAPI
 VOID
 DDKAPI
 SmbClassCompleteRequest(
-  IN PSMB_CLASS  SmbClass);
+  __W32_IN PSMB_CLASS  SmbClass);
 
 typedef NTSTATUS DDKAPI
 (*PSMB_INITIALIZE_MINIPORT)(
-  IN PSMB_CLASS  SmbClass,
-  IN PVOID  MiniportExtension,
-  IN PVOID  MiniportContext);
+  __W32_IN PSMB_CLASS  SmbClass,
+  __W32_IN PVOID  MiniportExtension,
+  __W32_IN PVOID  MiniportContext);
 
 SMBCLASSAPI
 NTSTATUS
 DDKAPI
 SmbClassCreateFdo(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDEVICE_OBJECT  PDO,
-  IN ULONG  MiniportExtensionSize,
-  IN PSMB_INITIALIZE_MINIPORT  MiniportInitialize,
-  IN PVOID  MiniportContext,
-  OUT PDEVICE_OBJECT  *FDO);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PDEVICE_OBJECT  PDO,
+  __W32_IN ULONG  MiniportExtensionSize,
+  __W32_IN PSMB_INITIALIZE_MINIPORT  MiniportInitialize,
+  __W32_IN PVOID  MiniportContext,
+  __W32_OUT PDEVICE_OBJECT  *FDO);
 
 SMBCLASSAPI
 NTSTATUS
 DDKAPI
 SmbClassInitializeDevice(
-  IN ULONG  MajorVersion,
-  IN ULONG  MinorVersion,
-  IN PDRIVER_OBJECT  DriverObject);
+  __W32_IN ULONG  MajorVersion,
+  __W32_IN ULONG  MinorVersion,
+  __W32_IN PDRIVER_OBJECT  DriverObject);
 
 SMBCLASSAPI
 VOID
 DDKAPI
 SmbClassLockDevice(
-  IN PSMB_CLASS  SmbClass);
+  __W32_IN PSMB_CLASS  SmbClass);
 
 SMBCLASSAPI
 VOID
 DDKAPI
 SmbClassUnlockDevice(
-  IN PSMB_CLASS  SmbClass);
+  __W32_IN PSMB_CLASS  SmbClass);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/srb.h w32api-3.6/include/ddk/srb.h
--- w32api-3.6.orig/include/ddk/srb.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/srb.h	2006-02-06 16:41:14.000000000 +1030
@@ -167,42 +167,42 @@
 #define SRB_FLAGS_PORT_DRIVER_RESERVED      0x0F000000
 #define SRB_FLAGS_CLASS_DRIVER_RESERVED     0xF0000000
 
-typedef struct _SCSI_REQUEST_BLOCK { 
-  USHORT  Length; 
-  UCHAR  Function; 
-  UCHAR  SrbStatus; 
-  UCHAR  ScsiStatus; 
-  UCHAR  PathId; 
-  UCHAR  TargetId; 
-  UCHAR  Lun; 
-  UCHAR  QueueTag; 
-  UCHAR  QueueAction; 
-  UCHAR  CdbLength; 
-  UCHAR  SenseInfoBufferLength; 
-  ULONG  SrbFlags; 
-  ULONG  DataTransferLength; 
-  ULONG  TimeOutValue; 
-  PVOID  DataBuffer; 
-  PVOID  SenseInfoBuffer; 
-  struct _SCSI_REQUEST_BLOCK  *NextSrb; 
-  PVOID  OriginalRequest; 
-  PVOID  SrbExtension; 
+typedef struct _SCSI_REQUEST_BLOCK {
+  USHORT  Length;
+  UCHAR  Function;
+  UCHAR  SrbStatus;
+  UCHAR  ScsiStatus;
+  UCHAR  PathId;
+  UCHAR  TargetId;
+  UCHAR  Lun;
+  UCHAR  QueueTag;
+  UCHAR  QueueAction;
+  UCHAR  CdbLength;
+  UCHAR  SenseInfoBufferLength;
+  ULONG  SrbFlags;
+  ULONG  DataTransferLength;
+  ULONG  TimeOutValue;
+  PVOID  DataBuffer;
+  PVOID  SenseInfoBuffer;
+  struct _SCSI_REQUEST_BLOCK  *NextSrb;
+  PVOID  OriginalRequest;
+  PVOID  SrbExtension;
   _ANONYMOUS_UNION union {
     ULONG  InternalStatus;
     ULONG  QueueSortKey;
-  } DUMMYUNIONNAME; 
+  } DUMMYUNIONNAME;
 #if defined(_WIN64)
   ULONG Reserved;
 #endif
-  UCHAR  Cdb[16]; 
-} SCSI_REQUEST_BLOCK, *PSCSI_REQUEST_BLOCK; 
+  UCHAR  Cdb[16];
+} SCSI_REQUEST_BLOCK, *PSCSI_REQUEST_BLOCK;
 
 #define SCSI_REQUEST_BLOCK_SIZE           sizeof(SCSI_REQUEST_BLOCK)
 
-typedef struct _ACCESS_RANGE { 
-  SCSI_PHYSICAL_ADDRESS  RangeStart; 
-  ULONG  RangeLength; 
-  BOOLEAN  RangeInMemory; 
+typedef struct _ACCESS_RANGE {
+  SCSI_PHYSICAL_ADDRESS  RangeStart;
+  ULONG  RangeLength;
+  BOOLEAN  RangeInMemory;
 } ACCESS_RANGE, *PACCESS_RANGE;
 
 /* PORT_CONFIGURATION_INFORMATION.Dma64BitAddresses constants */
@@ -266,52 +266,52 @@
 #define CONFIG_INFO_VERSION_2             sizeof(PORT_CONFIGURATION_INFORMATION)
 
 typedef enum _SCSI_NOTIFICATION_TYPE {
-	RequestComplete,
-	NextRequest,
-	NextLuRequest,
-	ResetDetected,
-	CallDisableInterrupts,
-	CallEnableInterrupts,
-	RequestTimerCall,
-	BusChangeDetected,
-	WMIEvent,
-	WMIReregister
+  RequestComplete,
+  NextRequest,
+  NextLuRequest,
+  ResetDetected,
+  CallDisableInterrupts,
+  CallEnableInterrupts,
+  RequestTimerCall,
+  BusChangeDetected,
+  WMIEvent,
+  WMIReregister
 } SCSI_NOTIFICATION_TYPE, *PSCSI_NOTIFICATION_TYPE;
 
 #ifdef __GNUC__
 __extension__ /* enums limited to range of integer */
 #endif
 typedef enum _SCSI_ADAPTER_CONTROL_TYPE {
-	ScsiQuerySupportedControlTypes = 0,
-	ScsiStopAdapter,
-	ScsiRestartAdapter,
-	ScsiSetBootConfig,
-	ScsiSetRunningConfig,
-	ScsiAdapterControlMax,
-	MakeAdapterControlTypeSizeOfUlong = 0xffffffff
+  ScsiQuerySupportedControlTypes = 0,
+  ScsiStopAdapter,
+  ScsiRestartAdapter,
+  ScsiSetBootConfig,
+  ScsiSetRunningConfig,
+  ScsiAdapterControlMax,
+  MakeAdapterControlTypeSizeOfUlong = 0xffffffff
 } SCSI_ADAPTER_CONTROL_TYPE, *PSCSI_ADAPTER_CONTROL_TYPE;
 
 typedef enum _SCSI_ADAPTER_CONTROL_STATUS {
-	ScsiAdapterControlSuccess = 0,
-	ScsiAdapterControlUnsuccessful
+  ScsiAdapterControlSuccess = 0,
+  ScsiAdapterControlUnsuccessful
 } SCSI_ADAPTER_CONTROL_STATUS, *PSCSI_ADAPTER_CONTROL_STATUS;
 
 typedef struct _SCSI_SUPPORTED_CONTROL_TYPE_LIST {
-	ULONG MaxControlType;
-	BOOLEAN SupportedTypeList[0];
+  ULONG MaxControlType;
+  BOOLEAN SupportedTypeList[0];
 } SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST;
 
 typedef SCSI_ADAPTER_CONTROL_STATUS DDKAPI
 (*PHW_ADAPTER_CONTROL)(
-	IN PVOID DeviceExtension,
-	IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
-	IN PVOID Parameters);
+  __W32_IN PVOID DeviceExtension,
+  __W32_IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
+  __W32_IN PVOID Parameters);
 
 typedef BOOLEAN DDKAPI
 (*PHW_ADAPTER_STATE)(
-	IN PVOID DeviceExtension,
-	IN PVOID Context,
-	IN BOOLEAN SaveState);
+  __W32_IN PVOID DeviceExtension,
+  __W32_IN PVOID Context,
+  __W32_IN BOOLEAN SaveState);
 
 #define SP_RETURN_NOT_FOUND               0
 #define SP_RETURN_FOUND                   1
@@ -320,431 +320,431 @@
 
 typedef ULONG DDKAPI
 (*PHW_FIND_ADAPTER)(
-	IN PVOID DeviceExtension,
-	IN PVOID HwContext,
-	IN PVOID BusInformation,
-	IN PCHAR ArgumentString,
-	IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
-	OUT PBOOLEAN Again);
+  __W32_IN PVOID DeviceExtension,
+  __W32_IN PVOID HwContext,
+  __W32_IN PVOID BusInformation,
+  __W32_IN PCHAR ArgumentString,
+  __W32_IN __W32_OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
+  __W32_OUT PBOOLEAN Again);
 
 typedef BOOLEAN DDKAPI
 (*PHW_INITIALIZE)(
-  IN PVOID DeviceExtension);
+  __W32_IN PVOID DeviceExtension);
 
 typedef BOOLEAN DDKAPI
 (*PHW_INTERRUPT)(
-  IN PVOID DeviceExtension);
+  __W32_IN PVOID DeviceExtension);
 
 typedef BOOLEAN DDKAPI
 (*PHW_RESET_BUS)(
-  IN PVOID DeviceExtension,
-  IN ULONG PathId);
+  __W32_IN PVOID DeviceExtension,
+  __W32_IN ULONG PathId);
 
 typedef VOID DDKAPI
 (*PHW_DMA_STARTED)(
-  IN PVOID DeviceExtension);
+  __W32_IN PVOID DeviceExtension);
 
 typedef BOOLEAN DDKAPI
 (*PHW_STARTIO)(
-  IN PVOID DeviceExtension,
-  IN PSCSI_REQUEST_BLOCK Srb);
+  __W32_IN PVOID DeviceExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK Srb);
 
 typedef VOID DDKAPI
 (*PHW_TIMER)(
-  IN PVOID DeviceExtension);
+  __W32_IN PVOID DeviceExtension);
 
-typedef struct _HW_INITIALIZATION_DATA { 
-  ULONG  HwInitializationDataSize; 
-  INTERFACE_TYPE  AdapterInterfaceType; 
-  PHW_INITIALIZE  HwInitialize; 
-  PHW_STARTIO  HwStartIo; 
-  PHW_INTERRUPT  HwInterrupt; 
-  PHW_FIND_ADAPTER  HwFindAdapter; 
-  PHW_RESET_BUS  HwResetBus; 
-  PHW_DMA_STARTED  HwDmaStarted; 
-  PHW_ADAPTER_STATE  HwAdapterState; 
-  ULONG  DeviceExtensionSize; 
-  ULONG  SpecificLuExtensionSize; 
-  ULONG  SrbExtensionSize; 
-  ULONG  NumberOfAccessRanges; 
-  PVOID  Reserved; 
-  BOOLEAN  MapBuffers; 
-  BOOLEAN  NeedPhysicalAddresses; 
-  BOOLEAN  TaggedQueuing; 
-  BOOLEAN  AutoRequestSense; 
-  BOOLEAN  MultipleRequestPerLu; 
-  BOOLEAN  ReceiveEvent; 
-  USHORT  VendorIdLength; 
-  PVOID  VendorId; 
-  USHORT  ReservedUshort; 
-  USHORT  DeviceIdLength; 
-  PVOID  DeviceId; 
+typedef struct _HW_INITIALIZATION_DATA {
+  ULONG  HwInitializationDataSize;
+  INTERFACE_TYPE  AdapterInterfaceType;
+  PHW_INITIALIZE  HwInitialize;
+  PHW_STARTIO  HwStartIo;
+  PHW_INTERRUPT  HwInterrupt;
+  PHW_FIND_ADAPTER  HwFindAdapter;
+  PHW_RESET_BUS  HwResetBus;
+  PHW_DMA_STARTED  HwDmaStarted;
+  PHW_ADAPTER_STATE  HwAdapterState;
+  ULONG  DeviceExtensionSize;
+  ULONG  SpecificLuExtensionSize;
+  ULONG  SrbExtensionSize;
+  ULONG  NumberOfAccessRanges;
+  PVOID  Reserved;
+  BOOLEAN  MapBuffers;
+  BOOLEAN  NeedPhysicalAddresses;
+  BOOLEAN  TaggedQueuing;
+  BOOLEAN  AutoRequestSense;
+  BOOLEAN  MultipleRequestPerLu;
+  BOOLEAN  ReceiveEvent;
+  USHORT  VendorIdLength;
+  PVOID  VendorId;
+  USHORT  ReservedUshort;
+  USHORT  DeviceIdLength;
+  PVOID  DeviceId;
   PHW_ADAPTER_CONTROL  HwAdapterControl;
-} HW_INITIALIZATION_DATA, *PHW_INITIALIZATION_DATA; 
+} HW_INITIALIZATION_DATA, *PHW_INITIALIZATION_DATA;
 
 SCSIPORTAPI
-VOID 
+VOID
 DDKAPI
 ScsiPortCompleteRequest(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN UCHAR  SrbStatus);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN UCHAR  SrbStatus);
 
 /*
  * ULONG
  * ScsiPortConvertPhysicalAddressToUlong(
- *   IN SCSI_PHYSICAL_ADDRESS  Address);
+ *   __W32_IN SCSI_PHYSICAL_ADDRESS  Address);
  */
 #define ScsiPortConvertPhysicalAddressToUlong(Address) ((Address).LowPart)
 
 SCSIPORTAPI
-SCSI_PHYSICAL_ADDRESS 
+SCSI_PHYSICAL_ADDRESS
 DDKAPI
 ScsiPortConvertUlongToPhysicalAddress(
-  IN ULONG  UlongAddress);
+  __W32_IN ULONG  UlongAddress);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortFlushDma(
-  IN PVOID  DeviceExtension);
+  __W32_IN PVOID  DeviceExtension);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortFreeDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  MappedAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  MappedAddress);
 
 SCSIPORTAPI
 ULONG
 DDKAPI
 ScsiPortGetBusData(
-  IN PVOID  DeviceExtension,
-  IN ULONG  BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  DeviceExtension,
+  __W32_IN ULONG  BusDataType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 SCSIPORTAPI
 PVOID
 DDKAPI
 ScsiPortGetDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN SCSI_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN INTERFACE_TYPE  BusType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN SCSI_PHYSICAL_ADDRESS  IoAddress,
+  __W32_IN ULONG  NumberOfBytes,
+  __W32_IN BOOLEAN  InIoSpace);
 
 SCSIPORTAPI
 PVOID
 DDKAPI
 ScsiPortGetLogicalUnit(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun);
 
 SCSIPORTAPI
 SCSI_PHYSICAL_ADDRESS
 DDKAPI
 ScsiPortGetPhysicalAddress(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb  OPTIONAL,
-  IN PVOID  VirtualAddress,
-  OUT ULONG  *Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb  __W32_OPTIONAL,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_OUT ULONG  *Length);
 
 SCSIPORTAPI
 PSCSI_REQUEST_BLOCK
 DDKAPI
 ScsiPortGetSrb(
-  IN PVOID  DeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN LONG  QueueTag);
+  __W32_IN PVOID  DeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN LONG  QueueTag);
 
 SCSIPORTAPI
 PVOID
 DDKAPI
 ScsiPortGetUncachedExtension(
-  IN PVOID  HwDeviceExtension,
-  IN PPORT_CONFIGURATION_INFORMATION  ConfigInfo,
-  IN ULONG  NumberOfBytes);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PPORT_CONFIGURATION_INFORMATION  ConfigInfo,
+  __W32_IN ULONG  NumberOfBytes);
 
 SCSIPORTAPI
 PVOID
 DDKAPI
 ScsiPortGetVirtualAddress(
-  IN PVOID  HwDeviceExtension,
-  IN SCSI_PHYSICAL_ADDRESS  PhysicalAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN SCSI_PHYSICAL_ADDRESS  PhysicalAddress);
 
 SCSIPORTAPI
 ULONG
 DDKAPI
 ScsiPortInitialize(
-  IN PVOID  Argument1,
-  IN PVOID  Argument2,
-  IN struct _HW_INITIALIZATION_DATA  *HwInitializationData,
-  IN PVOID  HwContext  OPTIONAL);
+  __W32_IN PVOID  Argument1,
+  __W32_IN PVOID  Argument2,
+  __W32_IN struct _HW_INITIALIZATION_DATA  *HwInitializationData,
+  __W32_IN PVOID  HwContext  __W32_OPTIONAL);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortIoMapTransfer(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb,
-  IN ULONG  LogicalAddress,
-  IN ULONG  Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb,
+  __W32_IN ULONG  LogicalAddress,
+  __W32_IN ULONG  Length);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortLogError(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb  OPTIONAL,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  ErrorCode,
-  IN ULONG  UniqueId);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb  __W32_OPTIONAL,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN ULONG  ErrorCode,
+  __W32_IN ULONG  UniqueId);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortMoveMemory(
-  IN PVOID  WriteBuffer,
-  IN PVOID  ReadBuffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  WriteBuffer,
+  __W32_IN PVOID  ReadBuffer,
+  __W32_IN ULONG  Length);
 
 SCSIPORTAPI
 VOID
 DDKCDECLAPI
 ScsiPortNotification(
-  IN SCSI_NOTIFICATION_TYPE  NotificationType,
-  IN PVOID  HwDeviceExtension,
-  IN ...);
+  __W32_IN SCSI_NOTIFICATION_TYPE  NotificationType,
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ...);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
+  __W32_OUT PLARGE_INTEGER  CurrentTime);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortReadPortBufferUchar(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Port,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortReadPortBufferUlong(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Port,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortReadPortBufferUshort(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Port,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 UCHAR
 DDKAPI
 ScsiPortReadPortUchar(
-  IN PUCHAR  Port);
+  __W32_IN PUCHAR  Port);
 
 SCSIPORTAPI
 ULONG
 DDKAPI
 ScsiPortReadPortUlong(
-  IN PULONG  Port);
+  __W32_IN PULONG  Port);
 
 SCSIPORTAPI
 USHORT
 DDKAPI
 ScsiPortReadPortUshort(
-  IN PUSHORT  Port);
+  __W32_IN PUSHORT  Port);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortReadRegisterBufferUchar(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Register,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortReadRegisterBufferUlong(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Register,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortReadRegisterBufferUshort(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Register,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 UCHAR
 DDKAPI
 ScsiPortReadRegisterUchar(
-  IN PUCHAR  Register);
+  __W32_IN PUCHAR  Register);
 
 SCSIPORTAPI
 ULONG
 DDKAPI
 ScsiPortReadRegisterUlong(
-  IN PULONG  Register);
+  __W32_IN PULONG  Register);
 
 SCSIPORTAPI
 USHORT
 DDKAPI
 ScsiPortReadRegisterUshort(
-  IN PUSHORT  Register);
+  __W32_IN PUSHORT  Register);
 
 SCSIPORTAPI
 ULONG
 DDKAPI
 ScsiPortSetBusDataByOffset(
-  IN PVOID  DeviceExtension,
-  IN ULONG  BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN PVOID  DeviceExtension,
+  __W32_IN ULONG  BusDataType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortStallExecution(
-  IN ULONG  Delay);
+  __W32_IN ULONG  Delay);
 
 SCSIPORTAPI
 BOOLEAN
 DDKAPI
 ScsiPortValidateRange(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN SCSI_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN INTERFACE_TYPE  BusType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN SCSI_PHYSICAL_ADDRESS  IoAddress,
+  __W32_IN ULONG  NumberOfBytes,
+  __W32_IN BOOLEAN  InIoSpace);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWritePortBufferUchar(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Port,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWritePortBufferUlong(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Port,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWritePortBufferUshort(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Port,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWritePortUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
+  __W32_IN PUCHAR  Port,
+  __W32_IN UCHAR  Value);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWritePortUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
+  __W32_IN PULONG  Port,
+  __W32_IN ULONG  Value);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWritePortUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Port,
+  __W32_IN USHORT  Value);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWriteRegisterBufferUchar(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Register,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWriteRegisterBufferUlong(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Register,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWriteRegisterBufferUshort(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Register,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWriteRegisterUchar(
-  IN PUCHAR  Register,
-  IN ULONG  Value);
+  __W32_IN PUCHAR  Register,
+  __W32_IN ULONG  Value);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWriteRegisterUlong(
-  IN PULONG  Register,
-  IN ULONG  Value);
+  __W32_IN PULONG  Register,
+  __W32_IN ULONG  Value);
 
 SCSIPORTAPI
 VOID
 DDKAPI
 ScsiPortWriteRegisterUshort(
-  IN PUSHORT  Register,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Register,
+  __W32_IN USHORT  Value);
 
 SCSIPORTAPI
 VOID
 DDKCDECLAPI
 ScsiDebugPrint(
-  IN ULONG DebugPrintLevel,
-  IN PCCHAR DebugMessage,
-  IN ...);
+  __W32_IN ULONG DebugPrintLevel,
+  __W32_IN PCCHAR DebugMessage,
+  __W32_IN ...);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/storport.h w32api-3.6/include/ddk/storport.h
--- w32api-3.6.orig/include/ddk/storport.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/storport.h	2006-02-06 16:41:14.000000000 +1030
@@ -44,15 +44,15 @@
 typedef PHYSICAL_ADDRESS STOR_PHYSICAL_ADDRESS;
 
 typedef struct _STOR_SCATTER_GATHER_ELEMENT {
-	STOR_PHYSICAL_ADDRESS  PhysicalAddress;
-	ULONG  Length;
-	ULONG_PTR  Reserved;
+  STOR_PHYSICAL_ADDRESS  PhysicalAddress;
+  ULONG  Length;
+  ULONG_PTR  Reserved;
 } STOR_SCATTER_GATHER_ELEMENT, *PSTOR_SCATTER_GATHER_ELEMENT;
 
 typedef struct _STOR_SCATTER_GATHER_LIST {
-    ULONG  NumberOfElements;
-    ULONG_PTR  Reserved;
-    STOR_SCATTER_GATHER_ELEMENT  List[0];
+  ULONG  NumberOfElements;
+  ULONG_PTR  Reserved;
+  STOR_SCATTER_GATHER_ELEMENT  List[0];
 } STOR_SCATTER_GATHER_LIST, *PSTOR_SCATTER_GATHER_LIST;
 
 typedef struct _SCSI_WMI_REQUEST_BLOCK {
@@ -83,331 +83,331 @@
 ULONG
 DDKAPI
 StorPortInitialize(
-  IN PVOID  Argument1,
-  IN PVOID  Argument2,
-  IN PHW_INITIALIZATION_DATA  HwInitializationData,
-  IN PVOID  Unused);
+  __W32_IN PVOID  Argument1,
+  __W32_IN PVOID  Argument2,
+  __W32_IN PHW_INITIALIZATION_DATA  HwInitializationData,
+  __W32_IN PVOID  Unused);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortFreeDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  MappedAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  MappedAddress);
 
 STORPORTAPI
 ULONG
 DDKAPI
 StorPortGetBusData(
-  IN PVOID  DeviceExtension,
-  IN ULONG  BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  DeviceExtension,
+  __W32_IN ULONG  BusDataType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 STORPORTAPI
 ULONG
 DDKAPI
 StorPortSetBusDataByOffset(
-  IN PVOID  DeviceExtension,
-  IN ULONG   BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN PVOID  DeviceExtension,
+  __W32_IN ULONG   BusDataType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 STORPORTAPI
 PVOID
 DDKAPI
 StorPortGetDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN SCSI_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN INTERFACE_TYPE  BusType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN SCSI_PHYSICAL_ADDRESS  IoAddress,
+  __W32_IN ULONG  NumberOfBytes,
+  __W32_IN BOOLEAN  InIoSpace);
 
 STORPORTAPI
 PVOID
 DDKAPI
 StorPortGetLogicalUnit(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun);
 
 STORPORTAPI
 PSCSI_REQUEST_BLOCK
 DDKAPI
 StorPortGetSrb(
-  IN PVOID  DeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN LONG  QueueTag);
+  __W32_IN PVOID  DeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN LONG  QueueTag);
 
 STORPORTAPI
 STOR_PHYSICAL_ADDRESS
 DDKAPI
 StorPortGetPhysicalAddress(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb,
-  IN PVOID  VirtualAddress,
-  OUT ULONG  *Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_OUT ULONG  *Length);
 
 STORPORTAPI
 PVOID
 DDKAPI
 StorPortGetVirtualAddress(
-  IN PVOID  HwDeviceExtension,
-  IN STOR_PHYSICAL_ADDRESS  PhysicalAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN STOR_PHYSICAL_ADDRESS  PhysicalAddress);
 
 STORPORTAPI
 PVOID
 DDKAPI
 StorPortGetUncachedExtension(
-  IN PVOID HwDeviceExtension,
-  IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
-  IN ULONG NumberOfBytes);
+  __W32_IN PVOID HwDeviceExtension,
+  __W32_IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
+  __W32_IN ULONG NumberOfBytes);
 
 STORPORTAPI
 VOID
 DDKCDECLAPI
 StorPortNotification(
-  IN SCSI_NOTIFICATION_TYPE  NotificationType,
-  IN PVOID  HwDeviceExtension,
-  IN ...);
+  __W32_IN SCSI_NOTIFICATION_TYPE  NotificationType,
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ...);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortLogError(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb OPTIONAL,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  ErrorCode,
-  IN ULONG  UniqueId);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb __W32_OPTIONAL,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN ULONG  ErrorCode,
+  __W32_IN ULONG  UniqueId);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortCompleteRequest(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN UCHAR  SrbStatus);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN UCHAR  SrbStatus);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortMoveMemory(
-  IN PVOID  WriteBuffer,
-  IN PVOID  ReadBuffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  WriteBuffer,
+  __W32_IN PVOID  ReadBuffer,
+  __W32_IN ULONG  Length);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortStallExecution(
-  IN ULONG  Delay);
+  __W32_IN ULONG  Delay);
 
 STORPORTAPI
 STOR_PHYSICAL_ADDRESS
 DDKAPI
 StorPortConvertUlong64ToPhysicalAddress(
-  IN ULONG64  UlongAddress);
+  __W32_IN ULONG64  UlongAddress);
 
 STORPORTAPI
 ULONG64
 DDKAPI
 StorPortConvertPhysicalAddressToUlong64(
-  IN STOR_PHYSICAL_ADDRESS  Address);
+  __W32_IN STOR_PHYSICAL_ADDRESS  Address);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortValidateRange(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN STOR_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN INTERFACE_TYPE  BusType,
+  __W32_IN ULONG  SystemIoBusNumber,
+  __W32_IN STOR_PHYSICAL_ADDRESS  IoAddress,
+  __W32_IN ULONG  NumberOfBytes,
+  __W32_IN BOOLEAN  InIoSpace);
 
 STORPORTAPI
 VOID
 DDKCDECLAPI
 StorPortDebugPrint(
-  IN ULONG  DebugPrintLevel,
-  IN PCCHAR  DebugMessage,
-  IN ...);
+  __W32_IN ULONG  DebugPrintLevel,
+  __W32_IN PCCHAR  DebugMessage,
+  __W32_IN ...);
 
 STORPORTAPI
 UCHAR
 DDKAPI
 StorPortReadPortUchar(
-  IN PUCHAR  Port);
+  __W32_IN PUCHAR  Port);
 
 STORPORTAPI
 ULONG
 DDKAPI
 StorPortReadPortUlong(
-  IN PULONG  Port);
+  __W32_IN PULONG  Port);
 
 STORPORTAPI
 USHORT
 DDKAPI
 StorPortReadPortUshort(
-  IN PUSHORT  Port);
+  __W32_IN PUSHORT  Port);
 
 STORPORTAPI
 UCHAR
 DDKAPI
 StorPortReadRegisterUchar(
-  IN PUCHAR  Register);
+  __W32_IN PUCHAR  Register);
 
 STORPORTAPI
 ULONG
 DDKAPI
 StorPortReadRegisterUlong(
-  IN PULONG  Register);
+  __W32_IN PULONG  Register);
 
 STORPORTAPI
 USHORT
 DDKAPI
 StorPortReadRegisterUshort(
-  IN PUSHORT  Register);
+  __W32_IN PUSHORT  Register);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortWritePortUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
+  __W32_IN PUCHAR  Port,
+  __W32_IN UCHAR  Value);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortWritePortUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
+  __W32_IN PULONG  Port,
+  __W32_IN ULONG  Value);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortWritePortUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Port,
+  __W32_IN USHORT  Value);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortWriteRegisterUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
+  __W32_IN PUCHAR  Port,
+  __W32_IN UCHAR  Value);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortWriteRegisterUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
+  __W32_IN PULONG  Port,
+  __W32_IN ULONG  Value);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortWriteRegisterUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Port,
+  __W32_IN USHORT  Value);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortPauseDevice(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  TimeOut);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN ULONG  TimeOut);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortResumeDevice(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortPause(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  TimeOut);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  TimeOut);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortResume(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortDeviceBusy(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  RequestsToComplete);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun,
+  __W32_IN ULONG  RequestsToComplete);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortDeviceReady(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN UCHAR  PathId,
+  __W32_IN UCHAR  TargetId,
+  __W32_IN UCHAR  Lun);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortBusy(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  RequestsToComplete);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  RequestsToComplete);
 
 STORPORTAPI
 BOOLEAN
 DDKAPI
 StorPortReady(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 STORPORTAPI
 PSTOR_SCATTER_GATHER_LIST
 DDKAPI
 StorPortGetScatterGatherList(
-  IN PVOID  DeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb);
+  __W32_IN PVOID  DeviceExtension,
+  __W32_IN PSCSI_REQUEST_BLOCK  Srb);
 
 typedef BOOLEAN DDKAPI
 (*PSTOR_SYNCHRONIZED_ACCESS)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Context);
 
 STORPORTAPI
 VOID
 DDKAPI
 StorPortSynchronizeAccess(
-  IN PVOID  HwDeviceExtension,
-  IN PSTOR_SYNCHRONIZED_ACCESS  SynchronizedAccessRoutine,
-  IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSTOR_SYNCHRONIZED_ACCESS  SynchronizedAccessRoutine,
+  __W32_IN PVOID  Context);
 
 #ifdef DBG
 #define DebugPrint(x) StorPortDebugPrint x
diff -ru w32api-3.6.orig/include/ddk/tdikrnl.h w32api-3.6/include/ddk/tdikrnl.h
--- w32api-3.6.orig/include/ddk/tdikrnl.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/tdikrnl.h	2006-02-06 16:41:14.000000000 +1030
@@ -163,232 +163,232 @@
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_CONNECT)(
-  IN PVOID  TdiEventContext,
-  IN LONG  RemoteAddressLength,
-  IN PVOID  RemoteAddress,
-  IN LONG  UserDataLength,
-  IN PVOID  UserData,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  OUT CONNECTION_CONTEXT  *ConnectionContext,
-  OUT PIRP  *AcceptIrp);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN LONG  RemoteAddressLength,
+  __W32_IN PVOID  RemoteAddress,
+  __W32_IN LONG  UserDataLength,
+  __W32_IN PVOID  UserData,
+  __W32_IN LONG  OptionsLength,
+  __W32_IN PVOID  Options,
+  __W32_OUT CONNECTION_CONTEXT  *ConnectionContext,
+  __W32_OUT PIRP  *AcceptIrp);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultConnectHandler(
-  IN PVOID  TdiEventContext,
-  IN LONG  RemoteAddressLength,
-  IN PVOID  RemoteAddress,
-  IN LONG  UserDataLength,
-  IN PVOID  UserData,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  OUT CONNECTION_CONTEXT *ConnectionContext,
-  OUT PIRP  *AcceptIrp);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN LONG  RemoteAddressLength,
+  __W32_IN PVOID  RemoteAddress,
+  __W32_IN LONG  UserDataLength,
+  __W32_IN PVOID  UserData,
+  __W32_IN LONG  OptionsLength,
+  __W32_IN PVOID  Options,
+  __W32_OUT CONNECTION_CONTEXT *ConnectionContext,
+  __W32_OUT PIRP  *AcceptIrp);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_DISCONNECT)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN LONG  DisconnectDataLength,
-  IN PVOID  DisconnectData,
-  IN LONG  DisconnectInformationLength,
-  IN PVOID  DisconnectInformation,
-  IN ULONG  DisconnectFlags);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN LONG  DisconnectDataLength,
+  __W32_IN PVOID  DisconnectData,
+  __W32_IN LONG  DisconnectInformationLength,
+  __W32_IN PVOID  DisconnectInformation,
+  __W32_IN ULONG  DisconnectFlags);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultDisconnectHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN LONG  DisconnectDataLength,
-  IN PVOID  DisconnectData,
-  IN LONG  DisconnectInformationLength,
-  IN PVOID  DisconnectInformation,
-  IN ULONG  DisconnectFlags);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN LONG  DisconnectDataLength,
+  __W32_IN PVOID  DisconnectData,
+  __W32_IN LONG  DisconnectInformationLength,
+  __W32_IN PVOID  DisconnectInformation,
+  __W32_IN ULONG  DisconnectFlags);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_ERROR)(
-  IN PVOID  TdiEventContext,
-  IN NTSTATUS  Status);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN NTSTATUS  Status);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_ERROR_EX)(
-  IN PVOID  TdiEventContext,
-  IN NTSTATUS  Status,
-  IN PVOID  Buffer);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN NTSTATUS  Status,
+  __W32_IN PVOID  Buffer);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultErrorHandler(
-  IN PVOID  TdiEventContext,
-  IN NTSTATUS  Status);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN NTSTATUS  Status);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_RECEIVE)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  BytesIndicated,
+  __W32_IN ULONG  BytesAvailable,
+  __W32_OUT ULONG  *BytesTaken,
+  __W32_IN PVOID  Tsdu,
+  __W32_OUT PIRP  *IoRequestPacket);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultReceiveHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  BytesIndicated,
+  __W32_IN ULONG  BytesAvailable,
+  __W32_OUT ULONG  *BytesTaken,
+  __W32_IN PVOID  Tsdu,
+  __W32_OUT PIRP  *IoRequestPacket);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_RECEIVE_DATAGRAM)(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN LONG  SourceAddressLength,
+  __W32_IN PVOID  SourceAddress,
+  __W32_IN LONG  OptionsLength,
+  __W32_IN PVOID  Options,
+  __W32_IN ULONG  ReceiveDatagramFlags,
+  __W32_IN ULONG  BytesIndicated,
+  __W32_IN ULONG  BytesAvailable,
+  __W32_OUT ULONG  *BytesTaken,
+  __W32_IN PVOID  Tsdu,
+  __W32_OUT PIRP  *IoRequestPacket);
 
 TDIKRNLAPI
 NTSTATUS DDKAPI
 TdiDefaultRcvDatagramHandler(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN LONG  SourceAddressLength,
+  __W32_IN PVOID  SourceAddress,
+  __W32_IN LONG  OptionsLength,
+  __W32_IN PVOID  Options,
+  __W32_IN ULONG  ReceiveDatagramFlags,
+  __W32_IN ULONG  BytesIndicated,
+  __W32_IN ULONG  BytesAvailable,
+  __W32_OUT ULONG  *BytesTaken,
+  __W32_IN PVOID  Tsdu,
+  __W32_OUT PIRP  *IoRequestPacket);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_RECEIVE_EXPEDITED)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  BytesIndicated,
+  __W32_IN ULONG  BytesAvailable,
+  __W32_OUT ULONG  *BytesTaken,
+  __W32_IN PVOID  Tsdu,
+  __W32_OUT PIRP  *IoRequestPacket);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultRcvExpeditedHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  BytesIndicated,
+  __W32_IN ULONG  BytesAvailable,
+  __W32_OUT ULONG  *BytesTaken,
+  __W32_IN PVOID  Tsdu,
+  __W32_OUT PIRP  *IoRequestPacket);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_CHAINED_RECEIVE)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  ReceiveLength,
+  __W32_IN ULONG  StartingOffset,
+  __W32_IN PMDL  Tsdu,
+  __W32_IN PVOID  TsduDescriptor);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultChainedReceiveHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  ReceiveLength,
+  __W32_IN ULONG  StartingOffset,
+  __W32_IN PMDL  Tsdu,
+  __W32_IN PVOID  TsduDescriptor);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_CHAINED_RECEIVE_DATAGRAM)(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  ReceiveDatagramLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN LONG  SourceAddressLength,
+  __W32_IN PVOID  SourceAddress,
+  __W32_IN LONG  OptionsLength,
+  __W32_IN PVOID  Options,
+  __W32_IN ULONG  ReceiveDatagramFlags,
+  __W32_IN ULONG  ReceiveDatagramLength,
+  __W32_IN ULONG  StartingOffset,
+  __W32_IN PMDL  Tsdu,
+  __W32_IN PVOID  TsduDescriptor);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultChainedRcvDatagramHandler(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  ReceiveDatagramLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN LONG  SourceAddressLength,
+  __W32_IN PVOID  SourceAddress,
+  __W32_IN LONG  OptionsLength,
+  __W32_IN PVOID  Options,
+  __W32_IN ULONG  ReceiveDatagramFlags,
+  __W32_IN ULONG  ReceiveDatagramLength,
+  __W32_IN ULONG  StartingOffset,
+  __W32_IN PMDL  Tsdu,
+  __W32_IN PVOID  TsduDescriptor);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_CHAINED_RECEIVE_EXPEDITED)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  ReceiveLength,
+  __W32_IN ULONG  StartingOffset,
+  __W32_IN PMDL  Tsdu,
+  __W32_IN PVOID  TsduDescriptor);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultChainedRcvExpeditedHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN CONNECTION_CONTEXT  ConnectionContext,
+  __W32_IN ULONG  ReceiveFlags,
+  __W32_IN ULONG  ReceiveLength,
+  __W32_IN ULONG  StartingOffset,
+  __W32_IN PMDL  Tsdu,
+  __W32_IN PVOID  TsduDescriptor);
 
 typedef NTSTATUS DDKAPI
 (*PTDI_IND_SEND_POSSIBLE)(
-  IN PVOID  TdiEventContext,
-  IN PVOID  ConnectionContext,
-  IN ULONG  BytesAvailable);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN PVOID  ConnectionContext,
+  __W32_IN ULONG  BytesAvailable);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDefaultSendPossibleHandler(
-  IN PVOID  TdiEventContext,
-  IN PVOID  ConnectionContext,
-  IN ULONG  BytesAvailable);
+  __W32_IN PVOID  TdiEventContext,
+  __W32_IN PVOID  ConnectionContext,
+  __W32_IN ULONG  BytesAvailable);
 
 
 
@@ -410,13 +410,13 @@
 /*
  * VOID
  * TdiBuildAccept(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
+ *   __W32_OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo);
  */
 #define TdiBuildAccept(                                             \
   Irp, DevObj, FileObj, CompRoutine, Contxt,                        \
@@ -438,12 +438,12 @@
 /*
  * VOID
  * TdiBuildAction(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PMDL  MdlAddr);
  */
 #define TdiBuildAction(                               \
   Irp, DevObj, FileObj, CompRoutine, Contxt, MdlAddr) \
@@ -461,12 +461,12 @@
 /*
  * VOID
  * TdiBuildAssociateAddress(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN HANDLE  AddrHandle);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN HANDLE  AddrHandle);
  */
 #define TdiBuildAssociateAddress(                                \
   Irp, DevObj, FileObj, CompRoutine, Contxt, AddrHandle)         \
@@ -486,14 +486,14 @@
 /*
  * VOID
  * TdiBuildConnect(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PLARGE_INTEGER  Time,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo); 
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PLARGE_INTEGER  Time,
+ *   __W32_IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
+ *   __W32_OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo);
  */
 #define TdiBuildConnect(                                            \
   Irp, DevObj, FileObj, CompRoutine, Contxt,                        \
@@ -516,11 +516,11 @@
 /*
  * VOID
  * TdiBuildDisassociateAddress(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt);
  */
 #define TdiBuildDisassociateAddress(                                \
   Irp, DevObj, FileObj, CompRoutine, Contxt)                        \
@@ -536,15 +536,15 @@
 /*
  * VOID
  * TdiBuildDisconnect(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PLARGE_INTEGER  Time,
- *   IN PULONG  Flags,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo); 
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PLARGE_INTEGER  Time,
+ *   __W32_IN PULONG  Flags,
+ *   __W32_IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
+ *   __W32_OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo);
  */
 #define TdiBuildDisconnect(                                         \
   Irp, DevObj, FileObj, CompRoutine, Contxt, Time,                  \
@@ -568,31 +568,31 @@
 /*
  * PIRP
  * TdiBuildInternalDeviceControlIrp(
- *   IN CCHAR IrpSubFunction,
- *   IN PDEVICE_OBJECT DeviceObject,
- *   IN PFILE_OBJECT FileObject,
- *   IN PKEVENT Event,
- *   IN PIO_STATUS_BLOCK IoStatusBlock);
+ *   __W32_IN CCHAR IrpSubFunction,
+ *   __W32_IN PDEVICE_OBJECT DeviceObject,
+ *   __W32_IN PFILE_OBJECT FileObject,
+ *   __W32_IN PKEVENT Event,
+ *   __W32_IN PIO_STATUS_BLOCK IoStatusBlock);
  */
 #define TdiBuildInternalDeviceControlIrp( \
   IrpSubFunction, DeviceObject,           \
   FileObject, Event, IoStatusBlock)       \
   IoBuildDeviceIoControlRequest(          \
-		0x00000003, DeviceObject,             \
-		NULL, 0, NULL, 0,                     \
-		TRUE, Event, IoStatusBlock)
+    0x00000003, DeviceObject,             \
+    NULL, 0, NULL, 0,                     \
+    TRUE, Event, IoStatusBlock)
 
 /*
  * VOID
  * TdiBuildListen(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN ULONG  Flags,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo); 
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN ULONG  Flags,
+ *   __W32_IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
+ *   __W32_OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo);
  */
 #define TdiBuildListen(                                             \
   Irp, DevObj, FileObj, CompRoutine, Contxt,                        \
@@ -616,28 +616,28 @@
 VOID
 DDKAPI
 TdiBuildNetbiosAddress(
-	IN PUCHAR  NetbiosName,
-	IN BOOLEAN  IsGroupName,
-	IN OUT PTA_NETBIOS_ADDRESS  NetworkName);
+  __W32_IN PUCHAR  NetbiosName,
+  __W32_IN BOOLEAN  IsGroupName,
+  __W32_IN __W32_OUT PTA_NETBIOS_ADDRESS  NetworkName);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiBuildNetbiosAddressEa(
-  IN PUCHAR  Buffer,
-  IN BOOLEAN  IsGroupName,
-  IN PUCHAR  NetbiosName);
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN BOOLEAN  IsGroupName,
+  __W32_IN PUCHAR  NetbiosName);
 
 /*
  * VOID
  * TdiBuildQueryInformation(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN UINT  QType,
- *   IN PMDL  MdlAddr);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN UINT  QType,
+ *   __W32_IN PMDL  MdlAddr);
  */
 #define TdiBuildQueryInformation(                                        \
   Irp, DevObj, FileObj, CompRoutine, Contxt, QType, MdlAddr)             \
@@ -659,14 +659,14 @@
 /*
  * VOID
  * TdiBuildReceive(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  InFlags, 
- *   IN ULONG  ReceiveLen); 
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PMDL  MdlAddr,
+ *   __W32_IN ULONG  InFlags,
+ *   __W32_IN ULONG  ReceiveLen);
  */
 #define TdiBuildReceive(                                       \
   Irp, DevObj, FileObj, CompRoutine, Contxt,                   \
@@ -689,16 +689,16 @@
 /*
  * VOID
  * TdiBuildReceiveDatagram(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  ReceiveLen,
- *   IN PTDI_CONNECTION_INFORMATION  ReceiveDatagramInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnInfo,
- *   ULONG InFlags); 
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PMDL  MdlAddr,
+ *   __W32_IN ULONG  ReceiveLen,
+ *   __W32_IN PTDI_CONNECTION_INFORMATION  ReceiveDatagramInfo,
+ *   __W32_OUT PTDI_CONNECTION_INFORMATION  ReturnInfo,
+ *   ULONG InFlags);
  */
 #define TdiBuildReceiveDatagram(                                 \
   Irp, DevObj, FileObj, CompRoutine, Contxt, MdlAddr,            \
@@ -723,14 +723,14 @@
 /*
  * VOID
  * TdiBuildSend(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  InFlags,
- *   IN ULONG  SendLen);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PMDL  MdlAddr,
+ *   __W32_IN ULONG  InFlags,
+ *   __W32_IN ULONG  SendLen);
  */
 #define TdiBuildSend(                                       \
   Irp, DevObj, FileObj, CompRoutine, Contxt,                \
@@ -753,14 +753,14 @@
 /*
  * VOID
  * TdiBuildSendDatagram(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  SendLen,
- *   IN PTDI_CONNECTION_INFORMATION  SendDatagramInfo); 
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN PMDL  MdlAddr,
+ *   __W32_IN ULONG  SendLen,
+ *   __W32_IN PTDI_CONNECTION_INFORMATION  SendDatagramInfo);
  */
 #define TdiBuildSendDatagram(                                 \
   Irp, DevObj, FileObj, CompRoutine, Contxt,                  \
@@ -783,14 +783,14 @@
 /*
  * VOID
  * TdiBuildSetEventHandler(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN INT  InEventType,
- *   IN PVOID  InEventHandler,
- *   IN PVOID  InEventContext);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN INT  InEventType,
+ *   __W32_IN PVOID  InEventHandler,
+ *   __W32_IN PVOID  InEventContext);
  */
 #define TdiBuildSetEventHandler(                                 \
   Irp, DevObj, FileObj, CompRoutine, Contxt,                     \
@@ -813,13 +813,13 @@
 /*
  * VOID
  * TdiBuildSetInformation(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN UINT  SType,
- *   IN PMDL  MdlAddr);
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDEVICE_OBJECT  DevObj,
+ *   __W32_IN PFILE_OBJECT  FileObj,
+ *   __W32_IN PVOID  CompRoutine,
+ *   __W32_IN PVOID  Contxt,
+ *   __W32_IN UINT  SType,
+ *   __W32_IN PMDL  MdlAddr);
  */
 #define TdiBuildSetInformation(                                        \
   Irp, DevObj, FileObj, CompRoutine, Contxt, SType, MdlAddr)           \
@@ -873,49 +873,49 @@
 
 typedef VOID DDKAPI
 (*TDI_ADD_ADDRESS_HANDLER)(
-  IN PTA_ADDRESS  Address);
+  __W32_IN PTA_ADDRESS  Address);
 
 typedef VOID DDKAPI
 (*TDI_ADD_ADDRESS_HANDLER_V2)(
-  IN PTA_ADDRESS  Address,
-  IN PUNICODE_STRING  DeviceName,
-  IN PTDI_PNP_CONTEXT  Context);
+  __W32_IN PTA_ADDRESS  Address,
+  __W32_IN PUNICODE_STRING  DeviceName,
+  __W32_IN PTDI_PNP_CONTEXT  Context);
 
 typedef VOID DDKAPI
 (*TDI_BINDING_HANDLER)(
-  IN TDI_PNP_OPCODE  PnPOpcode,
-  IN PUNICODE_STRING  DeviceName,
-  IN PWSTR  MultiSZBindList);
+  __W32_IN TDI_PNP_OPCODE  PnPOpcode,
+  __W32_IN PUNICODE_STRING  DeviceName,
+  __W32_IN PWSTR  MultiSZBindList);
 
 typedef VOID DDKAPI
 (*TDI_BIND_HANDLER)(
-  IN PUNICODE_STRING  DeviceName);
+  __W32_IN PUNICODE_STRING  DeviceName);
 
 typedef VOID DDKAPI
 (*TDI_DEL_ADDRESS_HANDLER)(
-  IN PTA_ADDRESS  Address);
+  __W32_IN PTA_ADDRESS  Address);
 
 typedef VOID DDKAPI
 (*TDI_DEL_ADDRESS_HANDLER_V2)(
-  IN PTA_ADDRESS  Address,
-  IN PUNICODE_STRING  DeviceName,
-  IN PTDI_PNP_CONTEXT  Context);
+  __W32_IN PTA_ADDRESS  Address,
+  __W32_IN PUNICODE_STRING  DeviceName,
+  __W32_IN PTDI_PNP_CONTEXT  Context);
 
 typedef NTSTATUS DDKAPI
 (*TDI_PNP_POWER_HANDLER)(
-  IN PUNICODE_STRING  DeviceName,
-  IN PNET_PNP_EVENT  PowerEvent,
-  IN PTDI_PNP_CONTEXT  Context1,
-  IN PTDI_PNP_CONTEXT  Context2);
+  __W32_IN PUNICODE_STRING  DeviceName,
+  __W32_IN PNET_PNP_EVENT  PowerEvent,
+  __W32_IN PTDI_PNP_CONTEXT  Context1,
+  __W32_IN PTDI_PNP_CONTEXT  Context2);
 
 typedef VOID DDKAPI
 (*TDI_UNBIND_HANDLER)(
-  IN PUNICODE_STRING  DeviceName);
+  __W32_IN PUNICODE_STRING  DeviceName);
 
 typedef VOID DDKAPI
 (*ProviderPnPPowerComplete)(
-  IN PNET_PNP_EVENT  NetEvent,
-  IN NTSTATUS  ProviderStatus);
+  __W32_IN PNET_PNP_EVENT  NetEvent,
+  __W32_IN NTSTATUS  ProviderStatus);
 
 typedef struct _TDI20_CLIENT_INTERFACE_INFO {
   _ANONYMOUS_UNION union {
@@ -956,8 +956,8 @@
 /*
  * VOID
  * TdiCompleteRequest(
- *   IN PIRP Irp,
- *   IN NTSTATUS Status);
+ *   __W32_IN PIRP Irp,
+ *   __W32_IN NTSTATUS Status);
  */
 #define TdiCompleteRequest(Irp, Status)           \
 {                                                 \
@@ -969,20 +969,20 @@
 NTSTATUS
 DDKAPI
 TdiCopyBufferToMdl(
-  IN PVOID  SourceBuffer,
-  IN ULONG  SourceOffset,
-  IN ULONG  SourceBytesToCopy,
-  IN PMDL  DestinationMdlChain,
-  IN ULONG  DestinationOffset,
-  IN PULONG  BytesCopied);
+  __W32_IN PVOID  SourceBuffer,
+  __W32_IN ULONG  SourceOffset,
+  __W32_IN ULONG  SourceBytesToCopy,
+  __W32_IN PMDL  DestinationMdlChain,
+  __W32_IN ULONG  DestinationOffset,
+  __W32_IN PULONG  BytesCopied);
 
 /*
  * VOID
  * TdiCopyLookaheadData(
- *   IN PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length,
- *   IN ULONG  ReceiveFlags);
+ *   __W32_IN PVOID  Destination,
+ *   __W32_IN PVOID  Source,
+ *   __W32_IN ULONG  Length,
+ *   __W32_IN ULONG  ReceiveFlags);
  */
 #define TdiCopyLookaheadData(Destination, Source, Length, ReceiveFlags) \
   RtlCopyMemory(Destination, Source, Length)
@@ -991,58 +991,58 @@
 NTSTATUS
 DDKAPI
 TdiCopyMdlChainToMdlChain (
-  IN PMDL  SourceMdlChain,
-  IN ULONG  SourceOffset,
-  IN PMDL  DestinationMdlChain,
-  IN ULONG  DestinationOffset,
-  OUT PULONG  BytesCopied);
+  __W32_IN PMDL  SourceMdlChain,
+  __W32_IN ULONG  SourceOffset,
+  __W32_IN PMDL  DestinationMdlChain,
+  __W32_IN ULONG  DestinationOffset,
+  __W32_OUT PULONG  BytesCopied);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiCopyMdlToBuffer(
-  IN PMDL  SourceMdlChain,
-  IN ULONG  SourceOffset,
-  IN PVOID  DestinationBuffer,
-  IN ULONG  DestinationOffset,
-  IN ULONG  DestinationBufferSize,
-  OUT PULONG  BytesCopied);
+  __W32_IN PMDL  SourceMdlChain,
+  __W32_IN ULONG  SourceOffset,
+  __W32_IN PVOID  DestinationBuffer,
+  __W32_IN ULONG  DestinationOffset,
+  __W32_IN ULONG  DestinationBufferSize,
+  __W32_OUT PULONG  BytesCopied);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDeregisterAddressChangeHandler(
-  IN HANDLE  BindingHandle);
+  __W32_IN HANDLE  BindingHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDeregisterDeviceObject(
-  IN HANDLE  DevRegistrationHandle);
+  __W32_IN HANDLE  DevRegistrationHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDeregisterNetAddress(
-  IN HANDLE  AddrRegistrationHandle);
+  __W32_IN HANDLE  AddrRegistrationHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDeregisterPnPHandlers(
-  IN HANDLE  BindingHandle);
+  __W32_IN HANDLE  BindingHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiDeregisterProvider(
-  IN HANDLE  ProviderHandle);
+  __W32_IN HANDLE  ProviderHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiEnumerateAddresses(
-  IN HANDLE  BindingHandle);
+  __W32_IN HANDLE  BindingHandle);
 
 TDIKRNLAPI
 VOID
@@ -1054,106 +1054,106 @@
 VOID
 DDKAPI
 TdiMapBuffer(
-  IN PMDL  MdlChain);
+  __W32_IN PMDL  MdlChain);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiMapUserRequest(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN PIO_STACK_LOCATION  IrpSp);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp,
+  __W32_IN PIO_STACK_LOCATION  IrpSp);
 
 TDIKRNLAPI
 BOOLEAN
 DDKAPI
 TdiMatchPdoWithChainedReceiveContext(
-  IN PVOID TsduDescriptor,
-  IN PVOID PDO);
+  __W32_IN PVOID TsduDescriptor,
+  __W32_IN PVOID PDO);
 
 TDIKRNLAPI
 VOID
 DDKAPI
 TdiPnPPowerComplete(
-  IN HANDLE  BindingHandle,
-  IN PNET_PNP_EVENT  PowerEvent,
-  IN NTSTATUS  Status);
+  __W32_IN HANDLE  BindingHandle,
+  __W32_IN PNET_PNP_EVENT  PowerEvent,
+  __W32_IN NTSTATUS  Status);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiPnPPowerRequest(
-  IN PUNICODE_STRING  DeviceName,
-  IN PNET_PNP_EVENT  PowerEvent,
-  IN PTDI_PNP_CONTEXT  Context1,
-  IN PTDI_PNP_CONTEXT  Context2,
-  IN ProviderPnPPowerComplete  ProtocolCompletionHandler);
+  __W32_IN PUNICODE_STRING  DeviceName,
+  __W32_IN PNET_PNP_EVENT  PowerEvent,
+  __W32_IN PTDI_PNP_CONTEXT  Context1,
+  __W32_IN PTDI_PNP_CONTEXT  Context2,
+  __W32_IN ProviderPnPPowerComplete  ProtocolCompletionHandler);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiProviderReady(
-  IN HANDLE  ProviderHandle);
+  __W32_IN HANDLE  ProviderHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiRegisterAddressChangeHandler(
-  IN TDI_ADD_ADDRESS_HANDLER  AddHandler,
-  IN TDI_DEL_ADDRESS_HANDLER  DeleteHandler,
-  OUT HANDLE  *BindingHandle);
+  __W32_IN TDI_ADD_ADDRESS_HANDLER  AddHandler,
+  __W32_IN TDI_DEL_ADDRESS_HANDLER  DeleteHandler,
+  __W32_OUT HANDLE  *BindingHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiRegisterDeviceObject(
-  IN PUNICODE_STRING  DeviceName,
-  OUT HANDLE  *DevRegistrationHandle);
+  __W32_IN PUNICODE_STRING  DeviceName,
+  __W32_OUT HANDLE  *DevRegistrationHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiRegisterNetAddress(
-  IN PTA_ADDRESS  Address,
-  IN PUNICODE_STRING  DeviceName,
-  IN PTDI_PNP_CONTEXT  Context,
-  OUT HANDLE  *AddrRegistrationHandle);
+  __W32_IN PTA_ADDRESS  Address,
+  __W32_IN PUNICODE_STRING  DeviceName,
+  __W32_IN PTDI_PNP_CONTEXT  Context,
+  __W32_OUT HANDLE  *AddrRegistrationHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiRegisterNotificationHandler(
-  IN TDI_BIND_HANDLER  BindHandler,
-  IN TDI_UNBIND_HANDLER  UnbindHandler,
-  OUT HANDLE  *BindingHandle);
+  __W32_IN TDI_BIND_HANDLER  BindHandler,
+  __W32_IN TDI_UNBIND_HANDLER  UnbindHandler,
+  __W32_OUT HANDLE  *BindingHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiRegisterPnPHandlers(
-  IN PTDI_CLIENT_INTERFACE_INFO  ClientInterfaceInfo,
-  IN ULONG  InterfaceInfoSize,
-  OUT HANDLE  *BindingHandle);
+  __W32_IN PTDI_CLIENT_INTERFACE_INFO  ClientInterfaceInfo,
+  __W32_IN ULONG  InterfaceInfoSize,
+  __W32_OUT HANDLE  *BindingHandle);
 
 TDIKRNLAPI
 NTSTATUS
 DDKAPI
 TdiRegisterProvider(
-  IN PUNICODE_STRING  ProviderName,
-  OUT HANDLE  *ProviderHandle);
+  __W32_IN PUNICODE_STRING  ProviderName,
+  __W32_OUT HANDLE  *ProviderHandle);
 
 TDIKRNLAPI
 VOID
 DDKAPI
 TdiReturnChainedReceives(
-  IN PVOID  *TsduDescriptors,
-  IN ULONG   NumberOfTsdus);
+  __W32_IN PVOID  *TsduDescriptors,
+  __W32_IN ULONG   NumberOfTsdus);
 
 TDIKRNLAPI
 VOID
 DDKAPI
 TdiUnmapBuffer(
-  IN PMDL  MdlChain);
+  __W32_IN PMDL  MdlChain);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/upssvc.h w32api-3.6/include/ddk/upssvc.h
--- w32api-3.6.orig/include/ddk/upssvc.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/upssvc.h	2006-02-06 16:41:14.000000000 +1030
@@ -78,14 +78,14 @@
 VOID
 DDKAPI
 UPSTurnOff(
-  IN DWORD  aTurnOffDelay);
+  __W32_IN DWORD  aTurnOffDelay);
 
 UPSAPI
 VOID
 DDKAPI
 UPSWaitForStateChange(
-  IN DWORD  aCurrentState,
-  IN DWORD  anInterval);
+  __W32_IN DWORD  aCurrentState,
+  __W32_IN DWORD  anInterval);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/usbcamdi.h w32api-3.6/include/ddk/usbcamdi.h
--- w32api-3.6.orig/include/ddk/usbcamdi.h	2003-09-12 22:56:51.000000000 +0930
+++ w32api-3.6/include/ddk/usbcamdi.h	2006-02-06 16:41:14.000000000 +1030
@@ -52,9 +52,9 @@
 DEFINE_GUID(GUID_USBCAMD_INTERFACE,
   0x2bcb75c0, 0xb27f, 0x11d1, 0xba, 0x41, 0x0, 0xa0, 0xc9, 0xd, 0x2b, 0x5);
 
-#define USBCAMD_PROCESSPACKETEX_DropFrame             0x0002 
-#define USBCAMD_PROCESSPACKETEX_NextFrameIsStill      0x0004 
-#define USBCAMD_PROCESSPACKETEX_CurrentFrameIsStill   0x0008 
+#define USBCAMD_PROCESSPACKETEX_DropFrame             0x0002
+#define USBCAMD_PROCESSPACKETEX_NextFrameIsStill      0x0004
+#define USBCAMD_PROCESSPACKETEX_CurrentFrameIsStill   0x0008
 
 #define USBCAMD_DATA_PIPE                 0x0001
 #define USBCAMD_MULTIPLEX_PIPE            0x0002
@@ -74,10 +74,10 @@
 } USBCAMD_Pipe_Config_Descriptor, *PUSBCAMD_Pipe_Config_Descriptor;
 
 typedef enum {
-	USBCAMD_CamControlFlag_NoVideoRawProcessing = 1,
-	USBCAMD_CamControlFlag_NoStillRawProcessing = 2,
-	USBCAMD_CamControlFlag_AssociatedFormat = 4,
-	USBCAMD_CamControlFlag_EnableDeviceEvents = 8
+  USBCAMD_CamControlFlag_NoVideoRawProcessing = 1,
+  USBCAMD_CamControlFlag_NoStillRawProcessing = 2,
+  USBCAMD_CamControlFlag_AssociatedFormat = 4,
+  USBCAMD_CamControlFlag_EnableDeviceEvents = 8
 } USBCAMD_CamControlFlags;
 
 typedef NTSTATUS DDKAPI
@@ -133,7 +133,7 @@
 typedef VOID DDKAPI
 (*PCAM_NEW_FRAME_ROUTINE)(
   PVOID  DeviceContext,
-  PVOID  FrameContext); 
+  PVOID  FrameContext);
 
 typedef VOID DDKAPI
 (*PCAM_NEW_FRAME_ROUTINE_EX)(
@@ -178,7 +178,7 @@
   PUSBD_ISO_PACKET_DESCRIPTOR  DataPacket,
   PVOID  DataBuffer,
   PBOOLEAN  FrameComplete,
-  PBOOLEAN  NextFrameIsStill); 
+  PBOOLEAN  NextFrameIsStill);
 
 typedef ULONG DDKAPI
 (*PCAM_PROCESS_PACKET_ROUTINE_EX)(
@@ -221,45 +221,45 @@
   ULONG  StreamNumber);
 
 typedef struct _USBCAMD_DEVICE_DATA {
-	ULONG  Sig;
-	PCAM_INITIALIZE_ROUTINE  CamInitialize;
-	PCAM_INITIALIZE_ROUTINE  CamUnInitialize;
-	PCAM_PROCESS_PACKET_ROUTINE  CamProcessUSBPacket;
-	PCAM_NEW_FRAME_ROUTINE  CamNewVideoFrame;
-	PCAM_PROCESS_RAW_FRAME_ROUTINE  CamProcessRawVideoFrame;
-	PCAM_START_CAPTURE_ROUTINE  CamStartCapture;
-	PCAM_STOP_CAPTURE_ROUTINE  CamStopCapture;
-	PCAM_CONFIGURE_ROUTINE  CamConfigure;
-	PCAM_STATE_ROUTINE  CamSaveState;
-	PCAM_STATE_ROUTINE  CamRestoreState;
-	PCAM_ALLOCATE_BW_ROUTINE  CamAllocateBandwidth;
-	PCAM_FREE_BW_ROUTINE  CamFreeBandwidth;
+  ULONG  Sig;
+  PCAM_INITIALIZE_ROUTINE  CamInitialize;
+  PCAM_INITIALIZE_ROUTINE  CamUnInitialize;
+  PCAM_PROCESS_PACKET_ROUTINE  CamProcessUSBPacket;
+  PCAM_NEW_FRAME_ROUTINE  CamNewVideoFrame;
+  PCAM_PROCESS_RAW_FRAME_ROUTINE  CamProcessRawVideoFrame;
+  PCAM_START_CAPTURE_ROUTINE  CamStartCapture;
+  PCAM_STOP_CAPTURE_ROUTINE  CamStopCapture;
+  PCAM_CONFIGURE_ROUTINE  CamConfigure;
+  PCAM_STATE_ROUTINE  CamSaveState;
+  PCAM_STATE_ROUTINE  CamRestoreState;
+  PCAM_ALLOCATE_BW_ROUTINE  CamAllocateBandwidth;
+  PCAM_FREE_BW_ROUTINE  CamFreeBandwidth;
 } USBCAMD_DEVICE_DATA, *PUSBCAMD_DEVICE_DATA;
 
 typedef struct _USBCAMD_DEVICE_DATA2 {
-	ULONG  Sig;
-	PCAM_INITIALIZE_ROUTINE  CamInitialize;
-	PCAM_INITIALIZE_ROUTINE  CamUnInitialize;
-	PCAM_PROCESS_PACKET_ROUTINE_EX  CamProcessUSBPacketEx;
-	PCAM_NEW_FRAME_ROUTINE_EX  CamNewVideoFrameEx;
-	PCAM_PROCESS_RAW_FRAME_ROUTINE_EX  CamProcessRawVideoFrameEx;
-	PCAM_START_CAPTURE_ROUTINE_EX  CamStartCaptureEx;
-	PCAM_STOP_CAPTURE_ROUTINE_EX  CamStopCaptureEx;
-	PCAM_CONFIGURE_ROUTINE_EX  CamConfigureEx;
-	PCAM_STATE_ROUTINE  CamSaveState;
-	PCAM_STATE_ROUTINE  CamRestoreState;
-	PCAM_ALLOCATE_BW_ROUTINE_EX  CamAllocateBandwidthEx;
-	PCAM_FREE_BW_ROUTINE_EX  CamFreeBandwidthEx;
+  ULONG  Sig;
+  PCAM_INITIALIZE_ROUTINE  CamInitialize;
+  PCAM_INITIALIZE_ROUTINE  CamUnInitialize;
+  PCAM_PROCESS_PACKET_ROUTINE_EX  CamProcessUSBPacketEx;
+  PCAM_NEW_FRAME_ROUTINE_EX  CamNewVideoFrameEx;
+  PCAM_PROCESS_RAW_FRAME_ROUTINE_EX  CamProcessRawVideoFrameEx;
+  PCAM_START_CAPTURE_ROUTINE_EX  CamStartCaptureEx;
+  PCAM_STOP_CAPTURE_ROUTINE_EX  CamStopCaptureEx;
+  PCAM_CONFIGURE_ROUTINE_EX  CamConfigureEx;
+  PCAM_STATE_ROUTINE  CamSaveState;
+  PCAM_STATE_ROUTINE  CamRestoreState;
+  PCAM_ALLOCATE_BW_ROUTINE_EX  CamAllocateBandwidthEx;
+  PCAM_FREE_BW_ROUTINE_EX  CamFreeBandwidthEx;
 } USBCAMD_DEVICE_DATA2, *PUSBCAMD_DEVICE_DATA2;
 
 USBCAMAPI
 ULONG
 DDKAPI
 USBCAMD_InitializeNewInterface(
-  IN PVOID  DeviceContext,
-  IN PVOID  DeviceData,
-  IN ULONG  Version,
-  IN ULONG  CamControlFlag);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PVOID  DeviceData,
+  __W32_IN ULONG  Version,
+  __W32_IN ULONG  CamControlFlag);
 
 typedef VOID DDKAPI
 (*PCOMMAND_COMPLETE_FUNCTION)(
@@ -269,64 +269,64 @@
 
 typedef NTSTATUS DDKAPI
 (*PFNUSBCAMD_BulkReadWrite)(
-  IN PVOID  DeviceContext,
-  IN USHORT  PipeIndex,
-  IN PVOID  Buffer,
-  IN ULONG  BufferLength,
-  IN PCOMMAND_COMPLETE_FUNCTION  CommandComplete,
-  IN PVOID  CommandContext);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN USHORT  PipeIndex,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_IN PCOMMAND_COMPLETE_FUNCTION  CommandComplete,
+  __W32_IN PVOID  CommandContext);
 
 typedef NTSTATUS DDKAPI
 (*PFNUSBCAMD_SetIsoPipeState)(
-  IN PVOID  DeviceContext,
-  IN ULONG  PipeStateFlags);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN ULONG  PipeStateFlags);
 
 typedef NTSTATUS DDKAPI
 (*PFNUSBCAMD_CancelBulkReadWrite)(
-  IN PVOID  DeviceContext,
-  IN ULONG  PipeIndex);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN ULONG  PipeIndex);
 
 typedef NTSTATUS DDKAPI
-(*PFNUSBCAMD_SetVideoFormat)( 
-  IN PVOID  DeviceContext,
-  IN PHW_STREAM_REQUEST_BLOCK  pSrb);
+(*PFNUSBCAMD_SetVideoFormat)(
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PHW_STREAM_REQUEST_BLOCK  pSrb);
 
 typedef NTSTATUS DDKAPI
 (*PFNUSBCAMD_WaitOnDeviceEvent)(
-  IN PVOID  DeviceContext,
-  IN ULONG  PipeIndex,
-  IN PVOID  Buffer,
-  IN ULONG  BufferLength,
-  IN PCOMMAND_COMPLETE_FUNCTION  EventComplete,
-  IN PVOID  EventContext,
-  IN BOOLEAN  LoopBack);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN ULONG  PipeIndex,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  BufferLength,
+  __W32_IN PCOMMAND_COMPLETE_FUNCTION  EventComplete,
+  __W32_IN PVOID  EventContext,
+  __W32_IN BOOLEAN  LoopBack);
 
 USBCAMAPI
 PVOID
 DDKAPI
 USBCAMD_AdapterReceivePacket(
-  IN PHW_STREAM_REQUEST_BLOCK  Srb,
-  IN PUSBCAMD_DEVICE_DATA  DeviceData,
-  IN PDEVICE_OBJECT  *DeviceObject,
-  IN BOOLEAN  NeedsCompletion);
+  __W32_IN PHW_STREAM_REQUEST_BLOCK  Srb,
+  __W32_IN PUSBCAMD_DEVICE_DATA  DeviceData,
+  __W32_IN PDEVICE_OBJECT  *DeviceObject,
+  __W32_IN BOOLEAN  NeedsCompletion);
 
 USBCAMAPI
 NTSTATUS
 DDKAPI
 USBCAMD_ControlVendorCommand(
-  IN PVOID  DeviceContext,
-  IN UCHAR  Request,
-  IN USHORT  Value,
-  IN USHORT  Index,
-  IN PVOID  Buffer,
-  IN OUT PULONG  BufferLength,
-  IN BOOLEAN  GetData,
-  IN PCOMMAND_COMPLETE_FUNCTION  CommandComplete,
-  IN PVOID  CommandContext);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN UCHAR  Request,
+  __W32_IN USHORT  Value,
+  __W32_IN USHORT  Index,
+  __W32_IN PVOID  Buffer,
+  __W32_IN __W32_OUT PULONG  BufferLength,
+  __W32_IN BOOLEAN  GetData,
+  __W32_IN PCOMMAND_COMPLETE_FUNCTION  CommandComplete,
+  __W32_IN PVOID  CommandContext);
 
 typedef VOID DDKAPI
 (*PADAPTER_RECEIVE_PACKET_ROUTINE)(
-  IN PHW_STREAM_REQUEST_BLOCK  Srb);
+  __W32_IN PHW_STREAM_REQUEST_BLOCK  Srb);
 
 USBCAMAPI
 ULONG
@@ -342,18 +342,18 @@
 NTSTATUS
 DDKAPI
 USBCAMD_GetRegistryKeyValue(
-  IN HANDLE  Handle,
-  IN PWCHAR  KeyNameString,
-  IN ULONG  KeyNameStringLength,
-  IN PVOID  Data,
-  IN ULONG  DataLength);
+  __W32_IN HANDLE  Handle,
+  __W32_IN PWCHAR  KeyNameString,
+  __W32_IN ULONG  KeyNameStringLength,
+  __W32_IN PVOID  Data,
+  __W32_IN ULONG  DataLength);
 
 USBCAMAPI
 NTSTATUS
 DDKAPI
 USBCAMD_SelectAlternateInterface(
-  IN PVOID  DeviceContext,
-  IN OUT PUSBD_INTERFACE_INFORMATION  RequestInterface);
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN __W32_OUT PUSBD_INTERFACE_INFORMATION  RequestInterface);
 
 #define USBCAMD_VERSION_200               0x200
 
@@ -368,9 +368,9 @@
 
 typedef VOID DDKAPI
 (*PSTREAM_RECEIVE_PACKET)(
-  IN PVOID  Srb,
-  IN PVOID  DeviceContext,
-  IN PBOOLEAN  Completed);
+  __W32_IN PVOID  Srb,
+  __W32_IN PVOID  DeviceContext,
+  __W32_IN PBOOLEAN  Completed);
 
 #if defined(DEBUG_LOG)
 
@@ -378,10 +378,10 @@
 VOID
 DDKAPI
 USBCAMD_Debug_LogEntry(
-	IN CHAR  *Name,
-	IN ULONG  Info1,
-	IN ULONG  Info2,
-	IN ULONG  Info3);
+  __W32_IN CHAR  *Name,
+  __W32_IN ULONG  Info1,
+  __W32_IN ULONG  Info2,
+  __W32_IN ULONG  Info3);
 
 #define ILOGENTRY(sig, info1, info2, info3) \
   USBCAMD_Debug_LogEntry(sig, (ULONG)info1, (ULONG)info2, (ULONG)info3)
diff -ru w32api-3.6.orig/include/ddk/usbscan.h w32api-3.6/include/ddk/usbscan.h
--- w32api-3.6.orig/include/ddk/usbscan.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/usbscan.h	2006-02-06 16:41:14.000000000 +1030
@@ -78,52 +78,52 @@
 #define BULKIN_FLAG                       0x80
 
 typedef struct _CHANNEL_INFO {
-  OUT ULONG  EventChannelSize;
-  OUT ULONG  uReadDataAlignment;
-  OUT ULONG  uWriteDataAlignment;
+  __W32_OUT ULONG  EventChannelSize;
+  __W32_OUT ULONG  uReadDataAlignment;
+  __W32_OUT ULONG  uWriteDataAlignment;
 }CHANNEL_INFO, *PCHANNEL_INFO;
 
 typedef struct _DEVICE_DESCRIPTOR {
-  OUT USHORT  usVendorId; 
-  OUT USHORT  usProductId; 
-  OUT USHORT  usBcdDevice; 
-  OUT USHORT  usLanguageId; 
+  __W32_OUT USHORT  usVendorId;
+  __W32_OUT USHORT  usProductId;
+  __W32_OUT USHORT  usBcdDevice;
+  __W32_OUT USHORT  usLanguageId;
 } DEVICE_DESCRIPTOR, *PDEVICE_DESCRIPTOR;
 
 typedef struct _DRV_VERSION {
-  OUT ULONG  major;
-  OUT ULONG  minor;
-  OUT ULONG  internal; 
+  __W32_OUT ULONG  major;
+  __W32_OUT ULONG  minor;
+  __W32_OUT ULONG  internal;
 } DRV_VERSION, *PDRV_VERSION;
 
 typedef struct _IO_BLOCK {
-  IN ULONG  uOffset;
-  IN ULONG  uLength;
-  IN OUT PUCHAR  pbyData;
-  IN ULONG  uIndex;
+  __W32_IN ULONG  uOffset;
+  __W32_IN ULONG  uLength;
+  __W32_IN __W32_OUT PUCHAR  pbyData;
+  __W32_IN ULONG  uIndex;
 } IO_BLOCK, *PIO_BLOCK;
 
 typedef struct _IO_BLOCK_EX {
-  IN  ULONG  uOffset;
-  IN  ULONG  uLength;
-  IN OUT PUCHAR  pbyData;
-  IN  ULONG  uIndex;
-  IN  UCHAR  bRequest;
-  IN  UCHAR  bmRequestType;
-  IN  UCHAR  fTransferDirectionIn;
+  __W32_IN  ULONG  uOffset;
+  __W32_IN  ULONG  uLength;
+  __W32_IN __W32_OUT PUCHAR  pbyData;
+  __W32_IN  ULONG  uIndex;
+  __W32_IN  UCHAR  bRequest;
+  __W32_IN  UCHAR  bmRequestType;
+  __W32_IN  UCHAR  fTransferDirectionIn;
 } IO_BLOCK_EX, *PIO_BLOCK_EX;
 
 typedef struct _USBSCAN_GET_DESCRIPTOR {
-  IN UCHAR  DescriptorType;
-  IN UCHAR  Index;
-  IN USHORT  LanguageId;
+  __W32_IN UCHAR  DescriptorType;
+  __W32_IN UCHAR  Index;
+  __W32_IN USHORT  LanguageId;
 } USBSCAN_GET_DESCRIPTOR, *PUSBSCAN_GET_DESCRIPTOR;
 
 typedef enum _RAW_PIPE_TYPE {
-	USBSCAN_PIPE_CONTROL,
-	USBSCAN_PIPE_ISOCHRONOUS,
-	USBSCAN_PIPE_BULK,
-	USBSCAN_PIPE_INTERRUPT
+  USBSCAN_PIPE_CONTROL,
+  USBSCAN_PIPE_ISOCHRONOUS,
+  USBSCAN_PIPE_BULK,
+  USBSCAN_PIPE_INTERRUPT
 } RAW_PIPE_TYPE;
 
 typedef struct _USBSCAN_PIPE_INFORMATION {
@@ -134,21 +134,21 @@
 } USBSCAN_PIPE_INFORMATION, *PUSBSCAN_PIPE_INFORMATION;
 
 typedef struct _USBSCAN_PIPE_CONFIGURATION {
-  OUT ULONG  NumberOfPipes;
-  OUT USBSCAN_PIPE_INFORMATION  PipeInfo[MAX_NUM_PIPES];
+  __W32_OUT ULONG  NumberOfPipes;
+  __W32_OUT USBSCAN_PIPE_INFORMATION  PipeInfo[MAX_NUM_PIPES];
 } USBSCAN_PIPE_CONFIGURATION, *PUSBSCAN_PIPE_CONFIGURATION;
 
 typedef struct _USBSCAN_TIMEOUT {
-  IN ULONG  TimeoutRead;
-  IN ULONG  TimeoutWrite;
-  IN ULONG  TimeoutEvent;
+  __W32_IN ULONG  TimeoutRead;
+  __W32_IN ULONG  TimeoutWrite;
+  __W32_IN ULONG  TimeoutEvent;
 } USBSCAN_TIMEOUT, *PUSBSCAN_TIMEOUT;
 
 typedef enum _PIPE_TYPE {
-	EVENT_PIPE,
-	READ_DATA_PIPE,
-	WRITE_DATA_PIPE,
-	ALL_PIPE
+  EVENT_PIPE,
+  READ_DATA_PIPE,
+  WRITE_DATA_PIPE,
+  ALL_PIPE
 } PIPE_TYPE;
 
 #ifdef __cplusplus
diff -ru w32api-3.6.orig/include/ddk/video.h w32api-3.6/include/ddk/video.h
--- w32api-3.6.orig/include/ddk/video.h	2004-09-06 00:46:59.000000000 +0930
+++ w32api-3.6/include/ddk/video.h	2006-02-06 16:41:14.000000000 +1030
@@ -149,15 +149,15 @@
 
 typedef VOID DDKAPI
 (*PEXECUTE_DMA)(
-	IN PVOID  HwDeviceExtension,
-	IN PVP_DMA_ADAPTER  VpDmaAdapter,
-	IN PVP_SCATTER_GATHER_LIST  SGList,
-	IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVP_DMA_ADAPTER  VpDmaAdapter,
+  __W32_IN PVP_SCATTER_GATHER_LIST  SGList,
+  __W32_IN PVOID  Context);
 
 typedef PVOID DDKAPI
 (*PVIDEO_PORT_GET_PROC_ADDRESS)(
-  IN PVOID  HwDeviceExtension,
-  IN PUCHAR  FunctionName);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PUCHAR  FunctionName);
 
 typedef struct _VIDEO_PORT_CONFIG_INFO {
   ULONG  Length;
@@ -193,17 +193,17 @@
 
 typedef VP_STATUS DDKAPI
 (*PVIDEO_HW_FIND_ADAPTER)(
-	IN PVOID  HwDeviceExtension,
-	IN PVOID  HwContext,
-	IN PWSTR  ArgumentString,
-	IN OUT  PVIDEO_PORT_CONFIG_INFO  ConfigInfo,
-	OUT PUCHAR  Again);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  HwContext,
+  __W32_IN PWSTR  ArgumentString,
+  __W32_IN __W32_OUT  PVIDEO_PORT_CONFIG_INFO  ConfigInfo,
+  __W32_OUT PUCHAR  Again);
 
 typedef VP_STATUS DDKAPI
 (*PVIDEO_HW_POWER_GET)(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  HwId,
-  IN OUT  PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  HwId,
+  __W32_IN __W32_OUT  PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
 
 /* PVIDEO_HW_GET_CHILD_DESCRIPTOR return values */
 #define VIDEO_ENUM_MORE_DEVICES           ERROR_CONTINUE
@@ -229,20 +229,20 @@
 
 typedef VP_STATUS DDKAPI
 (*PVIDEO_HW_GET_CHILD_DESCRIPTOR)(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_CHILD_ENUM_INFO  ChildEnumInfo,
-  OUT  PVIDEO_CHILD_TYPE  VideoChildType,
-  OUT  PUCHAR  pChildDescriptor,
-  OUT  PULONG  UId,
-  OUT  PULONG  pUnused);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVIDEO_CHILD_ENUM_INFO  ChildEnumInfo,
+  __W32_OUT  PVIDEO_CHILD_TYPE  VideoChildType,
+  __W32_OUT  PUCHAR  pChildDescriptor,
+  __W32_OUT  PULONG  UId,
+  __W32_OUT  PULONG  pUnused);
 
 typedef BOOLEAN DDKAPI
 (*PVIDEO_HW_INITIALIZE)(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 typedef BOOLEAN DDKAPI
 (*PVIDEO_HW_INTERRUPT)(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 /* VIDEO_ACCESS_RANGE.RangePassive */
 #define VIDEO_RANGE_PASSIVE_DECODE        1
@@ -262,22 +262,22 @@
 
 typedef VOID DDKAPI
 (*PVIDEO_HW_LEGACYRESOURCES)(
-  IN ULONG  VendorId,
-  IN ULONG  DeviceId,
-  IN OUT  PVIDEO_ACCESS_RANGE  *LegacyResourceList,
-  IN OUT  PULONG  LegacyResourceCount);
+  __W32_IN ULONG  VendorId,
+  __W32_IN ULONG  DeviceId,
+  __W32_IN __W32_OUT  PVIDEO_ACCESS_RANGE  *LegacyResourceList,
+  __W32_IN __W32_OUT  PULONG  LegacyResourceCount);
 
 typedef VP_STATUS DDKAPI
 (*PMINIPORT_QUERY_DEVICE_ROUTINE)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context,
-  IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,
-  IN PVOID  Identifier,
-  IN ULONG  IdentifierLength,
-  IN PVOID  ConfigurationData,
-  IN ULONG  ConfigurationDataLength,
-  IN OUT  PVOID  ComponentInformation,
-  IN ULONG  ComponentInformationLength);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Context,
+  __W32_IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,
+  __W32_IN PVOID  Identifier,
+  __W32_IN ULONG  IdentifierLength,
+  __W32_IN PVOID  ConfigurationData,
+  __W32_IN ULONG  ConfigurationDataLength,
+  __W32_IN __W32_OUT  PVOID  ComponentInformation,
+  __W32_IN ULONG  ComponentInformationLength);
 
 typedef struct _QUERY_INTERFACE {
   CONST GUID  *InterfaceType;
@@ -289,28 +289,28 @@
 
 typedef VP_STATUS DDKAPI
 (*PVIDEO_HW_QUERY_INTERFACE)(
-  IN PVOID  HwDeviceExtension,
-  IN OUT  PQUERY_INTERFACE  QueryInterface);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN __W32_OUT  PQUERY_INTERFACE  QueryInterface);
 
 typedef VP_STATUS DDKAPI
 (*PMINIPORT_GET_REGISTRY_ROUTINE)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context,
-  IN OUT  PWSTR  ValueName,
-  IN OUT  PVOID  ValueData,
-  IN ULONG  ValueLength);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Context,
+  __W32_IN __W32_OUT  PWSTR  ValueName,
+  __W32_IN __W32_OUT  PVOID  ValueData,
+  __W32_IN ULONG  ValueLength);
 
 typedef BOOLEAN DDKAPI
 (*PVIDEO_HW_RESET_HW)(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  Columns,
-  IN ULONG  Rows);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  Columns,
+  __W32_IN ULONG  Rows);
 
 typedef VP_STATUS DDKAPI
 (*PVIDEO_HW_POWER_SET)(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  HwId,
-  IN PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  HwId,
+  __W32_IN PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
 
 typedef struct _STATUS_BLOCK {
    _ANONYMOUS_UNION union {
@@ -331,66 +331,66 @@
 
 typedef BOOLEAN DDKAPI
 (*PVIDEO_HW_START_IO)(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_REQUEST_PACKET  RequestPacket);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVIDEO_REQUEST_PACKET  RequestPacket);
 
 typedef BOOLEAN DDKAPI
 (*PMINIPORT_SYNCHRONIZE_ROUTINE)(
-  IN PVOID  Context);
+  __W32_IN PVOID  Context);
 
 typedef VOID DDKAPI
 (*PVIDEO_HW_TIMER)(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 typedef VOID DDKAPI
 (*PMINIPORT_DPC_ROUTINE)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Context);
 
 typedef VP_STATUS DDKAPI
 (*PDRIVER_IO_PORT_UCHAR)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUCHAR  Data);
+  __W32_IN ULONG_PTR  Context,
+  __W32_IN ULONG  Port,
+  __W32_IN UCHAR  AccessMode,
+  __W32_IN PUCHAR  Data);
 
 typedef VP_STATUS DDKAPI
 (*PDRIVER_IO_PORT_UCHAR_STRING)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUCHAR  Data,
-  IN ULONG  DataLength);
+  __W32_IN ULONG_PTR  Context,
+  __W32_IN ULONG  Port,
+  __W32_IN UCHAR  AccessMode,
+  __W32_IN PUCHAR  Data,
+  __W32_IN ULONG  DataLength);
 
 typedef VP_STATUS DDKAPI
 (*PDRIVER_IO_PORT_ULONG)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PULONG  Data);
+  __W32_IN ULONG_PTR  Context,
+  __W32_IN ULONG  Port,
+  __W32_IN UCHAR  AccessMode,
+  __W32_IN PULONG  Data);
 
 typedef VP_STATUS DDKAPI
 (*PDRIVER_IO_PORT_ULONG_STRING)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PULONG  Data,
-  IN ULONG  DataLength);
+  __W32_IN ULONG_PTR  Context,
+  __W32_IN ULONG  Port,
+  __W32_IN UCHAR  AccessMode,
+  __W32_IN PULONG  Data,
+  __W32_IN ULONG  DataLength);
 
 typedef VP_STATUS DDKAPI
 (*PDRIVER_IO_PORT_USHORT)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUSHORT  Data);
+  __W32_IN ULONG_PTR  Context,
+  __W32_IN ULONG  Port,
+  __W32_IN UCHAR  AccessMode,
+  __W32_IN PUSHORT  Data);
 
 typedef VP_STATUS DDKAPI
 (*PDRIVER_IO_PORT_USHORT_STRING)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUSHORT  Data,
-  IN ULONG  DataLength);
+  __W32_IN ULONG_PTR  Context,
+  __W32_IN ULONG  Port,
+  __W32_IN UCHAR  AccessMode,
+  __W32_IN PUSHORT  Data,
+  __W32_IN ULONG  DataLength);
 
 
 
@@ -464,21 +464,21 @@
 #define VIDEO_PORT_AGP_INTERFACE_VERSION_2 2
 
 typedef struct _VIDEO_PORT_AGP_INTERFACE_2 {
-  IN USHORT  Size;
-  IN USHORT  Version;
-  OUT PVOID  Context;
-  OUT PINTERFACE_REFERENCE  InterfaceReference;
-  OUT PINTERFACE_DEREFERENCE  InterfaceDereference;
-  OUT PAGP_RESERVE_PHYSICAL  AgpReservePhysical;
-  OUT PAGP_RELEASE_PHYSICAL  AgpReleasePhysical;
-  OUT PAGP_COMMIT_PHYSICAL  AgpCommitPhysical;
-  OUT PAGP_FREE_PHYSICAL  AgpFreePhysical;
-  OUT PAGP_RESERVE_VIRTUAL  AgpReserveVirtual;
-  OUT PAGP_RELEASE_VIRTUAL  AgpReleaseVirtual;
-  OUT PAGP_COMMIT_VIRTUAL  AgpCommitVirtual;
-  OUT PAGP_FREE_VIRTUAL  AgpFreeVirtual;
-  OUT ULONGLONG  AgpAllocationLimit;
-  OUT PAGP_SET_RATE  AgpSetRate;
+  __W32_IN USHORT  Size;
+  __W32_IN USHORT  Version;
+  __W32_OUT PVOID  Context;
+  __W32_OUT PINTERFACE_REFERENCE  InterfaceReference;
+  __W32_OUT PINTERFACE_DEREFERENCE  InterfaceDereference;
+  __W32_OUT PAGP_RESERVE_PHYSICAL  AgpReservePhysical;
+  __W32_OUT PAGP_RELEASE_PHYSICAL  AgpReleasePhysical;
+  __W32_OUT PAGP_COMMIT_PHYSICAL  AgpCommitPhysical;
+  __W32_OUT PAGP_FREE_PHYSICAL  AgpFreePhysical;
+  __W32_OUT PAGP_RESERVE_VIRTUAL  AgpReserveVirtual;
+  __W32_OUT PAGP_RELEASE_VIRTUAL  AgpReleaseVirtual;
+  __W32_OUT PAGP_COMMIT_VIRTUAL  AgpCommitVirtual;
+  __W32_OUT PAGP_FREE_VIRTUAL  AgpFreeVirtual;
+  __W32_OUT ULONGLONG  AgpAllocationLimit;
+  __W32_OUT PAGP_SET_RATE  AgpSetRate;
 } VIDEO_PORT_AGP_INTERFACE_2, *PVIDEO_PORT_AGP_INTERFACE_2;
 
 #define VIDEO_PORT_I2C_INTERFACE_VERSION_1  1
@@ -503,35 +503,35 @@
 
 typedef struct _I2C_CALLBACKS
 {
-  IN PVIDEO_WRITE_CLOCK_LINE  WriteClockLine;
-  IN PVIDEO_WRITE_DATA_LINE  WriteDataLine;
-  IN PVIDEO_READ_CLOCK_LINE  ReadClockLine;
-  IN PVIDEO_READ_DATA_LINE  ReadDataLine;
+  __W32_IN PVIDEO_WRITE_CLOCK_LINE  WriteClockLine;
+  __W32_IN PVIDEO_WRITE_DATA_LINE  WriteDataLine;
+  __W32_IN PVIDEO_READ_CLOCK_LINE  ReadClockLine;
+  __W32_IN PVIDEO_READ_DATA_LINE  ReadDataLine;
 } I2C_CALLBACKS, *PI2C_CALLBACKS;
 
 typedef BOOLEAN DDKAPI
 (*PI2C_START)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PI2C_CALLBACKS  I2CCallbacks);
 
 typedef BOOLEAN DDKAPI
 (*PI2C_STOP)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PI2C_CALLBACKS  I2CCallbacks);
 
 typedef BOOLEAN DDKAPI
 (*PI2C_WRITE)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks,
-  IN PUCHAR  Buffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PI2C_CALLBACKS  I2CCallbacks,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Length);
 
 typedef BOOLEAN DDKAPI
 (*PI2C_READ)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks,
-  OUT PUCHAR  Buffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PI2C_CALLBACKS  I2CCallbacks,
+  __W32_OUT PUCHAR  Buffer,
+  __W32_IN ULONG  Length);
 
 typedef struct _VIDEO_PORT_I2C_INTERFACE {
   USHORT  Size;
@@ -550,49 +550,49 @@
 
 typedef VP_STATUS DDKAPI
 (*PINT10_ALLOCATE_BUFFER)(
-  IN PVOID  Context,
-  OUT PUSHORT  Seg,
-  OUT PUSHORT  Off,
-  IN OUT PULONG  Length);
+  __W32_IN PVOID  Context,
+  __W32_OUT PUSHORT  Seg,
+  __W32_OUT PUSHORT  Off,
+  __W32_IN __W32_OUT PULONG  Length);
 
 typedef VP_STATUS DDKAPI
 (*PINT10_CALL_BIOS)(
-  IN PVOID  Context,
-  IN OUT PINT10_BIOS_ARGUMENTS  BiosArguments);
+  __W32_IN PVOID  Context,
+  __W32_IN __W32_OUT PINT10_BIOS_ARGUMENTS  BiosArguments);
 
 typedef VP_STATUS DDKAPI
 (*PINT10_FREE_BUFFER)(
-  IN PVOID  Context,
-  IN USHORT  Seg,
-  IN USHORT  Off);
+  __W32_IN PVOID  Context,
+  __W32_IN USHORT  Seg,
+  __W32_IN USHORT  Off);
 
 typedef VP_STATUS DDKAPI
 (*PINT10_READ_MEMORY)(
-  IN PVOID  Context,
-  IN USHORT  Seg,
-  IN USHORT  Off,
-  OUT PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  Context,
+  __W32_IN USHORT  Seg,
+  __W32_IN USHORT  Off,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 typedef VP_STATUS DDKAPI
 (*PINT10_WRITE_MEMORY)(
-  IN PVOID  Context,
-  IN USHORT  Seg,
-  IN USHORT  Off,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  Context,
+  __W32_IN USHORT  Seg,
+  __W32_IN USHORT  Off,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 typedef struct _VIDEO_PORT_INT10_INTERFACE {
-  IN USHORT  Size;
-  IN USHORT  Version;
-  OUT PVOID  Context;
-  OUT PINTERFACE_REFERENCE  InterfaceReference;
-  OUT PINTERFACE_DEREFERENCE  InterfaceDereference;
-  OUT PINT10_ALLOCATE_BUFFER  Int10AllocateBuffer;
-  OUT PINT10_FREE_BUFFER  Int10FreeBuffer;
-  OUT PINT10_READ_MEMORY  Int10ReadMemory;
-  OUT PINT10_WRITE_MEMORY  Int10WriteMemory;
-  OUT PINT10_CALL_BIOS  Int10CallBios;
+  __W32_IN USHORT  Size;
+  __W32_IN USHORT  Version;
+  __W32_OUT PVOID  Context;
+  __W32_OUT PINTERFACE_REFERENCE  InterfaceReference;
+  __W32_OUT PINTERFACE_DEREFERENCE  InterfaceDereference;
+  __W32_OUT PINT10_ALLOCATE_BUFFER  Int10AllocateBuffer;
+  __W32_OUT PINT10_FREE_BUFFER  Int10FreeBuffer;
+  __W32_OUT PINT10_READ_MEMORY  Int10ReadMemory;
+  __W32_OUT PINT10_WRITE_MEMORY  Int10WriteMemory;
+  __W32_OUT PINT10_CALL_BIOS  Int10CallBios;
 } VIDEO_PORT_INT10_INTERFACE, *PVIDEO_PORT_INT10_INTERFACE;
 
 /* Flags for VideoPortGetDeviceBase and VideoPortMapMemory */
@@ -620,12 +620,12 @@
 } VP_DEVICE_DESCRIPTION, *PVP_DEVICE_DESCRIPTION;
 
 typedef struct _VPOSVERSIONINFO {
-  IN ULONG  Size;
-  OUT ULONG  MajorVersion;
-  OUT ULONG  MinorVersion;
-  OUT ULONG  BuildNumber;
-  OUT USHORT  ServicePackMajor;
-  OUT USHORT  ServicePackMinor;
+  __W32_IN ULONG  Size;
+  __W32_OUT ULONG  MajorVersion;
+  __W32_OUT ULONG  MinorVersion;
+  __W32_OUT ULONG  BuildNumber;
+  __W32_OUT USHORT  ServicePackMajor;
+  __W32_OUT USHORT  ServicePackMinor;
 } VPOSVERSIONINFO, *PVPOSVERSIONINFO;
 
 
@@ -636,57 +636,57 @@
 VOID
 DDKAPI
 VideoDebugPrint(
-  IN ULONG  DebugPrintLevel,
-  IN PCHAR  DebugMessage,
-  IN ...);
+  __W32_IN ULONG  DebugPrintLevel,
+  __W32_IN PCHAR  DebugMessage,
+  __W32_IN ...);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortAcquireDeviceLock(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortAcquireSpinLock(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock,
-  OUT PUCHAR  OldIrql);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSPIN_LOCK  SpinLock,
+  __W32_OUT PUCHAR  OldIrql);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortAcquireSpinLockAtDpcLevel(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSPIN_LOCK  SpinLock);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortAllocateBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  Size,
-  OUT PVOID  *Buffer);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  Size,
+  __W32_OUT PVOID  *Buffer);
 
 VPAPI
 PVOID
 DDKAPI
 VideoPortAllocateCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN ULONG  DesiredLength,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled,
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVP_DMA_ADAPTER  VpDmaAdapter,
+  __W32_IN ULONG  DesiredLength,
+  __W32_OUT PPHYSICAL_ADDRESS  LogicalAddress,
+  __W32_IN BOOLEAN  CacheEnabled,
   PVOID  Reserved);
 
 VPAPI
 PVOID
 DDKAPI
 VideoPortAllocateContiguousMemory(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumberOfBytes,
-  IN PHYSICAL_ADDRESS  HighestAcceptableAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  NumberOfBytes,
+  __W32_IN PHYSICAL_ADDRESS  HighestAcceptableAddress);
 
 /* VideoPortAllocatePool.PoolType constants */
 typedef enum _VP_POOL_TYPE {
@@ -700,19 +700,19 @@
 PVOID
 DDKAPI
 VideoPortAllocatePool(
-  IN PVOID  HwDeviceExtension,
-  IN VP_POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN VP_POOL_TYPE  PoolType,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN ULONG  Tag);
 
 VPAPI
 PDMA
 DDKAPI
 VideoPortAssociateEventsWithDmaHandle(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVIDEO_REQUEST_PACKET  pVrp,
-  IN PVOID  MappedUserEvent,
-  IN PVOID  DisplayDriverEvent);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN __W32_OUT PVIDEO_REQUEST_PACKET  pVrp,
+  __W32_IN PVOID  MappedUserEvent,
+  __W32_IN PVOID  DisplayDriverEvent);
 
 /* VideoPortCheckForDeviceExistence.Flags constants */
 #define CDE_USE_SUBSYSTEM_IDS             0x00000001
@@ -722,203 +722,203 @@
 BOOLEAN
 DDKAPI
 VideoPortCheckForDeviceExistence(
-  IN PVOID  HwDeviceExtension,
-  IN USHORT  VendorId,
-  IN USHORT  DeviceId,
-  IN UCHAR  RevisionId,
-  IN USHORT  SubVendorId,
-  IN USHORT  SubSystemId,
-  IN ULONG  Flags);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN USHORT  VendorId,
+  __W32_IN USHORT  DeviceId,
+  __W32_IN UCHAR  RevisionId,
+  __W32_IN USHORT  SubVendorId,
+  __W32_IN USHORT  SubSystemId,
+  __W32_IN ULONG  Flags);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortClearEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PEVENT  pEvent);
 
 VPAPI
 ULONG
 DDKAPI
 VideoPortCompareMemory(
-  IN PVOID  Source1,
-  IN PVOID  Source2,
-  IN ULONG  Length);
+  __W32_IN PVOID  Source1,
+  __W32_IN PVOID  Source2,
+  __W32_IN ULONG  Length);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortCompleteDma(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN PVP_SCATTER_GATHER_LIST  VpScatterGather,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVP_DMA_ADAPTER  VpDmaAdapter,
+  __W32_IN PVP_SCATTER_GATHER_LIST  VpScatterGather,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortCreateEvent(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  EventFlag,
-  IN PVOID  Unused,
-  OUT PEVENT  *ppEvent);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  EventFlag,
+  __W32_IN PVOID  Unused,
+  __W32_OUT PEVENT  *ppEvent);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortCreateSecondaryDisplay(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVOID  *SecondaryDeviceExtension,
-  IN ULONG  ulFlag);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN __W32_OUT PVOID  *SecondaryDeviceExtension,
+  __W32_IN ULONG  ulFlag);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortCreateSpinLock(
-  IN PVOID  HwDeviceExtension,
-  OUT PSPIN_LOCK  *SpinLock);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_OUT PSPIN_LOCK  *SpinLock);
 
 typedef struct _DDC_CONTROL {
-  IN ULONG  Size;
-  IN I2C_CALLBACKS  I2CCallbacks;
-  IN UCHAR  EdidSegment;
+  __W32_IN ULONG  Size;
+  __W32_IN I2C_CALLBACKS  I2CCallbacks;
+  __W32_IN UCHAR  EdidSegment;
 } DDC_CONTROL, *PDDC_CONTROL;
 
 VPAPI
 BOOLEAN
 DDKAPI
 VideoPortDDCMonitorHelper(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  DDCControl,
-  IN OUT PUCHAR  EdidBuffer,
-  IN ULONG  EdidBufferSize);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  DDCControl,
+  __W32_IN __W32_OUT PUCHAR  EdidBuffer,
+  __W32_IN ULONG  EdidBufferSize);
 
 VPAPI
 VOID
 DDKCDECLAPI
 VideoPortDebugPrint(
-  IN VIDEO_DEBUG_LEVEL  DebugPrintLevel,
-  IN PCHAR  DebugMessage,
-  IN ...);
+  __W32_IN VIDEO_DEBUG_LEVEL  DebugPrintLevel,
+  __W32_IN PCHAR  DebugMessage,
+  __W32_IN ...);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortDeleteEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PEVENT  pEvent);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortDeleteSpinLock(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSPIN_LOCK  SpinLock);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortDisableInterrupt(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 VPAPI
 PDMA
 DDKAPI
 VideoPortDoDma(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma,
-  IN DMA_FLAGS  DmaFlags);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PDMA  pDma,
+  __W32_IN DMA_FLAGS  DmaFlags);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortEnableInterrupt(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortEnumerateChildren(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Reserved);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Reserved);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortFreeCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  Length,
-  IN PVOID  VirtualAddress,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  Length,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN PHYSICAL_ADDRESS  LogicalAddress,
+  __W32_IN BOOLEAN  CacheEnabled);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortFreeDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  MappedAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  MappedAddress);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortFreePool(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Ptr);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Ptr);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortGetAccessRanges(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumRequestedResources,
-  IN PIO_RESOURCE_DESCRIPTOR  RequestedResources  OPTIONAL,
-  IN ULONG  NumAccessRanges,
-  OUT PVIDEO_ACCESS_RANGE  AccessRanges,
-  IN PVOID  VendorId,
-  IN PVOID  DeviceId,
-  OUT PULONG  Slot);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  NumRequestedResources,
+  __W32_IN PIO_RESOURCE_DESCRIPTOR  RequestedResources  __W32_OPTIONAL,
+  __W32_IN ULONG  NumAccessRanges,
+  __W32_OUT PVIDEO_ACCESS_RANGE  AccessRanges,
+  __W32_IN PVOID  VendorId,
+  __W32_IN PVOID  DeviceId,
+  __W32_OUT PULONG  Slot);
 
 VPAPI
 PVOID
 DDKAPI
 VideoPortGetAssociatedDeviceExtension(
-  IN PVOID  DeviceObject);
+  __W32_IN PVOID  DeviceObject);
 
 VPAPI
 ULONG
 DDKAPI
 VideoPortGetAssociatedDeviceID(
-  IN PVOID DeviceObject);
+  __W32_IN PVOID DeviceObject);
 
 VPAPI
 ULONG
 DDKAPI
 VideoPortGetBusData(
-  IN PVOID  HwDeviceExtension,
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  SlotNumber,
-  IN OUT PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN BUS_DATA_TYPE  BusDataType,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 VPAPI
 ULONG
 DDKAPI
 VideoPortGetBytesUsed(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PDMA  pDma);
 
 VPAPI
 PVOID
 DDKAPI
 VideoPortGetCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  DesiredLength,
-  IN ULONG  Alignment,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  OUT PULONG  pActualLength,
-  IN BOOLEAN  CacheEnabled);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  DesiredLength,
+  __W32_IN ULONG  Alignment,
+  __W32_OUT PPHYSICAL_ADDRESS  LogicalAddress,
+  __W32_OUT PULONG  pActualLength,
+  __W32_IN BOOLEAN  CacheEnabled);
 
 VPAPI
 UCHAR
@@ -930,108 +930,108 @@
 PVOID
 DDKAPI
 VideoPortGetDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfUchars,
-  IN UCHAR  InIoSpace);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PHYSICAL_ADDRESS  IoAddress,
+  __W32_IN ULONG  NumberOfUchars,
+  __W32_IN UCHAR  InIoSpace);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortGetDeviceData(
-  IN PVOID  HwDeviceExtension,
-  IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,
-  IN PMINIPORT_QUERY_DEVICE_ROUTINE  CallbackRoutine,
-  IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,
+  __W32_IN PMINIPORT_QUERY_DEVICE_ROUTINE  CallbackRoutine,
+  __W32_IN PVOID  Context);
 
 VPAPI
 PVP_DMA_ADAPTER
 DDKAPI
 VideoPortGetDmaAdapter(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DEVICE_DESCRIPTION  VpDeviceDescription);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVP_DEVICE_DESCRIPTION  VpDeviceDescription);
 
 VPAPI
 PVOID
 DDKAPI
 VideoPortGetDmaContext(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PDMA  pDma);
 
 VPAPI
 PVOID
 DDKAPI
 VideoPortGetMdl(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PDMA  pDma);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortGetRegistryParameters(
-  IN PVOID  HwDeviceExtension,
-  IN PWSTR  ParameterName,
-  IN UCHAR  IsParameterFileName,
-  IN PMINIPORT_GET_REGISTRY_ROUTINE  CallbackRoutine,
-  IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PWSTR  ParameterName,
+  __W32_IN UCHAR  IsParameterFileName,
+  __W32_IN PMINIPORT_GET_REGISTRY_ROUTINE  CallbackRoutine,
+  __W32_IN PVOID  Context);
 
 VPAPI
 PVOID
 DDKAPI
 VideoPortGetRomImage(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Unused1,
-  IN ULONG  Unused2,
-  IN ULONG  Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Unused1,
+  __W32_IN ULONG  Unused2,
+  __W32_IN ULONG  Length);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortGetVersion(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVPOSVERSIONINFO  pVpOsVersionInfo);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN __W32_OUT PVPOSVERSIONINFO  pVpOsVersionInfo);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortGetVgaStatus(
-  IN PVOID  HwDeviceExtension,
-  OUT PULONG  VgaStatus);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_OUT PULONG  VgaStatus);
 
 VPAPI
 ULONG
 DDKAPI
 VideoPortInitialize(
-  IN PVOID  Argument1,
-  IN PVOID  Argument2,
-  IN PVIDEO_HW_INITIALIZATION_DATA  HwInitializationData,
-  IN PVOID  HwContext);
+  __W32_IN PVOID  Argument1,
+  __W32_IN PVOID  Argument2,
+  __W32_IN PVIDEO_HW_INITIALIZATION_DATA  HwInitializationData,
+  __W32_IN PVOID  HwContext);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortInt10(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_X86_BIOS_ARGUMENTS  BiosArguments);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVIDEO_X86_BIOS_ARGUMENTS  BiosArguments);
 
 VPAPI
 LONG
 DDKFASTAPI
 VideoPortInterlockedDecrement(
-  IN PLONG  Addend);
+  __W32_IN PLONG  Addend);
 
 VPAPI
 LONG
 DDKFASTAPI
 VideoPortInterlockedExchange(
-  IN OUT PLONG  Target,
-  IN LONG  Value);
+  __W32_IN __W32_OUT PLONG  Target,
+  __W32_IN LONG  Value);
 
 VPAPI
 LONG
 DDKFASTAPI
 VideoPortInterlockedIncrement(
-  IN PLONG  Addend);
+  __W32_IN PLONG  Addend);
 
 typedef enum _VP_LOCK_OPERATION {
   VpReadAccess = 0,
@@ -1043,37 +1043,37 @@
 PVOID
 DDKAPI
 VideoPortLockBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  BaseAddress,
-  IN ULONG  Length,
-  IN VP_LOCK_OPERATION  Operation);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN ULONG  Length,
+  __W32_IN VP_LOCK_OPERATION  Operation);
 
 VPAPI
 BOOLEAN
 DDKAPI
 VideoPortLockPages(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVIDEO_REQUEST_PACKET  pVrp,
-  IN OUT PEVENT  pUEvent,
-  IN PEVENT  pDisplayEvent,
-  IN DMA_FLAGS  DmaFlags);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN __W32_OUT PVIDEO_REQUEST_PACKET  pVrp,
+  __W32_IN __W32_OUT PEVENT  pUEvent,
+  __W32_IN PEVENT  pDisplayEvent,
+  __W32_IN DMA_FLAGS  DmaFlags);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortLogError(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_REQUEST_PACKET  Vrp  OPTIONAL,
-  IN VP_STATUS  ErrorCode,
-  IN ULONG  UniqueId);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVIDEO_REQUEST_PACKET  Vrp  __W32_OPTIONAL,
+  __W32_IN VP_STATUS  ErrorCode,
+  __W32_IN ULONG  UniqueId);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortMapBankedMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN OUT PULONG  Length,
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PHYSICAL_ADDRESS  PhysicalAddress,
+  __W32_IN __W32_OUT PULONG  Length,
   PULONG  InIoSpace,
   PVOID  *VirtualAddress,
   ULONG  BankLength,
@@ -1085,46 +1085,46 @@
 PDMA
 DDKAPI
 VideoPortMapDmaMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_REQUEST_PACKET  pVrp,
-  IN PHYSICAL_ADDRESS  BoardAddress,
-  IN PULONG  Length,
-  IN PULONG  InIoSpace,
-  IN PVOID  MappedUserEvent,
-  IN PVOID  DisplayDriverEvent,
-  IN OUT PVOID  *VirtualAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVIDEO_REQUEST_PACKET  pVrp,
+  __W32_IN PHYSICAL_ADDRESS  BoardAddress,
+  __W32_IN PULONG  Length,
+  __W32_IN PULONG  InIoSpace,
+  __W32_IN PVOID  MappedUserEvent,
+  __W32_IN PVOID  DisplayDriverEvent,
+  __W32_IN __W32_OUT PVOID  *VirtualAddress);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortMapMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN OUT PULONG  Length,
-  IN PULONG  InIoSpace,
-  IN OUT PVOID  *VirtualAddress);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PHYSICAL_ADDRESS  PhysicalAddress,
+  __W32_IN __W32_OUT PULONG  Length,
+  __W32_IN PULONG  InIoSpace,
+  __W32_IN __W32_OUT PVOID  *VirtualAddress);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortMoveMemory(
-  IN PVOID  Destination,
-  IN PVOID  Source,
-  IN ULONG  Length);
+  __W32_IN PVOID  Destination,
+  __W32_IN PVOID  Source,
+  __W32_IN ULONG  Length);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortPutDmaAdapter(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVP_DMA_ADAPTER  VpDmaAdapter);
 
 VPAPI
 LONGLONG
 DDKAPI
 VideoPortQueryPerformanceCounter(
-  IN PVOID  HwDeviceExtension,
-  OUT PLONGLONG  PerformanceFrequency  OPTIONAL);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_OUT PLONGLONG  PerformanceFrequency  __W32_OPTIONAL);
 
 /* VideoPortQueryServices.ServicesType constants */
 typedef enum _VIDEO_PORT_SERVICES {
@@ -1138,153 +1138,153 @@
 VP_STATUS
 DDKAPI
 VideoPortQueryServices(
-  IN PVOID HwDeviceExtension,
-  IN VIDEO_PORT_SERVICES ServicesType,
-  IN OUT PINTERFACE Interface);
+  __W32_IN PVOID HwDeviceExtension,
+  __W32_IN VIDEO_PORT_SERVICES ServicesType,
+  __W32_IN __W32_OUT PINTERFACE Interface);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
+  __W32_OUT PLARGE_INTEGER  CurrentTime);
 
 VPAPI
 BOOLEAN
 DDKAPI
 VideoPortQueueDpc(
-  IN PVOID  HwDeviceExtension,
-  IN PMINIPORT_DPC_ROUTINE  CallbackRoutine,
-  IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PMINIPORT_DPC_ROUTINE  CallbackRoutine,
+  __W32_IN PVOID  Context);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReadPortBufferUchar(
-  IN PUCHAR  Port,
-  OUT PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Port,
+  __W32_OUT PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReadPortBufferUlong(
-  IN PULONG  Port,
-  OUT PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Port,
+  __W32_OUT PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReadPortBufferUshort(
-  IN PUSHORT  Port,
-  OUT PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Port,
+  __W32_OUT PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 UCHAR
 DDKAPI
 VideoPortReadPortUchar(
-  IN PUCHAR  Port);
+  __W32_IN PUCHAR  Port);
 
 VPAPI
 ULONG
 DDKAPI
 VideoPortReadPortUlong(
-  IN PULONG  Port);
+  __W32_IN PULONG  Port);
 
 VPAPI
 USHORT
 DDKAPI
 VideoPortReadPortUshort(
-  IN PUSHORT  Port);
+  __W32_IN PUSHORT  Port);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReadRegisterBufferUchar(
-  IN PUCHAR  Register,
-  OUT PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Register,
+  __W32_OUT PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReadRegisterBufferUlong(
-  IN PULONG  Register,
-  OUT PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Register,
+  __W32_OUT PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReadRegisterBufferUshort(
-  IN PUSHORT  Register,
-  OUT PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Register,
+  __W32_OUT PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 UCHAR
 DDKAPI
 VideoPortReadRegisterUchar(
-  IN PUCHAR  Register);
+  __W32_IN PUCHAR  Register);
 
 VPAPI
 ULONG
 DDKAPI
 VideoPortReadRegisterUlong(
-  IN PULONG  Register);
+  __W32_IN PULONG  Register);
 
 VPAPI
 USHORT
 DDKAPI
 VideoPortReadRegisterUshort(
-  IN PUSHORT  Register);
+  __W32_IN PUSHORT  Register);
 
 VPAPI
 LONG
 DDKAPI
 VideoPortReadStateEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PEVENT  pEvent);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReleaseBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Buffer);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Buffer);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReleaseCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN ULONG  Length,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN PVOID  VirtualAddress,
-  IN BOOLEAN  CacheEnabled);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVP_DMA_ADAPTER  VpDmaAdapter,
+  __W32_IN ULONG  Length,
+  __W32_IN PHYSICAL_ADDRESS  LogicalAddress,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN BOOLEAN  CacheEnabled);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReleaseDeviceLock(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReleaseSpinLock(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock,
-  IN UCHAR  NewIrql);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSPIN_LOCK  SpinLock,
+  __W32_IN UCHAR  NewIrql);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortReleaseSpinLockFromDpcLevel(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PSPIN_LOCK  SpinLock);
 
 VPAPI
 BOOLEAN
@@ -1299,90 +1299,90 @@
 ULONG
 DDKAPI
 VideoPortSetBusData(
-  IN PVOID  HwDeviceExtension,
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN BUS_DATA_TYPE  BusDataType,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortSetBytesUsed(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PDMA  pDma,
-  IN ULONG  BytesUsed);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN __W32_OUT PDMA  pDma,
+  __W32_IN ULONG  BytesUsed);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortSetDmaContext(
-  IN PVOID  HwDeviceExtension,
-  OUT PDMA  pDma,
-  IN PVOID  InstanceContext);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_OUT PDMA  pDma,
+  __W32_IN PVOID  InstanceContext);
 
 VPAPI
 LONG
 DDKAPI
 VideoPortSetEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PEVENT  pEvent);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortSetRegistryParameters(
-  IN PVOID  HwDeviceExtension,
-  IN PWSTR  ValueName,
-  IN PVOID  ValueData,
-  IN ULONG  ValueLength);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PWSTR  ValueName,
+  __W32_IN PVOID  ValueData,
+  __W32_IN ULONG  ValueLength);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortSetTrappedEmulatorPorts(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumAccessRanges,
-  IN PVIDEO_ACCESS_RANGE  AccessRange);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  NumAccessRanges,
+  __W32_IN PVIDEO_ACCESS_RANGE  AccessRange);
 
 VPAPI
 BOOLEAN
 DDKAPI
 VideoPortSignalDmaComplete(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  pDmaHandle);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  pDmaHandle);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortStallExecution(
-  IN ULONG  Microseconds);
+  __W32_IN ULONG  Microseconds);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortStartDma(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN PVOID  Mdl,
-  IN ULONG  Offset,
-  IN OUT PULONG  pLength,
-  IN PEXECUTE_DMA  ExecuteDmaRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVP_DMA_ADAPTER  VpDmaAdapter,
+  __W32_IN PVOID  Mdl,
+  __W32_IN ULONG  Offset,
+  __W32_IN __W32_OUT PULONG  pLength,
+  __W32_IN PEXECUTE_DMA  ExecuteDmaRoutine,
+  __W32_IN PVOID  Context,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortStartTimer(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortStopTimer(
-  IN PVOID  HwDeviceExtension);
+  __W32_IN PVOID  HwDeviceExtension);
 
 /* VideoPortSynchronizeExecution.Priority constants */
 typedef enum VIDEO_SYNCHRONIZE_PRIORITY {
@@ -1395,161 +1395,161 @@
 BOOLEAN
 DDKAPI
 VideoPortSynchronizeExecution(
-  IN PVOID  HwDeviceExtension,
-  IN VIDEO_SYNCHRONIZE_PRIORITY  Priority,
-  IN PMINIPORT_SYNCHRONIZE_ROUTINE  SynchronizeRoutine,
-  IN PVOID  Context);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN VIDEO_SYNCHRONIZE_PRIORITY  Priority,
+  __W32_IN PMINIPORT_SYNCHRONIZE_ROUTINE  SynchronizeRoutine,
+  __W32_IN PVOID  Context);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortUnLockBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Mdl);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Mdl);
 
 VPAPI
 BOOLEAN
 DDKAPI
 VideoPortUnlockPages(
-  IN PVOID  hwDeviceExtension,
-  IN OUT PDMA  pDma);
+  __W32_IN PVOID  hwDeviceExtension,
+  __W32_IN __W32_OUT PDMA  pDma);
 
 VPAPI
 BOOLEAN
 DDKAPI
 VideoPortUnmapDmaMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  VirtualAddress,
-  IN HANDLE  ProcessHandle,
-  IN PDMA  BoardMemoryHandle);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PDMA  BoardMemoryHandle);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortUnmapMemory(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVOID  VirtualAddress,
-  IN HANDLE  ProcessHandle);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN __W32_OUT PVOID  VirtualAddress,
+  __W32_IN HANDLE  ProcessHandle);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortVerifyAccessRanges(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumAccessRanges,
-  IN PVIDEO_ACCESS_RANGE  AccessRanges);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN ULONG  NumAccessRanges,
+  __W32_IN PVIDEO_ACCESS_RANGE  AccessRanges);
 
 VPAPI
 VP_STATUS
 DDKAPI
 VideoPortWaitForSingleObject(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Object,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL);
+  __W32_IN PVOID  HwDeviceExtension,
+  __W32_IN PVOID  Object,
+  __W32_IN PLARGE_INTEGER  Timeout  __W32_OPTIONAL);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWritePortBufferUchar(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Port,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWritePortBufferUlong(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Port,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWritePortBufferUshort(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Port,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWritePortUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
+  __W32_IN PUCHAR  Port,
+  __W32_IN UCHAR  Value);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWritePortUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
+  __W32_IN PULONG  Port,
+  __W32_IN ULONG  Value);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWritePortUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Port,
+  __W32_IN USHORT  Value);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWriteRegisterBufferUchar(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Register,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWriteRegisterBufferUlong(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Register,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWriteRegisterBufferUshort(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Register,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWriteRegisterUchar(
-  IN PUCHAR  Register,
-  IN UCHAR  Value);
+  __W32_IN PUCHAR  Register,
+  __W32_IN UCHAR  Value);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWriteRegisterUlong(
-  IN PULONG  Register,
-  IN ULONG  Value);
+  __W32_IN PULONG  Register,
+  __W32_IN ULONG  Value);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortWriteRegisterUshort(
-  IN PUSHORT  Register,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Register,
+  __W32_IN USHORT  Value);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortZeroDeviceMemory(
-  IN PVOID  Destination,
-  IN ULONG  Length);
+  __W32_IN PVOID  Destination,
+  __W32_IN ULONG  Length);
 
 VPAPI
 VOID
 DDKAPI
 VideoPortZeroMemory(
-  IN PVOID  Destination,
-  IN ULONG  Length);
+  __W32_IN PVOID  Destination,
+  __W32_IN ULONG  Length);
 
 #ifdef DBG
 #define VideoDebugPrint(x) VideoPortDebugPrint x
diff -ru w32api-3.6.orig/include/ddk/videoagp.h w32api-3.6/include/ddk/videoagp.h
--- w32api-3.6.orig/include/ddk/videoagp.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/videoagp.h	2006-02-06 16:41:14.000000000 +1030
@@ -41,67 +41,67 @@
 #define VIDEO_AGP_RATE_8X                 0x00000008
 
 typedef enum _VIDEO_PORT_CACHE_TYPE {
-	VpNonCached = 0,
-	VpWriteCombined,
-	VpCached
+  VpNonCached = 0,
+  VpWriteCombined,
+  VpCached
 } VIDEO_PORT_CACHE_TYPE;
 
 typedef BOOLEAN DDKAPI
 (*PAGP_COMMIT_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  PhysicalReserveContext,
-  IN  ULONG  Pages,
-  IN  ULONG  Offset);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  PVOID  PhysicalReserveContext,
+  __W32_IN  ULONG  Pages,
+  __W32_IN  ULONG  Offset);
 
 typedef PVOID DDKAPI
 (*PAGP_COMMIT_VIRTUAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  VirtualReserveContext,
-	IN  ULONG  Pages,
-	IN  ULONG  Offset);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  PVOID  VirtualReserveContext,
+  __W32_IN  ULONG  Pages,
+  __W32_IN  ULONG  Offset);
 
 typedef VOID DDKAPI
 (*PAGP_FREE_PHYSICAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  PhysicalReserveContext,
-	IN  ULONG  Pages,
-	IN  ULONG  Offset);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  PVOID  PhysicalReserveContext,
+  __W32_IN  ULONG  Pages,
+  __W32_IN  ULONG  Offset);
 
 typedef VOID DDKAPI
 (*PAGP_FREE_VIRTUAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  VirtualReserveContext,
-  IN  ULONG  Pages,
-  IN  ULONG  Offset);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  PVOID  VirtualReserveContext,
+  __W32_IN  ULONG  Pages,
+  __W32_IN  ULONG  Offset);
 
 typedef VOID DDKAPI
 (*PAGP_RELEASE_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  PhysicalReserveContext);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  PVOID  PhysicalReserveContext);
 
 typedef VOID DDKAPI
 (*PAGP_RELEASE_VIRTUAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  VirtualReserveContext);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  PVOID  VirtualReserveContext);
 
 typedef PHYSICAL_ADDRESS DDKAPI
 (*PAGP_RESERVE_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  ULONG  Pages,
-  IN  VIDEO_PORT_CACHE_TYPE  Caching,
-  OUT PVOID  *PhysicalReserveContext);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  ULONG  Pages,
+  __W32_IN  VIDEO_PORT_CACHE_TYPE  Caching,
+  __W32_OUT PVOID  *PhysicalReserveContext);
 
 typedef PVOID DDKAPI
 (*PAGP_RESERVE_VIRTUAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  HANDLE  ProcessHandle,
-  IN  PVOID  PhysicalReserveContext,
-  OUT PVOID  *VirtualReserveContext);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  HANDLE  ProcessHandle,
+  __W32_IN  PVOID  PhysicalReserveContext,
+  __W32_OUT PVOID  *VirtualReserveContext);
 
 typedef BOOLEAN DDKAPI
 (*PAGP_SET_RATE)(
-	IN  PVOID  HwDeviceExtension,
-	IN  ULONG  AgpRate);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  ULONG  AgpRate);
 
 typedef struct _VIDEO_PORT_AGP_SERVICES {
   PAGP_RESERVE_PHYSICAL  AgpReservePhysical;
@@ -119,8 +119,8 @@
 BOOLEAN
 DDKAPI
 VideoPortGetAgpServices(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVIDEO_PORT_AGP_SERVICES  AgpServices);
+  __W32_IN  PVOID  HwDeviceExtension,
+  __W32_IN  PVIDEO_PORT_AGP_SERVICES  AgpServices);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/win2k.h w32api-3.6/include/ddk/win2k.h
--- w32api-3.6.orig/include/ddk/win2k.h	2002-12-21 04:21:09.000000000 +1030
+++ w32api-3.6/include/ddk/win2k.h	2006-02-06 16:41:14.000000000 +1030
@@ -56,40 +56,40 @@
 VOID
 DDKAPI
 ExReleaseResourceForThreadLite(
-  IN PERESOURCE  Resource,
-  IN ERESOURCE_THREAD  ResourceThreadId);
+  __W32_IN PERESOURCE  Resource,
+  __W32_IN ERESOURCE_THREAD  ResourceThreadId);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReadPartitionTable(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN BOOLEAN  ReturnRecognizedPartitions,
-  OUT struct _DRIVE_LAYOUT_INFORMATION  **PartitionBuffer);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  SectorSize,
+  __W32_IN BOOLEAN  ReturnRecognizedPartitions,
+  __W32_OUT struct _DRIVE_LAYOUT_INFORMATION  **PartitionBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoSetPartitionInformation(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN ULONG  PartitionNumber,
-  IN ULONG  PartitionType);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  SectorSize,
+  __W32_IN ULONG  PartitionNumber,
+  __W32_IN ULONG  PartitionType);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWritePartitionTable(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN ULONG  SectorsPerTrack,
-  IN ULONG  NumberOfHeads,
-  IN struct _DRIVE_LAYOUT_INFORMATION  *PartitionBuffer);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  SectorSize,
+  __W32_IN ULONG  SectorsPerTrack,
+  __W32_IN ULONG  NumberOfHeads,
+  __W32_IN struct _DRIVE_LAYOUT_INFORMATION  *PartitionBuffer);
 
 /*
  * PVOID MmGetSystemAddressForMdl(
- *   IN PMDL  Mdl); 
+ *   __W32_IN PMDL  Mdl);
  */
 #define MmGetSystemAddressForMdl(Mdl) \
   (((Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | \
diff -ru w32api-3.6.orig/include/ddk/winddi.h w32api-3.6/include/ddk/winddi.h
--- w32api-3.6.orig/include/ddk/winddi.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/winddi.h	2006-02-06 16:41:14.000000000 +1030
@@ -151,8 +151,8 @@
 #define GX_GENERAL                        3
 
 typedef struct _POINTE {
-	FLOATL  x;
-	FLOATL  y;
+  FLOATL  x;
+  FLOATL  y;
 } POINTE, *PPOINTE;
 
 typedef union _FLOAT_LONG {
@@ -350,7 +350,7 @@
 
 typedef BOOL DDKAPI CALLBACK
 (*FREEOBJPROC)(
-  IN PDRIVEROBJ  pDriverObj);
+  __W32_IN PDRIVEROBJ  pDriverObj);
 
 typedef struct _DRIVEROBJ {
   PVOID  pvObj;
@@ -927,7 +927,7 @@
 #define MAXCHARSETS                       16
 
 /* IFIMETRICS.ulPanoseCulture constants */
-#define  FM_PANOSE_CULTURE_LATIN          0x0
+#define FM_PANOSE_CULTURE_LATIN           0x0
 
 typedef struct _IFIMETRICS {
   ULONG  cjThis;
@@ -1058,18 +1058,18 @@
 
 typedef struct _SURFACEALIGNMENT {
   union {
-		struct {
-			DWORD  dwStartAlignment;
-			DWORD  dwPitchAlignment;
-			DWORD  dwReserved1;
-			DWORD  dwReserved2;
-		} Linear;
-		struct {
-			DWORD  dwXAlignment;
-			DWORD  dwYAlignment;
-			DWORD  dwReserved1;
-			DWORD  dwReserved2;
-		} Rectangular;
+    struct {
+      DWORD  dwStartAlignment;
+      DWORD  dwPitchAlignment;
+      DWORD  dwReserved1;
+      DWORD  dwReserved2;
+    } Linear;
+    struct {
+      DWORD  dwXAlignment;
+      DWORD  dwYAlignment;
+      DWORD  dwReserved1;
+      DWORD  dwReserved2;
+    } Rectangular;
   };
 } SURFACEALIGNMENT, *LPSURFACEALIGNMENT;
 
@@ -1149,42 +1149,42 @@
 } XLATEOBJ;
 
 typedef VOID DDKAPI (CALLBACK *WNDOBJCHANGEPROC)(
-  IN WNDOBJ  *pwo,
-  IN FLONG  fl);
+  __W32_IN WNDOBJ  *pwo,
+  __W32_IN FLONG  fl);
 
 
 WIN32KAPI
 HANDLE
 DDKAPI
 BRUSHOBJ_hGetColorTransform(
-  IN BRUSHOBJ  *pbo);
+  __W32_IN BRUSHOBJ  *pbo);
 
 WIN32KAPI
 PVOID
 DDKAPI
 BRUSHOBJ_pvAllocRbrush(
-  IN BRUSHOBJ  *pbo,
-  IN ULONG  cj);
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN ULONG  cj);
 
 WIN32KAPI
 PVOID
 DDKAPI
 BRUSHOBJ_pvGetRbrush(
-  IN BRUSHOBJ  *pbo);
+  __W32_IN BRUSHOBJ  *pbo);
 
 WIN32KAPI
 ULONG
 DDKAPI
 BRUSHOBJ_ulGetBrushColor(
-  IN BRUSHOBJ  *pbo);
+  __W32_IN BRUSHOBJ  *pbo);
 
 WIN32KAPI
 BOOL
 DDKAPI
 CLIPOBJ_bEnum(
-  IN CLIPOBJ  *pco,
-  IN ULONG  cj,
-  OUT ULONG  *pv);
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN ULONG  cj,
+  __W32_OUT ULONG  *pv);
 
 /* CLIPOBJ_cEnumStart.iType constants */
 #define CT_RECTANGLES                     0L
@@ -1202,23 +1202,23 @@
 ULONG
 DDKAPI
 CLIPOBJ_cEnumStart(
-  IN CLIPOBJ  *pco,
-  IN BOOL  bAll,
-  IN ULONG  iType,
-  IN ULONG  iDirection,
-  IN ULONG  cLimit);
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN BOOL  bAll,
+  __W32_IN ULONG  iType,
+  __W32_IN ULONG  iDirection,
+  __W32_IN ULONG  cLimit);
 
 WIN32KAPI
 PATHOBJ*
 DDKAPI
 CLIPOBJ_ppoGetPath(
-  IN CLIPOBJ  *pco);
+  __W32_IN CLIPOBJ  *pco);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngAcquireSemaphore(
-  IN HSEMAPHORE  hsem);
+  __W32_IN HSEMAPHORE  hsem);
 
 #define FL_ZERO_MEMORY                    0x00000001
 #define FL_NONPAGED_MEMORY                0x00000002
@@ -1227,36 +1227,36 @@
 PVOID
 DDKAPI
 EngAllocMem(
-  IN ULONG  Flags,
-  IN ULONG  MemSize,
-  IN ULONG  Tag);
+  __W32_IN ULONG  Flags,
+  __W32_IN ULONG  MemSize,
+  __W32_IN ULONG  Tag);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngAllocPrivateUserMem(
-  IN PDD_SURFACE_LOCAL  psl,
-  IN SIZE_T  cj,
-  IN ULONG  tag);
+  __W32_IN PDD_SURFACE_LOCAL  psl,
+  __W32_IN SIZE_T  cj,
+  __W32_IN ULONG  tag);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngAllocUserMem(
-  IN SIZE_T  cj,
-  IN ULONG  tag);
+  __W32_IN SIZE_T  cj,
+  __W32_IN ULONG  tag);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngAlphaBlend(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN BLENDOBJ  *pBlendObj);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN BLENDOBJ  *pBlendObj);
 
 /* EngAssociateSurface.flHooks constants */
 #define HOOK_BITBLT                       0x00000001
@@ -1282,45 +1282,45 @@
 BOOL
 DDKAPI
 EngAssociateSurface(
-  IN HSURF  hsurf,
-  IN HDEV  hdev,
-  IN FLONG  flHooks);
+  __W32_IN HSURF  hsurf,
+  __W32_IN HDEV  hdev,
+  __W32_IN FLONG  flHooks);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngBitBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclTrg,
-  IN POINTL  *pptlSrc,
-  IN POINTL  *pptlMask,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrush,
-  IN ROP4  rop4);
+  __W32_IN SURFOBJ  *psoTrg,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclTrg,
+  __W32_IN POINTL  *pptlSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrush,
+  __W32_IN ROP4  rop4);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngCheckAbort(
-  IN SURFOBJ  *pso);
+  __W32_IN SURFOBJ  *pso);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngClearEvent(
-  IN PEVENT  pEvent);
+  __W32_IN PEVENT  pEvent);
 
 WIN32KAPI
 FD_GLYPHSET*
 DDKAPI
 EngComputeGlyphSet(
-  IN INT  nCodePage,
-  IN INT  nFirstChar,
-  IN INT  cChars);
+  __W32_IN INT  nCodePage,
+  __W32_IN INT  nFirstChar,
+  __W32_IN INT  cChars);
 
 /* EngControlSprites.fl constants */
 #define ECS_TEARDOWN                      0x00000001
@@ -1330,29 +1330,29 @@
 BOOL
 DDKAPI
 EngControlSprites(
-  IN WNDOBJ  *pwo,
-  IN FLONG  fl);
+  __W32_IN WNDOBJ  *pwo,
+  __W32_IN FLONG  fl);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngCopyBits(
-  OUT SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN POINTL  *pptlSrc);
+  __W32_OUT SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN POINTL  *pptlSrc);
 
 WIN32KAPI
 HBITMAP
 DDKAPI
 EngCreateBitmap(
-  IN SIZEL  sizl,
-  IN LONG  lWidth,
-  IN ULONG  iFormat,
-  IN FLONG  fl,
-  IN PVOID  pvBits);
+  __W32_IN SIZEL  sizl,
+  __W32_IN LONG  lWidth,
+  __W32_IN ULONG  iFormat,
+  __W32_IN FLONG  fl,
+  __W32_IN PVOID  pvBits);
 
 WIN32KAPI
 CLIPOBJ*
@@ -1364,9 +1364,9 @@
 HBITMAP
 DDKAPI
 EngCreateDeviceBitmap(
-  IN DHSURF  dhsurf,
-  IN SIZEL  sizl,
-  IN ULONG  iFormatCompat);
+  __W32_IN DHSURF  dhsurf,
+  __W32_IN SIZEL  sizl,
+  __W32_IN ULONG  iFormatCompat);
 
 WIN32KAPI
 HSURF
@@ -1390,7 +1390,7 @@
 BOOL
 DDKAPI
 EngCreateEvent(
-  OUT PEVENT  *ppEvent);
+  __W32_OUT PEVENT  *ppEvent);
 
 /* EngCreatePalette.iMode constants */
 #define PAL_INDEXED                       0x00000001
@@ -1403,12 +1403,12 @@
 HPALETTE
 DDKAPI
 EngCreatePalette(
-  IN ULONG  iMode,
-  IN ULONG  cColors,
-  IN ULONG  *pulColors,
-  IN FLONG  flRed,
-  IN FLONG  flGreen,
-  IN FLONG  flBlue);
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  cColors,
+  __W32_IN ULONG  *pulColors,
+  __W32_IN FLONG  flRed,
+  __W32_IN FLONG  flGreen,
+  __W32_IN FLONG  flBlue);
 
 WIN32KAPI
 PATHOBJ*
@@ -1453,146 +1453,146 @@
 VOID
 DDKAPI
 EngDebugPrint(
-  IN PCHAR StandardPrefix,
-  IN PCHAR DebugMessage,
-  IN va_list ap);
+  __W32_IN PCHAR StandardPrefix,
+  __W32_IN PCHAR DebugMessage,
+  __W32_IN va_list ap);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngDeleteClip(
-  IN CLIPOBJ  *pco);
+  __W32_IN CLIPOBJ  *pco);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngDeleteDriverObj(
-  IN HDRVOBJ  hdo,
-  IN BOOL  bCallBack,
-  IN BOOL  bLocked);
+  __W32_IN HDRVOBJ  hdo,
+  __W32_IN BOOL  bCallBack,
+  __W32_IN BOOL  bLocked);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngDeleteEvent(
-  IN PEVENT  pEvent);
+  __W32_IN PEVENT  pEvent);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngDeleteFile(
-  IN LPWSTR  pwszFileName);
+  __W32_IN LPWSTR  pwszFileName);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngDeletePalette(
-  IN HPALETTE  hpal);
+  __W32_IN HPALETTE  hpal);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngDeletePath(
-  IN PATHOBJ  *ppo);
+  __W32_IN PATHOBJ  *ppo);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngDeleteSafeSemaphore(
-  IN OUT ENGSAFESEMAPHORE  *pssem);
+  __W32_IN __W32_OUT ENGSAFESEMAPHORE  *pssem);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngDeleteSemaphore(
-  IN OUT HSEMAPHORE  hsem);
+  __W32_IN __W32_OUT HSEMAPHORE  hsem);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngDeleteSurface(
-  IN HSURF  hsurf);
+  __W32_IN HSURF  hsurf);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngDeleteWnd(
-  IN WNDOBJ  *pwo);
+  __W32_IN WNDOBJ  *pwo);
 
 WIN32KAPI
 DWORD
 DDKAPI
 EngDeviceIoControl(
-  IN HANDLE  hDevice,
-  IN DWORD  dwIoControlCode,
-  IN LPVOID  lpInBuffer,
-  IN DWORD  nInBufferSize,
-  IN OUT LPVOID  lpOutBuffer,
-  IN DWORD  nOutBufferSize,
-  OUT LPDWORD  lpBytesReturned);
+  __W32_IN HANDLE  hDevice,
+  __W32_IN DWORD  dwIoControlCode,
+  __W32_IN LPVOID  lpInBuffer,
+  __W32_IN DWORD  nInBufferSize,
+  __W32_IN __W32_OUT LPVOID  lpOutBuffer,
+  __W32_IN DWORD  nOutBufferSize,
+  __W32_OUT LPDWORD  lpBytesReturned);
 
 WIN32KAPI
 ULONG
 DDKAPI
 EngDitherColor(
-  IN HDEV  hdev,
-  IN ULONG  iMode,
-  IN ULONG  rgb,
-  OUT ULONG  *pul);
+  __W32_IN HDEV  hdev,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  rgb,
+  __W32_OUT ULONG  *pul);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngEnumForms(
-  IN HANDLE  hPrinter,
-  IN DWORD  Level,
-  OUT LPBYTE  pForm,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcbNeeded,
-  OUT LPDWORD  pcReturned);
+  __W32_IN HANDLE  hPrinter,
+  __W32_IN DWORD  Level,
+  __W32_OUT LPBYTE  pForm,
+  __W32_IN DWORD  cbBuf,
+  __W32_OUT LPDWORD  pcbNeeded,
+  __W32_OUT LPDWORD  pcReturned);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngEraseSurface(
-  IN SURFOBJ  *pso,
-  IN RECTL  *prcl,
-  IN ULONG  iColor);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN RECTL  *prcl,
+  __W32_IN ULONG  iColor);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix,
-  IN FLONG  flOptions);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mix,
+  __W32_IN FLONG  flOptions);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngFindImageProcAddress(
-  IN HANDLE  hModule,
-  IN LPSTR  lpProcName);
+  __W32_IN HANDLE  hModule,
+  __W32_IN LPSTR  lpProcName);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngFindResource(
-  IN HANDLE  h,
-  IN int  iName,
-  IN int  iType,
-  OUT PULONG  pulSize);
+  __W32_IN HANDLE  h,
+  __W32_IN int  iName,
+  __W32_IN int  iType,
+  __W32_OUT PULONG  pulSize);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngFntCacheAlloc(
-  IN ULONG  FastCheckSum,
-  IN ULONG  ulSize);
+  __W32_IN ULONG  FastCheckSum,
+  __W32_IN ULONG  ulSize);
 
 /* EngFntCacheFault.iFaultMode constants */
 #define ENG_FNT_CACHE_READ_FAULT          0x00000001
@@ -1602,47 +1602,47 @@
 VOID
 DDKAPI
 EngFntCacheFault(
-  IN ULONG  ulFastCheckSum,
-  IN ULONG  iFaultMode);
+  __W32_IN ULONG  ulFastCheckSum,
+  __W32_IN ULONG  iFaultMode);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngFntCacheLookUp(
-  IN ULONG  FastCheckSum,
-  OUT ULONG  *pulSize);
+  __W32_IN ULONG  FastCheckSum,
+  __W32_OUT ULONG  *pulSize);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngFreeMem(
-  IN PVOID  Mem);
+  __W32_IN PVOID  Mem);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngFreeModule(
-  IN HANDLE  h);
+  __W32_IN HANDLE  h);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngFreePrivateUserMem(
-  IN PDD_SURFACE_LOCAL  psl,
-  IN PVOID  pv);
+  __W32_IN PDD_SURFACE_LOCAL  psl,
+  __W32_IN PVOID  pv);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngFreeUserMem(
-  IN PVOID  pv);
+  __W32_IN PVOID  pv);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngGetCurrentCodePage(
-  OUT PUSHORT  OemCodePage,
-  OUT PUSHORT  AnsiCodePage);
+  __W32_OUT PUSHORT  OemCodePage,
+  __W32_OUT PUSHORT  AnsiCodePage);
 
 WIN32KAPI
 HANDLE
@@ -1660,32 +1660,32 @@
 LPWSTR
 DDKAPI
 EngGetDriverName(
-  IN HDEV  hdev);
+  __W32_IN HDEV  hdev);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngGetFileChangeTime(
-  IN HANDLE  h,
-  OUT LARGE_INTEGER  *pChangeTime);
+  __W32_IN HANDLE  h,
+  __W32_OUT LARGE_INTEGER  *pChangeTime);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngGetFilePath(
-  IN HANDLE  h,
-  OUT WCHAR  (*pDest)[MAX_PATH+1]);
+  __W32_IN HANDLE  h,
+  __W32_OUT WCHAR  (*pDest)[MAX_PATH+1]);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngGetForm(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pFormName,
-  IN DWORD  Level,
-  OUT LPBYTE  pForm,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcbNeeded);
+  __W32_IN HANDLE  hPrinter,
+  __W32_IN LPWSTR  pFormName,
+  __W32_IN DWORD  Level,
+  __W32_OUT LPBYTE  pForm,
+  __W32_IN DWORD  cbBuf,
+  __W32_OUT LPDWORD  pcbNeeded);
 
 WIN32KAPI
 ULONG
@@ -1697,39 +1697,39 @@
 BOOL
 DDKAPI
 EngGetPrinter(
-  IN HANDLE  hPrinter,
-  IN DWORD  dwLevel,
-  OUT LPBYTE  pPrinter,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcbNeeded);
+  __W32_IN HANDLE  hPrinter,
+  __W32_IN DWORD  dwLevel,
+  __W32_OUT LPBYTE  pPrinter,
+  __W32_IN DWORD  cbBuf,
+  __W32_OUT LPDWORD  pcbNeeded);
 
 WIN32KAPI
 DWORD
 DDKAPI
 EngGetPrinterData(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pValueName,
-  OUT LPDWORD  pType,
-  OUT LPBYTE  pData,
-  IN DWORD  nSize,
-  OUT LPDWORD  pcbNeeded);
+  __W32_IN HANDLE  hPrinter,
+  __W32_IN LPWSTR  pValueName,
+  __W32_OUT LPDWORD  pType,
+  __W32_OUT LPBYTE  pData,
+  __W32_IN DWORD  nSize,
+  __W32_OUT LPDWORD  pcbNeeded);
 
 WIN32KAPI
 LPWSTR
 DDKAPI
 EngGetPrinterDataFileName(
-  IN HDEV  hdev);
+  __W32_IN HDEV  hdev);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngGetPrinterDriver(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pEnvironment,
-  IN DWORD  dwLevel,
-  OUT BYTE  *lpbDrvInfo,
-  IN DWORD  cbBuf,
-  OUT DWORD  *pcbNeeded);
+  __W32_IN HANDLE  hPrinter,
+  __W32_IN LPWSTR  pEnvironment,
+  __W32_IN DWORD  dwLevel,
+  __W32_OUT BYTE  *lpbDrvInfo,
+  __W32_IN DWORD  cbBuf,
+  __W32_OUT DWORD  *pcbNeeded);
 
 WIN32KAPI
 HANDLE
@@ -1741,27 +1741,27 @@
 BOOL
 DDKAPI
 EngGetType1FontList(
-  IN HDEV  hdev,
-  OUT TYPE1_FONT  *pType1Buffer,
-  IN ULONG  cjType1Buffer,
-  OUT PULONG  pulLocalFonts,
-  OUT PULONG  pulRemoteFonts,
-  OUT LARGE_INTEGER  *pLastModified);
+  __W32_IN HDEV  hdev,
+  __W32_OUT TYPE1_FONT  *pType1Buffer,
+  __W32_IN ULONG  cjType1Buffer,
+  __W32_OUT PULONG  pulLocalFonts,
+  __W32_OUT PULONG  pulRemoteFonts,
+  __W32_OUT LARGE_INTEGER  *pLastModified);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngGradientFill(
-  IN SURFOBJ  *psoDest,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN TRIVERTEX  *pVertex,
-  IN ULONG  nVertex,
-  IN PVOID  pMesh,
-  IN ULONG  nMesh,
-  IN RECTL  *prclExtents,
-  IN POINTL  *pptlDitherOrg,
-  IN ULONG  ulMode);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN TRIVERTEX  *pVertex,
+  __W32_IN ULONG  nVertex,
+  __W32_IN PVOID  pMesh,
+  __W32_IN ULONG  nMesh,
+  __W32_IN RECTL  *prclExtents,
+  __W32_IN POINTL  *pptlDitherOrg,
+  __W32_IN ULONG  ulMode);
 
 /* EngHangNotification return values */
 #define EHN_RESTORED                      0x00000000
@@ -1771,26 +1771,26 @@
 ULONG
 DDKAPI
 EngHangNotification(
-  IN HDEV  hDev,
-  IN PVOID  Reserved);
+  __W32_IN HDEV  hDev,
+  __W32_IN PVOID  Reserved);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngInitializeSafeSemaphore(
-  OUT ENGSAFESEMAPHORE  *pssem);
+  __W32_OUT ENGSAFESEMAPHORE  *pssem);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngIsSemaphoreOwned(
-  IN HSEMAPHORE  hsem);
+  __W32_IN HSEMAPHORE  hsem);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngIsSemaphoreOwnedByCurrentThread(
-  IN HSEMAPHORE  hsem);
+  __W32_IN HSEMAPHORE  hsem);
 
 WIN32KAPI
 BOOL
@@ -1810,38 +1810,38 @@
 HANDLE
 DDKAPI
 EngLoadImage(
-  IN LPWSTR  pwszDriver);
+  __W32_IN LPWSTR  pwszDriver);
 
 WIN32KAPI
 HANDLE
 DDKAPI
 EngLoadModule(
-  IN LPWSTR  pwsz);
+  __W32_IN LPWSTR  pwsz);
 
 WIN32KAPI
 HANDLE
 DDKAPI
 EngLoadModuleForWrite(
-  IN LPWSTR  pwsz,
-  IN ULONG  cjSizeOfModule);
+  __W32_IN LPWSTR  pwsz,
+  __W32_IN ULONG  cjSizeOfModule);
 
 WIN32KAPI
 PDD_SURFACE_LOCAL
 DDKAPI
 EngLockDirectDrawSurface(
-  IN HANDLE  hSurface);
+  __W32_IN HANDLE  hSurface);
 
 WIN32KAPI
 DRIVEROBJ*
 DDKAPI
 EngLockDriverObj(
-  IN HDRVOBJ  hdo);
+  __W32_IN HDRVOBJ  hdo);
 
 WIN32KAPI
 SURFOBJ*
 DDKAPI
 EngLockSurface(
-  IN HSURF  hsurf);
+  __W32_IN HSURF  hsurf);
 
 WIN32KAPI
 BOOL
@@ -1853,19 +1853,19 @@
 PEVENT
 DDKAPI
 EngMapEvent(
-  IN HDEV  hDev,
-  IN HANDLE  hUserObject,
-  IN PVOID  Reserved1,
-  IN PVOID  Reserved2,
-  IN PVOID  Reserved3);
+  __W32_IN HDEV  hDev,
+  __W32_IN HANDLE  hUserObject,
+  __W32_IN PVOID  Reserved1,
+  __W32_IN PVOID  Reserved2,
+  __W32_IN PVOID  Reserved3);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngMapFile(
-  IN LPWSTR  pwsz,
-  IN ULONG  cjSize,
-  OUT ULONG_PTR  *piFile);
+  __W32_IN LPWSTR  pwsz,
+  __W32_IN ULONG  cjSize,
+  __W32_OUT ULONG_PTR  *piFile);
 
 WIN32KAPI
 BOOL
@@ -1879,22 +1879,22 @@
 BOOL
 DDKAPI
 EngMapFontFileFD(
-  IN ULONG_PTR  iFile,
-  OUT PULONG  *ppjBuf,
-  OUT ULONG  *pcjBuf);
+  __W32_IN ULONG_PTR  iFile,
+  __W32_OUT PULONG  *ppjBuf,
+  __W32_OUT ULONG  *pcjBuf);
 
 WIN32KAPI
 PVOID
 DDKAPI
 EngMapModule(
-  IN HANDLE  h,
-  OUT PULONG  pSize);
+  __W32_IN HANDLE  h,
+  __W32_OUT PULONG  pSize);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngMarkBandingSurface(
-  IN HSURF  hsurf);
+  __W32_IN HSURF  hsurf);
 
 /* EngModifySurface.flSurface constants */
 #define MS_NOTSYSTEMMEMORY                0x00000001
@@ -1904,93 +1904,93 @@
 BOOL
 DDKAPI
 EngModifySurface(
-  IN HSURF  hsurf,
-  IN HDEV  hdev,
-  IN FLONG  flHooks,
-  IN FLONG  flSurface,
-  IN DHSURF  dhsurf,
-  IN VOID  *pvScan0,
-  IN LONG  lDelta,
-  IN VOID  *pvReserved);
+  __W32_IN HSURF  hsurf,
+  __W32_IN HDEV  hdev,
+  __W32_IN FLONG  flHooks,
+  __W32_IN FLONG  flSurface,
+  __W32_IN DHSURF  dhsurf,
+  __W32_IN VOID  *pvScan0,
+  __W32_IN LONG  lDelta,
+  __W32_IN VOID  *pvReserved);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngMovePointer(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN RECTL  *prcl);
 
 WIN32KAPI
 int
 DDKAPI
 EngMulDiv(
-  IN int  a,
-  IN int  b,
-  IN int  c);
+  __W32_IN int  a,
+  __W32_IN int  b,
+  __W32_IN int  c);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngMultiByteToUnicodeN(
-  OUT LPWSTR  UnicodeString,
-  IN ULONG  MaxBytesInUnicodeString,
-  OUT PULONG  BytesInUnicodeString,
-  IN PCHAR  MultiByteString,
-  IN ULONG  BytesInMultiByteString);
+  __W32_OUT LPWSTR  UnicodeString,
+  __W32_IN ULONG  MaxBytesInUnicodeString,
+  __W32_OUT PULONG  BytesInUnicodeString,
+  __W32_IN PCHAR  MultiByteString,
+  __W32_IN ULONG  BytesInMultiByteString);
 
 WIN32KAPI
 INT
 DDKAPI
 EngMultiByteToWideChar(
-  IN UINT  CodePage,
-  OUT LPWSTR  WideCharString,
-  IN INT  BytesInWideCharString,
-  IN LPSTR  MultiByteString,
-  IN INT  BytesInMultiByteString);
+  __W32_IN UINT  CodePage,
+  __W32_OUT LPWSTR  WideCharString,
+  __W32_IN INT  BytesInWideCharString,
+  __W32_IN LPSTR  MultiByteString,
+  __W32_IN INT  BytesInMultiByteString);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngPaint(
-  IN SURFOBJ  *pso,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mix);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngPlgBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMsk,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlBrushOrg,
-  IN POINTFIX  *pptfx,
-  IN RECTL  *prcl,
-  IN POINTL  *pptl,
-  IN ULONG  iMode);
+  __W32_IN SURFOBJ  *psoTrg,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMsk,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN POINTFIX  *pptfx,
+  __W32_IN RECTL  *prcl,
+  __W32_IN POINTL  *pptl,
+  __W32_IN ULONG  iMode);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngProbeForRead(
-  IN PVOID  Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
+  __W32_IN PVOID  Address,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  Alignment);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngProbeForReadAndWrite(
-  IN PVOID  Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
+  __W32_IN PVOID  Address,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  Alignment);
 
 typedef enum _ENG_DEVICE_ATTRIBUTE {
   QDA_RESERVED = 0,
@@ -2001,45 +2001,45 @@
 BOOL
 DDKAPI
 EngQueryDeviceAttribute(
-  IN HDEV  hdev,
-  IN ENG_DEVICE_ATTRIBUTE  devAttr,
-  IN VOID  *pvIn,
-  IN ULONG  ulInSize,
-  OUT VOID  *pvOut,
-  OUT ULONG  ulOutSize);
+  __W32_IN HDEV  hdev,
+  __W32_IN ENG_DEVICE_ATTRIBUTE  devAttr,
+  __W32_IN VOID  *pvIn,
+  __W32_IN ULONG  ulInSize,
+  __W32_OUT VOID  *pvOut,
+  __W32_OUT ULONG  ulOutSize);
 
 WIN32KAPI
 LARGE_INTEGER
 DDKAPI
 EngQueryFileTimeStamp(
-  IN LPWSTR  pwsz);
+  __W32_IN LPWSTR  pwsz);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngQueryLocalTime(
-  OUT PENG_TIME_FIELDS  ptf);
+  __W32_OUT PENG_TIME_FIELDS  ptf);
 
 WIN32KAPI
 ULONG
 DDKAPI
 EngQueryPalette(
-  IN HPALETTE  hPal,
-  OUT ULONG  *piMode,
-  IN ULONG  cColors,
-  OUT ULONG  *pulColors);
+  __W32_IN HPALETTE  hPal,
+  __W32_OUT ULONG  *piMode,
+  __W32_IN ULONG  cColors,
+  __W32_OUT ULONG  *pulColors);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngQueryPerformanceCounter(
-  OUT LONGLONG  *pPerformanceCount);
+  __W32_OUT LONGLONG  *pPerformanceCount);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngQueryPerformanceFrequency(
-  OUT LONGLONG  *pFrequency);
+  __W32_OUT LONGLONG  *pFrequency);
 
 typedef enum _ENG_SYSTEM_ATTRIBUTE {
   EngProcessorFeature = 1,
@@ -2056,87 +2056,87 @@
 BOOL
 DDKAPI
 EngQuerySystemAttribute(
-  IN ENG_SYSTEM_ATTRIBUTE  CapNum,
-  OUT PDWORD  pCapability);
+  __W32_IN ENG_SYSTEM_ATTRIBUTE  CapNum,
+  __W32_OUT PDWORD  pCapability);
 
 WIN32KAPI
 LONG
 DDKAPI
 EngReadStateEvent(
-  IN PEVENT  pEvent);
+  __W32_IN PEVENT  pEvent);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngReleaseSemaphore(
-  IN HSEMAPHORE  hsem);
+  __W32_IN HSEMAPHORE  hsem);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngRestoreFloatingPointState(
-  IN VOID  *pBuffer);
+  __W32_IN VOID  *pBuffer);
 
 WIN32KAPI
 ULONG
 DDKAPI
 EngSaveFloatingPointState(
-  OUT VOID  *pBuffer,
-  IN ULONG  cjBufferSize);
+  __W32_OUT VOID  *pBuffer,
+  __W32_IN ULONG  cjBufferSize);
 
 WIN32KAPI
 HANDLE
 DDKAPI
 EngSecureMem(
-  IN PVOID  Address,
-  IN ULONG  Length);
+  __W32_IN PVOID  Address,
+  __W32_IN ULONG  Length);
 
 WIN32KAPI
 LONG
 DDKAPI
 EngSetEvent(
-  IN PEVENT  pEvent);
+  __W32_IN PEVENT  pEvent);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngSetLastError(
-  IN ULONG  iError);
+  __W32_IN ULONG  iError);
 
 WIN32KAPI
 ULONG
 DDKAPI
 EngSetPointerShape(
-  IN SURFOBJ  *pso,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN LONG  xHot,
-  IN LONG  yHot,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN SURFOBJ  *psoColor,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN LONG  xHot,
+  __W32_IN LONG  yHot,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN RECTL  *prcl,
+  __W32_IN FLONG  fl);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngSetPointerTag(
-  IN HDEV  hdev,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN FLONG  fl);
+  __W32_IN HDEV  hdev,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN SURFOBJ  *psoColor,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN FLONG  fl);
 
 WIN32KAPI
 DWORD
 DDKAPI
 EngSetPrinterData(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pType,
-  IN DWORD  dwType,
-  IN LPBYTE  lpbPrinterData,
-  IN DWORD  cjPrinterData);
+  __W32_IN HANDLE  hPrinter,
+  __W32_IN LPWSTR  pType,
+  __W32_IN DWORD  dwType,
+  __W32_IN LPBYTE  lpbPrinterData,
+  __W32_IN DWORD  cjPrinterData);
 
 typedef int DDKCDECLAPI (*SORTCOMP)(const void *pv1, const void *pv2);
 
@@ -2144,146 +2144,146 @@
 VOID
 DDKAPI
 EngSort(
-  IN OUT PBYTE  pjBuf,
-  IN ULONG  c,
-  IN ULONG  cjElem,
-  IN SORTCOMP  pfnComp);
+  __W32_IN __W32_OUT PBYTE  pjBuf,
+  __W32_IN ULONG  c,
+  __W32_IN ULONG  cjElem,
+  __W32_IN SORTCOMP  pfnComp);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngStretchBlt(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlHTOrg,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN ULONG  iMode);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngStretchBltROP(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode,
-  IN BRUSHOBJ  *pbo,
-  IN DWORD  rop4);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlHTOrg,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN ULONG  iMode,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN DWORD  rop4);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngStrokeAndFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pboStroke,
-  IN LINEATTRS  *plineattrs,
-  IN BRUSHOBJ  *pboFill,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mixFill,
-  IN FLONG  flOptions);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_IN BRUSHOBJ  *pboStroke,
+  __W32_IN LINEATTRS  *plineattrs,
+  __W32_IN BRUSHOBJ  *pboFill,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mixFill,
+  __W32_IN FLONG  flOptions);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngStrokePath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN LINEATTRS  *plineattrs,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN LINEATTRS  *plineattrs,
+  __W32_IN MIX  mix);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngTextOut(
-  IN SURFOBJ  *pso,
-  IN STROBJ  *pstro,
-  IN FONTOBJ  *pfo,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prclExtra,
-  IN RECTL  *prclOpaque,
-  IN BRUSHOBJ  *pboFore,
-  IN BRUSHOBJ  *pboOpaque,
-  IN POINTL  *pptlOrg,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN STROBJ  *pstro,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN RECTL  *prclExtra,
+  __W32_IN RECTL  *prclOpaque,
+  __W32_IN BRUSHOBJ  *pboFore,
+  __W32_IN BRUSHOBJ  *pboOpaque,
+  __W32_IN POINTL  *pptlOrg,
+  __W32_IN MIX  mix);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngTransparentBlt(
-  IN SURFOBJ  *psoDst,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDst,
-  IN RECTL  *prclSrc,
-  IN ULONG  iTransColor,
-  IN ULONG  ulReserved);
+  __W32_IN SURFOBJ  *psoDst,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDst,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN ULONG  iTransColor,
+  __W32_IN ULONG  ulReserved);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngUnicodeToMultiByteN(
-  OUT PCHAR  MultiByteString,
-  IN ULONG  MaxBytesInMultiByteString,
-  OUT PULONG  BytesInMultiByteString,
-  IN PWSTR  UnicodeString,
-  IN ULONG  BytesInUnicodeString);
+  __W32_OUT PCHAR  MultiByteString,
+  __W32_IN ULONG  MaxBytesInMultiByteString,
+  __W32_OUT PULONG  BytesInMultiByteString,
+  __W32_IN PWSTR  UnicodeString,
+  __W32_IN ULONG  BytesInUnicodeString);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngUnloadImage(
-  IN HANDLE  hModule);
+  __W32_IN HANDLE  hModule);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngUnlockDirectDrawSurface(
-  IN PDD_SURFACE_LOCAL  pSurface);
+  __W32_IN PDD_SURFACE_LOCAL  pSurface);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngUnlockDriverObj(
-  IN HDRVOBJ  hdo);
+  __W32_IN HDRVOBJ  hdo);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngUnlockSurface(
-  IN SURFOBJ  *pso);
+  __W32_IN SURFOBJ  *pso);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngUnmapEvent(
-  IN PEVENT  pEvent);
+  __W32_IN PEVENT  pEvent);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngUnmapFile(
-  IN ULONG_PTR  iFile);
+  __W32_IN ULONG_PTR  iFile);
 
 WIN32KAPI
 VOID
@@ -2295,472 +2295,472 @@
 VOID
 DDKAPI
 EngUnmapFontFileFD(
-  IN ULONG_PTR  iFile);
+  __W32_IN ULONG_PTR  iFile);
 
 WIN32KAPI
 VOID
 DDKAPI
 EngUnsecureMem(
-  IN HANDLE  hSecure);
+  __W32_IN HANDLE  hSecure);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngWaitForSingleObject(
-  IN PEVENT  pEvent,
-  IN PLARGE_INTEGER  pTimeOut);
+  __W32_IN PEVENT  pEvent,
+  __W32_IN PLARGE_INTEGER  pTimeOut);
 
 WIN32KAPI
 INT
 DDKAPI
 EngWideCharToMultiByte(
-  IN UINT  CodePage,
-  IN LPWSTR  WideCharString,
-  IN INT  BytesInWideCharString,
-  OUT LPSTR  MultiByteString,
-  IN INT  BytesInMultiByteString);
+  __W32_IN UINT  CodePage,
+  __W32_IN LPWSTR  WideCharString,
+  __W32_IN INT  BytesInWideCharString,
+  __W32_OUT LPSTR  MultiByteString,
+  __W32_IN INT  BytesInMultiByteString);
 
 WIN32KAPI
 BOOL
 DDKAPI
 EngWritePrinter(
-  IN HANDLE  hPrinter,
-  IN LPVOID  pBuf,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcWritten);
+  __W32_IN HANDLE  hPrinter,
+  __W32_IN LPVOID  pBuf,
+  __W32_IN DWORD  cbBuf,
+  __W32_OUT LPDWORD  pcWritten);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_Add(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN PFLOATOBJ  pf1);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_AddFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN FLOATL  f);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_AddLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_Div(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN PFLOATOBJ  pf1);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_DivFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN FLOATL  f);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_DivLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 BOOL
 DDKAPI
 FLOATOBJ_Equal(
-  IN PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
+  __W32_IN PFLOATOBJ  pf,
+  __W32_IN PFLOATOBJ  pf1);
 
 WIN32KAPI
 BOOL
 DDKAPI
 FLOATOBJ_EqualLong(
-  IN PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_IN PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 LONG
 DDKAPI
 FLOATOBJ_GetFloat(
-  IN PFLOATOBJ  pf);
+  __W32_IN PFLOATOBJ  pf);
 
 WIN32KAPI
 LONG
 DDKAPI
 FLOATOBJ_GetLong(
-  IN PFLOATOBJ  pf);
+  __W32_IN PFLOATOBJ  pf);
 
 WIN32KAPI
 BOOL
 DDKAPI
 FLOATOBJ_GreaterThan(
-  IN PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
+  __W32_IN PFLOATOBJ  pf,
+  __W32_IN PFLOATOBJ  pf1);
 
 WIN32KAPI
 BOOL
 DDKAPI
 FLOATOBJ_GreaterThanLong(
-  IN PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_IN PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 BOOL
 DDKAPI
 FLOATOBJ_LessThan(
-  IN PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
+  __W32_IN PFLOATOBJ  pf,
+  __W32_IN PFLOATOBJ  pf1);
 
 WIN32KAPI
 BOOL
 DDKAPI
 FLOATOBJ_LessThanLong(
-  IN PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_IN PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_Mul(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN PFLOATOBJ  pf1);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_MulFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN FLOATL  f);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_MulLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_Neg(
-  IN OUT PFLOATOBJ  pf);
+  __W32_IN __W32_OUT PFLOATOBJ  pf);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_SetFloat(
-  OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
+  __W32_OUT PFLOATOBJ  pf,
+  __W32_IN FLOATL  f);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_SetLong(
-  OUT PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_OUT PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_Sub(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN PFLOATOBJ  pf1);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_SubFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN FLOATL  f);
 
 WIN32KAPI
 VOID
 DDKAPI
 FLOATOBJ_SubLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
+  __W32_IN __W32_OUT PFLOATOBJ  pf,
+  __W32_IN LONG  l);
 
 WIN32KAPI
 ULONG
 DDKAPI
 FONTOBJ_cGetAllGlyphHandles(
-  IN FONTOBJ  *pfo,
-  OUT HGLYPH  *phg);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_OUT HGLYPH  *phg);
 
 WIN32KAPI
 ULONG
 DDKAPI
 FONTOBJ_cGetGlyphs(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN ULONG  cGlyph,
-  IN HGLYPH  *phg,
-  OUT PVOID  *ppvGlyph);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  cGlyph,
+  __W32_IN HGLYPH  *phg,
+  __W32_OUT PVOID  *ppvGlyph);
 
 WIN32KAPI
 FD_GLYPHSET*
 DDKAPI
 FONTOBJ_pfdg(
-  IN FONTOBJ  *pfo);
+  __W32_IN FONTOBJ  *pfo);
 
 WIN32KAPI
 IFIMETRICS*
 DDKAPI
 FONTOBJ_pifi(
-  IN FONTOBJ  *pfo);
+  __W32_IN FONTOBJ  *pfo);
 
 WIN32KAPI
 PBYTE
 DDKAPI
 FONTOBJ_pjOpenTypeTablePointer(
-  IN FONTOBJ  *pfo,
-  IN ULONG  ulTag,
-  OUT ULONG  *pcjTable);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  ulTag,
+  __W32_OUT ULONG  *pcjTable);
 
 WIN32KAPI
 PFD_GLYPHATTR
-DDKAPI 
+DDKAPI
 FONTOBJ_pQueryGlyphAttrs(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode);
 
 WIN32KAPI
 PVOID
 DDKAPI
 FONTOBJ_pvTrueTypeFontFile(
-  IN FONTOBJ  *pfo,
-  OUT ULONG  *pcjFile);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_OUT ULONG  *pcjFile);
 
 WIN32KAPI
 LPWSTR
 DDKAPI
 FONTOBJ_pwszFontFilePaths(
-  IN FONTOBJ  *pfo,
-  OUT ULONG  *pcwc);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_OUT ULONG  *pcwc);
 
 WIN32KAPI
 XFORMOBJ*
 DDKAPI
 FONTOBJ_pxoGetXform(
-  IN FONTOBJ  *pfo);
+  __W32_IN FONTOBJ  *pfo);
 
 WIN32KAPI
 VOID
 DDKAPI
 FONTOBJ_vGetInfo(
-  IN FONTOBJ  *pfo,
-  IN ULONG  cjSize,
-  OUT FONTINFO  *pfi);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  cjSize,
+  __W32_OUT FONTINFO  *pfi);
 
 WIN32KAPI
 FLATPTR
 DDKAPI
 HeapVidMemAllocAligned(
-  IN LPVIDMEM  lpVidMem,
-  IN DWORD  dwWidth,
-  IN DWORD  dwHeight,
-  IN LPSURFACEALIGNMENT  lpAlignment,
-  OUT LPLONG  lpNewPitch);
+  __W32_IN LPVIDMEM  lpVidMem,
+  __W32_IN DWORD  dwWidth,
+  __W32_IN DWORD  dwHeight,
+  __W32_IN LPSURFACEALIGNMENT  lpAlignment,
+  __W32_OUT LPLONG  lpNewPitch);
 
 WIN32KAPI
 LONG
 DDKAPI
 HT_ComputeRGBGammaTable(
-  IN USHORT  GammaTableEntries,
-  IN USHORT  GammaTableType,
-  IN USHORT  RedGamma,
-  IN USHORT  GreenGamma,
-  IN USHORT  BlueGamma,
-  OUT LPBYTE  pGammaTable);
+  __W32_IN USHORT  GammaTableEntries,
+  __W32_IN USHORT  GammaTableType,
+  __W32_IN USHORT  RedGamma,
+  __W32_IN USHORT  GreenGamma,
+  __W32_IN USHORT  BlueGamma,
+  __W32_OUT LPBYTE  pGammaTable);
 
 WIN32KAPI
 LONG
 DDKAPI
 HT_Get8BPPFormatPalette(
-  OUT LPPALETTEENTRY  pPaletteEntry,
-  IN USHORT  RedGamma,
-  IN USHORT  GreenGamma,
-  IN USHORT  BlueGamma);
+  __W32_OUT LPPALETTEENTRY  pPaletteEntry,
+  __W32_IN USHORT  RedGamma,
+  __W32_IN USHORT  GreenGamma,
+  __W32_IN USHORT  BlueGamma);
 
 WIN32KAPI
 LONG
 DDKAPI
 HT_Get8BPPMaskPalette(
-  IN OUT LPPALETTEENTRY  pPaletteEntry,
-  IN BOOL  Use8BPPMaskPal,
-  IN BYTE  CMYMask,
-  IN USHORT  RedGamma,
-  IN USHORT  GreenGamma,
-  IN USHORT  BlueGamma);
+  __W32_IN __W32_OUT LPPALETTEENTRY  pPaletteEntry,
+  __W32_IN BOOL  Use8BPPMaskPal,
+  __W32_IN BYTE  CMYMask,
+  __W32_IN USHORT  RedGamma,
+  __W32_IN USHORT  GreenGamma,
+  __W32_IN USHORT  BlueGamma);
 
 WIN32KAPI
 LONG
 DDKAPI
 HTUI_DeviceColorAdjustment(
-  IN LPSTR  pDeviceName,
-  OUT PDEVHTADJDATA  pDevHTAdjData);
+  __W32_IN LPSTR  pDeviceName,
+  __W32_OUT PDEVHTADJDATA  pDevHTAdjData);
 
 WIN32KAPI
 ULONG
 DDKAPI
 PALOBJ_cGetColors(
-  IN PALOBJ  *ppalo,
-  IN ULONG  iStart,
-  IN ULONG  cColors,
-  OUT ULONG  *pulColors);
+  __W32_IN PALOBJ  *ppalo,
+  __W32_IN ULONG  iStart,
+  __W32_IN ULONG  cColors,
+  __W32_OUT ULONG  *pulColors);
 
 WIN32KAPI
 BOOL
 DDKAPI
 PATHOBJ_bCloseFigure(
-  IN PATHOBJ  *ppo);
+  __W32_IN PATHOBJ  *ppo);
 
 WIN32KAPI
 BOOL
 DDKAPI
 PATHOBJ_bEnum(
-  IN PATHOBJ  *ppo,
-  OUT PATHDATA  *ppd);
+  __W32_IN PATHOBJ  *ppo,
+  __W32_OUT PATHDATA  *ppd);
 
 WIN32KAPI
 BOOL
 DDKAPI
 PATHOBJ_bEnumClipLines(
-  IN PATHOBJ  *ppo,
-  IN ULONG  cb,
-  OUT CLIPLINE  *pcl);
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN ULONG  cb,
+  __W32_OUT CLIPLINE  *pcl);
 
 WIN32KAPI
 BOOL
 DDKAPI
 PATHOBJ_bMoveTo(
-  IN PATHOBJ  *ppo,
-  IN POINTFIX  ptfx);
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN POINTFIX  ptfx);
 
 WIN32KAPI
 BOOL
 DDKAPI
 PATHOBJ_bPolyBezierTo(
-  IN PATHOBJ  *ppo,
-  IN POINTFIX  *pptfx,
-  IN ULONG  cptfx);
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN POINTFIX  *pptfx,
+  __W32_IN ULONG  cptfx);
 
 WIN32KAPI
 BOOL
 DDKAPI
 PATHOBJ_bPolyLineTo(
-  IN PATHOBJ  *ppo,
-  IN POINTFIX  *pptfx,
-  IN ULONG  cptfx);
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN POINTFIX  *pptfx,
+  __W32_IN ULONG  cptfx);
 
 WIN32KAPI
 VOID
 DDKAPI
 PATHOBJ_vEnumStart(
-  IN PATHOBJ  *ppo);
+  __W32_IN PATHOBJ  *ppo);
 
 WIN32KAPI
 VOID
 DDKAPI
 PATHOBJ_vEnumStartClipLines(
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN SURFOBJ  *pso,
-  IN LINEATTRS  *pla);
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LINEATTRS  *pla);
 
 WIN32KAPI
 VOID
 DDKAPI
 PATHOBJ_vGetBounds(
-  IN PATHOBJ  *ppo,
-  OUT PRECTFX  prectfx);
+  __W32_IN PATHOBJ  *ppo,
+  __W32_OUT PRECTFX  prectfx);
 
 WIN32KAPI
 BOOL
 DDKAPI
 STROBJ_bEnum(
-  IN STROBJ  *pstro,
-  OUT ULONG  *pc,
-  OUT PGLYPHPOS  *ppgpos);
+  __W32_IN STROBJ  *pstro,
+  __W32_OUT ULONG  *pc,
+  __W32_OUT PGLYPHPOS  *ppgpos);
 
 WIN32KAPI
 BOOL
 DDKAPI
 STROBJ_bEnumPositionsOnly(
-  IN STROBJ  *pstro,
-  OUT ULONG  *pc,
-  OUT PGLYPHPOS  *ppgpos);
+  __W32_IN STROBJ  *pstro,
+  __W32_OUT ULONG  *pc,
+  __W32_OUT PGLYPHPOS  *ppgpos);
 
 WIN32KAPI
 BOOL
 DDKAPI
 STROBJ_bGetAdvanceWidths(
-  IN STROBJ  *pso,
-  IN ULONG  iFirst,
-  IN ULONG  c,
-  OUT POINTQF  *pptqD);
+  __W32_IN STROBJ  *pso,
+  __W32_IN ULONG  iFirst,
+  __W32_IN ULONG  c,
+  __W32_OUT POINTQF  *pptqD);
 
 WIN32KAPI
 DWORD
 DDKAPI
 STROBJ_dwGetCodePage(
-  IN STROBJ  *pstro);
+  __W32_IN STROBJ  *pstro);
 
 WIN32KAPI
 FIX
 DDKAPI
 STROBJ_fxBreakExtra(
-  IN STROBJ  *pstro);
+  __W32_IN STROBJ  *pstro);
 
 WIN32KAPI
 FIX
 DDKAPI
 STROBJ_fxCharacterExtra(
-  IN STROBJ  *pstro);
+  __W32_IN STROBJ  *pstro);
 
 WIN32KAPI
 VOID
 DDKAPI
 STROBJ_vEnumStart(
-  IN STROBJ  *pstro);
+  __W32_IN STROBJ  *pstro);
 
 WIN32KAPI
 VOID
 DDKAPI
 VidMemFree(
-  IN LPVMEMHEAP  pvmh,
-  IN FLATPTR  ptr);
+  __W32_IN LPVMEMHEAP  pvmh,
+  __W32_IN FLATPTR  ptr);
 
 WIN32KAPI
 BOOL
 DDKAPI
 WNDOBJ_bEnum(
-  IN WNDOBJ  *pwo,
-  IN ULONG  cj,
-  OUT ULONG  *pul);
+  __W32_IN WNDOBJ  *pwo,
+  __W32_IN ULONG  cj,
+  __W32_OUT ULONG  *pul);
 
 WIN32KAPI
 ULONG
 DDKAPI
 WNDOBJ_cEnumStart(
-  IN WNDOBJ  *pwo,
-  IN ULONG  iType,
-  IN ULONG  iDirection,
-  IN ULONG  cLimit);
+  __W32_IN WNDOBJ  *pwo,
+  __W32_IN ULONG  iType,
+  __W32_IN ULONG  iDirection,
+  __W32_IN ULONG  cLimit);
 
 WIN32KAPI
 VOID
 DDKAPI
 WNDOBJ_vSetConsumer(
-  IN WNDOBJ  *pwo,
-  IN PVOID  pvConsumer);
+  __W32_IN WNDOBJ  *pwo,
+  __W32_IN PVOID  pvConsumer);
 
 /* XFORMOBJ_bApplyXform.iMode constants */
 #define XF_LTOL                           0L
@@ -2772,25 +2772,25 @@
 BOOL
 DDKAPI
 XFORMOBJ_bApplyXform(
-  IN XFORMOBJ  *pxo,
-  IN ULONG  iMode,
-  IN ULONG  cPoints,
-  IN PVOID  pvIn,
-  OUT PVOID  pvOut);
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  cPoints,
+  __W32_IN PVOID  pvIn,
+  __W32_OUT PVOID  pvOut);
 
 WIN32KAPI
 ULONG
 DDKAPI
 XFORMOBJ_iGetFloatObjXform(
-  IN XFORMOBJ  *pxo,
-  OUT FLOATOBJ_XFORM  *pxfo);
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_OUT FLOATOBJ_XFORM  *pxfo);
 
 WIN32KAPI
 ULONG
 DDKAPI
 XFORMOBJ_iGetXform(
-  IN XFORMOBJ  *pxo,
-  OUT XFORML  *pxform);
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_OUT XFORML  *pxform);
 
 /* XLATEOBJ_cGetPalette.iPal constants */
 #define XO_SRCPALETTE                     1
@@ -2803,29 +2803,29 @@
 ULONG
 DDKAPI
 XLATEOBJ_cGetPalette(
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iPal,
-  IN ULONG  cPal,
-  OUT ULONG  *pPal);
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN ULONG  iPal,
+  __W32_IN ULONG  cPal,
+  __W32_OUT ULONG  *pPal);
 
 WIN32KAPI
 HANDLE
 DDKAPI
 XLATEOBJ_hGetColorTransform(
-  IN XLATEOBJ  *pxlo);
+  __W32_IN XLATEOBJ  *pxlo);
 
 WIN32KAPI
 ULONG
 DDKAPI
 XLATEOBJ_iXlate(
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iColor);
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN ULONG  iColor);
 
 WIN32KAPI
 ULONG*
 DDKAPI
 XLATEOBJ_piVector(
-  IN XLATEOBJ  *pxlo);
+  __W32_IN XLATEOBJ  *pxlo);
 
 
 
@@ -2834,62 +2834,62 @@
 BOOL
 DDKAPI
 DrvAlphaBlend(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN BLENDOBJ  *pBlendObj);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN BLENDOBJ  *pBlendObj);
 
 BOOL
 DDKAPI
 DrvAssertMode(
-  IN DHPDEV  dhpdev,
-  IN BOOL  bEnable);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN BOOL  bEnable);
 
 BOOL
 DDKAPI
 DrvBitBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclTrg,
-  IN POINTL  *pptlSrc,
-  IN POINTL  *pptlMask,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrush,
-  IN ROP4  rop4);
+  __W32_IN SURFOBJ  *psoTrg,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclTrg,
+  __W32_IN POINTL  *pptlSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrush,
+  __W32_IN ROP4  rop4);
 
 VOID
 DDKAPI
 DrvCompletePDEV(
-  IN DHPDEV  dhpdev,
-  IN HDEV  hdev);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN HDEV  hdev);
 
 BOOL
 DDKAPI
 DrvCopyBits(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN POINTL  *pptlSrc);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN POINTL  *pptlSrc);
 
 HBITMAP
 DDKAPI
 DrvCreateDeviceBitmap(
-  IN DHPDEV  dhpdev,
-  IN SIZEL  sizl,
-  IN ULONG  iFormat);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN SIZEL  sizl,
+  __W32_IN ULONG  iFormat);
 
 VOID
 DDKAPI
 DrvDeleteDeviceBitmap(
-  IN DHSURF  dhsurf);
+  __W32_IN DHSURF  dhsurf);
 
 HBITMAP
 DDKAPI
@@ -2900,15 +2900,15 @@
 LONG
 DDKAPI
 DrvDescribePixelFormat(
-  IN DHPDEV  dhpdev,
-  IN LONG  iPixelFormat,
-  IN ULONG  cjpfd,
-  OUT PIXELFORMATDESCRIPTOR  *ppfd);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN LONG  iPixelFormat,
+  __W32_IN ULONG  cjpfd,
+  __W32_OUT PIXELFORMATDESCRIPTOR  *ppfd);
 
 VOID
 DDKAPI
 DrvDestroyFont(
-  IN FONTOBJ  *pfo);
+  __W32_IN FONTOBJ  *pfo);
 
 VOID
 DDKAPI
@@ -2918,12 +2918,12 @@
 VOID
 DDKAPI
 DrvDisablePDEV(
-  IN DHPDEV  dhpdev);
+  __W32_IN DHPDEV  dhpdev);
 
 VOID
 DDKAPI
 DrvDisableSurface(
-  IN DHPDEV  dhpdev);
+  __W32_IN DHPDEV  dhpdev);
 
 #define DM_DEFAULT                        0x00000001
 #define DM_MONOCHROME                     0x00000002
@@ -2931,47 +2931,47 @@
 ULONG
 DDKAPI
 DrvDitherColor(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iMode,
-  IN ULONG  rgb,
-  OUT ULONG  *pul);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  rgb,
+  __W32_OUT ULONG  *pul);
 
 ULONG
 DDKAPI
 DrvDrawEscape(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prcl,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iEsc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN RECTL  *prcl,
+  __W32_IN ULONG  cjIn,
+  __W32_IN PVOID  pvIn);
 
 BOOL
 DDKAPI
 DrvEnableDriver(
-  IN ULONG  iEngineVersion,
-  IN ULONG  cj,
-  OUT DRVENABLEDATA  *pded);
+  __W32_IN ULONG  iEngineVersion,
+  __W32_IN ULONG  cj,
+  __W32_OUT DRVENABLEDATA  *pded);
 
 DHPDEV
 DDKAPI
 DrvEnablePDEV(
-  IN DEVMODEW  *pdm,
-  IN LPWSTR  pwszLogAddress,
-  IN ULONG  cPat,
-  OUT HSURF  *phsurfPatterns,
-  IN ULONG  cjCaps,
-  OUT ULONG  *pdevcaps,
-  IN ULONG  cjDevInfo,
-  OUT DEVINFO  *pdi,
-  IN HDEV  hdev,
-  IN LPWSTR  pwszDeviceName,
-  IN HANDLE  hDriver);
+  __W32_IN DEVMODEW  *pdm,
+  __W32_IN LPWSTR  pwszLogAddress,
+  __W32_IN ULONG  cPat,
+  __W32_OUT HSURF  *phsurfPatterns,
+  __W32_IN ULONG  cjCaps,
+  __W32_OUT ULONG  *pdevcaps,
+  __W32_IN ULONG  cjDevInfo,
+  __W32_OUT DEVINFO  *pdi,
+  __W32_IN HDEV  hdev,
+  __W32_IN LPWSTR  pwszDeviceName,
+  __W32_IN HANDLE  hDriver);
 
 HSURF
 DDKAPI
 DrvEnableSurface(
-  IN DHPDEV  dhpdev);
+  __W32_IN DHPDEV  dhpdev);
 
 /* DrvEndDoc.fl constants */
 #define ED_ABORTDOC                       0x00000001
@@ -2979,46 +2979,46 @@
 BOOL
 DDKAPI
 DrvEndDoc(
-  IN SURFOBJ  *pso,
-  IN FLONG  fl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN FLONG  fl);
 
 ULONG
 DDKAPI
 DrvEscape(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iEsc,
+  __W32_IN ULONG  cjIn,
+  __W32_IN PVOID  pvIn,
+  __W32_IN ULONG  cjOut,
+  __W32_OUT PVOID  pvOut);
 
 BOOL
 DDKAPI
 DrvFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix,
-  IN FLONG  flOptions);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mix,
+  __W32_IN FLONG  flOptions);
 
 ULONG
 DDKAPI
 DrvFontManagement(
-  IN SURFOBJ  *pso,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  cjIn,
+  __W32_IN PVOID  pvIn,
+  __W32_IN ULONG  cjOut,
+  __W32_OUT PVOID  pvOut);
 
 VOID
 DDKAPI
 DrvFree(
-  IN PVOID  pv,
-  IN ULONG_PTR  id);
+  __W32_IN PVOID  pv,
+  __W32_IN ULONG_PTR  id);
 
 /* DrvGetGlyphMode return values */
 #define FO_HGLYPHS                        0L
@@ -3028,62 +3028,62 @@
 ULONG
 DDKAPI
 DrvGetGlyphMode(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo);
 
 ULONG
 DDKAPI
 DrvGetModes(
-  IN HANDLE  hDriver,
-  IN ULONG  cjSize,
-  OUT DEVMODEW  *pdm);
+  __W32_IN HANDLE  hDriver,
+  __W32_IN ULONG  cjSize,
+  __W32_OUT DEVMODEW  *pdm);
 
 PVOID
 DDKAPI
 DrvGetTrueTypeFile(
-  IN ULONG_PTR  iFile,
-  IN ULONG  *pcj);
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  *pcj);
 
 BOOL
 DDKAPI
 DrvGradientFill(
-  IN SURFOBJ  *psoDest,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN TRIVERTEX  *pVertex,
-  IN ULONG  nVertex,
-  IN PVOID  pMesh,
-  IN ULONG  nMesh,
-  IN RECTL  *prclExtents,
-  IN POINTL  *pptlDitherOrg,
-  IN ULONG  ulMode);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN TRIVERTEX  *pVertex,
+  __W32_IN ULONG  nVertex,
+  __W32_IN PVOID  pMesh,
+  __W32_IN ULONG  nMesh,
+  __W32_IN RECTL  *prclExtents,
+  __W32_IN POINTL  *pptlDitherOrg,
+  __W32_IN ULONG  ulMode);
 
 BOOL
 DDKAPI
 DrvIcmCheckBitmapBits(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hColorTransform,
-  IN SURFOBJ  *pso,
-  OUT PBYTE  paResults);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN HANDLE  hColorTransform,
+  __W32_IN SURFOBJ  *pso,
+  __W32_OUT PBYTE  paResults);
 
 HANDLE
 DDKAPI
 DrvIcmCreateColorTransform(
-  IN DHPDEV  dhpdev,
-  IN LPLOGCOLORSPACEW  pLogColorSpace,
-  IN PVOID  pvSourceProfile,
-  IN ULONG  cjSourceProfile,
-  IN PVOID  pvDestProfile,
-  IN ULONG  cjDestProfile,
-  IN PVOID  pvTargetProfile,
-  IN ULONG  cjTargetProfile,
-  IN DWORD  dwReserved);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN LPLOGCOLORSPACEW  pLogColorSpace,
+  __W32_IN PVOID  pvSourceProfile,
+  __W32_IN ULONG  cjSourceProfile,
+  __W32_IN PVOID  pvDestProfile,
+  __W32_IN ULONG  cjDestProfile,
+  __W32_IN PVOID  pvTargetProfile,
+  __W32_IN ULONG  cjTargetProfile,
+  __W32_IN DWORD  dwReserved);
 
 BOOL
 DDKAPI
 DrvIcmDeleteColorTransform(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hcmXform);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN HANDLE  hcmXform);
 
 /* DrvIcmSetDeviceGammaRamp.iFormat constants */
 #define IGRF_RGB_256BYTES                 0x00000000
@@ -3092,9 +3092,9 @@
 BOOL
 DDKAPI
 DrvIcmSetDeviceGammaRamp(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iFormat,
-  IN LPVOID  lpRamp);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG  iFormat,
+  __W32_IN LPVOID  lpRamp);
 
 BOOL
 DDKAPI
@@ -3123,55 +3123,55 @@
 VOID
 DDKAPI
 DrvMovePointer(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN RECTL  *prcl);
 
 BOOL
 DDKAPI
 DrvNextBand(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN POINTL  *pptl);
 
 VOID
 DDKAPI
 DrvNotify(
-  IN SURFOBJ  *pso,
-  IN ULONG  iType,
-  IN PVOID  pvData);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iType,
+  __W32_IN PVOID  pvData);
 
 BOOL
 DDKAPI
 DrvOffset(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN FLONG  flReserved);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN FLONG  flReserved);
 
 BOOL
 DDKAPI
 DrvPaint(
-  IN SURFOBJ  *pso,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mix);
 
 BOOL
 DDKAPI
 DrvPlgBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMsk,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlBrushOrg,
-  IN POINTFIX  *pptfx,
-  IN RECTL  *prcl,
-  IN POINTL  *pptl,
-  IN ULONG  iMode);
+  __W32_IN SURFOBJ  *psoTrg,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMsk,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN POINTFIX  *pptfx,
+  __W32_IN RECTL  *prcl,
+  __W32_IN POINTL  *pptl,
+  __W32_IN ULONG  iMode);
 
 /* DrvQueryAdvanceWidths.iMode constants */
 #define QAW_GETWIDTHS                     0
@@ -3180,12 +3180,12 @@
 BOOL
 DDKAPI
 DrvQueryAdvanceWidths(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  *phg,
-  OUT PVOID  pvWidths,
-  IN ULONG  cGlyphs);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode,
+  __W32_IN HGLYPH  *phg,
+  __W32_OUT PVOID  pvWidths,
+  __W32_IN ULONG  cGlyphs);
 
 /* DrvQueryDeviceSupport.iType constants */
 #define QDS_CHECKJPEGFORMAT               0x00000000
@@ -3217,10 +3217,10 @@
 PIFIMETRICS
 DDKAPI
 DrvQueryFont(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG_PTR  *pid);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  iFace,
+  __W32_IN ULONG_PTR  *pid);
 
 /* DrvQueryFontCaps.pulCaps constants */
 #define QC_OUTLINES                       0x00000001
@@ -3232,8 +3232,8 @@
 LONG
 DDKAPI
 DrvQueryFontCaps(
-  IN ULONG  culCaps,
-  OUT ULONG  *pulCaps);
+  __W32_IN ULONG  culCaps,
+  __W32_OUT ULONG  *pulCaps);
 
 /* DrvQueryFontData.iMode constants */
 #define QFD_GLYPHANDBITMAP                1L
@@ -3250,13 +3250,13 @@
 LONG
 DDKAPI
 DrvQueryFontData(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  hg,
-  IN OUT GLYPHDATA  *pgd,
-  IN OUT PVOID  pv,
-  IN ULONG  cjSize);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode,
+  __W32_IN HGLYPH  hg,
+  __W32_IN __W32_OUT GLYPHDATA  *pgd,
+  __W32_IN __W32_OUT PVOID  pv,
+  __W32_IN ULONG  cjSize);
 
 /* DrvQueryFontFile.ulMode constants */
 #define QFF_DESCRIPTION                   0x00000001
@@ -3265,10 +3265,10 @@
 LONG
 DDKAPI
 DrvQueryFontFile(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulMode,
-  IN ULONG  cjBuf,
-  IN ULONG  *pulBuf);
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  ulMode,
+  __W32_IN ULONG  cjBuf,
+  __W32_IN ULONG  *pulBuf);
 
 /* DrvQueryFontTree.iMode constants */
 #define QFT_UNICODE                       0L
@@ -3279,23 +3279,23 @@
 PVOID
 DDKAPI
 DrvQueryFontTree(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG  iMode,
-  IN ULONG_PTR  *pid);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  iFace,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG_PTR  *pid);
 
 PFD_GLYPHATTR
 DDKAPI
 DrvQueryGlyphAttrs(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode);
 
 ULONG
 DDKAPI
 DrvQueryPerBandInfo(
-  IN SURFOBJ  *pso,
-  IN OUT PERBANDINFO  *pbi);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN __W32_OUT PERBANDINFO  *pbi);
 
 /* DrvQueryTrueTypeOutline.bMetricsOnly constants */
 #define TTO_METRICS_ONLY                  0x00000001
@@ -3305,25 +3305,25 @@
 LONG
 DDKAPI
 DrvQueryTrueTypeOutline(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN HGLYPH  hglyph,
-  IN BOOL  bMetricsOnly,
-  IN GLYPHDATA  *pgldt,
-  IN ULONG  cjBuf,
-  OUT TTPOLYGONHEADER  *ppoly);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN HGLYPH  hglyph,
+  __W32_IN BOOL  bMetricsOnly,
+  __W32_IN GLYPHDATA  *pgldt,
+  __W32_IN ULONG  cjBuf,
+  __W32_OUT TTPOLYGONHEADER  *ppoly);
 
 LONG
 DDKAPI
 DrvQueryTrueTypeTable(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulFont,
-  IN ULONG  ulTag,
-  IN PTRDIFF  dpStart,
-  IN ULONG  cjBuf,
-  OUT BYTE  *pjBuf,
-  OUT PBYTE  *ppjTable,
-  OUT ULONG *pcjTable);
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  ulFont,
+  __W32_IN ULONG  ulTag,
+  __W32_IN PTRDIFF  dpStart,
+  __W32_IN ULONG  cjBuf,
+  __W32_OUT BYTE  *pjBuf,
+  __W32_OUT PBYTE  *ppjTable,
+  __W32_OUT ULONG *pcjTable);
 
 /* DrvRealizeBrush.iHatch constants */
 #define RB_DITHERCOLOR                    0x80000000L
@@ -3333,12 +3333,12 @@
 BOOL
 DDKAPI
 DrvRealizeBrush(
-  IN BRUSHOBJ  *pbo,
-  IN SURFOBJ  *psoTarget,
-  IN SURFOBJ  *psoPattern,
-  IN SURFOBJ  *psoMask,
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iHatch);
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN SURFOBJ  *psoTarget,
+  __W32_IN SURFOBJ  *psoPattern,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN ULONG  iHatch);
 
 /* DrvResetDevice return values */
 #define DRD_SUCCESS                       0
@@ -3347,8 +3347,8 @@
 ULONG
 DDKAPI
 DrvResetDevice(
-  IN DHPDEV dhpdev,
-  IN PVOID Reserved);
+  __W32_IN DHPDEV dhpdev,
+  __W32_IN PVOID Reserved);
 
 BOOL
 DDKAPI
@@ -3364,31 +3364,31 @@
 ULONG_PTR
 DDKAPI
 DrvSaveScreenBits(
-  IN SURFOBJ  *pso,
-  IN ULONG  iMode,
-  IN ULONG_PTR  ident,
-  IN RECTL  *prcl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG_PTR  ident,
+  __W32_IN RECTL  *prcl);
 
 BOOL
 DDKAPI
 DrvSendPage(
-  IN SURFOBJ  *pso);
+  __W32_IN SURFOBJ  *pso);
 
 BOOL
 DDKAPI
 DrvSetPalette(
-  IN DHPDEV  dhpdev,
-  IN PALOBJ  *ppalo,
-  IN FLONG  fl,
-  IN ULONG  iStart,
-  IN ULONG  cColors);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN PALOBJ  *ppalo,
+  __W32_IN FLONG  fl,
+  __W32_IN ULONG  iStart,
+  __W32_IN ULONG  cColors);
 
 BOOL
 DDKAPI
 DrvSetPixelFormat(
-  IN SURFOBJ  *pso,
-  IN LONG  iPixelFormat,
-  IN HWND  hwnd);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LONG  iPixelFormat,
+  __W32_IN HWND  hwnd);
 
 /* DrvSetPointerShape return values */
 #define SPS_ERROR                         0x00000000
@@ -3409,104 +3409,104 @@
 ULONG
 DDKAPI
 DrvSetPointerShape(
-  IN SURFOBJ  *pso,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN LONG  xHot,
-  IN LONG  yHot,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN SURFOBJ  *psoColor,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN LONG  xHot,
+  __W32_IN LONG  yHot,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN RECTL  *prcl,
+  __W32_IN FLONG  fl);
 
 BOOL
 DDKAPI
 DrvStartBanding(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN POINTL  *pptl);
 
 BOOL
 DDKAPI
 DrvStartDoc(
-  IN SURFOBJ  *pso,
-  IN LPWSTR  pwszDocName,
-  IN DWORD  dwJobId);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LPWSTR  pwszDocName,
+  __W32_IN DWORD  dwJobId);
 
 BOOL
 DDKAPI
 DrvStartPage(
-  IN SURFOBJ  *pso);
+  __W32_IN SURFOBJ  *pso);
 
 BOOL
 DDKAPI
 DrvStretchBlt(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlHTOrg,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN ULONG  iMode);
 
 BOOL
 DDKAPI
 DrvStretchBltROP(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode,
-  IN BRUSHOBJ  *pbo,
-  IN DWORD  rop4);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlHTOrg,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN ULONG  iMode,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN DWORD  rop4);
 
 BOOL
 DDKAPI
 DrvStrokeAndFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pboStroke,
-  IN LINEATTRS  *plineattrs,
-  IN BRUSHOBJ  *pboFill,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mixFill,
-  IN FLONG  flOptions);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_IN BRUSHOBJ  *pboStroke,
+  __W32_IN LINEATTRS  *plineattrs,
+  __W32_IN BRUSHOBJ  *pboFill,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mixFill,
+  __W32_IN FLONG  flOptions);
 
 BOOL
 DDKAPI
 DrvStrokePath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN LINEATTRS  *plineattrs,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN LINEATTRS  *plineattrs,
+  __W32_IN MIX  mix);
 
 BOOL
 DDKAPI
 DrvSwapBuffers(
-  IN SURFOBJ  *pso,
-  IN WNDOBJ  *pwo);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN WNDOBJ  *pwo);
 
 VOID
 DDKAPI
 DrvSynchronize(
-  IN DHPDEV  dhpdev,
-  IN RECTL  *prcl);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN RECTL  *prcl);
 
 /* DrvSynchronizeSurface.fl constants */
 #define DSS_TIMER_EVENT                   0x00000001
@@ -3515,40 +3515,40 @@
 VOID
 DDKAPI
 DrvSynchronizeSurface(
-  IN SURFOBJ  *pso,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN RECTL  *prcl,
+  __W32_IN FLONG  fl);
 
 BOOL
 DDKAPI
 DrvTextOut(
-  IN SURFOBJ  *pso,
-  IN STROBJ  *pstro,
-  IN FONTOBJ  *pfo,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prclExtra,
-  IN RECTL  *prclOpaque,
-  IN BRUSHOBJ  *pboFore,
-  IN BRUSHOBJ  *pboOpaque,
-  IN POINTL  *pptlOrg,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN STROBJ  *pstro,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN RECTL  *prclExtra,
+  __W32_IN RECTL  *prclOpaque,
+  __W32_IN BRUSHOBJ  *pboFore,
+  __W32_IN BRUSHOBJ  *pboOpaque,
+  __W32_IN POINTL  *pptlOrg,
+  __W32_IN MIX  mix);
 
 BOOL
 DDKAPI
 DrvTransparentBlt(
-  IN SURFOBJ  *psoDst,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDst,
-  IN RECTL  *prclSrc,
-  IN ULONG  iTransColor,
-  IN ULONG  ulReserved);
+  __W32_IN SURFOBJ  *psoDst,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDst,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN ULONG  iTransColor,
+  __W32_IN ULONG  ulReserved);
 
 BOOL
 DDKAPI
 DrvUnloadFontFile(
-  IN ULONG_PTR  iFile);
+  __W32_IN ULONG_PTR  iFile);
 
 /* WNDOBJCHANGEPROC.fl constants */
 #define WOC_RGN_CLIENT_DELTA              0x00000001
@@ -3569,56 +3569,56 @@
 
 typedef BOOL DDKAPI
 (*PFN_DrvAlphaBlend)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN BLENDOBJ  *pBlendObj);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN BLENDOBJ  *pBlendObj);
 
 typedef BOOL DDKAPI
 (*PFN_DrvAssertMode)(
-  IN DHPDEV  dhpdev,
-  IN BOOL  bEnable);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN BOOL  bEnable);
 
 typedef BOOL DDKAPI
 (*PFN_DrvBitBlt)(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclTrg,
-  IN POINTL  *pptlSrc,
-  IN POINTL  *pptlMask,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrush,
-  IN ROP4  rop4);
+  __W32_IN SURFOBJ  *psoTrg,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclTrg,
+  __W32_IN POINTL  *pptlSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrush,
+  __W32_IN ROP4  rop4);
 
 typedef VOID DDKAPI
 (*PFN_DrvCompletePDEV)(
-  IN DHPDEV  dhpdev,
-  IN HDEV  hdev);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN HDEV  hdev);
 
 typedef BOOL DDKAPI
 (*PFN_DrvCopyBits)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN POINTL  *pptlSrc);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN POINTL  *pptlSrc);
 
 typedef HBITMAP DDKAPI
 (*PFN_DrvCreateDeviceBitmap)(
-  IN DHPDEV  dhpdev,
-  IN SIZEL  sizl,
-  IN ULONG  iFormat);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN SIZEL  sizl,
+  __W32_IN ULONG  iFormat);
 
 typedef VOID DDKAPI
 (*PFN_DrvDeleteDeviceBitmap)(
-  IN DHSURF  dhsurf);
+  __W32_IN DHSURF  dhsurf);
 
 typedef HBITMAP DDKAPI
 (*PFN_DrvDeriveSurface)(
@@ -3627,14 +3627,14 @@
 
 typedef LONG DDKAPI
 (*PFN_DrvDescribePixelFormat)(
-  IN DHPDEV  dhpdev,
-  IN LONG  iPixelFormat,
-  IN ULONG  cjpfd,
-  OUT PIXELFORMATDESCRIPTOR  *ppfd);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN LONG  iPixelFormat,
+  __W32_IN ULONG  cjpfd,
+  __W32_OUT PIXELFORMATDESCRIPTOR  *ppfd);
 
 typedef VOID DDKAPI
 (*PFN_DrvDestroyFont)(
-  IN FONTOBJ  *pfo);
+  __W32_IN FONTOBJ  *pfo);
 
 typedef VOID DDKAPI
 (*PFN_DrvDisableDriver)(
@@ -3642,149 +3642,149 @@
 
 typedef VOID DDKAPI
 (*PFN_DrvDisablePDEV)(
-  IN DHPDEV  dhpdev);
+  __W32_IN DHPDEV  dhpdev);
 
 typedef VOID DDKAPI
 (*PFN_DrvDisableSurface)(
-  IN DHPDEV  dhpdev);
+  __W32_IN DHPDEV  dhpdev);
 
 typedef ULONG DDKAPI
 (*PFN_DrvDitherColor)(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iMode,
-  IN ULONG  rgb,
-  OUT ULONG  *pul);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  rgb,
+  __W32_OUT ULONG  *pul);
 
 typedef ULONG DDKAPI
 (*PFN_DrvDrawEscape)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prcl,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iEsc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN RECTL  *prcl,
+  __W32_IN ULONG  cjIn,
+  __W32_IN PVOID  pvIn);
 
 typedef BOOL DDKAPI
 (*PFN_DrvEnableDriver)(
-  IN ULONG  iEngineVersion,
-  IN ULONG  cj,
-  OUT DRVENABLEDATA  *pded);
+  __W32_IN ULONG  iEngineVersion,
+  __W32_IN ULONG  cj,
+  __W32_OUT DRVENABLEDATA  *pded);
 #if 0
 typedef DHPDEV DDKAPI
 (*PFN_DrvEnablePDEV)(
-  IN DEVMODEW  *pdm,
-  IN LPWSTR  pwszLogAddress,
-  IN ULONG  cPat,
-  OUT HSURF  *phsurfPatterns,
-  IN ULONG  cjCaps,
-  OUT ULONG  *pdevcaps,
-  IN ULONG  cjDevInfo,
-  OUT DEVINFO  *pdi,
-  IN HDEV  hdev,
-  IN LPWSTR  pwszDeviceName,
-  IN HANDLE  hDriver);
+  __W32_IN DEVMODEW  *pdm,
+  __W32_IN LPWSTR  pwszLogAddress,
+  __W32_IN ULONG  cPat,
+  __W32_OUT HSURF  *phsurfPatterns,
+  __W32_IN ULONG  cjCaps,
+  __W32_OUT ULONG  *pdevcaps,
+  __W32_IN ULONG  cjDevInfo,
+  __W32_OUT DEVINFO  *pdi,
+  __W32_IN HDEV  hdev,
+  __W32_IN LPWSTR  pwszDeviceName,
+  __W32_IN HANDLE  hDriver);
 #endif
 typedef HSURF DDKAPI
 (*PFN_DrvEnableSurface)(
-  IN DHPDEV  dhpdev);
+  __W32_IN DHPDEV  dhpdev);
 
 typedef BOOL DDKAPI
 (*PFN_DrvEndDoc)(
-  IN SURFOBJ  *pso,
-  IN FLONG  fl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN FLONG  fl);
 
 typedef ULONG DDKAPI
 (*PFN_DrvEscape)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iEsc,
+  __W32_IN ULONG  cjIn,
+  __W32_IN PVOID  pvIn,
+  __W32_IN ULONG  cjOut,
+  __W32_OUT PVOID  pvOut);
 
 typedef BOOL DDKAPI
 (*PFN_DrvFillPath)(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix,
-  IN FLONG  flOptions);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mix,
+  __W32_IN FLONG  flOptions);
 
 typedef ULONG DDKAPI
 (*PFN_DrvFontManagement)(
-  IN SURFOBJ  *pso,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG  cjIn,
+  __W32_IN PVOID  pvIn,
+  __W32_IN ULONG  cjOut,
+  __W32_OUT PVOID  pvOut);
 
 typedef VOID DDKAPI
 (*PFN_DrvFree)(
-  IN PVOID  pv,
-  IN ULONG_PTR  id);
+  __W32_IN PVOID  pv,
+  __W32_IN ULONG_PTR  id);
 
 typedef ULONG DDKAPI
 (*PFN_DrvGetGlyphMode)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo);
 
 typedef ULONG DDKAPI
 (*PFN_DrvGetModes)(
-  IN HANDLE  hDriver,
-  IN ULONG  cjSize,
-  OUT DEVMODEW  *pdm);
+  __W32_IN HANDLE  hDriver,
+  __W32_IN ULONG  cjSize,
+  __W32_OUT DEVMODEW  *pdm);
 
 typedef PVOID DDKAPI
 (*PFN_DrvGetTrueTypeFile)(
-  IN ULONG_PTR  iFile,
-  IN ULONG  *pcj);
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  *pcj);
 
 typedef BOOL DDKAPI
 (*PFN_DrvGradientFill)(
-  IN SURFOBJ  *psoDest,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN TRIVERTEX  *pVertex,
-  IN ULONG  nVertex,
-  IN PVOID  pMesh,
-  IN ULONG  nMesh,
-  IN RECTL  *prclExtents,
-  IN POINTL  *pptlDitherOrg,
-  IN ULONG  ulMode);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN TRIVERTEX  *pVertex,
+  __W32_IN ULONG  nVertex,
+  __W32_IN PVOID  pMesh,
+  __W32_IN ULONG  nMesh,
+  __W32_IN RECTL  *prclExtents,
+  __W32_IN POINTL  *pptlDitherOrg,
+  __W32_IN ULONG  ulMode);
 
 typedef BOOL DDKAPI
 (*PFN_DrvIcmCheckBitmapBits)(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hColorTransform,
-  IN SURFOBJ  *pso,
-  OUT PBYTE  paResults);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN HANDLE  hColorTransform,
+  __W32_IN SURFOBJ  *pso,
+  __W32_OUT PBYTE  paResults);
 
 typedef HANDLE DDKAPI
 (*PFN_DrvIcmCreateColorTransform)(
-  IN DHPDEV  dhpdev,
-  IN LPLOGCOLORSPACEW  pLogColorSpace,
-  IN PVOID  pvSourceProfile,
-  IN ULONG  cjSourceProfile,
-  IN PVOID  pvDestProfile,
-  IN ULONG  cjDestProfile,
-  IN PVOID  pvTargetProfile,
-  IN ULONG  cjTargetProfile,
-  IN DWORD  dwReserved);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN LPLOGCOLORSPACEW  pLogColorSpace,
+  __W32_IN PVOID  pvSourceProfile,
+  __W32_IN ULONG  cjSourceProfile,
+  __W32_IN PVOID  pvDestProfile,
+  __W32_IN ULONG  cjDestProfile,
+  __W32_IN PVOID  pvTargetProfile,
+  __W32_IN ULONG  cjTargetProfile,
+  __W32_IN DWORD  dwReserved);
 
 typedef BOOL DDKAPI
 (*PFN_DrvIcmDeleteColorTransform)(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hcmXform);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN HANDLE  hcmXform);
 
 typedef BOOL DDKAPI
 (*PFN_DrvIcmSetDeviceGammaRamp)(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iFormat,
-  IN LPVOID  lpRamp);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG  iFormat,
+  __W32_IN LPVOID  lpRamp);
 
 typedef BOOL DDKAPI
 (*PFN_DrvLineTo)(
@@ -3810,59 +3810,59 @@
 
 typedef VOID DDKAPI
 (*PFN_DrvMovePointer)(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN RECTL  *prcl);
 
 typedef BOOL DDKAPI
 (*PFN_DrvNextBand)(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN POINTL  *pptl);
 
 typedef VOID DDKAPI
 (*PFN_DrvNotify)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iType,
-  IN PVOID  pvData);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iType,
+  __W32_IN PVOID  pvData);
 
 typedef BOOL DDKAPI
 (*PFN_DrvOffset)(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN FLONG  flReserved);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN FLONG  flReserved);
 
 typedef BOOL DDKAPI
 (*PFN_DrvPaint)(
-  IN SURFOBJ  *pso,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mix);
 
 typedef BOOL DDKAPI
 (*PFN_DrvPlgBlt)(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMsk,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlBrushOrg,
-  IN POINTFIX  *pptfx,
-  IN RECTL  *prcl,
-  IN POINTL  *pptl,
-  IN ULONG  iMode);
+  __W32_IN SURFOBJ  *psoTrg,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMsk,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN POINTFIX  *pptfx,
+  __W32_IN RECTL  *prcl,
+  __W32_IN POINTL  *pptl,
+  __W32_IN ULONG  iMode);
 
 typedef BOOL DDKAPI
 (*PFN_DrvQueryAdvanceWidths)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  *phg,
-  OUT PVOID  pvWidths,
-  IN ULONG  cGlyphs);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode,
+  __W32_IN HGLYPH  *phg,
+  __W32_OUT PVOID  pvWidths,
+  __W32_IN ULONG  cGlyphs);
 
 typedef BOOL DDKAPI
 (*PFN_DrvQueryDeviceSupport)(
@@ -3884,85 +3884,85 @@
 
 typedef PIFIMETRICS DDKAPI
 (*PFN_DrvQueryFont)(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG_PTR  *pid);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  iFace,
+  __W32_IN ULONG_PTR  *pid);
 
 typedef LONG DDKAPI
 (*PFN_DrvQueryFontCaps)(
-  IN ULONG  culCaps,
-  OUT ULONG  *pulCaps);
+  __W32_IN ULONG  culCaps,
+  __W32_OUT ULONG  *pulCaps);
 
 typedef LONG DDKAPI
 (*PFN_DrvQueryFontData)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  hg,
-  IN OUT GLYPHDATA  *pgd,
-  IN OUT PVOID  pv,
-  IN ULONG  cjSize);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode,
+  __W32_IN HGLYPH  hg,
+  __W32_IN __W32_OUT GLYPHDATA  *pgd,
+  __W32_IN __W32_OUT PVOID  pv,
+  __W32_IN ULONG  cjSize);
 
 typedef LONG DDKAPI
 (*PFN_DrvQueryFontFile)(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulMode,
-  IN ULONG  cjBuf,
-  IN ULONG  *pulBuf);
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  ulMode,
+  __W32_IN ULONG  cjBuf,
+  __W32_IN ULONG  *pulBuf);
 
 typedef PVOID DDKAPI
 (*PFN_DrvQueryFontTree)(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG  iMode,
-  IN ULONG_PTR  *pid);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  iFace,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG_PTR  *pid);
 
 typedef PFD_GLYPHATTR DDKAPI
 (*PFN_DrvQueryGlyphAttrs)(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode);
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN ULONG  iMode);
 
 typedef ULONG DDKAPI
 (*PFN_DrvQueryPerBandInfo)(
-  IN SURFOBJ  *pso,
-  IN OUT PERBANDINFO  *pbi);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN __W32_OUT PERBANDINFO  *pbi);
 
 typedef LONG DDKAPI
 (*PFN_DrvQueryTrueTypeOutline)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN HGLYPH  hglyph,
-  IN BOOL  bMetricsOnly,
-  IN GLYPHDATA  *pgldt,
-  IN ULONG  cjBuf,
-  OUT TTPOLYGONHEADER  *ppoly);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN HGLYPH  hglyph,
+  __W32_IN BOOL  bMetricsOnly,
+  __W32_IN GLYPHDATA  *pgldt,
+  __W32_IN ULONG  cjBuf,
+  __W32_OUT TTPOLYGONHEADER  *ppoly);
 
 typedef LONG DDKAPI
 (*PFN_DrvQueryTrueTypeTable)(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulFont,
-  IN ULONG  ulTag,
-  IN PTRDIFF  dpStart,
-  IN ULONG  cjBuf,
-  OUT BYTE  *pjBuf,
-  OUT PBYTE  *ppjTable,
-  OUT ULONG *pcjTable);
+  __W32_IN ULONG_PTR  iFile,
+  __W32_IN ULONG  ulFont,
+  __W32_IN ULONG  ulTag,
+  __W32_IN PTRDIFF  dpStart,
+  __W32_IN ULONG  cjBuf,
+  __W32_OUT BYTE  *pjBuf,
+  __W32_OUT PBYTE  *ppjTable,
+  __W32_OUT ULONG *pcjTable);
 
 typedef BOOL DDKAPI
 (*PFN_DrvRealizeBrush)(
-  IN BRUSHOBJ  *pbo,
-  IN SURFOBJ  *psoTarget,
-  IN SURFOBJ  *psoPattern,
-  IN SURFOBJ  *psoMask,
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iHatch);
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN SURFOBJ  *psoTarget,
+  __W32_IN SURFOBJ  *psoPattern,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN ULONG  iHatch);
 
 typedef ULONG DDKAPI
 (*PFN_DrvResetDevice)(
-  IN DHPDEV dhpdev,
-  IN PVOID Reserved);
+  __W32_IN DHPDEV dhpdev,
+  __W32_IN PVOID Reserved);
 
 typedef BOOL DDKAPI
 (*PFN_DrvResetPDEV)(
@@ -3971,181 +3971,181 @@
 
 typedef ULONG_PTR DDKAPI
 (*PFN_DrvSaveScreenBits)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iMode,
-  IN ULONG_PTR  ident,
-  IN RECTL  *prcl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN ULONG  iMode,
+  __W32_IN ULONG_PTR  ident,
+  __W32_IN RECTL  *prcl);
 
 typedef BOOL DDKAPI
 (*PFN_DrvSendPage)(
-  IN SURFOBJ  *pso);
+  __W32_IN SURFOBJ  *pso);
 
 typedef BOOL DDKAPI
 (*PFN_DrvSetPalette)(
-  IN DHPDEV  dhpdev,
-  IN PALOBJ  *ppalo,
-  IN FLONG  fl,
-  IN ULONG  iStart,
-  IN ULONG  cColors);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN PALOBJ  *ppalo,
+  __W32_IN FLONG  fl,
+  __W32_IN ULONG  iStart,
+  __W32_IN ULONG  cColors);
 
 typedef BOOL DDKAPI
 (*PFN_DrvSetPixelFormat)(
-  IN SURFOBJ  *pso,
-  IN LONG  iPixelFormat,
-  IN HWND  hwnd);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LONG  iPixelFormat,
+  __W32_IN HWND  hwnd);
 
 typedef ULONG DDKAPI
 (*PFN_DrvSetPointerShape)(
-  IN SURFOBJ  *pso,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN LONG  xHot,
-  IN LONG  yHot,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN SURFOBJ  *psoColor,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN LONG  xHot,
+  __W32_IN LONG  yHot,
+  __W32_IN LONG  x,
+  __W32_IN LONG  y,
+  __W32_IN RECTL  *prcl,
+  __W32_IN FLONG  fl);
 
 typedef BOOL DDKAPI
 (*PFN_DrvStartBanding)(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN POINTL  *pptl);
 
 typedef BOOL DDKAPI
 (*PFN_DrvStartDoc)(
-  IN SURFOBJ  *pso,
-  IN LPWSTR  pwszDocName,
-  IN DWORD  dwJobId);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN LPWSTR  pwszDocName,
+  __W32_IN DWORD  dwJobId);
 
 typedef BOOL DDKAPI
 (*PFN_DrvStartPage)(
-  IN SURFOBJ  *pso);
+  __W32_IN SURFOBJ  *pso);
 
 typedef BOOL DDKAPI
 (*PFN_DrvStretchBlt)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlHTOrg,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN ULONG  iMode);
 
 typedef BOOL DDKAPI
 (*PFN_DrvStretchBltROP)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode,
-  IN BRUSHOBJ  *pbo,
-  IN DWORD  rop4);
+  __W32_IN SURFOBJ  *psoDest,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN SURFOBJ  *psoMask,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN COLORADJUSTMENT  *pca,
+  __W32_IN POINTL  *pptlHTOrg,
+  __W32_IN RECTL  *prclDest,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN POINTL  *pptlMask,
+  __W32_IN ULONG  iMode,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN DWORD  rop4);
 
 typedef BOOL DDKAPI
 (*PFN_DrvStrokeAndFillPath)(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pboStroke,
-  IN LINEATTRS  *plineattrs,
-  IN BRUSHOBJ  *pboFill,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mixFill,
-  IN FLONG  flOptions);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_IN BRUSHOBJ  *pboStroke,
+  __W32_IN LINEATTRS  *plineattrs,
+  __W32_IN BRUSHOBJ  *pboFill,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN MIX  mixFill,
+  __W32_IN FLONG  flOptions);
 
 typedef BOOL DDKAPI
 (*PFN_DrvStrokePath)(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN LINEATTRS  *plineattrs,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN PATHOBJ  *ppo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XFORMOBJ  *pxo,
+  __W32_IN BRUSHOBJ  *pbo,
+  __W32_IN POINTL  *pptlBrushOrg,
+  __W32_IN LINEATTRS  *plineattrs,
+  __W32_IN MIX  mix);
 
 typedef BOOL DDKAPI
 (*PFN_DrvSwapBuffers)(
-  IN SURFOBJ  *pso,
-  IN WNDOBJ  *pwo);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN WNDOBJ  *pwo);
 
 typedef VOID DDKAPI
 (*PFN_DrvSynchronize)(
-  IN DHPDEV  dhpdev,
-  IN RECTL  *prcl);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_IN RECTL  *prcl);
 
 typedef VOID DDKAPI
 (*PFN_DrvSynchronizeSurface)(
-  IN SURFOBJ  *pso,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN RECTL  *prcl,
+  __W32_IN FLONG  fl);
 
 typedef BOOL DDKAPI
 (*PFN_DrvTextOut)(
-  IN SURFOBJ  *pso,
-  IN STROBJ  *pstro,
-  IN FONTOBJ  *pfo,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prclExtra,
-  IN RECTL  *prclOpaque,
-  IN BRUSHOBJ  *pboFore,
-  IN BRUSHOBJ  *pboOpaque,
-  IN POINTL  *pptlOrg,
-  IN MIX  mix);
+  __W32_IN SURFOBJ  *pso,
+  __W32_IN STROBJ  *pstro,
+  __W32_IN FONTOBJ  *pfo,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN RECTL  *prclExtra,
+  __W32_IN RECTL  *prclOpaque,
+  __W32_IN BRUSHOBJ  *pboFore,
+  __W32_IN BRUSHOBJ  *pboOpaque,
+  __W32_IN POINTL  *pptlOrg,
+  __W32_IN MIX  mix);
 
 typedef BOOL DDKAPI
 (*PFN_DrvTransparentBlt)(
-  IN SURFOBJ  *psoDst,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDst,
-  IN RECTL  *prclSrc,
-  IN ULONG  iTransColor,
-  IN ULONG  ulReserved);
+  __W32_IN SURFOBJ  *psoDst,
+  __W32_IN SURFOBJ  *psoSrc,
+  __W32_IN CLIPOBJ  *pco,
+  __W32_IN XLATEOBJ  *pxlo,
+  __W32_IN RECTL  *prclDst,
+  __W32_IN RECTL  *prclSrc,
+  __W32_IN ULONG  iTransColor,
+  __W32_IN ULONG  ulReserved);
 
 typedef BOOL DDKAPI
 (*PFN_DrvUnloadFontFile)(
-  IN ULONG_PTR  iFile);
+  __W32_IN ULONG_PTR  iFile);
 
 
 WIN32KAPI
 VOID
 DDKAPI
 DrvDisableDirectDraw(
-  IN DHPDEV  dhpdev);
+  __W32_IN DHPDEV  dhpdev);
 
 WIN32KAPI
 BOOL
 DDKAPI
 DrvEnableDirectDraw(
-  IN DHPDEV  dhpdev,
-  OUT DD_CALLBACKS  *pCallBacks,
-  OUT DD_SURFACECALLBACKS  *pSurfaceCallBacks,
-  OUT DD_PALETTECALLBACKS  *pPaletteCallBacks);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_OUT DD_CALLBACKS  *pCallBacks,
+  __W32_OUT DD_SURFACECALLBACKS  *pSurfaceCallBacks,
+  __W32_OUT DD_PALETTECALLBACKS  *pPaletteCallBacks);
 
 WIN32KAPI
 BOOL
 DDKAPI
 DrvGetDirectDrawInfo(
-  IN DHPDEV  dhpdev,
-  OUT DD_HALINFO  *pHalInfo,
-  OUT DWORD  *pdwNumHeaps,
-  OUT VIDEOMEMORY  *pvmList,
-  OUT DWORD  *pdwNumFourCCCodes,
-  OUT DWORD  *pdwFourCC);
+  __W32_IN DHPDEV  dhpdev,
+  __W32_OUT DD_HALINFO  *pHalInfo,
+  __W32_OUT DWORD  *pdwNumHeaps,
+  __W32_OUT VIDEOMEMORY  *pvmList,
+  __W32_OUT DWORD  *pdwNumFourCCCodes,
+  __W32_OUT DWORD  *pdwFourCC);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/ddk/winddk.h w32api-3.6/include/ddk/winddk.h
--- w32api-3.6.orig/include/ddk/winddk.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/winddk.h	2006-02-06 16:41:14.000000000 +1030
@@ -53,9 +53,9 @@
 #endif
 
 /* Pseudo modifiers for parameters */
-#define IN
-#define OUT
-#define OPTIONAL
+#define __W32_IN
+#define __W32_OUT
+#define __W32_OPTIONAL
 #define UNALLIGNED
 
 #define CONST const
@@ -112,7 +112,7 @@
 */
 
 #define TAG(_a, _b, _c, _d) (ULONG) \
-	(((_a) << 0) + ((_b) << 8) + ((_c) << 16) + ((_d) << 24))
+  (((_a) << 0) + ((_b) << 8) + ((_c) << 16) + ((_d) << 24))
 
 static __inline struct _KPCR * KeGetCurrentKPCR(
   VOID)
@@ -120,7 +120,7 @@
   ULONG Value;
 
   __asm__ __volatile__ ("movl %%fs:0x18, %0\n\t"
-	  : "=r" (Value)
+    : "=r" (Value)
     : /* no inputs */
   );
   return (struct _KPCR *) Value;
@@ -157,7 +157,7 @@
 typedef struct _DRIVE_LAYOUT_INFORMATION_EX *PDRIVE_LAYOUT_INFORMATION_EX;
 
 /* Constants */
-#define	MAXIMUM_PROCESSORS                32
+#define  MAXIMUM_PROCESSORS                32
 
 #define MAXIMUM_WAIT_OBJECTS              64
 
@@ -291,7 +291,7 @@
 #define DIRECTORY_CREATE_OBJECT (0x0004)
 #define DIRECTORY_CREATE_SUBDIRECTORY (0x0008)
 #define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF)
-  
+
 /* Exported object types */
 extern NTOSAPI POBJECT_TYPE ExDesktopObjectType;
 extern NTOSAPI POBJECT_TYPE ExEventObjectType;
@@ -428,99 +428,99 @@
 
 typedef IO_ALLOCATION_ACTION
 (DDKAPI *PDRIVER_CONTROL)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  Context);
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN struct _IRP  *Irp,
+  __W32_IN PVOID  MapRegisterBase,
+  __W32_IN PVOID  Context);
 
 typedef VOID
 (DDKAPI *PDRIVER_LIST_CONTROL)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN struct _SCATTER_GATHER_LIST  *ScatterGather,
-  IN PVOID  Context);
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN struct _IRP  *Irp,
+  __W32_IN struct _SCATTER_GATHER_LIST  *ScatterGather,
+  __W32_IN PVOID  Context);
 
 typedef NTSTATUS
 (DDKAPI *PDRIVER_ADD_DEVICE)(
-  IN struct _DRIVER_OBJECT  *DriverObject,
-  IN struct _DEVICE_OBJECT  *PhysicalDeviceObject);
+  __W32_IN struct _DRIVER_OBJECT  *DriverObject,
+  __W32_IN struct _DEVICE_OBJECT  *PhysicalDeviceObject);
 
 typedef NTSTATUS
 (DDKAPI *PIO_COMPLETION_ROUTINE)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN PVOID  Context);
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN struct _IRP  *Irp,
+  __W32_IN PVOID  Context);
 
 typedef VOID
 (DDKAPI *PDRIVER_CANCEL)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp);
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN struct _IRP  *Irp);
 
 typedef VOID
 (DDKAPI *PKDEFERRED_ROUTINE)(
-  IN struct _KDPC  *Dpc,
-  IN PVOID  DeferredContext,
-  IN PVOID  SystemArgument1,
-  IN PVOID  SystemArgument2);
+  __W32_IN struct _KDPC  *Dpc,
+  __W32_IN PVOID  DeferredContext,
+  __W32_IN PVOID  SystemArgument1,
+  __W32_IN PVOID  SystemArgument2);
 
 typedef NTSTATUS
 (DDKAPI *PDRIVER_DISPATCH)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp);
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN struct _IRP  *Irp);
 
 typedef VOID
 (DDKAPI *PIO_DPC_ROUTINE)(
-  IN struct _KDPC  *Dpc,
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN PVOID  Context);
+  __W32_IN struct _KDPC  *Dpc,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN struct _IRP  *Irp,
+  __W32_IN PVOID  Context);
 
 typedef NTSTATUS
 (DDKAPI *PMM_DLL_INITIALIZE)(
-  IN PUNICODE_STRING  RegistryPath);
+  __W32_IN PUNICODE_STRING  RegistryPath);
 
 typedef NTSTATUS
 (DDKAPI *PMM_DLL_UNLOAD)(
   VOID);
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_ENTRY)( 
-  IN struct _DRIVER_OBJECT  *DriverObject, 
-  IN PUNICODE_STRING  RegistryPath); 
+(DDKAPI *PDRIVER_ENTRY)(
+  __W32_IN struct _DRIVER_OBJECT  *DriverObject,
+  __W32_IN PUNICODE_STRING  RegistryPath);
 
 typedef NTSTATUS
 (DDKAPI *PDRIVER_INITIALIZE)(
-  IN struct _DRIVER_OBJECT  *DriverObject, 
-  IN PUNICODE_STRING  RegistryPath);
+  __W32_IN struct _DRIVER_OBJECT  *DriverObject,
+  __W32_IN PUNICODE_STRING  RegistryPath);
 
 typedef BOOLEAN
 (DDKAPI *PKSERVICE_ROUTINE)(
-  IN struct _KINTERRUPT  *Interrupt,
-  IN PVOID  ServiceContext);
+  __W32_IN struct _KINTERRUPT  *Interrupt,
+  __W32_IN PVOID  ServiceContext);
 
 typedef VOID
 (DDKAPI *PIO_TIMER_ROUTINE)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN PVOID  Context);
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN PVOID  Context);
 
 typedef VOID
-(DDKAPI *PDRIVER_REINITIALIZE)( 
-  IN struct _DRIVER_OBJECT  *DriverObject, 
-  IN PVOID  Context, 
-  IN ULONG  Count); 
+(DDKAPI *PDRIVER_REINITIALIZE)(
+  __W32_IN struct _DRIVER_OBJECT  *DriverObject,
+  __W32_IN PVOID  Context,
+  __W32_IN ULONG  Count);
 
 typedef NTSTATUS
 (DDKAPI *PDRIVER_STARTIO)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp);
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject,
+  __W32_IN struct _IRP  *Irp);
 
 typedef BOOLEAN
 (DDKAPI *PKSYNCHRONIZE_ROUTINE)(
-  IN PVOID  SynchronizeContext);
+  __W32_IN PVOID  SynchronizeContext);
 
 typedef VOID
-(DDKAPI *PDRIVER_UNLOAD)( 
-  IN struct _DRIVER_OBJECT  *DriverObject); 
+(DDKAPI *PDRIVER_UNLOAD)(
+  __W32_IN struct _DRIVER_OBJECT  *DriverObject);
 
 
 
@@ -538,25 +538,25 @@
 
 typedef BOOLEAN DDKAPI
 (*PTRANSLATE_BUS_ADDRESS)(
-  IN PVOID  Context,
-  IN PHYSICAL_ADDRESS  BusAddress,
-  IN ULONG  Length,
-  IN OUT PULONG  AddressSpace,
-  OUT PPHYSICAL_ADDRESS  TranslatedAddress);
+  __W32_IN PVOID  Context,
+  __W32_IN PHYSICAL_ADDRESS  BusAddress,
+  __W32_IN ULONG  Length,
+  __W32_IN __W32_OUT PULONG  AddressSpace,
+  __W32_OUT PPHYSICAL_ADDRESS  TranslatedAddress);
 
 typedef struct _DMA_ADAPTER* DDKAPI
 (*PGET_DMA_ADAPTER)(
-  IN PVOID  Context,
-  IN struct _DEVICE_DESCRIPTION  *DeviceDescriptor,
-  OUT PULONG  NumberOfMapRegisters);
+  __W32_IN PVOID  Context,
+  __W32_IN struct _DEVICE_DESCRIPTION  *DeviceDescriptor,
+  __W32_OUT PULONG  NumberOfMapRegisters);
 
 typedef ULONG DDKAPI
 (*PGET_SET_DEVICE_DATA)(
-  IN PVOID  Context,
-  IN ULONG  DataType,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN PVOID  Context,
+  __W32_IN ULONG  DataType,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 typedef union _POWER_STATE {
   SYSTEM_POWER_STATE  SystemState;
@@ -634,11 +634,11 @@
   PVOID  Context;
   PINTERFACE_REFERENCE  InterfaceReference;
   PINTERFACE_DEREFERENCE  InterfaceDereference;
-} INTERFACE, *PINTERFACE; 
+} INTERFACE, *PINTERFACE;
 
 typedef struct _PLUGPLAY_NOTIFICATION_HEADER {
-  USHORT  Version; 
-  USHORT  Size; 
+  USHORT  Version;
+  USHORT  Size;
   GUID  Event;
 } PLUGPLAY_NOTIFICATION_HEADER, *PPLUGPLAY_NOTIFICATION_HEADER;
 
@@ -729,12 +729,12 @@
 
 typedef NTSTATUS DDKAPI
 (*PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
-  IN PVOID NotificationStructure,
-  IN PVOID Context);
+  __W32_IN PVOID NotificationStructure,
+  __W32_IN PVOID Context);
 
 typedef VOID DDKAPI
 (*PDEVICE_CHANGE_COMPLETE_CALLBACK)(
-  IN PVOID Context);
+  __W32_IN PVOID Context);
 
 
 
@@ -751,15 +751,15 @@
 #define DUPLICATE_SAME_ATTRIBUTES         0x00000004
 /* end winnt.h */
 
-typedef struct _OBJECT_NAME_INFORMATION {               
-  UNICODE_STRING  Name;                                
-} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;   
+typedef struct _OBJECT_NAME_INFORMATION {
+  UNICODE_STRING  Name;
+} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;
 
 typedef VOID DDKAPI
 (*PIO_APC_ROUTINE)(
-  IN PVOID ApcContext,
-  IN PIO_STATUS_BLOCK IoStatusBlock,
-  IN ULONG Reserved);
+  __W32_IN PVOID ApcContext,
+  __W32_IN PIO_STATUS_BLOCK IoStatusBlock,
+  __W32_IN ULONG Reserved);
 
 typedef struct _IO_STATUS_BLOCK {
   _ANONYMOUS_UNION union {
@@ -771,21 +771,21 @@
 
 typedef VOID DDKAPI
 (*PKNORMAL_ROUTINE)(
-  IN PVOID  NormalContext,
-  IN PVOID  SystemArgument1,
-  IN PVOID  SystemArgument2);
+  __W32_IN PVOID  NormalContext,
+  __W32_IN PVOID  SystemArgument1,
+  __W32_IN PVOID  SystemArgument2);
 
 typedef VOID DDKAPI
 (*PKKERNEL_ROUTINE)(
-  IN struct _KAPC  *Apc,
-  IN OUT PKNORMAL_ROUTINE  *NormalRoutine,
-  IN OUT PVOID  *NormalContext,
-  IN OUT PVOID  *SystemArgument1,
-  IN OUT PVOID  *SystemArgument2);
+  __W32_IN struct _KAPC  *Apc,
+  __W32_IN __W32_OUT PKNORMAL_ROUTINE  *NormalRoutine,
+  __W32_IN __W32_OUT PVOID  *NormalContext,
+  __W32_IN __W32_OUT PVOID  *SystemArgument1,
+  __W32_IN __W32_OUT PVOID  *SystemArgument2);
 
 typedef VOID DDKAPI
 (*PKRUNDOWN_ROUTINE)(
-  IN struct _KAPC  *Apc);
+  __W32_IN struct _KAPC  *Apc);
 
 typedef BOOLEAN DDKAPI
 (*PKTRANSFER_ROUTINE)(
@@ -1550,7 +1550,7 @@
   BOOLEAN  IgnoreCount;
   BOOLEAN  Reserved1;
   BOOLEAN  Dma64BitAddresses;
-  ULONG  BusNumber; 
+  ULONG  BusNumber;
   ULONG  DmaChannel;
   INTERFACE_TYPE  InterfaceType;
   DMA_WIDTH  DmaWidth;
@@ -1582,21 +1582,21 @@
 
 /* DEVICE_OBJECT.Flags */
 
-#define DO_VERIFY_VOLUME                  0x00000002      
-#define DO_BUFFERED_IO                    0x00000004      
-#define DO_EXCLUSIVE                      0x00000008      
-#define DO_DIRECT_IO                      0x00000010      
-#define DO_MAP_IO_BUFFER                  0x00000020      
-#define DO_DEVICE_HAS_NAME                0x00000040      
-#define DO_DEVICE_INITIALIZING            0x00000080      
-#define DO_SYSTEM_BOOT_PARTITION          0x00000100      
-#define DO_LONG_TERM_REQUESTS             0x00000200      
-#define DO_NEVER_LAST_DEVICE              0x00000400      
-#define DO_SHUTDOWN_REGISTERED            0x00000800      
-#define DO_BUS_ENUMERATED_DEVICE          0x00001000      
-#define DO_POWER_PAGABLE                  0x00002000      
-#define DO_POWER_INRUSH                   0x00004000      
-#define DO_LOW_PRIORITY_FILESYSTEM        0x00010000      
+#define DO_VERIFY_VOLUME                  0x00000002
+#define DO_BUFFERED_IO                    0x00000004
+#define DO_EXCLUSIVE                      0x00000008
+#define DO_DIRECT_IO                      0x00000010
+#define DO_MAP_IO_BUFFER                  0x00000020
+#define DO_DEVICE_HAS_NAME                0x00000040
+#define DO_DEVICE_INITIALIZING            0x00000080
+#define DO_SYSTEM_BOOT_PARTITION          0x00000100
+#define DO_LONG_TERM_REQUESTS             0x00000200
+#define DO_NEVER_LAST_DEVICE              0x00000400
+#define DO_SHUTDOWN_REGISTERED            0x00000800
+#define DO_BUS_ENUMERATED_DEVICE          0x00001000
+#define DO_POWER_PAGABLE                  0x00002000
+#define DO_POWER_INRUSH                   0x00004000
+#define DO_LOW_PRIORITY_FILESYSTEM        0x00010000
 
 /* DEVICE_OBJECT.Characteristics */
 
@@ -1684,7 +1684,7 @@
 #define FILE_DEVICE_SERENUM               0x00000037
 #define FILE_DEVICE_TERMSRV               0x00000038
 #define FILE_DEVICE_KSEC                  0x00000039
-#define FILE_DEVICE_FIPS		              0x0000003a
+#define FILE_DEVICE_FIPS                  0x0000003a
 
 typedef struct _DEVICE_OBJECT {
   CSHORT  Type;
@@ -1733,8 +1733,8 @@
 } DEVICE_RELATIONS, *PDEVICE_RELATIONS;
 
 typedef struct _SCATTER_GATHER_ELEMENT {
-  PHYSICAL_ADDRESS  Address;   
-  ULONG  Length;          
+  PHYSICAL_ADDRESS  Address;
+  ULONG  Length;
   ULONG_PTR  Reserved;
 } SCATTER_GATHER_ELEMENT, *PSCATTER_GATHER_ELEMENT;
 
@@ -1781,112 +1781,112 @@
 
 typedef VOID DDKAPI
 (*PPUT_DMA_ADAPTER)(
-  IN PDMA_ADAPTER  DmaAdapter);
+  __W32_IN PDMA_ADAPTER  DmaAdapter);
 
 typedef PVOID DDKAPI
 (*PALLOCATE_COMMON_BUFFER)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN ULONG  Length,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN ULONG  Length,
+  __W32_OUT PPHYSICAL_ADDRESS  LogicalAddress,
+  __W32_IN BOOLEAN  CacheEnabled);
 
 typedef VOID DDKAPI
 (*PFREE_COMMON_BUFFER)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN ULONG  Length,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN PVOID  VirtualAddress,
-  IN BOOLEAN  CacheEnabled);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN ULONG  Length,
+  __W32_IN PHYSICAL_ADDRESS  LogicalAddress,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN BOOLEAN  CacheEnabled);
 
 typedef NTSTATUS DDKAPI
 (*PALLOCATE_ADAPTER_CHANNEL)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  NumberOfMapRegisters,
-  IN PDRIVER_CONTROL  ExecutionRoutine,
-  IN PVOID  Context);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  NumberOfMapRegisters,
+  __W32_IN PDRIVER_CONTROL  ExecutionRoutine,
+  __W32_IN PVOID  Context);
 
 typedef BOOLEAN DDKAPI
 (*PFLUSH_ADAPTER_BUFFERS)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PMDL  Mdl,
+  __W32_IN PVOID  MapRegisterBase,
+  __W32_IN PVOID  CurrentVa,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 typedef VOID DDKAPI
 (*PFREE_ADAPTER_CHANNEL)(
-  IN PDMA_ADAPTER  DmaAdapter);
+  __W32_IN PDMA_ADAPTER  DmaAdapter);
 
 typedef VOID DDKAPI
 (*PFREE_MAP_REGISTERS)(
-  IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
   PVOID  MapRegisterBase,
   ULONG  NumberOfMapRegisters);
 
 typedef PHYSICAL_ADDRESS DDKAPI
 (*PMAP_TRANSFER)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN OUT PULONG  Length,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PMDL  Mdl,
+  __W32_IN PVOID  MapRegisterBase,
+  __W32_IN PVOID  CurrentVa,
+  __W32_IN __W32_OUT PULONG  Length,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 typedef ULONG DDKAPI
 (*PGET_DMA_ALIGNMENT)(
-  IN PDMA_ADAPTER  DmaAdapter);
+  __W32_IN PDMA_ADAPTER  DmaAdapter);
 
 typedef ULONG DDKAPI
 (*PREAD_DMA_COUNTER)(
-  IN PDMA_ADAPTER  DmaAdapter);
+  __W32_IN PDMA_ADAPTER  DmaAdapter);
 
 typedef NTSTATUS DDKAPI
 (*PGET_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PMDL  Mdl,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN PDRIVER_LIST_CONTROL  ExecutionRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PMDL  Mdl,
+  __W32_IN PVOID  CurrentVa,
+  __W32_IN ULONG  Length,
+  __W32_IN PDRIVER_LIST_CONTROL  ExecutionRoutine,
+  __W32_IN PVOID  Context,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 typedef VOID DDKAPI
 (*PPUT_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PSCATTER_GATHER_LIST  ScatterGather,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PSCATTER_GATHER_LIST  ScatterGather,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 typedef NTSTATUS DDKAPI
 (*PCALCULATE_SCATTER_GATHER_LIST_SIZE)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PMDL  Mdl  OPTIONAL,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  OUT PULONG  ScatterGatherListSize,
-  OUT PULONG  pNumberOfMapRegisters  OPTIONAL);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PMDL  Mdl  __W32_OPTIONAL,
+  __W32_IN PVOID  CurrentVa,
+  __W32_IN ULONG  Length,
+  __W32_OUT PULONG  ScatterGatherListSize,
+  __W32_OUT PULONG  pNumberOfMapRegisters  __W32_OPTIONAL);
 
 typedef NTSTATUS DDKAPI
 (*PBUILD_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PMDL  Mdl,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN PDRIVER_LIST_CONTROL  ExecutionRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN  WriteToDevice,
-  IN PVOID  ScatterGatherBuffer,
-  IN ULONG  ScatterGatherLength);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PMDL  Mdl,
+  __W32_IN PVOID  CurrentVa,
+  __W32_IN ULONG  Length,
+  __W32_IN PDRIVER_LIST_CONTROL  ExecutionRoutine,
+  __W32_IN PVOID  Context,
+  __W32_IN BOOLEAN  WriteToDevice,
+  __W32_IN PVOID  ScatterGatherBuffer,
+  __W32_IN ULONG  ScatterGatherLength);
 
 typedef NTSTATUS DDKAPI
 (*PBUILD_MDL_FROM_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PSCATTER_GATHER_LIST  ScatterGather,
-  IN PMDL  OriginalMdl,
-  OUT PMDL  *TargetMdl);
+  __W32_IN PDMA_ADAPTER  DmaAdapter,
+  __W32_IN PSCATTER_GATHER_LIST  ScatterGather,
+  __W32_IN PMDL  OriginalMdl,
+  __W32_OUT PMDL  *TargetMdl);
 
 typedef struct _DMA_OPERATIONS {
   ULONG  Size;
@@ -1957,18 +1957,18 @@
   FileMaximumInformation
 } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
 
-typedef struct _FILE_POSITION_INFORMATION {                 
-  LARGE_INTEGER  CurrentByteOffset;                        
-} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION;   
+typedef struct _FILE_POSITION_INFORMATION {
+  LARGE_INTEGER  CurrentByteOffset;
+} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION;
 
 typedef struct _FILE_ALIGNMENT_INFORMATION {
   ULONG  AlignmentRequirement;
 } FILE_ALIGNMENT_INFORMATION;
 
-typedef struct _FILE_NAME_INFORMATION {                     
-  ULONG  FileNameLength;                                   
-  WCHAR  FileName[1];                                      
-} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION;           
+typedef struct _FILE_NAME_INFORMATION {
+  ULONG  FileNameLength;
+  WCHAR  FileName[1];
+} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION;
 
 typedef struct _FILE_BASIC_INFORMATION {
   LARGE_INTEGER  CreationTime;
@@ -1986,32 +1986,32 @@
   BOOLEAN  Directory;
 } FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION;
 
-typedef struct _FILE_NETWORK_OPEN_INFORMATION {                 
-  LARGE_INTEGER  CreationTime;                                 
-  LARGE_INTEGER  LastAccessTime;                               
-  LARGE_INTEGER  LastWriteTime;                                
-  LARGE_INTEGER  ChangeTime;                                   
-  LARGE_INTEGER  AllocationSize;                               
-  LARGE_INTEGER  EndOfFile;                                    
-  ULONG  FileAttributes;                                       
-} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION;   
-
-typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION {               
-  ULONG  FileAttributes;                                       
-  ULONG  ReparseTag;                                           
+typedef struct _FILE_NETWORK_OPEN_INFORMATION {
+  LARGE_INTEGER  CreationTime;
+  LARGE_INTEGER  LastAccessTime;
+  LARGE_INTEGER  LastWriteTime;
+  LARGE_INTEGER  ChangeTime;
+  LARGE_INTEGER  AllocationSize;
+  LARGE_INTEGER  EndOfFile;
+  ULONG  FileAttributes;
+} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION;
+
+typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION {
+  ULONG  FileAttributes;
+  ULONG  ReparseTag;
 } FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION;
 
-typedef struct _FILE_DISPOSITION_INFORMATION {                  
-  BOOLEAN  DoDeleteFile;                                         
-} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; 
-                                                                
-typedef struct _FILE_END_OF_FILE_INFORMATION {                  
-  LARGE_INTEGER  EndOfFile;                                    
-} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; 
-                                                                
-typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION {                                    
-  LARGE_INTEGER  ValidDataLength;                                                      
-} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION;             
+typedef struct _FILE_DISPOSITION_INFORMATION {
+  BOOLEAN  DoDeleteFile;
+} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION;
+
+typedef struct _FILE_END_OF_FILE_INFORMATION {
+  LARGE_INTEGER  EndOfFile;
+} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION;
+
+typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION {
+  LARGE_INTEGER  ValidDataLength;
+} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION;
 
 typedef enum _FSINFOCLASS {
   FileFsVolumeInformation = 1,
@@ -2086,223 +2086,223 @@
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_CHECK_IF_POSSIBLE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN BOOLEAN  Wait,
-  IN ULONG  LockKey,
-  IN BOOLEAN  CheckForReadOperation,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  Wait,
+  __W32_IN ULONG  LockKey,
+  __W32_IN BOOLEAN  CheckForReadOperation,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_READ)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN BOOLEAN  Wait,
-  IN ULONG  LockKey,
-  OUT PVOID  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  Wait,
+  __W32_IN ULONG  LockKey,
+  __W32_OUT PVOID  Buffer,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN BOOLEAN  Wait,
-  IN ULONG  LockKey,
-  IN PVOID  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  Wait,
+  __W32_IN ULONG  LockKey,
+  __W32_IN PVOID  Buffer,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_QUERY_BASIC_INFO)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  OUT PFILE_BASIC_INFORMATION  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN BOOLEAN  Wait,
+  __W32_OUT PFILE_BASIC_INFORMATION  Buffer,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_QUERY_STANDARD_INFO)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  OUT PFILE_STANDARD_INFORMATION  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN BOOLEAN  Wait,
+  __W32_OUT PFILE_STANDARD_INFORMATION  Buffer,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_LOCK)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PLARGE_INTEGER  Length,
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN PLARGE_INTEGER  Length,
   PEPROCESS  ProcessId,
   ULONG  Key,
   BOOLEAN  FailImmediately,
   BOOLEAN  ExclusiveLock,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_UNLOCK_SINGLE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PLARGE_INTEGER  Length,
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN PLARGE_INTEGER  Length,
   PEPROCESS  ProcessId,
   ULONG  Key,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_UNLOCK_ALL)(
-  IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN struct _FILE_OBJECT  *FileObject,
   PEPROCESS  ProcessId,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_UNLOCK_ALL_BY_KEY)(
-  IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN struct _FILE_OBJECT  *FileObject,
   PVOID  ProcessId,
   ULONG  Key,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_DEVICE_CONTROL)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  IN PVOID  InputBuffer  OPTIONAL,
-  IN ULONG  InputBufferLength,
-  OUT PVOID  OutputBuffer  OPTIONAL,
-  IN ULONG  OutputBufferLength,
-  IN ULONG  IoControlCode,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN BOOLEAN  Wait,
+  __W32_IN PVOID  InputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  InputBufferLength,
+  __W32_OUT PVOID  OutputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  OutputBufferLength,
+  __W32_IN ULONG  IoControlCode,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef VOID DDKAPI
 (*PFAST_IO_ACQUIRE_FILE)(
-  IN struct _FILE_OBJECT  *FileObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject);
 
 typedef VOID DDKAPI
 (*PFAST_IO_RELEASE_FILE)(
-  IN struct _FILE_OBJECT  *FileObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject);
 
 typedef VOID DDKAPI
 (*PFAST_IO_DETACH_DEVICE)(
-  IN struct _DEVICE_OBJECT  *SourceDevice,
-  IN struct _DEVICE_OBJECT  *TargetDevice);
+  __W32_IN struct _DEVICE_OBJECT  *SourceDevice,
+  __W32_IN struct _DEVICE_OBJECT  *TargetDevice);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_QUERY_NETWORK_OPEN_INFO)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  OUT struct _FILE_NETWORK_OPEN_INFORMATION  *Buffer,
-  OUT struct _IO_STATUS_BLOCK  *IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN BOOLEAN  Wait,
+  __W32_OUT struct _FILE_NETWORK_OPEN_INFORMATION  *Buffer,
+  __W32_OUT struct _IO_STATUS_BLOCK  *IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef NTSTATUS DDKAPI
 (*PFAST_IO_ACQUIRE_FOR_MOD_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  EndingOffset,
-  OUT struct _ERESOURCE  **ResourceToRelease,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  EndingOffset,
+  __W32_OUT struct _ERESOURCE  **ResourceToRelease,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_MDL_READ)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  LockKey,
+  __W32_OUT PMDL  *MdlChain,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_MDL_READ_COMPLETE)(
-  IN struct _FILE_OBJECT *FileObject,
-  IN PMDL MdlChain,
-  IN struct _DEVICE_OBJECT *DeviceObject);
+  __W32_IN struct _FILE_OBJECT *FileObject,
+  __W32_IN PMDL MdlChain,
+  __W32_IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_PREPARE_MDL_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  LockKey,
+  __W32_OUT PMDL  *MdlChain,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_MDL_WRITE_COMPLETE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PMDL  MdlChain,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN PMDL  MdlChain,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_READ_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  OUT PVOID  Buffer,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  OUT struct _COMPRESSED_DATA_INFO  *CompressedDataInfo,
-  IN ULONG  CompressedDataInfoLength,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  LockKey,
+  __W32_OUT PVOID  Buffer,
+  __W32_OUT PMDL  *MdlChain,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_OUT struct _COMPRESSED_DATA_INFO  *CompressedDataInfo,
+  __W32_IN ULONG  CompressedDataInfoLength,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_WRITE_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  IN PVOID  Buffer,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _COMPRESSED_DATA_INFO  *CompressedDataInfo,
-  IN ULONG  CompressedDataInfoLength,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  LockKey,
+  __W32_IN PVOID  Buffer,
+  __W32_OUT PMDL  *MdlChain,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatus,
+  __W32_IN struct _COMPRESSED_DATA_INFO  *CompressedDataInfo,
+  __W32_IN ULONG  CompressedDataInfoLength,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PMDL  MdlChain,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PMDL  MdlChain,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PMDL  MdlChain,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN PLARGE_INTEGER  FileOffset,
+  __W32_IN PMDL  MdlChain,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef BOOLEAN DDKAPI
 (*PFAST_IO_QUERY_OPEN)(
-  IN struct _IRP  *Irp,
-  OUT PFILE_NETWORK_OPEN_INFORMATION  NetworkInformation,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _IRP  *Irp,
+  __W32_OUT PFILE_NETWORK_OPEN_INFORMATION  NetworkInformation,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef NTSTATUS DDKAPI
 (*PFAST_IO_RELEASE_FOR_MOD_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN struct _ERESOURCE  *ResourceToRelease,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN struct _ERESOURCE  *ResourceToRelease,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef NTSTATUS DDKAPI
 (*PFAST_IO_ACQUIRE_FOR_CCFLUSH)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef NTSTATUS DDKAPI
 (*PFAST_IO_RELEASE_FOR_CCFLUSH) (
-  IN struct _FILE_OBJECT  *FileObject,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
+  __W32_IN struct _FILE_OBJECT  *FileObject,
+  __W32_IN struct _DEVICE_OBJECT  *DeviceObject);
 
 typedef struct _FAST_IO_DISPATCH {
   ULONG  SizeOfFastIoDispatch;
@@ -2488,34 +2488,34 @@
 
 typedef VOID DDKAPI
 (*PIO_CSQ_INSERT_IRP)(
-  IN struct _IO_CSQ  *Csq,
-  IN PIRP  Irp);
+  __W32_IN struct _IO_CSQ  *Csq,
+  __W32_IN PIRP  Irp);
 
 typedef VOID DDKAPI
 (*PIO_CSQ_REMOVE_IRP)(
-  IN struct _IO_CSQ  *Csq,
-  IN PIRP  Irp);
+  __W32_IN struct _IO_CSQ  *Csq,
+  __W32_IN PIRP  Irp);
 
 typedef PIRP DDKAPI
 (*PIO_CSQ_PEEK_NEXT_IRP)(
-  IN struct _IO_CSQ  *Csq,
-  IN PIRP  Irp,
-  IN PVOID  PeekContext);
+  __W32_IN struct _IO_CSQ  *Csq,
+  __W32_IN PIRP  Irp,
+  __W32_IN PVOID  PeekContext);
 
 typedef VOID DDKAPI
 (*PIO_CSQ_ACQUIRE_LOCK)(
-  IN  struct _IO_CSQ  *Csq,
-  OUT PKIRQL  Irql);
+  __W32_IN  struct _IO_CSQ  *Csq,
+  __W32_OUT PKIRQL  Irql);
 
 typedef VOID DDKAPI
 (*PIO_CSQ_RELEASE_LOCK)(
-  IN struct _IO_CSQ  *Csq,
-  IN KIRQL  Irql);
+  __W32_IN struct _IO_CSQ  *Csq,
+  __W32_IN KIRQL  Irql);
 
 typedef VOID DDKAPI
 (*PIO_CSQ_COMPLETE_CANCELED_IRP)(
-  IN  struct _IO_CSQ  *Csq,
-  IN  PIRP  Irp);
+  __W32_IN  struct _IO_CSQ  *Csq,
+  __W32_IN  PIRP  Irp);
 
 typedef struct _IO_CSQ {
   ULONG  Type;
@@ -2914,14 +2914,14 @@
   NonPagedPoolCacheAligned,
   PagedPoolCacheAligned,
   NonPagedPoolCacheAlignedMustS,
-	MaxPoolType,
-	NonPagedPoolSession = 32,
-	PagedPoolSession,
-	NonPagedPoolMustSucceedSession,
-	DontUseThisTypeSession,
-	NonPagedPoolCacheAlignedSession,
-	PagedPoolCacheAlignedSession,
-	NonPagedPoolCacheAlignedMustSSession
+  MaxPoolType,
+  NonPagedPoolSession = 32,
+  PagedPoolSession,
+  NonPagedPoolMustSucceedSession,
+  DontUseThisTypeSession,
+  NonPagedPoolCacheAlignedSession,
+  PagedPoolCacheAlignedSession,
+  NonPagedPoolCacheAlignedMustSSession
 } POOL_TYPE;
 
 typedef enum _EX_POOL_PRIORITY {
@@ -2967,9 +2967,9 @@
 ULONGLONG
 DDKAPI
 VerSetConditionMask(
-  IN ULONGLONG  ConditionMask,
-  IN ULONG  TypeMask,
-  IN UCHAR  Condition);
+  __W32_IN ULONGLONG  ConditionMask,
+  __W32_IN ULONG  TypeMask,
+  __W32_IN UCHAR  Condition);
 
 #define VER_SET_CONDITION(ConditionMask, TypeBitMask, ComparisonType)  \
         ((ConditionMask) = VerSetConditionMask((ConditionMask), \
@@ -3011,12 +3011,12 @@
 
 typedef NTSTATUS DDKAPI
 (*PRTL_QUERY_REGISTRY_ROUTINE)(
-  IN PWSTR  ValueName,
-  IN ULONG  ValueType,
-  IN PVOID  ValueData,
-  IN ULONG  ValueLength,
-  IN PVOID  Context,
-  IN PVOID  EntryContext);
+  __W32_IN PWSTR  ValueName,
+  __W32_IN ULONG  ValueType,
+  __W32_IN PVOID  ValueData,
+  __W32_IN ULONG  ValueLength,
+  __W32_IN PVOID  Context,
+  __W32_IN PVOID  EntryContext);
 
 #define RTL_REGISTRY_ABSOLUTE             0
 #define RTL_REGISTRY_SERVICES             1
@@ -3057,13 +3057,13 @@
 
 typedef PVOID DDKAPI
 (*PALLOCATE_FUNCTION)(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
+  __W32_IN POOL_TYPE  PoolType,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN ULONG  Tag);
 
 typedef VOID DDKAPI
 (*PFREE_FUNCTION)(
-  IN PVOID  Buffer);
+  __W32_IN PVOID  Buffer);
 
 #define GENERAL_LOOKASIDE_S \
   SLIST_HEADER  ListHead; \
@@ -3109,9 +3109,9 @@
 typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT;
 
 typedef VOID DDKAPI (*PCALLBACK_FUNCTION)(
-  IN PVOID  CallbackContext,
-  IN PVOID  Argument1,
-  IN PVOID  Argument2);
+  __W32_IN PVOID  CallbackContext,
+  __W32_IN PVOID  Argument1,
+  __W32_IN PVOID  Argument2);
 
 typedef enum _EVENT_TYPE {
   NotificationEvent,
@@ -3191,8 +3191,8 @@
 
 typedef VOID DDKAPI
 (*PIO_WORKITEM_ROUTINE)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PVOID  Context);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PVOID  Context);
 
 typedef struct _SHARE_ACCESS {
   ULONG  OpenCount;
@@ -3306,17 +3306,17 @@
 } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE;
 
 typedef NTSTATUS (*PIO_QUERY_DEVICE_ROUTINE)(
-  IN PVOID  Context,
-  IN PUNICODE_STRING  PathName,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  BusNumber,
-  IN PKEY_VALUE_FULL_INFORMATION  *BusInformation,
-  IN CONFIGURATION_TYPE  ControllerType,
-  IN ULONG  ControllerNumber,
-  IN PKEY_VALUE_FULL_INFORMATION  *ControllerInformation,
-  IN CONFIGURATION_TYPE  PeripheralType,
-  IN ULONG  PeripheralNumber,
-  IN PKEY_VALUE_FULL_INFORMATION  *PeripheralInformation);
+  __W32_IN PVOID  Context,
+  __W32_IN PUNICODE_STRING  PathName,
+  __W32_IN INTERFACE_TYPE  BusType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN PKEY_VALUE_FULL_INFORMATION  *BusInformation,
+  __W32_IN CONFIGURATION_TYPE  ControllerType,
+  __W32_IN ULONG  ControllerNumber,
+  __W32_IN PKEY_VALUE_FULL_INFORMATION  *ControllerInformation,
+  __W32_IN CONFIGURATION_TYPE  PeripheralType,
+  __W32_IN ULONG  PeripheralNumber,
+  __W32_IN PKEY_VALUE_FULL_INFORMATION  *PeripheralInformation);
 
 typedef enum _WORK_QUEUE_TYPE {
   CriticalWorkQueue,
@@ -3327,7 +3327,7 @@
 
 typedef VOID DDKAPI
 (*PWORKER_THREAD_ROUTINE)(
-  IN PVOID Parameter);
+  __W32_IN PVOID Parameter);
 
 typedef struct _WORK_QUEUE_ITEM {
   LIST_ENTRY  List;
@@ -3345,8 +3345,8 @@
 
 typedef VOID DDKAPI
 (*PKBUGCHECK_CALLBACK_ROUTINE)(
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 typedef struct _KBUGCHECK_CALLBACK_RECORD {
   LIST_ENTRY  Entry;
@@ -3361,7 +3361,7 @@
 /*
  * VOID
  * KeInitializeCallbackRecord(
- *   IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord)
+ *   __W32_IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord)
  */
 #define KeInitializeCallbackRecord(CallbackRecord) \
   CallbackRecord->State = BufferEmpty;
@@ -3416,19 +3416,19 @@
 
 typedef VOID DDKAPI
 (*PKSTART_ROUTINE)(
-  IN PVOID  StartContext);
+  __W32_IN PVOID  StartContext);
 
 typedef VOID DDKAPI
 (*PCREATE_PROCESS_NOTIFY_ROUTINE)(
-  IN HANDLE  ParentId,
-  IN HANDLE  ProcessId,
-  IN BOOLEAN  Create);
+  __W32_IN HANDLE  ParentId,
+  __W32_IN HANDLE  ProcessId,
+  __W32_IN BOOLEAN  Create);
 
 typedef VOID DDKAPI
 (*PCREATE_THREAD_NOTIFY_ROUTINE)(
-  IN HANDLE  ProcessId,
-  IN HANDLE  ThreadId,
-  IN BOOLEAN  Create);
+  __W32_IN HANDLE  ProcessId,
+  __W32_IN HANDLE  ThreadId,
+  __W32_IN BOOLEAN  Create);
 
 typedef struct _IMAGE_INFO {
   _ANONYMOUS_UNION union {
@@ -3450,9 +3450,9 @@
 
 typedef VOID DDKAPI
 (*PLOAD_IMAGE_NOTIFY_ROUTINE)(
-  IN PUNICODE_STRING  FullImageName,
-  IN HANDLE  ProcessId,
-  IN PIMAGE_INFO  ImageInfo);
+  __W32_IN PUNICODE_STRING  FullImageName,
+  __W32_IN HANDLE  ProcessId,
+  __W32_IN PIMAGE_INFO  ImageInfo);
 
 typedef enum _PROCESSINFOCLASS {
   ProcessBasicInformation,
@@ -3523,11 +3523,11 @@
 
 typedef VOID DDKAPI
 (*PREQUEST_POWER_COMPLETE)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN UCHAR  MinorFunction,
-  IN POWER_STATE  PowerState,
-  IN PVOID  Context,
-  IN PIO_STATUS_BLOCK  IoStatus);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN UCHAR  MinorFunction,
+  __W32_IN POWER_STATE  PowerState,
+  __W32_IN PVOID  Context,
+  __W32_IN PIO_STATUS_BLOCK  IoStatus);
 
 typedef enum _TRACE_INFORMATION_CLASS {
   TraceIdClass,
@@ -3542,9 +3542,9 @@
 
 typedef NTSTATUS DDKAPI
 (*PEX_CALLBACK_FUNCTION)(
-  IN PVOID  CallbackContext,
-  IN PVOID  Argument1,
-  IN PVOID  Argument2);
+  __W32_IN PVOID  CallbackContext,
+  __W32_IN PVOID  Argument1,
+  __W32_IN PVOID  Argument2);
 
 
 
@@ -3588,8 +3588,8 @@
 
 typedef VOID DDKFASTAPI
 (*PTIME_UPDATE_NOTIFY_ROUTINE)(
-  IN HANDLE  ThreadId,
-  IN KPROCESSOR_MODE  Mode);
+  __W32_IN HANDLE  ThreadId,
+  __W32_IN KPROCESSOR_MODE  Mode);
 
 #define DBG_STATUS_CONTROL_C              1
 #define DBG_STATUS_SYSRQ                  2
@@ -3606,7 +3606,7 @@
 
 typedef ULONG_PTR
 (*PDRIVER_VERIFIER_THUNK_ROUTINE)(
-  IN PVOID  Context);
+  __W32_IN PVOID  Context);
 
 typedef struct _DRIVER_VERIFIER_THUNK_PAIRS {
   PDRIVER_VERIFIER_THUNK_ROUTINE  PristineRoutine;
@@ -3658,8 +3658,8 @@
 
 typedef BOOLEAN
 (*PRTL_CONFLICT_RANGE_CALLBACK)(
-  IN PVOID  Context,
-  IN PRTL_RANGE  Range);
+  __W32_IN PVOID  Context,
+  __W32_IN PRTL_RANGE  Range);
 
 #define HASH_STRING_ALGORITHM_DEFAULT     0
 #define HASH_STRING_ALGORITHM_X65599      1
@@ -3682,9 +3682,9 @@
 
 typedef VOID DDKAPI
 (*PTIMER_APC_ROUTINE)(
-  IN PVOID  TimerContext,
-  IN ULONG  TimerLowValue,
-  IN LONG  TimerHighValue);
+  __W32_IN PVOID  TimerContext,
+  __W32_IN ULONG  TimerLowValue,
+  __W32_IN LONG  TimerHighValue);
 
 
 
@@ -3821,41 +3821,41 @@
 LONG
 DDKFASTAPI
 InterlockedIncrement(
-  IN PLONG  VOLATILE  Addend);
+  __W32_IN PLONG  VOLATILE  Addend);
 
 NTOSAPI
 LONG
 DDKFASTAPI
 InterlockedDecrement(
-  IN PLONG  VOLATILE  Addend);
+  __W32_IN PLONG  VOLATILE  Addend);
 
 NTOSAPI
 LONG
 DDKFASTAPI
 InterlockedCompareExchange(
-  IN OUT PLONG  VOLATILE  Destination,
-  IN LONG  Exchange,
-  IN LONG  Comparand);
+  __W32_IN __W32_OUT PLONG  VOLATILE  Destination,
+  __W32_IN LONG  Exchange,
+  __W32_IN LONG  Comparand);
 
 NTOSAPI
 LONG
 DDKFASTAPI
 InterlockedExchange(
-  IN OUT PLONG  VOLATILE  Target,
-  IN LONG Value);
+  __W32_IN __W32_OUT PLONG  VOLATILE  Target,
+  __W32_IN LONG Value);
 
 NTOSAPI
 LONG
 DDKFASTAPI
 InterlockedExchangeAdd(
-  IN OUT PLONG VOLATILE  Addend,
-  IN LONG  Value);
+  __W32_IN __W32_OUT PLONG VOLATILE  Addend,
+  __W32_IN LONG  Value);
 
 /*
  * PVOID
  * InterlockedExchangePointer(
- *   IN OUT PVOID VOLATILE  *Target,
- *   IN PVOID  Value)
+ *   __W32_IN __W32_OUT PVOID VOLATILE  *Target,
+ *   __W32_IN PVOID  Value)
  */
 #define InterlockedExchangePointer(Target, Value) \
   ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value))
@@ -3863,9 +3863,9 @@
 /*
  * PVOID
  * InterlockedCompareExchangePointer(
- *   IN OUT PVOID  *Destination,
- *   IN PVOID  Exchange,
- *   IN PVOID  Comparand)
+ *   __W32_IN __W32_OUT PVOID  *Destination,
+ *   __W32_IN PVOID  Exchange,
+ *   __W32_IN PVOID  Comparand)
  */
 #define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \
   ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand))
@@ -3874,14 +3874,14 @@
 PSLIST_ENTRY
 DDKFASTAPI
 InterlockedPopEntrySList(
-  IN PSLIST_HEADER  ListHead);
+  __W32_IN PSLIST_HEADER  ListHead);
 
 NTOSAPI
 PSLIST_ENTRY
 DDKFASTAPI
 InterlockedPushEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PSLIST_ENTRY  ListEntry);
+  __W32_IN PSLIST_HEADER  ListHead,
+  __W32_IN PSLIST_ENTRY  ListEntry);
 #endif /* _WIN32_WINNT >= 0x0501 */
 
 #endif /* !__INTERLOCKED_DECLARED */
@@ -3891,13 +3891,13 @@
 VOID
 DDKFASTAPI
 KefAcquireSpinLockAtDpcLevel(
-  IN PKSPIN_LOCK  SpinLock);
+  __W32_IN PKSPIN_LOCK  SpinLock);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 KefReleaseSpinLockFromDpcLevel(
-  IN PKSPIN_LOCK  SpinLock);
+  __W32_IN PKSPIN_LOCK  SpinLock);
 
 #define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock)
 #define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock)
@@ -3920,7 +3920,7 @@
 /*
  * ULONG
  * BYTE_OFFSET(
- *   IN PVOID  Va)
+ *   __W32_IN PVOID  Va)
  */
 #define BYTE_OFFSET(Va) \
   ((ULONG) ((ULONG_PTR) (Va) & (PAGE_SIZE - 1)))
@@ -3928,7 +3928,7 @@
 /*
  * ULONG
  * BYTES_TO_PAGES(
- *   IN ULONG  Size)
+ *   __W32_IN ULONG  Size)
  */
 #define BYTES_TO_PAGES(Size) \
   ((ULONG) ((ULONG_PTR) (Size) >> PAGE_SHIFT) + (((ULONG) (Size) & (PAGE_SIZE - 1)) != 0))
@@ -3936,9 +3936,9 @@
 /*
  * PCHAR
  * CONTAINING_RECORD(
- *   IN PCHAR  Address,
- *   IN TYPE  Type,
- *   IN PCHAR  Field);
+ *   __W32_IN PCHAR  Address,
+ *   __W32_IN TYPE  Type,
+ *   __W32_IN PCHAR  Field);
  */
 #ifndef CONTAINING_RECORD
 #define CONTAINING_RECORD(Address, Type, Field) \
@@ -3947,8 +3947,8 @@
 
 /* LONG
  * FIELD_OFFSET(
- *   IN TYPE  Type,
- *   IN PCHAR  Field);
+ *   __W32_IN TYPE  Type,
+ *   __W32_IN PCHAR  Field);
  */
 #ifndef FIELD_OFFSET
 #define FIELD_OFFSET(Type, Field) \
@@ -3958,7 +3958,7 @@
 /*
  * PVOID
  * PAGE_ALIGN(
- *   IN PVOID  Va)
+ *   __W32_IN PVOID  Va)
  */
 #define PAGE_ALIGN(Va) \
   ((PVOID) ((ULONG_PTR)(Va) & ~(PAGE_SIZE - 1)))
@@ -3966,7 +3966,7 @@
 /*
  * ULONG_PTR
  * ROUND_TO_PAGES(
- *   IN ULONG_PTR  Size)
+ *   __W32_IN ULONG_PTR  Size)
  */
 #define ROUND_TO_PAGES(Size) \
   ((ULONG_PTR) (((ULONG_PTR) Size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)))
@@ -3975,10 +3975,10 @@
 VOID
 DDKAPI
 RtlAssert(
-  IN PVOID  FailedAssertion,
-  IN PVOID  FileName,
-  IN ULONG  LineNumber,
-  IN PCHAR  Message);
+  __W32_IN PVOID  FailedAssertion,
+  __W32_IN PVOID  FileName,
+  __W32_IN ULONG  LineNumber,
+  __W32_IN PCHAR  Message);
 
 #ifdef DBG
 
@@ -4030,7 +4030,7 @@
 /*
  * VOID
  * InitializeListHead(
- *   IN PLIST_ENTRY  ListHead)
+ *   __W32_IN PLIST_ENTRY  ListHead)
  */
 #define InitializeListHead(_ListHead) \
 { \
@@ -4041,8 +4041,8 @@
 /*
  * VOID
  * InsertHeadList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  Entry)
+ *   __W32_IN PLIST_ENTRY  ListHead,
+ *   __W32_IN PLIST_ENTRY  Entry)
  */
 #define InsertHeadList(_ListHead, \
                        _Entry) \
@@ -4058,85 +4058,85 @@
 /*
  * VOID
  * InsertTailList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  Entry)
+ *   __W32_IN PLIST_ENTRY  ListHead,
+ *   __W32_IN PLIST_ENTRY  Entry)
  */
 #define InsertTailList(_ListHead, \
                        _Entry) \
 { \
-	PLIST_ENTRY _OldBlink; \
-	_OldBlink = (_ListHead)->Blink; \
-	(_Entry)->Flink = (_ListHead); \
-	(_Entry)->Blink = _OldBlink; \
-	_OldBlink->Flink = (_Entry); \
-	(_ListHead)->Blink = (_Entry); \
+  PLIST_ENTRY _OldBlink; \
+  _OldBlink = (_ListHead)->Blink; \
+  (_Entry)->Flink = (_ListHead); \
+  (_Entry)->Blink = _OldBlink; \
+  _OldBlink->Flink = (_Entry); \
+  (_ListHead)->Blink = (_Entry); \
 }
 
 /*
  * BOOLEAN
  * IsListEmpty(
- *   IN PLIST_ENTRY  ListHead)
+ *   __W32_IN PLIST_ENTRY  ListHead)
  */
 #define IsListEmpty(_ListHead) \
   ((_ListHead)->Flink == (_ListHead))
 
-static __inline PSINGLE_LIST_ENTRY 
+static __inline PSINGLE_LIST_ENTRY
 PopEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead)
+  __W32_IN PSINGLE_LIST_ENTRY  ListHead)
 {
-	PSINGLE_LIST_ENTRY Entry;
+  PSINGLE_LIST_ENTRY Entry;
 
-	Entry = ListHead->Next;
-	if (Entry != NULL)
-	{
-		ListHead->Next = Entry->Next;
-	}
+  Entry = ListHead->Next;
+  if (Entry != NULL)
+  {
+    ListHead->Next = Entry->Next;
+  }
   return Entry;
 }
 
 /*
  * VOID
  * PushEntryList(
- *   IN PSINGLE_LIST_ENTRY  ListHead,
- *   IN PSINGLE_LIST_ENTRY  Entry)
+ *   __W32_IN PSINGLE_LIST_ENTRY  ListHead,
+ *   __W32_IN PSINGLE_LIST_ENTRY  Entry)
  */
 #define PushEntryList(_ListHead, \
                       _Entry) \
 { \
-	(_Entry)->Next = (_ListHead)->Next; \
-	(_ListHead)->Next = (_Entry); \
+  (_Entry)->Next = (_ListHead)->Next; \
+  (_ListHead)->Next = (_Entry); \
 }
 
 /*
  * VOID
  * RemoveEntryList(
- *   IN PLIST_ENTRY  Entry)
+ *   __W32_IN PLIST_ENTRY  Entry)
  */
 #define RemoveEntryList(_Entry) \
 { \
-	PLIST_ENTRY _OldFlink; \
-	PLIST_ENTRY _OldBlink; \
-	_OldFlink = (_Entry)->Flink; \
-	_OldBlink = (_Entry)->Blink; \
-	_OldFlink->Blink = _OldBlink; \
-	_OldBlink->Flink = _OldFlink; \
+  PLIST_ENTRY _OldFlink; \
+  PLIST_ENTRY _OldBlink; \
+  _OldFlink = (_Entry)->Flink; \
+  _OldBlink = (_Entry)->Blink; \
+  _OldFlink->Blink = _OldBlink; \
+  _OldBlink->Flink = _OldFlink; \
   (_Entry)->Flink = NULL; \
   (_Entry)->Blink = NULL; \
 }
 
-static __inline PLIST_ENTRY 
+static __inline PLIST_ENTRY
 RemoveHeadList(
-  IN PLIST_ENTRY  ListHead)
+  __W32_IN PLIST_ENTRY  ListHead)
 {
-	PLIST_ENTRY OldFlink;
-	PLIST_ENTRY OldBlink;
-	PLIST_ENTRY Entry;
-
-	Entry = ListHead->Flink;
-	OldFlink = ListHead->Flink->Flink;
-	OldBlink = ListHead->Flink->Blink;
-	OldFlink->Blink = OldBlink;
-	OldBlink->Flink = OldFlink;
+  PLIST_ENTRY OldFlink;
+  PLIST_ENTRY OldBlink;
+  PLIST_ENTRY Entry;
+
+  Entry = ListHead->Flink;
+  OldFlink = ListHead->Flink->Flink;
+  OldBlink = ListHead->Flink->Blink;
+  OldFlink->Blink = OldBlink;
+  OldBlink->Flink = OldFlink;
 
   if (Entry != ListHead)
   {
@@ -4144,36 +4144,36 @@
     Entry->Blink = NULL;
   }
 
-	return Entry;
+  return Entry;
 }
 
 static __inline PLIST_ENTRY
 RemoveTailList(
-  IN PLIST_ENTRY  ListHead)
+  __W32_IN PLIST_ENTRY  ListHead)
 {
-	PLIST_ENTRY OldFlink;
-	PLIST_ENTRY OldBlink;
-	PLIST_ENTRY Entry;
-
-	Entry = ListHead->Blink;
-	OldFlink = ListHead->Blink->Flink;
-	OldBlink = ListHead->Blink->Blink;
-	OldFlink->Blink = OldBlink;
-	OldBlink->Flink = OldFlink;
+  PLIST_ENTRY OldFlink;
+  PLIST_ENTRY OldBlink;
+  PLIST_ENTRY Entry;
+
+  Entry = ListHead->Blink;
+  OldFlink = ListHead->Blink->Flink;
+  OldBlink = ListHead->Blink->Blink;
+  OldFlink->Blink = OldBlink;
+  OldBlink->Flink = OldFlink;
 
   if (Entry != ListHead)
   {
     Entry->Flink = NULL;
     Entry->Blink = NULL;
   }
-   
+
   return Entry;
 }
 
 /*
  * USHORT
  * QueryDepthSList(
- *   IN PSLIST_HEADER  SListHead)
+ *   __W32_IN PSLIST_HEADER  SListHead)
  */
 #define QueryDepthSList(_SListHead) \
   ((USHORT) ((_SListHead)->Alignment & 0xffff))
@@ -4184,85 +4184,85 @@
 ULONG
 DDKAPI
 RtlAnsiStringToUnicodeSize(
-  IN PANSI_STRING  AnsiString);
+  __W32_IN PANSI_STRING  AnsiString);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlAddRange(
-  IN OUT PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Start,
-  IN ULONGLONG  End,
-  IN UCHAR  Attributes,
-  IN ULONG  Flags,
-  IN PVOID  UserData  OPTIONAL,
-  IN PVOID  Owner  OPTIONAL);
+  __W32_IN __W32_OUT PRTL_RANGE_LIST  RangeList,
+  __W32_IN ULONGLONG  Start,
+  __W32_IN ULONGLONG  End,
+  __W32_IN UCHAR  Attributes,
+  __W32_IN ULONG  Flags,
+  __W32_IN PVOID  UserData  __W32_OPTIONAL,
+  __W32_IN PVOID  Owner  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlAnsiStringToUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString,
-  IN PANSI_STRING  SourceString,
-  IN BOOLEAN  AllocateDestinationString);
+  __W32_IN __W32_OUT PUNICODE_STRING  DestinationString,
+  __W32_IN PANSI_STRING  SourceString,
+  __W32_IN BOOLEAN  AllocateDestinationString);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlAppendUnicodeStringToString(
-  IN OUT PUNICODE_STRING  Destination,
-  IN PUNICODE_STRING  Source);
+  __W32_IN __W32_OUT PUNICODE_STRING  Destination,
+  __W32_IN PUNICODE_STRING  Source);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlAppendUnicodeToString(
-  IN OUT PUNICODE_STRING  Destination,
-  IN PCWSTR  Source);
+  __W32_IN __W32_OUT PUNICODE_STRING  Destination,
+  __W32_IN PCWSTR  Source);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlAreBitsClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  Length); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  StartingIndex,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlAreBitsSet(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  Length); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  StartingIndex,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlCharToInteger(
-  IN PCSZ  String,
-  IN ULONG  Base  OPTIONAL,
-  IN OUT PULONG  Value);
+  __W32_IN PCSZ  String,
+  __W32_IN ULONG  Base  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PULONG  Value);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlCheckBit(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  BitPosition); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  BitPosition);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlCheckRegistryKey(
-  IN ULONG  RelativeTo,
-  IN PWSTR  Path);
+  __W32_IN ULONG  RelativeTo,
+  __W32_IN PWSTR  Path);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlClearAllBits(
-  IN PRTL_BITMAP  BitMapHeader); 
+  __W32_IN PRTL_BITMAP  BitMapHeader);
 
 NTOSAPI
 VOID
@@ -4275,51 +4275,51 @@
 VOID
 DDKAPI
 RtlClearBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  NumberToClear); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  StartingIndex,
+  __W32_IN ULONG  NumberToClear);
 
 NTOSAPI
 SIZE_T
 DDKAPI
 RtlCompareMemory(
-  IN CONST VOID  *Source1,
-  IN CONST VOID  *Source2,
-  IN SIZE_T  Length);
+  __W32_IN CONST VOID  *Source1,
+  __W32_IN CONST VOID  *Source2,
+  __W32_IN SIZE_T  Length);
 
 NTOSAPI
 LONG
 DDKAPI
 RtlCompareString(
-  IN PSTRING  String1,
-  IN PSTRING  String2,
+  __W32_IN PSTRING  String1,
+  __W32_IN PSTRING  String2,
   BOOLEAN  CaseInSensitive);
 
 NTOSAPI
 LONG
 DDKAPI
 RtlCompareUnicodeString(
-  IN PUNICODE_STRING  String1,
-  IN PUNICODE_STRING  String2,
-  IN BOOLEAN  CaseInSensitive);
+  __W32_IN PUNICODE_STRING  String1,
+  __W32_IN PUNICODE_STRING  String2,
+  __W32_IN BOOLEAN  CaseInSensitive);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlConvertLongToLargeInteger(
-  IN LONG  SignedInteger);
+  __W32_IN LONG  SignedInteger);
 
 NTOSAPI
 LUID
 DDKAPI
 RtlConvertLongToLuid(
-  IN LONG  Long);
+  __W32_IN LONG  Long);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlConvertUlongToLargeInteger(
-  IN ULONG  UnsignedInteger);
+  __W32_IN ULONG  UnsignedInteger);
 
 NTOSAPI
 LUID
@@ -4330,9 +4330,9 @@
 /*
  * VOID
  * RtlCopyMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN CONST VOID UNALIGNED  *Source,
- *   IN SIZE_T  Length)
+ *   __W32_IN VOID UNALIGNED  *Destination,
+ *   __W32_IN CONST VOID UNALIGNED  *Source,
+ *   __W32_IN SIZE_T  Length)
  */
 #ifndef RtlCopyMemory
 #define RtlCopyMemory(Destination, Source, Length) \
@@ -4347,83 +4347,83 @@
 VOID
 DDKAPI
 RtlCopyMemory32(
-  IN VOID UNALIGNED  *Destination,
-  IN CONST VOID UNALIGNED  *Source,
-  IN ULONG  Length);
+  __W32_IN VOID UNALIGNED  *Destination,
+  __W32_IN CONST VOID UNALIGNED  *Source,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlCopyRangeList(
-  OUT PRTL_RANGE_LIST  CopyRangeList,
-  IN PRTL_RANGE_LIST  RangeList);
+  __W32_OUT PRTL_RANGE_LIST  CopyRangeList,
+  __W32_IN PRTL_RANGE_LIST  RangeList);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlCopyString(
-  IN OUT PSTRING  DestinationString,
-  IN PSTRING  SourceString  OPTIONAL);
+  __W32_IN __W32_OUT PSTRING  DestinationString,
+  __W32_IN PSTRING  SourceString  __W32_OPTIONAL);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlCopyUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString,
-  IN PUNICODE_STRING  SourceString);
+  __W32_IN __W32_OUT PUNICODE_STRING  DestinationString,
+  __W32_IN PUNICODE_STRING  SourceString);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlCreateRegistryKey(
-  IN ULONG  RelativeTo,
-  IN PWSTR  Path);
+  __W32_IN ULONG  RelativeTo,
+  __W32_IN PWSTR  Path);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlCreateSecurityDescriptor(
-  IN OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  Revision);
+  __W32_IN __W32_OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN ULONG  Revision);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlDeleteOwnersRanges(
-  IN OUT PRTL_RANGE_LIST  RangeList,
-  IN PVOID  Owner);
+  __W32_IN __W32_OUT PRTL_RANGE_LIST  RangeList,
+  __W32_IN PVOID  Owner);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlDeleteRange(
-  IN OUT PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Start,
-  IN ULONGLONG  End,
-  IN PVOID  Owner);
+  __W32_IN __W32_OUT PRTL_RANGE_LIST  RangeList,
+  __W32_IN ULONGLONG  Start,
+  __W32_IN ULONGLONG  End,
+  __W32_IN PVOID  Owner);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlDeleteRegistryValue(
-  IN ULONG  RelativeTo,
-  IN PCWSTR  Path,
-  IN PCWSTR  ValueName);
+  __W32_IN ULONG  RelativeTo,
+  __W32_IN PCWSTR  Path,
+  __W32_IN PCWSTR  ValueName);
 
 NTOSAPI
 BOOL
 DDKAPI
 RtlDosPathNameToNtPathName_U(
-  IN PCWSTR  DosPathName,
-  OUT PUNICODE_STRING  NtPathName,
-  OUT PCWSTR  *NtFileNamePart,
-  OUT VOID  *DirectoryInfo);
+  __W32_IN PCWSTR  DosPathName,
+  __W32_OUT PUNICODE_STRING  NtPathName,
+  __W32_OUT PCWSTR  *NtFileNamePart,
+  __W32_OUT VOID  *DirectoryInfo);
 
 /*
  * BOOLEAN
- * RtlEqualLuid( 
- *   IN LUID  Luid1,
- *   IN LUID  Luid2)
+ * RtlEqualLuid(
+ *   __W32_IN LUID  Luid1,
+ *   __W32_IN LUID  Luid2)
  */
 #define RtlEqualLuid(_Luid1, \
                      _Luid2) \
@@ -4432,9 +4432,9 @@
 /*
  * ULONG
  * RtlEqualMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN CONST VOID UNALIGNED  *Source,
- *   IN SIZE_T  Length)
+ *   __W32_IN VOID UNALIGNED  *Destination,
+ *   __W32_IN CONST VOID UNALIGNED  *Source,
+ *   __W32_IN SIZE_T  Length)
  */
 #define RtlEqualMemory(Destination, Source, Length) (!memcmp(Destination, Source, Length))
 
@@ -4442,24 +4442,24 @@
 BOOLEAN
 DDKAPI
 RtlEqualString(
-  IN PSTRING  String1,
-  IN PSTRING  String2,
-  IN BOOLEAN  CaseInSensitive);
+  __W32_IN PSTRING  String1,
+  __W32_IN PSTRING  String2,
+  __W32_IN BOOLEAN  CaseInSensitive);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlEqualUnicodeString(
-  IN CONST UNICODE_STRING  *String1,
-  IN CONST UNICODE_STRING  *String2,
-  IN BOOLEAN  CaseInSensitive);
+  __W32_IN CONST UNICODE_STRING  *String1,
+  __W32_IN CONST UNICODE_STRING  *String2,
+  __W32_IN BOOLEAN  CaseInSensitive);
 
 /*
  * VOID
  * RtlFillMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN SIZE_T  Length,
- *   IN UCHAR  Fill)
+ *   __W32_IN VOID UNALIGNED  *Destination,
+ *   __W32_IN SIZE_T  Length,
+ *   __W32_IN UCHAR  Fill)
  */
 #ifndef RtlFillMemory
 #define RtlFillMemory(Destination, Length, Fill) \
@@ -4474,146 +4474,146 @@
 ULONG
 DDKAPI
 RtlFindClearBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  NumberToFind,
+  __W32_IN ULONG  HintIndex);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlFindClearBitsAndSet(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  NumberToFind,
+  __W32_IN ULONG  HintIndex);
 
 NTOSAPI
 ULONG
 DDKAPI
-RtlFindClearRuns( 
-  IN PRTL_BITMAP  BitMapHeader, 
-  OUT PRTL_BITMAP_RUN  RunArray, 
-  IN ULONG  SizeOfRunArray, 
-  IN BOOLEAN  LocateLongestRuns);
+RtlFindClearRuns(
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_OUT PRTL_BITMAP_RUN  RunArray,
+  __W32_IN ULONG  SizeOfRunArray,
+  __W32_IN BOOLEAN  LocateLongestRuns);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlFindFirstRunClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  OUT PULONG  StartingIndex);
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_OUT PULONG  StartingIndex);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlFindLastBackwardRunClear(
-  IN PRTL_BITMAP  BitMapHeader, 
-  IN ULONG  FromIndex, 
-  OUT PULONG  StartingRunIndex); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  FromIndex,
+  __W32_OUT PULONG  StartingRunIndex);
 
 NTOSAPI
 CCHAR
 DDKAPI
 RtlFindLeastSignificantBit(
-  IN ULONGLONG  Set);
+  __W32_IN ULONGLONG  Set);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlFindLongestRunClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  OUT PULONG  StartingIndex); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_OUT PULONG  StartingIndex);
 
 NTOSAPI
 CCHAR
 DDKAPI
 RtlFindMostSignificantBit(
-  IN ULONGLONG  Set);
+  __W32_IN ULONGLONG  Set);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlFindNextForwardRunClear(
-  IN PRTL_BITMAP  BitMapHeader, 
-  IN ULONG  FromIndex, 
-  OUT PULONG  StartingRunIndex);
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  FromIndex,
+  __W32_OUT PULONG  StartingRunIndex);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlFindRange(
-  IN PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Minimum,
-  IN ULONGLONG  Maximum,
-  IN ULONG  Length,
-  IN ULONG  Alignment,
-  IN ULONG  Flags,
-  IN UCHAR  AttributeAvailableMask,
-  IN PVOID  Context  OPTIONAL,
-  IN PRTL_CONFLICT_RANGE_CALLBACK  Callback  OPTIONAL,
-  OUT PULONGLONG  Start);
+  __W32_IN PRTL_RANGE_LIST  RangeList,
+  __W32_IN ULONGLONG  Minimum,
+  __W32_IN ULONGLONG  Maximum,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  Alignment,
+  __W32_IN ULONG  Flags,
+  __W32_IN UCHAR  AttributeAvailableMask,
+  __W32_IN PVOID  Context  __W32_OPTIONAL,
+  __W32_IN PRTL_CONFLICT_RANGE_CALLBACK  Callback  __W32_OPTIONAL,
+  __W32_OUT PULONGLONG  Start);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlFindSetBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  NumberToFind,
+  __W32_IN ULONG  HintIndex);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlFindSetBitsAndClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  NumberToFind,
+  __W32_IN ULONG  HintIndex);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlFreeAnsiString(
-  IN PANSI_STRING  AnsiString);
+  __W32_IN PANSI_STRING  AnsiString);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlFreeRangeList(
-  IN PRTL_RANGE_LIST  RangeList);
+  __W32_IN PRTL_RANGE_LIST  RangeList);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlFreeUnicodeString(
-  IN PUNICODE_STRING  UnicodeString);
+  __W32_IN PUNICODE_STRING  UnicodeString);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlGetCallersAddress(
-  OUT PVOID  *CallersAddress,
-  OUT PVOID  *CallersCaller);
+  __W32_OUT PVOID  *CallersAddress,
+  __W32_OUT PVOID  *CallersCaller);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlGetVersion(
-  IN OUT PRTL_OSVERSIONINFOW  lpVersionInformation);
+  __W32_IN __W32_OUT PRTL_OSVERSIONINFOW  lpVersionInformation);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlGetFirstRange(
-  IN PRTL_RANGE_LIST  RangeList,
-  OUT PRTL_RANGE_LIST_ITERATOR  Iterator,
-  OUT PRTL_RANGE  *Range);
+  __W32_IN PRTL_RANGE_LIST  RangeList,
+  __W32_OUT PRTL_RANGE_LIST_ITERATOR  Iterator,
+  __W32_OUT PRTL_RANGE  *Range);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlGetNextRange(
-  IN OUT  PRTL_RANGE_LIST_ITERATOR  Iterator,
-  OUT PRTL_RANGE  *Range,
-  IN BOOLEAN  MoveForwards);
+  __W32_IN __W32_OUT  PRTL_RANGE_LIST_ITERATOR  Iterator,
+  __W32_OUT PRTL_RANGE  *Range,
+  __W32_IN BOOLEAN  MoveForwards);
 
 #define FOR_ALL_RANGES(RangeList, Iterator, Current)          \
   for (RtlGetFirstRange((RangeList), (Iterator), &(Current)); \
@@ -4628,102 +4628,102 @@
 NTOSAPI
 NTSTATUS
 DDKAPI
-RtlGUIDFromString( 
-  IN PUNICODE_STRING  GuidString, 
-  OUT GUID  *Guid);
+RtlGUIDFromString(
+  __W32_IN PUNICODE_STRING  GuidString,
+  __W32_OUT GUID  *Guid);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlHashUnicodeString(
-  IN CONST UNICODE_STRING  *String,
-  IN BOOLEAN  CaseInSensitive,
-  IN ULONG  HashAlgorithm,
-  OUT PULONG  HashValue);
+  __W32_IN CONST UNICODE_STRING  *String,
+  __W32_IN BOOLEAN  CaseInSensitive,
+  __W32_IN ULONG  HashAlgorithm,
+  __W32_OUT PULONG  HashValue);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlInitAnsiString(
-  IN OUT PANSI_STRING  DestinationString,
-  IN PCSZ  SourceString);
+  __W32_IN __W32_OUT PANSI_STRING  DestinationString,
+  __W32_IN PCSZ  SourceString);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlInitializeBitMap(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN PULONG  BitMapBuffer,
-  IN ULONG  SizeOfBitMap); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN PULONG  BitMapBuffer,
+  __W32_IN ULONG  SizeOfBitMap);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlInitializeRangeList(
-  IN OUT PRTL_RANGE_LIST  RangeList);
+  __W32_IN __W32_OUT PRTL_RANGE_LIST  RangeList);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlInitString(
-  IN OUT PSTRING  DestinationString,
-  IN PCSZ  SourceString);
+  __W32_IN __W32_OUT PSTRING  DestinationString,
+  __W32_IN PCSZ  SourceString);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlInitUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString,
-  IN PCWSTR  SourceString);
+  __W32_IN __W32_OUT PUNICODE_STRING  DestinationString,
+  __W32_IN PCWSTR  SourceString);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlInt64ToUnicodeString(
-  IN ULONGLONG  Value,
-  IN ULONG  Base OPTIONAL,
-  IN OUT PUNICODE_STRING  String);
+  __W32_IN ULONGLONG  Value,
+  __W32_IN ULONG  Base __W32_OPTIONAL,
+  __W32_IN __W32_OUT PUNICODE_STRING  String);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlIntegerToUnicodeString(
-  IN ULONG  Value,
-  IN ULONG  Base  OPTIONAL,
-  IN OUT PUNICODE_STRING  String);
+  __W32_IN ULONG  Value,
+  __W32_IN ULONG  Base  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PUNICODE_STRING  String);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlIntPtrToUnicodeString(
   PLONG  Value,
-  ULONG  Base  OPTIONAL,
+  ULONG  Base  __W32_OPTIONAL,
   PUNICODE_STRING  String);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlInvertRangeList(
-  OUT PRTL_RANGE_LIST  InvertedRangeList,
-  IN PRTL_RANGE_LIST  RangeList);
+  __W32_OUT PRTL_RANGE_LIST  InvertedRangeList,
+  __W32_IN PRTL_RANGE_LIST  RangeList);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlIsRangeAvailable(
-  IN PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Start,
-  IN ULONGLONG  End,
-  IN ULONG  Flags,
-  IN UCHAR  AttributeAvailableMask,
-  IN PVOID  Context  OPTIONAL,
-  IN PRTL_CONFLICT_RANGE_CALLBACK  Callback  OPTIONAL,
-  OUT PBOOLEAN  Available);
+  __W32_IN PRTL_RANGE_LIST  RangeList,
+  __W32_IN ULONGLONG  Start,
+  __W32_IN ULONGLONG  End,
+  __W32_IN ULONG  Flags,
+  __W32_IN UCHAR  AttributeAvailableMask,
+  __W32_IN PVOID  Context  __W32_OPTIONAL,
+  __W32_IN PRTL_CONFLICT_RANGE_CALLBACK  Callback  __W32_OPTIONAL,
+  __W32_OUT PBOOLEAN  Available);
 
 /*
  * BOOLEAN
  * RtlIsZeroLuid(
- *   IN PLUID  L1)
+ *   __W32_IN PLUID  L1)
  */
 #define RtlIsZeroLuid(_L1) \
   ((BOOLEAN) ((!(_L1)->LowPart) && (!(_L1)->HighPart)))
@@ -4732,30 +4732,30 @@
 ULONG
 DDKAPI
 RtlLengthSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlMapGenericMask(
-  IN OUT PACCESS_MASK  AccessMask,
-  IN PGENERIC_MAPPING  GenericMapping);
+  __W32_IN __W32_OUT PACCESS_MASK  AccessMask,
+  __W32_IN PGENERIC_MAPPING  GenericMapping);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlMergeRangeLists(
-  OUT PRTL_RANGE_LIST  MergedRangeList,
-  IN PRTL_RANGE_LIST  RangeList1,
-  IN PRTL_RANGE_LIST  RangeList2,
-  IN ULONG  Flags);
+  __W32_OUT PRTL_RANGE_LIST  MergedRangeList,
+  __W32_IN PRTL_RANGE_LIST  RangeList1,
+  __W32_IN PRTL_RANGE_LIST  RangeList2,
+  __W32_IN ULONG  Flags);
 
 /*
  * VOID
  * RtlMoveMemory(
- *  IN VOID UNALIGNED  *Destination,
- *  IN CONST VOID UNALIGNED  *Source,
- *  IN SIZE_T  Length)
+ *  __W32_IN VOID UNALIGNED  *Destination,
+ *  __W32_IN CONST VOID UNALIGNED  *Source,
+ *  __W32_IN SIZE_T  Length)
  */
 #define RtlMoveMemory memmove
 
@@ -4763,58 +4763,58 @@
 ULONG
 DDKAPI
 RtlNumberOfClearBits(
-  IN PRTL_BITMAP  BitMapHeader);
+  __W32_IN PRTL_BITMAP  BitMapHeader);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlNumberOfSetBits(
-  IN PRTL_BITMAP  BitMapHeader); 
+  __W32_IN PRTL_BITMAP  BitMapHeader);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 RtlPrefetchMemoryNonTemporal(
-  IN PVOID  Source,
-  IN SIZE_T  Length);
+  __W32_IN PVOID  Source,
+  __W32_IN SIZE_T  Length);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
-RtlPrefixUnicodeString( 
-  IN PUNICODE_STRING  String1, 
-  IN PUNICODE_STRING  String2, 
-  IN BOOLEAN  CaseInSensitive);
+RtlPrefixUnicodeString(
+  __W32_IN PUNICODE_STRING  String1,
+  __W32_IN PUNICODE_STRING  String2,
+  __W32_IN BOOLEAN  CaseInSensitive);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlQueryRegistryValues(
-  IN ULONG  RelativeTo,
-  IN PCWSTR  Path,
-  IN PRTL_QUERY_REGISTRY_TABLE  QueryTable,
-  IN PVOID  Context,
-  IN PVOID  Environment  OPTIONAL);
+  __W32_IN ULONG  RelativeTo,
+  __W32_IN PCWSTR  Path,
+  __W32_IN PRTL_QUERY_REGISTRY_TABLE  QueryTable,
+  __W32_IN PVOID  Context,
+  __W32_IN PVOID  Environment  __W32_OPTIONAL);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlRetrieveUlong(
-  IN OUT PULONG  DestinationAddress,
-  IN PULONG  SourceAddress);
+  __W32_IN __W32_OUT PULONG  DestinationAddress,
+  __W32_IN PULONG  SourceAddress);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlRetrieveUshort(
-  IN OUT PUSHORT  DestinationAddress,
-  IN PUSHORT  SourceAddress);
+  __W32_IN __W32_OUT PUSHORT  DestinationAddress,
+  __W32_IN PUSHORT  SourceAddress);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlSetAllBits(
-  IN PRTL_BITMAP  BitMapHeader); 
+  __W32_IN PRTL_BITMAP  BitMapHeader);
 
 NTOSAPI
 VOID
@@ -4827,201 +4827,201 @@
 VOID
 DDKAPI
 RtlSetBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  NumberToSet); 
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  StartingIndex,
+  __W32_IN ULONG  NumberToSet);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlSetDaclSecurityDescriptor(
-  IN OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN BOOLEAN  DaclPresent,
-  IN PACL  Dacl  OPTIONAL,
-  IN BOOLEAN  DaclDefaulted  OPTIONAL);
+  __W32_IN __W32_OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN BOOLEAN  DaclPresent,
+  __W32_IN PACL  Dacl  __W32_OPTIONAL,
+  __W32_IN BOOLEAN  DaclDefaulted  __W32_OPTIONAL);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlStoreUlong(
-  IN PULONG  Address,
-  IN ULONG  Value);
+  __W32_IN PULONG  Address,
+  __W32_IN ULONG  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlStoreUlonglong(
-  IN OUT PULONGLONG  Address,
+  __W32_IN __W32_OUT PULONGLONG  Address,
   ULONGLONG  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlStoreUlongPtr(
-  IN OUT PULONG_PTR  Address,
-  IN ULONG_PTR  Value);
+  __W32_IN __W32_OUT PULONG_PTR  Address,
+  __W32_IN ULONG_PTR  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlStoreUshort(
-  IN PUSHORT  Address,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Address,
+  __W32_IN USHORT  Value);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
-RtlStringFromGUID( 
-  IN REFGUID  Guid, 
-  OUT PUNICODE_STRING  GuidString);
+RtlStringFromGUID(
+  __W32_IN REFGUID  Guid,
+  __W32_OUT PUNICODE_STRING  GuidString);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlTestBit(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  BitNumber);
+  __W32_IN PRTL_BITMAP  BitMapHeader,
+  __W32_IN ULONG  BitNumber);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlTimeFieldsToTime(
-  IN PTIME_FIELDS  TimeFields,
-  IN PLARGE_INTEGER  Time);
+  __W32_IN PTIME_FIELDS  TimeFields,
+  __W32_IN PLARGE_INTEGER  Time);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlTimeToTimeFields(
-  IN PLARGE_INTEGER  Time,
-  IN PTIME_FIELDS  TimeFields);
+  __W32_IN PLARGE_INTEGER  Time,
+  __W32_IN PTIME_FIELDS  TimeFields);
 
 NTOSAPI
 ULONG
 DDKFASTAPI
 RtlUlongByteSwap(
-  IN ULONG  Source);
+  __W32_IN ULONG  Source);
 
 NTOSAPI
 ULONGLONG
 DDKFASTAPI
 RtlUlonglongByteSwap(
-  IN ULONGLONG  Source);
+  __W32_IN ULONGLONG  Source);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlUnicodeStringToAnsiSize(
-  IN PUNICODE_STRING  UnicodeString);
+  __W32_IN PUNICODE_STRING  UnicodeString);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlUnicodeStringToAnsiString(
-  IN OUT PANSI_STRING  DestinationString,
-  IN PUNICODE_STRING  SourceString,
-  IN BOOLEAN  AllocateDestinationString);
+  __W32_IN __W32_OUT PANSI_STRING  DestinationString,
+  __W32_IN PUNICODE_STRING  SourceString,
+  __W32_IN BOOLEAN  AllocateDestinationString);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlUnicodeStringToInteger(
-  IN PUNICODE_STRING  String,
-  IN ULONG  Base  OPTIONAL,
-  OUT PULONG  Value);
+  __W32_IN PUNICODE_STRING  String,
+  __W32_IN ULONG  Base  __W32_OPTIONAL,
+  __W32_OUT PULONG  Value);
 
 NTOSAPI
 WCHAR
 DDKAPI
-RtlUpcaseUnicodeChar( 
-  IN WCHAR  SourceCharacter);
+RtlUpcaseUnicodeChar(
+  __W32_IN WCHAR  SourceCharacter);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlUpcaseUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString  OPTIONAL,
-  IN PCUNICODE_STRING  SourceString,
-  IN BOOLEAN  AllocateDestinationString);
+  __W32_IN __W32_OUT PUNICODE_STRING  DestinationString  __W32_OPTIONAL,
+  __W32_IN PCUNICODE_STRING  SourceString,
+  __W32_IN BOOLEAN  AllocateDestinationString);
 
 NTOSAPI
 CHAR
 DDKAPI
-RtlUpperChar( 
-  IN CHAR Character);
+RtlUpperChar(
+  __W32_IN CHAR Character);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlUpperString(
-  IN OUT PSTRING  DestinationString,
-  IN PSTRING  SourceString);
+  __W32_IN __W32_OUT PSTRING  DestinationString,
+  __W32_IN PSTRING  SourceString);
 
 NTOSAPI
 USHORT
 DDKFASTAPI
 RtlUshortByteSwap(
-  IN USHORT  Source);
+  __W32_IN USHORT  Source);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlValidRelativeSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptorInput,
-  IN ULONG  SecurityDescriptorLength,
-  IN SECURITY_INFORMATION  RequiredInformation);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptorInput,
+  __W32_IN ULONG  SecurityDescriptorLength,
+  __W32_IN SECURITY_INFORMATION  RequiredInformation);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlValidSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlVerifyVersionInfo(
-  IN PRTL_OSVERSIONINFOEXW  VersionInfo,
-  IN ULONG  TypeMask,
-  IN ULONGLONG  ConditionMask);
+  __W32_IN PRTL_OSVERSIONINFOEXW  VersionInfo,
+  __W32_IN ULONG  TypeMask,
+  __W32_IN ULONGLONG  ConditionMask);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlVolumeDeviceToDosName(
-  IN PVOID  VolumeDeviceObject,
-  OUT PUNICODE_STRING  DosName);
+  __W32_IN PVOID  VolumeDeviceObject,
+  __W32_OUT PUNICODE_STRING  DosName);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlWalkFrameChain(
-  OUT PVOID  *Callers,
-  IN ULONG  Count,
-  IN ULONG  Flags);
+  __W32_OUT PVOID  *Callers,
+  __W32_IN ULONG  Count,
+  __W32_IN ULONG  Flags);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 RtlWriteRegistryValue(
-  IN ULONG  RelativeTo,
-  IN PCWSTR  Path,
-  IN PCWSTR  ValueName,
-  IN ULONG  ValueType,
-  IN PVOID  ValueData,
-  IN ULONG  ValueLength);
+  __W32_IN ULONG  RelativeTo,
+  __W32_IN PCWSTR  Path,
+  __W32_IN PCWSTR  ValueName,
+  __W32_IN ULONG  ValueType,
+  __W32_IN PVOID  ValueData,
+  __W32_IN ULONG  ValueLength);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlxUnicodeStringToAnsiSize(
-  IN PUNICODE_STRING  UnicodeString);
+  __W32_IN PUNICODE_STRING  UnicodeString);
 
 /*
  * VOID
  * RtlZeroMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN SIZE_T  Length)
+ *   __W32_IN VOID UNALIGNED  *Destination,
+ *   __W32_IN SIZE_T  Length)
  */
 #ifndef RtlZeroMemory
 #define RtlZeroMemory(Destination, Length) \
@@ -5039,58 +5039,58 @@
 VOID
 DDKFASTAPI
 ExAcquireFastMutex(
-  IN PFAST_MUTEX  FastMutex);
+  __W32_IN PFAST_MUTEX  FastMutex);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 ExAcquireFastMutexUnsafe(
-  IN PFAST_MUTEX  FastMutex);
+  __W32_IN PFAST_MUTEX  FastMutex);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExAcquireResourceExclusiveLite(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
+  __W32_IN PERESOURCE  Resource,
+  __W32_IN BOOLEAN  Wait);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExAcquireResourceSharedLite(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
+  __W32_IN PERESOURCE  Resource,
+  __W32_IN BOOLEAN  Wait);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExAcquireSharedStarveExclusive(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
+  __W32_IN PERESOURCE  Resource,
+  __W32_IN BOOLEAN  Wait);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExAcquireSharedWaitForExclusive(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
+  __W32_IN PERESOURCE  Resource,
+  __W32_IN BOOLEAN  Wait);
 
 
 NTOSAPI
 PSINGLE_LIST_ENTRY
 DDKFASTAPI
 ExInterlockedPopEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSLIST_HEADER  ListHead,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 
 NTOSAPI
 PSINGLE_LIST_ENTRY
 DDKFASTAPI
 ExInterlockedPushEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PSINGLE_LIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSLIST_HEADER  ListHead,
+  __W32_IN PSINGLE_LIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 
 #if (__USE_NTOSKRNL__) && (_WIN32_WINNT >= 0x0501)
@@ -5108,26 +5108,26 @@
 
 static __inline PVOID
 ExAllocateFromNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside)
+  __W32_IN PNPAGED_LOOKASIDE_LIST  Lookaside)
 {
   PVOID Entry;
 
   Lookaside->TotalAllocates++;
   Entry = ExInterlockedPopEntrySList(&Lookaside->ListHead,
-				     &Lookaside->Obsoleted);
+             &Lookaside->Obsoleted);
   if (Entry == NULL) {
     Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++;
     Entry = (Lookaside->Allocate)(Lookaside->Type,
-				  Lookaside->Size,
-				  Lookaside->Tag);
+          Lookaside->Size,
+          Lookaside->Tag);
   }
   return Entry;
 }
 
 static __inline VOID
 ExFreeToNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PVOID  Entry)
+  __W32_IN PNPAGED_LOOKASIDE_LIST  Lookaside,
+  __W32_IN PVOID  Entry)
 {
   Lookaside->TotalFrees++;
   if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
@@ -5135,8 +5135,8 @@
     (Lookaside->Free)(Entry);
   } else {
     ExInterlockedPushEntrySList(&Lookaside->ListHead,
-				(PSLIST_ENTRY)Entry,
-				&Lookaside->Obsoleted);
+        (PSLIST_ENTRY)Entry,
+        &Lookaside->Obsoleted);
   }
 }
 
@@ -5144,7 +5144,7 @@
 
 static __inline PVOID
 ExAllocateFromPagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside)
+  __W32_IN PPAGED_LOOKASIDE_LIST  Lookaside)
 {
   PVOID Entry;
 
@@ -5153,16 +5153,16 @@
   if (Entry == NULL) {
     Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++;
     Entry = (Lookaside->Allocate)(Lookaside->Type,
-				  Lookaside->Size,
-				  Lookaside->Tag);
+          Lookaside->Size,
+          Lookaside->Tag);
   }
   return Entry;
 }
 
 static __inline VOID
 ExFreeToPagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PVOID  Entry)
+  __W32_IN PPAGED_LOOKASIDE_LIST  Lookaside,
+  __W32_IN PVOID  Entry)
 {
   Lookaside->TotalFrees++;
   if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
@@ -5170,7 +5170,7 @@
     (Lookaside->Free)(Entry);
   } else {
     InterlockedPushEntrySList(&Lookaside->ListHead,
-			      (PSLIST_ENTRY)Entry);
+            (PSLIST_ENTRY)Entry);
   }
 }
 
@@ -5180,14 +5180,14 @@
 PVOID
 DDKAPI
 ExAllocateFromPagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside);
+  __W32_IN PPAGED_LOOKASIDE_LIST  Lookaside);
 
 NTOSAPI
 VOID
 DDKAPI
 ExFreeToPagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PVOID  Entry);
+  __W32_IN PPAGED_LOOKASIDE_LIST  Lookaside,
+  __W32_IN PVOID  Entry);
 
 #endif /* (__USE_NTOSKRNL__) && (_WIN32_WINNT >= 0x0501) */
 
@@ -5195,17 +5195,17 @@
 PVOID
 DDKAPI
 ExAllocatePoolWithQuotaTag(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
+  __W32_IN POOL_TYPE  PoolType,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN ULONG  Tag);
 
 NTOSAPI
 PVOID
 DDKAPI
 ExAllocatePoolWithTag(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
+  __W32_IN POOL_TYPE  PoolType,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN ULONG  Tag);
 
 #ifdef POOL_TAGGING
 
@@ -5218,15 +5218,15 @@
 PVOID
 DDKAPI
 ExAllocatePool(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes);
+  __W32_IN POOL_TYPE  PoolType,
+  __W32_IN SIZE_T  NumberOfBytes);
 
 NTOSAPI
 PVOID
 DDKAPI
 ExAllocatePoolWithQuota(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes);
+  __W32_IN POOL_TYPE  PoolType,
+  __W32_IN SIZE_T  NumberOfBytes);
 
 #endif /* POOL_TAGGING */
 
@@ -5234,49 +5234,49 @@
 PVOID
 DDKAPI
 ExAllocatePoolWithTagPriority(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag,
-  IN EX_POOL_PRIORITY  Priority);
+  __W32_IN POOL_TYPE  PoolType,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN ULONG  Tag,
+  __W32_IN EX_POOL_PRIORITY  Priority);
 
 NTOSAPI
 VOID
 DDKAPI
 ExConvertExclusiveToSharedLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ExCreateCallback(
-  OUT PCALLBACK_OBJECT  *CallbackObject,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  Create,
-  IN BOOLEAN  AllowMultipleCallbacks);
+  __W32_OUT PCALLBACK_OBJECT  *CallbackObject,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN BOOLEAN  Create,
+  __W32_IN BOOLEAN  AllowMultipleCallbacks);
 
 NTOSAPI
 VOID
 DDKAPI
 ExDeleteNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside);
+  __W32_IN PNPAGED_LOOKASIDE_LIST  Lookaside);
 
 NTOSAPI
 VOID
 DDKAPI
 ExDeletePagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside);
+  __W32_IN PPAGED_LOOKASIDE_LIST  Lookaside);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ExDeleteResourceLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 VOID
 DDKAPI
 ExFreePool(
-  IN PVOID  P);
+  __W32_IN PVOID  P);
 
 #define PROTECTED_POOL                    0x80000000
 
@@ -5288,8 +5288,8 @@
 VOID
 DDKAPI
 ExFreePoolWithTag(
-  IN PVOID  P,
-  IN ULONG  Tag);
+  __W32_IN PVOID  P,
+  __W32_IN ULONG  Tag);
 
 /*
  * ERESOURCE_THREAD
@@ -5302,32 +5302,32 @@
 ULONG
 DDKAPI
 ExGetExclusiveWaiterCount(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 KPROCESSOR_MODE
 DDKAPI
-ExGetPreviousMode( 
+ExGetPreviousMode(
   VOID);
 
 NTOSAPI
 ULONG
 DDKAPI
 ExGetSharedWaiterCount(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeEvent(
-  IN PRKEVENT  Event,
-  IN EVENT_TYPE  Type,
-  IN BOOLEAN  State);
+  __W32_IN PRKEVENT  Event,
+  __W32_IN EVENT_TYPE  Type,
+  __W32_IN BOOLEAN  State);
 
 /*
  * VOID DDKAPI
  * ExInitializeFastMutex(
- *   IN PFAST_MUTEX  FastMutex)
+ *   __W32_IN PFAST_MUTEX  FastMutex)
  */
 #define ExInitializeFastMutex(_FastMutex) \
 { \
@@ -5341,39 +5341,39 @@
 VOID
 DDKAPI
 ExInitializeNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PALLOCATE_FUNCTION  Allocate  OPTIONAL,
-  IN PFREE_FUNCTION  Free  OPTIONAL,
-  IN ULONG  Flags,
-  IN SIZE_T  Size,
-  IN ULONG  Tag,
-  IN USHORT  Depth);
+  __W32_IN PNPAGED_LOOKASIDE_LIST  Lookaside,
+  __W32_IN PALLOCATE_FUNCTION  Allocate  __W32_OPTIONAL,
+  __W32_IN PFREE_FUNCTION  Free  __W32_OPTIONAL,
+  __W32_IN ULONG  Flags,
+  __W32_IN SIZE_T  Size,
+  __W32_IN ULONG  Tag,
+  __W32_IN USHORT  Depth);
 
 NTOSAPI
 VOID
 DDKAPI
 ExInitializePagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PALLOCATE_FUNCTION  Allocate  OPTIONAL,
-  IN PFREE_FUNCTION  Free  OPTIONAL,
-  IN ULONG  Flags,
-  IN SIZE_T  Size,
-  IN ULONG  Tag,
-  IN USHORT  Depth);
+  __W32_IN PPAGED_LOOKASIDE_LIST  Lookaside,
+  __W32_IN PALLOCATE_FUNCTION  Allocate  __W32_OPTIONAL,
+  __W32_IN PFREE_FUNCTION  Free  __W32_OPTIONAL,
+  __W32_IN ULONG  Flags,
+  __W32_IN SIZE_T  Size,
+  __W32_IN ULONG  Tag,
+  __W32_IN USHORT  Depth);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ExInitializeResourceLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 /*
  * VOID
  * InitializeSListHead(
- *   IN PSLIST_HEADER  SListHead)
+ *   __W32_IN PSLIST_HEADER  SListHead)
  */
 #define InitializeSListHead(_SListHead) \
-	(_SListHead)->Alignment = 0
+  (_SListHead)->Alignment = 0
 
 #define ExInitializeSListHead InitializeSListHead
 
@@ -5381,31 +5381,31 @@
 LARGE_INTEGER
 DDKAPI
 ExInterlockedAddLargeInteger(
-  IN PLARGE_INTEGER  Addend,
-  IN LARGE_INTEGER  Increment,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLARGE_INTEGER  Addend,
+  __W32_IN LARGE_INTEGER  Increment,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 ExInterlockedAddLargeStatistic(
-  IN PLARGE_INTEGER  Addend,
-  IN ULONG  Increment);
+  __W32_IN PLARGE_INTEGER  Addend,
+  __W32_IN ULONG  Increment);
 
 NTOSAPI
 ULONG
 DDKAPI
 ExInterlockedAddUlong(
-  IN PULONG  Addend,
-  IN ULONG  Increment,
+  __W32_IN PULONG  Addend,
+  __W32_IN ULONG  Increment,
   PKSPIN_LOCK  Lock);
 
 NTOSAPI
 ULONG
 DDKFASTAPI
 ExfInterlockedAddUlong(
-  IN PULONG  Addend,
-  IN ULONG  Increment,
+  __W32_IN PULONG  Addend,
+  __W32_IN ULONG  Increment,
   PKSPIN_LOCK  Lock);
 
 
@@ -5413,134 +5413,134 @@
 LONGLONG
 DDKFASTAPI
 ExInterlockedCompareExchange64(
-  IN OUT PLONGLONG  Destination,
-  IN PLONGLONG  Exchange,
-  IN PLONGLONG  Comparand,
-  IN PKSPIN_LOCK  Lock); 
+  __W32_IN __W32_OUT PLONGLONG  Destination,
+  __W32_IN PLONGLONG  Exchange,
+  __W32_IN PLONGLONG  Comparand,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PSINGLE_LIST_ENTRY
 DDKFASTAPI
 ExInterlockedFlushSList(
-  IN PSLIST_HEADER  ListHead);
+  __W32_IN PSLIST_HEADER  ListHead);
 
 NTOSAPI
 PLIST_ENTRY
 DDKAPI
 ExInterlockedInsertHeadList(
-  IN PLIST_ENTRY  ListHead,
-  IN PLIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLIST_ENTRY  ListHead,
+  __W32_IN PLIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PLIST_ENTRY
 DDKFASTAPI
 ExfInterlockedInsertHeadList(
-  IN PLIST_ENTRY  ListHead,
-  IN PLIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLIST_ENTRY  ListHead,
+  __W32_IN PLIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PLIST_ENTRY
 DDKAPI
 ExInterlockedInsertTailList(
-  IN PLIST_ENTRY  ListHead,
-  IN PLIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLIST_ENTRY  ListHead,
+  __W32_IN PLIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PLIST_ENTRY
 DDKFASTAPI
 ExfInterlockedInsertTailList(
-  IN PLIST_ENTRY  ListHead,
-  IN PLIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLIST_ENTRY  ListHead,
+  __W32_IN PLIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PSINGLE_LIST_ENTRY
 DDKAPI
 ExInterlockedPopEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSINGLE_LIST_ENTRY  ListHead,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PSINGLE_LIST_ENTRY
 DDKFASTAPI
 ExfInterlockedPopEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSINGLE_LIST_ENTRY  ListHead,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 
 NTOSAPI
 PSINGLE_LIST_ENTRY
 DDKAPI
 ExInterlockedPushEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead,
-  IN PSINGLE_LIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSINGLE_LIST_ENTRY  ListHead,
+  __W32_IN PSINGLE_LIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PSINGLE_LIST_ENTRY
 DDKFASTAPI
 ExfInterlockedPushEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead,
-  IN PSINGLE_LIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PSINGLE_LIST_ENTRY  ListHead,
+  __W32_IN PSINGLE_LIST_ENTRY  ListEntry,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 
 NTOSAPI
 PLIST_ENTRY
 DDKAPI
 ExInterlockedRemoveHeadList(
-  IN PLIST_ENTRY  ListHead,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLIST_ENTRY  ListHead,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PLIST_ENTRY
 DDKFASTAPI
 ExfInterlockedRemoveHeadList(
-  IN PLIST_ENTRY  ListHead,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLIST_ENTRY  ListHead,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExIsProcessorFeaturePresent(
-  IN ULONG  ProcessorFeature);
+  __W32_IN ULONG  ProcessorFeature);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExIsResourceAcquiredExclusiveLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 USHORT
 DDKAPI
 ExIsResourceAcquiredLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 USHORT
 DDKAPI
 ExIsResourceAcquiredSharedLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 VOID
 DDKAPI
 ExLocalTimeToSystemTime(
-  IN PLARGE_INTEGER  LocalTime,
-  OUT PLARGE_INTEGER  SystemTime);
+  __W32_IN PLARGE_INTEGER  LocalTime,
+  __W32_OUT PLARGE_INTEGER  SystemTime);
 
 NTOSAPI
 VOID
 DDKAPI
 ExNotifyCallback(
-  IN PCALLBACK_OBJECT  CallbackObject,
-  IN PVOID  Argument1,
-  IN PVOID  Argument2);
+  __W32_IN PCALLBACK_OBJECT  CallbackObject,
+  __W32_IN PVOID  Argument1,
+  __W32_IN PVOID  Argument2);
 
 NTOSAPI
 VOID
@@ -5558,97 +5558,97 @@
 VOID
 DDKAPI
 ExRaiseStatus(
-  IN NTSTATUS  Status);
+  __W32_IN NTSTATUS  Status);
 
 NTOSAPI
 PVOID
 DDKAPI
 ExRegisterCallback(
-  IN PCALLBACK_OBJECT  CallbackObject,
-  IN PCALLBACK_FUNCTION  CallbackFunction,
-  IN PVOID  CallbackContext);
+  __W32_IN PCALLBACK_OBJECT  CallbackObject,
+  __W32_IN PCALLBACK_FUNCTION  CallbackFunction,
+  __W32_IN PVOID  CallbackContext);
 
 NTOSAPI
 VOID
 DDKAPI
 ExReinitializeResourceLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 ExReleaseFastMutex(
-  IN PFAST_MUTEX  FastMutex);
+  __W32_IN PFAST_MUTEX  FastMutex);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 ExReleaseFastMutexUnsafe(
-  IN PFAST_MUTEX  FastMutex);
+  __W32_IN PFAST_MUTEX  FastMutex);
 
 NTOSAPI
 VOID
 DDKAPI
 ExReleaseResourceForThreadLite(
-  IN PERESOURCE  Resource,
-  IN ERESOURCE_THREAD  ResourceThreadId);
+  __W32_IN PERESOURCE  Resource,
+  __W32_IN ERESOURCE_THREAD  ResourceThreadId);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 ExReleaseResourceLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 VOID
 DDKAPI
-ExSetResourceOwnerPointer( 
-  IN PERESOURCE  Resource,
-  IN PVOID  OwnerPointer);
+ExSetResourceOwnerPointer(
+  __W32_IN PERESOURCE  Resource,
+  __W32_IN PVOID  OwnerPointer);
 
 NTOSAPI
 ULONG
 DDKAPI
 ExSetTimerResolution(
-  IN ULONG  DesiredTime,
-  IN BOOLEAN  SetResolution);
+  __W32_IN ULONG  DesiredTime,
+  __W32_IN BOOLEAN  SetResolution);
 
 NTOSAPI
 VOID
 DDKAPI
 ExSystemTimeToLocalTime(
-  IN PLARGE_INTEGER  SystemTime,
-  OUT PLARGE_INTEGER  LocalTime);
+  __W32_IN PLARGE_INTEGER  SystemTime,
+  __W32_OUT PLARGE_INTEGER  LocalTime);
 
 NTOSAPI
 BOOLEAN
 DDKFASTAPI
 ExTryToAcquireFastMutex(
-  IN PFAST_MUTEX  FastMutex);
+  __W32_IN PFAST_MUTEX  FastMutex);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExTryToAcquireResourceExclusiveLite(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 NTOSAPI
 VOID
 DDKAPI
 ExUnregisterCallback(
-  IN PVOID  CbRegistration);
+  __W32_IN PVOID  CbRegistration);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ExUuidCreate(
-  OUT UUID  *Uuid);
+  __W32_OUT UUID  *Uuid);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExVerifySuite(
-  IN SUITE_TYPE  SuiteType);
+  __W32_IN SUITE_TYPE  SuiteType);
 
 #ifdef DBG
 
@@ -5669,17 +5669,17 @@
 VOID
 DDKAPI
 ProbeForRead(
-  IN CONST VOID  *Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
+  __W32_IN CONST VOID  *Address,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  Alignment);
 
 NTOSAPI
 VOID
 DDKAPI
 ProbeForWrite(
-  IN CONST VOID  *Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
+  __W32_IN CONST VOID  *Address,
+  __W32_IN ULONG  Length,
+  __W32_IN ULONG  Alignment);
 
 
 
@@ -5689,15 +5689,15 @@
 NTSTATUS
 DDKAPI
 CmRegisterCallback(
-  IN PEX_CALLBACK_FUNCTION  Function,
-  IN PVOID  Context,
-  IN OUT PLARGE_INTEGER  Cookie);
+  __W32_IN PEX_CALLBACK_FUNCTION  Function,
+  __W32_IN PVOID  Context,
+  __W32_IN __W32_OUT PLARGE_INTEGER  Cookie);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 CmUnRegisterCallback(
-  IN LARGE_INTEGER  Cookie);
+  __W32_IN LARGE_INTEGER  Cookie);
 
 
 
@@ -5707,7 +5707,7 @@
 BOOLEAN
 DDKAPI
 FsRtlIsTotalDeviceFailure(
-  IN NTSTATUS  Status);
+  __W32_IN NTSTATUS  Status);
 
 
 
@@ -5717,184 +5717,184 @@
 VOID
 DDKFASTAPI
 HalExamineMBR(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN ULONG  MBRTypeIdentifier,
-  OUT PVOID  Buffer);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  SectorSize,
+  __W32_IN ULONG  MBRTypeIdentifier,
+  __W32_OUT PVOID  Buffer);
 
 NTOSAPI
 VOID
 DDKAPI
 READ_PORT_BUFFER_UCHAR(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Port,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 READ_PORT_BUFFER_ULONG(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Port,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 READ_PORT_BUFFER_USHORT(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Port,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 UCHAR
 DDKAPI
 READ_PORT_UCHAR(
-  IN PUCHAR  Port);
+  __W32_IN PUCHAR  Port);
 
 NTOSAPI
 ULONG
 DDKAPI
 READ_PORT_ULONG(
-  IN PULONG  Port);
+  __W32_IN PULONG  Port);
 
 NTOSAPI
 USHORT
 DDKAPI
 READ_PORT_USHORT(
-  IN PUSHORT  Port);
+  __W32_IN PUSHORT  Port);
 
 NTOSAPI
 VOID
 DDKAPI
 READ_REGISTER_BUFFER_UCHAR(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Register,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 READ_REGISTER_BUFFER_ULONG(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Register,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 READ_REGISTER_BUFFER_USHORT(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Register,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 UCHAR
 DDKAPI
 READ_REGISTER_UCHAR(
-  IN PUCHAR  Register);
+  __W32_IN PUCHAR  Register);
 
 NTOSAPI
 ULONG
 DDKAPI
 READ_REGISTER_ULONG(
-  IN PULONG  Register);
+  __W32_IN PULONG  Register);
 
 NTOSAPI
 USHORT
 DDKAPI
 READ_REGISTER_USHORT(
-  IN PUSHORT  Register);
+  __W32_IN PUSHORT  Register);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_PORT_BUFFER_UCHAR(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Port,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_PORT_BUFFER_ULONG(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Port,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_PORT_BUFFER_USHORT(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Port,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_PORT_UCHAR(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
+  __W32_IN PUCHAR  Port,
+  __W32_IN UCHAR  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_PORT_ULONG(
-  IN PULONG  Port,
-  IN ULONG  Value);
+  __W32_IN PULONG  Port,
+  __W32_IN ULONG  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_PORT_USHORT(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Port,
+  __W32_IN USHORT  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_REGISTER_BUFFER_UCHAR(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUCHAR  Register,
+  __W32_IN PUCHAR  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_REGISTER_BUFFER_ULONG(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
+  __W32_IN PULONG  Register,
+  __W32_IN PULONG  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_REGISTER_BUFFER_USHORT(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
+  __W32_IN PUSHORT  Register,
+  __W32_IN PUSHORT  Buffer,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_REGISTER_UCHAR(
-  IN PUCHAR  Register,
-  IN UCHAR  Value);
+  __W32_IN PUCHAR  Register,
+  __W32_IN UCHAR  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_REGISTER_ULONG(
-  IN PULONG  Register,
-  IN ULONG  Value);
+  __W32_IN PULONG  Register,
+  __W32_IN ULONG  Value);
 
 NTOSAPI
 VOID
 DDKAPI
 WRITE_REGISTER_USHORT(
-  IN PUSHORT  Register,
-  IN USHORT  Value);
+  __W32_IN PUSHORT  Register,
+  __W32_IN USHORT  Value);
 
 /** I/O manager routines **/
 
@@ -5902,23 +5902,23 @@
 VOID
 DDKAPI
 IoAcquireCancelSpinLock(
-  OUT PKIRQL  Irql);
+  __W32_OUT PKIRQL  Irql);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoAcquireRemoveLockEx(
-  IN PIO_REMOVE_LOCK  RemoveLock,
-  IN OPTIONAL PVOID  Tag  OPTIONAL,
-  IN PCSTR  File,
-  IN ULONG  Line,
-  IN ULONG  RemlockSize);
+  __W32_IN PIO_REMOVE_LOCK  RemoveLock,
+  __W32_IN __W32_OPTIONAL PVOID  Tag  __W32_OPTIONAL,
+  __W32_IN PCSTR  File,
+  __W32_IN ULONG  Line,
+  __W32_IN ULONG  RemlockSize);
 
 /*
  * NTSTATUS
  * IoAcquireRemoveLock(
- *   IN PIO_REMOVE_LOCK  RemoveLock,
- *   IN OPTIONAL PVOID  Tag)
+ *   __W32_IN PIO_REMOVE_LOCK  RemoveLock,
+ *   __W32_IN __W32_OPTIONAL PVOID  Tag)
  */
 #define IoAcquireRemoveLock(_RemoveLock, \
                             _Tag) \
@@ -5927,8 +5927,8 @@
 /*
  * VOID
  * IoAdjustPagingPathCount(
- *   IN PLONG  Count,
- *   IN BOOLEAN  Increment)
+ *   __W32_IN PLONG  Count,
+ *   __W32_IN BOOLEAN  Increment)
  */
 #define IoAdjustPagingPathCount(_Count, \
                                 _Increment) \
@@ -5947,70 +5947,70 @@
 VOID
 DDKAPI
 IoAllocateController(
-  IN PCONTROLLER_OBJECT  ControllerObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PDRIVER_CONTROL  ExecutionRoutine,
-  IN PVOID  Context);
+  __W32_IN PCONTROLLER_OBJECT  ControllerObject,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PDRIVER_CONTROL  ExecutionRoutine,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoAllocateDriverObjectExtension(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PVOID  ClientIdentificationAddress,
-  IN ULONG  DriverObjectExtensionSize,
-  OUT PVOID  *DriverObjectExtension);
-
-typedef struct _IO_ERROR_LOG_PACKET { 
-	UCHAR  MajorFunctionCode; 
-	UCHAR  RetryCount; 
-	USHORT  DumpDataSize; 
-	USHORT  NumberOfStrings; 
-	USHORT  StringOffset; 
-	USHORT  EventCategory; 
-	NTSTATUS  ErrorCode; 
-	ULONG  UniqueErrorValue; 
-	NTSTATUS  FinalStatus; 
-	ULONG  SequenceNumber; 
-	ULONG  IoControlCode; 
-	LARGE_INTEGER  DeviceOffset; 
-	ULONG  DumpData[1]; 
-} IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; 
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PVOID  ClientIdentificationAddress,
+  __W32_IN ULONG  DriverObjectExtensionSize,
+  __W32_OUT PVOID  *DriverObjectExtension);
+
+typedef struct _IO_ERROR_LOG_PACKET {
+  UCHAR  MajorFunctionCode;
+  UCHAR  RetryCount;
+  USHORT  DumpDataSize;
+  USHORT  NumberOfStrings;
+  USHORT  StringOffset;
+  USHORT  EventCategory;
+  NTSTATUS  ErrorCode;
+  ULONG  UniqueErrorValue;
+  NTSTATUS  FinalStatus;
+  ULONG  SequenceNumber;
+  ULONG  IoControlCode;
+  LARGE_INTEGER  DeviceOffset;
+  ULONG  DumpData[1];
+} IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET;
 
 NTOSAPI
 PVOID
 DDKAPI
 IoAllocateErrorLogEntry(
-  IN PVOID  IoObject,
-  IN UCHAR  EntrySize);
+  __W32_IN PVOID  IoObject,
+  __W32_IN UCHAR  EntrySize);
 
 NTOSAPI
 PIRP
 DDKAPI
 IoAllocateIrp(
-  IN CCHAR  StackSize,
-  IN BOOLEAN  ChargeQuota);
+  __W32_IN CCHAR  StackSize,
+  __W32_IN BOOLEAN  ChargeQuota);
 
 NTOSAPI
 PMDL
 DDKAPI
 IoAllocateMdl(
-  IN PVOID  VirtualAddress,
-  IN ULONG  Length,
-  IN BOOLEAN  SecondaryBuffer,
-  IN BOOLEAN  ChargeQuota,
-  IN OUT PIRP  Irp  OPTIONAL);
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  SecondaryBuffer,
+  __W32_IN BOOLEAN  ChargeQuota,
+  __W32_IN __W32_OUT PIRP  Irp  __W32_OPTIONAL);
 
 NTOSAPI
 PIO_WORKITEM
 DDKAPI
 IoAllocateWorkItem(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 /*
  * VOID IoAssignArcName(
- *   IN PUNICODE_STRING  ArcName,
- *   IN PUNICODE_STRING  DeviceName);
+ *   __W32_IN PUNICODE_STRING  ArcName,
+ *   __W32_IN PUNICODE_STRING  DeviceName);
  */
 #define IoAssignArcName(_ArcName, _DeviceName) ( \
   IoCreateSymbolicLink((_ArcName), (_DeviceName)))
@@ -6019,75 +6019,75 @@
 NTSTATUS
 DDKAPI
 IoAttachDevice(
-  IN PDEVICE_OBJECT  SourceDevice,
-  IN PUNICODE_STRING  TargetDevice,
-  OUT PDEVICE_OBJECT  *AttachedDevice);
+  __W32_IN PDEVICE_OBJECT  SourceDevice,
+  __W32_IN PUNICODE_STRING  TargetDevice,
+  __W32_OUT PDEVICE_OBJECT  *AttachedDevice);
 
 NTOSAPI
 PDEVICE_OBJECT
 DDKAPI
 IoAttachDeviceToDeviceStack(
-  IN PDEVICE_OBJECT  SourceDevice,
-  IN PDEVICE_OBJECT  TargetDevice);
+  __W32_IN PDEVICE_OBJECT  SourceDevice,
+  __W32_IN PDEVICE_OBJECT  TargetDevice);
 
 NTOSAPI
 PIRP
 DDKAPI
 IoBuildAsynchronousFsdRequest(
-  IN ULONG  MajorFunction,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PVOID  Buffer  OPTIONAL,
-  IN ULONG  Length  OPTIONAL,
-  IN PLARGE_INTEGER  StartingOffset  OPTIONAL,
-  IN PIO_STATUS_BLOCK  IoStatusBlock  OPTIONAL);
+  __W32_IN ULONG  MajorFunction,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN __W32_OUT PVOID  Buffer  __W32_OPTIONAL,
+  __W32_IN ULONG  Length  __W32_OPTIONAL,
+  __W32_IN PLARGE_INTEGER  StartingOffset  __W32_OPTIONAL,
+  __W32_IN PIO_STATUS_BLOCK  IoStatusBlock  __W32_OPTIONAL);
 
 NTOSAPI
 PIRP
 DDKAPI
 IoBuildDeviceIoControlRequest(
-  IN ULONG  IoControlCode,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PVOID  InputBuffer  OPTIONAL,
-  IN ULONG  InputBufferLength,
-  OUT PVOID  OutputBuffer  OPTIONAL,
-  IN ULONG  OutputBufferLength,
-  IN BOOLEAN  InternalDeviceIoControl,
-  IN PKEVENT  Event,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock);
+  __W32_IN ULONG  IoControlCode,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PVOID  InputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  InputBufferLength,
+  __W32_OUT PVOID  OutputBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  OutputBufferLength,
+  __W32_IN BOOLEAN  InternalDeviceIoControl,
+  __W32_IN PKEVENT  Event,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock);
 
 NTOSAPI
 VOID
 DDKAPI
 IoBuildPartialMdl(
-  IN PMDL  SourceMdl,
-  IN OUT PMDL  TargetMdl,
-  IN PVOID  VirtualAddress,
-  IN ULONG  Length);
+  __W32_IN PMDL  SourceMdl,
+  __W32_IN __W32_OUT PMDL  TargetMdl,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 PIRP
 DDKAPI
 IoBuildSynchronousFsdRequest(
-  IN ULONG  MajorFunction,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PVOID  Buffer  OPTIONAL,
-  IN ULONG  Length  OPTIONAL,
-  IN PLARGE_INTEGER  StartingOffset  OPTIONAL,
-  IN PKEVENT  Event,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock);
+  __W32_IN ULONG  MajorFunction,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN __W32_OUT PVOID  Buffer  __W32_OPTIONAL,
+  __W32_IN ULONG  Length  __W32_OPTIONAL,
+  __W32_IN PLARGE_INTEGER  StartingOffset  __W32_OPTIONAL,
+  __W32_IN PKEVENT  Event,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock);
 
 NTOSAPI
 NTSTATUS
 DDKFASTAPI
 IofCallDriver(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PIRP  Irp);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN __W32_OUT PIRP  Irp);
 
 /*
  * NTSTATUS
  * IoCallDriver(
- *   IN PDEVICE_OBJECT  DeviceObject,
- *   IN OUT PIRP  Irp)
+ *   __W32_IN PDEVICE_OBJECT  DeviceObject,
+ *   __W32_IN __W32_OUT PIRP  Irp)
  */
 #define IoCallDriver IofCallDriver
 
@@ -6095,37 +6095,37 @@
 VOID
 DDKAPI
 IoCancelFileOpen(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PFILE_OBJECT  FileObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PFILE_OBJECT  FileObject);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 IoCancelIrp(
-  IN PIRP  Irp);
+  __W32_IN PIRP  Irp);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoCheckShareAccess(
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  DesiredShareAccess,
-  IN OUT PFILE_OBJECT  FileObject,
-  IN OUT PSHARE_ACCESS  ShareAccess,
-  IN BOOLEAN  Update);
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN ULONG  DesiredShareAccess,
+  __W32_IN __W32_OUT PFILE_OBJECT  FileObject,
+  __W32_IN __W32_OUT PSHARE_ACCESS  ShareAccess,
+  __W32_IN BOOLEAN  Update);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 IofCompleteRequest(
-  IN PIRP  Irp,
-  IN CCHAR  PriorityBoost);
+  __W32_IN PIRP  Irp,
+  __W32_IN CCHAR  PriorityBoost);
 
 /*
  * VOID
  * IoCompleteRequest(
- *  IN PIRP  Irp,
- *  IN CCHAR  PriorityBoost)
+ *  __W32_IN PIRP  Irp,
+ *  __W32_IN CCHAR  PriorityBoost)
  */
 #define IoCompleteRequest IofCompleteRequest
 
@@ -6133,22 +6133,22 @@
 NTSTATUS
 DDKAPI
 IoConnectInterrupt(
-  OUT PKINTERRUPT  *InterruptObject,
-  IN PKSERVICE_ROUTINE  ServiceRoutine,
-  IN PVOID  ServiceContext,
-  IN PKSPIN_LOCK  SpinLock  OPTIONAL,
-  IN ULONG  Vector,
-  IN KIRQL  Irql,
-  IN KIRQL  SynchronizeIrql,
-  IN KINTERRUPT_MODE    InterruptMode,
-  IN BOOLEAN  ShareVector,
-  IN KAFFINITY  ProcessorEnableMask,
-  IN BOOLEAN  FloatingSave);
+  __W32_OUT PKINTERRUPT  *InterruptObject,
+  __W32_IN PKSERVICE_ROUTINE  ServiceRoutine,
+  __W32_IN PVOID  ServiceContext,
+  __W32_IN PKSPIN_LOCK  SpinLock  __W32_OPTIONAL,
+  __W32_IN ULONG  Vector,
+  __W32_IN KIRQL  Irql,
+  __W32_IN KIRQL  SynchronizeIrql,
+  __W32_IN KINTERRUPT_MODE    InterruptMode,
+  __W32_IN BOOLEAN  ShareVector,
+  __W32_IN KAFFINITY  ProcessorEnableMask,
+  __W32_IN BOOLEAN  FloatingSave);
 
 /*
  * PIO_STACK_LOCATION
  * IoGetCurrentIrpStackLocation(
- *   IN PIRP  Irp)
+ *   __W32_IN PIRP  Irp)
  */
 #define IoGetCurrentIrpStackLocation(_Irp) \
   ((_Irp)->Tail.Overlay.CurrentStackLocation)
@@ -6156,7 +6156,7 @@
 /*
  * PIO_STACK_LOCATION
  * IoGetNextIrpStackLocation(
- *   IN PIRP  Irp)
+ *   __W32_IN PIRP  Irp)
  */
 #define IoGetNextIrpStackLocation(_Irp) \
   ((_Irp)->Tail.Overlay.CurrentStackLocation - 1)
@@ -6164,7 +6164,7 @@
 /*
  * VOID
  * IoCopyCurrentIrpStackLocationToNext(
- *   IN PIRP  Irp)
+ *   __W32_IN PIRP  Irp)
  */
 #define IoCopyCurrentIrpStackLocationToNext(_Irp) \
 { \
@@ -6181,130 +6181,130 @@
 PCONTROLLER_OBJECT
 DDKAPI
 IoCreateController(
-  IN ULONG  Size);
+  __W32_IN ULONG  Size);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoCreateDevice(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN ULONG  DeviceExtensionSize,
-  IN PUNICODE_STRING  DeviceName  OPTIONAL,
-  IN DEVICE_TYPE  DeviceType,
-  IN ULONG  DeviceCharacteristics,
-  IN BOOLEAN  Exclusive,
-  OUT PDEVICE_OBJECT  *DeviceObject);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN ULONG  DeviceExtensionSize,
+  __W32_IN PUNICODE_STRING  DeviceName  __W32_OPTIONAL,
+  __W32_IN DEVICE_TYPE  DeviceType,
+  __W32_IN ULONG  DeviceCharacteristics,
+  __W32_IN BOOLEAN  Exclusive,
+  __W32_OUT PDEVICE_OBJECT  *DeviceObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoCreateDisk(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PCREATE_DISK  Disk);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PCREATE_DISK  Disk);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoCreateFile(
-  OUT PHANDLE FileHandle,
-  IN ACCESS_MASK DesiredAccess,
-  IN POBJECT_ATTRIBUTES ObjectAttributes,
-  OUT PIO_STATUS_BLOCK IoStatusBlock,
-  IN PLARGE_INTEGER AllocationSize OPTIONAL,
-  IN ULONG FileAttributes,
-  IN ULONG ShareAccess,
-  IN ULONG Disposition,
-  IN ULONG CreateOptions,
-  IN PVOID EaBuffer OPTIONAL,
-  IN ULONG EaLength,
-  IN CREATE_FILE_TYPE CreateFileType,
-  IN PVOID ExtraCreateParameters OPTIONAL,
-  IN ULONG Options);
+  __W32_OUT PHANDLE FileHandle,
+  __W32_IN ACCESS_MASK DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES ObjectAttributes,
+  __W32_OUT PIO_STATUS_BLOCK IoStatusBlock,
+  __W32_IN PLARGE_INTEGER AllocationSize __W32_OPTIONAL,
+  __W32_IN ULONG FileAttributes,
+  __W32_IN ULONG ShareAccess,
+  __W32_IN ULONG Disposition,
+  __W32_IN ULONG CreateOptions,
+  __W32_IN PVOID EaBuffer __W32_OPTIONAL,
+  __W32_IN ULONG EaLength,
+  __W32_IN CREATE_FILE_TYPE CreateFileType,
+  __W32_IN PVOID ExtraCreateParameters __W32_OPTIONAL,
+  __W32_IN ULONG Options);
 
 NTOSAPI
 PKEVENT
 DDKAPI
 IoCreateNotificationEvent(
-  IN PUNICODE_STRING  EventName,
-  OUT PHANDLE  EventHandle);
+  __W32_IN PUNICODE_STRING  EventName,
+  __W32_OUT PHANDLE  EventHandle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoCreateSymbolicLink(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN PUNICODE_STRING  DeviceName);
+  __W32_IN PUNICODE_STRING  SymbolicLinkName,
+  __W32_IN PUNICODE_STRING  DeviceName);
 
 NTOSAPI
 PKEVENT
 DDKAPI
 IoCreateSynchronizationEvent(
-  IN PUNICODE_STRING  EventName,
-  OUT PHANDLE  EventHandle);
+  __W32_IN PUNICODE_STRING  EventName,
+  __W32_OUT PHANDLE  EventHandle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoCreateUnprotectedSymbolicLink(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN PUNICODE_STRING  DeviceName);
+  __W32_IN PUNICODE_STRING  SymbolicLinkName,
+  __W32_IN PUNICODE_STRING  DeviceName);
 
 NTOSAPI
 VOID
 DDKAPI
 IoCsqInitialize(
   PIO_CSQ  Csq,
-  IN PIO_CSQ_INSERT_IRP  CsqInsertIrp,
-  IN PIO_CSQ_REMOVE_IRP  CsqRemoveIrp,
-  IN PIO_CSQ_PEEK_NEXT_IRP  CsqPeekNextIrp,
-  IN PIO_CSQ_ACQUIRE_LOCK  CsqAcquireLock,
-  IN PIO_CSQ_RELEASE_LOCK  CsqReleaseLock,
-  IN PIO_CSQ_COMPLETE_CANCELED_IRP  CsqCompleteCanceledIrp);
+  __W32_IN PIO_CSQ_INSERT_IRP  CsqInsertIrp,
+  __W32_IN PIO_CSQ_REMOVE_IRP  CsqRemoveIrp,
+  __W32_IN PIO_CSQ_PEEK_NEXT_IRP  CsqPeekNextIrp,
+  __W32_IN PIO_CSQ_ACQUIRE_LOCK  CsqAcquireLock,
+  __W32_IN PIO_CSQ_RELEASE_LOCK  CsqReleaseLock,
+  __W32_IN PIO_CSQ_COMPLETE_CANCELED_IRP  CsqCompleteCanceledIrp);
 
 NTOSAPI
 VOID
 DDKAPI
 IoCsqInsertIrp(
-  IN  PIO_CSQ  Csq,
-  IN  PIRP  Irp,
-  IN  PIO_CSQ_IRP_CONTEXT  Context);
+  __W32_IN  PIO_CSQ  Csq,
+  __W32_IN  PIRP  Irp,
+  __W32_IN  PIO_CSQ_IRP_CONTEXT  Context);
 
 NTOSAPI
 PIRP
 DDKAPI
 IoCsqRemoveIrp(
-  IN  PIO_CSQ  Csq,
-  IN  PIO_CSQ_IRP_CONTEXT  Context);
+  __W32_IN  PIO_CSQ  Csq,
+  __W32_IN  PIO_CSQ_IRP_CONTEXT  Context);
 
 NTOSAPI
 PIRP
 DDKAPI
 IoCsqRemoveNextIrp(
-  IN PIO_CSQ  Csq,
-  IN PVOID  PeekContext);
+  __W32_IN PIO_CSQ  Csq,
+  __W32_IN PVOID  PeekContext);
 
 NTOSAPI
 VOID
 DDKAPI
 IoDeleteController(
-  IN PCONTROLLER_OBJECT  ControllerObject);
+  __W32_IN PCONTROLLER_OBJECT  ControllerObject);
 
 NTOSAPI
 VOID
 DDKAPI
 IoDeleteDevice(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoDeleteSymbolicLink(
-  IN PUNICODE_STRING  SymbolicLinkName);
+  __W32_IN PUNICODE_STRING  SymbolicLinkName);
 
 /*
  * VOID
  * IoDeassignArcName(
- *   IN PUNICODE_STRING  ArcName)
+ *   __W32_IN PUNICODE_STRING  ArcName)
  */
 #define IoDeassignArcName IoDeleteSymbolicLink
 
@@ -6312,20 +6312,20 @@
 VOID
 DDKAPI
 IoDetachDevice(
-  IN OUT PDEVICE_OBJECT  TargetDevice);
+  __W32_IN __W32_OUT PDEVICE_OBJECT  TargetDevice);
 
 NTOSAPI
 VOID
 DDKAPI
 IoDisconnectInterrupt(
-  IN PKINTERRUPT  InterruptObject);
+  __W32_IN PKINTERRUPT  InterruptObject);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 IoForwardIrpSynchronously(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp);
 
 #define IoForwardAndCatchIrp IoForwardIrpSynchronously
 
@@ -6333,7 +6333,7 @@
 VOID
 DDKAPI
 IoFreeController(
-  IN PCONTROLLER_OBJECT  ControllerObject);
+  __W32_IN PCONTROLLER_OBJECT  ControllerObject);
 
 NTOSAPI
 VOID
@@ -6345,43 +6345,43 @@
 VOID
 DDKAPI
 IoFreeIrp(
-  IN PIRP  Irp);
+  __W32_IN PIRP  Irp);
 
 NTOSAPI
 VOID
 DDKAPI
 IoFreeMdl(
-  IN PMDL  Mdl);
+  __W32_IN PMDL  Mdl);
 
 NTOSAPI
 VOID
 DDKAPI
 IoFreeWorkItem(
-  IN PIO_WORKITEM  pIOWorkItem);
+  __W32_IN PIO_WORKITEM  pIOWorkItem);
 
 NTOSAPI
 PDEVICE_OBJECT
 DDKAPI
 IoGetAttachedDevice(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 PDEVICE_OBJECT
 DDKAPI
 IoGetAttachedDeviceReference(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoGetBootDiskInformation(
-  IN OUT PBOOTDISK_INFORMATION  BootDiskInformation,
-  IN ULONG  Size);
+  __W32_IN __W32_OUT PBOOTDISK_INFORMATION  BootDiskInformation,
+  __W32_IN ULONG  Size);
 
 NTOSAPI
 PCONFIGURATION_INFORMATION
 DDKAPI
-IoGetConfigurationInformation( 
+IoGetConfigurationInformation(
   VOID);
 
 NTOSAPI
@@ -6394,58 +6394,58 @@
 NTSTATUS
 DDKAPI
 IoGetDeviceInterfaceAlias(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN CONST GUID  *AliasInterfaceClassGuid,
-  OUT PUNICODE_STRING  AliasSymbolicLinkName);
+  __W32_IN PUNICODE_STRING  SymbolicLinkName,
+  __W32_IN CONST GUID  *AliasInterfaceClassGuid,
+  __W32_OUT PUNICODE_STRING  AliasSymbolicLinkName);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoGetDeviceInterfaces(
-  IN CONST GUID  *InterfaceClassGuid,
-  IN PDEVICE_OBJECT  PhysicalDeviceObject  OPTIONAL,
-  IN ULONG  Flags,
-  OUT PWSTR  *SymbolicLinkList);
+  __W32_IN CONST GUID  *InterfaceClassGuid,
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject  __W32_OPTIONAL,
+  __W32_IN ULONG  Flags,
+  __W32_OUT PWSTR  *SymbolicLinkList);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoGetDeviceObjectPointer(
-  IN PUNICODE_STRING  ObjectName,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PFILE_OBJECT  *FileObject,
-  OUT PDEVICE_OBJECT  *DeviceObject);
+  __W32_IN PUNICODE_STRING  ObjectName,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_OUT PFILE_OBJECT  *FileObject,
+  __W32_OUT PDEVICE_OBJECT  *DeviceObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoGetDeviceProperty(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN DEVICE_REGISTRY_PROPERTY  DeviceProperty,
-  IN ULONG  BufferLength,
-  OUT PVOID  PropertyBuffer,
-  OUT PULONG  ResultLength);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN DEVICE_REGISTRY_PROPERTY  DeviceProperty,
+  __W32_IN ULONG  BufferLength,
+  __W32_OUT PVOID  PropertyBuffer,
+  __W32_OUT PULONG  ResultLength);
 
 NTOSAPI
 PDEVICE_OBJECT
 DDKAPI
 IoGetDeviceToVerify(
-  IN PETHREAD  Thread);
+  __W32_IN PETHREAD  Thread);
 
 NTOSAPI
 PDMA_ADAPTER
 DDKAPI
 IoGetDmaAdapter(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN PDEVICE_DESCRIPTION  DeviceDescription,
-  IN OUT PULONG  NumberOfMapRegisters);
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject,
+  __W32_IN PDEVICE_DESCRIPTION  DeviceDescription,
+  __W32_IN __W32_OUT PULONG  NumberOfMapRegisters);
 
 NTOSAPI
 PVOID
 DDKAPI
 IoGetDriverObjectExtension(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PVOID  ClientIdentificationAddress);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PVOID  ClientIdentificationAddress);
 
 NTOSAPI
 PGENERIC_MAPPING
@@ -6456,7 +6456,7 @@
 /*
  * ULONG
  * IoGetFunctionCodeFromCtlCode(
- *   IN ULONG  ControlCode)
+ *   __W32_IN ULONG  ControlCode)
  */
 #define IoGetFunctionCodeFromCtlCode(_ControlCode) \
   (((_ControlCode) >> 2) & 0x00000FFF)
@@ -6471,7 +6471,7 @@
 PDEVICE_OBJECT
 DDKAPI
 IoGetRelatedDeviceObject(
-  IN PFILE_OBJECT  FileObject);
+  __W32_IN PFILE_OBJECT  FileObject);
 
 NTOSAPI
 ULONG
@@ -6483,22 +6483,22 @@
 VOID
 DDKAPI
 IoGetStackLimits(
-  OUT PULONG_PTR  LowLimit,
-  OUT PULONG_PTR  HighLimit);
+  __W32_OUT PULONG_PTR  LowLimit,
+  __W32_OUT PULONG_PTR  HighLimit);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeDpc(
-  IN PRKDPC  Dpc,
-  IN PKDEFERRED_ROUTINE  DeferredRoutine,
-  IN PVOID  DeferredContext);
+  __W32_IN PRKDPC  Dpc,
+  __W32_IN PKDEFERRED_ROUTINE  DeferredRoutine,
+  __W32_IN PVOID  DeferredContext);
 
 /*
  * VOID
  * IoInitializeDpcRequest(
- *   IN PDEVICE_OBJECT DeviceObject,
- *   IN PIO_DPC_ROUTINE DpcRoutine)
+ *   __W32_IN PDEVICE_OBJECT DeviceObject,
+ *   __W32_IN PIO_DPC_ROUTINE DpcRoutine)
  */
 #define IoInitializeDpcRequest(_DeviceObject, \
                                _DpcRoutine) \
@@ -6510,26 +6510,26 @@
 VOID
 DDKAPI
 IoInitializeIrp(
-  IN OUT PIRP  Irp,
-  IN USHORT  PacketSize,
-  IN CCHAR  StackSize);
+  __W32_IN __W32_OUT PIRP  Irp,
+  __W32_IN USHORT  PacketSize,
+  __W32_IN CCHAR  StackSize);
 
 NTOSAPI
 VOID
 DDKAPI
 IoInitializeRemoveLockEx(
-  IN  PIO_REMOVE_LOCK Lock,
-  IN  ULONG   AllocateTag,
-  IN  ULONG   MaxLockedMinutes,
-  IN  ULONG   HighWatermark,
-  IN  ULONG   RemlockSize);
+  __W32_IN  PIO_REMOVE_LOCK Lock,
+  __W32_IN  ULONG   AllocateTag,
+  __W32_IN  ULONG   MaxLockedMinutes,
+  __W32_IN  ULONG   HighWatermark,
+  __W32_IN  ULONG   RemlockSize);
 
 /* VOID
  * IoInitializeRemoveLock(
- *   IN PIO_REMOVE_LOCK  Lock,
- *   IN ULONG  AllocateTag,
- *   IN ULONG  MaxLockedMinutes,
- *   IN ULONG  HighWatermark)
+ *   __W32_IN PIO_REMOVE_LOCK  Lock,
+ *   __W32_IN ULONG  AllocateTag,
+ *   __W32_IN ULONG  MaxLockedMinutes,
+ *   __W32_IN ULONG  HighWatermark)
  */
 #define IoInitializeRemoveLock( \
   Lock, AllocateTag, MaxLockedMinutes, HighWatermark) \
@@ -6540,36 +6540,36 @@
 NTSTATUS
 DDKAPI
 IoInitializeTimer(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIO_TIMER_ROUTINE  TimerRoutine,
-  IN PVOID  Context);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIO_TIMER_ROUTINE  TimerRoutine,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 VOID
 DDKAPI
 IoInvalidateDeviceRelations(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN DEVICE_RELATION_TYPE  Type);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN DEVICE_RELATION_TYPE  Type);
 
 NTOSAPI
 VOID
 DDKAPI
 IoInvalidateDeviceState(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject);
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 IoIs32bitProcess(
-  IN PIRP  Irp  OPTIONAL);
+  __W32_IN PIRP  Irp  __W32_OPTIONAL);
 
 /*
  * BOOLEAN
  * IoIsErrorUserInduced(
- *   IN NTSTATUS  Status);
+ *   __W32_IN NTSTATUS  Status);
  */
 #define IoIsErrorUserInduced(Status) \
-	((BOOLEAN)(((Status) == STATUS_DEVICE_NOT_READY) || \
+  ((BOOLEAN)(((Status) == STATUS_DEVICE_NOT_READY) || \
    ((Status) == STATUS_IO_TIMEOUT) || \
    ((Status) == STATUS_MEDIA_WRITE_PROTECTED) || \
    ((Status) == STATUS_NO_MEDIA_IN_DEVICE) || \
@@ -6581,20 +6581,20 @@
 BOOLEAN
 DDKAPI
 IoIsWdmVersionAvailable(
-  IN UCHAR  MajorVersion,
-  IN UCHAR  MinorVersion);
+  __W32_IN UCHAR  MajorVersion,
+  __W32_IN UCHAR  MinorVersion);
 
 NTOSAPI
 PIRP
 DDKAPI
 IoMakeAssociatedIrp(
-  IN PIRP  Irp,
-  IN CCHAR  StackSize);
+  __W32_IN PIRP  Irp,
+  __W32_IN CCHAR  StackSize);
 
 /*
  * VOID
  * IoMarkIrpPending(
- *   IN OUT PIRP  Irp)
+ *   __W32_IN __W32_OUT PIRP  Irp)
  */
 #define IoMarkIrpPending(_Irp) \
   (IoGetCurrentIrpStackLocation(_Irp)->Control |= SL_PENDING_RETURNED)
@@ -6603,142 +6603,142 @@
 NTSTATUS
 DDKAPI
 IoOpenDeviceInterfaceRegistryKey(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  DeviceInterfaceKey);
+  __W32_IN PUNICODE_STRING  SymbolicLinkName,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_OUT PHANDLE  DeviceInterfaceKey);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoOpenDeviceRegistryKey(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  DevInstKeyType,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  DevInstRegKey);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  DevInstKeyType,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_OUT PHANDLE  DevInstRegKey);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoQueryDeviceDescription(
-  IN PINTERFACE_TYPE  BusType  OPTIONAL,
-  IN PULONG  BusNumber  OPTIONAL,
-  IN PCONFIGURATION_TYPE  ControllerType  OPTIONAL,
-  IN PULONG  ControllerNumber  OPTIONAL,
-  IN PCONFIGURATION_TYPE  PeripheralType  OPTIONAL,
-  IN PULONG  PeripheralNumber  OPTIONAL,
-  IN PIO_QUERY_DEVICE_ROUTINE  CalloutRoutine,
-  IN PVOID  Context);
+  __W32_IN PINTERFACE_TYPE  BusType  __W32_OPTIONAL,
+  __W32_IN PULONG  BusNumber  __W32_OPTIONAL,
+  __W32_IN PCONFIGURATION_TYPE  ControllerType  __W32_OPTIONAL,
+  __W32_IN PULONG  ControllerNumber  __W32_OPTIONAL,
+  __W32_IN PCONFIGURATION_TYPE  PeripheralType  __W32_OPTIONAL,
+  __W32_IN PULONG  PeripheralNumber  __W32_OPTIONAL,
+  __W32_IN PIO_QUERY_DEVICE_ROUTINE  CalloutRoutine,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 VOID
 DDKAPI
 IoQueueWorkItem(
-  IN PIO_WORKITEM  pIOWorkItem,
-  IN PIO_WORKITEM_ROUTINE  Routine,
-  IN WORK_QUEUE_TYPE  QueueType,
-  IN PVOID  Context);
+  __W32_IN PIO_WORKITEM  pIOWorkItem,
+  __W32_IN PIO_WORKITEM_ROUTINE  Routine,
+  __W32_IN WORK_QUEUE_TYPE  QueueType,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 VOID
 DDKAPI
 IoRaiseHardError(
-  IN PIRP  Irp,
-  IN PVPB  Vpb  OPTIONAL,
-  IN PDEVICE_OBJECT  RealDeviceObject);
+  __W32_IN PIRP  Irp,
+  __W32_IN PVPB  Vpb  __W32_OPTIONAL,
+  __W32_IN PDEVICE_OBJECT  RealDeviceObject);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 IoRaiseInformationalHardError(
-  IN NTSTATUS  ErrorStatus,
-  IN PUNICODE_STRING  String  OPTIONAL,
-  IN PKTHREAD  Thread  OPTIONAL);
+  __W32_IN NTSTATUS  ErrorStatus,
+  __W32_IN PUNICODE_STRING  String  __W32_OPTIONAL,
+  __W32_IN PKTHREAD  Thread  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReadDiskSignature(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  BytesPerSector,
-  OUT PDISK_SIGNATURE  Signature);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  BytesPerSector,
+  __W32_OUT PDISK_SIGNATURE  Signature);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReadPartitionTableEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN struct _DRIVE_LAYOUT_INFORMATION_EX  **PartitionBuffer);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN struct _DRIVE_LAYOUT_INFORMATION_EX  **PartitionBuffer);
 
 NTOSAPI
 VOID
 DDKAPI
 IoRegisterBootDriverReinitialization(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
-  IN PVOID  Context);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 VOID
 DDKAPI
 IoRegisterBootDriverReinitialization(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
-  IN PVOID  Context);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoRegisterDeviceInterface(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN CONST GUID  *InterfaceClassGuid,
-  IN PUNICODE_STRING  ReferenceString  OPTIONAL,
-  OUT PUNICODE_STRING  SymbolicLinkName);
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject,
+  __W32_IN CONST GUID  *InterfaceClassGuid,
+  __W32_IN PUNICODE_STRING  ReferenceString  __W32_OPTIONAL,
+  __W32_OUT PUNICODE_STRING  SymbolicLinkName);
 
 NTOSAPI
 VOID
 DDKAPI
 IoRegisterDriverReinitialization(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
-  IN PVOID  Context);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoRegisterPlugPlayNotification(
-  IN IO_NOTIFICATION_EVENT_CATEGORY  EventCategory,
-  IN ULONG  EventCategoryFlags,
-  IN PVOID  EventCategoryData  OPTIONAL,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_NOTIFICATION_CALLBACK_ROUTINE  CallbackRoutine,
-  IN PVOID  Context,
-  OUT PVOID  *NotificationEntry);
+  __W32_IN IO_NOTIFICATION_EVENT_CATEGORY  EventCategory,
+  __W32_IN ULONG  EventCategoryFlags,
+  __W32_IN PVOID  EventCategoryData  __W32_OPTIONAL,
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PDRIVER_NOTIFICATION_CALLBACK_ROUTINE  CallbackRoutine,
+  __W32_IN PVOID  Context,
+  __W32_OUT PVOID  *NotificationEntry);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoRegisterShutdownNotification(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 VOID
 DDKAPI
 IoReleaseCancelSpinLock(
-  IN KIRQL  Irql);
+  __W32_IN KIRQL  Irql);
 
 NTOSAPI
 VOID
 DDKAPI
 IoReleaseRemoveLockAndWaitEx(
-  IN PIO_REMOVE_LOCK  RemoveLock,
-  IN PVOID  Tag,
-  IN ULONG  RemlockSize);
+  __W32_IN PIO_REMOVE_LOCK  RemoveLock,
+  __W32_IN PVOID  Tag,
+  __W32_IN ULONG  RemlockSize);
 
 /*
  * VOID
  * IoReleaseRemoveLockAndWait(
- *   IN PIO_REMOVE_LOCK  RemoveLock,
- *   IN PVOID  Tag)
+ *   __W32_IN PIO_REMOVE_LOCK  RemoveLock,
+ *   __W32_IN PVOID  Tag)
  */
 #define IoReleaseRemoveLockAndWait(_RemoveLock, \
                                    _Tag) \
@@ -6748,15 +6748,15 @@
 VOID
 DDKAPI
 IoReleaseRemoveLockEx(
-  IN PIO_REMOVE_LOCK  RemoveLock,
-  IN PVOID  Tag,
-  IN ULONG  RemlockSize);
+  __W32_IN PIO_REMOVE_LOCK  RemoveLock,
+  __W32_IN PVOID  Tag,
+  __W32_IN ULONG  RemlockSize);
 
 /*
  * VOID
  * IoReleaseRemoveLock(
- *   IN PIO_REMOVE_LOCK  RemoveLock,
- *   IN PVOID  Tag)
+ *   __W32_IN PIO_REMOVE_LOCK  RemoveLock,
+ *   __W32_IN PVOID  Tag)
  */
 #define IoReleaseRemoveLock(_RemoveLock, \
                                    _Tag) \
@@ -6766,76 +6766,76 @@
 VOID
 DDKAPI
 IoRemoveShareAccess(
-  IN PFILE_OBJECT  FileObject,
-  IN OUT PSHARE_ACCESS  ShareAccess);
+  __W32_IN PFILE_OBJECT  FileObject,
+  __W32_IN __W32_OUT PSHARE_ACCESS  ShareAccess);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReportDetectedDevice(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN INTERFACE_TYPE  LegacyBusType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PCM_RESOURCE_LIST  ResourceList,
-  IN PIO_RESOURCE_REQUIREMENTS_LIST  ResourceRequirements  OPTIONAL,
-  IN BOOLEAN  ResourceAssigned,
-  IN OUT PDEVICE_OBJECT  *DeviceObject);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN INTERFACE_TYPE  LegacyBusType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PCM_RESOURCE_LIST  ResourceList,
+  __W32_IN PIO_RESOURCE_REQUIREMENTS_LIST  ResourceRequirements  __W32_OPTIONAL,
+  __W32_IN BOOLEAN  ResourceAssigned,
+  __W32_IN __W32_OUT PDEVICE_OBJECT  *DeviceObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReportResourceForDetection(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PCM_RESOURCE_LIST  DriverList  OPTIONAL,
-  IN ULONG  DriverListSize  OPTIONAL,
-  IN PDEVICE_OBJECT  DeviceObject  OPTIONAL,
-  IN PCM_RESOURCE_LIST  DeviceList  OPTIONAL,
-  IN ULONG  DeviceListSize  OPTIONAL,
-  OUT PBOOLEAN  ConflictDetected);
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PCM_RESOURCE_LIST  DriverList  __W32_OPTIONAL,
+  __W32_IN ULONG  DriverListSize  __W32_OPTIONAL,
+  __W32_IN PDEVICE_OBJECT  DeviceObject  __W32_OPTIONAL,
+  __W32_IN PCM_RESOURCE_LIST  DeviceList  __W32_OPTIONAL,
+  __W32_IN ULONG  DeviceListSize  __W32_OPTIONAL,
+  __W32_OUT PBOOLEAN  ConflictDetected);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReportResourceUsage(
-  IN PUNICODE_STRING  DriverClassName  OPTIONAL,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PCM_RESOURCE_LIST  DriverList  OPTIONAL,
-  IN ULONG  DriverListSize  OPTIONAL,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PCM_RESOURCE_LIST  DeviceList  OPTIONAL,
-  IN ULONG  DeviceListSize  OPTIONAL,
-  IN BOOLEAN  OverrideConflict,
-  OUT PBOOLEAN  ConflictDetected);
+  __W32_IN PUNICODE_STRING  DriverClassName  __W32_OPTIONAL,
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PCM_RESOURCE_LIST  DriverList  __W32_OPTIONAL,
+  __W32_IN ULONG  DriverListSize  __W32_OPTIONAL,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PCM_RESOURCE_LIST  DeviceList  __W32_OPTIONAL,
+  __W32_IN ULONG  DeviceListSize  __W32_OPTIONAL,
+  __W32_IN BOOLEAN  OverrideConflict,
+  __W32_OUT PBOOLEAN  ConflictDetected);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReportTargetDeviceChange(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN PVOID  NotificationStructure);
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject,
+  __W32_IN PVOID  NotificationStructure);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoReportTargetDeviceChangeAsynchronous(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN PVOID  NotificationStructure,
-  IN PDEVICE_CHANGE_COMPLETE_CALLBACK  Callback  OPTIONAL,
-  IN PVOID  Context  OPTIONAL);
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject,
+  __W32_IN PVOID  NotificationStructure,
+  __W32_IN PDEVICE_CHANGE_COMPLETE_CALLBACK  Callback  __W32_OPTIONAL,
+  __W32_IN PVOID  Context  __W32_OPTIONAL);
 
 NTOSAPI
 VOID
 DDKAPI
 IoRequestDeviceEject(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject);
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject);
 
 /*
  * VOID
  * IoRequestDpc(
- *   IN PDEVICE_OBJECT  DeviceObject,
- *   IN PIRP  Irp,
- *   IN PVOID  Context);
+ *   __W32_IN PDEVICE_OBJECT  DeviceObject,
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PVOID  Context);
  */
 #define IoRequestDpc(DeviceObject, Irp, Context)( \
   KeInsertQueueDpc(&(DeviceObject)->Dpc, (Irp), (Context)))
@@ -6844,14 +6844,14 @@
 VOID
 DDKAPI
 IoReuseIrp(
-  IN OUT PIRP  Irp,
-  IN NTSTATUS  Status);
+  __W32_IN __W32_OUT PIRP  Irp,
+  __W32_IN NTSTATUS  Status);
 
 /*
  * PDRIVER_CANCEL
  * IoSetCancelRoutine(
- *   IN PIRP  Irp,
- *   IN PDRIVER_CANCEL  CancelRoutine)
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PDRIVER_CANCEL  CancelRoutine)
  */
 #define IoSetCancelRoutine(_Irp, \
                            _CancelRoutine) \
@@ -6861,12 +6861,12 @@
 /*
  * VOID
  * IoSetCompletionRoutine(
- *   IN PIRP  Irp,
- *   IN PIO_COMPLETION_ROUTINE  CompletionRoutine,
- *   IN PVOID  Context,
- *   IN BOOLEAN  InvokeOnSuccess,
- *   IN BOOLEAN  InvokeOnError,
- *   IN BOOLEAN  InvokeOnCancel)
+ *   __W32_IN PIRP  Irp,
+ *   __W32_IN PIO_COMPLETION_ROUTINE  CompletionRoutine,
+ *   __W32_IN PVOID  Context,
+ *   __W32_IN BOOLEAN  InvokeOnSuccess,
+ *   __W32_IN BOOLEAN  InvokeOnError,
+ *   __W32_IN BOOLEAN  InvokeOnCancel)
  */
 #define IoSetCompletionRoutine(_Irp, \
                                _CompletionRoutine, \
@@ -6880,7 +6880,7 @@
     _CompletionRoutine != NULL : TRUE); \
   _IrpSp = IoGetNextIrpStackLocation(_Irp); \
   _IrpSp->CompletionRoutine = (PIO_COMPLETION_ROUTINE)(_CompletionRoutine); \
-	_IrpSp->Context = (_Context); \
+  _IrpSp->Context = (_Context); \
   _IrpSp->Control = 0; \
   if (_InvokeOnSuccess) _IrpSp->Control = SL_INVOKE_ON_SUCCESS; \
   if (_InvokeOnError) _IrpSp->Control |= SL_INVOKE_ON_ERROR; \
@@ -6891,32 +6891,32 @@
 VOID
 DDKAPI
 IoSetCompletionRoutineEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN PIO_COMPLETION_ROUTINE  CompletionRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN    InvokeOnSuccess,
-  IN BOOLEAN  InvokeOnError,
-  IN BOOLEAN  InvokeOnCancel);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp,
+  __W32_IN PIO_COMPLETION_ROUTINE  CompletionRoutine,
+  __W32_IN PVOID  Context,
+  __W32_IN BOOLEAN    InvokeOnSuccess,
+  __W32_IN BOOLEAN  InvokeOnError,
+  __W32_IN BOOLEAN  InvokeOnCancel);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoSetDeviceInterfaceState(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN BOOLEAN  Enable);
+  __W32_IN PUNICODE_STRING  SymbolicLinkName,
+  __W32_IN BOOLEAN  Enable);
 
 NTOSAPI
 VOID
 DDKAPI
 IoSetHardErrorOrVerifyDevice(
-  IN PIRP  Irp,
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PIRP  Irp,
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 /*
  * VOID
  * IoSetNextIrpStackLocation(
- *   IN OUT PIRP  Irp)
+ *   __W32_IN __W32_OUT PIRP  Irp)
  */
 #define IoSetNextIrpStackLocation(_Irp) \
 { \
@@ -6928,43 +6928,43 @@
 NTSTATUS
 DDKAPI
 IoSetPartitionInformationEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  PartitionNumber,
-  IN struct _SET_PARTITION_INFORMATION_EX  *PartitionInfo);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  PartitionNumber,
+  __W32_IN struct _SET_PARTITION_INFORMATION_EX  *PartitionInfo);
 
 NTOSAPI
 VOID
 DDKAPI
 IoSetShareAccess(
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  DesiredShareAccess,
-  IN OUT PFILE_OBJECT  FileObject,
-  OUT PSHARE_ACCESS  ShareAccess);
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN ULONG  DesiredShareAccess,
+  __W32_IN __W32_OUT PFILE_OBJECT  FileObject,
+  __W32_OUT PSHARE_ACCESS  ShareAccess);
 
 NTOSAPI
 VOID
 DDKAPI
 IoSetStartIoAttributes(
-  IN PDEVICE_OBJECT  DeviceObject, 
-  IN BOOLEAN  DeferredStartIo, 
-  IN BOOLEAN  NonCancelable); 
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN BOOLEAN  DeferredStartIo,
+  __W32_IN BOOLEAN  NonCancelable);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoSetSystemPartition(
-  IN PUNICODE_STRING  VolumeNameString);
+  __W32_IN PUNICODE_STRING  VolumeNameString);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 IoSetThreadHardErrorMode(
-  IN BOOLEAN  EnableHardErrors);
+  __W32_IN BOOLEAN  EnableHardErrors);
 
 /*
  * USHORT
  * IoSizeOfIrp(
- *   IN CCHAR  StackSize)
+ *   __W32_IN CCHAR  StackSize)
  */
 #define IoSizeOfIrp(_StackSize) \
   ((USHORT) (sizeof(IRP) + ((_StackSize) * (sizeof(IO_STACK_LOCATION)))))
@@ -6972,7 +6972,7 @@
 /*
  * VOID
  * IoSkipCurrentIrpStackLocation(
- *   IN PIRP  Irp)
+ *   __W32_IN PIRP  Irp)
  */
 #define IoSkipCurrentIrpStackLocation(_Irp) \
 { \
@@ -6984,219 +6984,219 @@
 VOID
 DDKAPI
 IoStartNextPacket(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN BOOLEAN  Cancelable);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN BOOLEAN  Cancelable);
 
 NTOSAPI
 VOID
 DDKAPI
 IoStartNextPacketByKey(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN BOOLEAN  Cancelable,
-  IN ULONG  Key);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN BOOLEAN  Cancelable,
+  __W32_IN ULONG  Key);
 
 NTOSAPI
 VOID
 DDKAPI
 IoStartPacket(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN PULONG  Key  OPTIONAL,
-  IN PDRIVER_CANCEL  CancelFunction  OPTIONAL);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp,
+  __W32_IN PULONG  Key  __W32_OPTIONAL,
+  __W32_IN PDRIVER_CANCEL  CancelFunction  __W32_OPTIONAL);
 
 NTOSAPI
 VOID
 DDKAPI
 IoStartTimer(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 VOID
 DDKAPI
 IoStopTimer(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoUnregisterPlugPlayNotification(
-  IN PVOID  NotificationEntry);
+  __W32_IN PVOID  NotificationEntry);
 
 NTOSAPI
 VOID
 DDKAPI
 IoUnregisterShutdownNotification(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 VOID
 DDKAPI
 IoUpdateShareAccess(
-  IN PFILE_OBJECT  FileObject,
-  IN OUT PSHARE_ACCESS  ShareAccess);
+  __W32_IN PFILE_OBJECT  FileObject,
+  __W32_IN __W32_OUT PSHARE_ACCESS  ShareAccess);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoVerifyPartitionTable(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN BOOLEAN  FixErrors);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN BOOLEAN  FixErrors);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoVolumeDeviceToDosName(
-  IN  PVOID  VolumeDeviceObject,
-  OUT PUNICODE_STRING  DosName);
+  __W32_IN  PVOID  VolumeDeviceObject,
+  __W32_OUT PUNICODE_STRING  DosName);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIAllocateInstanceIds(
-  IN GUID  *Guid,
-  IN ULONG  InstanceCount,
-  OUT ULONG  *FirstInstanceId);
+  __W32_IN GUID  *Guid,
+  __W32_IN ULONG  InstanceCount,
+  __W32_OUT ULONG  *FirstInstanceId);
 
 NTOSAPI
 ULONG
 DDKAPI
 IoWMIDeviceObjectToProviderId(
-  IN PDEVICE_OBJECT  DeviceObject);
+  __W32_IN PDEVICE_OBJECT  DeviceObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIDeviceObjectToInstanceName(
-  IN PVOID  DataBlockObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  OUT PUNICODE_STRING  InstanceName);
+  __W32_IN PVOID  DataBlockObject,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_OUT PUNICODE_STRING  InstanceName);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIExecuteMethod(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN ULONG  MethodId,
-  IN ULONG  InBufferSize,
-  IN OUT PULONG  OutBufferSize,
-  IN OUT  PUCHAR  InOutBuffer);
+  __W32_IN PVOID  DataBlockObject,
+  __W32_IN PUNICODE_STRING  InstanceName,
+  __W32_IN ULONG  MethodId,
+  __W32_IN ULONG  InBufferSize,
+  __W32_IN __W32_OUT PULONG  OutBufferSize,
+  __W32_IN __W32_OUT  PUCHAR  InOutBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIHandleToInstanceName(
-  IN PVOID  DataBlockObject,
-  IN HANDLE  FileHandle,
-  OUT PUNICODE_STRING  InstanceName);
+  __W32_IN PVOID  DataBlockObject,
+  __W32_IN HANDLE  FileHandle,
+  __W32_OUT PUNICODE_STRING  InstanceName);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIOpenBlock(
-  IN GUID  *DataBlockGuid,
-  IN ULONG  DesiredAccess,
-  OUT PVOID  *DataBlockObject);
+  __W32_IN GUID  *DataBlockGuid,
+  __W32_IN ULONG  DesiredAccess,
+  __W32_OUT PVOID  *DataBlockObject);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIQueryAllData(
-  IN PVOID  DataBlockObject,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID  OutBuffer);
+  __W32_IN PVOID  DataBlockObject,
+  __W32_IN __W32_OUT ULONG  *InOutBufferSize,
+  __W32_OUT PVOID  OutBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIQueryAllDataMultiple(
-  IN PVOID  *DataBlockObjectList,
-  IN ULONG  ObjectCount,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID  OutBuffer);
+  __W32_IN PVOID  *DataBlockObjectList,
+  __W32_IN ULONG  ObjectCount,
+  __W32_IN __W32_OUT ULONG  *InOutBufferSize,
+  __W32_OUT PVOID  OutBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIQuerySingleInstance(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID OutBuffer);
+  __W32_IN PVOID  DataBlockObject,
+  __W32_IN PUNICODE_STRING  InstanceName,
+  __W32_IN __W32_OUT ULONG  *InOutBufferSize,
+  __W32_OUT PVOID OutBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIQuerySingleInstanceMultiple(
-  IN PVOID  *DataBlockObjectList,
-  IN PUNICODE_STRING  InstanceNames,
-  IN ULONG  ObjectCount,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID  OutBuffer);
+  __W32_IN PVOID  *DataBlockObjectList,
+  __W32_IN PUNICODE_STRING  InstanceNames,
+  __W32_IN ULONG  ObjectCount,
+  __W32_IN __W32_OUT ULONG  *InOutBufferSize,
+  __W32_OUT PVOID  OutBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIRegistrationControl(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  Action);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  Action);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMISetNotificationCallback(
-  IN PVOID  Object,
-  IN WMI_NOTIFICATION_CALLBACK  Callback,
-  IN PVOID  Context);
+  __W32_IN PVOID  Object,
+  __W32_IN WMI_NOTIFICATION_CALLBACK  Callback,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMISetSingleInstance(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN ULONG  Version,
-  IN ULONG  ValueBufferSize,
-  IN PVOID  ValueBuffer);
+  __W32_IN PVOID  DataBlockObject,
+  __W32_IN PUNICODE_STRING  InstanceName,
+  __W32_IN ULONG  Version,
+  __W32_IN ULONG  ValueBufferSize,
+  __W32_IN PVOID  ValueBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMISetSingleItem(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN ULONG  DataItemId,
-  IN ULONG  Version,
-  IN ULONG  ValueBufferSize,
-  IN PVOID  ValueBuffer);
+  __W32_IN PVOID  DataBlockObject,
+  __W32_IN PUNICODE_STRING  InstanceName,
+  __W32_IN ULONG  DataItemId,
+  __W32_IN ULONG  Version,
+  __W32_IN ULONG  ValueBufferSize,
+  __W32_IN PVOID  ValueBuffer);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMISuggestInstanceName(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject OPTIONAL,
-  IN PUNICODE_STRING  SymbolicLinkName OPTIONAL,
-  IN BOOLEAN  CombineNames,
-  OUT PUNICODE_STRING  SuggestedInstanceName);
+  __W32_IN PDEVICE_OBJECT  PhysicalDeviceObject __W32_OPTIONAL,
+  __W32_IN PUNICODE_STRING  SymbolicLinkName __W32_OPTIONAL,
+  __W32_IN BOOLEAN  CombineNames,
+  __W32_OUT PUNICODE_STRING  SuggestedInstanceName);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWMIWriteEvent(
-  IN PVOID  WnodeEventItem);
+  __W32_IN PVOID  WnodeEventItem);
 
 NTOSAPI
 VOID
 DDKAPI
 IoWriteErrorLogEntry(
-  IN PVOID  ElEntry);
+  __W32_IN PVOID  ElEntry);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoWritePartitionTableEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN struct _DRIVE_LAYOUT_INFORMATION_EX  *PartitionBuffer);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN struct _DRIVE_LAYOUT_INFORMATION_EX  *PartitionBuffer);
 
 
 
@@ -7206,28 +7206,28 @@
 VOID
 DDKFASTAPI
 KeAcquireInStackQueuedSpinLock(
-  IN PKSPIN_LOCK  SpinLock,
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
+  __W32_IN PKSPIN_LOCK  SpinLock,
+  __W32_IN PKLOCK_QUEUE_HANDLE  LockHandle);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 KeAcquireInStackQueuedSpinLockAtDpcLevel(
-  IN PKSPIN_LOCK  SpinLock,
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
+  __W32_IN PKSPIN_LOCK  SpinLock,
+  __W32_IN PKLOCK_QUEUE_HANDLE  LockHandle);
 
 NTOSAPI
 KIRQL
 DDKAPI
 KeAcquireInterruptSpinLock(
-  IN PKINTERRUPT  Interrupt);
+  __W32_IN PKINTERRUPT  Interrupt);
 
 NTOSAPI
 VOID
 DDKAPI
 KeAcquireSpinLock(
-  IN PKSPIN_LOCK  SpinLock,
-  OUT PKIRQL  OldIrql);
+  __W32_IN PKSPIN_LOCK  SpinLock,
+  __W32_OUT PKIRQL  OldIrql);
 
 /* System Service Dispatch Table */
 typedef PVOID (NTAPI * SSDT)(VOID);
@@ -7237,21 +7237,21 @@
 typedef UCHAR SSPT, * PSSPT;
 
 typedef struct _SSDT_ENTRY {
-	PSSDT  SSDT;
-	PULONG  ServiceCounterTable;
-	ULONG  NumberOfServices;
-	PSSPT  SSPT;
+  PSSDT  SSDT;
+  PULONG  ServiceCounterTable;
+  ULONG  NumberOfServices;
+  PSSPT  SSPT;
 } SSDT_ENTRY, *PSSDT_ENTRY;
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeAddSystemServiceTable(
-  IN PSSDT  SSDT,
-  IN PULONG  ServiceCounterTable,
-  IN ULONG  NumberOfServices,
-  IN PSSPT  SSPT,
-  IN ULONG  TableIndex);
+  __W32_IN PSSDT  SSDT,
+  __W32_IN PULONG  ServiceCounterTable,
+  __W32_IN ULONG  NumberOfServices,
+  __W32_IN PSSPT  SSPT,
+  __W32_IN ULONG  TableIndex);
 
 NTOSAPI
 BOOLEAN
@@ -7263,49 +7263,49 @@
 VOID
 DDKAPI
 KeAttachProcess(
-  IN PEPROCESS  Process);
+  __W32_IN PEPROCESS  Process);
 
 NTOSAPI
 VOID
 DDKAPI
 KeBugCheck(
-  IN ULONG  BugCheckCode);
+  __W32_IN ULONG  BugCheckCode);
 
 NTOSAPI
 VOID
 DDKAPI
 KeBugCheckEx(
-  IN ULONG  BugCheckCode,
-  IN ULONG_PTR  BugCheckParameter1,
-  IN ULONG_PTR  BugCheckParameter2,
-  IN ULONG_PTR  BugCheckParameter3,
-  IN ULONG_PTR  BugCheckParameter4);
+  __W32_IN ULONG  BugCheckCode,
+  __W32_IN ULONG_PTR  BugCheckParameter1,
+  __W32_IN ULONG_PTR  BugCheckParameter2,
+  __W32_IN ULONG_PTR  BugCheckParameter3,
+  __W32_IN ULONG_PTR  BugCheckParameter4);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeCancelTimer(
-  IN PKTIMER  Timer);
+  __W32_IN PKTIMER  Timer);
 
 NTOSAPI
 VOID
 DDKAPI
 KeClearEvent(
-  IN PRKEVENT  Event);
+  __W32_IN PRKEVENT  Event);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 KeDelayExecutionThread(
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Interval);
+  __W32_IN KPROCESSOR_MODE  WaitMode,
+  __W32_IN BOOLEAN  Alertable,
+  __W32_IN PLARGE_INTEGER  Interval);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeDeregisterBugCheckCallback(
-  IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord);
+  __W32_IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord);
 
 NTOSAPI
 VOID
@@ -7322,9 +7322,9 @@
 /*
  * VOID
  * KeFlushIoBuffers(
- *   IN PMDL  Mdl,
- *   IN BOOLEAN  ReadOperation,
- *   IN BOOLEAN  DmaOperation)
+ *   __W32_IN PMDL  Mdl,
+ *   __W32_IN BOOLEAN  ReadOperation,
+ *   __W32_IN BOOLEAN  DmaOperation)
  */
 #define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation)
 
@@ -7350,77 +7350,77 @@
 VOID
 DDKAPI
 KeInitializeApc(
-  IN PKAPC  Apc,
-	IN PKTHREAD  Thread,
-	IN UCHAR  StateIndex,
-	IN PKKERNEL_ROUTINE  KernelRoutine,
-	IN PKRUNDOWN_ROUTINE  RundownRoutine,
-	IN PKNORMAL_ROUTINE  NormalRoutine,
-	IN UCHAR  Mode,
-	IN PVOID  Context);
+  __W32_IN PKAPC  Apc,
+  __W32_IN PKTHREAD  Thread,
+  __W32_IN UCHAR  StateIndex,
+  __W32_IN PKKERNEL_ROUTINE  KernelRoutine,
+  __W32_IN PKRUNDOWN_ROUTINE  RundownRoutine,
+  __W32_IN PKNORMAL_ROUTINE  NormalRoutine,
+  __W32_IN UCHAR  Mode,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue);
+  __W32_IN PKDEVICE_QUEUE  DeviceQueue);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeMutex(
-  IN PRKMUTEX  Mutex,
-  IN ULONG  Level);
+  __W32_IN PRKMUTEX  Mutex,
+  __W32_IN ULONG  Level);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeSemaphore(
-  IN PRKSEMAPHORE  Semaphore,
-  IN LONG  Count,
-  IN LONG  Limit);
+  __W32_IN PRKSEMAPHORE  Semaphore,
+  __W32_IN LONG  Count,
+  __W32_IN LONG  Limit);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeSpinLock(
-  IN PKSPIN_LOCK  SpinLock);
+  __W32_IN PKSPIN_LOCK  SpinLock);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeTimer(
-  IN PKTIMER  Timer);
+  __W32_IN PKTIMER  Timer);
 
 NTOSAPI
 VOID
 DDKAPI
 KeInitializeTimerEx(
-  IN PKTIMER  Timer,
-  IN TIMER_TYPE  Type);
+  __W32_IN PKTIMER  Timer,
+  __W32_IN TIMER_TYPE  Type);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeInsertByKeyDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry,
-  IN ULONG  SortKey);
+  __W32_IN PKDEVICE_QUEUE  DeviceQueue,
+  __W32_IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry,
+  __W32_IN ULONG  SortKey);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeInsertDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry);
+  __W32_IN PKDEVICE_QUEUE  DeviceQueue,
+  __W32_IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeInsertQueueDpc(
-  IN PRKDPC  Dpc,
-  IN PVOID  SystemArgument1,
-  IN PVOID  SystemArgument2);
+  __W32_IN PRKDPC  Dpc,
+  __W32_IN PVOID  SystemArgument1,
+  __W32_IN PVOID  SystemArgument2);
 
 NTOSAPI
 VOID
@@ -7432,9 +7432,9 @@
 NTSTATUS
 DDKAPI
 KePulseEvent(
-  IN PRKEVENT  Event,
-  IN KPRIORITY  Increment,
-  IN BOOLEAN  Wait);
+  __W32_IN PRKEVENT  Event,
+  __W32_IN KPRIORITY  Increment,
+  __W32_IN BOOLEAN  Wait);
 
 NTOSAPI
 ULONGLONG
@@ -7446,25 +7446,25 @@
 LARGE_INTEGER
 DDKAPI
 KeQueryPerformanceCounter(
-  OUT PLARGE_INTEGER  PerformanceFrequency  OPTIONAL);
+  __W32_OUT PLARGE_INTEGER  PerformanceFrequency  __W32_OPTIONAL);
 
 NTOSAPI
 KPRIORITY
 DDKAPI
 KeQueryPriorityThread(
-  IN PRKTHREAD  Thread);
+  __W32_IN PRKTHREAD  Thread);
 
 NTOSAPI
 VOID
 DDKAPI
 KeQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
+  __W32_OUT PLARGE_INTEGER  CurrentTime);
 
 NTOSAPI
 VOID
 DDKAPI
 KeQueryTickCount(
-  OUT PLARGE_INTEGER  TickCount);
+  __W32_OUT PLARGE_INTEGER  TickCount);
 
 NTOSAPI
 ULONG
@@ -7476,227 +7476,227 @@
 LONG
 DDKAPI
 KeReadStateEvent(
-  IN PRKEVENT  Event);
+  __W32_IN PRKEVENT  Event);
 
 NTOSAPI
 LONG
 DDKAPI
 KeReadStateMutex(
-  IN PRKMUTEX  Mutex);
+  __W32_IN PRKMUTEX  Mutex);
 
 NTOSAPI
 LONG
 DDKAPI
 KeReadStateSemaphore(
-  IN PRKSEMAPHORE  Semaphore);
+  __W32_IN PRKSEMAPHORE  Semaphore);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeReadStateTimer(
-  IN PKTIMER  Timer);
+  __W32_IN PKTIMER  Timer);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeRegisterBugCheckCallback(
-  IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord,
-  IN PKBUGCHECK_CALLBACK_ROUTINE  CallbackRoutine,
-  IN PVOID  Buffer,
-  IN ULONG  Length,
-  IN PUCHAR  Component);
+  __W32_IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord,
+  __W32_IN PKBUGCHECK_CALLBACK_ROUTINE  CallbackRoutine,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length,
+  __W32_IN PUCHAR  Component);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 KeReleaseInStackQueuedSpinLock(
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
+  __W32_IN PKLOCK_QUEUE_HANDLE  LockHandle);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 KeReleaseInStackQueuedSpinLockFromDpcLevel(
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
+  __W32_IN PKLOCK_QUEUE_HANDLE  LockHandle);
 
 NTOSAPI
 VOID
 DDKAPI
 KeReleaseInterruptSpinLock(
-  IN PKINTERRUPT  Interrupt,
-  IN KIRQL  OldIrql);
+  __W32_IN PKINTERRUPT  Interrupt,
+  __W32_IN KIRQL  OldIrql);
 
 NTOSAPI
 LONG
 DDKAPI
 KeReleaseMutex(
-  IN PRKMUTEX  Mutex,
-  IN BOOLEAN  Wait);
+  __W32_IN PRKMUTEX  Mutex,
+  __W32_IN BOOLEAN  Wait);
 
 NTOSAPI
 LONG
 DDKAPI
 KeReleaseSemaphore(
-  IN PRKSEMAPHORE  Semaphore,
-  IN KPRIORITY  Increment,
-  IN LONG  Adjustment,
-  IN BOOLEAN  Wait);
+  __W32_IN PRKSEMAPHORE  Semaphore,
+  __W32_IN KPRIORITY  Increment,
+  __W32_IN LONG  Adjustment,
+  __W32_IN BOOLEAN  Wait);
 
 NTOSAPI
 VOID
 DDKAPI
 KeReleaseSpinLock(
-  IN PKSPIN_LOCK  SpinLock,
-  IN KIRQL  NewIrql);
+  __W32_IN PKSPIN_LOCK  SpinLock,
+  __W32_IN KIRQL  NewIrql);
 
 NTOSAPI
 PKDEVICE_QUEUE_ENTRY
-DDKAPI 
+DDKAPI
 KeRemoveByKeyDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN ULONG  SortKey);
+  __W32_IN PKDEVICE_QUEUE  DeviceQueue,
+  __W32_IN ULONG  SortKey);
 
 NTOSAPI
 PKDEVICE_QUEUE_ENTRY
 DDKAPI
 KeRemoveDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue);
+  __W32_IN PKDEVICE_QUEUE  DeviceQueue);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeRemoveEntryDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry);
+  __W32_IN PKDEVICE_QUEUE  DeviceQueue,
+  __W32_IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeRemoveQueueDpc(
-  IN PRKDPC  Dpc);
+  __W32_IN PRKDPC  Dpc);
 
 NTOSAPI
 LONG
 DDKAPI
 KeResetEvent(
-  IN PRKEVENT  Event);
+  __W32_IN PRKEVENT  Event);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 KeRestoreFloatingPointState(
-  IN PKFLOATING_SAVE  FloatSave);
+  __W32_IN PKFLOATING_SAVE  FloatSave);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 KeSaveFloatingPointState(
-  OUT PKFLOATING_SAVE  FloatSave);
+  __W32_OUT PKFLOATING_SAVE  FloatSave);
 
 NTOSAPI
 LONG
 DDKAPI
 KeSetBasePriorityThread(
-  IN PRKTHREAD  Thread,
-  IN LONG  Increment);
+  __W32_IN PRKTHREAD  Thread,
+  __W32_IN LONG  Increment);
 
 NTOSAPI
 LONG
 DDKAPI
 KeSetEvent(
-  IN PRKEVENT  Event,
-  IN KPRIORITY  Increment,
-  IN BOOLEAN  Wait);
+  __W32_IN PRKEVENT  Event,
+  __W32_IN KPRIORITY  Increment,
+  __W32_IN BOOLEAN  Wait);
 
 NTOSAPI
 VOID
 DDKAPI
 KeSetImportanceDpc(
-  IN PRKDPC  Dpc,
-  IN KDPC_IMPORTANCE  Importance);
+  __W32_IN PRKDPC  Dpc,
+  __W32_IN KDPC_IMPORTANCE  Importance);
 
 NTOSAPI
 KPRIORITY
 DDKAPI
 KeSetPriorityThread(
-  IN PKTHREAD  Thread,
-  IN KPRIORITY  Priority);
+  __W32_IN PKTHREAD  Thread,
+  __W32_IN KPRIORITY  Priority);
 
 NTOSAPI
 VOID
 DDKAPI
 KeSetTargetProcessorDpc(
-  IN PRKDPC  Dpc,
-  IN CCHAR  Number);
+  __W32_IN PRKDPC  Dpc,
+  __W32_IN CCHAR  Number);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeSetTimer(
-  IN PKTIMER  Timer,
-  IN LARGE_INTEGER  DueTime,
-  IN PKDPC  Dpc  OPTIONAL);
+  __W32_IN PKTIMER  Timer,
+  __W32_IN LARGE_INTEGER  DueTime,
+  __W32_IN PKDPC  Dpc  __W32_OPTIONAL);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeSetTimerEx(
-  IN PKTIMER  Timer,
-  IN LARGE_INTEGER  DueTime,
-  IN LONG  Period  OPTIONAL,
-  IN PKDPC  Dpc  OPTIONAL);
+  __W32_IN PKTIMER  Timer,
+  __W32_IN LARGE_INTEGER  DueTime,
+  __W32_IN LONG  Period  __W32_OPTIONAL,
+  __W32_IN PKDPC  Dpc  __W32_OPTIONAL);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 KeSetTimeUpdateNotifyRoutine(
-  IN PTIME_UPDATE_NOTIFY_ROUTINE  NotifyRoutine);
+  __W32_IN PTIME_UPDATE_NOTIFY_ROUTINE  NotifyRoutine);
 
 NTOSAPI
 VOID
 DDKAPI
 KeStallExecutionProcessor(
-  IN ULONG  MicroSeconds);
+  __W32_IN ULONG  MicroSeconds);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 KeSynchronizeExecution(
-  IN PKINTERRUPT    Interrupt,
-  IN PKSYNCHRONIZE_ROUTINE  SynchronizeRoutine,
-  IN PVOID  SynchronizeContext);
+  __W32_IN PKINTERRUPT    Interrupt,
+  __W32_IN PKSYNCHRONIZE_ROUTINE  SynchronizeRoutine,
+  __W32_IN PVOID  SynchronizeContext);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 KeWaitForMultipleObjects(
-  IN ULONG  Count,
-  IN PVOID  Object[],
-  IN WAIT_TYPE  WaitType,
-  IN KWAIT_REASON  WaitReason,
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL,
-  IN PKWAIT_BLOCK  WaitBlockArray  OPTIONAL);
+  __W32_IN ULONG  Count,
+  __W32_IN PVOID  Object[],
+  __W32_IN WAIT_TYPE  WaitType,
+  __W32_IN KWAIT_REASON  WaitReason,
+  __W32_IN KPROCESSOR_MODE  WaitMode,
+  __W32_IN BOOLEAN  Alertable,
+  __W32_IN PLARGE_INTEGER  Timeout  __W32_OPTIONAL,
+  __W32_IN PKWAIT_BLOCK  WaitBlockArray  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 KeWaitForMutexObject(
-  IN PRKMUTEX  Mutex,
-  IN KWAIT_REASON  WaitReason,
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL);
+  __W32_IN PRKMUTEX  Mutex,
+  __W32_IN KWAIT_REASON  WaitReason,
+  __W32_IN KPROCESSOR_MODE  WaitMode,
+  __W32_IN BOOLEAN  Alertable,
+  __W32_IN PLARGE_INTEGER  Timeout  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 KeWaitForSingleObject(
-  IN PVOID  Object,
-  IN KWAIT_REASON  WaitReason,
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL);
+  __W32_IN PVOID  Object,
+  __W32_IN KWAIT_REASON  WaitReason,
+  __W32_IN KPROCESSOR_MODE  WaitMode,
+  __W32_IN BOOLEAN  Alertable,
+  __W32_IN PLARGE_INTEGER  Timeout  __W32_OPTIONAL);
 
 #if defined(_X86_)
 
@@ -7704,13 +7704,13 @@
 VOID
 FASTCALL
 KfLowerIrql(
-  IN KIRQL  NewIrql);
+  __W32_IN KIRQL  NewIrql);
 
 NTOSAPI
 KIRQL
 FASTCALL
 KfRaiseIrql(
-  IN KIRQL  NewIrql);
+  __W32_IN KIRQL  NewIrql);
 
 #define KeLowerIrql(a) KfLowerIrql(a)
 #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a)
@@ -7721,13 +7721,13 @@
 VOID
 DDKAPI
 KeLowerIrql(
-  IN KIRQL  NewIrql);
+  __W32_IN KIRQL  NewIrql);
 
 NTOSAPI
 KIRQL
 DDKAPI
 KeRaiseIrql(
-  IN KIRQL  NewIrql);
+  __W32_IN KIRQL  NewIrql);
 
 #endif
 
@@ -7743,66 +7743,66 @@
 NTSTATUS
 DDKAPI
 MmAdvanceMdl(
-  IN PMDL  Mdl,
-  IN ULONG  NumberOfBytes);
+  __W32_IN PMDL  Mdl,
+  __W32_IN ULONG  NumberOfBytes);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmAllocateContiguousMemory(
-  IN ULONG  NumberOfBytes,
-  IN PHYSICAL_ADDRESS  HighestAcceptableAddress);
+  __W32_IN ULONG  NumberOfBytes,
+  __W32_IN PHYSICAL_ADDRESS  HighestAcceptableAddress);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmAllocateContiguousMemorySpecifyCache(
-  IN SIZE_T  NumberOfBytes,
-  IN PHYSICAL_ADDRESS  LowestAcceptableAddress,
-  IN PHYSICAL_ADDRESS  HighestAcceptableAddress,
-  IN PHYSICAL_ADDRESS  BoundaryAddressMultiple  OPTIONAL,
-  IN MEMORY_CACHING_TYPE  CacheType);
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN PHYSICAL_ADDRESS  LowestAcceptableAddress,
+  __W32_IN PHYSICAL_ADDRESS  HighestAcceptableAddress,
+  __W32_IN PHYSICAL_ADDRESS  BoundaryAddressMultiple  __W32_OPTIONAL,
+  __W32_IN MEMORY_CACHING_TYPE  CacheType);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmAllocateMappingAddress(
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  PoolTag);
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN ULONG  PoolTag);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmAllocateNonCachedMemory(
-  IN ULONG  NumberOfBytes);
+  __W32_IN ULONG  NumberOfBytes);
 
 NTOSAPI
 PMDL
 DDKAPI
 MmAllocatePagesForMdl(
-  IN PHYSICAL_ADDRESS  LowAddress,
-  IN PHYSICAL_ADDRESS  HighAddress,
-  IN PHYSICAL_ADDRESS  SkipBytes,
-  IN SIZE_T  TotalBytes);
+  __W32_IN PHYSICAL_ADDRESS  LowAddress,
+  __W32_IN PHYSICAL_ADDRESS  HighAddress,
+  __W32_IN PHYSICAL_ADDRESS  SkipBytes,
+  __W32_IN SIZE_T  TotalBytes);
 
 NTOSAPI
 VOID
 DDKAPI
 MmBuildMdlForNonPagedPool(
-  IN OUT PMDL  MemoryDescriptorList);
+  __W32_IN __W32_OUT PMDL  MemoryDescriptorList);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmCreateSection(
-  OUT PSECTION_OBJECT  *SectionObject,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes  OPTIONAL,
-  IN PLARGE_INTEGER  MaximumSize,
-  IN ULONG  SectionPageProtection,
-  IN ULONG  AllocationAttributes,
-  IN HANDLE  FileHandle  OPTIONAL,
-  IN PFILE_OBJECT  File  OPTIONAL);
+  __W32_OUT PSECTION_OBJECT  *SectionObject,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes  __W32_OPTIONAL,
+  __W32_IN PLARGE_INTEGER  MaximumSize,
+  __W32_IN ULONG  SectionPageProtection,
+  __W32_IN ULONG  AllocationAttributes,
+  __W32_IN HANDLE  FileHandle  __W32_OPTIONAL,
+  __W32_IN PFILE_OBJECT  File  __W32_OPTIONAL);
 
 typedef enum _MMFLUSH_TYPE {
   MmFlushForDelete,
@@ -7813,47 +7813,47 @@
 BOOLEAN
 DDKAPI
 MmFlushImageSection(
-  IN PSECTION_OBJECT_POINTERS  SectionObjectPointer,
-  IN MMFLUSH_TYPE  FlushType);
+  __W32_IN PSECTION_OBJECT_POINTERS  SectionObjectPointer,
+  __W32_IN MMFLUSH_TYPE  FlushType);
 
 NTOSAPI
 VOID
 DDKAPI
 MmFreeContiguousMemory(
-  IN PVOID  BaseAddress);
+  __W32_IN PVOID  BaseAddress);
 
 NTOSAPI
 VOID
 DDKAPI
 MmFreeContiguousMemorySpecifyCache(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes,
-  IN MEMORY_CACHING_TYPE  CacheType);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN MEMORY_CACHING_TYPE  CacheType);
 
 NTOSAPI
 VOID
 DDKAPI
 MmFreeMappingAddress(
-  IN PVOID  BaseAddress,
-  IN ULONG  PoolTag);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN ULONG  PoolTag);
 
 NTOSAPI
 VOID
 DDKAPI
 MmFreeNonCachedMemory(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN SIZE_T  NumberOfBytes);
 
 NTOSAPI
 VOID
 DDKAPI
 MmFreePagesFromMdl(
-  IN PMDL  MemoryDescriptorList);
+  __W32_IN PMDL  MemoryDescriptorList);
 
 /*
  * ULONG
  * MmGetMdlByteCount(
- *   IN PMDL  Mdl)
+ *   __W32_IN PMDL  Mdl)
  */
 #define MmGetMdlByteCount(_Mdl) \
   ((_Mdl)->ByteCount)
@@ -7861,7 +7861,7 @@
 /*
  * ULONG
  * MmGetMdlByteOffset(
- *   IN PMDL  Mdl)
+ *   __W32_IN PMDL  Mdl)
  */
 #define MmGetMdlByteOffset(_Mdl) \
   ((_Mdl)->ByteOffset)
@@ -7869,7 +7869,7 @@
 /*
  * PPFN_NUMBER
  * MmGetMdlPfnArray(
- *   IN PMDL  Mdl)
+ *   __W32_IN PMDL  Mdl)
  */
 #define MmGetMdlPfnArray(_Mdl) \
   ((PPFN_NUMBER) ((_Mdl) + 1))
@@ -7877,7 +7877,7 @@
 /*
  * PVOID
  * MmGetMdlVirtualAddress(
- *   IN PMDL  Mdl)
+ *   __W32_IN PMDL  Mdl)
  */
 #define MmGetMdlVirtualAddress(_Mdl) \
   ((PVOID) ((PCHAR) ((_Mdl)->StartVa) + (_Mdl)->ByteOffset))
@@ -7886,7 +7886,7 @@
 PHYSICAL_ADDRESS
 DDKAPI
 MmGetPhysicalAddress(
-  IN PVOID  BaseAddress);
+  __W32_IN PVOID  BaseAddress);
 
 NTOSAPI
 PPHYSICAL_MEMORY_RANGE
@@ -7898,79 +7898,79 @@
 PVOID
 DDKAPI
 MmGetVirtualForPhysical(
-  IN PHYSICAL_ADDRESS  PhysicalAddress);
+  __W32_IN PHYSICAL_ADDRESS  PhysicalAddress);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmMapLockedPagesSpecifyCache(
-  IN PMDL  MemoryDescriptorList,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN MEMORY_CACHING_TYPE  CacheType,
-  IN PVOID  BaseAddress,
-  IN ULONG  BugCheckOnFailure,
-  IN MM_PAGE_PRIORITY  Priority);
+  __W32_IN PMDL  MemoryDescriptorList,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_IN MEMORY_CACHING_TYPE  CacheType,
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN ULONG  BugCheckOnFailure,
+  __W32_IN MM_PAGE_PRIORITY  Priority);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmMapLockedPagesWithReservedMapping(
-  IN PVOID  MappingAddress,
-  IN ULONG  PoolTag,
-  IN PMDL  MemoryDescriptorList,
-  IN MEMORY_CACHING_TYPE  CacheType);
+  __W32_IN PVOID  MappingAddress,
+  __W32_IN ULONG  PoolTag,
+  __W32_IN PMDL  MemoryDescriptorList,
+  __W32_IN MEMORY_CACHING_TYPE  CacheType);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmMapUserAddressesToPage(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes,
-  IN PVOID  PageAddress);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN PVOID  PageAddress);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmMapVideoDisplay(
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN SIZE_T  NumberOfBytes,
-  IN MEMORY_CACHING_TYPE  CacheType);
+  __W32_IN PHYSICAL_ADDRESS  PhysicalAddress,
+  __W32_IN SIZE_T  NumberOfBytes,
+  __W32_IN MEMORY_CACHING_TYPE  CacheType);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmMapViewInSessionSpace(
-  IN PVOID  Section,
-  OUT PVOID  *MappedBase,
-  IN OUT PSIZE_T  ViewSize);
+  __W32_IN PVOID  Section,
+  __W32_OUT PVOID  *MappedBase,
+  __W32_IN __W32_OUT PSIZE_T  ViewSize);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmMapViewInSystemSpace(
-  IN PVOID  Section,
-  OUT PVOID  *MappedBase,
-  IN PSIZE_T  ViewSize);
+  __W32_IN PVOID  Section,
+  __W32_OUT PVOID  *MappedBase,
+  __W32_IN PSIZE_T  ViewSize);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmMarkPhysicalMemoryAsBad(
-  IN PPHYSICAL_ADDRESS  StartAddress,
-  IN OUT PLARGE_INTEGER  NumberOfBytes);
+  __W32_IN PPHYSICAL_ADDRESS  StartAddress,
+  __W32_IN __W32_OUT PLARGE_INTEGER  NumberOfBytes);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmMarkPhysicalMemoryAsGood(
-  IN PPHYSICAL_ADDRESS  StartAddress,
-  IN OUT PLARGE_INTEGER  NumberOfBytes);
+  __W32_IN PPHYSICAL_ADDRESS  StartAddress,
+  __W32_IN __W32_OUT PLARGE_INTEGER  NumberOfBytes);
 
 /*
  * PVOID
  * MmGetSystemAddressForMdlSafe(
- *   IN PMDL  Mdl,
- *   IN MM_PAGE_PRIORITY  Priority)
+ *   __W32_IN PMDL  Mdl,
+ *   __W32_IN MM_PAGE_PRIORITY  Priority)
  */
 #define MmGetSystemAddressForMdlSafe(_Mdl, _Priority) \
   ((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \
@@ -7983,13 +7983,13 @@
 PVOID
 DDKAPI
 MmGetSystemRoutineAddress(
-  IN PUNICODE_STRING  SystemRoutineName);
+  __W32_IN PUNICODE_STRING  SystemRoutineName);
 
 /*
  * ULONG
  * ADDRESS_AND_SIZE_TO_SPAN_PAGES(
- *   IN PVOID  Va,
- *   IN ULONG  Size)
+ *   __W32_IN PVOID  Va,
+ *   __W32_IN ULONG  Size)
  */
 #define ADDRESS_AND_SIZE_TO_SPAN_PAGES(_Va, \
                                        _Size) \
@@ -7999,9 +7999,9 @@
 /*
  * VOID
  * MmInitializeMdl(
- *   IN PMDL  MemoryDescriptorList,
- *   IN PVOID  BaseVa,
- *   IN SIZE_T  Length)
+ *   __W32_IN PMDL  MemoryDescriptorList,
+ *   __W32_IN PVOID  BaseVa,
+ *   __W32_IN SIZE_T  Length)
  */
 #define MmInitializeMdl(_MemoryDescriptorList, \
                         _BaseVa, \
@@ -8020,13 +8020,13 @@
 BOOLEAN
 DDKAPI
 MmIsAddressValid(
-  IN PVOID  VirtualAddress);
+  __W32_IN PVOID  VirtualAddress);
 
 NTOSAPI
 LOGICAL
 DDKAPI
 MmIsDriverVerifying(
-  IN PDRIVER_OBJECT  DriverObject);
+  __W32_IN PDRIVER_OBJECT  DriverObject);
 
 NTOSAPI
 BOOLEAN
@@ -8038,24 +8038,24 @@
 NTSTATUS
 DDKAPI
 MmIsVerifierEnabled(
-  OUT PULONG  VerifierFlags);
+  __W32_OUT PULONG  VerifierFlags);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmLockPagableDataSection(
-  IN PVOID  AddressWithinSection);
+  __W32_IN PVOID  AddressWithinSection);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmLockPagableImageSection(
-  IN PVOID  AddressWithinSection);
+  __W32_IN PVOID  AddressWithinSection);
 
 /*
  * PVOID
  * MmLockPagableCodeSection(
- *   IN PVOID  AddressWithinSection)
+ *   __W32_IN PVOID  AddressWithinSection)
  */
 #define MmLockPagableCodeSection MmLockPagableDataSection
 
@@ -8063,74 +8063,74 @@
 VOID
 DDKAPI
 MmLockPagableSectionByHandle(
-  IN PVOID  ImageSectionHandle);
+  __W32_IN PVOID  ImageSectionHandle);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmMapIoSpace(
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN ULONG  NumberOfBytes,
-  IN MEMORY_CACHING_TYPE  CacheEnable);
+  __W32_IN PHYSICAL_ADDRESS  PhysicalAddress,
+  __W32_IN ULONG  NumberOfBytes,
+  __W32_IN MEMORY_CACHING_TYPE  CacheEnable);
 
 NTOSAPI
 PVOID
 DDKAPI
 MmMapLockedPages(
-  IN PMDL  MemoryDescriptorList,
-  IN KPROCESSOR_MODE  AccessMode);
+  __W32_IN PMDL  MemoryDescriptorList,
+  __W32_IN KPROCESSOR_MODE  AccessMode);
 
 NTOSAPI
 VOID
 DDKAPI
 MmPageEntireDriver(
-  IN PVOID  AddressWithinSection);
+  __W32_IN PVOID  AddressWithinSection);
 
 NTOSAPI
 VOID
 DDKAPI
 MmProbeAndLockProcessPages(
-  IN OUT PMDL  MemoryDescriptorList,
-  IN PEPROCESS  Process,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN LOCK_OPERATION  Operation);
+  __W32_IN __W32_OUT PMDL  MemoryDescriptorList,
+  __W32_IN PEPROCESS  Process,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_IN LOCK_OPERATION  Operation);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmProtectMdlSystemAddress(
-  IN PMDL  MemoryDescriptorList,
-  IN ULONG  NewProtect);
+  __W32_IN PMDL  MemoryDescriptorList,
+  __W32_IN ULONG  NewProtect);
 
 NTOSAPI
 VOID
 DDKAPI
 MmUnmapLockedPages(
-  IN PVOID  BaseAddress,
-  IN PMDL  MemoryDescriptorList);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN PMDL  MemoryDescriptorList);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmUnmapViewInSessionSpace(
-  IN PVOID  MappedBase);
+  __W32_IN PVOID  MappedBase);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 MmUnmapViewInSystemSpace(
-  IN PVOID MappedBase);
+  __W32_IN PVOID MappedBase);
 
 NTOSAPI
 VOID
 DDKAPI
 MmUnsecureVirtualMemory(
-  IN HANDLE  SecureHandle);
+  __W32_IN HANDLE  SecureHandle);
 
 /*
  * VOID
  * MmPrepareMdlForReuse(
- *   IN PMDL  Mdl)
+ *   __W32_IN PMDL  Mdl)
  */
 #define MmPrepareMdlForReuse(_Mdl) \
 { \
@@ -8146,9 +8146,9 @@
 VOID
 DDKAPI
 MmProbeAndLockPages(
-  IN OUT PMDL  MemoryDescriptorList,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN LOCK_OPERATION  Operation);
+  __W32_IN __W32_OUT PMDL  MemoryDescriptorList,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_IN LOCK_OPERATION  Operation);
 
 NTOSAPI
 MM_SYSTEM_SIZE
@@ -8160,63 +8160,63 @@
 NTSTATUS
 DDKAPI
 MmRemovePhysicalMemory(
-  IN PPHYSICAL_ADDRESS  StartAddress,
-  IN OUT PLARGE_INTEGER  NumberOfBytes);
+  __W32_IN PPHYSICAL_ADDRESS  StartAddress,
+  __W32_IN __W32_OUT PLARGE_INTEGER  NumberOfBytes);
 
 NTOSAPI
 VOID
 DDKAPI
 MmResetDriverPaging(
-  IN PVOID  AddressWithinSection);
+  __W32_IN PVOID  AddressWithinSection);
 
 NTOSAPI
 HANDLE
 DDKAPI
 MmSecureVirtualMemory(
-  IN PVOID  Address,
-  IN SIZE_T  Size,
-  IN ULONG  ProbeMode);
+  __W32_IN PVOID  Address,
+  __W32_IN SIZE_T  Size,
+  __W32_IN ULONG  ProbeMode);
 
 NTOSAPI
 ULONG
 DDKAPI
 MmSizeOfMdl(
-  IN PVOID  Base,
-  IN SIZE_T  Length);
+  __W32_IN PVOID  Base,
+  __W32_IN SIZE_T  Length);
 
 NTOSAPI
 VOID
 DDKAPI
 MmUnlockPagableImageSection(
-  IN PVOID  ImageSectionHandle);
+  __W32_IN PVOID  ImageSectionHandle);
 
 NTOSAPI
 VOID
 DDKAPI
 MmUnlockPages(
-  IN PMDL  MemoryDescriptorList);
+  __W32_IN PMDL  MemoryDescriptorList);
 
 NTOSAPI
 VOID
 DDKAPI
 MmUnmapIoSpace(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN SIZE_T  NumberOfBytes);
 
 NTOSAPI
 VOID
 DDKAPI
 MmUnmapReservedMapping(
-  IN PVOID  BaseAddress,
-  IN ULONG  PoolTag,
-  IN PMDL  MemoryDescriptorList);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN ULONG  PoolTag,
+  __W32_IN PMDL  MemoryDescriptorList);
 
 NTOSAPI
 VOID
 DDKAPI
 MmUnmapVideoDisplay(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes);
+  __W32_IN PVOID  BaseAddress,
+  __W32_IN SIZE_T  NumberOfBytes);
 
 
 
@@ -8226,10 +8226,10 @@
 NTSTATUS
 DDKAPI
 ObAssignSecurity(
-  IN PACCESS_STATE  AccessState,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN PVOID  Object,
-  IN POBJECT_TYPE  Type);
+  __W32_IN PACCESS_STATE  AccessState,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN PVOID  Object,
+  __W32_IN POBJECT_TYPE  Type);
 
 NTOSAPI
 VOID
@@ -8242,12 +8242,12 @@
 VOID
 DDKFASTAPI
 ObfDereferenceObject(
-  IN PVOID  Object);
+  __W32_IN PVOID  Object);
 
 /*
  * VOID
  * ObDereferenceObject(
- *   IN PVOID  Object)
+ *   __W32_IN PVOID  Object)
  */
 #define ObDereferenceObject ObfDereferenceObject
 
@@ -8255,38 +8255,38 @@
 NTSTATUS
 DDKAPI
 ObGetObjectSecurity(
-  IN PVOID  Object,
-  OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor,
-  OUT PBOOLEAN  MemoryAllocated); 
+  __W32_IN PVOID  Object,
+  __W32_OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor,
+  __W32_OUT PBOOLEAN  MemoryAllocated);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObInsertObject(
-  IN PVOID  Object,
-  IN PACCESS_STATE  PassedAccessState  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  AdditionalReferences,
-  OUT PVOID*  ReferencedObject  OPTIONAL,
-  OUT PHANDLE  Handle);
+  __W32_IN PVOID  Object,
+  __W32_IN PACCESS_STATE  PassedAccessState  __W32_OPTIONAL,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN ULONG  AdditionalReferences,
+  __W32_OUT PVOID*  ReferencedObject  __W32_OPTIONAL,
+  __W32_OUT PHANDLE  Handle);
 
 NTOSAPI
 VOID
 DDKFASTAPI
 ObfReferenceObject(
-  IN PVOID  Object);
+  __W32_IN PVOID  Object);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObLogSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  InputSecurityDescriptor,
-  OUT PSECURITY_DESCRIPTOR  *OutputSecurityDescriptor,
-  IN ULONG RefBias);
+  __W32_IN PSECURITY_DESCRIPTOR  InputSecurityDescriptor,
+  __W32_OUT PSECURITY_DESCRIPTOR  *OutputSecurityDescriptor,
+  __W32_IN ULONG RefBias);
 /*
  * VOID
  * ObReferenceObject(
- *   IN PVOID  Object)
+ *   __W32_IN PVOID  Object)
  */
 #define ObReferenceObject ObfReferenceObject
 
@@ -8294,85 +8294,85 @@
 VOID
 DDKAPI
 ObMakeTemporaryObject(
-  IN PVOID  Object);
+  __W32_IN PVOID  Object);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObOpenObjectByName(
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN POBJECT_TYPE  ObjectType,
-  IN OUT PVOID  ParseContext  OPTIONAL,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN ACCESS_MASK  DesiredAccess,
-  IN PACCESS_STATE  PassedAccessState,
-  OUT PHANDLE  Handle);
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN POBJECT_TYPE  ObjectType,
+  __W32_IN __W32_OUT PVOID  ParseContext  __W32_OPTIONAL,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN PACCESS_STATE  PassedAccessState,
+  __W32_OUT PHANDLE  Handle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObOpenObjectByPointer(
-  IN PVOID  Object,
-  IN ULONG  HandleAttributes,
-  IN PACCESS_STATE  PassedAccessState  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess  OPTIONAL,
-  IN POBJECT_TYPE  ObjectType  OPTIONAL,
-  IN KPROCESSOR_MODE  AccessMode,
-  OUT PHANDLE  Handle);
+  __W32_IN PVOID  Object,
+  __W32_IN ULONG  HandleAttributes,
+  __W32_IN PACCESS_STATE  PassedAccessState  __W32_OPTIONAL,
+  __W32_IN ACCESS_MASK  DesiredAccess  __W32_OPTIONAL,
+  __W32_IN POBJECT_TYPE  ObjectType  __W32_OPTIONAL,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_OUT PHANDLE  Handle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObQueryObjectAuditingByHandle(
-  IN HANDLE  Handle,
-  OUT PBOOLEAN  GenerateOnClose);
+  __W32_IN HANDLE  Handle,
+  __W32_OUT PBOOLEAN  GenerateOnClose);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObReferenceObjectByHandle(
-  IN HANDLE  Handle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_TYPE  ObjectType  OPTIONAL,
-  IN KPROCESSOR_MODE  AccessMode,
-  OUT PVOID  *Object,
-  OUT POBJECT_HANDLE_INFORMATION  HandleInformation  OPTIONAL);
+  __W32_IN HANDLE  Handle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_TYPE  ObjectType  __W32_OPTIONAL,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_OUT PVOID  *Object,
+  __W32_OUT POBJECT_HANDLE_INFORMATION  HandleInformation  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObReferenceObjectByName(
-  IN PUNICODE_STRING  ObjectPath,
-  IN ULONG  Attributes,
-  IN PACCESS_STATE  PassedAccessState  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess  OPTIONAL,
-  IN POBJECT_TYPE  ObjectType,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN OUT PVOID  ParseContext  OPTIONAL,
-  OUT PVOID  *Object);
+  __W32_IN PUNICODE_STRING  ObjectPath,
+  __W32_IN ULONG  Attributes,
+  __W32_IN PACCESS_STATE  PassedAccessState  __W32_OPTIONAL,
+  __W32_IN ACCESS_MASK  DesiredAccess  __W32_OPTIONAL,
+  __W32_IN POBJECT_TYPE  ObjectType,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_IN __W32_OUT PVOID  ParseContext  __W32_OPTIONAL,
+  __W32_OUT PVOID  *Object);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ObReferenceObjectByPointer(
-  IN PVOID  Object,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_TYPE  ObjectType,
-  IN KPROCESSOR_MODE  AccessMode);
+  __W32_IN PVOID  Object,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_TYPE  ObjectType,
+  __W32_IN KPROCESSOR_MODE  AccessMode);
 
 NTOSAPI
 VOID
 DDKAPI
 ObReferenceSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  Count);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN ULONG  Count);
 
 NTOSAPI
 VOID
 DDKAPI
 ObReleaseObjectSecurity(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN BOOLEAN  MemoryAllocated);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN BOOLEAN  MemoryAllocated);
 
 
 
@@ -8382,21 +8382,21 @@
 NTSTATUS
 DDKAPI
 PsCreateSystemProcess(
-  IN PHANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_IN PHANDLE  ProcessHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PsCreateSystemThread(
-  OUT PHANDLE  ThreadHandle,
-  IN ULONG  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes  OPTIONAL,
-  IN HANDLE  ProcessHandle  OPTIONAL,
-  OUT PCLIENT_ID  ClientId  OPTIONAL,
-  IN PKSTART_ROUTINE  StartRoutine,
-  IN PVOID  StartContext);
+  __W32_OUT PHANDLE  ThreadHandle,
+  __W32_IN ULONG  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes  __W32_OPTIONAL,
+  __W32_IN HANDLE  ProcessHandle  __W32_OPTIONAL,
+  __W32_OUT PCLIENT_ID  ClientId  __W32_OPTIONAL,
+  __W32_IN PKSTART_ROUTINE  StartRoutine,
+  __W32_IN PVOID  StartContext);
 
 /*
  * PEPROCESS
@@ -8427,47 +8427,47 @@
 BOOLEAN
 DDKAPI
 PsGetVersion(
-  PULONG  MajorVersion  OPTIONAL,
-  PULONG  MinorVersion  OPTIONAL,
-  PULONG  BuildNumber  OPTIONAL,
-  PUNICODE_STRING  CSDVersion  OPTIONAL);
+  PULONG  MajorVersion  __W32_OPTIONAL,
+  PULONG  MinorVersion  __W32_OPTIONAL,
+  PULONG  BuildNumber  __W32_OPTIONAL,
+  PUNICODE_STRING  CSDVersion  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PsRemoveCreateThreadNotifyRoutine(
-  IN PCREATE_THREAD_NOTIFY_ROUTINE  NotifyRoutine);
+  __W32_IN PCREATE_THREAD_NOTIFY_ROUTINE  NotifyRoutine);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PsRemoveLoadImageNotifyRoutine(
-  IN PLOAD_IMAGE_NOTIFY_ROUTINE  NotifyRoutine);
+  __W32_IN PLOAD_IMAGE_NOTIFY_ROUTINE  NotifyRoutine);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PsSetCreateProcessNotifyRoutine(
-  IN PCREATE_PROCESS_NOTIFY_ROUTINE  NotifyRoutine,
-  IN BOOLEAN  Remove);
+  __W32_IN PCREATE_PROCESS_NOTIFY_ROUTINE  NotifyRoutine,
+  __W32_IN BOOLEAN  Remove);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PsSetCreateThreadNotifyRoutine(
-  IN PCREATE_THREAD_NOTIFY_ROUTINE  NotifyRoutine);
+  __W32_IN PCREATE_THREAD_NOTIFY_ROUTINE  NotifyRoutine);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PsSetLoadImageNotifyRoutine(
-  IN PLOAD_IMAGE_NOTIFY_ROUTINE  NotifyRoutine);
+  __W32_IN PLOAD_IMAGE_NOTIFY_ROUTINE  NotifyRoutine);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PsTerminateSystemThread(
-  IN NTSTATUS  ExitStatus);
+  __W32_IN NTSTATUS  ExitStatus);
 
 
 
@@ -8477,48 +8477,48 @@
 BOOLEAN
 DDKAPI
 SeAccessCheck(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN PSECURITY_SUBJECT_CONTEXT  SubjectSecurityContext,
-  IN BOOLEAN  SubjectContextLocked,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ACCESS_MASK  PreviouslyGrantedAccess,
-  OUT PPRIVILEGE_SET  *Privileges  OPTIONAL,
-  IN PGENERIC_MAPPING  GenericMapping,
-  IN KPROCESSOR_MODE  AccessMode,
-  OUT PACCESS_MASK  GrantedAccess,
-  OUT PNTSTATUS  AccessStatus);
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
+  __W32_IN PSECURITY_SUBJECT_CONTEXT  SubjectSecurityContext,
+  __W32_IN BOOLEAN  SubjectContextLocked,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN ACCESS_MASK  PreviouslyGrantedAccess,
+  __W32_OUT PPRIVILEGE_SET  *Privileges  __W32_OPTIONAL,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN KPROCESSOR_MODE  AccessMode,
+  __W32_OUT PACCESS_MASK  GrantedAccess,
+  __W32_OUT PNTSTATUS  AccessStatus);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 SeAssignSecurity(
-  IN PSECURITY_DESCRIPTOR  ParentDescriptor  OPTIONAL,
-  IN PSECURITY_DESCRIPTOR  ExplicitDescriptor  OPTIONAL,
-  OUT PSECURITY_DESCRIPTOR  *NewDescriptor,
-  IN BOOLEAN  IsDirectoryObject,
-  IN PSECURITY_SUBJECT_CONTEXT  SubjectContext,
-  IN PGENERIC_MAPPING  GenericMapping,
-  IN POOL_TYPE  PoolType);
+  __W32_IN PSECURITY_DESCRIPTOR  ParentDescriptor  __W32_OPTIONAL,
+  __W32_IN PSECURITY_DESCRIPTOR  ExplicitDescriptor  __W32_OPTIONAL,
+  __W32_OUT PSECURITY_DESCRIPTOR  *NewDescriptor,
+  __W32_IN BOOLEAN  IsDirectoryObject,
+  __W32_IN PSECURITY_SUBJECT_CONTEXT  SubjectContext,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN POOL_TYPE  PoolType);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 SeAssignSecurityEx(
-  IN PSECURITY_DESCRIPTOR  ParentDescriptor  OPTIONAL,
-  IN PSECURITY_DESCRIPTOR  ExplicitDescriptor  OPTIONAL,
-  OUT PSECURITY_DESCRIPTOR  *NewDescriptor,
-  IN GUID  *ObjectType  OPTIONAL,
-  IN BOOLEAN  IsDirectoryObject,
-  IN ULONG  AutoInheritFlags,
-  IN PSECURITY_SUBJECT_CONTEXT  SubjectContext,
-  IN PGENERIC_MAPPING  GenericMapping,
-  IN POOL_TYPE  PoolType);
+  __W32_IN PSECURITY_DESCRIPTOR  ParentDescriptor  __W32_OPTIONAL,
+  __W32_IN PSECURITY_DESCRIPTOR  ExplicitDescriptor  __W32_OPTIONAL,
+  __W32_OUT PSECURITY_DESCRIPTOR  *NewDescriptor,
+  __W32_IN GUID  *ObjectType  __W32_OPTIONAL,
+  __W32_IN BOOLEAN  IsDirectoryObject,
+  __W32_IN ULONG  AutoInheritFlags,
+  __W32_IN PSECURITY_SUBJECT_CONTEXT  SubjectContext,
+  __W32_IN PGENERIC_MAPPING  GenericMapping,
+  __W32_IN POOL_TYPE  PoolType);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 SeDeassignSecurity(
-  IN OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor);
+  __W32_IN __W32_OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor);
 
 NTOSAPI
 BOOLEAN
@@ -8531,8 +8531,8 @@
 BOOLEAN
 DDKAPI
 SeValidSecurityDescriptor(
-  IN ULONG  Length,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
+  __W32_IN ULONG  Length,
+  __W32_IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
 
 
 
@@ -8542,20 +8542,20 @@
 NTSTATUS
 DDKAPI
 NtOpenProcess(
-  OUT PHANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PCLIENT_ID  ClientId  OPTIONAL);
+  __W32_OUT PHANDLE  ProcessHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN PCLIENT_ID  ClientId  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtQueryInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  OUT PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength,
-  OUT PULONG  ReturnLength OPTIONAL);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PROCESSINFOCLASS  ProcessInformationClass,
+  __W32_OUT PVOID  ProcessInformation,
+  __W32_IN ULONG  ProcessInformationLength,
+  __W32_OUT PULONG  ReturnLength __W32_OPTIONAL);
 
 
 
@@ -8565,369 +8565,369 @@
 NTSTATUS
 DDKAPI
 ZwCancelTimer(
-  IN HANDLE  TimerHandle,
-  OUT PBOOLEAN  CurrentState  OPTIONAL);
+  __W32_IN HANDLE  TimerHandle,
+  __W32_OUT PBOOLEAN  CurrentState  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtClose(
-  IN HANDLE  Handle);
+  __W32_IN HANDLE  Handle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwClose(
-  IN HANDLE  Handle);
+  __W32_IN HANDLE  Handle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwCreateDirectoryObject(
-  OUT PHANDLE  DirectoryHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  DirectoryHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtCreateEvent(
-  OUT PHANDLE  EventHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  ManualReset,
-  IN BOOLEAN  InitialState);
+  __W32_OUT PHANDLE  EventHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN BOOLEAN  ManualReset,
+  __W32_IN BOOLEAN  InitialState);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwCreateEvent(
-  OUT PHANDLE  EventHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  ManualReset,
-  IN BOOLEAN  InitialState);
+  __W32_OUT PHANDLE  EventHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN BOOLEAN  ManualReset,
+  __W32_IN BOOLEAN  InitialState);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwCreateFile(
-  OUT PHANDLE  FileHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PLARGE_INTEGER  AllocationSize  OPTIONAL,
-  IN ULONG  FileAttributes,
-  IN ULONG  ShareAccess,
-  IN ULONG  CreateDisposition,
-  IN ULONG  CreateOptions,
-  IN PVOID  EaBuffer  OPTIONAL,
-  IN ULONG  EaLength);
+  __W32_OUT PHANDLE  FileHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN PLARGE_INTEGER  AllocationSize  __W32_OPTIONAL,
+  __W32_IN ULONG  FileAttributes,
+  __W32_IN ULONG  ShareAccess,
+  __W32_IN ULONG  CreateDisposition,
+  __W32_IN ULONG  CreateOptions,
+  __W32_IN PVOID  EaBuffer  __W32_OPTIONAL,
+  __W32_IN ULONG  EaLength);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwCreateKey(
-  OUT PHANDLE  KeyHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN ULONG  TitleIndex,
-  IN PUNICODE_STRING  Class  OPTIONAL,
-  IN ULONG  CreateOptions,
-  OUT PULONG  Disposition  OPTIONAL);
+  __W32_OUT PHANDLE  KeyHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_IN ULONG  TitleIndex,
+  __W32_IN PUNICODE_STRING  Class  __W32_OPTIONAL,
+  __W32_IN ULONG  CreateOptions,
+  __W32_OUT PULONG  Disposition  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwCreateTimer(
-  OUT PHANDLE  TimerHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes  OPTIONAL,
-  IN TIMER_TYPE  TimerType);
+  __W32_OUT PHANDLE  TimerHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes  __W32_OPTIONAL,
+  __W32_IN TIMER_TYPE  TimerType);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwDeleteKey(
-  IN HANDLE  KeyHandle);
+  __W32_IN HANDLE  KeyHandle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwDeleteValueKey(
-  IN HANDLE  KeyHandle,
-  IN PUNICODE_STRING  ValueName);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN PUNICODE_STRING  ValueName);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtDeviceIoControlFile(
-  IN HANDLE  DeviceHandle,
-  IN HANDLE  Event  OPTIONAL, 
-  IN PIO_APC_ROUTINE  UserApcRoutine  OPTIONAL, 
-  IN PVOID  UserApcContext  OPTIONAL, 
-  OUT PIO_STATUS_BLOCK  IoStatusBlock, 
-  IN ULONG  IoControlCode,
-  IN PVOID  InputBuffer, 
-  IN ULONG  InputBufferSize,
-  OUT PVOID  OutputBuffer,
-  IN ULONG  OutputBufferSize);
+  __W32_IN HANDLE  DeviceHandle,
+  __W32_IN HANDLE  Event  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  UserApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  UserApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN ULONG  IoControlCode,
+  __W32_IN PVOID  InputBuffer,
+  __W32_IN ULONG  InputBufferSize,
+  __W32_OUT PVOID  OutputBuffer,
+  __W32_IN ULONG  OutputBufferSize);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwDeviceIoControlFile(
-  IN HANDLE  DeviceHandle,
-  IN HANDLE  Event  OPTIONAL, 
-  IN PIO_APC_ROUTINE  UserApcRoutine  OPTIONAL, 
-  IN PVOID  UserApcContext  OPTIONAL, 
-  OUT PIO_STATUS_BLOCK  IoStatusBlock, 
-  IN ULONG  IoControlCode,
-  IN PVOID  InputBuffer, 
-  IN ULONG  InputBufferSize,
-  OUT PVOID  OutputBuffer,
-  IN ULONG  OutputBufferSize);
+  __W32_IN HANDLE  DeviceHandle,
+  __W32_IN HANDLE  Event  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  UserApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  UserApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN ULONG  IoControlCode,
+  __W32_IN PVOID  InputBuffer,
+  __W32_IN ULONG  InputBufferSize,
+  __W32_OUT PVOID  OutputBuffer,
+  __W32_IN ULONG  OutputBufferSize);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwEnumerateKey(
-  IN HANDLE  KeyHandle,
-  IN ULONG  Index,
-  IN KEY_INFORMATION_CLASS  KeyInformationClass,
-  OUT PVOID  KeyInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN ULONG  Index,
+  __W32_IN KEY_INFORMATION_CLASS  KeyInformationClass,
+  __W32_OUT PVOID  KeyInformation,
+  __W32_IN ULONG  Length,
+  __W32_OUT PULONG  ResultLength);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwEnumerateValueKey(
-  IN HANDLE  KeyHandle,
-  IN ULONG  Index,
-  IN KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
-  OUT PVOID  KeyValueInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN ULONG  Index,
+  __W32_IN KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
+  __W32_OUT PVOID  KeyValueInformation,
+  __W32_IN ULONG  Length,
+  __W32_OUT PULONG  ResultLength);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwFlushKey(
-  IN HANDLE  KeyHandle);
+  __W32_IN HANDLE  KeyHandle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwMakeTemporaryObject(
-  IN HANDLE  Handle);
+  __W32_IN HANDLE  Handle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtMapViewOfSection(
-  IN HANDLE  SectionHandle,
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN ULONG  CommitSize,
-  IN OUT PLARGE_INTEGER  SectionOffset  OPTIONAL,
-  IN OUT PSIZE_T  ViewSize,
-  IN SECTION_INHERIT  InheritDisposition,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
+  __W32_IN HANDLE  SectionHandle,
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN ULONG  ZeroBits,
+  __W32_IN ULONG  CommitSize,
+  __W32_IN __W32_OUT PLARGE_INTEGER  SectionOffset  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PSIZE_T  ViewSize,
+  __W32_IN SECTION_INHERIT  InheritDisposition,
+  __W32_IN ULONG  AllocationType,
+  __W32_IN ULONG  Protect);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwMapViewOfSection(
-  IN HANDLE  SectionHandle,
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN ULONG  CommitSize,
-  IN OUT PLARGE_INTEGER  SectionOffset  OPTIONAL,
-  IN OUT PSIZE_T  ViewSize,
-  IN SECTION_INHERIT  InheritDisposition,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
+  __W32_IN HANDLE  SectionHandle,
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN __W32_OUT PVOID  *BaseAddress,
+  __W32_IN ULONG  ZeroBits,
+  __W32_IN ULONG  CommitSize,
+  __W32_IN __W32_OUT PLARGE_INTEGER  SectionOffset  __W32_OPTIONAL,
+  __W32_IN __W32_OUT PSIZE_T  ViewSize,
+  __W32_IN SECTION_INHERIT  InheritDisposition,
+  __W32_IN ULONG  AllocationType,
+  __W32_IN ULONG  Protect);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtOpenFile(
-  OUT PHANDLE  FileHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN ULONG  ShareAccess,
-  IN ULONG  OpenOptions);
+  __W32_OUT PHANDLE  FileHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN ULONG  ShareAccess,
+  __W32_IN ULONG  OpenOptions);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwOpenFile(
-  OUT PHANDLE  FileHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN ULONG  ShareAccess,
-  IN ULONG  OpenOptions);
+  __W32_OUT PHANDLE  FileHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN ULONG  ShareAccess,
+  __W32_IN ULONG  OpenOptions);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwOpenKey(
-  OUT PHANDLE  KeyHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  KeyHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwOpenSection(
-  OUT PHANDLE  SectionHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  SectionHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwOpenSymbolicLinkObject(
-  OUT PHANDLE  LinkHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  LinkHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwOpenTimer(
-  OUT PHANDLE  TimerHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
+  __W32_OUT PHANDLE  TimerHandle,
+  __W32_IN ACCESS_MASK  DesiredAccess,
+  __W32_IN POBJECT_ATTRIBUTES  ObjectAttributes);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwQueryInformationFile(
-  IN HANDLE  FileHandle,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  OUT PVOID  FileInformation,
-  IN ULONG  Length,
-  IN FILE_INFORMATION_CLASS  FileInformationClass);
+  __W32_IN HANDLE  FileHandle,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_OUT PVOID  FileInformation,
+  __W32_IN ULONG  Length,
+  __W32_IN FILE_INFORMATION_CLASS  FileInformationClass);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwQueryKey(
-  IN HANDLE  KeyHandle,
-  IN KEY_INFORMATION_CLASS  KeyInformationClass,
-  OUT PVOID  KeyInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN KEY_INFORMATION_CLASS  KeyInformationClass,
+  __W32_OUT PVOID  KeyInformation,
+  __W32_IN ULONG  Length,
+  __W32_OUT PULONG  ResultLength);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwQuerySymbolicLinkObject(
-  IN HANDLE  LinkHandle,
-  IN OUT PUNICODE_STRING  LinkTarget,
-  OUT PULONG  ReturnedLength  OPTIONAL);
+  __W32_IN HANDLE  LinkHandle,
+  __W32_IN __W32_OUT PUNICODE_STRING  LinkTarget,
+  __W32_OUT PULONG  ReturnedLength  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwQueryValueKey(
-  IN HANDLE  KeyHandle,
-  IN PUNICODE_STRING  ValueName,
-  IN KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
-  OUT PVOID  KeyValueInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN PUNICODE_STRING  ValueName,
+  __W32_IN KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
+  __W32_OUT PVOID  KeyValueInformation,
+  __W32_IN ULONG  Length,
+  __W32_OUT PULONG  ResultLength);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtReadFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  OUT PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
+  __W32_IN HANDLE  FileHandle,
+  __W32_IN HANDLE  Event  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  Length,
+  __W32_IN PLARGE_INTEGER  ByteOffset  __W32_OPTIONAL,
+  __W32_IN PULONG  Key  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwReadFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  OUT PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
+  __W32_IN HANDLE  FileHandle,
+  __W32_IN HANDLE  Event  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_OUT PVOID  Buffer,
+  __W32_IN ULONG  Length,
+  __W32_IN PLARGE_INTEGER  ByteOffset  __W32_OPTIONAL,
+  __W32_IN PULONG  Key  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtSetEvent(
-  IN HANDLE  EventHandle,
-  IN PULONG  NumberOfThreadsReleased);
+  __W32_IN HANDLE  EventHandle,
+  __W32_IN PULONG  NumberOfThreadsReleased);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwSetEvent(
-  IN HANDLE  EventHandle,
-  IN PULONG  NumberOfThreadsReleased);
+  __W32_IN HANDLE  EventHandle,
+  __W32_IN PULONG  NumberOfThreadsReleased);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwSetInformationFile(
-  IN HANDLE  FileHandle,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PVOID  FileInformation,
-  IN ULONG  Length,
-  IN FILE_INFORMATION_CLASS  FileInformationClass);
+  __W32_IN HANDLE  FileHandle,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN PVOID  FileInformation,
+  __W32_IN ULONG  Length,
+  __W32_IN FILE_INFORMATION_CLASS  FileInformationClass);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwSetInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  IN PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength);
+  __W32_IN HANDLE  ThreadHandle,
+  __W32_IN THREADINFOCLASS  ThreadInformationClass,
+  __W32_IN PVOID  ThreadInformation,
+  __W32_IN ULONG  ThreadInformationLength);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwSetTimer(
-  IN HANDLE  TimerHandle,
-  IN PLARGE_INTEGER  DueTime,
-  IN PTIMER_APC_ROUTINE  TimerApcRoutine  OPTIONAL,
-  IN PVOID  TimerContext  OPTIONAL,
-  IN BOOLEAN  WakeTimer,
-  IN LONG  Period  OPTIONAL,
-  OUT PBOOLEAN  PreviousState  OPTIONAL);
+  __W32_IN HANDLE  TimerHandle,
+  __W32_IN PLARGE_INTEGER  DueTime,
+  __W32_IN PTIMER_APC_ROUTINE  TimerApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  TimerContext  __W32_OPTIONAL,
+  __W32_IN BOOLEAN  WakeTimer,
+  __W32_IN LONG  Period  __W32_OPTIONAL,
+  __W32_OUT PBOOLEAN  PreviousState  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwSetValueKey(
-  IN HANDLE  KeyHandle,
-  IN PUNICODE_STRING  ValueName,
-  IN ULONG  TitleIndex  OPTIONAL,
-  IN ULONG  Type,
-  IN PVOID  Data,
-  IN ULONG  DataSize);
+  __W32_IN HANDLE  KeyHandle,
+  __W32_IN PUNICODE_STRING  ValueName,
+  __W32_IN ULONG  TitleIndex  __W32_OPTIONAL,
+  __W32_IN ULONG  Type,
+  __W32_IN PVOID  Data,
+  __W32_IN ULONG  DataSize);
 
 /* [Nt|Zw]MapViewOfSection.InheritDisposition constants */
 #define AT_EXTENDABLE_FILE                0x00002000
@@ -8939,59 +8939,59 @@
 NTSTATUS
 DDKAPI
 NtUnmapViewOfSection(
-  IN HANDLE  ProcessHandle,
-  IN PVOID  BaseAddress);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  BaseAddress);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwUnmapViewOfSection(
-  IN HANDLE  ProcessHandle,
-  IN PVOID  BaseAddress);
+  __W32_IN HANDLE  ProcessHandle,
+  __W32_IN PVOID  BaseAddress);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtWaitForSingleObject(
-  IN HANDLE  Object,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Time);
+  __W32_IN HANDLE  Object,
+  __W32_IN BOOLEAN  Alertable,
+  __W32_IN PLARGE_INTEGER  Time);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwWaitForSingleObject(
-  IN HANDLE  Object,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Time);
+  __W32_IN HANDLE  Object,
+  __W32_IN BOOLEAN  Alertable,
+  __W32_IN PLARGE_INTEGER  Time);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 NtWriteFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
+  __W32_IN HANDLE  FileHandle,
+  __W32_IN HANDLE  Event  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length,
+  __W32_IN PLARGE_INTEGER  ByteOffset  __W32_OPTIONAL,
+  __W32_IN PULONG  Key  __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 ZwWriteFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
+  __W32_IN HANDLE  FileHandle,
+  __W32_IN HANDLE  Event  __W32_OPTIONAL,
+  __W32_IN PIO_APC_ROUTINE  ApcRoutine  __W32_OPTIONAL,
+  __W32_IN PVOID  ApcContext  __W32_OPTIONAL,
+  __W32_OUT PIO_STATUS_BLOCK  IoStatusBlock,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length,
+  __W32_IN PLARGE_INTEGER  ByteOffset  __W32_OPTIONAL,
+  __W32_IN PULONG  Key  __W32_OPTIONAL);
 
 
 
@@ -9001,73 +9001,73 @@
 NTSTATUS
 DDKAPI
 PoCallDriver(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PIRP  Irp);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN __W32_OUT PIRP  Irp);
 
 NTOSAPI
 PULONG
 DDKAPI
 PoRegisterDeviceForIdleDetection(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  ConservationIdleTime,
-  IN ULONG  PerformanceIdleTime,
-  IN DEVICE_POWER_STATE  State);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  ConservationIdleTime,
+  __W32_IN ULONG  PerformanceIdleTime,
+  __W32_IN DEVICE_POWER_STATE  State);
 
 NTOSAPI
 PVOID
 DDKAPI
 PoRegisterSystemState(
-  IN PVOID  StateHandle,
-  IN EXECUTION_STATE  Flags);
+  __W32_IN PVOID  StateHandle,
+  __W32_IN EXECUTION_STATE  Flags);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PoRequestPowerIrp(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN UCHAR  MinorFunction,  
-  IN POWER_STATE  PowerState,
-  IN PREQUEST_POWER_COMPLETE  CompletionFunction,
-  IN PVOID  Context,
-  OUT PIRP  *Irp OPTIONAL);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN UCHAR  MinorFunction,
+  __W32_IN POWER_STATE  PowerState,
+  __W32_IN PREQUEST_POWER_COMPLETE  CompletionFunction,
+  __W32_IN PVOID  Context,
+  __W32_OUT PIRP  *Irp __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 PoRequestShutdownEvent(
-  OUT PVOID  *Event);
+  __W32_OUT PVOID  *Event);
 
 NTOSAPI
 VOID
 DDKAPI
 PoSetDeviceBusy(
-  PULONG  IdlePointer); 
+  PULONG  IdlePointer);
 
 NTOSAPI
 POWER_STATE
 DDKAPI
 PoSetPowerState(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN POWER_STATE_TYPE  Type,
-  IN POWER_STATE  State);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN POWER_STATE_TYPE  Type,
+  __W32_IN POWER_STATE  State);
 
 NTOSAPI
 VOID
 DDKAPI
 PoSetSystemState(
-  IN EXECUTION_STATE  Flags);
+  __W32_IN EXECUTION_STATE  Flags);
 
 NTOSAPI
 VOID
 DDKAPI
 PoStartNextPowerIrp(
-  IN PIRP  Irp);
+  __W32_IN PIRP  Irp);
 
 NTOSAPI
 VOID
 DDKAPI
 PoUnregisterSystemState(
-  IN PVOID  StateHandle);
+  __W32_IN PVOID  StateHandle);
 
 
 
@@ -9077,50 +9077,50 @@
 NTSTATUS
 DDKAPI
 WmiCompleteRequest(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN NTSTATUS  Status,
-  IN ULONG  BufferUsed,
-  IN CCHAR  PriorityBoost);
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp,
+  __W32_IN NTSTATUS  Status,
+  __W32_IN ULONG  BufferUsed,
+  __W32_IN CCHAR  PriorityBoost);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 WmiFireEvent(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN LPGUID  Guid, 
-  IN ULONG  InstanceIndex,
-  IN ULONG  EventDataSize,
-  IN PVOID  EventData); 
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN LPGUID  Guid,
+  __W32_IN ULONG  InstanceIndex,
+  __W32_IN ULONG  EventDataSize,
+  __W32_IN PVOID  EventData);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 WmiQueryTraceInformation(
-  IN TRACE_INFORMATION_CLASS  TraceInformationClass,
-  OUT PVOID  TraceInformation,
-  IN ULONG  TraceInformationLength,
-  OUT PULONG  RequiredLength OPTIONAL,
-  IN PVOID  Buffer OPTIONAL);
+  __W32_IN TRACE_INFORMATION_CLASS  TraceInformationClass,
+  __W32_OUT PVOID  TraceInformation,
+  __W32_IN ULONG  TraceInformationLength,
+  __W32_OUT PULONG  RequiredLength __W32_OPTIONAL,
+  __W32_IN PVOID  Buffer __W32_OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 WmiSystemControl(
-  IN PWMILIB_CONTEXT  WmiLibInfo,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  OUT PSYSCTL_IRP_DISPOSITION  IrpDisposition);
+  __W32_IN PWMILIB_CONTEXT  WmiLibInfo,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN PIRP  Irp,
+  __W32_OUT PSYSCTL_IRP_DISPOSITION  IrpDisposition);
 
 NTOSAPI
 NTSTATUS
 DDKCDECLAPI
 WmiTraceMessage(
-  IN TRACEHANDLE  LoggerHandle,
-  IN ULONG  MessageFlags,
-  IN LPGUID  MessageGuid,
-  IN USHORT  MessageNumber,
-  IN ...);
+  __W32_IN TRACEHANDLE  LoggerHandle,
+  __W32_IN ULONG  MessageFlags,
+  __W32_IN LPGUID  MessageGuid,
+  __W32_IN USHORT  MessageNumber,
+  __W32_IN ...);
 
 #if 0
 /* FIXME: Get va_list from where? */
@@ -9128,11 +9128,11 @@
 NTSTATUS
 DDKCDECLAPI
 WmiTraceMessageVa(
-  IN TRACEHANDLE  LoggerHandle,
-  IN ULONG  MessageFlags,
-  IN LPGUID  MessageGuid,
-  IN USHORT  MessageNumber,
-  IN va_list  MessageArgList);
+  __W32_IN TRACEHANDLE  LoggerHandle,
+  __W32_IN ULONG  MessageFlags,
+  __W32_IN LPGUID  MessageGuid,
+  __W32_IN USHORT  MessageNumber,
+  __W32_IN va_list  MessageArgList);
 #endif
 
 
@@ -9160,45 +9160,45 @@
 VOID
 DDKAPI
 DbgBreakPointWithStatus(
-  IN ULONG  Status);
+  __W32_IN ULONG  Status);
 
 NTOSAPI
 ULONG
 DDKCDECLAPI
 DbgPrint(
-  IN PCH  Format,
-  IN ...);
+  __W32_IN PCH  Format,
+  __W32_IN ...);
 
 NTOSAPI
 ULONG
 DDKCDECLAPI
 DbgPrintEx(
-  IN ULONG  ComponentId,
-  IN ULONG  Level,
-  IN PCH  Format,
-  IN ...);
+  __W32_IN ULONG  ComponentId,
+  __W32_IN ULONG  Level,
+  __W32_IN PCH  Format,
+  __W32_IN ...);
 
 NTOSAPI
 ULONG
 DDKCDECLAPI
 DbgPrintReturnControlC(
-  IN PCH  Format,
-  IN ...);
+  __W32_IN PCH  Format,
+  __W32_IN ...);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 DbgQueryDebugFilterState(
-  IN ULONG  ComponentId,
-  IN ULONG  Level);
+  __W32_IN ULONG  ComponentId,
+  __W32_IN ULONG  Level);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 DbgSetDebugFilterState(
-  IN ULONG  ComponentId,
-  IN ULONG  Level,
-  IN BOOLEAN  State);
+  __W32_IN ULONG  ComponentId,
+  __W32_IN ULONG  Level,
+  __W32_IN BOOLEAN  State);
 
 #ifdef DBG
 
diff -ru w32api-3.6.orig/include/ddk/winnt4.h w32api-3.6/include/ddk/winnt4.h
--- w32api-3.6.orig/include/ddk/winnt4.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/winnt4.h	2006-02-06 16:41:14.000000000 +1030
@@ -45,7 +45,7 @@
 
 static __inline PVOID
 ExAllocateFromZone(
-  IN PZONE_HEADER  Zone)
+  __W32_IN PZONE_HEADER  Zone)
 {
   if (Zone->FreeList.Next)
     Zone->FreeList.Next = Zone->FreeList.Next->Next;
@@ -56,14 +56,14 @@
 NTSTATUS
 DDKAPI
 ExExtendZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Segment,
-  IN ULONG  SegmentSize);
+  __W32_IN PZONE_HEADER  Zone,
+  __W32_IN PVOID  Segment,
+  __W32_IN ULONG  SegmentSize);
 
 static __inline PVOID
 ExFreeToZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Block)
+  __W32_IN PZONE_HEADER  Zone,
+  __W32_IN PVOID  Block)
 {
   ((PSINGLE_LIST_ENTRY) Block)->Next = Zone->FreeList.Next;
   Zone->FreeList.Next = ((PSINGLE_LIST_ENTRY) Block);
@@ -74,16 +74,16 @@
 NTSTATUS
 DDKAPI
 ExInitializeZone(
-  IN PZONE_HEADER  Zone,
-  IN ULONG  BlockSize,
-  IN PVOID  InitialSegment,
-  IN ULONG  InitialSegmentSize);
+  __W32_IN PZONE_HEADER  Zone,
+  __W32_IN ULONG  BlockSize,
+  __W32_IN PVOID  InitialSegment,
+  __W32_IN ULONG  InitialSegmentSize);
 
 /*
  * PVOID
  * ExInterlockedAllocateFromZone(
- *   IN PZONE_HEADER  Zone,
- *   IN PKSPIN_LOCK  Lock)
+ *   __W32_IN PZONE_HEADER  Zone,
+ *   __W32_IN PKSPIN_LOCK  Lock)
  */
 #define ExInterlockedAllocateFromZone(Zone, \
                               Lock) \
@@ -93,25 +93,25 @@
 NTSTATUS
 DDKAPI
 ExInterlockedExtendZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Segment,
-  IN ULONG  SegmentSize,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PZONE_HEADER  Zone,
+  __W32_IN PVOID  Segment,
+  __W32_IN ULONG  SegmentSize,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PVOID
 DDKAPI
 ExInterlockedFreeToZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Block,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PZONE_HEADER  Zone,
+  __W32_IN PVOID  Block,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 /*
  * VOID
  * ExInitializeWorkItem(
- *   IN PWORK_QUEUE_ITEM  Item,
- *   IN PWORKER_THREAD_ROUTINE  Routine,
- *   IN PVOID  Context)
+ *   __W32_IN PWORK_QUEUE_ITEM  Item,
+ *   __W32_IN PWORKER_THREAD_ROUTINE  Routine,
+ *   __W32_IN PVOID  Context)
  */
 #define ExInitializeWorkItem(Item, \
                              Routine, \
@@ -125,7 +125,7 @@
 /*
  * BOOLEAN
  * ExIsFullZone(
- *  IN PZONE_HEADER  Zone)
+ *  __W32_IN PZONE_HEADER  Zone)
  */
 #define ExIsFullZone(Zone) \
   ((Zone)->FreeList.Next == (PSINGLE_LIST_ENTRY) NULL)
@@ -134,21 +134,21 @@
 VOID
 DDKAPI
 ExQueueWorkItem(
-  IN PWORK_QUEUE_ITEM  WorkItem,
-  IN WORK_QUEUE_TYPE  QueueType);
+  __W32_IN PWORK_QUEUE_ITEM  WorkItem,
+  __W32_IN WORK_QUEUE_TYPE  QueueType);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 ExIsObjectInFirstZoneSegment(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Object);
+  __W32_IN PZONE_HEADER  Zone,
+  __W32_IN PVOID  Object);
 
 NTOSAPI
 VOID
 DDKAPI
 ExReleaseResource(
-  IN PERESOURCE  Resource);
+  __W32_IN PERESOURCE  Resource);
 
 #define ExAcquireResourceExclusive ExAcquireResourceExclusiveLite
 #define ExAcquireResourceShared ExAcquireResourceSharedLite
@@ -164,402 +164,402 @@
 INTERLOCKED_RESULT
 DDKAPI
 ExInterlockedDecrementLong(
-  IN PLONG  Addend,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLONG  Addend,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 ULONG
 DDKAPI
 ExInterlockedExchangeUlong(
-  IN PULONG  Target,
-  IN ULONG  Value,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PULONG  Target,
+  __W32_IN ULONG  Value,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 INTERLOCKED_RESULT
 DDKAPI
 ExInterlockedIncrementLong(
-  IN PLONG  Addend,
-  IN PKSPIN_LOCK  Lock);
+  __W32_IN PLONG  Addend,
+  __W32_IN PKSPIN_LOCK  Lock);
 
 NTOSAPI
 PVOID
 DDKAPI
 HalAllocateCommonBuffer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN ULONG  Length,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled);
+  __W32_IN PADAPTER_OBJECT  AdapterObject,
+  __W32_IN ULONG  Length,
+  __W32_OUT PPHYSICAL_ADDRESS  LogicalAddress,
+  __W32_IN BOOLEAN  CacheEnabled);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 HalAssignSlotResources(
-  IN PUNICODE_STRING  RegistryPath,
-  IN PUNICODE_STRING  DriverClassName,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResources);
+  __W32_IN PUNICODE_STRING  RegistryPath,
+  __W32_IN PUNICODE_STRING  DriverClassName,
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN INTERFACE_TYPE  BusType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN __W32_OUT PCM_RESOURCE_LIST  *AllocatedResources);
 
 NTOSAPI
 VOID
 DDKAPI
 HalFreeCommonBuffer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN ULONG  Length,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN PVOID  VirtualAddress,
-  IN BOOLEAN  CacheEnabled);
+  __W32_IN PADAPTER_OBJECT  AdapterObject,
+  __W32_IN ULONG  Length,
+  __W32_IN PHYSICAL_ADDRESS  LogicalAddress,
+  __W32_IN PVOID  VirtualAddress,
+  __W32_IN BOOLEAN  CacheEnabled);
 
 NTOSAPI
 PADAPTER_OBJECT
 DDKAPI
 HalGetAdapter(
-  IN PDEVICE_DESCRIPTION  DeviceDescription,
-  IN OUT PULONG  NumberOfMapRegisters);
+  __W32_IN PDEVICE_DESCRIPTION  DeviceDescription,
+  __W32_IN __W32_OUT PULONG  NumberOfMapRegisters);
 
 NTOSAPI
 ULONG
 DDKAPI
 HalGetBusData(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN BUS_DATA_TYPE  BusDataType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 ULONG
 DDKAPI
 HalGetBusDataByOffset(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN BUS_DATA_TYPE  BusDataType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 ULONG
 DDKAPI
-HalGetDmaAlignmentRequirement( 
+HalGetDmaAlignmentRequirement(
   VOID);
 
 NTOSAPI
 ULONG
 DDKAPI
 HalGetInterruptVector(
-  IN INTERFACE_TYPE  InterfaceType,
-  IN ULONG  BusNumber,
-  IN ULONG  BusInterruptLevel,
-  IN ULONG  BusInterruptVector,
-  OUT PKIRQL  Irql,
-  OUT PKAFFINITY  Affinity);
+  __W32_IN INTERFACE_TYPE  InterfaceType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN ULONG  BusInterruptLevel,
+  __W32_IN ULONG  BusInterruptVector,
+  __W32_OUT PKIRQL  Irql,
+  __W32_OUT PKAFFINITY  Affinity);
 
 NTOSAPI
 ULONG
 DDKAPI
 HalReadDmaCounter(
-  IN PADAPTER_OBJECT  AdapterObject);
+  __W32_IN PADAPTER_OBJECT  AdapterObject);
 
 NTOSAPI
 ULONG
 DDKAPI
 HalSetBusData(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
+  __W32_IN BUS_DATA_TYPE  BusDataType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 ULONG
 DDKAPI
 HalSetBusDataByOffset(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
+  __W32_IN BUS_DATA_TYPE  BusDataType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN ULONG  SlotNumber,
+  __W32_IN PVOID  Buffer,
+  __W32_IN ULONG  Offset,
+  __W32_IN ULONG  Length);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 HalTranslateBusAddress(
-  IN INTERFACE_TYPE  InterfaceType,
-  IN ULONG  BusNumber,
-  IN PHYSICAL_ADDRESS  BusAddress,
-  IN OUT PULONG  AddressSpace,
-  OUT PPHYSICAL_ADDRESS  TranslatedAddress);
+  __W32_IN INTERFACE_TYPE  InterfaceType,
+  __W32_IN ULONG  BusNumber,
+  __W32_IN PHYSICAL_ADDRESS  BusAddress,
+  __W32_IN __W32_OUT PULONG  AddressSpace,
+  __W32_OUT PPHYSICAL_ADDRESS  TranslatedAddress);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoAllocateAdapterChannel(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  NumberOfMapRegisters,
-  IN PDRIVER_CONTROL  ExecutionRoutine,
-  IN PVOID  Context);
+  __W32_IN PADAPTER_OBJECT  AdapterObject,
+  __W32_IN PDEVICE_OBJECT  DeviceObject,
+  __W32_IN ULONG  NumberOfMapRegisters,
+  __W32_IN PDRIVER_CONTROL  ExecutionRoutine,
+  __W32_IN PVOID  Context);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoAssignResources(
-  IN PUNICODE_STRING  RegistryPath,
-  IN PUNICODE_STRING  DriverClassName  OPTIONAL,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDEVICE_OBJECT  DeviceObject  OPTIONAL,
-  IN PIO_RESOURCE_REQUIREMENTS_LIST  RequestedResources,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResources);
+  __W32_IN PUNICODE_STRING  RegistryPath,
+  __W32_IN PUNICODE_STRING  DriverClassName  __W32_OPTIONAL,
+  __W32_IN PDRIVER_OBJECT  DriverObject,
+  __W32_IN PDEVICE_OBJECT  DeviceObject  __W32_OPTIONAL,
+  __W32_IN PIO_RESOURCE_REQUIREMENTS_LIST  RequestedResources,
+  __W32_IN __W32_OUT PCM_RESOURCE_LIST  *AllocatedResources);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
 IoAttachDeviceByPointer(
-  IN PDEVICE_OBJECT  SourceDevice,
-  IN PDEVICE_OBJECT  TargetDevice);
+  __W32_IN PDEVICE_OBJECT  SourceDevice,
+  __W32_IN PDEVICE_OBJECT  TargetDevice);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 IoFlushAdapterBuffers(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PADAPTER_OBJECT  AdapterObject,
+  __W32_IN PMDL  Mdl,
+  __W32_IN PVOID  MapRegisterBase,
+  __W32_IN PVOID  CurrentVa,
+  __W32_IN ULONG  Length,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 NTOSAPI
 VOID
 DDKAPI
 IoFreeAdapterChannel(
-  IN PADAPTER_OBJECT  AdapterObject);
+  __W32_IN PADAPTER_OBJECT  AdapterObject);
 
 NTOSAPI
 VOID
 DDKAPI
 IoFreeMapRegisters(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PVOID  MapRegisterBase,
-  IN ULONG  NumberOfMapRegisters);
+  __W32_IN PADAPTER_OBJECT  AdapterObject,
+  __W32_IN PVOID  MapRegisterBase,
+  __W32_IN ULONG  NumberOfMapRegisters);
 
 NTOSAPI
 PHYSICAL_ADDRESS
 DDKAPI
 IoMapTransfer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN OUT PULONG  Length,
-  IN BOOLEAN  WriteToDevice);
+  __W32_IN PADAPTER_OBJECT  AdapterObject,
+  __W32_IN PMDL  Mdl,
+  __W32_IN PVOID  MapRegisterBase,
+  __W32_IN PVOID  CurrentVa,
+  __W32_IN __W32_OUT PULONG  Length,
+  __W32_IN BOOLEAN  WriteToDevice);
 
 NTOSAPI
 PMDL
 DDKAPI
 MmCreateMdl(
-  IN PMDL  MemoryDescriptorList  OPTIONAL,
-  IN PVOID  Base,
-  IN SIZE_T  Length);
+  __W32_IN PMDL  MemoryDescriptorList  __W32_OPTIONAL,
+  __W32_IN PVOID  Base,
+  __W32_IN SIZE_T  Length);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 MmIsNonPagedSystemAddressValid(
-  IN PVOID  VirtualAddress);
+  __W32_IN PVOID  VirtualAddress);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlEnlargedIntegerMultiply(
-  IN LONG  Multiplicand,
-  IN LONG  Multiplier);
+  __W32_IN LONG  Multiplicand,
+  __W32_IN LONG  Multiplier);
 
 NTOSAPI
 ULONG
 DDKAPI
 RtlEnlargedUnsignedDivide(
-  IN ULARGE_INTEGER  Dividend,
-  IN ULONG  Divisor,
-  IN OUT PULONG  Remainder);
+  __W32_IN ULARGE_INTEGER  Dividend,
+  __W32_IN ULONG  Divisor,
+  __W32_IN __W32_OUT PULONG  Remainder);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlEnlargedUnsignedMultiply(
-  IN ULONG  Multiplicand,
-  IN ULONG  Multiplier);
+  __W32_IN ULONG  Multiplicand,
+  __W32_IN ULONG  Multiplier);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlExtendedIntegerMultiply(
-  IN LARGE_INTEGER  Multiplicand,
-  IN LONG  Multiplier);
+  __W32_IN LARGE_INTEGER  Multiplicand,
+  __W32_IN LONG  Multiplier);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlExtendedLargeIntegerDivide(
-  IN LARGE_INTEGER  Dividend,
-  IN ULONG  Divisor,
-  IN OUT PULONG  Remainder);
+  __W32_IN LARGE_INTEGER  Dividend,
+  __W32_IN ULONG  Divisor,
+  __W32_IN __W32_OUT PULONG  Remainder);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlExtendedMagicDivide(
-  IN LARGE_INTEGER  Dividend,
-  IN LARGE_INTEGER  MagicDivisor,
-  IN CCHAR  ShiftCount);
+  __W32_IN LARGE_INTEGER  Dividend,
+  __W32_IN LARGE_INTEGER  MagicDivisor,
+  __W32_IN CCHAR  ShiftCount);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlLargeIntegerAdd(
-  IN LARGE_INTEGER  Addend1,
-  IN LARGE_INTEGER  Addend2);
+  __W32_IN LARGE_INTEGER  Addend1,
+  __W32_IN LARGE_INTEGER  Addend2);
 
 NTOSAPI
 VOID
 DDKAPI
 RtlLargeIntegerAnd(
-  IN OUT LARGE_INTEGER  Result,
-  IN LARGE_INTEGER  Source,
-  IN LARGE_INTEGER  Mask);
+  __W32_IN __W32_OUT LARGE_INTEGER  Result,
+  __W32_IN LARGE_INTEGER  Source,
+  __W32_IN LARGE_INTEGER  Mask);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlLargeIntegerArithmeticShift(
-  IN LARGE_INTEGER  LargeInteger,
-  IN CCHAR  ShiftCount);
+  __W32_IN LARGE_INTEGER  LargeInteger,
+  __W32_IN CCHAR  ShiftCount);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlLargeIntegerDivide(
-  IN LARGE_INTEGER  Dividend,
-  IN LARGE_INTEGER  Divisor,
-  IN OUT PLARGE_INTEGER  Remainder);
+  __W32_IN LARGE_INTEGER  Dividend,
+  __W32_IN LARGE_INTEGER  Divisor,
+  __W32_IN __W32_OUT PLARGE_INTEGER  Remainder);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
+  __W32_IN LARGE_INTEGER  Operand1,
+  __W32_IN LARGE_INTEGER  Operand2);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerEqualToZero(
-  IN LARGE_INTEGER  Operand);
+  __W32_IN LARGE_INTEGER  Operand);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerGreaterOrEqualToZero(
-  IN LARGE_INTEGER  Operand);
+  __W32_IN LARGE_INTEGER  Operand);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerGreaterThan(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
+  __W32_IN LARGE_INTEGER  Operand1,
+  __W32_IN LARGE_INTEGER  Operand2);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerGreaterThanOrEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
+  __W32_IN LARGE_INTEGER  Operand1,
+  __W32_IN LARGE_INTEGER  Operand2);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerGreaterThanZero(
-  IN LARGE_INTEGER  Operand);
+  __W32_IN LARGE_INTEGER  Operand);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerLessOrEqualToZero(
-  IN LARGE_INTEGER  Operand);
+  __W32_IN LARGE_INTEGER  Operand);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerLessThan(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
+  __W32_IN LARGE_INTEGER  Operand1,
+  __W32_IN LARGE_INTEGER  Operand2);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerLessThanOrEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
+  __W32_IN LARGE_INTEGER  Operand1,
+  __W32_IN LARGE_INTEGER  Operand2);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerLessThanZero(
-  IN LARGE_INTEGER  Operand);
+  __W32_IN LARGE_INTEGER  Operand);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlLargeIntegerNegate(
-  IN LARGE_INTEGER  Subtrahend);
+  __W32_IN LARGE_INTEGER  Subtrahend);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerNotEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
+  __W32_IN LARGE_INTEGER  Operand1,
+  __W32_IN LARGE_INTEGER  Operand2);
 
 NTOSAPI
 BOOLEAN
 DDKAPI
 RtlLargeIntegerNotEqualToZero(
-  IN LARGE_INTEGER  Operand);
+  __W32_IN LARGE_INTEGER  Operand);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlLargeIntegerShiftLeft(
-  IN LARGE_INTEGER  LargeInteger,
-  IN CCHAR  ShiftCount);
+  __W32_IN LARGE_INTEGER  LargeInteger,
+  __W32_IN CCHAR  ShiftCount);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlLargeIntegerShiftRight(
-  IN LARGE_INTEGER  LargeInteger,
-  IN CCHAR  ShiftCount);
+  __W32_IN LARGE_INTEGER  LargeInteger,
+  __W32_IN CCHAR  ShiftCount);
 
 NTOSAPI
 LARGE_INTEGER
 DDKAPI
 RtlLargeIntegerSubtract(
-  IN LARGE_INTEGER  Minuend,
-  IN LARGE_INTEGER  Subtrahend);
+  __W32_IN LARGE_INTEGER  Minuend,
+  __W32_IN LARGE_INTEGER  Subtrahend);
 
 
 /*
  * ULONG
  * COMPUTE_PAGES_SPANNED(
- *   IN PVOID  Va,
- *   IN ULONG  Size)
+ *   __W32_IN PVOID  Va,
+ *   __W32_IN ULONG  Size)
  */
 #define COMPUTE_PAGES_SPANNED(Va, \
                               Size) \
@@ -576,39 +576,39 @@
 INTERLOCKED_RESULT
 DDKAPI
 Exi386InterlockedIncrementLong(
-  IN PLONG  Addend);
+  __W32_IN PLONG  Addend);
 
 NTOSAPI
 INTERLOCKED_RESULT
 DDKFASTAPI
 Exfi386InterlockedIncrementLong(
-  IN PLONG  Addend);
+  __W32_IN PLONG  Addend);
 
 NTOSAPI
 INTERLOCKED_RESULT
 DDKAPI
 Exi386InterlockedDecrementLong(
-  IN PLONG  Addend);
+  __W32_IN PLONG  Addend);
 
 NTOSAPI
 INTERLOCKED_RESULT
 DDKFASTAPI
 Exfi386InterlockedDecrementLong(
-  IN PLONG  Addend);
+  __W32_IN PLONG  Addend);
 
 NTOSAPI
 ULONG
 DDKAPI
 Exi386InterlockedExchangeUlong(
-  IN PULONG  Target,
-  IN ULONG  Value);
+  __W32_IN PULONG  Target,
+  __W32_IN ULONG  Value);
 
 NTOSAPI
 ULONG
 DDKFASTAPI
 Exfi386InterlockedExchangeUlong(
-  IN PULONG  Target,
-  IN ULONG  Value);
+  __W32_IN PULONG  Target,
+  __W32_IN ULONG  Value);
 
 #define ExInterlockedIncrementLong(Addend,Lock) Exfi386InterlockedIncrementLong(Addend)
 #define ExInterlockedDecrementLong(Addend,Lock) Exfi386InterlockedDecrementLong(Addend)
diff -ru w32api-3.6.orig/include/ddk/ws2san.h w32api-3.6/include/ddk/ws2san.h
--- w32api-3.6.orig/include/ddk/ws2san.h	2005-01-02 23:40:38.000000000 +1030
+++ w32api-3.6/include/ddk/ws2san.h	2006-02-06 16:41:14.000000000 +1030
@@ -69,47 +69,47 @@
   {0xE5DA4AF8, 0xD824, 0x48CD, {0xA7, 0x99, 0x63, 0x37, 0xA9, 0x8E, 0xD2, 0xAF}}
 
 typedef struct _WSABUFEX {
-	u_long  len; 
-	char FAR  *buf; 
-	HANDLE  handle; 
+  u_long  len;
+  char FAR  *buf;
+  HANDLE  handle;
 } WSABUFEX, FAR * LPWSABUFEX;
 
 #if 0
 typedef struct _WSPUPCALLTABLEEX {
-	LPWPUCLOSEEVENT  lpWPUCloseEvent;
-	LPWPUCLOSESOCKETHANDLE  lpWPUCloseSocketHandle;
-	LPWPUCREATEEVENT  lpWPUCreateEvent;
-	LPWPUCREATESOCKETHANDLE  lpWPUCreateSocketHandle;
-	LPWPUFDISSET  lpWPUFDIsSet;
-	LPWPUGETPROVIDERPATH  lpWPUGetProviderPath;
-	LPWPUMODIFYIFSHANDLE  lpWPUModifyIFSHandle;
-	LPWPUPOSTMESSAGE  lpWPUPostMessage;
-	LPWPUQUERYBLOCKINGCALLBACK  lpWPUQueryBlockingCallback;
-	LPWPUQUERYSOCKETHANDLECONTEXT  lpWPUQuerySocketHandleContext;
-	LPWPUQUEUEAPC  lpWPUQueueApc;
-	LPWPURESETEVENT  lpWPUResetEvent;
-	LPWPUSETEVENT  lpWPUSetEvent;
-	LPWPUOPENCURRENTTHREAD  lpWPUOpenCurrentThread;
-	LPWPUCLOSETHREAD  lpWPUCloseThread;
-	LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
+  LPWPUCLOSEEVENT  lpWPUCloseEvent;
+  LPWPUCLOSESOCKETHANDLE  lpWPUCloseSocketHandle;
+  LPWPUCREATEEVENT  lpWPUCreateEvent;
+  LPWPUCREATESOCKETHANDLE  lpWPUCreateSocketHandle;
+  LPWPUFDISSET  lpWPUFDIsSet;
+  LPWPUGETPROVIDERPATH  lpWPUGetProviderPath;
+  LPWPUMODIFYIFSHANDLE  lpWPUModifyIFSHandle;
+  LPWPUPOSTMESSAGE  lpWPUPostMessage;
+  LPWPUQUERYBLOCKINGCALLBACK  lpWPUQueryBlockingCallback;
+  LPWPUQUERYSOCKETHANDLECONTEXT  lpWPUQuerySocketHandleContext;
+  LPWPUQUEUEAPC  lpWPUQueueApc;
+  LPWPURESETEVENT  lpWPUResetEvent;
+  LPWPUSETEVENT  lpWPUSetEvent;
+  LPWPUOPENCURRENTTHREAD  lpWPUOpenCurrentThread;
+  LPWPUCLOSETHREAD  lpWPUCloseThread;
+  LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
 } WSPUPCALLTABLEEX, FAR * LPWSPUPCALLTABLEEX;
 #endif
 
 int WSPAPI
 WSPStartupEx(
-  IN WORD  wVersionRequested,
-  OUT LPWSPDATA  lpWSPData,
-  IN LPWSAPROTOCOL_INFOW  lpProtocolInfo,
-  IN LPWSPUPCALLTABLEEX  lpUpcallTable,
-  OUT LPWSPPROC_TABLE  lpProcTable);
+  __W32_IN WORD  wVersionRequested,
+  __W32_OUT LPWSPDATA  lpWSPData,
+  __W32_IN LPWSAPROTOCOL_INFOW  lpProtocolInfo,
+  __W32_IN LPWSPUPCALLTABLEEX  lpUpcallTable,
+  __W32_OUT LPWSPPROC_TABLE  lpProcTable);
 
 typedef int WSPAPI
 (*LPWSPSTARTUPEX)(
-  IN WORD  wVersionRequested,
-  OUT LPWSPDATA  lpWSPData,
-  IN LPWSAPROTOCOL_INFOW  lpProtocolInfo,
-  IN LPWSPUPCALLTABLEEX  lpUpcallTable,
-  OUT LPWSPPROC_TABLE  lpProcTable);
+  __W32_IN WORD  wVersionRequested,
+  __W32_OUT LPWSPDATA  lpWSPData,
+  __W32_IN LPWSAPROTOCOL_INFOW  lpProtocolInfo,
+  __W32_IN LPWSPUPCALLTABLEEX  lpUpcallTable,
+  __W32_OUT LPWSPPROC_TABLE  lpProcTable);
 
 #define MEM_READ                          1
 #define MEM_WRITE                         2
@@ -117,129 +117,129 @@
 
 int WSPAPI
 WSPDeregisterMemory(
-  IN SOCKET  s,
-  IN HANDLE  Handle,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN HANDLE  Handle,
+  __W32_OUT LPINT  lpErrno);
 
 typedef int WSPAPI
 (*LPFN_WSPDEREGISTERMEMORY)(
-  IN SOCKET  s,
-  IN HANDLE  Handle,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN HANDLE  Handle,
+  __W32_OUT LPINT  lpErrno);
 
 int WSPAPI
 WSPDeregisterRdmaMemory(
-  IN SOCKET  s,
-  IN LPVOID  lpRdmaBufferDescriptor,
-  IN DWORD  dwDescriptorLength,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN LPVOID  lpRdmaBufferDescriptor,
+  __W32_IN DWORD  dwDescriptorLength,
+  __W32_OUT LPINT  lpErrno);
 
 typedef int WSPAPI
 (*LPFN_WSPDEREGISTERRDMAMEMORY)(
-  IN SOCKET  s,
-  IN LPVOID  lpRdmaBufferDescriptor,
-  IN DWORD  dwDescriptorLength,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN LPVOID  lpRdmaBufferDescriptor,
+  __W32_IN DWORD  dwDescriptorLength,
+  __W32_OUT LPINT  lpErrno);
 
 int WSPAPI
 WSPMemoryRegistrationCacheCallback(
-  IN PVOID  lpvAddress,
-  IN SIZE_T  Size,
-  OUT LPINT  lpErrno);
+  __W32_IN PVOID  lpvAddress,
+  __W32_IN SIZE_T  Size,
+  __W32_OUT LPINT  lpErrno);
 
 typedef int WSPAPI
 (*LPFN_WSPMEMORYREGISTRATIONCACHECALLBACK)(
-  IN PVOID  lpvAddress,
-  IN SIZE_T  Size,
-  OUT LPINT  lpErrno);
+  __W32_IN PVOID  lpvAddress,
+  __W32_IN SIZE_T  Size,
+  __W32_OUT LPINT  lpErrno);
 
 int WSPAPI
 WSPRdmaRead(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesRead,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN LPWSABUFEX  lpBuffers,
+  __W32_IN DWORD  dwBufferCount,
+  __W32_IN LPVOID  lpTargetBufferDescriptor,
+  __W32_IN DWORD  dwTargetDescriptorLength,
+  __W32_IN DWORD  dwTargetBufferOffset,
+  __W32_OUT LPDWORD  lpdwNumberOfBytesRead,
+  __W32_IN DWORD  dwFlags,
+  __W32_IN LPWSAOVERLAPPED  lpOverlapped,
+  __W32_IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
+  __W32_IN LPWSATHREADID  lpThreadId,
+  __W32_OUT LPINT  lpErrno);
 
 typedef int WSPAPI
 (*LPFN_WSPRDMAREAD)(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesRead,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN LPWSABUFEX  lpBuffers,
+  __W32_IN DWORD  dwBufferCount,
+  __W32_IN LPVOID  lpTargetBufferDescriptor,
+  __W32_IN DWORD  dwTargetDescriptorLength,
+  __W32_IN DWORD  dwTargetBufferOffset,
+  __W32_OUT LPDWORD  lpdwNumberOfBytesRead,
+  __W32_IN DWORD  dwFlags,
+  __W32_IN LPWSAOVERLAPPED  lpOverlapped,
+  __W32_IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
+  __W32_IN LPWSATHREADID  lpThreadId,
+  __W32_OUT LPINT  lpErrno);
 
 int WSPAPI
 WSPRdmaWrite(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesWritten,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN LPWSABUFEX  lpBuffers,
+  __W32_IN DWORD  dwBufferCount,
+  __W32_IN LPVOID  lpTargetBufferDescriptor,
+  __W32_IN DWORD  dwTargetDescriptorLength,
+  __W32_IN DWORD  dwTargetBufferOffset,
+  __W32_OUT LPDWORD  lpdwNumberOfBytesWritten,
+  __W32_IN DWORD  dwFlags,
+  __W32_IN LPWSAOVERLAPPED  lpOverlapped,
+  __W32_IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
+  __W32_IN LPWSATHREADID  lpThreadId,
+  __W32_OUT LPINT  lpErrno);
 
 typedef int WSPAPI
 (*LPFN_WSPRDMAWRITE)(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesWritten,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN LPWSABUFEX  lpBuffers,
+  __W32_IN DWORD  dwBufferCount,
+  __W32_IN LPVOID  lpTargetBufferDescriptor,
+  __W32_IN DWORD  dwTargetDescriptorLength,
+  __W32_IN DWORD  dwTargetBufferOffset,
+  __W32_OUT LPDWORD  lpdwNumberOfBytesWritten,
+  __W32_IN DWORD  dwFlags,
+  __W32_IN LPWSAOVERLAPPED  lpOverlapped,
+  __W32_IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
+  __W32_IN LPWSATHREADID  lpThreadId,
+  __W32_OUT LPINT  lpErrno);
 
 HANDLE WSPAPI
 WSPRegisterMemory(
-  IN SOCKET  s,
-  IN PVOID  lpBuffer,
-  IN DWORD  dwBufferLength,
-  IN DWORD  dwFlags,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN PVOID  lpBuffer,
+  __W32_IN DWORD  dwBufferLength,
+  __W32_IN DWORD  dwFlags,
+  __W32_OUT LPINT  lpErrno);
 
 int WSPAPI
 WSPRegisterRdmaMemory(
-  IN SOCKET  s,
-  IN PVOID  lpBuffer,
-  IN DWORD  dwBufferLength,
-  IN DWORD  dwFlags,
-  OUT LPVOID  lpRdmaBufferDescriptor,
-  IN OUT LPDWORD  lpdwDescriptorLength,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN PVOID  lpBuffer,
+  __W32_IN DWORD  dwBufferLength,
+  __W32_IN DWORD  dwFlags,
+  __W32_OUT LPVOID  lpRdmaBufferDescriptor,
+  __W32_IN __W32_OUT LPDWORD  lpdwDescriptorLength,
+  __W32_OUT LPINT  lpErrno);
 
 typedef int WSPAPI
 (*LPFN_WSPREGISTERRDMAMEMORY)(
-  IN SOCKET  s,
-  IN PVOID  lpBuffer,
-  IN DWORD  dwBufferLength,
-  IN DWORD  dwFlags,
-  OUT LPVOID  lpRdmaBufferDescriptor,
-  IN OUT LPDWORD  lpdwDescriptorLength,
-  OUT LPINT  lpErrno);
+  __W32_IN SOCKET  s,
+  __W32_IN PVOID  lpBuffer,
+  __W32_IN DWORD  dwBufferLength,
+  __W32_IN DWORD  dwFlags,
+  __W32_OUT LPVOID  lpRdmaBufferDescriptor,
+  __W32_IN __W32_OUT LPDWORD  lpdwDescriptorLength,
+  __W32_OUT LPINT  lpErrno);
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/imagehlp.h w32api-3.6/include/imagehlp.h
--- w32api-3.6.orig/include/imagehlp.h	2002-04-10 06:47:17.000000000 +0930
+++ w32api-3.6/include/imagehlp.h	2006-02-06 16:41:14.000000000 +1030
@@ -1,17 +1,17 @@
 /*
-	imagehlp.h - Include file for IMAGEHLP.DLL APIs
+  imagehlp.h - Include file for IMAGEHLP.DLL APIs
 
-	Written by Mumit Khan <khan@nanotech.wisc.edu>
+  Written by Mumit Khan <khan@nanotech.wisc.edu>
 
-	This file is part of a free library for the Win32 API. 
+  This file is part of a free library for the Win32 API.
 
-	NOTE: This strictly does not belong in the Win32 API since it's
-	really part of Platform SDK. However,GDB needs it and we might
-	as well provide it here.
+  NOTE: This strictly does not belong in the Win32 API since it's
+  really part of Platform SDK. However,GDB needs it and we might
+  as well provide it here.
 
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 */
 
@@ -29,7 +29,7 @@
 #define BIND_NO_BOUND_IMPORTS 0x00000001
 #define BIND_NO_UPDATE 0x00000002
 #define BIND_ALL_IMAGES 0x00000004
-#define BIND_CACHE_IMPORT_DLLS 0x00000008 
+#define BIND_CACHE_IMPORT_DLLS 0x00000008
 #define CBA_DEFERRED_SYMBOL_LOAD_START 1
 #define CBA_DEFERRED_SYMBOL_LOAD_COMPLETE 2
 #define CBA_DEFERRED_SYMBOL_LOAD_FAILURE 3
@@ -40,203 +40,203 @@
 #define CERT_PE_IMAGE_DIGEST_ALL_IMPORT_INFO 4
 #define CERT_PE_IMAGE_DIGEST_NON_PE_INFO 8
 #define CERT_SECTION_TYPE_ANY 255
-#define CHECKSUM_SUCCESS	0
-#define CHECKSUM_OPEN_FAILURE	1
-#define CHECKSUM_MAP_FAILURE	2
-#define CHECKSUM_MAPVIEW_FAILURE	3
-#define CHECKSUM_UNICODE_FAILURE	4
-#define IMAGE_SEPARATION	65536
-#define SPLITSYM_REMOVE_PRIVATE	1
-#define SPLITSYM_EXTRACT_ALL	2
-#define SPLITSYM_SYMBOLPATH_IS_SRC	4
-#define SYMF_OMAP_GENERATED	1
-#define SYMF_OMAP_MODIFIED	2
-#define SYMOPT_CASE_INSENSITIVE	1
-#define SYMOPT_UNDNAME	2
-#define SYMOPT_DEFERRED_LOADS	4
-#define SYMOPT_NO_CPP	8
-#define SYMOPT_LOAD_LINES	16
-#define SYMOPT_OMAP_FIND_NEAREST	32
-#define UNDNAME_COMPLETE	0
-#define UNDNAME_NO_LEADING_UNDERSCORES	1 
-#define UNDNAME_NO_MS_KEYWORDS	2 
-#define UNDNAME_NO_FUNCTION_RETURNS	4 
-#define UNDNAME_NO_ALLOCATION_MODEL	8 
-#define UNDNAME_NO_ALLOCATION_LANGUAGE	16
-#define UNDNAME_NO_MS_THISTYPE	32
-#define UNDNAME_NO_CV_THISTYPE	64
-#define UNDNAME_NO_THISTYPE	96
-#define UNDNAME_NO_ACCESS_SPECIFIERS	128
-#define UNDNAME_NO_THROW_SIGNATURES	256
-#define UNDNAME_NO_MEMBER_TYPE	512 
-#define UNDNAME_NO_RETURN_UDT_MODEL	1024
-#define UNDNAME_32_BIT_DECODE	2048
-#define UNDNAME_NAME_ONLY	4096
-#define UNDNAME_NO_ARGUMENTS	8192
-#define UNDNAME_NO_SPECIAL_SYMS	16384
+#define CHECKSUM_SUCCESS  0
+#define CHECKSUM_OPEN_FAILURE  1
+#define CHECKSUM_MAP_FAILURE  2
+#define CHECKSUM_MAPVIEW_FAILURE  3
+#define CHECKSUM_UNICODE_FAILURE  4
+#define IMAGE_SEPARATION  65536
+#define SPLITSYM_REMOVE_PRIVATE  1
+#define SPLITSYM_EXTRACT_ALL  2
+#define SPLITSYM_SYMBOLPATH_IS_SRC  4
+#define SYMF_OMAP_GENERATED  1
+#define SYMF_OMAP_MODIFIED  2
+#define SYMOPT_CASE_INSENSITIVE  1
+#define SYMOPT_UNDNAME  2
+#define SYMOPT_DEFERRED_LOADS  4
+#define SYMOPT_NO_CPP  8
+#define SYMOPT_LOAD_LINES  16
+#define SYMOPT_OMAP_FIND_NEAREST  32
+#define UNDNAME_COMPLETE  0
+#define UNDNAME_NO_LEADING_UNDERSCORES  1
+#define UNDNAME_NO_MS_KEYWORDS  2
+#define UNDNAME_NO_FUNCTION_RETURNS  4
+#define UNDNAME_NO_ALLOCATION_MODEL  8
+#define UNDNAME_NO_ALLOCATION_LANGUAGE  16
+#define UNDNAME_NO_MS_THISTYPE  32
+#define UNDNAME_NO_CV_THISTYPE  64
+#define UNDNAME_NO_THISTYPE  96
+#define UNDNAME_NO_ACCESS_SPECIFIERS  128
+#define UNDNAME_NO_THROW_SIGNATURES  256
+#define UNDNAME_NO_MEMBER_TYPE  512
+#define UNDNAME_NO_RETURN_UDT_MODEL  1024
+#define UNDNAME_32_BIT_DECODE  2048
+#define UNDNAME_NAME_ONLY  4096
+#define UNDNAME_NO_ARGUMENTS  8192
+#define UNDNAME_NO_SPECIAL_SYMS  16384
 
 #define _IMAGEHLPAPI DECLSPEC_IMPORT WINAPI
 
 #ifndef RC_INVOKED
 
 typedef enum _IMAGEHLP_STATUS_REASON {
-	BindOutOfMemory,
-	BindRvaToVaFailed,
-	BindNoRoomInImage,
-	BindImportModuleFailed,
-	BindImportProcedureFailed,
-	BindImportModule,
-	BindImportProcedure,
-	BindForwarder,
-	BindForwarderNOT,
-	BindImageModified,
-	BindExpandFileHeaders,
-	BindImageComplete,
-	BindMismatchedSymbols,
-	BindSymbolsNotUpdated
+  BindOutOfMemory,
+  BindRvaToVaFailed,
+  BindNoRoomInImage,
+  BindImportModuleFailed,
+  BindImportProcedureFailed,
+  BindImportModule,
+  BindImportProcedure,
+  BindForwarder,
+  BindForwarderNOT,
+  BindImageModified,
+  BindExpandFileHeaders,
+  BindImageComplete,
+  BindMismatchedSymbols,
+  BindSymbolsNotUpdated
 } IMAGEHLP_STATUS_REASON;
 typedef BOOL(STDCALL*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG);
 typedef struct _LOADED_IMAGE {
-	LPSTR ModuleName;
-	HANDLE hFile;
-	PUCHAR MappedAddress;
-	PIMAGE_NT_HEADERS FileHeader;
-	PIMAGE_SECTION_HEADER LastRvaSection;
-	ULONG NumberOfSections;
-	PIMAGE_SECTION_HEADER Sections;
-	ULONG Characteristics;
-	BOOLEAN fSystemImage;
-	BOOLEAN fDOSImage;
-	LIST_ENTRY Links;
-	ULONG SizeOfImage;
+  LPSTR ModuleName;
+  HANDLE hFile;
+  PUCHAR MappedAddress;
+  PIMAGE_NT_HEADERS FileHeader;
+  PIMAGE_SECTION_HEADER LastRvaSection;
+  ULONG NumberOfSections;
+  PIMAGE_SECTION_HEADER Sections;
+  ULONG Characteristics;
+  BOOLEAN fSystemImage;
+  BOOLEAN fDOSImage;
+  LIST_ENTRY Links;
+  ULONG SizeOfImage;
 } LOADED_IMAGE,*PLOADED_IMAGE;
 typedef struct _IMAGE_DEBUG_INFORMATION {
-	LIST_ENTRY List;
-	DWORD Size;
-	PVOID MappedBase;
-	USHORT Machine;
-	USHORT Characteristics;
-	DWORD CheckSum;
-	DWORD ImageBase;
-	DWORD SizeOfImage;
-	DWORD NumberOfSections;
-	PIMAGE_SECTION_HEADER Sections;
-	DWORD ExportedNamesSize;
-	LPSTR ExportedNames;
-	DWORD NumberOfFunctionTableEntries;
-	PIMAGE_FUNCTION_ENTRY FunctionTableEntries;
-	DWORD LowestFunctionStartingAddress;
-	DWORD HighestFunctionEndingAddress;
-	DWORD NumberOfFpoTableEntries;
-	PFPO_DATA FpoTableEntries;
-	DWORD SizeOfCoffSymbols;
-	PIMAGE_COFF_SYMBOLS_HEADER CoffSymbols;
-	DWORD SizeOfCodeViewSymbols;
-	PVOID CodeViewSymbols;
-	LPSTR ImageFilePath;
-	LPSTR ImageFileName;
-	LPSTR DebugFilePath;
-	DWORD TimeDateStamp;
-	BOOL RomImage;
-	PIMAGE_DEBUG_DIRECTORY DebugDirectory;
-	DWORD NumberOfDebugDirectories;
-	DWORD Reserved[3];
+  LIST_ENTRY List;
+  DWORD Size;
+  PVOID MappedBase;
+  USHORT Machine;
+  USHORT Characteristics;
+  DWORD CheckSum;
+  DWORD ImageBase;
+  DWORD SizeOfImage;
+  DWORD NumberOfSections;
+  PIMAGE_SECTION_HEADER Sections;
+  DWORD ExportedNamesSize;
+  LPSTR ExportedNames;
+  DWORD NumberOfFunctionTableEntries;
+  PIMAGE_FUNCTION_ENTRY FunctionTableEntries;
+  DWORD LowestFunctionStartingAddress;
+  DWORD HighestFunctionEndingAddress;
+  DWORD NumberOfFpoTableEntries;
+  PFPO_DATA FpoTableEntries;
+  DWORD SizeOfCoffSymbols;
+  PIMAGE_COFF_SYMBOLS_HEADER CoffSymbols;
+  DWORD SizeOfCodeViewSymbols;
+  PVOID CodeViewSymbols;
+  LPSTR ImageFilePath;
+  LPSTR ImageFileName;
+  LPSTR DebugFilePath;
+  DWORD TimeDateStamp;
+  BOOL RomImage;
+  PIMAGE_DEBUG_DIRECTORY DebugDirectory;
+  DWORD NumberOfDebugDirectories;
+  DWORD Reserved[3];
 } IMAGE_DEBUG_INFORMATION,*PIMAGE_DEBUG_INFORMATION;
 typedef enum {
-	AddrMode1616,
-	AddrMode1632,
-	AddrModeReal,
-	AddrModeFlat
+  AddrMode1616,
+  AddrMode1632,
+  AddrModeReal,
+  AddrModeFlat
 } ADDRESS_MODE;
 typedef struct _tagADDRESS {
-	DWORD Offset;
-	WORD Segment;
-	ADDRESS_MODE Mode;
+  DWORD Offset;
+  WORD Segment;
+  ADDRESS_MODE Mode;
 } ADDRESS,*LPADDRESS;
 typedef struct _KDHELP {
-	DWORD Thread;
-	DWORD ThCallbackStack;
-	DWORD NextCallback;
-	DWORD FramePointer;
-	DWORD KiCallUserMode;
-	DWORD KeUserCallbackDispatcher;
-	DWORD SystemRangeStart;
+  DWORD Thread;
+  DWORD ThCallbackStack;
+  DWORD NextCallback;
+  DWORD FramePointer;
+  DWORD KiCallUserMode;
+  DWORD KeUserCallbackDispatcher;
+  DWORD SystemRangeStart;
 } KDHELP,*PKDHELP;
 typedef struct _tagSTACKFRAME {
-	ADDRESS AddrPC; 
-	ADDRESS AddrReturn; 
-	ADDRESS AddrFrame; 
-	ADDRESS AddrStack; 
-	LPVOID FuncTableEntry; 
-	DWORD Params[4]; 
-	BOOL Far; 
-	BOOL Virtual; 
-	DWORD Reserved[3];
-	KDHELP KdHelp;
+  ADDRESS AddrPC;
+  ADDRESS AddrReturn;
+  ADDRESS AddrFrame;
+  ADDRESS AddrStack;
+  LPVOID FuncTableEntry;
+  DWORD Params[4];
+  BOOL Far;
+  BOOL Virtual;
+  DWORD Reserved[3];
+  KDHELP KdHelp;
 } STACKFRAME,*LPSTACKFRAME;
-typedef BOOL(STDCALL*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD); 
-typedef LPVOID(STDCALL*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD); 
-typedef DWORD(STDCALL*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD); 
+typedef BOOL(STDCALL*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD);
+typedef LPVOID(STDCALL*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD);
+typedef DWORD(STDCALL*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD);
 typedef DWORD(STDCALL*PTRANSLATE_ADDRESS_ROUTINE)(HANDLE,HANDLE,LPADDRESS);
 typedef struct API_VERSION {
-	USHORT MajorVersion;
-	USHORT MinorVersion;
-	USHORT Revision;
-	USHORT Reserved;
+  USHORT MajorVersion;
+  USHORT MinorVersion;
+  USHORT Revision;
+  USHORT Reserved;
 } API_VERSION,*LPAPI_VERSION;
-typedef BOOL(CALLBACK*PSYM_ENUMMODULES_CALLBACK)(LPSTR,ULONG,PVOID); 
+typedef BOOL(CALLBACK*PSYM_ENUMMODULES_CALLBACK)(LPSTR,ULONG,PVOID);
 typedef BOOL(CALLBACK*PSYM_ENUMSYMBOLS_CALLBACK)(LPSTR,ULONG,ULONG,PVOID);
 typedef BOOL(CALLBACK*PENUMLOADED_MODULES_CALLBACK)(LPSTR,ULONG,ULONG,PVOID);
 typedef BOOL(CALLBACK*PSYMBOL_REGISTERED_CALLBACK)(HANDLE,ULONG,PVOID,PVOID);
 typedef enum {
-	SymNone,
-	SymCoff,
-	SymCv,
-	SymPdb,
-	SymExport,
-	SymDeferred,
-	SymSym 
+  SymNone,
+  SymCoff,
+  SymCv,
+  SymPdb,
+  SymExport,
+  SymDeferred,
+  SymSym
 } SYM_TYPE;
 typedef struct _IMAGEHLP_SYMBOL {
-	DWORD SizeOfStruct; 
-	DWORD Address; 
-	DWORD Size; 
-	DWORD Flags; 
-	DWORD MaxNameLength; 
-	CHAR Name[1]; 
+  DWORD SizeOfStruct;
+  DWORD Address;
+  DWORD Size;
+  DWORD Flags;
+  DWORD MaxNameLength;
+  CHAR Name[1];
 } IMAGEHLP_SYMBOL,*PIMAGEHLP_SYMBOL;
 typedef struct _IMAGEHLP_MODULE {
-	DWORD SizeOfStruct; 
-	DWORD BaseOfImage; 
-	DWORD ImageSize; 
-	DWORD TimeDateStamp; 
-	DWORD CheckSum; 
-	DWORD NumSyms; 
-	SYM_TYPE SymType; 
-	CHAR ModuleName[32]; 
-	CHAR ImageName[256]; 
-	CHAR LoadedImageName[256]; 
+  DWORD SizeOfStruct;
+  DWORD BaseOfImage;
+  DWORD ImageSize;
+  DWORD TimeDateStamp;
+  DWORD CheckSum;
+  DWORD NumSyms;
+  SYM_TYPE SymType;
+  CHAR ModuleName[32];
+  CHAR ImageName[256];
+  CHAR LoadedImageName[256];
 } IMAGEHLP_MODULE,*PIMAGEHLP_MODULE;
 typedef struct _IMAGEHLP_LINE {
-	DWORD SizeOfStruct; 
-	DWORD Key; 
-	DWORD LineNumber; 
-	PCHAR FileName; 
-	DWORD Address; 
+  DWORD SizeOfStruct;
+  DWORD Key;
+  DWORD LineNumber;
+  PCHAR FileName;
+  DWORD Address;
 } IMAGEHLP_LINE,*PIMAGEHLP_LINE;
 typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD {
-	DWORD SizeOfStruct; 
-	DWORD BaseOfImage; 
-	DWORD CheckSum; 
-	DWORD TimeDateStamp; 
-	CHAR FileName[MAX_PATH]; 
-	BOOLEAN Reparse; 
+  DWORD SizeOfStruct;
+  DWORD BaseOfImage;
+  DWORD CheckSum;
+  DWORD TimeDateStamp;
+  CHAR FileName[MAX_PATH];
+  BOOLEAN Reparse;
 } IMAGEHLP_DEFERRED_SYMBOL_LOAD,*PIMAGEHLP_DEFERRED_SYMBOL_LOAD;
 typedef struct _IMAGEHLP_DUPLICATE_SYMBOL {
-	DWORD SizeOfStruct; 
-	DWORD NumberOfDups; 
-	PIMAGEHLP_SYMBOL Symbol; 
-	ULONG SelectedSymbol; 
+  DWORD SizeOfStruct;
+  DWORD NumberOfDups;
+  PIMAGEHLP_SYMBOL Symbol;
+  ULONG SelectedSymbol;
 } IMAGEHLP_DUPLICATE_SYMBOL,*PIMAGEHLP_DUPLICATE_SYMBOL;
 typedef PVOID DIGEST_HANDLE;
 typedef BOOL(WINAPI*DIGEST_FUNCTION)(DIGEST_HANDLE refdata,PBYTE pData,DWORD dwLength);
@@ -244,73 +244,73 @@
 PIMAGE_NT_HEADERS _IMAGEHLPAPI CheckSumMappedFile(LPVOID,DWORD,LPDWORD,LPDWORD);
 DWORD _IMAGEHLPAPI MapFileAndCheckSumA(LPSTR,LPDWORD,LPDWORD);
 DWORD _IMAGEHLPAPI MapFileAndCheckSumW(PWSTR,LPDWORD,LPDWORD);
-BOOL _IMAGEHLPAPI TouchFileTimes(HANDLE,LPSYSTEMTIME); 
-BOOL _IMAGEHLPAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD); 
-HANDLE _IMAGEHLPAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR); 
+BOOL _IMAGEHLPAPI TouchFileTimes(HANDLE,LPSYSTEMTIME);
+BOOL _IMAGEHLPAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD);
+HANDLE _IMAGEHLPAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR);
 HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR);
-BOOL _IMAGEHLPAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS); 
-BOOL _IMAGEHLPAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD); 
-BOOL _IMAGEHLPAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); 
-BOOL _IMAGEHLPAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); 
-BOOL _IMAGEHLPAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG*, OUT ULONG*, IN OUT ULONG*, IN ULONG);
-
-PLOADED_IMAGE _IMAGEHLPAPI ImageLoad(LPSTR,LPSTR); 
-BOOL _IMAGEHLPAPI ImageUnload(PLOADED_IMAGE); 
-PIMAGE_NT_HEADERS _IMAGEHLPAPI ImageNtHeader(IN PVOID); 
-PVOID _IMAGEHLPAPI ImageDirectoryEntryToData(IN PVOID,IN BOOLEAN,IN USHORT,OUT PULONG); 
-PIMAGE_SECTION_HEADER _IMAGEHLPAPI ImageRvaToSection(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG); 
-PVOID _IMAGEHLPAPI ImageRvaToVa(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG,IN OUT PIMAGE_SECTION_HEADER*); 
-BOOL _IMAGEHLPAPI MapAndLoad(LPSTR,LPSTR,PLOADED_IMAGE,BOOL,BOOL); 
-BOOL _IMAGEHLPAPI GetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY); 
+BOOL _IMAGEHLPAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS);
+BOOL _IMAGEHLPAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD);
+BOOL _IMAGEHLPAPI BindImage(__W32_IN LPSTR,__W32_IN LPSTR,__W32_IN LPSTR);
+BOOL _IMAGEHLPAPI BindImageEx(__W32_IN DWORD,__W32_IN LPSTR,__W32_IN LPSTR,__W32_IN LPSTR,__W32_IN PIMAGEHLP_STATUS_ROUTINE);
+BOOL _IMAGEHLPAPI ReBaseImage(__W32_IN LPSTR,__W32_IN LPSTR,__W32_IN BOOL, __W32_IN BOOL,__W32_IN BOOL, __W32_IN ULONG, __W32_OUT ULONG*, __W32_OUT ULONG*, __W32_OUT ULONG*, __W32_IN __W32_OUT ULONG*, __W32_IN ULONG);
+
+PLOADED_IMAGE _IMAGEHLPAPI ImageLoad(LPSTR,LPSTR);
+BOOL _IMAGEHLPAPI ImageUnload(PLOADED_IMAGE);
+PIMAGE_NT_HEADERS _IMAGEHLPAPI ImageNtHeader(__W32_IN PVOID);
+PVOID _IMAGEHLPAPI ImageDirectoryEntryToData(__W32_IN PVOID,__W32_IN BOOLEAN,__W32_IN USHORT,__W32_OUT PULONG);
+PIMAGE_SECTION_HEADER _IMAGEHLPAPI ImageRvaToSection(__W32_IN PIMAGE_NT_HEADERS,__W32_IN PVOID,__W32_IN ULONG);
+PVOID _IMAGEHLPAPI ImageRvaToVa(__W32_IN PIMAGE_NT_HEADERS,__W32_IN PVOID,__W32_IN ULONG,__W32_IN __W32_OUT PIMAGE_SECTION_HEADER*);
+BOOL _IMAGEHLPAPI MapAndLoad(LPSTR,LPSTR,PLOADED_IMAGE,BOOL,BOOL);
+BOOL _IMAGEHLPAPI GetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY);
 DWORD _IMAGEHLPAPI GetImageUnusedHeaderBytes(PLOADED_IMAGE,LPDWORD);
 BOOL _IMAGEHLPAPI SetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY);
-BOOL _IMAGEHLPAPI UnMapAndLoad(PLOADED_IMAGE); 
-PIMAGE_DEBUG_INFORMATION _IMAGEHLPAPI MapDebugInformation(HANDLE,LPSTR,LPSTR,DWORD); 
-BOOL _IMAGEHLPAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); 
-HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); 
+BOOL _IMAGEHLPAPI UnMapAndLoad(PLOADED_IMAGE);
+PIMAGE_DEBUG_INFORMATION _IMAGEHLPAPI MapDebugInformation(HANDLE,LPSTR,LPSTR,DWORD);
+BOOL _IMAGEHLPAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION);
+HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR);
 BOOL _IMAGEHLPAPI SearchTreeForFile(LPSTR,LPSTR,LPSTR);
 BOOL _IMAGEHLPAPI MakeSureDirectoryPathExists(LPCSTR);
-DWORD _IMAGEHLPAPI WINAPI UnDecorateSymbolName(LPCSTR,LPSTR,DWORD, DWORD); 
+DWORD _IMAGEHLPAPI WINAPI UnDecorateSymbolName(LPCSTR,LPSTR,DWORD, DWORD);
 BOOL
 _IMAGEHLPAPI
 StackWalk(DWORD,HANDLE,HANDLE,LPSTACKFRAME,LPVOID,PREAD_PROCESS_MEMORY_ROUTINE,PFUNCTION_TABLE_ACCESS_ROUTINE,PGET_MODULE_BASE_ROUTINE,PTRANSLATE_ADDRESS_ROUTINE);
-LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersion(VOID); 
+LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersion(VOID);
 LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersionEx(LPAPI_VERSION);
-DWORD _IMAGEHLPAPI GetTimestampForLoadedLibrary(HMODULE); 
-BOOL _IMAGEHLPAPI RemovePrivateCvSymbolic(PCHAR,PCHAR*,ULONG*); 
+DWORD _IMAGEHLPAPI GetTimestampForLoadedLibrary(HMODULE);
+BOOL _IMAGEHLPAPI RemovePrivateCvSymbolic(PCHAR,PCHAR*,ULONG*);
 VOID _IMAGEHLPAPI RemoveRelocations(PCHAR);
-DWORD _IMAGEHLPAPI SymSetOptions(IN DWORD); 
-DWORD _IMAGEHLPAPI SymGetOptions(VOID); 
-BOOL _IMAGEHLPAPI SymCleanup(IN HANDLE); 
-BOOL _IMAGEHLPAPI SymEnumerateModules(IN HANDLE,IN PSYM_ENUMMODULES_CALLBACK,IN PVOID);
-BOOL _IMAGEHLPAPI SymEnumerateSymbols(IN HANDLE,IN DWORD,IN PSYM_ENUMSYMBOLS_CALLBACK,IN PVOID);
-BOOL _IMAGEHLPAPI EnumerateLoadedModules(IN HANDLE,IN PENUMLOADED_MODULES_CALLBACK,IN PVOID);
+DWORD _IMAGEHLPAPI SymSetOptions(__W32_IN DWORD);
+DWORD _IMAGEHLPAPI SymGetOptions(VOID);
+BOOL _IMAGEHLPAPI SymCleanup(__W32_IN HANDLE);
+BOOL _IMAGEHLPAPI SymEnumerateModules(__W32_IN HANDLE,__W32_IN PSYM_ENUMMODULES_CALLBACK,__W32_IN PVOID);
+BOOL _IMAGEHLPAPI SymEnumerateSymbols(__W32_IN HANDLE,__W32_IN DWORD,__W32_IN PSYM_ENUMSYMBOLS_CALLBACK,__W32_IN PVOID);
+BOOL _IMAGEHLPAPI EnumerateLoadedModules(__W32_IN HANDLE,__W32_IN PENUMLOADED_MODULES_CALLBACK,__W32_IN PVOID);
 LPVOID _IMAGEHLPAPI SymFunctionTableAccess(HANDLE,DWORD);
-BOOL _IMAGEHLPAPI SymGetModuleInfo(IN HANDLE,IN DWORD,OUT PIMAGEHLP_MODULE); 
-DWORD _IMAGEHLPAPI SymGetModuleBase(IN HANDLE,IN DWORD); 
-BOOL _IMAGEHLPAPI SymGetSymFromAddr(IN HANDLE,IN DWORD,OUT PDWORD,OUT PIMAGEHLP_SYMBOL); 
-BOOL _IMAGEHLPAPI SymGetSymFromName(IN HANDLE,IN LPSTR,OUT PIMAGEHLP_SYMBOL);
-BOOL _IMAGEHLPAPI SymGetSymNext(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); 
-BOOL _IMAGEHLPAPI SymGetSymPrev(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); 
-BOOL _IMAGEHLPAPI SymGetLineFromAddr(IN HANDLE,IN DWORD,OUT PDWORD,OUT PIMAGEHLP_LINE);
-BOOL _IMAGEHLPAPI SymGetLineFromName(IN HANDLE,IN LPSTR,IN LPSTR,IN DWORD,OUT PLONG,IN OUT PIMAGEHLP_LINE);
-BOOL _IMAGEHLPAPI SymGetLineNext(IN HANDLE,IN OUT PIMAGEHLP_LINE); 
-BOOL _IMAGEHLPAPI SymGetLinePrev(IN HANDLE,IN OUT PIMAGEHLP_LINE); 
-BOOL _IMAGEHLPAPI SymMatchFileName(IN LPSTR,IN LPSTR,OUT LPSTR*,OUT LPSTR*);
-BOOL _IMAGEHLPAPI SymInitialize(IN HANDLE,IN LPSTR,IN BOOL); 
-BOOL _IMAGEHLPAPI SymGetSearchPath(IN HANDLE,OUT LPSTR,IN DWORD); 
-BOOL _IMAGEHLPAPI SymSetSearchPath(IN HANDLE,IN LPSTR); 
-BOOL _IMAGEHLPAPI SymLoadModule(IN HANDLE,IN HANDLE,IN PSTR,IN PSTR,IN DWORD,IN DWORD); 
-BOOL _IMAGEHLPAPI SymUnloadModule(IN HANDLE,IN DWORD); 
-BOOL _IMAGEHLPAPI SymUnDName(IN PIMAGEHLP_SYMBOL,OUT LPSTR,IN DWORD); 
-BOOL _IMAGEHLPAPI SymRegisterCallback(IN HANDLE,IN PSYMBOL_REGISTERED_CALLBACK,IN PVOID);
-BOOL _IMAGEHLPAPI ImageGetDigestStream(IN HANDLE,IN DWORD,IN DIGEST_FUNCTION,IN DIGEST_HANDLE); 
-BOOL _IMAGEHLPAPI ImageAddCertificate(IN HANDLE,IN LPWIN_CERTIFICATE,OUT PDWORD); 
-BOOL _IMAGEHLPAPI ImageRemoveCertificate(IN HANDLE,IN DWORD); 
-BOOL _IMAGEHLPAPI ImageEnumerateCertificates(IN HANDLE,IN WORD,OUT PDWORD,IN OUT PDWORD OPTIONAL,IN OUT DWORD OPTIONAL); 
-BOOL _IMAGEHLPAPI ImageGetCertificateData(IN HANDLE,IN DWORD,OUT LPWIN_CERTIFICATE,IN OUT PDWORD); 
-BOOL _IMAGEHLPAPI ImageGetCertificateHeader(IN HANDLE,IN DWORD,IN OUT LPWIN_CERTIFICATE); 
-BOOL _IMAGEHLPAPI CopyPdb(CHAR const*,CHAR const*,BOOL); 
+BOOL _IMAGEHLPAPI SymGetModuleInfo(__W32_IN HANDLE,__W32_IN DWORD,__W32_OUT PIMAGEHLP_MODULE);
+DWORD _IMAGEHLPAPI SymGetModuleBase(__W32_IN HANDLE,__W32_IN DWORD);
+BOOL _IMAGEHLPAPI SymGetSymFromAddr(__W32_IN HANDLE,__W32_IN DWORD,__W32_OUT PDWORD,__W32_OUT PIMAGEHLP_SYMBOL);
+BOOL _IMAGEHLPAPI SymGetSymFromName(__W32_IN HANDLE,__W32_IN LPSTR,__W32_OUT PIMAGEHLP_SYMBOL);
+BOOL _IMAGEHLPAPI SymGetSymNext(__W32_IN HANDLE,__W32_IN __W32_OUT PIMAGEHLP_SYMBOL);
+BOOL _IMAGEHLPAPI SymGetSymPrev(__W32_IN HANDLE,__W32_IN __W32_OUT PIMAGEHLP_SYMBOL);
+BOOL _IMAGEHLPAPI SymGetLineFromAddr(__W32_IN HANDLE,__W32_IN DWORD,__W32_OUT PDWORD,__W32_OUT PIMAGEHLP_LINE);
+BOOL _IMAGEHLPAPI SymGetLineFromName(__W32_IN HANDLE,__W32_IN LPSTR,__W32_IN LPSTR,__W32_IN DWORD,__W32_OUT PLONG,__W32_IN __W32_OUT PIMAGEHLP_LINE);
+BOOL _IMAGEHLPAPI SymGetLineNext(__W32_IN HANDLE,__W32_IN __W32_OUT PIMAGEHLP_LINE);
+BOOL _IMAGEHLPAPI SymGetLinePrev(__W32_IN HANDLE,__W32_IN __W32_OUT PIMAGEHLP_LINE);
+BOOL _IMAGEHLPAPI SymMatchFileName(__W32_IN LPSTR,__W32_IN LPSTR,__W32_OUT LPSTR*,__W32_OUT LPSTR*);
+BOOL _IMAGEHLPAPI SymInitialize(__W32_IN HANDLE,__W32_IN LPSTR,__W32_IN BOOL);
+BOOL _IMAGEHLPAPI SymGetSearchPath(__W32_IN HANDLE,__W32_OUT LPSTR,__W32_IN DWORD);
+BOOL _IMAGEHLPAPI SymSetSearchPath(__W32_IN HANDLE,__W32_IN LPSTR);
+BOOL _IMAGEHLPAPI SymLoadModule(__W32_IN HANDLE,__W32_IN HANDLE,__W32_IN PSTR,__W32_IN PSTR,__W32_IN DWORD,__W32_IN DWORD);
+BOOL _IMAGEHLPAPI SymUnloadModule(__W32_IN HANDLE,__W32_IN DWORD);
+BOOL _IMAGEHLPAPI SymUnDName(__W32_IN PIMAGEHLP_SYMBOL,__W32_OUT LPSTR,__W32_IN DWORD);
+BOOL _IMAGEHLPAPI SymRegisterCallback(__W32_IN HANDLE,__W32_IN PSYMBOL_REGISTERED_CALLBACK,__W32_IN PVOID);
+BOOL _IMAGEHLPAPI ImageGetDigestStream(__W32_IN HANDLE,__W32_IN DWORD,__W32_IN DIGEST_FUNCTION,__W32_IN DIGEST_HANDLE);
+BOOL _IMAGEHLPAPI ImageAddCertificate(__W32_IN HANDLE,__W32_IN LPWIN_CERTIFICATE,__W32_OUT PDWORD);
+BOOL _IMAGEHLPAPI ImageRemoveCertificate(__W32_IN HANDLE,__W32_IN DWORD);
+BOOL _IMAGEHLPAPI ImageEnumerateCertificates(__W32_IN HANDLE,__W32_IN WORD,__W32_OUT PDWORD,__W32_IN __W32_OUT PDWORD __W32_OPTIONAL,__W32_IN __W32_OUT DWORD __W32_OPTIONAL);
+BOOL _IMAGEHLPAPI ImageGetCertificateData(__W32_IN HANDLE,__W32_IN DWORD,__W32_OUT LPWIN_CERTIFICATE,__W32_IN __W32_OUT PDWORD);
+BOOL _IMAGEHLPAPI ImageGetCertificateHeader(__W32_IN HANDLE,__W32_IN DWORD,__W32_IN __W32_OUT LPWIN_CERTIFICATE);
+BOOL _IMAGEHLPAPI CopyPdb(CHAR const*,CHAR const*,BOOL);
 BOOL _IMAGEHLPAPI RemovePrivateCvSymbolicEx(PCHAR,ULONG,PCHAR*,ULONG*);
 
 #endif /* RC_INVOKED */
@@ -319,7 +319,7 @@
 #define MapFileAndCheckSum MapFileAndCheckSumW
 #else
 #define MapFileAndCheckSum MapFileAndCheckSumA
-#endif 
+#endif
 
 #ifdef __cplusplus
 }
diff -ru w32api-3.6.orig/include/rpcdce.h w32api-3.6/include/rpcdce.h
--- w32api-3.6.orig/include/rpcdce.h	2004-09-06 00:46:58.000000000 +0930
+++ w32api-3.6/include/rpcdce.h	2006-02-06 16:41:14.000000000 +1030
@@ -9,10 +9,10 @@
 #endif
 #include <basetyps.h>
 
-#define IN
-#define OUT
-#ifndef OPTIONAL
-#define OPTIONAL
+#define __W32_IN
+#define __W32_OUT
+#ifndef __W32_OPTIONAL
+#define __W32_OPTIONAL
 #endif
 #define uuid_t UUID
 #define rpc_binding_handle_t RPC_BINDING_HANDLE
diff -ru w32api-3.6.orig/include/rpcnsi.h w32api-3.6/include/rpcnsi.h
--- w32api-3.6.orig/include/rpcnsi.h	2002-04-10 06:47:17.000000000 +0930
+++ w32api-3.6/include/rpcnsi.h	2006-02-06 16:41:14.000000000 +1030
@@ -34,8 +34,8 @@
 RPC_STATUS RPC_ENTRY RpcNsProfileEltInqBeginA(unsigned long,unsigned char*,unsigned long,RPC_IF_ID*,unsigned long,unsigned long,unsigned char*,RPC_NS_HANDLE*);
 RPC_STATUS RPC_ENTRY RpcNsProfileEltInqNextA(RPC_NS_HANDLE,RPC_IF_ID*,unsigned char**,unsigned long*,unsigned char**);
 RPC_STATUS RPC_ENTRY RpcNsProfileEltInqDone(RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqNext(IN  RPC_NS_HANDLE,OUT UUID*);
-RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqDone(IN OUT RPC_NS_HANDLE*);
+RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqNext(__W32_IN  RPC_NS_HANDLE,__W32_OUT UUID*);
+RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqDone(__W32_IN __W32_OUT RPC_NS_HANDLE*);
 RPC_STATUS RPC_ENTRY RpcNsEntryExpandNameA(unsigned long,unsigned char*,unsigned char**);
 RPC_STATUS RPC_ENTRY RpcNsMgmtBindingUnexportA(unsigned long,unsigned char*,RPC_IF_ID*,unsigned long,UUID_VECTOR*);
 RPC_STATUS RPC_ENTRY RpcNsMgmtEntryCreateA(unsigned long,unsigned char*);
diff -ru w32api-3.6.orig/include/rpcnsip.h w32api-3.6/include/rpcnsip.h
--- w32api-3.6.orig/include/rpcnsip.h	2002-04-10 06:47:17.000000000 +0930
+++ w32api-3.6/include/rpcnsip.h	2006-02-06 16:48:02.000000000 +1030
@@ -8,14 +8,15 @@
 extern "C" {
 #endif
 typedef struct {
-	RPC_NS_HANDLE LookupContext;
-	RPC_BINDING_HANDLE ProposedHandle;
-	RPC_BINDING_VECTOR *Bindings;
+  RPC_NS_HANDLE LookupContext;
+  RPC_BINDING_HANDLE ProposedHandle;
+  RPC_BINDING_VECTOR *Bindings;
 } RPC_IMPORT_CONTEXT_P,*PRPC_IMPORT_CONTEXT_P;
-RPC_STATUS RPC_ENTRY I_RpcNsGetBuffer(IN PRPC_MESSAGE);
-RPC_STATUS RPC_ENTRY I_RpcNsSendReceive(IN PRPC_MESSAGE,OUT RPC_BINDING_HANDLE*);
-void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS);
-RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE);
+
+RPC_STATUS RPC_ENTRY I_RpcNsGetBuffer(__W32_IN PRPC_MESSAGE);
+RPC_STATUS RPC_ENTRY I_RpcNsSendReceive(__W32_IN PRPC_MESSAGE,__W32_OUT RPC_BINDING_HANDLE*);
+void RPC_ENTRY I_RpcNsRaiseException(__W32_IN PRPC_MESSAGE,__W32_IN RPC_STATUS);
+RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(__W32_IN PRPC_MESSAGE);
 RPC_STATUS RPC_ENTRY I_NsServerBindSearch(void);
 RPC_STATUS RPC_ENTRY I_NsClientBindSearch(void);
 void RPC_ENTRY I_NsClientBindDone(void);
diff -ru w32api-3.6.orig/include/windef.h w32api-3.6/include/windef.h
--- w32api-3.6.orig/include/windef.h	2002-10-15 05:53:39.000000000 +0930
+++ w32api-3.6/include/windef.h	2006-02-06 16:41:14.000000000 +1030
@@ -54,10 +54,10 @@
 #ifndef TRUE
 #define TRUE 1
 #endif
-#define IN
-#define OUT
-#ifndef OPTIONAL
-#define OPTIONAL
+#define __W32_IN
+#define __W32_OUT
+#ifndef __W32_OPTIONAL
+#define __W32_OPTIONAL
 #endif
 
 #ifdef __GNUC__
