[ros-diffs] [ekohl] 13408: - Fix WDM-GUIDs. Patch by Filip Navara.

- Fix WDM-GUIDs. Patch by Filip Navara.
- Implement libwdmguid.a.
Modified: trunk/reactos/Makefile
Modified: trunk/reactos/include/ntos/ntpnp.h
Added: trunk/reactos/lib/wdmguid/
Added: trunk/reactos/lib/wdmguid/makefile
Added: trunk/reactos/lib/wdmguid/wdmguid.c
  _____  

Modified: trunk/reactos/Makefile
--- trunk/reactos/Makefile	2005-02-04 20:46:46 UTC (rev 13407)
+++ trunk/reactos/Makefile	2005-02-04 23:24:32 UTC (rev 13408)
@@ -42,7 +42,7 @@

 LIB_FSLIB = vfatlib
 
 # Static libraries
-LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh
adns dxguid strmiids crt rossym
+LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh
adns dxguid strmiids crt rossym wdmguid
 
 # Keyboard layout libraries
 DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus
  _____  

Modified: trunk/reactos/include/ntos/ntpnp.h
--- trunk/reactos/include/ntos/ntpnp.h	2005-02-04 20:46:46 UTC (rev
13407)
+++ trunk/reactos/include/ntos/ntpnp.h	2005-02-04 23:24:32 UTC (rev
13408)
@@ -30,29 +30,32 @@

  * Undocumented GUIDs used by NtGetPlugPlayEvent.
  */
 
-DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, 0x03B21C13, 0x11D3, 0x18D6,
0xA0, 0x00, 0xDB, 0x97, 0x2E, 0x52, 0x40, 0xC9);
-DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, 0x14689B54, 0x11D3,
0x0703, 0xA0, 0x00, 0xD2, 0x97, 0x2E, 0x52, 0x40, 0xC9);
-DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, 0x4AFA3D51, 0x11D0, 0x74A7, 0xA0,
0x00, 0x5E, 0xBE, 0x57, 0x28, 0x06, 0xC9);
-DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, 0x4AFA3D53, 0x11D0, 0x74A7, 0xA0,
0x00, 0x5E, 0xBE, 0x57, 0x28, 0x06, 0xC9);
-DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, 0x60DBD5FA, 0x11D2, 0xDDD2,
0xA0, 0x00, 0xB8, 0x97, 0x2E, 0x52, 0x40, 0xC9);
-DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x11D3, 0x194F,
0xA0, 0x00, 0xDC, 0x97, 0x2E, 0x52, 0x40, 0xC9);
-DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x11D0, 0x78A4, 0xAA,
0x00, 0xF7, 0xBC, 0x2A, 0xB3, 0xB7, 0x00);
-DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0x11D2, 0xD6C5, 0xA0,
0x00, 0xB5, 0x97, 0x2E, 0x52, 0x40, 0xC9);
-/* DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x11D0,
0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); */
-/* DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x11D0,
0x46F0, 0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97); */
-DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x11D0, 0x46F0, 0x60,
0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x11D0, 0x46F0, 0x60,
0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x11D0, 0x46F0,
0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_START_REQUEST, 0xCB3A400C, 0x11D0, 0x46F0,
0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, 0xCB3A400D, 0x11D0, 0x46F0,
0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, 0xCB3A400E, 0x11D0, 0x46F0,
0x60, 0x00, 0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_EJECT, 0xCB3A400F, 0x11D0, 0x46F0, 0x60, 0x00,
0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_NOOP, 0xCB3A4010, 0x11D0, 0x46F0, 0x60, 0x00,
0x8F, 0xB0, 0x3F, 0x05, 0x13, 0x97);
-DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, 0xCBF4C1F9, 0x11D3, 0x18D5,
0xA0, 0x00, 0xDB, 0x97, 0x2E, 0x52, 0x40, 0xC9);
-DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, 0xCE5AF000, 0x11D2, 0x80DD,
0xA0, 0x00, 0x8D, 0xA8, 0x4B, 0x6B, 0x69, 0xC9);
-DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, 0xCF7B71E8, 0x11D2, 0xD8FD, 0xA0,
0x00, 0xB5, 0x97, 0x2E, 0x52, 0x40, 0xC9);
-DEFINE_GUID(GUID_DEVICE_EVENT_RBC, 0xD0744792, 0x11D2, 0xA98E, 0xA0,
0x00, 0x7A, 0x91, 0xF3, 0x8F, 0x06, 0xC9);
+DEFINE_GUID(GUID_DEVICE_STANDBY_VETOED, 0x03B21C13, 0x18D6, 0x11D3,
0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
+DEFINE_GUID(GUID_DEVICE_KERNEL_INITIATED_EJECT, 0x14689B54, 0x0703,
0x11D3, 0x97, 0xD2, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
+DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE, 0x4AFA3D51, 0x74A7, 0x11D0, 0xBE,
0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57);
+DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, 0x4AFA3D53, 0x74A7, 0x11D0, 0xBE,
0x5E, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57);
+DEFINE_GUID(GUID_DEVICE_REMOVAL_VETOED, 0x60DBD5FA, 0xDDD2, 0x11D2,
0x97, 0xB8, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
+DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x194F, 0x11D3,
0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
+DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x78A4, 0x11D0, 0xBC,
0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A);
+DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0xD6C5, 0x11D2, 0x97,
0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
+/* DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0,
0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); */
+/* DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0,
0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); */
+DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x46F0, 0x11D0, 0xB0,
0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x46F0, 0x11D0, 0xB0,
0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x46F0, 0x11D0,
0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_START_REQUEST, 0xCB3A400C, 0x46F0, 0x11D0,
0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_REMOVE_PENDING, 0xCB3A400D, 0x46F0, 0x11D0,
0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_QUERY_AND_REMOVE, 0xCB3A400E, 0x46F0, 0x11D0,
0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_EJECT, 0xCB3A400F, 0x46F0, 0x11D0, 0xB0, 0x8F,
0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_NOOP, 0xCB3A4010, 0x46F0, 0x11D0, 0xB0, 0x8F,
0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+DEFINE_GUID(GUID_DEVICE_WARM_EJECT_VETOED, 0xCBF4C1F9, 0x18D5, 0x11D3,
0x97, 0xDB, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
+DEFINE_GUID(GUID_DEVICE_SURPRISE_REMOVAL, 0xCE5AF000, 0x80DD, 0x11D2,
0xA8, 0x8D, 0x00, 0xA0, 0xC9, 0x69, 0x6B, 0x4B);
+DEFINE_GUID(GUID_DEVICE_EJECT_VETOED, 0xCF7B71E8, 0xD8FD, 0x11D2, 0x97,
0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
+DEFINE_GUID(GUID_DEVICE_EVENT_RBC, 0xD0744792, 0xA98E, 0x11D2, 0x91,
0x7A, 0x00, 0xA0, 0xC9, 0x06, 0x8F, 0xF3);
 
+
+#ifndef __GUIDS_ONLY__ /* This is defined to build libwdmguid.a */
+
 typedef enum _PLUGPLAY_EVENT_CATEGORY {
    HardwareProfileChangeEvent,
    TargetDeviceChangeEvent,
@@ -149,7 +152,7 @@
       } BlockedDriverNotification;
    };
 } PLUGPLAY_EVENT_BLOCK, *PPLUGPLAY_EVENT_BLOCK;
