January 2024 - Wine-Commits

Akihiro Sagawa : d3d9/tests: Test the presentation parameters after creating a device.
by Alexandre Julliard Jan. 10, 2024

Jan. 10, 2024

Module: wine Branch: master Commit: 45ea10c71f5540c9915553ce822a77d7cbcc033f URL: https://gitlab.winehq.org/wine/wine/-/commit/45ea10c71f5540c9915553ce822a77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:28 2023 +0900 d3d9/tests: Test the presentation parameters after creating a device. --- dlls/d3d9/tests/d3d9ex.c | 34 ++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 77830cae631..44d5edba63c 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3686,6 +3686,7 @@ static void test_swapchain_parameters(void) { IDirect3DDevice9Ex *device; IDirect3D9Ex *d3d9ex; + RECT client_rect; HWND window; HRESULT hr; unsigned int i; @@ -3837,6 +3838,39 @@ static void test_swapchain_parameters(void) IDirect3DDevice9Ex_Release(device); } + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 0; + present_parameters.BackBufferHeight = 0; + present_parameters.BackBufferFormat = D3DFMT_UNKNOWN; + + GetClientRect(window, &client_rect); + + hr = IDirect3D9Ex_CreateDeviceEx(d3d9ex, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, + &present_parameters, NULL, &device); + + todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + present_parameters.BackBufferWidth, client_rect.right); + todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + present_parameters.BackBufferHeight, client_rect.bottom); + todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + present_parameters.BackBufferFormat); + ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); + ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); + ok(!present_parameters.MultiSampleQuality, "Got unexpected MultiSampleQuality %lu.\n", present_parameters.MultiSampleQuality); + ok(present_parameters.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", present_parameters.SwapEffect); + ok(!present_parameters.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", present_parameters.hDeviceWindow); + ok(present_parameters.Windowed, "Got unexpected Windowed %#x.\n", present_parameters.Windowed); + ok(!present_parameters.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", present_parameters.EnableAutoDepthStencil); + ok(!present_parameters.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", present_parameters.AutoDepthStencilFormat); + ok(!present_parameters.Flags, "Got unexpected Flags %#lx.\n", present_parameters.Flags); + ok(!present_parameters.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", + present_parameters.FullScreen_RefreshRateInHz); + ok(!present_parameters.PresentationInterval, "Got unexpected PresentationInterval %#x.\n", present_parameters.PresentationInterval); + IDirect3DDevice9Ex_Release(device); + IDirect3D9Ex_Release(d3d9ex); DestroyWindow(window); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index de0bedba7ca..0af7f179df6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12296,6 +12296,7 @@ static void test_swapchain_parameters(void) { IDirect3DDevice9 *device; HRESULT hr, expected_hr; + RECT client_rect; IDirect3D9 *d3d; D3DCAPS9 caps; HWND window; @@ -12493,6 +12494,40 @@ static void test_swapchain_parameters(void) IDirect3DDevice9_Release(device); } + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 0; + present_parameters.BackBufferHeight = 0; + present_parameters.BackBufferFormat = D3DFMT_UNKNOWN; + + GetClientRect(window, &client_rect); + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, + &present_parameters, &device); + + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + present_parameters.BackBufferWidth, client_rect.right); + todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + present_parameters.BackBufferHeight, client_rect.bottom); + todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + present_parameters.BackBufferFormat); + ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); + ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); + ok(!present_parameters.MultiSampleQuality, "Got unexpected MultiSampleQuality %lu.\n", present_parameters.MultiSampleQuality); + ok(present_parameters.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", present_parameters.SwapEffect); + ok(!present_parameters.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", present_parameters.hDeviceWindow); + ok(present_parameters.Windowed, "Got unexpected Windowed %#x.\n", present_parameters.Windowed); + ok(!present_parameters.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", present_parameters.EnableAutoDepthStencil); + ok(!present_parameters.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", present_parameters.AutoDepthStencilFormat); + ok(!present_parameters.Flags, "Got unexpected Flags %#lx.\n", present_parameters.Flags); + ok(!present_parameters.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", + present_parameters.FullScreen_RefreshRateInHz); + ok(!present_parameters.PresentationInterval, "Got unexpected PresentationInterval %#x.\n", present_parameters.PresentationInterval); + + IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Akihiro Sagawa : d3d8/tests: Test the presentation parameters after creating a device.
by Alexandre Julliard Jan. 10, 2024

