[ros-diffs] [greatlrd] 26207: moref compatible fix betwin reactos ddk and ms DDK version 3790.1830

Author: greatlrd
Date: Fri Mar 30 19:13:14 2007
New Revision: 26207

URL: http://svn.reactos.org/svn/reactos?rev=26207&view=rev
Log:
moref compatible fix betwin reactos ddk and ms DDK version 3790.1830


Added:
    trunk/reactos/include/ddk/ntdd1934.h   (with props)
    trunk/reactos/include/ddk/oprghdlr.h   (with props)
    trunk/reactos/include/ddk/stireg.h   (with props)
Modified:
    trunk/reactos/include/ddk/d4iface.h

Modified: trunk/reactos/include/ddk/d4iface.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d4iface.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/d4iface.h (original)
+++ trunk/reactos/include/ddk/d4iface.h Fri Mar 30 19:13:14 2007
@@ -1,82 +1,47 @@
-/*
- * d4iface.h
- *
- * DOT4 interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __D4IFACE_H
-#define __D4IFACE_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+#ifndef _DOT4_IFACE_H
+#define _DOT4_IFACE_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define DOT4_MAX_CHANNELS                 128
-#define NO_TIMEOUT                        0
+typedef unsigned long CHANNEL_HANDLE;
+typedef CHANNEL_HANDLE *PCHANNEL_HANDLE;
 
-#define DOT4_CHANNEL                      0
-#define HP_MESSAGE_PROCESSOR              1
-#define PRINTER_CHANNEL                   2
-#define SCANNER_CHANNEL                   4
-#define MIO_COMMAND_PROCESSOR             5
-#define ECHO_CHANNEL                      6
-#define FAX_SEND_CHANNEL                  7
-#define FAX_RECV_CHANNEL                  8
-#define DIAGNOSTIC_CHANNEL                9
-#define HP_RESERVED                       10
-#define IMAGE_DOWNLOAD                    11
-#define HOST_DATASTORE_UPLOAD             12
-#define HOST_DATASTORE_DOWNLOAD           13
-#define CONFIG_UPLOAD                     14
-#define CONFIG_DOWNLOAD                   15
-
-#define STREAM_TYPE_CHANNEL               1
-#define PACKET_TYPE_CHANNEL               2
-
-/* DOT4_ACTIVITY.ulMessage flags */
-#define DOT4_STREAM_RECEIVED              0x100
-#define DOT4_STREAM_CREDITS               0x101
-#define DOT4_MESSAGE_RECEIVED             0x102
-#define DOT4_DISCONNECT                   0x103
-#define DOT4_CHANNEL_CLOSED               0x105
-
-typedef unsigned long CHANNEL_HANDLE, *PCHANNEL_HANDLE;
-
-typedef struct _DOT4_ACTIVITY {
-  ULONG  ulMessage;
-  ULONG  ulByteCount;
-  CHANNEL_HANDLE  hChannel;
+typedef struct _DOT4_ACTIVITY
+{
+  ULONG ulMessage;
+  ULONG ulByteCount;
+  CHANNEL_HANDLE hChannel;
 } DOT4_ACTIVITY, *PDOT4_ACTIVITY;
 
-typedef struct _DOT4_WMI_XFER_INFO {
-  ULONG  ulStreamBytesWritten;
-  ULONG  ulStreamBytesRead;
-  ULONG  ulPacketBytesWritten;
-  ULONG  ulPacketBytesRead;
-} DOT4_WMI_XFER_INFO, *PDOT4_WMI_XFER_INFO;
+#define DOT4_MAX_CHANNELS                 128
+#define NO_TIMEOUT                          0
+#define STREAM_TYPE_CHANNEL                 1
+#define PACKET_TYPE_CHANNEL                 2
+#define DOT4_STREAM_RECEIVED            0x100
+#define DOT4_STREAM_CREDITS             0x101
+#define DOT4_MESSAGE_RECEIVED           0x102
+#define DOT4_DISCONNECT                 0x103
+#define DOT4_CHANNEL_CLOSED             0x105
+#define DOT4_CHANNEL                    0
+#define HP_MESSAGE_PROCESSOR            1
+#define PRINTER_CHANNEL                 2
+#define SCANNER_CHANNEL                 4
+#define MIO_COMMAND_PROCESSOR           5
+#define ECHO_CHANNEL                    6
+#define FAX_SEND_CHANNEL                7
+#define FAX_RECV_CHANNEL                8
+#define DIAGNOSTIC_CHANNEL              9
+#define HP_RESERVED                     10
+#define IMAGE_DOWNLOAD                  11
+#define HOST_DATASTORE_UPLOAD           12
+#define HOST_DATASTORE_DOWNLOAD         13
+#define CONFIG_UPLOAD                   14
+#define CONFIG_DOWNLOAD                 15
 
 #ifdef __cplusplus
 }
 #endif
