January 2019 - Wine-devel - list.winehq.org

[PATCH v4 1/2] setupapi: Implement SetupDiSetDevicePropertyW.
by Zhiyi Zhang 29 Jan '19

29 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Simplify registry handling. Remove inconsistent tests. v3: Add a FIXME for unhandled errors in SetupDiGetDevicePropertyW. Thanks to Zeb. v4: Don't update the whole spec file. dlls/setupapi/devinst.c | 101 +++++++++++++++++++++ dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/tests/devinst.c | 163 +++++++++++++++++++++++++++++++++- include/setupapi.h | 2 + 4 files changed, 266 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 36c1854654..13f7853290 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -327,6 +327,28 @@ static WCHAR *get_refstr_key_path(struct device_iface *iface) return path; } +static BOOL is_valid_property_type(DEVPROPTYPE prop_type) +{ + DWORD type = prop_type & DEVPROP_MASK_TYPE; + DWORD typemod = prop_type & DEVPROP_MASK_TYPEMOD; + + if (type > MAX_DEVPROP_TYPE) + return FALSE; + if (typemod > MAX_DEVPROP_TYPEMOD) + return FALSE; + + if (typemod == DEVPROP_TYPEMOD_ARRAY + && (type == DEVPROP_TYPE_EMPTY || type == DEVPROP_TYPE_NULL || type == DEVPROP_TYPE_STRING + || type == DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING)) + return FALSE; + + if (typemod == DEVPROP_TYPEMOD_LIST + && !(type == DEVPROP_TYPE_STRING || type == DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING)) + return FALSE; + + return TRUE; +} + static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, const GUID *InterfaceClassGuid, LPCWSTR ReferenceString) { @@ -3410,6 +3432,85 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsW( return TRUE; } +BOOL WINAPI SetupDiSetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, const DEVPROPKEY *key, + DEVPROPTYPE type, const BYTE *buffer, DWORD size, DWORD flags) +{ + static const WCHAR propertiesW[] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 0}; + static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; + struct device *device; + HKEY properties_hkey, property_hkey; + WCHAR property_hkey_path[44]; + LSTATUS ls; + + TRACE("%p %p %p %#x %p %d %#x\n", devinfo, device_data, key, type, buffer, size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!key || !is_valid_property_type(type) + || (buffer && !size && !(type == DEVPROP_TYPE_EMPTY || type == DEVPROP_TYPE_NULL)) + || (buffer && size && (type == DEVPROP_TYPE_EMPTY || type == DEVPROP_TYPE_NULL))) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (size && !buffer) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (flags) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + ls = RegCreateKeyExW(device->key, propertiesW, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &properties_hkey, NULL); + if (ls) + { + SetLastError(ls); + return FALSE; + } + + SETUPDI_GuidToString(&key->fmtid, property_hkey_path); + sprintfW(property_hkey_path + 38, formatW, key->pid); + + if (type == DEVPROP_TYPE_EMPTY) + { + ls = RegDeleteKeyW(properties_hkey, property_hkey_path); + RegCloseKey(properties_hkey); + SetLastError(ls == ERROR_FILE_NOT_FOUND ? ERROR_NOT_FOUND : ls); + return !ls; + } + else if (type == DEVPROP_TYPE_NULL) + { + if (!(ls = RegOpenKeyW(properties_hkey, property_hkey_path, &property_hkey))) + { + ls = RegDeleteValueW(property_hkey, NULL); + RegCloseKey(property_hkey); + } + + RegCloseKey(properties_hkey); + SetLastError(ls == ERROR_FILE_NOT_FOUND ? ERROR_NOT_FOUND : ls); + return !ls; + } + else + { + if (!(ls = RegCreateKeyExW(properties_hkey, property_hkey_path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, + &property_hkey, NULL))) + { + ls = RegSetValueExW(property_hkey, NULL, 0, 0xffff0000 | (0xffff & type), buffer, size); + RegCloseKey(property_hkey); + } + + RegCloseKey(properties_hkey); + SetLastError(ls); + return !ls; + } +} + static HKEY SETUPDI_OpenDevKey(struct device *device, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 0b44e184fc..844bb21ecc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -389,6 +389,7 @@ @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) +@ stdcall SetupDiSetDevicePropertyW(ptr ptr ptr long ptr long long) @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long) @ stub SetupDiSetDriverInstallParamsA diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 74fa545029..0a77fca9c2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -26,7 +26,8 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "guiddef.h" +#include "initguid.h" +#include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -37,6 +38,8 @@ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; +BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); + static void test_create_device_list_ex(void) { static const WCHAR machine[] = { 'd','u','m','m','y',0 }; @@ -342,6 +345,163 @@ static void test_device_info(void) SetupDiDestroyDeviceInfoList(set); } +static void test_device_property(void) +{ + static const WCHAR valueW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HMODULE hmod; + HDEVINFO set; + DWORD err; + BOOL ret; + + hmod = LoadLibraryA("setupapi.dll"); + pSetupDiSetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiSetDevicePropertyW"); + + if (!pSetupDiSetDevicePropertyW) + { + win_skip("SetupDiSetDevicePropertyW() are only available on vista+, skipping tests.\n"); + FreeLibrary(hmod); + return; + } + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device_data); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* SetupDiSetDevicePropertyW */ + /* #1 Null device info list */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(NULL, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#x\n", ERROR_INVALID_HANDLE, err); + + /* #2 Null device */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, NULL, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#x\n", ERROR_INVALID_PARAMETER, err); + + /* #3 Null property key pointer */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, NULL, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #4 Invalid property key type */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, 0xffff, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #5 Null buffer pointer */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, NULL, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + + /* #6 Zero buffer size */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, 0, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + + /* #7 Flags not zero */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 1); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#x\n", ERROR_INVALID_FLAGS, err); + + /* #8 Normal */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #9 Delete property with buffer not null */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, (const BYTE *)valueW, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #10 Delete property with size not zero */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, NULL, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + + /* #11 Delete property */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, NULL, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #12 Delete non-existent property */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_EMPTY, NULL, 0, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + + /* #13 Delete property value with buffer not null */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, (const BYTE *)valueW, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #14 Delete property value with size not zero */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, sizeof(valueW), 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + + /* #15 Delete property value */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, 0, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + + /* #16 Delete non-existent property value */ + SetLastError(0xdeadbeef); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, 0, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + + ret = SetupDiRemoveDevice(set, &device_data); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + + SetupDiDestroyDeviceInfoList(set); + FreeLibrary(hmod); +} + static void test_get_device_instance_id(void) { BOOL ret; @@ -1339,6 +1499,7 @@ START_TEST(devinst) test_open_class_key(); test_install_class(); test_device_info(); + test_device_property(); test_get_device_instance_id(); test_register_device_info(); test_device_iface(); diff --git a/include/setupapi.h b/include/setupapi.h index 76e255cc44..4491617d8a 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1634,6 +1634,8 @@ BOOL WINAPI SetupDiSetDeviceInterfaceDefault(HDEVINFO, PSP_DEVICE_INTERFACE_ BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DEVINSTALL_PARAMS_A); BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DEVINSTALL_PARAMS_W); #define SetupDiSetDeviceInstallParams WINELIB_NAME_AW(SetupDiSetDeviceInstallParams) +BOOL WINAPI SetupDiSetDevicePropertyW(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); +#define SetupDiSetDeviceProperty WINELIB_NAME_AW(SetupDiSetDeviceProperty) /* note: A function doesn't exist */ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); #define SetupDiSetDeviceRegistryProperty WINELIB_NAME_AW(SetupDiSetDeviceRegistryProperty) -- 2.20.1