Jan. 10, 2024

Module: wine Branch: master Commit: beefff000287388baf975f6210a8defa660892ad URL: https://gitlab.winehq.org/wine/wine/-/commit/beefff000287388baf975f6210a8de… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:09 2023 +0900 d3d8/tests: Test the presentation parameters after creating a device. --- dlls/d3d8/tests/device.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fd06e1bf79d..ef3a429afe0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8896,6 +8896,33 @@ static void test_swapchain_parameters(void) IDirect3DDevice8_Release(device); } + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.Windowed = TRUE; + present_parameters.BackBufferWidth = 0; + present_parameters.BackBufferHeight = 0; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, + &present_parameters, &device); + + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!present_parameters.BackBufferWidth, "Got unexpected BackBufferWidth %u.\n", present_parameters.BackBufferWidth); + ok(!present_parameters.BackBufferHeight, "Got unexpected BackBufferHeight %u,.\n", present_parameters.BackBufferHeight); + ok(present_parameters.BackBufferFormat == D3DFMT_X8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", present_parameters.BackBufferFormat); + ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); + ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); + ok(present_parameters.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", present_parameters.SwapEffect); + ok(!present_parameters.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", present_parameters.hDeviceWindow); + ok(present_parameters.Windowed, "Got unexpected Windowed %#x.\n", present_parameters.Windowed); + ok(!present_parameters.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", present_parameters.EnableAutoDepthStencil); + ok(!present_parameters.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", present_parameters.AutoDepthStencilFormat); + ok(!present_parameters.Flags, "Got unexpected Flags %#lx.\n", present_parameters.Flags); + ok(!present_parameters.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", present_parameters.FullScreen_RefreshRateInHz); + ok(!present_parameters.FullScreen_PresentationInterval, "Got unexpected FullScreen_PresentationInterval %#x.\n", present_parameters.FullScreen_PresentationInterval); + + IDirect3DDevice8_Release(device); IDirect3D8_Release(d3d); DestroyWindow(window); }

1 0

Enol Puente : po: Update Asturian translation.
by Alexandre Julliard Jan. 10, 2024

Jan. 10, 2024

Module: wine Branch: master Commit: 7a9fba29d6354b824253f0419f260113d9f88b76 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a9fba29d6354b824253f0419f2601… Author: Enol Puente <enolp(a)softastur.org> Date: Sun Jan 7 22:56:58 2024 +0000 po: Update Asturian translation. --- po/ast.po | 6081 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 3108 insertions(+), 2973 deletions(-)

1 0

Gabriel Ivăncescu : winex11: Update Virtual Desktop fullscreen WM state after setting window pos.
by Alexandre Julliard Jan. 9, 2024

Jan. 9, 2024

Module: wine Branch: master Commit: 4054795ff199c3f65612f351a88daf17f56a6db9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4054795ff199c3f65612f351a88daf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 9 19:45:26 2024 +0200 winex11: Update Virtual Desktop fullscreen WM state after setting window pos. To make sure the hints are set up properly first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56149 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 687c0cf5a4c..5867f9d16a4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -149,10 +149,10 @@ void X11DRV_resize_desktop(void) height = primary_rect.bottom; TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); - update_desktop_fullscreen( width, height ); NtUserSetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); + update_desktop_fullscreen( width, height ); if (old_virtual_rect.left != virtual_rect.left || old_virtual_rect.top != virtual_rect.top) send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left,

1 0

Rémi Bernon : dmusic: Clone streams instead of allocating wave data.
by Alexandre Julliard Jan. 9, 2024

Jan. 9, 2024

