- Wine-Commits - list.winehq.org

Stefan Dösinger : dxgi/tests: Fix UnregisterClass call in test_resize_target_wndproc.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 2654f9c456e9a25ca3dad6d292457c125d9d3c7c URL: https://gitlab.winehq.org/wine/wine/-/commit/2654f9c456e9a25ca3dad6d292457c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 8 20:19:43 2023 +0300 dxgi/tests: Fix UnregisterClass call in test_resize_target_wndproc. --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 4703bd8ee27..fb506d6ccb0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3418,7 +3418,7 @@ static DWORD WINAPI window_thread(void *data) DestroyWindow(thread_data->window); thread_data->window = NULL; - UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + UnregisterClassA("dxgi_resize_target_wndproc_wc", GetModuleHandleA(NULL)); return 0; }

1 0

Stefan Dösinger : dxgi/tests: Run test_swapchain_window_messages on d3d12.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 52bdd0dbcd482da836ef488bb201bcdc5b7b8c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/52bdd0dbcd482da836ef488bb201bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 8 20:46:01 2023 +0300 dxgi/tests: Run test_swapchain_window_messages on d3d12. --- dlls/dxgi/tests/dxgi.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5788a82b32e..c6e06312d76 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5873,14 +5873,12 @@ static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wpa return DefWindowProcA(hwnd, message, wparam, lparam); } -static void test_swapchain_window_messages(void) +static void test_swapchain_window_messages(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; DXGI_MODE_DESC mode_desc; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; ULONG refcount; WNDCLASSA wc; HWND window; @@ -5942,12 +5940,6 @@ static void test_swapchain_window_messages(void) {0, FALSE, 0}, }; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - memset(&wc, 0, sizeof(wc)); wc.lpfnWndProc = test_wndproc; wc.lpszClassName = "dxgi_test_wndproc_wc"; @@ -5955,11 +5947,7 @@ static void test_swapchain_window_messages(void) window = CreateWindowA("dxgi_test_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); ok(!!window, "Failed to create window.\n"); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -5971,16 +5959,16 @@ static void test_swapchain_window_messages(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = window; swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; /* create swapchain */ flush_events(); expect_no_messages = TRUE; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); flush_events(); expect_no_messages = FALSE; @@ -6045,7 +6033,7 @@ static void test_swapchain_window_messages(void) expect_messages = enter_fullscreen_messages; expect_messages_broken = enter_fullscreen_messages_vista; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); flush_events(); todo_wine @@ -6067,10 +6055,8 @@ done: ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(window); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %lu references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); } @@ -7717,7 +7703,6 @@ START_TEST(dxgi) test_gamma_control(); test_multi_adapter(); test_swapchain_parameters(); - test_swapchain_window_messages(); test_swapchain_window_styles(); run_on_d3d10(test_set_fullscreen); run_on_d3d10(test_resize_target); @@ -7733,6 +7718,7 @@ START_TEST(dxgi) run_on_d3d10(test_mode_change); run_on_d3d10(test_swapchain_present_count); run_on_d3d10(test_resize_target_wndproc); + run_on_d3d10(test_swapchain_window_messages); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7765,6 +7751,7 @@ START_TEST(dxgi) run_on_d3d12(test_mode_change); run_on_d3d12(test_swapchain_present_count); run_on_d3d12(test_resize_target_wndproc); + run_on_d3d12(test_swapchain_window_messages); FreeLibrary(d3d12_module); }

1 0

Stefan Dösinger : dxgi/tests: Run test_resize_target_wndproc on d3d12 too.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 99cc854a0343eeb237c420c262f537b603f1a616 URL: https://gitlab.winehq.org/wine/wine/-/commit/99cc854a0343eeb237c420c262f537… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 8 20:26:49 2023 +0300 dxgi/tests: Run test_resize_target_wndproc on d3d12 too. --- dlls/dxgi/tests/dxgi.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index fb506d6ccb0..5788a82b32e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3423,15 +3423,13 @@ static DWORD WINAPI window_thread(void *data) return 0; } -static void test_resize_target_wndproc(void) +static void test_resize_target_wndproc(IUnknown *device, BOOL is_d3d12) { struct window_thread_data thread_data; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; - IDXGIAdapter *adapter; DXGI_MODE_DESC mode; - IDXGIDevice *device; unsigned int ret; ULONG refcount; LONG_PTR data; @@ -3439,11 +3437,7 @@ static void test_resize_target_wndproc(void) HRESULT hr; RECT rect; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } + get_factory(device, is_d3d12, &factory); memset(&thread_data, 0, sizeof(thread_data)); thread_data.window_created = CreateEventA(NULL, FALSE, FALSE, NULL); @@ -3456,11 +3450,6 @@ static void test_resize_target_wndproc(void) ret = WaitForSingleObject(thread_data.window_created, INFINITE); ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#lx.\n", ret, GetLastError()); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; @@ -3471,12 +3460,12 @@ static void test_resize_target_wndproc(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = thread_data.window; swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain); @@ -3503,11 +3492,8 @@ static void test_resize_target_wndproc(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); - IDXGIAdapter_Release(adapter); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %lu references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); ret = SetEvent(thread_data.finished); ok(ret, "Failed to set event, last error %#lx.\n", GetLastError()); @@ -7715,7 +7701,6 @@ START_TEST(dxgi) queue_test(test_parents); queue_test(test_output); queue_test(test_find_closest_matching_mode); - queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); queue_test(test_maximum_frame_latency); @@ -7747,6 +7732,7 @@ START_TEST(dxgi) run_on_d3d10(test_default_fullscreen_target_output); run_on_d3d10(test_mode_change); run_on_d3d10(test_swapchain_present_count); + run_on_d3d10(test_resize_target_wndproc); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7778,6 +7764,7 @@ START_TEST(dxgi) run_on_d3d12(test_default_fullscreen_target_output); run_on_d3d12(test_mode_change); run_on_d3d12(test_swapchain_present_count); + run_on_d3d12(test_resize_target_wndproc); FreeLibrary(d3d12_module); }

1 0

Zebediah Figura : dxgi: Call wined3d_swapchain_state_set_fullscreen in d3d12_swapchain_init.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 6956746a0aa2903659fff93481fb4f803a62440b URL: https://gitlab.winehq.org/wine/wine/-/commit/6956746a0aa2903659fff93481fb4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 11:24:09 2023 +0300 dxgi: Call wined3d_swapchain_state_set_fullscreen in d3d12_swapchain_init. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e00867f8069..454d58792fe 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2794,6 +2794,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkBool32 supported; VkDevice vk_device; VkFence vk_fence; + bool fullscreen; VkResult vr; HRESULT hr; @@ -2838,6 +2839,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } + fullscreen = !wined3d_desc.windowed; + wined3d_desc.windowed = TRUE; + dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_factory->wined3d, &swapchain->state_parent, &swapchain->state))) @@ -2846,8 +2850,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } - if (!fullscreen_desc->Windowed) + if (fullscreen) { + wined3d_desc.windowed = FALSE; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); if (FAILED(hr)) {

1 0

Stefan Dösinger : dxgi: Unlock the wined3d mutex after storing the new target.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 75f7bd0eea4f0a9a351c858196ef6c83fda2a747 URL: https://gitlab.winehq.org/wine/wine/-/commit/75f7bd0eea4f0a9a351c858196ef6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 27 10:38:46 2023 +0300 dxgi: Unlock the wined3d mutex after storing the new target. Otherwise a second thread might set it to something else between the unlock and assignment. --- dlls/dxgi/swapchain.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 454d58792fe..9449d13ae49 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -410,12 +410,11 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); - wined3d_mutex_unlock(); if (FAILED(hr)) { IDXGIOutput_Release(target); - - return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + goto done; } if (!fullscreen) @@ -428,7 +427,9 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen IDXGIOutput_Release(swapchain->target); swapchain->target = target; - return S_OK; +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapChain1 *iface, @@ -2098,13 +2099,20 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, target, window, swapchain_desc, fullscreen_desc))) - goto fail; + { + IDXGIOutput_Release(target); + return hr; + } + wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); - wined3d_mutex_unlock(); if (FAILED(hr)) - goto fail; + { + IDXGIOutput_Release(target); + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + goto done; + } fullscreen_desc->Windowed = wined3d_desc.windowed; if (!fullscreen) @@ -2117,12 +2125,9 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen IDXGIOutput_Release(swapchain->target); swapchain->target = target; - return S_OK; - -fail: - IDXGIOutput_Release(target); - - return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain4 *iface,

1 0

Stefan Dösinger : dxgi: Catch nested SetFullscreenState invocations.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 33170e27206e4e94ea3365822cdd2e807e5656d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/33170e27206e4e94ea3365822cdd2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 13 16:27:59 2023 +0300 dxgi: Catch nested SetFullscreenState invocations. --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index dd17e39eca6..fa704d28b0f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -183,6 +183,7 @@ struct d3d11_swapchain IDXGIOutput *target; LONG present_count; + LONG in_set_fullscreen_state; }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9449d13ae49..1f5eb99ab4b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -383,6 +383,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain_state *state; struct dxgi_output *dxgi_output; + LONG in_set_fullscreen_state; + BOOL old_fs; HRESULT hr; TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); @@ -404,6 +406,18 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen } dxgi_output = unsafe_impl_from_IDXGIOutput(target); + /* DXGI catches nested SetFullscreenState invocations, earlier versions of d3d + * do not. Final Fantasy XIV depends on this behavior. It tries to call SFS on + * WM_WINDOWPOSCHANGED messages. */ + in_set_fullscreen_state = InterlockedExchange(&swapchain->in_set_fullscreen_state, 1); + if (in_set_fullscreen_state) + { + WARN("Nested invocation of SetFullscreenState.\n"); + IDXGIOutput_Release(target); + IDXGISwapChain1_GetFullscreenState(iface, &old_fs, NULL); + return old_fs == fullscreen ? S_OK : DXGI_STATUS_MODE_CHANGE_IN_PROGRESS; + } + wined3d_mutex_lock(); state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); @@ -429,6 +443,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen done: wined3d_mutex_unlock(); + InterlockedExchange(&swapchain->in_set_fullscreen_state, 0); return hr; } @@ -1016,6 +1031,7 @@ struct d3d12_swapchain IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + LONG in_set_fullscreen_state; ID3D12Fence *frame_latency_fence; HANDLE frame_latency_event; @@ -2077,6 +2093,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc; struct wined3d_swapchain_desc wined3d_desc; HWND window = swapchain->window; + LONG in_set_fullscreen_state; + BOOL old_fs; HRESULT hr; TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); @@ -2104,6 +2122,15 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen return hr; } + in_set_fullscreen_state = InterlockedExchange(&swapchain->in_set_fullscreen_state, 1); + if (in_set_fullscreen_state) + { + WARN("Nested invocation of SetFullscreenState.\n"); + IDXGIOutput_Release(target); + IDXGISwapChain4_GetFullscreenState(iface, &old_fs, NULL); + return old_fs == fullscreen ? S_OK : DXGI_STATUS_MODE_CHANGE_IN_PROGRESS; + } + wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); @@ -2127,6 +2154,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen done: wined3d_mutex_unlock(); + InterlockedExchange(&swapchain->in_set_fullscreen_state, 0); return hr; }