1 0

[PATCH vkd3d 1/3] vkd3d: Implement d3d12_query_heap_SetName().
by Henri Verbeet 29 Jan '19

29 Jan '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Note that I made a few (minor) modifications; it would be good if Zhiyi could confirm that this still does something reasonable for his application. Makefile.am | 4 +- include/private/vkd3d_utf8.h | 26 +++++++ libs/vkd3d-common/utf8.c | 162 +++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 5 +- libs/vkd3d/utils.c | 29 ++++++++ libs/vkd3d/vkd3d_private.h | 5 ++ libs/vkd3d/vulkan_procs.h | 2 + 8 files changed, 231 insertions(+), 3 deletions(-) create mode 100644 include/private/vkd3d_utf8.h create mode 100644 libs/vkd3d-common/utf8.c diff --git a/Makefile.am b/Makefile.am index 7869b2e..487d2ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,7 +59,8 @@ noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d_common_la_SOURCES = \ include/private/vkd3d_debug.h \ libs/vkd3d-common/debug.c \ - libs/vkd3d-common/memory.c + libs/vkd3d-common/memory.c \ + libs/vkd3d-common/utf8.c lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la @@ -88,6 +89,7 @@ libvkd3d_la_SOURCES = \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ + include/private/vkd3d_utf8.h \ include/private/vkd3d_test.h \ include/vkd3d_d3d12.idl \ include/vkd3d_d3dcommon.idl \ diff --git a/include/private/vkd3d_utf8.h b/include/private/vkd3d_utf8.h new file mode 100644 index 0000000..ab32884 --- /dev/null +++ b/include/private/vkd3d_utf8.h @@ -0,0 +1,26 @@ +/* + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_UTF8_H +#define __VKD3D_UTF8_H + +#include "vkd3d_common.h" + +char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; + +#endif /* __VKD3D_UTF8_H */ diff --git a/libs/vkd3d-common/utf8.c b/libs/vkd3d-common/utf8.c new file mode 100644 index 0000000..e48316d --- /dev/null +++ b/libs/vkd3d-common/utf8.c @@ -0,0 +1,162 @@ +/* + * Copyright 2000 Alexandre Julliard + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "vkd3d_memory.h" +#include "vkd3d_utf8.h" + +#include <inttypes.h> + +static size_t vkd3d_utf8_len(uint32_t c) +{ + /* 0x00-0x7f: 1 byte */ + if (c < 0x80) + return 1; + /* 0x80-0x7ff: 2 bytes */ + if (c < 0x800) + return 2; + /* 0x800-0xffff: 3 bytes */ + if (c < 0x10000) + return 3; + /* 0x10000-0x10ffff: 4 bytes */ + return 4; +} + +static void vkd3d_utf8_append(char **dst, uint32_t c) +{ + char *d = *dst; + + /* 0x00-0x7f: 1 byte */ + if (c < 0x80) + { + d[0] = c; + *dst += 1; + return; + } + + /* 0x80-0x7ff: 2 bytes */ + if (c < 0x800) + { + d[1] = 0x80 | (c & 0x3f); + c >>= 6; + d[0] = 0xc0 | c; + *dst += 2; + return; + } + + /* 0x800-0xffff: 3 bytes */ + if (c < 0x10000) /* 0x800-0xffff: 3 bytes */ + { + d[2] = 0x80 | (c & 0x3f); + c >>= 6; + d[1] = 0x80 | (c & 0x3f); + c >>= 6; + d[0] = 0xe0 | c; + *dst += 3; + return; + } + + /* 0x10000-0x10ffff: 4 bytes */ + d[3] = 0x80 | (c & 0x3f); + c >>= 6; + d[2] = 0x80 | (c & 0x3f); + c >>= 6; + d[1] = 0x80 | (c & 0x3f); + c >>= 6; + d[0] = 0xf0 | c; + *dst += 4; +} + +static uint32_t vkd3d_utf16_read(const uint16_t **src) +{ + const uint16_t *s = *src; + + if (s[0] < 0xd800 || s[0] > 0xdfff) /* Not a surrogate pair. */ + { + *src += 1; + return s[0]; + } + + if (s[0] > 0xdbff /* Invalid high surrogate. */ + || s[1] < 0xdc00 || s[1] > 0xdfff) /* Invalid low surrogate. */ + { + *src += 1; + return 0; + } + + *src += 2; + return 0x10000 + ((s[0] & 0x3ff) << 10) + (s[1] & 0x3ff); +} + +static char *vkd3d_strdup_w16_utf8(const uint16_t *wstr) +{ + const uint16_t *src = wstr; + size_t dst_size = 0; + uint32_t c; + char *dst; + + while (*src) + { + if (!(c = vkd3d_utf16_read(&src))) + continue; + dst_size += vkd3d_utf8_len(c); + } + ++dst_size; + + if (!(dst = vkd3d_malloc(dst_size))) + return NULL; + + src = wstr; + while (*src) + { + if (!(c = vkd3d_utf16_read(&src))) + continue; + vkd3d_utf8_append(&dst, c); + } + *dst = 0; + + return dst; +} + +static char *vkd3d_strdup_w32_utf8(const uint32_t *wstr) +{ + const uint32_t *src = wstr; + size_t dst_size = 0; + char *dst; + + while (*src) + dst_size += vkd3d_utf8_len(*src++); + ++dst_size; + + if (!(dst = vkd3d_malloc(dst_size))) + return NULL; + + src = wstr; + while (*src) + vkd3d_utf8_append(&dst, *src++); + *dst = 0; + + return dst; +} + +char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size) +{ + if (wchar_size == 2) + return vkd3d_strdup_w16_utf8((const uint16_t *)wstr); + return vkd3d_strdup_w32_utf8((const uint32_t *)wstr); +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 64c8391..4b5f522 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -84,6 +84,7 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, + {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_transform_feedback)}, {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6eba450..158240d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2730,9 +2730,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetName(ID3D12QueryHeap *iface { struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_vk_object_name(heap->device, (uint64_t)heap->vk_query_pool, + VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT, name); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_GetDevice(ID3D12QueryHeap *iface, diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 0144fdc..27333f2 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -642,3 +642,32 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, pthread_mutex_unlock(&store->mutex); return hr; } + +HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkDebugMarkerObjectNameInfoEXT info; + char *name_utf8; + VkResult vr; + + if (!name) + return E_INVALIDARG; + + if (!device->vk_info.EXT_debug_marker) + return S_OK; + + if (!(name_utf8 = vkd3d_strdup_w_utf8(name, device->wchar_size))) + return E_OUTOFMEMORY; + + info.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT; + info.pNext = NULL; + info.objectType = vk_object_type; + info.object = vk_object; + info.pObjectName = name_utf8; + vr = VK_CALL(vkDebugMarkerSetObjectNameEXT(device->vk_device, &info)); + + vkd3d_free(name_utf8); + + return hresult_from_vk_result(vr); +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 73825bb..69e2cf7 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -25,6 +25,7 @@ #include "vkd3d_common.h" #include "vkd3d_memory.h" +#include "vkd3d_utf8.h" #include "list.h" #include "rbtree.h" @@ -87,6 +88,7 @@ struct vkd3d_vulkan_info bool EXT_debug_report; /* device extensions */ bool KHR_push_descriptor; + bool EXT_debug_marker; bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; @@ -1026,4 +1028,7 @@ static inline void vkd3d_set_thread_name(const char *name) #endif } +HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN; + #endif /* __VKD3D_PRIVATE_H */ diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index be983ec..b62af4e 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -174,6 +174,8 @@ VK_DEVICE_PFN(vkSetEvent) VK_DEVICE_PFN(vkUnmapMemory) VK_DEVICE_PFN(vkUpdateDescriptorSets) VK_DEVICE_PFN(vkWaitForFences) +/* VK_EXT_debug_marker */ +VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) /* VK_EXT_transform_feedback */ -- 2.11.0

