August 2018 - Wine-commits - list.winehq.org

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: 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: 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: 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: Correctly implement SetupDiCreateDeviceInterfaceRegKey().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 1d17352ce275492554bb2fc06a227060017876e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d17352ce275492554bb2fc0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:28 2018 -0500 setupapi: Correctly implement SetupDiCreateDeviceInterfaceRegKey(). This family of functions manipulates the "Device Parameters" subkey, not its parent. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 123 +++++++++++++----------------------------- dlls/setupapi/tests/devinst.c | 57 ++++++++++++++++++++ 2 files changed, 95 insertions(+), 85 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8b97eb5..44d2cb9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -76,6 +76,7 @@ static const WCHAR Enum[] = {'S','y','s','t','e','m','\\', 'E','n','u','m',0}; static const WCHAR DeviceDesc[] = {'D','e','v','i','c','e','D','e','s','c',0}; static const WCHAR DeviceInstance[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; +static const WCHAR DeviceParameters[] = {'D','e','v','i','c','e',' ','P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR HardwareId[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR CompatibleIDs[] = {'C','o','m','p','a','t','i','b','l','e','I','d','s',0}; static const WCHAR Service[] = {'S','e','r','v','i','c','e',0}; @@ -2559,111 +2560,63 @@ static PWSTR SETUPDI_GetInstancePath(struct device_iface *iface) /*********************************************************************** * SetupDiCreateDeviceInterfaceRegKeyW (SETUPAPI.@) */ -HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( - HDEVINFO DeviceInfoSet, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - DWORD Reserved, - REGSAM samDesired, - HINF InfHandle, - PCWSTR InfSectionName) +HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, + SP_DEVICE_INTERFACE_DATA *iface_data, DWORD reserved, REGSAM access, + HINF hinf, const WCHAR *section) { - struct DeviceInfoSet *set = DeviceInfoSet; - HKEY key = INVALID_HANDLE_VALUE, interfacesKey; - LONG l; + struct DeviceInfoSet *set = devinfo; + struct device_iface *iface; + HKEY refstr_key, params_key; + WCHAR *path; + LONG ret; - TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, - samDesired, InfHandle, InfSectionName); + TRACE("%p %p %d %#x %p %s\n", devinfo, iface_data, reserved, access, hinf, + debugstr_w(section)); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || + if (!devinfo || devinfo == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return INVALID_HANDLE_VALUE; } - if (!DeviceInterfaceData || - DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || - !DeviceInterfaceData->Reserved) + if (!iface_data || iface_data->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || + !iface_data->Reserved) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - if (InfHandle && !InfSectionName) + if (hinf && !section) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - if (!(l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, DeviceClasses, 0, NULL, 0, - samDesired, NULL, &interfacesKey, NULL))) - { - HKEY parent; - WCHAR bracedGuidString[39]; - SETUPDI_GuidToString(&DeviceInterfaceData->InterfaceClassGuid, - bracedGuidString); - if (!(l = RegCreateKeyExW(interfacesKey, bracedGuidString, 0, NULL, 0, - samDesired, NULL, &parent, NULL))) - { - struct device_iface *ifaceInfo = - (struct device_iface *)DeviceInterfaceData->Reserved; - PWSTR instancePath = SETUPDI_GetInstancePath(ifaceInfo); - PWSTR interfKeyName = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(ifaceInfo->symlink) + 1) * sizeof(WCHAR)); - HKEY interfKey; - WCHAR *ptr; - - lstrcpyW(interfKeyName, ifaceInfo->symlink); - if (lstrlenW(ifaceInfo->symlink) > 3) - { - interfKeyName[0] = '#'; - interfKeyName[1] = '#'; - interfKeyName[3] = '#'; - } - ptr = strchrW(interfKeyName, '\\'); - if (ptr) - *ptr = 0; - l = RegCreateKeyExW(parent, interfKeyName, 0, NULL, 0, - samDesired, NULL, &interfKey, NULL); - if (!l) - { - struct device *device = ifaceInfo->device; + iface = (struct device_iface *)iface_data->Reserved; + if (!(path = get_refstr_key_path(iface))) + { + SetLastError(ERROR_OUTOFMEMORY); + return INVALID_HANDLE_VALUE; + } - l = RegSetValueExW(interfKey, DeviceInstance, 0, REG_SZ, - (BYTE *)device->instanceId, - (lstrlenW(device->instanceId) + 1) * sizeof(WCHAR)); - if (!l) - { - if (instancePath) - { - LONG l; + ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, + &refstr_key, NULL); + heap_free(path); + if (ret) + { + SetLastError(ret); + return INVALID_HANDLE_VALUE; + } - l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, - samDesired, NULL, &key, NULL); - if (l) - { - SetLastError(l); - key = INVALID_HANDLE_VALUE; - } - else if (InfHandle) - FIXME("INF section installation unsupported\n"); - } - } - else - SetLastError(l); - RegCloseKey(interfKey); - } - else - SetLastError(l); - HeapFree(GetProcessHeap(), 0, interfKeyName); - HeapFree(GetProcessHeap(), 0, instancePath); - RegCloseKey(parent); - } - else - SetLastError(l); - RegCloseKey(interfacesKey); + ret = RegCreateKeyExW(refstr_key, DeviceParameters, 0, NULL, 0, access, + NULL, &params_key, NULL); + RegCloseKey(refstr_key); + if (ret) + { + SetLastError(ret); + return INVALID_HANDLE_VALUE; } - else - SetLastError(l); - return key; + + return params_key; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2bb8027..95d0dc4 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1376,6 +1376,62 @@ static void test_devnode(void) SetupDiDestroyDeviceInfoList(set); } +static void test_device_interface_key(void) +{ + const char keypath[] = "System\\CurrentControlSet\\Control\\DeviceClasses\\" + "{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\" + "##?#ROOT#LEGACY_BOGUS#0001#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; + SP_DEVINFO_DATA devinfo = { sizeof(devinfo) }; + HKEY parent, key, dikey; + char buffer[5]; + HDEVINFO set; + LONG sz, ret; + + set = SetupDiGetClassDevsA(NULL, NULL, 0, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed: %#x\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &devinfo); + ok(ret, "SetupDiCreateDeviceInfo failed: %#x\n", GetLastError()); + + ret = SetupDiCreateDeviceInterfaceA(set, &devinfo, &guid, NULL, 0, &iface); + ok(ret, "SetupDiCreateDeviceInterface failed: %#x\n", GetLastError()); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &parent); + ok(!ret, "failed to open device parent key: %u\n", ret); + + ret = RegOpenKeyA(parent, "#\\Device Parameters", &key); + ok(ret == ERROR_FILE_NOT_FOUND, "key shouldn't exist\n"); + + dikey = SetupDiCreateDeviceInterfaceRegKeyA(set, &iface, 0, KEY_ALL_ACCESS, NULL, NULL); + ok(dikey != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = RegOpenKeyA(parent, "#\\Device Parameters", &key); + ok(!ret, "key should exist: %u\n", ret); + + ret = RegSetValueA(key, NULL, REG_SZ, "test", 5); + sz = sizeof(buffer); + ret = RegQueryValueA(dikey, NULL, buffer, &sz); + ok(!ret, "RegQueryValue failed: %u\n", ret); + ok(!strcmp(buffer, "test"), "got wrong data %s\n", buffer); + + RegCloseKey(dikey); + RegCloseKey(key); + + ret = SetupDiDeleteDeviceInterfaceRegKey(set, &iface, 0); +todo_wine + ok(ret, "got error %u\n", GetLastError()); + + ret = RegOpenKeyA(parent, "#\\Device Parameters", &key); +todo_wine + ok(ret == ERROR_FILE_NOT_FOUND, "key shouldn't exist\n"); + + RegCloseKey(parent); + SetupDiRemoveDeviceInterface(set, &iface); + SetupDiRemoveDevice(set, &devinfo); + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { HKEY hkey; @@ -1414,4 +1470,5 @@ START_TEST(devinst) testDeviceRegistryPropertyW(); testSetupDiGetINFClassA(); test_devnode(); + test_device_interface_key(); }

1 0

Zebediah Figura : setupapi: Correctly implement SetupDiDeleteDeviceInterfaceRegKey().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 9b767ad6bb4139b3465e7c43f5dbdebc21aa7654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b767ad6bb4139b3465e7c43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 20:26:29 2018 -0500 setupapi: Correctly implement SetupDiDeleteDeviceInterfaceRegKey(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 88 ++++++++++++++++--------------------------- dlls/setupapi/tests/devinst.c | 2 - 2 files changed, 33 insertions(+), 57 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 44d2cb9..9f77669 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2531,32 +2531,6 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA( return key; } -static PWSTR SETUPDI_GetInstancePath(struct device_iface *iface) -{ - static const WCHAR hash[] = {'#',0}; - PWSTR instancePath = NULL; - - if (iface->refstr) - { - instancePath = heap_alloc((lstrlenW(iface->refstr) + 2) * sizeof(WCHAR)); - if (instancePath) - { - lstrcpyW(instancePath, hash); - lstrcatW(instancePath, iface->refstr); - } - else - SetLastError(ERROR_OUTOFMEMORY); - } - else - { - instancePath = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(hash) + 1) * sizeof(WCHAR)); - if (instancePath) - lstrcpyW(instancePath, hash); - } - return instancePath; -} - /*********************************************************************** * SetupDiCreateDeviceInterfaceRegKeyW (SETUPAPI.@) */ @@ -2622,51 +2596,55 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, /*********************************************************************** * SetupDiDeleteDeviceInterfaceRegKey (SETUPAPI.@) */ -BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey( - HDEVINFO DeviceInfoSet, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - DWORD Reserved) +BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, + SP_DEVICE_INTERFACE_DATA *iface_data, DWORD reserved) { - struct DeviceInfoSet *set = DeviceInfoSet; - HKEY parent; - BOOL ret = FALSE; + struct DeviceInfoSet *set = devinfo; + struct device_iface *iface; + HKEY refstr_key; + WCHAR *path; + LONG ret; - TRACE("%p %p %d\n", DeviceInfoSet, DeviceInterfaceData, Reserved); + TRACE("%p %p %d\n", devinfo, iface_data, reserved); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || + if (!devinfo || devinfo == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!DeviceInterfaceData || - DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || - !DeviceInterfaceData->Reserved) + if (!iface_data || iface_data->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || + !iface_data->Reserved) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - parent = SetupDiOpenClassRegKeyExW(&DeviceInterfaceData->InterfaceClassGuid, - KEY_ALL_ACCESS, DIOCR_INTERFACE, NULL, NULL); - if (parent != INVALID_HANDLE_VALUE) + + iface = (struct device_iface *)iface_data->Reserved; + if (!(path = get_refstr_key_path(iface))) { - struct device_iface *ifaceInfo = - (struct device_iface *)DeviceInterfaceData->Reserved; - PWSTR instancePath = SETUPDI_GetInstancePath(ifaceInfo); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } - if (instancePath) - { - LONG l = RegDeleteKeyW(parent, instancePath); + ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, + &refstr_key, NULL); + heap_free(path); + if (ret) + { + SetLastError(ret); + return FALSE; + } - if (l) - SetLastError(l); - else - ret = TRUE; - HeapFree(GetProcessHeap(), 0, instancePath); - } - RegCloseKey(parent); + ret = RegDeleteKeyW(refstr_key, DeviceParameters); + RegCloseKey(refstr_key); + if (ret) + { + SetLastError(ret); + return FALSE; } - return ret; + + return TRUE; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 95d0dc4..9a8ecbc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1419,11 +1419,9 @@ static void test_device_interface_key(void) RegCloseKey(key); ret = SetupDiDeleteDeviceInterfaceRegKey(set, &iface, 0); -todo_wine ok(ret, "got error %u\n", GetLastError()); ret = RegOpenKeyA(parent, "#\\Device Parameters", &key); -todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "key shouldn't exist\n"); RegCloseKey(parent);