+#endif
 
-#endif /* __D4IFACE_H */

Added: trunk/reactos/include/ddk/ntdd1934.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd1934.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/ntdd1934.h (added)
+++ trunk/reactos/include/ddk/ntdd1934.h Fri Mar 30 19:13:14 2007
@@ -1,0 +1,47 @@
+
+#ifndef _NTDD1394_H_
+#define _NTDD1394_H_
+
+#if (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _IEEE1394_VDEV_PNP_REQUEST
+{
+  ULONG fulFlags;
+  ULONG Reserved;
+  ULARGE_INTEGER InstanceId;
+  UCHAR DeviceId;
+} IEEE1394_VDEV_PNP_REQUEST,*PIEEE1394_VDEV_PNP_REQUEST;
+
+
+typedef struct _IEEE1394_API_REQUEST
+{
+  ULONG RequestNumber;
+  ULONG Flags;
+  union
+  {
+    IEEE1394_VDEV_PNP_REQUEST AddVirtualDevice;
+    IEEE1394_VDEV_PNP_REQUEST RemoveVirtualDevice;
+  } u;
+} IEEE1394_API_REQUEST, *PIEEE1394_API_REQUEST;
+
+#define IEEE1394_API_ADD_VIRTUAL_DEVICE           0x00000001
+#define IEEE1394_API_REMOVE_VIRTUAL_DEVICE        0x00000002
+#define IEEE1394_REQUEST_FLAG_UNICODE             0x00000001
+#define IEEE1394_REQUEST_FLAG_PERSISTENT          0x00000002
+#define IEEE1394_REQUEST_FLAG_USE_LOCAL_HOST_EUI  0x00000004
+#define BUS1394_VIRTUAL_DEVICE_LIST_KEY           L"Virtual Device List"
+#define BUS1394_LOCAL_HOST_INSTANCE_KEY           L"LOCAL HOST EUI64"
+#define IOCTL_IEEE1394_API_REQUEST                CTL_CODE(FILE_DEVICE_UNKNOWN, 0x100,
METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

Propchange: trunk/reactos/include/ddk/ntdd1934.h
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/include/ddk/oprghdlr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/oprghdlr.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/oprghdlr.h (added)
+++ trunk/reactos/include/ddk/oprghdlr.h Fri Mar 30 19:13:14 2007
@@ -1,0 +1,43 @@
+#include "wdm.h"
+
+#ifdef EXPORT
+  #undef EXPORT
+#endif
+#define EXPORT  __cdecl
+
+
+typedef VOID (EXPORT *PACPI_OP_REGION_CALLBACK)();
+
+typedef
+NTSTATUS
+(EXPORT *PACPI_OP_REGION_HANDLER) (ULONG AccessType,
+                                   PVOID OperationRegionObject,
+                                   ULONG Address,
+                                   ULONG Size,
+                                   PULONG Data,
+                                   ULONG_PTR Context,
+                                   PACPI_OP_REGION_CALLBACK CompletionHandler,
+                                   PVOID CompletionContext);
+
+NTSTATUS
+RegisterOpRegionHandler (IN PDEVICE_OBJECT DeviceObject,
+                         IN ULONG AccessType,
+                         IN ULONG RegionSpace,
+                         IN PACPI_OP_REGION_HANDLER Handler,
+                         IN PVOID Context, IN ULONG Flags,
+                         IN OUT PVOID *OperationRegionObject);
+
+NTSTATUS
+DeRegisterOpRegionHandler (IN PDEVICE_OBJECT DeviceObject,
+                           IN PVOID OperationRegionObject);
+
+#define ACPI_OPREGION_ACCESS_AS_RAW            0x1
+#define ACPI_OPREGION_ACCESS_AS_COOKED         0x2
+#define ACPI_OPREGION_REGION_SPACE_MEMORY      0x0
+#define ACPI_OPREGION_REGION_SPACE_IO          0x1
+#define ACPI_OPREGION_REGION_SPACE_PCI_CONFIG  0x2
+#define ACPI_OPREGION_REGION_SPACE_EC          0x3
+#define ACPI_OPREGION_REGION_SPACE_SMB         0x4
+#define ACPI_OPREGION_READ                     0x0
+#define ACPI_OPREGION_WRITE                    0x1
+#define ACPI_OPREGION_ACCESS_AT_HIGH_LEVEL     0x1

