December 2019 - Wine-commits

Zebediah Figura : strmbase: Correctly implement IVideoWindow::NotifyOwnerMessage().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 54da011d2c070afcf3e8effca856ca3a84f553d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54da011d2c070afcf3e8effc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 5 23:08:29 2019 -0600 strmbase: Correctly implement IVideoWindow::NotifyOwnerMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43367 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 40 +++++++++++++++++++++++++++++++++++++-- dlls/strmbase/window.c | 24 ++++++++++++++++++----- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ec089c8444..b2202d7ae7 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1812,10 +1812,27 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw ok(state == OATRUE, "Got state %d.\n", state); } +struct notify_message_params +{ + IVideoWindow *window; + HWND hwnd; + UINT message; +}; + +static DWORD CALLBACK notify_message_proc(void *arg) +{ + const struct notify_message_params *params = arg; + HRESULT hr = IVideoWindow_NotifyOwnerMessage(params->window, (OAHWND)params->hwnd, params->message, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return 0; +} + static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our_hwnd) { + struct notify_message_params params; unsigned int i; OAHWND oahwnd; + HANDLE thread; HRESULT hr; BOOL ret; MSG msg; @@ -1886,14 +1903,33 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our ok(hr == S_OK, "Got hr %#x.\n", hr); ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - todo_wine ok(!ret, "Got unexpected status %#x.\n", ret); + ok(!ret, "Got unexpected status %#x.\n", ret); hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - todo_wine ok(!ret, "Got unexpected status %#x.\n", ret); + ok(!ret, "Got unexpected status %#x.\n", ret); + + params.window = window; + params.hwnd = our_hwnd; + params.message = WM_SYSCOLORCHANGE; + thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); + ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); + ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + CloseHandle(thread); + + params.message = WM_SETCURSOR; + thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); + CloseHandle(thread); + ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); + ok(!ret, "Got unexpected status %#x.\n", ret); hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index be6646c27a..04132aaab1 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -654,14 +654,28 @@ HRESULT WINAPI BaseControlWindowImpl_GetWindowPosition(IVideoWindow *iface, LONG return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface, OAHWND hwnd, LONG uMsg, LONG_PTR wParam, LONG_PTR lParam) +HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface, + OAHWND hwnd, LONG message, LONG_PTR wparam, LONG_PTR lparam) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); - TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam); + TRACE("window %p, hwnd %#lx, message %#x, wparam %#lx, lparam %#lx.\n", + window, hwnd, message, wparam, lparam); - if (!PostMessageW(This->baseWindow.hWnd, uMsg, wParam, lParam)) - return E_FAIL; + /* That these messages are forwarded, and no others, is stated by the + * DirectX documentation, and supported by manual testing. */ + switch (message) + { + case WM_ACTIVATEAPP: + case WM_DEVMODECHANGE: + case WM_DISPLAYCHANGE: + case WM_PALETTECHANGED: + case WM_PALETTEISCHANGING: + case WM_QUERYNEWPALETTE: + case WM_SYSCOLORCHANGE: + SendMessageW(window->baseWindow.hWnd, message, wparam, lparam); + break; + } return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Create the rendering window when the filter is created.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 94822bae5fed8a3bbda00adb4e79652cd9374309 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94822bae5fed8a3bbda00adb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 5 23:08:30 2019 -0600 quartz/vmr9: Create the rendering window when the filter is created. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 50 ++++++++++++++++-------------------------------- 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b8fd3f53ce..98dfd4551b 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1453,7 +1453,7 @@ static void test_overlay(void) hwnd = (HWND)0xdeadbeef; hr = IOverlay_GetWindowHandle(overlay, &hwnd); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(hwnd && hwnd != (HWND)0xdeadbeef, "Got invalid window %p.\n", hwnd); + ok(hwnd && hwnd != (HWND)0xdeadbeef, "Got invalid window %p.\n", hwnd); IOverlay_Release(overlay); IPin_Release(pin); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 1897149575..70b100544c 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1453,7 +1453,7 @@ static void test_overlay(void) hwnd = (HWND)0xdeadbeef; hr = IOverlay_GetWindowHandle(overlay, &hwnd); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(hwnd && hwnd != (HWND)0xdeadbeef, "Got invalid window %p.\n", hwnd); + ok(hwnd && hwnd != (HWND)0xdeadbeef, "Got invalid window %p.\n", hwnd); IOverlay_Release(overlay); IPin_Release(pin); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 994e309165..60c19e0019 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -294,7 +294,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi info.dwFlags |= VMR9Sample_SyncPoint; /* If we render ourselves, and this is a preroll sample, discard it */ - if (This->baseControlWindow.baseWindow.hWnd && (info.dwFlags & VMR9Sample_Preroll)) + if (info.dwFlags & VMR9Sample_Preroll) { return S_OK; } @@ -374,7 +374,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force) HRESULT hr; TRACE("my mode: %u, my window: %p, my last window: %p\n", This->mode, This->baseControlWindow.baseWindow.hWnd, This->hWndClippingWindow); - if (This->baseControlWindow.baseWindow.hWnd || !This->renderer.sink.pin.peer) + if (This->num_surfaces || !This->renderer.sink.pin.peer) return S_OK; if (This->mode == VMR9Mode_Windowless && !This->hWndClippingWindow) @@ -516,6 +516,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) CloseHandle(filter->run_event); FreeLibrary(filter->hD3d9); + BaseControlWindow_Destroy(&filter->baseControlWindow); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -1510,13 +1511,10 @@ static HRESULT WINAPI VMR7WindowlessControl_SetVideoPosition(IVMRWindowlessContr if (dest) { This->target_rect = *dest; - if (This->baseControlWindow.baseWindow.hWnd) - { - FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest)); - SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, - dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, - SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); - } + FIXME("Output rectangle: %s.\n", wine_dbgstr_rect(dest)); + SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, + dest->left, dest->top, dest->right - dest->left, dest->bottom-dest->top, + SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_NOREDRAW); } LeaveCriticalSection(&This->renderer.filter.csFilter); @@ -1714,12 +1712,10 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr if (dest) { This->target_rect = *dest; - if (This->baseControlWindow.baseWindow.hWnd) - { - FIXME("Output rectangle: %s\n", wine_dbgstr_rect(dest)); - SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, - dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); - } + FIXME("Output rectangle: %s.\n", wine_dbgstr_rect(dest)); + SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, + dest->left, dest->top, dest->right - dest->left, dest->bottom - dest->top, + SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | SWP_NOREDRAW); } LeaveCriticalSection(&This->renderer.filter.csFilter); @@ -2251,6 +2247,9 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) if (FAILED(hr)) goto fail; + if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVMR->baseControlWindow.baseWindow))) + goto fail; + hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) @@ -2265,6 +2264,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) return hr; fail: + BaseWindowImpl_DoneWithWindow(&pVMR->baseControlWindow.baseWindow); strmbase_renderer_cleanup(&pVMR->renderer); FreeLibrary(pVMR->hD3d9); CoTaskMemFree(pVMR); @@ -2594,9 +2594,6 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A TRACE("(%p)->()\n", This); - if (FAILED(BaseWindowImpl_PrepareWindow(&This->pVMR9->baseControlWindow.baseWindow))) - return FALSE; - /* Obtain a monitor and d3d9 device */ d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->baseControlWindow.baseWindow.hWnd, &This->hMon); @@ -2612,7 +2609,6 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A if (FAILED(hr)) { ERR("Could not create device: %08x\n", hr); - BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); return FALSE; } IVMRSurfaceAllocatorNotify9_SetD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); @@ -2634,7 +2630,6 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A if (FAILED(hr)) { IVMRSurfaceAllocatorEx9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); - BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); return FALSE; } @@ -2666,14 +2661,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - - if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) - { - return S_OK; - } - - BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); + TRACE("iface %p, id %#lx.\n", iface, id); return S_OK; } @@ -2688,12 +2676,6 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPrese D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) - { - ERR("No window\n"); - return E_FAIL; - } - if (!This->d3d9_surfaces || !This->reset) return S_OK;

