December 2020 - Wine-Commits

Henri Verbeet : wined3d: Unmap the chunk if needed in wined3d_context_vk_destroy_bo().
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 9992d710e4d6e7aa9a0dd3ea0824849c7043bae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9992d710e4d6e7aa9a0dd3ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 18:15:21 2020 +0330 wined3d: Unmap the chunk if needed in wined3d_context_vk_destroy_bo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 16 +++++++--------- dlls/wined3d/context_vk.c | 2 ++ dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3da1615b1b5..4e804b60502 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -762,7 +762,6 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - void *map_ptr; VkResult vr; if (bo->map_ptr) @@ -773,7 +772,7 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ if ((slab = bo->slab)) { - if (!(map_ptr = slab->map_ptr) && !(map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) + if (!(bo->map_ptr = slab->map_ptr) && !(bo->map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) { ERR("Failed to map slab.\n"); return NULL; @@ -784,22 +783,19 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ { struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(bo->memory->chunk); - if (!(map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) + if (!(bo->map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) { ERR("Failed to map chunk.\n"); return NULL; } } - else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &map_ptr))) < 0) + else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->map_ptr))) < 0) { ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); return NULL; } - if (sizeof(map_ptr) >= sizeof(uint64_t)) - bo->map_ptr = map_ptr; - - return map_ptr; + return bo->map_ptr; } static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) @@ -808,9 +804,11 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - if (bo->map_ptr) + if (wined3d_map_persistent()) return; + bo->map_ptr = NULL; + if ((slab = bo->slab)) { if (--slab->map_count) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 1b937dd3b21..bd3dc50ab01 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -812,6 +812,8 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); if (bo->memory) { + if (bo->map_ptr) + wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); wined3d_context_vk_destroy_allocator_block(context_vk, bo->memory, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30b21a8225f..f48778ee345 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6367,6 +6367,11 @@ static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *co bo_gl->command_fence_id = device_gl->current_fence_id; } +static inline bool wined3d_map_persistent(void) +{ + return sizeof(void *) >= sizeof(uint64_t); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Henri Verbeet : wined3d: Only clear "map_ptr" if the memory was unmapped in wined3d_allocator_chunk_vk_unmap().
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 4e7be889904152183b349d5e33d862fe659c1806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e7be889904152183b349d5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 18:15:20 2020 +0330 wined3d: Only clear "map_ptr" if the memory was unmapped in wined3d_allocator_chunk_vk_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 66f5109dc87..1b937dd3b21 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -277,8 +277,10 @@ void wined3d_allocator_chunk_vk_unmap(struct wined3d_allocator_chunk_vk *chunk_v TRACE("chunk_vk %p, context_vk %p.\n", chunk_vk, context_vk); - if (!--chunk_vk->c.map_count) - VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); + if (--chunk_vk->c.map_count) + return; + + VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); chunk_vk->c.map_ptr = NULL; }

1 0

Michael Stefaniuc : schedsvc/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: beacd4baf7e5dcc776588e93683f7d8e1258ff27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beacd4baf7e5dcc776588e93… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 13 21:46:22 2020 +0100 schedsvc/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/atsvcapi.c | 2 +- dlls/schedsvc/tests/rpcapi.c | 168 +++++++++++++++++++---------------------- 2 files changed, 80 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=beacd4baf7e5dcc77658…

1 0

