April 2019 - Wine-commits - list.winehq.org

Zebediah Figura : widl: Correctly set the import library offset for all imported types.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 6c64d02117ecb9b259a55237f145fc9d5e70cdad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c64d02117ecb9b259a55237… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 17 00:14:55 2019 -0500 widl: Correctly set the import library offset for all imported types. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47031 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index afca4c0..1177c1a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -497,6 +497,7 @@ struct _importinfo_t { }; struct _importlib_t { + int offset; char *name; int version; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index cb4f0f3..4dcbc03 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -702,15 +702,15 @@ static void alloc_importinfo(msft_typelib_t *typelib, importinfo_t *importinfo) guid_idx = ctl2_alloc_guid(typelib, &guid); - alloc_importfile(typelib, guid_idx, importlib->version&0xffff, - importlib->version>>16, importlib->name); + importlib->offset = alloc_importfile(typelib, guid_idx, importlib->version & 0xffff, + importlib->version >> 16, importlib->name); } if(importinfo->offset == -1 || !(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID)) { MSFT_ImpInfo impinfo; impinfo.flags = importinfo->flags; - impinfo.oImpFile = 0; + impinfo.oImpFile = importlib->offset; if(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID) { MSFT_GuidEntry guid;

1 0

Hans Leidekker : msi: Remove system environment variables on uninstall.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 7f95ed7cd2d440420c0c3d1a938af8b48960f352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f95ed7cd2d440420c0c3d1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 17 15:14:01 2019 +0200 msi: Remove system environment variables on uninstall. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/tests/action.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 849335e..03b6abf 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7050,7 +7050,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) else if (*cptr == '!') *flags |= ENV_ACT_REMOVEMATCH; else if (*cptr == '*') - *flags |= ENV_MOD_MACHINE; + *flags |= ENV_MOD_MACHINE | ENV_ACT_REMOVE; else break; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 951b89c..7750351 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -247,7 +247,8 @@ static const char env_environment_dat[] = "Var26\t+-MSITESTVAR20\t2[~]\tOne\n" "Var27\t+-MSITESTVAR21\t[~];1\tOne\n" "Var28\t-MSITESTVAR22\t1\tOne\n" - "Var29\t-MSITESTVAR23\t2\tOne\n"; + "Var29\t-MSITESTVAR23\t2\tOne\n" + "Var30\t*MSITESTVAR100\t1\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -4843,7 +4844,7 @@ static void test_envvar(void) { char buffer[16]; UINT r, i; - HKEY env; + HKEY env, env2; LONG res; if (is_process_limited()) @@ -4857,6 +4858,10 @@ static void test_envvar(void) res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Session Manager\\Environment", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env2, NULL); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4910,6 +4915,7 @@ static void test_envvar(void) CHECK_REG_STR(env, "MSITESTVAR19", "1"); CHECK_REG_STR(env, "MSITESTVAR20", "1"); CHECK_REG_STR(env, "MSITESTVAR21", "1"); + CHECK_REG_STR(env2, "MSITESTVAR100", "1"); res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4937,11 +4943,15 @@ todo_wine { ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res); } + res = RegDeleteValueA(env2, "MSITESTVAR100"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + error: RegDeleteValueA(env, "MSITESTVAR1"); RegDeleteValueA(env, "MSITESTVAR2"); RegDeleteValueA(env, "MSITESTVAR21"); RegCloseKey(env); + RegCloseKey(env2); DeleteFileA(msifile); }

1 0

Józef Kucia : wined3d: Make the adapter responsible for creating devices.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 32c3afba51cdf20217a525c2a50d3822222d86ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c3afba51cdf20217a525c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:20 2019 +0200 wined3d: Make the adapter responsible for creating devices. 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/wined3d/adapter_gl.c | 33 +++++++++++++++++ dlls/wined3d/adapter_vk.c | 42 ++++++++++++++++++++++ dlls/wined3d/device.c | 82 ++++++++++++++++++++++-------------------- dlls/wined3d/directx.c | 50 +++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 10 ++++-- 5 files changed, 164 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32c3afba51cdf20217a5…