Module: wine Branch: master Commit: 1b753413467b75b0a638ad635127ca5a5e426e7c URL: https://gitlab.winehq.org/wine/wine/-/commit/1b753413467b75b0a638ad635127ca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 8 10:26:15 2024 +0100 dmusic: Clone streams instead of allocating wave data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56117 --- dlls/dmusic/wave.c | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index 27f7224af49..f741cff1418 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -38,7 +38,7 @@ struct wave struct sample *sample; WAVEFORMATEX *format; UINT data_size; - void *data; + IStream *data; }; static inline struct wave *impl_from_IUnknown(IUnknown *iface) @@ -96,7 +96,7 @@ static ULONG WINAPI wave_Release(IUnknown *iface) if (!ref) { free(This->format); - free(This->data); + if (This->data) IStream_Release(This->data); free(This->sample); free(This); } @@ -150,8 +150,8 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk break; case mmioFOURCC('d','a','t','a'): - if (!(This->data = malloc(chunk.size))) return E_OUTOFMEMORY; - hr = stream_chunk_get_data(stream, &chunk, This->data, chunk.size); + if (This->data) IStream_Release(This->data); + hr = IStream_Clone(stream, &This->data); if (SUCCEEDED(hr)) This->data_size = chunk.size; break; @@ -341,9 +341,9 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDir struct sample *sample = NULL; WAVEFORMATEX *format = NULL; HRESULT hr = E_OUTOFMEMORY; - UINT data_size, offset; + DWORD data_size, offset; struct wave *This; - void *data = NULL; + IStream *stream = NULL; IDirectMusicObject *iface; TRACE("(%p, %u, %p)\n", soundfont, index, ret_iface); @@ -365,9 +365,9 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDir sample->loops[0].ulLength = sf_sample->end_loop - sf_sample->start_loop; data_size = sf_sample->end - sf_sample->start; - if (!(data = malloc(data_size * format->nBlockAlign))) goto failed; + if (FAILED(hr = CreateStreamOnHGlobal(NULL, TRUE, &stream))) goto failed; offset = sf_sample->start * format->nBlockAlign / format->nChannels; - memcpy(data, soundfont->sdta + offset, data_size); + if (FAILED(hr = IStream_Write(stream, soundfont->sdta + offset, data_size, &data_size))) goto failed; if (FAILED(hr = wave_create(&iface))) goto failed; @@ -375,7 +375,7 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDir This->format = format; This->sample = sample; This->data_size = data_size; - This->data = data; + This->data = stream; if (TRACE_ON(dmusic)) { @@ -408,12 +408,26 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDir return S_OK; failed: - free(data); + if (stream) IStream_Release(stream); free(sample); free(format); return hr; } +static HRESULT wave_read_data(struct wave *This, void *data, DWORD *data_size) +{ + IStream *stream; + HRESULT hr; + + if (SUCCEEDED(hr = IStream_Clone(This->data, &stream))) + { + hr = IStream_Read(stream, data, This->data_size, data_size); + IStream_Release(stream); + } + + return hr; +} + HRESULT wave_download_to_port(IDirectMusicObject *iface, IDirectMusicPortDownload *port, DWORD *id) { struct download_buffer @@ -446,11 +460,12 @@ HRESULT wave_download_to_port(IDirectMusicObject *iface, IDirectMusicPortDownloa buffer->wave.ulCopyrightIdx = 0; buffer->wave.ulFirstExtCkIdx = 0; - buffer->data.cbSize = This->data_size; - memcpy(buffer->data.byData, This->data, This->data_size); - - if (SUCCEEDED(hr = IDirectMusicPortDownload_Download(port, download))) *id = buffer->info.dwDLId; - else WARN("Failed to download wave to port, hr %#lx\n", hr); + if (FAILED(hr = wave_read_data(This, buffer->data.byData, &buffer->data.cbSize))) + WARN("Failed to read wave data from stream, hr %#lx\n", hr); + else if (FAILED(hr = IDirectMusicPortDownload_Download(port, download))) + WARN("Failed to download wave to port, hr %#lx\n", hr); + else + *id = buffer->info.dwDLId; } IDirectMusicDownload_Release(download); @@ -481,8 +496,9 @@ HRESULT wave_download_to_dsound(IDirectMusicObject *iface, IDirectSound *dsound, if (SUCCEEDED(hr = IDirectSoundBuffer_Lock(buffer, 0, This->data_size, &data, &size, NULL, 0, 0))) { - memcpy(data, This->data, This->data_size); - hr = IDirectSoundBuffer_Unlock(buffer, data, This->data_size, NULL, 0); + if (FAILED(hr = wave_read_data(This, data, &size))) + WARN("Failed to read wave data from stream, hr %#lx\n", hr); + hr = IDirectSoundBuffer_Unlock(buffer, data, size, NULL, 0); } if (FAILED(hr))