1 0

Chip Davis : libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: bdca749f7ba4f434ac326481cf4fe0a059887f5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdca749f7ba4f434ac326481… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Aug 1 15:46:09 2018 -0500 libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment. Don't assume it ends with the fake PE header. This assumption doesn't hold on Mac OS: the __data section where it was placed is located after several other sections, all in the __DATA segment. Unfortunately, this causes Wine, when DEP/NX is turned off, to override the page protections for the start of the __DATA segment, removing write permission from them, leading to a crash when winemac.drv attempted to use an Objective-C class for the first time. Also, be sure to include the zero-fill (i.e. BSS) sections in the total size of the .data section. This should fix some tests that use large uninitialized arrays. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c07042a..0af3b8e 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -49,6 +49,7 @@ #undef LoadResource #undef GetCurrentThread #include <pthread.h> +#include <mach-o/getsect.h> #else extern char **environ; #endif @@ -387,11 +388,15 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) IMAGE_NT_HEADERS *nt; IMAGE_SECTION_HEADER *sec; BYTE *addr; - DWORD code_start, data_start, data_end; + DWORD code_start, code_end, data_start, data_end; const size_t page_size = sysconf( _SC_PAGESIZE ); const size_t page_mask = page_size - 1; int delta, nb_sections = 2; /* code + data */ unsigned int i; +#ifdef __APPLE__ + Dl_info dli; + unsigned long data_size; +#endif size_t size = (sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS) @@ -425,7 +430,15 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) delta = (const BYTE *)nt_descr - addr; code_start = page_size; data_start = delta & ~page_mask; +#ifdef __APPLE__ + /* Need the mach_header, not the PE header, to give to getsegmentdata(3) */ + dladdr(addr, &dli); + code_end = getsegmentdata(dli.dli_fbase, "__DATA", &data_size) - addr; + data_end = (code_end + data_size + page_mask) & ~page_mask; +#else + code_end = data_start; data_end = (nt->OptionalHeader.SizeOfImage + delta + page_mask) & ~page_mask; +#endif fixup_rva_ptrs( &nt->OptionalHeader.AddressOfEntryPoint, addr, 1 ); @@ -434,7 +447,7 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) #ifndef _WIN64 nt->OptionalHeader.BaseOfData = data_start; #endif - nt->OptionalHeader.SizeOfCode = data_start - code_start; + nt->OptionalHeader.SizeOfCode = code_end - code_start; nt->OptionalHeader.SizeOfInitializedData = data_end - data_start; nt->OptionalHeader.SizeOfUninitializedData = 0; nt->OptionalHeader.SizeOfImage = data_end; @@ -443,7 +456,7 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) /* Build the code section */ memcpy( sec->Name, ".text", sizeof(".text") ); - sec->SizeOfRawData = data_start - code_start; + sec->SizeOfRawData = code_end - code_start; sec->Misc.VirtualSize = sec->SizeOfRawData; sec->VirtualAddress = code_start; sec->PointerToRawData = code_start;