1 0

Józef Kucia : wined3d: Create Vulkan device for wined3d_device_vk.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 725c5156ef4b87e49d94289c3f071bf48e58c467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=725c5156ef4b87e49d94289c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:21 2019 +0200 wined3d: Create Vulkan device for wined3d_device_vk. 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/wined3d/adapter_vk.c | 116 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 848c02c..813a027 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -27,6 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); struct wined3d_device_vk { struct wined3d_device d; + + VkDevice vk_device; + VkQueue vk_queue; }; static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) @@ -45,6 +48,30 @@ static const char *debug_vk_version(uint32_t version) VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)); } +static HRESULT hresult_from_vk_result(VkResult vr) +{ + switch (vr) + { + case VK_SUCCESS: + return S_OK; + case VK_ERROR_OUT_OF_HOST_MEMORY: + WARN("Out of host memory.\n"); + return E_OUTOFMEMORY; + case VK_ERROR_OUT_OF_DEVICE_MEMORY: + WARN("Out of device memory.\n"); + return E_OUTOFMEMORY; + case VK_ERROR_DEVICE_LOST: + WARN("Device lost.\n"); + return E_FAIL; + case VK_ERROR_EXTENSION_NOT_PRESENT: + WARN("Extension not present.\n"); + return E_FAIL; + default: + FIXME("Unhandled VkResult %d.\n", vr); + return E_FAIL; + } +} + #ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { @@ -106,33 +133,116 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) heap_free(adapter_vk); } +static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_vk *adapter_vk, + uint32_t *queue_family_index) +{ + VkPhysicalDevice physical_device = adapter_vk->physical_device; + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + VkQueueFamilyProperties *queue_properties; + uint32_t count, i; + + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, NULL)); + + if (!(queue_properties = heap_calloc(count, sizeof(*queue_properties)))) + return E_OUTOFMEMORY; + + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, queue_properties)); + + for (i = 0; i < count; ++i) + { + if (queue_properties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) + { + *queue_family_index = i; + heap_free(queue_properties); + return WINED3D_OK; + } + } + heap_free(queue_properties); + + WARN("Failed to find graphics queue.\n"); + return E_FAIL; +} + static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { + const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + static const float priorities[] = {1.0f}; struct wined3d_device_vk *device_vk; + VkDevice vk_device = VK_NULL_HANDLE; + VkDeviceQueueCreateInfo queue_info; + VkPhysicalDeviceFeatures features; + VkPhysicalDevice physical_device; + VkDeviceCreateInfo device_info; + uint32_t queue_family_index; + VkResult vr; HRESULT hr; if (!(device_vk = heap_alloc_zero(sizeof(*device_vk)))) return E_OUTOFMEMORY; + if (FAILED(hr = wined3d_select_vulkan_queue_family(adapter_vk, &queue_family_index))) + goto fail; + + physical_device = adapter_vk->physical_device; + + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features)); + + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; + queue_info.pNext = NULL; + queue_info.flags = 0; + queue_info.queueFamilyIndex = queue_family_index; + queue_info.queueCount = ARRAY_SIZE(priorities); + queue_info.pQueuePriorities = priorities; + + device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_info.pNext = NULL; + device_info.flags = 0; + device_info.queueCreateInfoCount = 1; + device_info.pQueueCreateInfos = &queue_info; + device_info.enabledLayerCount = 0; + device_info.ppEnabledLayerNames = NULL; + device_info.enabledExtensionCount = 0; + device_info.ppEnabledExtensionNames = NULL; + device_info.pEnabledFeatures = &features; + + if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) + { + WARN("Failed to create Vulkan device, vr %d.\n", vr); + vk_device = VK_NULL_HANDLE; + hr = hresult_from_vk_result(vr); + goto fail; + } + + device_vk->vk_device = vk_device; + VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); + if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(device_vk); - return hr; + goto fail; } return WINED3D_OK; + +fail: + VK_CALL(vkDestroyDevice(vk_device, NULL)); + heap_free(device_vk); + return hr; } static void adapter_vk_destroy_device(struct wined3d_device *device) { + struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(device->adapter); struct wined3d_device_vk *device_vk = wined3d_device_vk(device); + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - wined3d_device_cleanup(device); + wined3d_device_cleanup(&device_vk->d); + VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); }