1 0

Alexandre Julliard : gitlab: Add workaround for more strict git ownership check.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 7af84c79a19afe1476c401f9be93dc6ef8ae56fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7af84c79a19afe1476c401f9be93dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 09:33:13 2023 +0100 gitlab: Add workaround for more strict git ownership check. --- tools/gitlab/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 12ffe86dd62..b474f271c8b 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -21,6 +21,7 @@ - export CCACHE_DIR="$BASEDIR/ccache" - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" + - git config --global --add safe.directory $CI_PROJECT_DIR - mkdir -p build32 build64 - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase

1 0

Alexandre Julliard : make_makefiles: Die when the git command fails.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: ce8023ea139c545fa0780ad710f74d580443c602 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce8023ea139c545fa0780ad710f74d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 09:25:46 2023 +0100 make_makefiles: Die when the git command fails. --- tools/make_makefiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2025b45b75c..2079a037f4e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -487,7 +487,7 @@ sub update_wine_inf() my $git_dir = $ENV{GIT_DIR} || ".git"; die "needs to be run from a git checkout" unless -e $git_dir; -my @all_files = split /\0/, `git ls-files -c -z`; +my @all_files = split /\0/, `git ls-files -c -z` or die "cannot get files list"; map { $ignored_source_files{$_} = 1; } split /\0/, `git ls-files -d -z`; @makefiles = grep /Makefile.in$/, @all_files;