1 0

Fabian Maurer : cmd: Handle quotes when parsing the folders in the PATH environment variable.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: d175419f0b52550d2a8126e6221428fdb9992980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d175419f0b52550d2a8126e6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 2 19:48:59 2018 +0200 cmd: Handle quotes when parsing the folders in the PATH environment variable. Semicolons are also allowed inside a path, as long as they are quoted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45552 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 17 +++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ programs/cmd/wcmdmain.c | 27 ++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b9e9b25..775f21b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -507,6 +507,23 @@ rem Only the final quote ends the string set "WINE_FOO=apple"banana"grape"orange echo '%WINE_FOO%' set WINE_FOO= +rem set PATH must work with quotes +set PATH_BACKUP=%PATH% +mkdir folder +mkdir "fol;der" +echo echo I'm here! > "fol;der\sub1.bat" +echo echo I'm here! > folder\sub1.bat +set PATH=nothing;"fol;der" +call sub1 +set PATH="folder +call sub1 +set PATH=folder" +call sub1 +del "fol;der\sub1.bat" +del folder\sub1.bat +rmdir "fol;der" +rmdir folder +PATH=%PATH_BACKUP% echo ------------ Testing variable expansion ------------ call :setError 0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3118359..ea4157c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -475,6 +475,9 @@ foo 'jim fred' 'jim' 'apple"banana"grape' +I'm here!@space@ +I'm here!@space@ +I'm here!@space@ ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8fe2d57..5135be4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1099,24 +1099,41 @@ void WCMD_run_program (WCHAR *command, BOOL called) wine_dbgstr_w(stemofsearch)); while (pathposn) { WCHAR thisDir[MAX_PATH] = {'\0'}; + int length = 0; WCHAR *pos = NULL; BOOL found = FALSE; + BOOL inside_quotes = FALSE; /* Work on the first directory on the search path */ - pos = strchrW(pathposn, ';'); - if (pos) { + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } + + if (*pos) { /* Reached semicolon */ memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); thisDir[(pos-pathposn)] = 0x00; pathposn = pos+1; - - } else { + } else { /* Reached string end */ strcpyW(thisDir, pathposn); pathposn = NULL; } + /* Remove quotes */ + length = strlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; + + if (*thisDir != '"') + strcpyW(temp, thisDir); + else + strcpyW(temp, thisDir + 1); + /* Since you can have eg. ..\.. on the path, need to expand to full information */ - strcpyW(temp, thisDir); GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */

