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

Fabian Maurer : comctl32/tests: Add a test for base class names.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 48e8e579bc2b699847b9e3edcd830568662c901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e8e579bc2b699847b9e3ed… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Aug 27 09:14:12 2018 +0300 comctl32/tests: Add a test for base class names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index eca85d4..85f339b 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -345,6 +345,9 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno if (GetClassInfoA( 0, name, &wc )) { + char buff[64]; + HWND hwnd; + todo_wine_if(strcmp(name, "Button") && strcmp(name, "ComboBox") && strcmp(name, "Edit") && @@ -356,6 +359,12 @@ todo_wine_if(strcmp(name, "Button") && ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", name, wc.style & ~style, wc.style, style ); ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance ); + + hwnd = CreateWindowA(name, 0, 0, 0, 0, 0, 0, 0, NULL, GetModuleHandleA(NULL), 0); + ok( hwnd != NULL, "Failed to create window for class %s.\n", name ); + GetClassNameA(hwnd, buff, ARRAY_SIZE(buff)); + ok( !strcmp(name, buff), "Unexpected class name %s, expected %s.\n", buff, name ); + DestroyWindow(hwnd); } else ok( !must_exist, "System class %s does not exist\n", name );

1 0

Alex Henrie : shell32: Add rights icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 5f82532b218c9b25064d65f389e674668dbd361c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f82532b218c9b25064d65f3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:52 2018 -0600 shell32: Add rights icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/lock.ico | Bin 0 -> 32810 bytes dlls/shell32/resources/lock.svg | 532 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 537 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f82532b218c9b25064d…

1 0

Zhiyi Zhang : comctl32/tests: Remove pager skip check.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: b200fac42d7bc4ac9da3d6056e60d50dc5efdf15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b200fac42d7bc4ac9da3d605… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 22:04:20 2018 +0800 comctl32/tests: Remove pager skip check. Pager should be available on all VMs(XP+) on TestBot. So there's no need to check for the availability of pager control. Add calling InitCommonControls() so that pager control can be correctly initialized on XP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 0da396c..fa505dc 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -32,6 +32,7 @@ static HWND parent_wnd, child1_wnd, child2_wnd; #define CHILD1_ID 1 #define CHILD2_ID 2 +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -257,11 +258,7 @@ static void test_pager(void) RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); - if (!pager) - { - win_skip( "Pager control not supported\n" ); - return; - } + ok(pager != NULL, "Fail to create pager\n"); register_child_wnd_class(); @@ -333,11 +330,26 @@ static void test_pager(void) DestroyWindow( pager ); } -START_TEST(pager) +static void init_functions(void) { - HMODULE mod = GetModuleHandleA("comctl32.dll"); + HMODULE mod = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(mod, #f); + X(InitCommonControlsEx); +#undef X pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); +} + +START_TEST(pager) +{ + INITCOMMONCONTROLSEX iccex; + + init_functions(); + + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_PAGESCROLLER_CLASS; + pInitCommonControlsEx(&iccex); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); @@ -345,4 +357,6 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + + DestroyWindow(parent_wnd); }

1 0

Zhiyi Zhang : comctl32/pager: Support WM_NOTIFYFORMAT message.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 069eb68bf9f3b0285b4459774e7585313a67b422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=069eb68bf9f3b0285b445977… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 22:04:49 2018 +0800 comctl32/pager: Support WM_NOTIFYFORMAT message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 8 ++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index fe68515..de63cad 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -71,6 +71,7 @@ typedef struct HWND hwndSelf; /* handle of the control wnd */ HWND hwndChild; /* handle of the contained wnd */ HWND hwndNotify; /* handle of the parent wnd */ + BOOL bUnicode; /* send notifications in Unicode */ DWORD dwStyle; /* styles for this control */ COLORREF clrBk; /* background color */ INT nBorder; /* border size for the control */ @@ -555,6 +556,7 @@ static LRESULT PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { PAGER_INFO *infoPtr; + INT ret; /* allocate memory for info structure */ infoPtr = heap_alloc_zero (sizeof(*infoPtr)); @@ -581,6 +583,9 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) if (infoPtr->dwStyle & PGS_DRAGNDROP) FIXME("[%p] Drag and Drop style is not implemented yet.\n", infoPtr->hwndSelf); + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return 0; } @@ -998,6 +1003,23 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp return 0; } +static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) +{ + INT ret; + switch (command) + { + case NF_REQUERY: + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + infoPtr->bUnicode = (ret == NFR_UNICODE); + return ret; + case NF_QUERY: + /* Pager always wants Unicode notifications from children */ + return NFR_UNICODE; + default: + return 0; + } +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1089,6 +1111,9 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_TIMER: return PAGER_Timer (infoPtr, (INT)wParam); + case WM_NOTIFYFORMAT: + return PAGER_NotifyFormat (infoPtr, lParam); + case WM_NOTIFY: case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index f2ac8b2..a1f6683 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -392,8 +392,8 @@ static void test_wm_notifyformat(void) /* Test parent */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Send NF_QUERY directly to parent */ notify_query_received = FALSE; @@ -404,8 +404,8 @@ static void test_wm_notifyformat(void) /* Pager send notifications to its parent regardless of wParam */ notify_query_received = FALSE; ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); - todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); - todo_wine ok(notify_query_received, "Didn't receive notify\n"); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); /* Pager always wants Unicode notifications from children */ ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY);