1 0

Long Junyu : packaging/android: Use correct strip when cross building.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: tools Branch: master Commit: b78d90fc51d58446728f60e7f9ceeebab767fa0e URL: https://gitlab.winehq.org/winehq/tools/-/commit/b78d90fc51d58446728f60e7f9c… Author: Long Junyu <877730493(a)qq.com> Date: Thu Mar 9 08:39:20 2023 +0000 packaging/android: Use correct strip when cross building. --- packaging/android/build-apks | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index ef245cdb..23df1d96 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -175,6 +175,7 @@ install_all () rm -rf $destdir/assets assets-tmp $destdir/lib make $makeflags all install-lib DESTDIR=$(pwd) prefix=/assets-tmp + STRIPPROG=$host-strip for i in \ ../$freetype/objs/.libs/libfreetype.so \ ../$gmp/.libs/libgmp.so \

1 0

Zebediah Figura : tests/shader_runner: Use the global test_options structure.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: vkd3d Branch: master Commit: 9ea84ae8c91741418a7e0ab0b46887fd358b7d3c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9ea84ae8c91741418a7e0ab0b4688… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 21 17:46:36 2023 -0600 tests/shader_runner: Use the global test_options structure. Inspired by a patch by Giovanni Mascellani. --- tests/d3d12.c | 2 ++ tests/d3d12_crosstest.h | 25 ------------------------ tests/d3d12_invalid_usage.c | 2 ++ tests/hlsl_d3d12.c | 2 ++ tests/shader_runner.c | 46 ++++++++++++++++---------------------------- tests/shader_runner.h | 10 +++++----- tests/shader_runner_d3d11.c | 42 ++++++---------------------------------- tests/shader_runner_d3d12.c | 5 ++--- tests/shader_runner_d3d9.c | 20 +++---------------- tests/shader_runner_vulkan.c | 4 ++-- tests/utils.h | 30 +++++++++++++++++++++++++++++ 11 files changed, 71 insertions(+), 117 deletions(-)

1 0