From feef8df7bc618c1af268c7319ea4f015872a47f9 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Sat, 22 Jul 2006 12:06:11 +0000 Subject: [PATCH] 2006-07-20 Elias Naur * include/devguid.h: Add new file with missing GUID_DEVCLASS_* declarations. They were extracted from the registry with a script. * lib/devguid.c: Add new file with the implementation of the missing GUIDs. * lib/Makefile.in: Add devguid.c to UUID_SOURCES and UUID_OBJS. --- winsup/w32api/ChangeLog | 8 ++++ winsup/w32api/include/devguid.h | 65 +++++++++++++++++++++++++++++++++ winsup/w32api/lib/Makefile.in | 4 +- winsup/w32api/lib/devguid.c | 61 +++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 winsup/w32api/include/devguid.h create mode 100644 winsup/w32api/lib/devguid.c diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index ea9ee7c0f..4ba0cec6d 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -2,6 +2,14 @@ * lib/uuid.c: Remove. +2006-07-20 Elias Naur + + * include/devguid.h: Add new file with missing GUID_DEVCLASS_* + declarations. They were extracted from the registry with a script. + * lib/devguid.c: Add new file with the implementation of the + missing GUIDs. + * lib/Makefile.in: Add devguid.c to UUID_SOURCES and UUID_OBJS. + 2006-07-19 Elias Naur * include/winuser.h (WM_INPUT): Add missing Raw Input diff --git a/winsup/w32api/include/devguid.h b/winsup/w32api/include/devguid.h new file mode 100644 index 000000000..817a162e6 --- /dev/null +++ b/winsup/w32api/include/devguid.h @@ -0,0 +1,65 @@ +#ifndef _DEVGUID_H +#define _DEVGUID_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +extern const GUID GUID_DEVCLASS_WCEUSBS; +extern const GUID GUID_DEVCLASS_USB; +extern const GUID GUID_DEVCLASS_PNPPRINTERS; +extern const GUID GUID_DEVCLASS_DOT4; +extern const GUID GUID_DEVCLASS_DOT4PRINT; +extern const GUID GUID_DEVCLASS_CDROM; +extern const GUID GUID_DEVCLASS_COMPUTER; +extern const GUID GUID_DEVCLASS_DISKDRIVE; +extern const GUID GUID_DEVCLASS_DISPLAY; +extern const GUID GUID_DEVCLASS_FDC; +extern const GUID GUID_DEVCLASS_HDC; +extern const GUID GUID_DEVCLASS_KEYBOARD; +extern const GUID GUID_DEVCLASS_MEDIA; +extern const GUID GUID_DEVCLASS_MODEM; +extern const GUID GUID_DEVCLASS_MONITOR; +extern const GUID GUID_DEVCLASS_MOUSE; +extern const GUID GUID_DEVCLASS_MTD; +extern const GUID GUID_DEVCLASS_MULTIFUNCTION; +extern const GUID GUID_DEVCLASS_NET; +extern const GUID GUID_DEVCLASS_NETCLIENT; +extern const GUID GUID_DEVCLASS_NETSERVICE; +extern const GUID GUID_DEVCLASS_NETTRANS; +extern const GUID GUID_DEVCLASS_PCMCIA; +extern const GUID GUID_DEVCLASS_PORTS; +extern const GUID GUID_DEVCLASS_PRINTER; +extern const GUID GUID_DEVCLASS_SCSIADAPTER; +extern const GUID GUID_DEVCLASS_SYSTEM; +extern const GUID GUID_DEVCLASS_UNKNOWN; +extern const GUID GUID_DEVCLASS_FLOPPYDISK; +extern const GUID GUID_DEVCLASS_PROCESSOR; +extern const GUID GUID_DEVCLASS_MULTIPORTSERIAL; +extern const GUID GUID_DEVCLASS_SMARTCARDREADER; +extern const GUID GUID_DEVCLASS_VOLUMESNAPSHOT; +extern const GUID GUID_DEVCLASS_1394DEBUG; +extern const GUID GUID_DEVCLASS_1394; +extern const GUID GUID_DEVCLASS_INFRARED; +extern const GUID GUID_DEVCLASS_IMAGE; +extern const GUID GUID_DEVCLASS_TAPEDRIVE; +extern const GUID GUID_DEVCLASS_VOLUME; +extern const GUID GUID_DEVCLASS_BATTERY; +extern const GUID GUID_DEVCLASS_HIDCLASS; +extern const GUID GUID_DEVCLASS_61883; +extern const GUID GUID_DEVCLASS_LEGACYDRIVER; +extern const GUID GUID_DEVCLASS_SDHOST; +extern const GUID GUID_DEVCLASS_AVC; +extern const GUID GUID_DEVCLASS_ENUM1394; +extern const GUID GUID_DEVCLASS_MEDIUMCHANGER; +extern const GUID GUID_DEVCLASS_NTAPM; +extern const GUID GUID_DEVCLASS_SBP2; +extern const GUID GUID_DEVCLASS_BLUETOOTH; +extern const GUID GUID_DEVCLASS_PROBES; +#ifdef __cplusplus +} +#endif +#endif /* _DEVGUID_H */ diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index f969f9e48..b678d2b1f 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -120,7 +120,7 @@ UUID_OBJS = mshtml-uuid.o msxml-uuid.o unknwn-uuid.o \ objsafe-uuid.o oaidl-uuid.o docobj-uuid.o comcat-uuid.o \ exdisp-uuid.o mlang-uuid.o objidl-uuid.o cguid-uuid.o \ olectlid-uuid.o ativscp-uuid.o urlmon-uuid.o hlink-uuid.o \ - hlguids-uuid.o extras-uuid.o + hlguids-uuid.o extras-uuid.o devguid.o EXTRA_OBJS = shell32.o scrnsave.o scrnsavw.o largeint.o \ $(UUID_OBJS) kernel32.o ws2_32.o UUID_SOURCES = mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \ @@ -128,7 +128,7 @@ UUID_SOURCES = mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \ objsafe-uuid.c oaidl-uuid.c docobj-uuid.c comcat-uuid.c \ exdisp-uuid.c mlang-uuid.c objidl-uuid.c cguid-uuid.c \ olectlid-uuid.c ativscp-uuid.c urlmon-uuid.c hlink-uuid.c \ - hlguids-uuid.c extras-uuid.c + hlguids-uuid.c extras-uuid.c devguid.c SOURCES = scrnsave.c shell32.c largeint.c $(UUID_SOURCES)\ res.rc test.c kernel32.c ws2_32.c diff --git a/winsup/w32api/lib/devguid.c b/winsup/w32api/lib/devguid.c new file mode 100644 index 000000000..7e4c5f118 --- /dev/null +++ b/winsup/w32api/lib/devguid.c @@ -0,0 +1,61 @@ +/* + Generate GUIDs for device classes for PnP and SetupAPI + + This file was generated by extracting the UUIDs from the registry at + \\SYSTEM\\CurrentControlSet\\Control\\Class and pairing them with + the class name in the registry value "Class" with GUID_DEVCLASS_ prepended + */ + +#define INITGUID +#include +DEFINE_GUID(GUID_DEVCLASS_WCEUSBS, 0x25DBCE51, 0x6C8F, 0x4A72, 0x8A, 0x6D, 0xB5, 0x4C, 0x2B, 0x4F, 0xC8, 0x35); +DEFINE_GUID(GUID_DEVCLASS_USB, 0x36FC9E60, 0xC465, 0x11CF, 0x80, 0x56, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(GUID_DEVCLASS_PNPPRINTERS, 0x4658EE7E, 0xF050, 0x11D1, 0xB6, 0xBD, 0x00, 0xC0, 0x4F, 0xA3, 0x72, 0xA7); +DEFINE_GUID(GUID_DEVCLASS_DOT4, 0x48721B56, 0x6795, 0x11D2, 0xB1, 0xA8, 0x00, 0x80, 0xC7, 0x2E, 0x74, 0xA2); +DEFINE_GUID(GUID_DEVCLASS_DOT4PRINT, 0x49CE6AC8, 0x6F86, 0x11D2, 0xB1, 0xE5, 0x00, 0x80, 0xC7, 0x2E, 0x74, 0xA2); +DEFINE_GUID(GUID_DEVCLASS_CDROM, 0x4D36E965, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_COMPUTER, 0x4D36E966, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_DISKDRIVE, 0x4D36E967, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_DISPLAY, 0x4D36E968, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_FDC, 0x4D36E969, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_HDC, 0x4D36E96A, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_KEYBOARD, 0x4D36E96B, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MEDIA, 0x4D36E96C, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MODEM, 0x4D36E96D, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MONITOR, 0x4D36E96E, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MOUSE, 0x4D36E96F, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MTD, 0x4D36E970, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_MULTIFUNCTION, 0x4D36E971, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NET, 0x4D36E972, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2b, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NETCLIENT, 0x4D36E973, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NETSERVICE, 0x4D36E974, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_NETTRANS, 0x4D36E975, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_PCMCIA, 0x4D36E977, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_PORTS, 0x4D36E978, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_PRINTER, 0x4D36E979, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_SCSIADAPTER, 0x4D36E97B, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_SYSTEM, 0x4D36E97D, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_UNKNOWN, 0x4D36E97E, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_FLOPPYDISK, 0x4D36E980, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_PROCESSOR, 0x50127DC3, 0x0F36, 0x415E, 0xA6, 0xCC, 0x4C, 0xB3, 0xBE, 0x91, 0x0B, 0x65); +DEFINE_GUID(GUID_DEVCLASS_MULTIPORTSERIAL, 0x50906CB8, 0xBA12, 0x11D1, 0xBF, 0x5D, 0x00, 0x00, 0xF8, 0x05, 0xF5, 0x30); +DEFINE_GUID(GUID_DEVCLASS_SMARTCARDREADER, 0x50DD5230, 0xBA8A, 0x11D1, 0xBF, 0x5D, 0x00, 0x00, 0xF8, 0x05, 0xF5, 0x30); +DEFINE_GUID(GUID_DEVCLASS_VOLUMESNAPSHOT, 0x533C5B84, 0xEC70, 0x11D2, 0x95, 0x05, 0x00, 0xC0, 0x4F, 0x79, 0xDE, 0xAF); +DEFINE_GUID(GUID_DEVCLASS_1394DEBUG, 0x66F250D6, 0x7801, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24); +DEFINE_GUID(GUID_DEVCLASS_1394, 0x6BDD1FC1, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_DEVCLASS_INFRARED, 0x6BDD1FC5, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_DEVCLASS_IMAGE, 0x6BDD1FC6, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_DEVCLASS_TAPEDRIVE, 0x6D807884, 0x7D21, 0x11CF, 0x80, 0x1C, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_VOLUME, 0x71A27CDD, 0x812A, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_DEVCLASS_BATTERY, 0x72631E54, 0x78A4, 0x11D0, 0xBC, 0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_DEVCLASS_HIDCLASS, 0x745A17A0, 0x74D3, 0x11D0, 0xB6, 0xFE, 0x00, 0xA0, 0xC9, 0x0F, 0x57, 0xDA); +DEFINE_GUID(GUID_DEVCLASS_61883, 0x7EBEFBC0, 0x3200, 0x11D2, 0xB4, 0xC2, 0x00, 0xA0, 0xC9, 0x69, 0x7D, 0x07); +DEFINE_GUID(GUID_DEVCLASS_LEGACYDRIVER, 0x8ECC055D, 0x047F, 0x11D1, 0xA5, 0x37, 0x00, 0x00, 0xF8, 0x75, 0x3E, 0xD1); +DEFINE_GUID(GUID_DEVCLASS_SDHOST, 0xA0A588A4, 0xC46F, 0x4B37, 0xB7, 0xEA, 0xC8, 0x2F, 0xE8, 0x98, 0x70, 0xC6); +DEFINE_GUID(GUID_DEVCLASS_AVC, 0xC06FF265, 0xAE09, 0x48F0, 0x81, 0x2C, 0x16, 0x75, 0x3D, 0x7C, 0xBA, 0x83); +DEFINE_GUID(GUID_DEVCLASS_ENUM1394, 0xC459DF55, 0xDB08, 0x11D1, 0xB0, 0x09, 0x00, 0xA0, 0xC9, 0x08, 0x1F, 0xF6); +DEFINE_GUID(GUID_DEVCLASS_MEDIUMCHANGER, 0xCE5939AE, 0xEBDE, 0x11D0, 0xB1, 0x81, 0x00, 0x00, 0xF8, 0x75, 0x3E, 0xC4); +DEFINE_GUID(GUID_DEVCLASS_NTAPM, 0xD45B1C18, 0xC8FA, 0x11D1, 0x9F, 0x77, 0x00, 0x00, 0xF8, 0x05, 0xF5, 0x30); +DEFINE_GUID(GUID_DEVCLASS_SBP2, 0xD48179BE, 0xEC20, 0x11D1, 0xB6, 0xB8, 0x00, 0xC0, 0x4F, 0xA3, 0x72, 0xA7); +DEFINE_GUID(GUID_DEVCLASS_BLUETOOTH, 0xE0CBF06C, 0xCD8B, 0x4647, 0xBB, 0x8A, 0x26, 0x3B, 0x43, 0xF0, 0xF9, 0x74); +DEFINE_GUID(GUID_DEVCLASS_PROBES, 0xFD02DFAC, 0x6A7C, 0x4391, 0x97, 0xDA, 0xF8, 0x1F, 0xEF, 0x1F, 0xC9, 0xD3);