1 0

Zhiyi Zhang : comctl32/tests: Add WM_NOTIFYFORMAT tests for pager.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 4be93106cd446539faae881e5a81b8844a930888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be93106cd446539faae881e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 22:04:35 2018 +0800 comctl32/tests: Add WM_NOTIFYFORMAT tests for pager. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index fa505dc..f2ac8b2 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -28,6 +28,8 @@ #define PAGER_SEQ_INDEX 0 static HWND parent_wnd, child1_wnd, child2_wnd; +static INT notify_format; +static BOOL notify_query_received; #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -330,6 +332,93 @@ static void test_pager(void) DestroyWindow( pager ); } +static LRESULT WINAPI test_notifyformat_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) + { + notify_query_received = TRUE; + return notify_format; + } + else if (lParam == NF_REQUERY) + return SendMessageA(GetParent(hwnd), WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); + else + return 0; + default: + return notify_format == NFR_UNICODE ? DefWindowProcW(hwnd, message, wParam, lParam) + : DefWindowProcA(hwnd, message, wParam, lParam); + } +} + +static BOOL register_notifyformat_class(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + WNDCLASSW cls = {0}; + + cls.lpfnWndProc = test_notifyformat_proc; + cls.hInstance = GetModuleHandleW(NULL); + cls.lpszClassName = class_w; + return RegisterClassW(&cls); +} + +static void test_wm_notifyformat(void) +{ + static const WCHAR class_w[] = {'P', 'a', 'g', 'e', 'r', ' ', 'n', 'o', 't', 'i', 'f', 'y', 'f', + 'o', 'r', 'm', 'a', 't', ' ', 'c', 'l', 'a', 's', 's', 0}; + static const WCHAR parent_w[] = {'p', 'a', 'r', 'e', 'n', 't', 0}; + static const WCHAR pager_w[] = {'p', 'a', 'g', 'e', 'r', 0}; + static const WCHAR child_w[] = {'c', 'h', 'i', 'l', 'd', 0}; + static const INT formats[] = {NFR_UNICODE, NFR_ANSI}; + HWND parent, pager, child; + LRESULT ret; + INT i; + + ok(register_notifyformat_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(formats); i++) + { + notify_format = formats[i]; + parent = CreateWindowW(class_w, parent_w, WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleW(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowW(WC_PAGESCROLLERW, pager_w, WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleW(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child = CreateWindowW(class_w, child_w, WS_CHILD, 0, 0, 100, 100, pager, 0, GetModuleHandleW(0), 0); + ok(child != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child); + + /* Test parent */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Send NF_QUERY directly to parent */ + notify_query_received = FALSE; + ret = SendMessageW(parent, WM_NOTIFYFORMAT, (WPARAM)pager, NF_QUERY); + ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager send notifications to its parent regardless of wParam */ + notify_query_received = FALSE; + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)parent_wnd, NF_REQUERY); + todo_wine_if(notify_format == NFR_ANSI) ok(ret == notify_format, "Expect %d, got %ld\n", notify_format, ret); + todo_wine ok(notify_query_received, "Didn't receive notify\n"); + + /* Pager always wants Unicode notifications from children */ + ret = SendMessageW(child, WM_NOTIFYFORMAT, (WPARAM)pager, NF_REQUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + ret = SendMessageW(pager, WM_NOTIFYFORMAT, (WPARAM)child, NF_QUERY); + ok(ret == NFR_UNICODE, "Expect %d, got %ld\n", NFR_UNICODE, ret); + + DestroyWindow(parent); + } + + UnregisterClassW(class_w, GetModuleHandleW(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -357,6 +446,7 @@ START_TEST(pager) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_pager(); + test_wm_notifyformat(); DestroyWindow(parent_wnd); }