1 0

Zebediah Figura : quartz/tests: Port IVideoWindow tests to the VMR.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: cb6d6f5d1a80492fc4994169293fec6a0e6b2d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6d6f5d1a80492fc4994169… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 5 23:08:31 2019 -0600 quartz/tests: Port IVideoWindow tests to the VMR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 789 +++++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 807 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1596 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb6d6f5d1a80492fc499…

1 0

Zebediah Figura : strmbase: Create the video window with the correct styles.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: c05c4452ba2e34a90e1f606ef46bd44184660712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05c4452ba2e34a90e1f606e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 5 23:08:32 2019 -0600 strmbase: Create the video window with the correct styles. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 8 ++++---- dlls/quartz/tests/vmr7.c | 8 ++++---- dlls/quartz/tests/vmr9.c | 8 ++++---- dlls/strmbase/window.c | 3 ++- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index b2202d7ae7..2b4b166958 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1391,11 +1391,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); hr = IVideoWindow_put_WindowStyle(window, style | WS_DISABLED); @@ -1414,10 +1414,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index af5d2b4aca..008c84ab30 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1525,11 +1525,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); hr = IVideoWindow_put_WindowStyle(window, style | WS_DISABLED); @@ -1548,10 +1548,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 5d5c7a4756..fd6901d211 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1525,11 +1525,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); hr = IVideoWindow_put_WindowStyle(window, style | WS_DISABLED); @@ -1548,10 +1548,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 04132aaab1..07a12eca26 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -118,7 +118,8 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) return E_FAIL; } - This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, + This->hWnd = CreateWindowExW(0, class_nameW, windownameW, + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLConfigDataSource/W.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 8f0057699e141a90f7ed4bb00b14aafe5753b6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f0057699e141a90f7ed4bb0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 5 21:36:50 2019 +0000 odbccp32: Implement SQLConfigDataSource/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 121 ++++++++++++++++++++++++++++++++++++--------- dlls/odbccp32/tests/misc.c | 8 +-- 2 files changed, 101 insertions(+), 28 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index a09d6571f3..c842872fa6 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -68,6 +68,9 @@ static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i',' static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; +static BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); +static BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { @@ -219,30 +222,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -359,6 +338,100 @@ fail: return FALSE; } +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + mod = load_config_driver(driver); + if (!mod) + return FALSE; + + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if(pConfigDSNW) + ret = pConfigDSNW(hwnd, request, driver, attributes); + else + ERR("Failed to find ConfigDSNW\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(mod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + mod = load_config_driver(driverW); + if (!mod) + { + heap_free(driverW); + return FALSE; + } + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + if (pConfigDSN) + { + TRACE("Calling ConfigDSN\n"); + ret = pConfigDSN(hwnd, request, driver, attributes); + } + else + { + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if (pConfigDSNW) + { + WCHAR *attr = NULL; + TRACE("Calling ConfigDSNW\n"); + + attr = SQLInstall_strdup_multi(attributes); + if(attr) + ret = pConfigDSNW(hwnd, request, driverW, attr); + heap_free(attr); + } + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(driverW); + FreeLibrary(mod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index e2f48ee732..0120504227 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -751,10 +751,10 @@ static void test_SQLConfigDataSource(void) BOOL ret; ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "SQL Server", "DSN=WINEMQIS\0Database=MQIS\0\0"); - ok(ret, "got %d\n", ret); + todo_wine ok(ret, "got %d\n", ret); ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); - ok(ret, "got %d\n", ret); + todo_wine ok(ret, "got %d\n", ret); ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); if(!ret) @@ -767,8 +767,8 @@ static void test_SQLConfigDataSource(void) } ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "ODBC driver", "DSN=ODBC data source\0\0"); - todo_wine ok(!ret, "got %d\n", ret); - todo_wine check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); + ok(!ret, "got %d\n", ret); + check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); } START_TEST(misc)

1 0

Conor McCarthy : vkd3d: Add SetViewInstanceMask() to the ID3D12GraphicsCommandList1 interface.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: vkd3d Branch: master Commit: 9c64642468fbf17dcec07220a2ec5bf1aed9ce3b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9c64642468fbf17dcec0722… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 6 22:51:15 2019 +0330 vkd3d: Add SetViewInstanceMask() to the ID3D12GraphicsCommandList1 interface. This method was missing in version 10.0.15063.0 of the SDK, but is present in version 10.0.18362.0, without a UUID change. Presumably that means this was simply an omission in the older header, rather than an API change in the newer header. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 2 ++ libs/vkd3d/command.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec8b83d..b887480 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2000,6 +2000,8 @@ interface ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandList UINT dst_sub_resource_idx, UINT dst_x, UINT dst_y, ID3D12Resource *src_resource, UINT src_sub_resource_idx, D3D12_RECT *src_rect, DXGI_FORMAT format, D3D12_RESOLVE_MODE mode); + + void SetViewInstanceMask(UINT mask); } typedef enum D3D12_TILE_RANGE_FLAGS diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75af27d..d6feecf 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5483,6 +5483,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresourceRegion(ID3D12 src_resource, src_sub_resource_idx, src_rect, format, mode); } +static void STDMETHODCALLTYPE d3d12_command_list_SetViewInstanceMask(ID3D12GraphicsCommandList1 *iface, UINT mask) +{ + FIXME("iface %p, mask %#x stub!\n", iface, mask); +} + static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl = { /* IUnknown methods */ @@ -5556,6 +5561,7 @@ static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl = d3d12_command_list_OMSetDepthBounds, d3d12_command_list_SetSamplePositions, d3d12_command_list_ResolveSubresourceRegion, + d3d12_command_list_SetViewInstanceMask, }; static struct d3d12_command_list *unsafe_impl_from_ID3D12CommandList(ID3D12CommandList *iface)

