wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Zebediah Figura : setupapi: Merge the InterfaceInfo and InterfaceInstances structs.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 86d26dded5560d6d8adb195372f0676d1f7229b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86d26dded5560d6d8adb1953… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:27 2018 -0500 setupapi: Merge the InterfaceInfo and InterfaceInstances structs. It seems the original motivation for separating these was to facilitate easy enumeration of specific classes using SetupDiEnumDeviceInterfaces(), but it makes other things unnecessarily complex [including an eventual implementation of SetupDiRemoveDeviceInterface()] and the implementation provided here seems quite simple enough. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 541 +++++++++++++++++------------------------------- 1 file changed, 189 insertions(+), 352 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86d26dded5560d6d8adb…

1 0

Zebediah Figura : setupapi: Add helper functions to get the path of the device instance keys.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: ad9e1883ef558886607037592f48e6c5d216d4e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad9e1883ef55888660703759… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:26 2018 -0500 setupapi: Add helper functions to get the path of the device instance keys. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 106 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a845290..2e4ff3a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -201,8 +201,75 @@ static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } +static WCHAR *get_iface_key_path(SP_DEVICE_INTERFACE_DATA *iface) +{ + const WCHAR slashW[] = {'\\',0}; + struct InterfaceInfo *info = (struct InterfaceInfo *)iface->Reserved; + WCHAR *path, *ptr; + size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(info->symbolicLink); + + if (!(path = heap_alloc((len + 1) * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + strcpyW(path, DeviceClasses); + strcatW(path, slashW); + SETUPDI_GuidToString(&iface->InterfaceClassGuid, path + strlenW(path)); + strcatW(path, slashW); + ptr = path + strlenW(path); + strcatW(path, info->symbolicLink); + if (strlenW(info->symbolicLink) > 3) + ptr[0] = ptr[1] = ptr[3] = '#'; + + ptr = strchrW(ptr, '\\'); + if (ptr) *ptr = 0; + + return path; +} + +static WCHAR *get_refstr_key_path(SP_DEVICE_INTERFACE_DATA *iface) +{ + const WCHAR hashW[] = {'#',0}; + const WCHAR slashW[] = {'\\',0}; + struct InterfaceInfo *info = (struct InterfaceInfo *)iface->Reserved; + WCHAR *path, *ptr; + size_t len = strlenW(DeviceClasses) + 1 + 38 + 1 + strlenW(info->symbolicLink) + 1 + 1; + + if (info->referenceString) + len += strlenW(info->referenceString); + + if (!(path = heap_alloc((len + 1) * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + strcpyW(path, DeviceClasses); + strcatW(path, slashW); + SETUPDI_GuidToString(&iface->InterfaceClassGuid, path + strlenW(path)); + strcatW(path, slashW); + ptr = path + strlenW(path); + strcatW(path, info->symbolicLink); + if (strlenW(info->symbolicLink) > 3) + ptr[0] = ptr[1] = ptr[3] = '#'; + + ptr = strchrW(ptr, '\\'); + if (ptr) *ptr = 0; + + strcatW(path, slashW); + strcatW(path, hashW); + + if (info->referenceString) + strcatW(path, info->referenceString); + + return path; +} + static void SETUPDI_FreeInterfaceInstances(struct InterfaceInstances *instances) { + WCHAR *path; DWORD i; for (i = 0; i < instances->cInstances; i++) @@ -212,8 +279,11 @@ static void SETUPDI_FreeInterfaceInstances(struct InterfaceInstances *instances) if (ifaceInfo->device && ifaceInfo->device->phantom) { - SetupDiDeleteDeviceInterfaceRegKey(ifaceInfo->device->set, - &instances->instances[i], 0); + if ((path = get_refstr_key_path(&instances->instances[i]))) + { + RegDeleteKeyW(HKEY_LOCAL_MACHINE, path); + heap_free(path); + } } HeapFree(GetProcessHeap(), 0, ifaceInfo->referenceString); HeapFree(GetProcessHeap(), 0, ifaceInfo->symbolicLink); @@ -399,6 +469,7 @@ static BOOL SETUPDI_AddInterfaceInstance(struct device *devInfo, ifaceInfo->referenceString = NULL; if (ret) { + WCHAR *path; HKEY key; iface->cInstances++; @@ -409,15 +480,30 @@ static BOOL SETUPDI_AddInterfaceInstance(struct device *devInfo, instance->Reserved = (ULONG_PTR)ifaceInfo; if (newInterface) iface->guid = *InterfaceClassGuid; - key = SetupDiCreateDeviceInterfaceRegKeyW(devInfo->set, - instance, 0, KEY_WRITE, NULL, NULL); - if (key != INVALID_HANDLE_VALUE) + + if ((path = get_iface_key_path(instance))) { - RegSetValueExW(key, SymbolicLink, 0, REG_SZ, - (BYTE *)ifaceInfo->symbolicLink, - lstrlenW(ifaceInfo->symbolicLink) * - sizeof(WCHAR)); - RegCloseKey(key); + if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, path, &key)) + { + RegSetValueExW(key, DeviceInstance, 0, REG_SZ, + (BYTE *)devInfo->instanceId, + lstrlenW(devInfo->instanceId) * sizeof(WCHAR)); + RegCloseKey(key); + } + heap_free(path); + } + + if ((path = get_refstr_key_path(instance))) + { + if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, path, &key)) + { + RegSetValueExW(key, SymbolicLink, 0, REG_SZ, + (BYTE *)ifaceInfo->symbolicLink, + lstrlenW(ifaceInfo->symbolicLink) * + sizeof(WCHAR)); + RegCloseKey(key); + } + heap_free(path); } if (ifaceData) *ifaceData = instance;

1 0

Zebediah Figura : setupapi: Don't use SP_DEVINFO_DATA in internal structs.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 11d09c299e5df47cadda7473d03a49244c846634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d09c299e5df47cadda7473… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:25 2018 -0500 setupapi: Don't use SP_DEVINFO_DATA in internal structs. And especially don't use a pointer to one, since there's no guarantee it'll remain stable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 98 +++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11d09c299e5df47cadda…

1 0

Zebediah Figura : setupapi: Merge the DeviceInstance and DeviceInfo structs.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 5d7b123d094ba2de40237f310ec43f4b06b560a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d7b123d094ba2de40237f31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:24 2018 -0500 setupapi: Merge the DeviceInstance and DeviceInfo structs. These are two different representations of the same underlying object; there's no reason to keep them separate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 374 ++++++++++++++++++++---------------------------- 1 file changed, 155 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d7b123d094ba2de4023…

1 0

Zebediah Figura : setupapi: Add an internal helper for SetupDiSetDeviceRegistryProperty().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: b5b09649e6be0154154174b2641bca23a7216f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b09649e6be0154154174b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:23 2018 -0500 setupapi: Add an internal helper for SetupDiSetDeviceRegistryProperty(). This essentially follows the model used in MSI. The next patch makes use of this helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 111 ++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8c63298..1a4d4dd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -504,6 +504,50 @@ static HKEY SETUPDI_CreateDrvKey(struct DeviceInfo *devInfo) return key; } +struct PropertyMapEntry +{ + DWORD regType; + LPCSTR nameA; + LPCWSTR nameW; +}; + +static const struct PropertyMapEntry PropertyMap[] = { + { REG_SZ, "DeviceDesc", DeviceDesc }, + { REG_MULTI_SZ, "HardwareId", HardwareId }, + { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs }, + { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ + { REG_SZ, "Service", Service }, + { 0, NULL, NULL }, /* SPDRP_UNUSED1 */ + { 0, NULL, NULL }, /* SPDRP_UNUSED2 */ + { REG_SZ, "Class", Class }, + { REG_SZ, "ClassGUID", ClassGUID }, + { REG_SZ, "Driver", Driver }, + { REG_DWORD, "ConfigFlags", ConfigFlags }, + { REG_SZ, "Mfg", Mfg }, + { REG_SZ, "FriendlyName", FriendlyName }, + { REG_SZ, "LocationInformation", LocationInformation }, + { 0, NULL, NULL }, /* SPDRP_PHYSICAL_DEVICE_OBJECT_NAME */ + { REG_DWORD, "Capabilities", Capabilities }, + { REG_DWORD, "UINumber", UINumber }, + { REG_MULTI_SZ, "UpperFilters", UpperFilters }, + { REG_MULTI_SZ, "LowerFilters", LowerFilters }, +}; + +static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct DeviceInfo *device, + DWORD prop, const BYTE *buffer, DWORD size) +{ + if (prop < ARRAY_SIZE(PropertyMap) && PropertyMap[prop].nameW) + { + LONG ret = RegSetValueExW(device->key, PropertyMap[prop].nameW, 0, + PropertyMap[prop].regType, buffer, size); + if (!ret) + return TRUE; + + SetLastError(ret); + } + return FALSE; +} + static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, DWORD devId, LPCWSTR instanceId, BOOL phantom) { @@ -3090,35 +3134,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( return ret; } -struct PropertyMapEntry -{ - DWORD regType; - LPCSTR nameA; - LPCWSTR nameW; -}; - -static const struct PropertyMapEntry PropertyMap[] = { - { REG_SZ, "DeviceDesc", DeviceDesc }, - { REG_MULTI_SZ, "HardwareId", HardwareId }, - { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs }, - { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ - { REG_SZ, "Service", Service }, - { 0, NULL, NULL }, /* SPDRP_UNUSED1 */ - { 0, NULL, NULL }, /* SPDRP_UNUSED2 */ - { REG_SZ, "Class", Class }, - { REG_SZ, "ClassGUID", ClassGUID }, - { REG_SZ, "Driver", Driver }, - { REG_DWORD, "ConfigFlags", ConfigFlags }, - { REG_SZ, "Mfg", Mfg }, - { REG_SZ, "FriendlyName", FriendlyName }, - { REG_SZ, "LocationInformation", LocationInformation }, - { 0, NULL, NULL }, /* SPDRP_PHYSICAL_DEVICE_OBJECT_NAME */ - { REG_DWORD, "Capabilities", Capabilities }, - { REG_DWORD, "UINumber", UINumber }, - { REG_MULTI_SZ, "UpperFilters", UpperFilters }, - { REG_MULTI_SZ, "LowerFilters", LowerFilters }, -}; - /*********************************************************************** * SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@) */ @@ -3296,21 +3311,15 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( /*********************************************************************** * SetupDiSetDeviceRegistryPropertyW (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) +BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, DWORD prop, const BYTE *buffer, DWORD size) { - BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; - struct DeviceInfo *devInfo; + struct DeviceInfoSet *set = devinfo; + struct DeviceInfo *device; - TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, - PropertyBuffer, PropertyBufferSize); + TRACE("%p %p %d %p %d\n", devinfo, device_data, prop, buffer, size); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + if (!devinfo || devinfo == INVALID_HANDLE_VALUE) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3320,25 +3329,15 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) + if (!device_data || device_data->cbSize != sizeof(SP_DEVINFO_DATA) + || !device_data->Reserved) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) - && PropertyMap[Property].nameW) - { - LONG l = RegSetValueExW(devInfo->key, PropertyMap[Property].nameW, 0, - PropertyMap[Property].regType, PropertyBuffer, - PropertyBufferSize); - if (!l) - ret = TRUE; - else - SetLastError(l); - } - return ret; + + device = (struct DeviceInfo *)device_data->Reserved; + return SETUPDI_SetDeviceRegistryPropertyW(device, prop, buffer, size); } /***********************************************************************

1 0

Zebediah Figura : setupapi: Use a handle table to allocate device nodes.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: f840bcc6f7dfdfda507e4fc89d9ed2fdc6ca3a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f840bcc6f7dfdfda507e4fc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:22 2018 -0500 setupapi: Use a handle table to allocate device nodes. The size of DEVINST is DWORD, so using the pointer directly won't work on 64-bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 108 +++++++++++++++++++++++++-------------- dlls/setupapi/setupapi_private.h | 5 ++ dlls/setupapi/tests/devinst.c | 22 ++++++++ 3 files changed, 96 insertions(+), 39 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ea69dea..8c63298 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -33,6 +33,7 @@ #include "winnls.h" #include "setupapi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "cfgmgr32.h" @@ -140,6 +141,52 @@ struct DeviceInfo struct list interfaces; }; +static struct DeviceInfo **devnode_table; +static unsigned int devnode_table_size; + +static DEVINST alloc_devnode(struct DeviceInfo *device) +{ + unsigned int i; + + for (i = 0; i < devnode_table_size; ++i) + { + if (!devnode_table[i]) + break; + } + + if (i == devnode_table_size) + { + if (devnode_table) + { + devnode_table_size *= 2; + devnode_table = heap_realloc_zero(devnode_table, + devnode_table_size * sizeof(*devnode_table)); + } + else + { + devnode_table_size = 256; + devnode_table = heap_alloc_zero(devnode_table_size * sizeof(*devnode_table)); + } + } + + devnode_table[i] = device; + return i; +} + +static void free_devnode(DEVINST devnode) +{ + devnode_table[devnode] = NULL; +} + +static struct DeviceInfo *get_devnode_device(DEVINST devnode) +{ + if (devnode < devnode_table_size) + return devnode_table[devnode]; + + WARN("device node %u not found\n", devnode); + return NULL; +} + static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) { static const WCHAR fmt[] = {'{','%','0','8','X','-','%','0','4','X','-', @@ -460,15 +507,12 @@ static HKEY SETUPDI_CreateDrvKey(struct DeviceInfo *devInfo) static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, DWORD devId, LPCWSTR instanceId, BOOL phantom) { - struct DeviceInfo *devInfo = NULL; - HANDLE devInst = GlobalAlloc(GMEM_FIXED, sizeof(struct DeviceInfo)); - if (devInst) - devInfo = GlobalLock(devInst); + struct DeviceInfo *devInfo = heap_alloc(sizeof(*devInfo)); if (devInfo) { devInfo->set = set; - devInfo->devId = (DWORD)devInst; + devInfo->devId = alloc_devnode(devInfo); devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); @@ -486,12 +530,10 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, (LPBYTE)&phantom, sizeof(phantom)); } list_init(&devInfo->interfaces); - GlobalUnlock(devInst); } else { - GlobalUnlock(devInst); - GlobalFree(devInst); + heap_free(devInfo); devInfo = NULL; } } @@ -525,7 +567,8 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) SETUPDI_FreeInterfaceInstances(iface); HeapFree(GetProcessHeap(), 0, iface); } - GlobalFree((HANDLE)devInfo->devId); + free_devnode(devInfo->devId); + heap_free(devInfo); } /* Adds a device with GUID guid and identifier devInst to set. Allocates a @@ -3979,63 +4022,50 @@ BOOL WINAPI SetupDiDeleteDevRegKey( /*********************************************************************** * CM_Get_Device_IDA (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST dnDevInst, PSTR Buffer, - ULONG BufferLen, ULONG ulFlags) +CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST devnode, char *buffer, ULONG len, ULONG flags) { - struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst); + struct DeviceInfo *device = get_devnode_device(devnode); - TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags); + TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags); - if (!devInfo) + if (!device) return CR_NO_SUCH_DEVINST; - WideCharToMultiByte(CP_ACP, 0, devInfo->instanceId, -1, Buffer, BufferLen, 0, 0); - TRACE("Returning %s\n", debugstr_a(Buffer)); + WideCharToMultiByte(CP_ACP, 0, device->instanceId, -1, buffer, len, 0, 0); + TRACE("Returning %s\n", debugstr_a(buffer)); return CR_SUCCESS; } /*********************************************************************** * CM_Get_Device_IDW (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST dnDevInst, LPWSTR Buffer, - ULONG BufferLen, ULONG ulFlags) +CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST devnode, WCHAR *buffer, ULONG len, ULONG flags) { - struct DeviceInfo *devInfo = GlobalLock((HANDLE)dnDevInst); + struct DeviceInfo *device = get_devnode_device(devnode); - TRACE("%x->%p, %p, %u %u\n", dnDevInst, devInfo, Buffer, BufferLen, ulFlags); + TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags); - if (!devInfo) - { - WARN("dev instance %d not found!\n", dnDevInst); + if (!device) return CR_NO_SUCH_DEVINST; - } - lstrcpynW(Buffer, devInfo->instanceId, BufferLen); - TRACE("Returning %s\n", debugstr_w(Buffer)); - GlobalUnlock((HANDLE)dnDevInst); + lstrcpynW(buffer, device->instanceId, len); + TRACE("Returning %s\n", debugstr_w(buffer)); return CR_SUCCESS; } - - /*********************************************************************** * CM_Get_Device_ID_Size (SETUPAPI.@) */ -CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG pulLen, DEVINST dnDevInst, - ULONG ulFlags) +CONFIGRET WINAPI CM_Get_Device_ID_Size(ULONG *len, DEVINST devnode, ULONG flags) { - struct DeviceInfo *ppdevInfo = GlobalLock((HANDLE)dnDevInst); + struct DeviceInfo *device = get_devnode_device(devnode); - TRACE("%x->%p, %p, %u\n", dnDevInst, ppdevInfo, pulLen, ulFlags); + TRACE("%p, %u, %#x\n", len, devnode, flags); - if (!ppdevInfo) - { - WARN("dev instance %d not found!\n", dnDevInst); + if (!device) return CR_NO_SUCH_DEVINST; - } - *pulLen = lstrlenW(ppdevInfo->instanceId); - GlobalUnlock((HANDLE)dnDevInst); + *len = lstrlenW(device->instanceId); return CR_SUCCESS; } diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 5cdedb6..1df96b1 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -45,6 +45,11 @@ extern HINSTANCE SETUPAPI_hInstance DECLSPEC_HIDDEN; +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline WCHAR *strdupW( const WCHAR *str ) { WCHAR *ret = NULL; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 420c65a..2bb8027 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "guiddef.h" #include "setupapi.h" +#include "cfgmgr32.h" #include "wine/test.h" @@ -1355,6 +1356,26 @@ static void testSetupDiGetINFClassA(void) } } +static void test_devnode(void) +{ + HDEVINFO set; + SP_DEVINFO_DATA device = { sizeof(SP_DEVINFO_DATA) }; + char buffer[50]; + DWORD ret; + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed: %#x\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, + NULL, 0, &device); + ok(ret, "SetupDiCreateDeviceInfo failed: %#x\n", GetLastError()); + + ret = CM_Get_Device_IDA(device.DevInst, buffer, sizeof(buffer), 0); + ok(!ret, "got %#x\n", ret); + ok(!strcmp(buffer, "ROOT\\LEGACY_BOGUS\\0000"), "got %s\n", buffer); + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { HKEY hkey; @@ -1392,4 +1413,5 @@ START_TEST(devinst) testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); testSetupDiGetINFClassA(); + test_devnode(); }

1 0

Zebediah Figura : setupapi: Remove a pointless cast.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: a3cedc1f3a2ca66c9ed15fe054413fb9566326c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3cedc1f3a2ca66c9ed15fe0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:21 2018 -0500 setupapi: Remove a pointless cast. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4a852da..ea69dea 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3092,7 +3092,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; - TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, + TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); @@ -3155,7 +3155,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; - TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, + TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize);

1 0

Józef Kucia : dxgi: Prefer vkGet*ProcAddr() for loading Vulkan functions.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: df84cb38429f545e3fb32787b73a02b1f530e8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df84cb38429f545e3fb32787… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 12:03:25 2018 +0200 dxgi: Prefer vkGet*ProcAddr() for loading Vulkan functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 241db3b..83e0f25 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -846,7 +846,6 @@ struct dxgi_vk_funcs PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; PFN_vkEndCommandBuffer p_vkEndCommandBuffer; PFN_vkFreeMemory p_vkFreeMemory; - PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; PFN_vkGetImageMemoryRequirements p_vkGetImageMemoryRequirements; PFN_vkGetInstanceProcAddr p_vkGetInstanceProcAddr; PFN_vkGetPhysicalDeviceMemoryProperties p_vkGetPhysicalDeviceMemoryProperties; @@ -1640,19 +1639,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return FALSE; } - dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; - dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; - dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; - dxgi->p_vkDestroySwapchainKHR = vk->p_vkDestroySwapchainKHR; - dxgi->p_vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vk->p_vkGetDeviceProcAddr; dxgi->p_vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vk->p_vkGetInstanceProcAddr; - dxgi->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = vk->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceFormatsKHR = vk->p_vkGetPhysicalDeviceSurfaceFormatsKHR; - dxgi->p_vkGetPhysicalDeviceSurfacePresentModesKHR = vk->p_vkGetPhysicalDeviceSurfacePresentModesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceSupportKHR = vk->p_vkGetPhysicalDeviceSurfaceSupportKHR; - dxgi->p_vkGetPhysicalDeviceWin32PresentationSupportKHR = vk->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - dxgi->p_vkGetSwapchainImagesKHR = vk->p_vkGetSwapchainImagesKHR; - dxgi->p_vkQueuePresentKHR = vk->p_vkQueuePresentKHR; #define LOAD_INSTANCE_PFN(name) \ if (!(dxgi->p_##name = vk->p_vkGetInstanceProcAddr(vk_instance, #name))) \ @@ -1660,7 +1647,14 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk ERR("Failed to get instance proc "#name".\n"); \ return FALSE; \ } + LOAD_INSTANCE_PFN(vkCreateWin32SurfaceKHR) + LOAD_INSTANCE_PFN(vkDestroySurfaceKHR) LOAD_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfacePresentModesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceWin32PresentationSupportKHR) #undef LOAD_INSTANCE_PFN #define LOAD_DEVICE_PFN(name) \ @@ -1680,13 +1674,17 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk LOAD_DEVICE_PFN(vkCreateFence) LOAD_DEVICE_PFN(vkCreateImage) LOAD_DEVICE_PFN(vkCreateSemaphore) + LOAD_DEVICE_PFN(vkCreateSwapchainKHR) LOAD_DEVICE_PFN(vkDestroyCommandPool) LOAD_DEVICE_PFN(vkDestroyFence) LOAD_DEVICE_PFN(vkDestroyImage) LOAD_DEVICE_PFN(vkDestroySemaphore) + LOAD_DEVICE_PFN(vkDestroySwapchainKHR) LOAD_DEVICE_PFN(vkEndCommandBuffer) LOAD_DEVICE_PFN(vkFreeMemory) LOAD_DEVICE_PFN(vkGetImageMemoryRequirements) + LOAD_DEVICE_PFN(vkGetSwapchainImagesKHR) + LOAD_DEVICE_PFN(vkQueuePresentKHR) LOAD_DEVICE_PFN(vkQueueSubmit) LOAD_DEVICE_PFN(vkQueueWaitIdle) LOAD_DEVICE_PFN(vkResetFences)

1 0

Józef Kucia : d3d12: Return DXGI_ERROR_SDK_COMPONENT_MISSING from D3D12GetDebugInterface().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 8f13509dcdfa119044142d32436e05aa3ba02006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f13509dcdfa119044142d32… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 12:03:24 2018 +0200 d3d12: Return DXGI_ERROR_SDK_COMPONENT_MISSING from D3D12GetDebugInterface(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 324ad3c..f0c48ee 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -39,9 +39,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { - FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); + TRACE("iid %s, debug %p.\n", debugstr_guid(iid), debug); - return E_NOTIMPL; + WARN("Returning DXGI_ERROR_SDK_COMPONENT_MISSING.\n"); + return DXGI_ERROR_SDK_COMPONENT_MISSING; } static HRESULT d3d12_signal_event(HANDLE event)

1 0

Józef Kucia : dxgi: Return DXGI_ERROR_SDK_COMPONENT_MISSING from DXGIGetDebugInterface1().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: a608ef1f2d9db962bcf2f47bc026144c0148ed41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a608ef1f2d9db962bcf2f47b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 12:03:23 2018 +0200 dxgi: Return DXGI_ERROR_SDK_COMPONENT_MISSING from DXGIGetDebugInterface1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index cd2c39f..83c3f37 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -253,6 +253,6 @@ HRESULT WINAPI DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug) { TRACE("flags %#x, iid %s, debug %p.\n", flags, debugstr_guid(iid), debug); - WARN("Returning E_NOINTERFACE.\n"); - return E_NOINTERFACE; + WARN("Returning DXGI_ERROR_SDK_COMPONENT_MISSING.\n"); + return DXGI_ERROR_SDK_COMPONENT_MISSING; }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018