Michael Stefaniuc : atl100/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 58426ab34effd831075b0a7e1a50b14d9cb8d78d URL: https://source.winehq.org/git/wine.git/?a=commit;h=58426ab34effd831075b0a7e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 13 12:41:59 2020 +0100 atl100/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl100/tests/atl.c | 59 ++++++++++++++++++------------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index d23c53c1047..71e25b3fb3e 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -43,24 +43,12 @@ static const GUID CATID_CatTest1 = static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" - -static const WCHAR emptyW[] = {'\0'}; -static const WCHAR randomW[] = {'r','a','n','d','o','m','\0'}; -static const WCHAR progid1W[] = {'S','h','e','l','l','.','E','x','p','l','o','r','e','r','.','2','\0'}; -static const WCHAR clsid1W[] = {'{','8','8','5','6','f','9','6','1','-','3','4','0','a','-', - '1','1','d','0','-','a','9','6','b','-', - '0','0','c','0','4','f','d','7','0','5','a','2','}','\0'}; -static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q', - '.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_', - 's','n','a','p','s','h','o','t','/','\0'}; -static const WCHAR mshtml1W[] = {'m','s','h','t','m','l',':','<','h','t','m','l','>','<','b','o','d','y','>', - 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR mshtml2W[] = {'M','S','H','T','M','L',':','<','h','t','m','l','>','<','b','o','d','y','>', - 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR mshtml3W[] = {'<','h','t','m','l','>','<','b','o','d','y','>', 't','e','s','t', - '<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; -static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; +static const WCHAR progid1W[] = L"Shell.Explorer.2"; +static const WCHAR clsid1W[] = L"{8856f961-340a-11d0-a96b-00c04fd705a2}"; +static const WCHAR url1W[] = L"http://test.winehq.org/tests/winehq_snapshot/"; +static const WCHAR mshtml1W[] = L"mshtml:<html><body>test</body></html>"; +static const WCHAR mshtml2W[] = L"MSHTML:<html><body>test</body></html>"; +static const WCHAR mshtml3W[] = L"<html><body>test</body></html>"; static const char html_str[] = "<html><body>test</body><html>"; static BOOL is_token_admin(HANDLE token) @@ -292,9 +280,6 @@ static void test_typelib(void) BSTR path; HRESULT hres; - static const WCHAR scrrun_dll_suffixW[] = {'\\','s','c','r','r','u','n','.','d','l','l',0}; - static const WCHAR mshtml_tlb_suffixW[] = {'\\','m','s','h','t','m','l','.','t','l','b',0}; - inst = LoadLibraryA("scrrun.dll"); ok(inst != NULL, "Could not load scrrun.dll\n"); @@ -304,8 +289,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > ARRAY_SIZE(scrrun_dll_suffixW) - && lstrcmpiW(path+len-ARRAY_SIZE(scrrun_dll_suffixW), scrrun_dll_suffixW), + ok(len > ARRAY_SIZE(L"\\scrrun.dll") + && lstrcmpiW(path+len-ARRAY_SIZE(L"\\scrrun.dll"), L"\\scrrun.dll"), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -320,8 +305,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > ARRAY_SIZE(mshtml_tlb_suffixW) - && lstrcmpiW(path+len-ARRAY_SIZE(mshtml_tlb_suffixW), mshtml_tlb_suffixW), + ok(len > ARRAY_SIZE(L"\\mshtml.tlb") + && lstrcmpiW(path+len-ARRAY_SIZE(L"\\mshtml.tlb"), L"\\mshtml.tlb"), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -589,12 +574,10 @@ static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID l ITypeLib *typelib; HRESULT hres; - static const WCHAR mshtml_tlbW[] = {'m','s','h','t','m','l','.','t','l','b',0}; - ok(!iTInfo, "iTInfo = %d\n", iTInfo); ok(!lcid, "lcid = %x\n", lcid); - hres = LoadTypeLib(mshtml_tlbW, &typelib); + hres = LoadTypeLib(L"mshtml.tlb", &typelib); ok(hres == S_OK, "LoadTypeLib failed: %08x\n", hres); hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHTMLElement, ppTInfo); @@ -679,8 +662,8 @@ static void test_ax_win(void) static HMODULE hinstance = 0; static const WCHAR cls_names[][16] = { - {'A','t','l','A','x','W','i','n','1','0','0',0}, - {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0} + L"AtlAxWin100", + L"AtlAxWinLic100" }; ret = AtlAxWinInit(); @@ -706,7 +689,7 @@ static void test_ax_win(void) if (control) IUnknown_Release(control); DestroyWindow(hwnd); - hwnd = CreateWindowW(cls_names[i], emptyW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + hwnd = CreateWindowW(cls_names[i], L"", 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); @@ -715,7 +698,7 @@ static void test_ax_win(void) if (control) IUnknown_Release(control); DestroyWindow(hwnd); - hwnd = CreateWindowW(cls_names[i], randomW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + hwnd = CreateWindowW(cls_names[i], L"random", 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); todo_wine ok(!hwnd, "returned %p\n", hwnd); if(hwnd) DestroyWindow(hwnd); @@ -772,7 +755,7 @@ static void test_ax_win(void) ret = GetTempPathW(MAX_PATH, pathW); ok(ret, "GetTempPath failed!\n"); - lstrcatW(pathW, html_fileW); + lstrcatW(pathW, L"test.html"); hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); @@ -790,7 +773,7 @@ static void test_ax_win(void) DestroyWindow(hwnd); /* test file:// scheme */ - lstrcpyW(file_uri1W, fileW); + lstrcpyW(file_uri1W, L"file:///"); lstrcatW(file_uri1W, pathW); hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed!\n"); @@ -940,7 +923,7 @@ static void test_AtlAxCreateControl(void) control = (IUnknown *)0xdeadbeef; hwnd = create_container_window(); ok(hwnd != NULL, "create window failed!\n"); - hr = AtlAxCreateControlEx(emptyW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + hr = AtlAxCreateControlEx(L"", hwnd, NULL, &container, &control, &IID_NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(container != NULL, "returned %p!\n", container); ok(!control, "returned %p\n", control); @@ -950,7 +933,7 @@ static void test_AtlAxCreateControl(void) control = (IUnknown *)0xdeadbeef; hwnd = create_container_window(); ok(hwnd != NULL, "create window failed!\n"); - hr = AtlAxCreateControlEx(randomW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + hr = AtlAxCreateControlEx(L"random", hwnd, NULL, &container, &control, &IID_NULL, NULL); ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); ok(!container, "returned %p!\n", container); ok(!control, "returned %p\n", control); @@ -1028,7 +1011,7 @@ static void test_AtlAxCreateControl(void) ret = GetTempPathW(MAX_PATH, pathW); ok(ret, "GetTempPath failed!\n"); - lstrcatW(pathW, html_fileW); + lstrcatW(pathW, L"test.html"); hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); @@ -1049,7 +1032,7 @@ static void test_AtlAxCreateControl(void) DestroyWindow(hwnd); /* test file:// scheme */ - lstrcpyW(file_uri1W, fileW); + lstrcpyW(file_uri1W, L"file:///"); lstrcatW(file_uri1W, pathW); container = NULL; control = NULL;