1 0

Gabriel Ivăncescu : winex11: Set MWM_FUNC_RESIZE for fullscreen desktop windows.
by Alexandre Julliard Jan. 9, 2024

Jan. 9, 2024

Module: wine Branch: master Commit: 75a774f90a86d1e39b2ea4fd5716ec74ac5aae64 URL: https://gitlab.winehq.org/wine/wine/-/commit/75a774f90a86d1e39b2ea4fd5716ec… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 9 19:45:26 2024 +0200 winex11: Set MWM_FUNC_RESIZE for fullscreen desktop windows. Same workaround as used in is_window_resizable, except it's on a different code path. This also affects other WMs (e.g. Kwin, compiz). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56149 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/window.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 51125065958..f5f2dd03662 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -747,9 +747,13 @@ static void set_mwm_hints( struct x11drv_win_data *data, UINT style, UINT ex_sty if (data->hwnd == NtUserGetDesktopWindow()) { - if (is_desktop_fullscreen()) mwm_hints.decorations = 0; - else mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; + if (is_desktop_fullscreen()) + { + mwm_hints.decorations = 0; + mwm_hints.functions |= MWM_FUNC_RESIZE; /* some WMs need this to make it fullscreen */ + } + else mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; } else {

1 0

Gabriel Ivăncescu : Revert "winex11: Use the correct root window for virtual desktops.".
by Alexandre Julliard Jan. 9, 2024

Jan. 9, 2024

Module: wine Branch: master Commit: d9b5bf9a719b1145f514230f170ccc6b969a6679 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9b5bf9a719b1145f514230f170ccc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 9 19:44:06 2024 +0200 Revert "winex11: Use the correct root window for virtual desktops.". This reverts commit 790133e95036597092443b30c0fe0aa6a40a9167. It was incorrect, sorry about that. The issue was weirder in a different place (MWM_FUNC_RESIZE not set before setting fullscreen). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56149 --- dlls/winex11.drv/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index fcb6ba2faf5..687c0cf5a4c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -107,7 +107,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) if (!display || !is_virtual_desktop()) return; xev.xclient.type = ClientMessage; - xev.xclient.window = DefaultRootWindow(display); + xev.xclient.window = root_window; xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); xev.xclient.serial = 0; xev.xclient.display = display;

1 0

Jacek Caban : gitlab: Cache config.cache in Clang builds.
by Alexandre Julliard Jan. 9, 2024

Jan. 9, 2024

Module: wine Branch: master Commit: 67f2da2a8d1f219f528bf820b3d6002c5f34d5e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/67f2da2a8d1f219f528bf820b3d600… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 9 15:16:06 2024 +0100 gitlab: Cache config.cache in Clang builds. --- tools/gitlab/build-clang | 4 +++- tools/gitlab/build.yml | 29 +++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/tools/gitlab/build-clang b/tools/gitlab/build-clang index e335faf049c..b93bdf146f3 100755 --- a/tools/gitlab/build-clang +++ b/tools/gitlab/build-clang @@ -9,5 +9,7 @@ set -Eeuxo pipefail ./tools/make_makefiles autoreconf -f -./configure -q --enable-archs=i386,x86_64,aarch64 --with-mingw=clang +cd build +../configure -q -C --enable-archs=i386,x86_64,aarch64 --with-mingw=clang make -s -j$(nproc) +cd .. diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 75cb4b26945..9337d6c3b43 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -9,12 +9,6 @@ cache: - paths: - ccache/ - - key: - files: - - configure.ac - paths: - - build32/config.cache - - build64/config.cache before_script: - export BASEDIR="$PWD" - export CCACHE_BASEDIR="$BASEDIR" @@ -34,7 +28,15 @@ build-linux: expire_in: 1 day paths: - usr/local/ + cache: + - key: + files: + - configure.ac + paths: + - build32/config.cache + - build64/config.cache script: + - mkdir -p build32 build64 - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux - git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA | sed -re '/\/tests\//!d; s@/tests/.*@/tests/Makefile.in@' | (xargs -r ls 2>/dev/null || true) | xargs -r sed '/TESTDLL/!d; s(a).dll@@; s(a).*= *@@' >usr/local/share/wine/winetest.args @@ -43,7 +45,14 @@ build-clang: extends: .wine-build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + cache: + - key: + files: + - configure.ac + paths: + - build/config.cache script: + - mkdir -p build - ./tools/gitlab/build-clang build-mac: @@ -52,12 +61,20 @@ build-mac: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' tags: - mac + cache: + - key: + files: + - configure.ac + paths: + - build32/config.cache + - build64/config.cache artifacts: when: on_failure paths: - build64/config.log - build32/config.log script: + - mkdir -p build32 build64 - export PATH="/usr/local/opt/ccache/libexec:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac

