From bea96d1d84d44661f263e5a28cc37b99ccfb17c2 Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Tue, 5 Nov 2019 09:58:57 +0900 Subject: fix: MS OS 2.0 Property value --- tmk_core/protocol/webusb.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'tmk_core') diff --git a/tmk_core/protocol/webusb.h b/tmk_core/protocol/webusb.h index c0b45c758e..ff3b8f65b2 100644 --- a/tmk_core/protocol/webusb.h +++ b/tmk_core/protocol/webusb.h @@ -77,13 +77,26 @@ typedef struct { #define MS_OS_20_DESCRIPTOR_FUNCTION_HEADER_LENGTH 160 #define MS_OS_20_DESCRIPTOR_SET_TOTAL_LENGTH 178 // Sum of `.Length`s in MS_OS_20_Descriptor in WebUSB.c -#define MS_OS_20_DESCRIPTOR_COMPATIBILITY_ID u8"WINUSB\0" +#define MS_OS_20_DESCRIPTOR_COMPATIBILITY_ID { 'W', 'I', 'N', 'U', 'S', 'B', 0, 0 } #define MS_OS_20_DESCRIPTOR_SUB_COMPATIBILITY_ID {0, 0, 0, 0, 0, 0, 0, 0} #define MS_OS_20_PROPERTY_NAME_LENGTH 42 -#define MS_OS_20_PROPERTY_NAME u8"DeviceInterfaceGUIDs\0" +#define MS_OS_20_PROPERTY_NAME { \ + 'D', 0x00, 'e', 0x00, 'v', 0x00, 'i', 0x00, 'c', 0x00, 'e', 0x00, \ + 'I', 0x00, 'n', 0x00, 't', 0x00, 'e', 0x00, 'r', 0x00, 'f', 0x00, \ + 'a', 0x00, 'c', 0x00, 'e', 0x00, 'G', 0x00, 'U', 0x00, 'I', 0x00, \ + 'D', 0x00, 's', 0x00, 0x00, 0x00 \ + } #define MS_OS_20_PROPERTY_DATA_LENGTH 80 -#define MS_OS_20_PROPERTY_DATA u8"{9D32F82C-1FB2-4486-8501-B6145B5BA336}\0\0" +#define MS_OS_20_PROPERTY_DATA { \ + '{', 0x00, '9', 0x00, 'D', 0x00, 'B', 0x00, '7', 0x00, 'F', 0x00, \ + '1', 0x00, 'F', 0x00, 'D', 0x00, '-', 0x00, '7', 0x00, 'E', 0x00, \ + '7', 0x00, 'A', 0x00, '-', 0x00, '4', 0x00, '0', 0x00, '0', 0x00, \ + '8', 0x00, '-', 0x00, '9', 0x00, '3', 0x00, '6', 0x00, 'B', 0x00, \ + '-', 0x00, '6', 0x00, 'B', 0x00, 'A', 0x00, '6', 0x00, 'C', 0x00, \ + '1', 0x00, '9', 0x00, 'A', 0x00, '3', 0x00, '0', 0x00, '8', 0x00, \ + 'c', 0x00, '}', 0x00, 0x00, 0x00, 0x00, 0x00 \ + } #define MS_OS_20_PLATFORM_UUID 0xdf, 0x60, 0xdd, 0xd8, 0x89, 0x45, 0xc7, 0x4c, 0x9c, 0xd2, 0x65, 0x9d, 0x9e, 0x64, 0x8a, 0x9f -- cgit v1.2.3