1 0

Henri Verbeet : wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 8a6d3b3ea2dba8ad329accec63ffc2755566b641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a6d3b3ea2dba8ad329accec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:20 2018 +0430 wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init(). Matching WINED3D_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d9a5e9..8f9449f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6728,7 +6728,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) { DISPLAY_DEVICEW display_device; @@ -6774,7 +6774,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) TRACE("Initializing adapters.\n"); if (flags & WINED3D_NO3D) - ret = wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); else ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); if (!ret)

1 0

Henri Verbeet : wined3d: Share common code between wined3d_adapter_init() and wined3d_adapter_no3d_init().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: b96a6771a8805fab21c68258c19f16a5eecce04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96a6771a8805fab21c68258… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:21 2018 +0430 wined3d: Share common code between wined3d_adapter_init() and wined3d_adapter_no3d_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f9449f..be03a1d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6601,7 +6601,7 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } -static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) +static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = { @@ -6611,13 +6611,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, }; struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - unsigned int i; - DISPLAY_DEVICEW display_device; DWORD max_gl_version; + unsigned int i; - TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); - - adapter->ordinal = ordinal; + TRACE("adapter %p, wined3d_creation_flags %#x.\n", adapter, wined3d_creation_flags); /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL @@ -6716,11 +6713,6 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - display_device.cb = sizeof(display_device); - EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->DeviceName, display_device.DeviceName); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); @@ -6728,12 +6720,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) { - DISPLAY_DEVICEW display_device; - - memset(adapter, 0, sizeof(*adapter)); - adapter->ordinal = ordinal; + TRACE("adapter %p.\n", adapter); adapter->driver_info.name = "Display"; adapter->driver_info.description = "WineD3D DirectDraw Emulation"; @@ -6749,12 +6738,23 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordi adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; + return TRUE; +} + +static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, DWORD wined3d_creation_flags) +{ + DISPLAY_DEVICEW display_device; + + adapter->ordinal = ordinal; + display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); - return TRUE; + if (wined3d_creation_flags & WINED3D_NO3D) + return wined3d_adapter_no3d_init(adapter); + return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} @@ -6766,20 +6766,14 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { - BOOL ret; - wined3d->ref = 1; wined3d->flags = flags; - TRACE("Initializing adapters.\n"); + TRACE("Initialising adapters.\n"); - if (flags & WINED3D_NO3D) - ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); - else - ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); - if (!ret) + if (!wined3d_adapter_init(&wined3d->adapters[0], 0, flags)) { - WARN("Failed to initialize adapter.\n"); + WARN("Failed to initialise adapter.\n"); return E_FAIL; } wined3d->adapter_count = 1;

1 0