2 1

winex11.drv/window.c:is_window_managed()
by Dawser Stevens 29 Jan '19

29 Jan '19

Hi everybody, This is my first post to the list. I have been trying for a few days to make Office 2016 run using the trunk version of Wine. I got it to mostly work, Excel and Word very well, and OneNote almost as well, even supporting inking. However, the main problem to make it usable was the right-click dual tool window popup. Using the trunk version of wine, right click only shows the first toolwindow of the two (the one that doesn't include Copy/Paste etc.) I think I debugged the problem to `winex11.drv/window.c:is_window_managed()` There used to be old code that made WS_EX_TOOLWINDOW extended attribute windows unmanaged. Alexandre added some additional logic and removed that line...in 2008! https://www.winehq.org/pipermail/wine-cvs/2008-April/042994.html The new interface from Microsoft may have changed the logic in the last ten years. These windows now have a `style = WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS` and a extended style including `WS_EX_TOOLWINDOW` so they are layered popups and toolwindows. If I add: `if (ex_style & WS_EX_TOOLWINDOW) return FALSE;` right after the managed mode check at the beginning of the function, making them unmanaged, both tool windows appear, though the mouse clicks and window creation are not perfectly synced (the right mouse click works randomly). I am asking for advice. I really don't know the code very well yet, and that particular logic of what windows to manage seems very sensitive. I think it would be a big win to make Office 2016 usable. Thank you.

1 0

Re: [PATCH v2] debug.h: hint a compiler: TRACE is not executed in common usage
by Konstantin Kharlamov 29 Jan '19

29 Jan '19

On 30.01.2019 00:18, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Rejected". > > This means that the patch has been rejected by a reviewer. You should > have received a mail explaining why it was rejected. You need to fix > the issue and resend the patch, or if you are convinced that your > patch is good as is, you should reply to the rejection message with > your counterarguments. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. I'm sorry, but rejecting a patch that's still being discussed is not the most polite act. Just a point, to whoever did this.

1 0

[PATCH vkd3d 3/3] vkd3d: Implement d3d12_heap_SetName().
by Henri Verbeet 29 Jan '19

29 Jan '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/resource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 3f44712..ced232d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -192,9 +192,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCH { struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_vk_object_name(heap->device, (uint64_t)heap->vk_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, name); } static HRESULT STDMETHODCALLTYPE d3d12_heap_GetDevice(ID3D12Heap *iface, -- 2.11.0

1 0

[PATCH vkd3d 2/3] vkd3d: Implement d3d12_resource_SetName().
by Henri Verbeet 29 Jan '19

29 Jan '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/resource.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 158240d..3f44712 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -842,10 +842,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_SetPrivateDataInterface(ID3D12Re static HRESULT STDMETHODCALLTYPE d3d12_resource_SetName(ID3D12Resource *iface, const WCHAR *name) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + HRESULT hr; - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, resource->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, resource->device->wchar_size)); - return E_NOTIMPL; + if (resource->vk_memory) + { + if (FAILED(hr = vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->vk_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, name))) + return hr; + } + + if (d3d12_resource_is_buffer(resource)) + return vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->u.vk_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, name); + else + return vkd3d_set_vk_object_name(resource->device, (uint64_t)resource->u.vk_image, + VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, name); } static HRESULT STDMETHODCALLTYPE d3d12_resource_GetDevice(ID3D12Resource *iface, -- 2.11.0

1 0

[PATCH 1/3] dmime/tests: Fix a memory leak (Valgrind).
by Sven Baars 29 Jan '19

29 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/dmime/tests/performance.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index c4cbb32e18..567de1e7f1 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -315,6 +315,9 @@ static void test_createport(void) ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); + hr = IDirectMusicPerformance8_CloseDown(perf); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + IDirectMusic_Release(music); IDirectMusicPerformance_Release(perf); } -- 2.17.1