1 0

Michael Stefaniuc : msi/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: f211bd0a4e0b8e8911b6a64ff4f09bb9d4ec2f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f211bd0a4e0b8e8911b6a64f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 13 21:46:21 2020 +0100 msi/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 4 +--- dlls/msi/tests/record.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index caf24356948..d74d0a2d097 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -518,12 +518,10 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { - WCHAR emptyW[1] = { 0 }; - r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, L""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); } diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 8e4c2df4294..407d756caae 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -56,7 +56,6 @@ static void test_msirecord(void) char buf[10]; WCHAR bufW[10]; const char str[] = "hello"; - const WCHAR strW[] = { 'h','e','l','l','o',0}; char filename[MAX_PATH]; /* check behaviour with an invalid record */ @@ -210,7 +209,7 @@ static void test_msirecord(void) r = MsiRecordGetStringW(h,0,bufW,&sz); ok(r == ERROR_MORE_DATA, "wrong error\n"); ok(sz == 5, "MsiRecordGetStringA returned the wrong length\n"); - ok(0==memcmp(bufW,strW,8), "MsiRecordGetStringA returned the wrong string\n"); + ok(!memcmp(bufW, L"hello", 8), "MsiRecordGetStringA returned the wrong string\n"); sz = 0; bufW[0] = 'x';

1 0