1 0

Gijs Vermeulen : ntdll/tests: Add Nt[WaitFor|Release] KeyedEvent test with NULL handle.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 7de2754cc613a53cdf99d5ad28c9b44a32e97e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de2754cc613a53cdf99d5ad… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Aug 26 21:25:36 2018 +0200 ntdll/tests: Add Nt[WaitFor|Release]KeyedEvent test with NULL handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44620 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 52b4a83..c2b40cb 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1677,6 +1677,13 @@ static void test_keyed_events(void) status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); + todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + "NtReleaseKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout );

1 0

Józef Kucia : vkd3d-shader: Downgrade FIXME() about unhandled instruction modifiers to WARN().
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: vkd3d Branch: master Commit: bca28c79eceae04c2a9018dedc7f492819bdec5d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bca28c79eceae04c2a9018d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:38 2018 +0200 vkd3d-shader: Downgrade FIXME() about unhandled instruction modifiers to WARN(). 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-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1309b7e..3be3ca9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1622,7 +1622,7 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh if (modifier & ~recognized_bits) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); + WARN("Unhandled modifier 0x%08x.\n", modifier); } else {

1 0

Józef Kucia : tests: Implement readback for 3D textures.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: vkd3d Branch: master Commit: b9d42358a40ac5e28575bc4b47f81a6046c09eea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b9d42358a40ac5e28575bc4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:36 2018 +0200 tests: Implement readback for 3D textures. 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> --- tests/d3d12.c | 194 ++++++++++++++++++++++------------------------- tests/vkd3d_d3d12_test.h | 61 ++++++++++----- 2 files changed, 132 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b9d42358a40ac5e2857…

1 0

Józef Kucia : vkd3d: Add FIXME() for ignored SampleDesc.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: vkd3d Branch: master Commit: e43141b68e5b12ac603f4ae3c3702386fa18be8a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e43141b68e5b12ac603f4ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:34 2018 +0200 vkd3d: Add FIXME() for ignored SampleDesc. 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/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5e401fd..446e1a6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2180,6 +2180,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (desc->SampleDesc.Count != 1) + FIXME("Ignoring sample desc %u, %u.\n", desc->SampleDesc.Count, desc->SampleDesc.Quality); + graphics->root_signature = root_signature; state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS;

1 0

Józef Kucia : vkd3d: Rename vkd3d_queue_gpu_fence() to vkd3d_enqueue_gpu_fence().
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: vkd3d Branch: master Commit: c4c3634bc468f51839d225ee633b7cc7f0838159 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c4c3634bc468f51839d225e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 27 17:27:35 2018 +0200 vkd3d: Rename vkd3d_queue_gpu_fence() to vkd3d_enqueue_gpu_fence(). 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7aa1695..16c6135 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -78,7 +78,7 @@ static void vkd3d_queue_release(struct vkd3d_queue *queue) } /* Fence worker thread */ -static HRESULT vkd3d_queue_gpu_fence(struct vkd3d_fence_worker *worker, +static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, ID3D12Fence *fence, UINT64 value) { int rc; @@ -4486,7 +4486,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * return hresult_from_vk_result(vr); } - return vkd3d_queue_gpu_fence(&device->fence_worker, vk_fence, fence, value); + return vkd3d_enqueue_gpu_fence(&device->fence_worker, vk_fence, fence, value); } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface,

1 0