-            
+
 /*
  * NtGetPlugPlayEvent
  *
@@ -247,4 +250,6 @@
    PVOID Buffer,
    ULONG BufferSize);
 
+#endif /* __GUIDS_ONLY__ */
+
 #endif /* __NTPNP_H */
  _____  

Added: trunk/reactos/lib/wdmguid/makefile
--- trunk/reactos/lib/wdmguid/makefile	2005-02-04 20:46:46 UTC (rev
13407)
+++ trunk/reactos/lib/wdmguid/makefile	2005-02-04 23:24:32 UTC (rev
13408)
@@ -0,0 +1,24 @@

+# $Id$
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = library
+
+TARGET_NAME = wdmguid
+
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-I$(PATH_TO_TOP)/include/wine
+
+# require os code to explicitly request A/W version of
structs/functions
+TARGET_CFLAGS += -D_DISABLE_TIDENTS
+
+TARGET_OBJECTS = wdmguid.o
+ 
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+DEP_OBJECTS := $(TARGET_OBJECTS)
+
+TARGET_CLEAN = $(DEP_FILES)
+
+include $(PATH_TO_TOP)/tools/depend.mk
  _____  

Added: trunk/reactos/lib/wdmguid/wdmguid.c
--- trunk/reactos/lib/wdmguid/wdmguid.c	2005-02-04 20:46:46 UTC (rev
13407)
+++ trunk/reactos/lib/wdmguid/wdmguid.c	2005-02-04 23:24:32 UTC (rev
13408)
@@ -0,0 +1,11 @@

+
+#include <stdarg.h>
+
+#define COM_NO_WINDOWS_H
+#include "initguid.h"
+
+#include <ddk/wdmguid.h>
+#define __GUIDS_ONLY__
+#include <ntos/ntpnp.h>
+
+/* EOF */