1 0

Conor McCarthy : vkd3d/tests: Add tests for ID3D12GraphicsCommandList2::WriteBufferImmediate().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: vkd3d Branch: master Commit: 0d43c776c50c36743f765eb9f2ce18e985a5b1cc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0d43c776c50c36743f765eb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 6 22:51:16 2019 +0330 vkd3d/tests: Add tests for ID3D12GraphicsCommandList2::WriteBufferImmediate(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 26 +++++++++++++++ tests/d3d12.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index b887480..3bfe47b 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -177,6 +177,13 @@ typedef enum D3D12_FORMAT_SUPPORT2 D3D12_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x00004000, } D3D12_FORMAT_SUPPORT2; +typedef enum D3D12_WRITEBUFFERIMMEDIATE_MODE +{ + D3D12_WRITEBUFFERIMMEDIATE_MODE_DEFAULT = 0x0, + D3D12_WRITEBUFFERIMMEDIATE_MODE_MARKER_IN = 0x1, + D3D12_WRITEBUFFERIMMEDIATE_MODE_MARKER_OUT = 0x2, +} D3D12_WRITEBUFFERIMMEDIATE_MODE; + interface ID3D12Fence; interface ID3D12RootSignature; interface ID3D12Heap; @@ -1657,6 +1664,12 @@ typedef enum D3D12_RESIDENCY_PRIORITY D3D12_RESIDENCY_PRIORITY_MAXIMUM = 0xc8000000, } D3D12_RESIDENCY_PRIORITY; +typedef struct D3D12_WRITEBUFFERIMMEDIATE_PARAMETER +{ + D3D12_GPU_VIRTUAL_ADDRESS Dest; + UINT32 Value; +} D3D12_WRITEBUFFERIMMEDIATE_PARAMETER; + [ uuid(c4fec28f-7966-4e95-9f94-f431cb56c3b8), object, @@ -2004,6 +2017,19 @@ interface ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandList void SetViewInstanceMask(UINT mask); } +[ + uuid(38c3e585-ff17-412c-9150-4fc6f9d72a28), + object, + local, + pointer_default(unique) +] +interface ID3D12GraphicsCommandList2 : ID3D12GraphicsCommandList1 +{ + void WriteBufferImmediate(UINT count, + const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *parameters, + const D3D12_WRITEBUFFERIMMEDIATE_MODE *modes); +} + typedef enum D3D12_TILE_RANGE_FLAGS { D3D12_TILE_RANGE_FLAG_NONE = 0x0, diff --git a/tests/d3d12.c b/tests/d3d12.c index 578ae56..b08f115 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32728,6 +32728,89 @@ static void test_bufinfo_instruction(void) destroy_test_context(&context); } +static void test_write_buffer_immediate(void) +{ + D3D12_WRITEBUFFERIMMEDIATE_PARAMETER parameters[2]; + ID3D12GraphicsCommandList2 *command_list2; + D3D12_WRITEBUFFERIMMEDIATE_MODE modes[2]; + ID3D12GraphicsCommandList *command_list; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *buffer; + ID3D12Device *device; + unsigned int value; + HRESULT hr; + + static const unsigned int data_values[] = {0xdeadbeef, 0xf00baa}; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + if (FAILED(hr = ID3D12GraphicsCommandList_QueryInterface(command_list, + &IID_ID3D12GraphicsCommandList2, (void **)&command_list2))) + { + skip("ID3D12GraphicsCommandList2 not implemented.\n"); + destroy_test_context(&context); + return; + } + + buffer = create_default_buffer(device, sizeof(data_values), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(buffer, 0, sizeof(data_values), data_values, queue, command_list); + reset_command_list(command_list, context.allocator); + + parameters[0].Dest = ID3D12Resource_GetGPUVirtualAddress(buffer); + parameters[0].Value = 0x1020304; + parameters[1].Dest = parameters[0].Dest + sizeof(data_values[0]); + parameters[1].Value = 0xc0d0e0f; + ID3D12GraphicsCommandList2_WriteBufferImmediate(command_list2, ARRAY_SIZE(parameters), parameters, NULL); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + value = get_readback_uint(&rb, 0, 0, 0); + ok(value == parameters[0].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[0].Value); + value = get_readback_uint(&rb, 1, 0, 0); + ok(value == parameters[1].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[1].Value); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + + parameters[0].Value = 0x2030405; + parameters[1].Value = 0xb0c0d0e; + modes[0] = D3D12_WRITEBUFFERIMMEDIATE_MODE_MARKER_IN; + modes[1] = D3D12_WRITEBUFFERIMMEDIATE_MODE_MARKER_OUT; + ID3D12GraphicsCommandList2_WriteBufferImmediate(command_list2, ARRAY_SIZE(parameters), parameters, modes); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + value = get_readback_uint(&rb, 0, 0, 0); + ok(value == parameters[0].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[0].Value); + value = get_readback_uint(&rb, 1, 0, 0); + ok(value == parameters[1].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[1].Value); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + + modes[0] = 0x7fffffff; + ID3D12GraphicsCommandList2_WriteBufferImmediate(command_list2, ARRAY_SIZE(parameters), parameters, modes); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D12Resource_Release(buffer); + ID3D12GraphicsCommandList2_Release(command_list2); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -32891,4 +32974,5 @@ START_TEST(d3d12) run_test(test_early_depth_stencil_tests); run_test(test_conditional_rendering); run_test(test_bufinfo_instruction); + run_test(test_write_buffer_immediate); }

1 0

Conor McCarthy : vkd3d: Add stub for ID3D12GraphicsCommandList2::WriteBufferImmediate().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: vkd3d Branch: master Commit: 91555883ac6c56471ab062da361f63dbd2dc6dfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91555883ac6c56471ab062d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 6 22:51:17 2019 +0330 vkd3d: Add stub for ID3D12GraphicsCommandList2::WriteBufferImmediate(). ID3D12GraphicsCommandList2 and WriteBufferImmediate() are used by Hitman 2, but implementing the function on top of an AMD extension has no effect on game behaviour. It's commonly used to write debug info. Signed-off-by: Conor McCarthy <cmccarthy(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 | 272 ++++++++++++++++++++++++--------------------- libs/vkd3d/device.c | 4 +- libs/vkd3d/vkd3d_private.h | 2 +- tests/d3d12.c | 10 +- 4 files changed, 154 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=91555883ac6c56471ab…

1 0

Henri Verbeet : vkd3d-shader: Handle normalised types in vkd3d_component_type_from_data_type().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: vkd3d Branch: master Commit: 61799500e23411cf4a9abf6cec4e52aa8fe6e8dd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=61799500e23411cf4a9abf6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 22:51:18 2019 +0330 vkd3d-shader: Handle normalised types in vkd3d_component_type_from_data_type(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 940cb76..100d515 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -838,6 +838,8 @@ static inline enum vkd3d_component_type vkd3d_component_type_from_data_type( switch (data_type) { case VKD3D_DATA_FLOAT: + case VKD3D_DATA_UNORM: + case VKD3D_DATA_SNORM: return VKD3D_TYPE_FLOAT; case VKD3D_DATA_UINT: return VKD3D_TYPE_UINT;

1 0

Henri Verbeet : vkd3d-shader: Avoid declaring outputs multiple times with incompatible types.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: vkd3d Branch: master Commit: ebac7ee24cb981705853aa7b52d97941630b093d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebac7ee24cb981705853aa7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 22:51:19 2019 +0330 vkd3d-shader: Avoid declaring outputs multiple times with incompatible types. This would cause CoreValidation-Shader-InterfaceTypeMismatch validation errors from Wine's test_shader_interstage_interface() d3d11 test. This reverts parts of commits 1eb7eca411f71d8dec7cfae5c58c1dff9626a7e0 and 04ec461fb4224e126d271760123bb6d756c06582. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a949e4a..40280eb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4438,8 +4438,13 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { use_private_variable = true; write_mask = VKD3DSP_WRITEMASK_ALL; + entry = rb_get(&compiler->symbol_table, &reg_symbol); } } + else if (!use_private_variable && (entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + } else { if (builtin) @@ -4487,15 +4492,15 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); - - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; } + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; + if (use_private_variable) storage_class = SpvStorageClassPrivate; - if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if (entry) var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; else if (!use_private_variable) var_id = id;

1 0