1 0

Giovanni Mascellani : vkd3d-utils: Support many different surface types when creating a device.
by Alexandre Julliard Jan. 9, 2024

Jan. 9, 2024

Module: vkd3d Branch: master Commit: e3fb4e7eace34001bd5d81457050f14dd2b9345c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e3fb4e7eace34001bd5d81457050f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 9 10:44:37 2024 +0100 vkd3d-utils: Support many different surface types when creating a device. This is nice for the application, which can use our implementation of D3D12CreateDevice() in more environments, and basically free for us, because surface creation is still the application's business. --- libs/vkd3d-utils/vkd3d_utils_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index a2edf403..96676660 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -70,8 +70,14 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim }; static const char * const optional_instance_extensions[] = { + "VK_KHR_android_surface", + "VK_KHR_wayland_surface", + "VK_KHR_win32_surface", "VK_KHR_xcb_surface", + "VK_KHR_xlib_surface", + "VK_EXT_metal_surface", "VK_MVK_macos_surface", + "VK_MVK_ios_surface", }; static const char * const device_extensions[] = {

1 0

Giovanni Mascellani : configure: Detect pthread support using -pthread instead of -lpthread.
by Alexandre Julliard Jan. 9, 2024

Jan. 9, 2024

Module: vkd3d Branch: master Commit: 0752e545e46bd2d05301ff23405770823f9bade4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0752e545e46bd2d05301ff2340577… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 9 10:31:37 2024 +0100 configure: Detect pthread support using -pthread instead of -lpthread. The latter links the pthread library, but doesn't set the preprocessor state that some toolchains require. The former is the supported way to use pthread. This allows vkd3d to be compiled with the Android NDK. --- m4/check-pthread.m4 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/m4/check-pthread.m4 b/m4/check-pthread.m4 index 5fa82ecb..706829d9 100644 --- a/m4/check-pthread.m4 +++ b/m4/check-pthread.m4 @@ -15,7 +15,15 @@ AS_IF([test "x$vkd3d_pthread_found" = "xno"], [PTHREAD_LIBS=""]) LIBS="$vkd3d_libs_saved"]) AS_IF([test "x$vkd3d_pthread_found" != "xyes"], -AC_CHECK_LIB([pthread], [pthread_create], - [PTHREAD_LIBS="-lpthread"], - [AC_MSG_ERROR([libpthread not found.])])) +[vkd3d_libs_saved="$LIBS" +PTHREAD_LIBS="-pthread" +LIBS="$LIBS $PTHREAD_LIBS" + +AC_MSG_CHECKING([checking for pthread_create in $PTHREAD_LIBS]) +AC_TRY_LINK_FUNC([pthread_create], [vkd3d_pthread_found=yes]) +AC_MSG_RESULT([$vkd3d_pthread_found]) + +AS_IF([test "x$vkd3d_pthread_found" = "xno"], [PTHREAD_LIBS=""]) + +LIBS="$vkd3d_libs_saved"]) ])

1 0