1 0

Józef Kucia : d3d11: Fix d3d11_immediate_context_RSGetScissorRects().
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 51ef6190c771b56691696920da5d442a9eb001fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ef6190c771b56691696920… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:22 2019 +0200 d3d11: Fix d3d11_immediate_context_RSGetScissorRects(). 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/d3d11/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 588395b..6b89a64 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2061,6 +2061,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De if (!rect_count) return; + actual_count = *rect_count; + wined3d_mutex_lock(); wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock();

1 0

Józef Kucia : d3d11: Fix d3d10_device_RSGetScissorRects().
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: fcb2784697ca63d47a4262b7f277d904177e9c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb2784697ca63d47a4262b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 18 11:00:23 2019 +0200 d3d11: Fix d3d10_device_RSGetScissorRects(). 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/d3d11/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6b89a64..4f19c03 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5114,6 +5114,8 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *ifac if (!rect_count) return; + actual_count = *rect_count; + wined3d_mutex_lock(); wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock();

1 0

Hans Leidekker : msi: Fix architecture handling in the AppSearch action.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: eb508e5a014f59fbb2c70d9909ba0870ce2b901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb508e5a014f59fbb2c70d99… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 18 11:31:59 2019 +0200 msi: Fix architecture handling in the AppSearch action. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/appsearch.c | 7 +++++-- dlls/msi/tests/package.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 047085d..6b1768e 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -372,6 +372,7 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig const WCHAR *keyPath, *valueName; WCHAR *deformatted = NULL, *ptr = NULL, *end; int root, type; + REGSAM access = KEY_READ; HKEY rootKey, key = NULL; DWORD sz = 0, regType; LPBYTE value = NULL; @@ -406,6 +407,8 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig break; case msidbRegistryRootLocalMachine: rootKey = HKEY_LOCAL_MACHINE; + if (type & msidbLocatorType64bit) access |= KEY_WOW64_64KEY; + else access |= KEY_WOW64_32KEY; break; case msidbRegistryRootUsers: rootKey = HKEY_USERS; @@ -415,10 +418,10 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig goto end; } - rc = RegOpenKeyW(rootKey, deformatted, &key); + rc = RegOpenKeyExW( rootKey, deformatted, 0, access, &key ); if (rc) { - TRACE("RegOpenKeyW returned %d\n", rc); + TRACE("RegOpenKeyExW returned %d\n", rc); goto end; } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d5f1568..593e254 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4036,6 +4036,8 @@ static void test_appsearch(void) add_appsearch_entry( hdb, "'WEBBROWSERPROG', 'NewSignature1'" ); add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); add_appsearch_entry( hdb, "'REGEXPANDVAL', 'NewSignature3'" ); + add_appsearch_entry( hdb, "'32KEYVAL', 'NewSignature4'" ); + add_appsearch_entry( hdb, "'64KEYVAL', 'NewSignature5'" ); create_reglocator_table( hdb ); add_reglocator_entry( hdb, "NewSignature1", 0, "htmlfile\\shell\\open\\command", "", 1 ); @@ -4045,7 +4047,26 @@ static void test_appsearch(void) r = RegSetValueExA(hkey, NULL, 0, REG_EXPAND_SZ, (const BYTE*)reg_expand_value, strlen(reg_expand_value) + 1); ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); RegCloseKey(hkey); - add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", 1 ); + add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", msidbLocatorTypeFileName ); + + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, + NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", + sizeof("c:\\windows\\system32\\notepad.exe")); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + add_reglocator_entry( hdb, "NewSignature4", 2, "Software\\Winetest_msi", "", msidbLocatorTypeFileName ); + + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, + NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", + sizeof("c:\\windows\\system32\\notepad.exe")); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + add_reglocator_entry( hdb, "NewSignature5", 2, "Software\\Winetest_msi", "", + msidbLocatorTypeFileName|msidbLocatorType64bit ); create_drlocator_table( hdb ); add_drlocator_entry( hdb, "'NewSignature2', 0, 'c:\\windows\\system32', 0" ); @@ -4054,6 +4075,8 @@ static void test_appsearch(void) add_signature_entry( hdb, "'NewSignature1', 'FileName', '', '', '', '', '', '', ''" ); add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); add_signature_entry( hdb, "'NewSignature3', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + add_signature_entry( hdb, "'NewSignature4', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + add_signature_entry( hdb, "'NewSignature5', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4086,10 +4109,22 @@ static void test_appsearch(void) ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "32KEYVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "64KEYVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); + delete_key(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", KEY_WOW64_32KEY); + delete_key(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", KEY_WOW64_64KEY); } static void test_appsearch_complocator(void)

1 0

Nikolay Sivov : mfreadwrite: Output warning for uninitialized stream descriptor.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 3e8b14adb38431a075eb9cc96f482f27d46f1fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8b14adb38431a075eb9cc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 14:35:30 2019 +0300 mfreadwrite: Output warning for uninitialized stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index fd9062f..7625669 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -727,7 +727,13 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor { hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); IMFMediaTypeHandler_Release(handler); - if (SUCCEEDED(hr) && IsEqualGUID(&guid, major)) + if (FAILED(hr)) + { + WARN("Failed to get stream major type, hr %#x.\n", hr); + continue; + } + + if (IsEqualGUID(&guid, major)) { return i; }

1 0

Nikolay Sivov : mfplat/tests: Add a test for stream descriptor major type behavior.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 4c9517ee0d3de7850f9227dd8828190679ecde48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9517ee0d3de7850f9227dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 14:35:31 2019 +0300 mfplat/tests: Add a test for stream descriptor major type behavior. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 176f339..571d57a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -216,9 +216,13 @@ static void test_source_resolver(void) IMFAttributes *attributes; IMFMediaSource *mediasource; IMFPresentationDescriptor *descriptor; + IMFMediaTypeHandler *handler; MF_OBJECT_TYPE obj_type; + IMFStreamDescriptor *sd; HRESULT hr; WCHAR *filename; + BOOL selected; + GUID guid; static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; @@ -297,11 +301,23 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); - hr = IMFMediaSource_CreatePresentationDescriptor( - mediasource, &descriptor); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); + ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); ok(descriptor != NULL, "got %p\n", descriptor); + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); +todo_wine + ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); + + IMFMediaTypeHandler_Release(handler); + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(descriptor); IMFMediaSource_Release(mediasource); IMFByteStream_Release(bytestream);