Henri Verbeet : wined3d: Compare requested memory types in wined3d_bo_slab_vk_compare().
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 46c7f66cf3a6ae4fb288bf981db8c7e07846f21b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46c7f66cf3a6ae4fb288bf98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 18:15:19 2020 +0330 wined3d: Compare requested memory types in wined3d_bo_slab_vk_compare(). Instead of comparing the requested memory type against what we actually got. For example, we may have gotten coherent memory without having explicitly requested it, in which case wined3d_context_vk_create_slab_bo() would fail to find an existing slab to allocate from. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f1258842152..66f5109dc87 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -371,6 +371,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context return false; } + slab->requested_memory_type = memory_type; if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { ERR("Failed to create slab bo.\n"); @@ -625,7 +626,7 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, if (!slab->map) { - key.memory_type = slab->bo.memory_type; + key.memory_type = slab->requested_memory_type; key.usage = slab->bo.usage; key.size = slab->bo.size; @@ -1677,8 +1678,8 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); const struct wined3d_bo_slab_vk_key *k = key; - if (k->memory_type != slab->bo.memory_type) - return k->memory_type - slab->bo.memory_type; + if (k->memory_type != slab->requested_memory_type) + return k->memory_type - slab->requested_memory_type; if (k->usage != slab->bo.usage) return k->usage - slab->bo.usage; return k->size - slab->bo.size; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf1a0bb0668..30b21a8225f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1626,6 +1626,7 @@ struct wined3d_bo_slab_vk { struct wine_rb_entry entry; struct wined3d_bo_slab_vk *next; + VkMemoryPropertyFlags requested_memory_type; struct wined3d_bo_vk bo; unsigned int map_count; void *map_ptr;

1 0

Michael Stefaniuc : wldap32/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 981da1d50d75b8b3a7b252c395c43b67e208787a URL: https://source.winehq.org/git/wine.git/?a=commit;h=981da1d50d75b8b3a7b252c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 13 12:42:00 2020 +0100 wldap32/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/tests/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index c982be9e592..9fdd4db03ad 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -98,7 +98,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) static void test_ldap_search_extW( LDAP *ld ) { ULONG ret, message, timelimit; - WCHAR base[] = {0}, filter[] = {'o','u','=','*',0}; + WCHAR base[] = L"", filter[] = L"ou=*"; timelimit = 20; ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message );

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 7b2c78c3bb86feba64c93478c32b85267eb610be URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2c78c3bb86feba64c93478… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 13 20:29:59 2020 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 387 ++++++++++++++++++++------------------------------------------- 1 file changed, 121 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b2c78c3bb86feba64c9…

1 0

Henri Verbeet : wined3d: The Vulkan blitter supports depth blits.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: 85152f3a502230e85942c39cde693321cf47670f URL: https://source.winehq.org/git/wine.git/?a=commit;h=85152f3a502230e85942c39c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 18:15:23 2020 +0330 wined3d: The Vulkan blitter supports depth blits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 69f948c5fd2..b630f0dcfc5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6465,11 +6465,6 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ src_aspect = vk_aspect_mask_from_format(src_texture_vk->t.resource.format); dst_aspect = vk_aspect_mask_from_format(dst_texture_vk->t.resource.format); - if ((src_aspect | dst_aspect) & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) - { - TRACE("Depth/stencil blits not supported.\n"); - goto next; - } if (wined3d_resource_get_sample_count(&src_texture_vk->t.resource) > 1) resolve = true;

1 0

Rafał Harabień : d3d9: Fix handling of D3DENUM_WHQL_LEVEL.
by Alexandre Julliard Dec. 14, 2020

Dec. 14, 2020

Module: wine Branch: master Commit: e6c777d26d9095e0b551869fe107a115034218c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c777d26d9095e0b551869f… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Mon Dec 14 18:15:24 2020 +0330 d3d9: Fix handling of D3DENUM_WHQL_LEVEL. D3DENUM_NO_WHQL_LEVEL from Direct3D 8 was replaced with D3DENUM_WHQL_LEVEL in Direct3D 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 +++ dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..3818cb79952 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,9 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + /* D3DENUM_NO_WHQL_LEVEL -> WINED3DENUM_WHQL_LEVEL */ + flags ^= D3DENUM_NO_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f78d344c085..d616330c307 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2642,7 +2642,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); wined3d_mutex_lock(); - hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, WINED3DENUM_WHQL_LEVEL, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000

1 0