Propchange: trunk/reactos/include/ddk/oprghdlr.h
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/include/ddk/stireg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stireg.h?rev=2…
==============================================================================
--- trunk/reactos/include/ddk/stireg.h (added)
+++ trunk/reactos/include/ddk/stireg.h Fri Mar 30 19:13:14 2007
@@ -1,0 +1,39 @@
+#ifndef _STIREG_
+#define _STIREG_
+#define REGSTR_VAL_TYPE_W                           L"Type"
+#define REGSTR_VAL_VENDOR_NAME_W                    L"Vendor"
+#define REGSTR_VAL_DEVICETYPE_W                     L"DeviceType"
+#define REGSTR_VAL_DEVICESUBTYPE_W                  L"DeviceSubType"
+#define REGSTR_VAL_DEV_NAME_W                       L"DeviceName"
+#define REGSTR_VAL_DRIVER_DESC_W                    L"DriverDesc"
+#define REGSTR_VAL_FRIENDLY_NAME_W                  L"FriendlyName"
+#define REGSTR_VAL_GENERIC_CAPS_W                   L"Capabilities"
+#define REGSTR_VAL_HARDWARE_W                       L"HardwareConfig"
+#define REGSTR_VAL_HARDWARE                         TEXT("HardwareConfig")
+#define REGSTR_VAL_DEVICE_NAME_W                    L"DriverDesc"
+#define REGSTR_VAL_DATA_W                           L"DeviceData"
+#define REGSTR_VAL_GUID_W                           L"GUID"
+#define REGSTR_VAL_GUID                             TEXT("GUID")
+#define REGSTR_VAL_LAUNCH_APPS_W                    L"LaunchApplications"
+#define REGSTR_VAL_LAUNCH_APPS                      TEXT("LaunchApplications")
+#define REGSTR_VAL_LAUNCHABLE_W                     L"Launchable"
+#define REGSTR_VAL_LAUNCHABLE                       TEXT("Launchable")
+#define IS_DIGITAL_CAMERA_STR                       L"IsDigitalCamera"
+#define IS_DIGITAL_CAMERA_VAL                       1
+#define SUPPORTS_MSCPLUS_STR                        L"SupportsMSCPlus"
+#define SUPPORTS_MSCPLUS_VAL                        1
+#define STI_DEVICE_VALUE_TWAIN_NAME                 L"TwainDS"
+#define STI_DEVICE_VALUE_ISIS_NAME                  L"ISISDriverName"
+#define STI_DEVICE_VALUE_ICM_PROFILE                L"ICMProfile"
+#define STI_DEVICE_VALUE_DEFAULT_LAUNCHAPP          L"DefaultLaunchApp"
+#define STI_DEVICE_VALUE_TIMEOUT                    L"PollTimeout"
+#define STI_DEVICE_VALUE_DISABLE_NOTIFICATIONS      L"DisableNotifications"
+#define REGSTR_VAL_BAUDRATE                         L"BaudRate"
+#define STI_DEVICE_VALUE_TWAIN_NAME_A               "TwainDS"
+#define STI_DEVICE_VALUE_ISIS_NAME_A                "ISISDriverName"
+#define STI_DEVICE_VALUE_ICM_PROFILE_A              "ICMProfile"
+#define STI_DEVICE_VALUE_DEFAULT_LAUNCHAPP_A        "DefaultLaunchApp"
+#define STI_DEVICE_VALUE_TIMEOUT_A                  "PollTimeout"
+#define STI_DEVICE_VALUE_DISABLE_NOTIFICATIONS_A    "DisableNotifications"
+#define REGSTR_VAL_BAUDRATE_A                       "BaudRate"
+#endif

Propchange: trunk/reactos/include/ddk/stireg.h
------------------------------------------------------------------------------
    svn:eol-style = native