3 4

[PATCH] strmbase: Remove redundant NULL check before CoTaskMemFree()
by Michael Stefaniuc 29 Jan '19

29 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/strmbase/mediatype.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 91c0ddc60a..e43bed5a46 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -45,11 +45,8 @@ HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src) void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType) { - if (pMediaType->pbFormat) - { - CoTaskMemFree(pMediaType->pbFormat); - pMediaType->pbFormat = NULL; - } + CoTaskMemFree(pMediaType->pbFormat); + pMediaType->pbFormat = NULL; if (pMediaType->pUnk) { IUnknown_Release(pMediaType->pUnk); -- 2.20.1

1 0

[PATCH] reg: Remove redundant NULL check before heap_free()
by Michael Stefaniuc 29 Jan '19

29 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/reg/import.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 779ea2863b..3e3ad11638 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -645,11 +645,8 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) { WCHAR *val_name = pos, *p; - if (parser->value_name) - { - heap_free(parser->value_name); - parser->value_name = NULL; - } + heap_free(parser->value_name); + parser->value_name = NULL; if (!unescape_string(val_name, &p)) goto invalid; -- 2.20.1

1 0

[PATCH] regedit: Remove redundant NULL check before heap_free()
by Michael Stefaniuc 29 Jan '19

29 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/regproc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4ef99ec3ca..28402dc3cd 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -731,11 +731,8 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) { WCHAR *val_name = pos, *p; - if (parser->value_name) - { - heap_free(parser->value_name); - parser->value_name = NULL; - } + heap_free(parser->value_name); + parser->value_name = NULL; if (!REGPROC_unescape_string(val_name, &p)) goto invalid; -- 2.20.1

1 0