1 0

Józef Kucia : vkd3d: Differentiate GPU and CPU fence signal operations.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: 81b33e7129d7b47f6ae6d01eabee1dabdbe00511 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=81b33e7129d7b47f6ae6d01… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:34 2019 +0200 vkd3d: Differentiate GPU and CPU fence signal operations. 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> --- libs/vkd3d/command.c | 109 ++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 6 +-- 2 files changed, 71 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b9deffe..6c9b145 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -19,6 +19,8 @@ #include "vkd3d_private.h" +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence); + HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue) { @@ -80,7 +82,7 @@ void vkd3d_queue_release(struct vkd3d_queue *queue) /* Fence worker thread */ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, - VkFence vk_fence, ID3D12Fence *fence, UINT64 value) + VkFence vk_fence, struct d3d12_fence *fence, uint64_t value) { int rc; @@ -118,7 +120,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, return S_OK; } -static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, ID3D12Fence *fence) +static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence) { struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -156,6 +158,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; unsigned int i, j; + VkFence vk_fence; HRESULT hr; int vr; @@ -174,12 +177,13 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) for (i = 0, j = 0; i < worker->fence_count; ++i) { - if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, worker->vk_fences[i])))) + vk_fence = worker->vk_fences[i]; + if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)))) { struct vkd3d_waiting_fence *current = &worker->fences[i]; - if (FAILED(hr = ID3D12Fence_Signal(current->fence, current->value))) - ERR("Failed to signal D3D12 fence, hr %d.\n", hr); - VK_CALL(vkDestroyFence(device->vk_device, worker->vk_fences[i], NULL)); + TRACE("Signaling fence %p value %#"PRIx64".\n", current->fence, current->value); + if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence))) + ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); continue; } @@ -373,6 +377,48 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence) +{ + struct d3d12_device *device = fence->device; + unsigned int i, j; + int rc; + + if (vk_fence) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); + } + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + fence->value = value; + + for (i = 0, j = 0; i < fence->event_count; ++i) + { + struct vkd3d_waiting_event *current = &fence->events[i]; + + if (current->value <= value) + { + fence->device->signal_event(current->event); + } + else + { + if (i != j) + fence->events[j] = *current; + ++j; + } + } + fence->event_count = j; + + pthread_mutex_unlock(&fence->mutex); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_fence_QueryInterface(ID3D12Fence *iface, REFIID riid, void **object) { @@ -419,7 +465,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_private_store_destroy(&fence->private_store); - vkd3d_fence_worker_remove_fence(&device->fence_worker, iface); + vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) @@ -554,39 +600,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 value) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - unsigned int i, j; - int rc; TRACE("iface %p, value %#"PRIx64".\n", iface, value); - if ((rc = pthread_mutex_lock(&fence->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return hresult_from_errno(rc); - } - - fence->value = value; - - for (i = 0, j = 0; i < fence->event_count; ++i) - { - struct vkd3d_waiting_event *current = &fence->events[i]; - - if (current->value <= value) - { - fence->device->signal_event(current->event); - } - else - { - if (i != j) - fence->events[j] = *current; - ++j; - } - } - fence->event_count = j; - - pthread_mutex_unlock(&fence->mutex); - - return S_OK; + return d3d12_fence_signal(fence, value, VK_NULL_HANDLE); } static const struct ID3D12FenceVtbl d3d12_fence_vtbl = @@ -608,6 +625,14 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = d3d12_fence_Signal, }; +static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d12_fence_vtbl); + return impl_from_ID3D12Fence(iface); +} + static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { @@ -4886,21 +4911,24 @@ static void STDMETHODCALLTYPE d3d12_command_queue_EndEvent(ID3D12CommandQueue *i } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *iface, - ID3D12Fence *fence, UINT64 value) + ID3D12Fence *fence_iface, UINT64 value) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; VkFenceCreateInfo fence_info; struct d3d12_device *device; + struct d3d12_fence *fence; VkFence vk_fence; VkQueue vk_queue; VkResult vr; - TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence, value); + TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value); device = command_queue->device; vk_procs = &device->vk_procs; + fence = unsafe_impl_from_ID3D12Fence(fence_iface); + fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_info.pNext = NULL; fence_info.flags = 0; @@ -4929,8 +4957,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)); if (vr == VK_SUCCESS) { - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - return d3d12_fence_Signal(fence, value); + return d3d12_fence_signal(fence, value, vk_fence); } if (vr != VK_NOT_READY) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76fec70..68a51c0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -147,7 +147,7 @@ struct vkd3d_fence_worker size_t vk_fences_size; struct vkd3d_waiting_fence { - ID3D12Fence *fence; + struct d3d12_fence *fence; UINT64 value; } *fences; size_t fences_size; @@ -249,12 +249,12 @@ struct d3d12_fence ID3D12Fence ID3D12Fence_iface; LONG refcount; - UINT64 value; + uint64_t value; pthread_mutex_t mutex; struct vkd3d_waiting_event { - UINT64 value; + uint64_t value; HANDLE event; } *events; size_t events_size;

1 0