October 2023 - Wine-Commits

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .man.in files.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 4e9f1a41b9d828ddc17463e01efc46ece175adca URL: https://gitlab.winehq.org/wine/wine/-/commit/4e9f1a41b9d828ddc17463e01efc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:43:34 2023 +0200 makefiles: Always use the global SOURCES variable for .man.in files. --- programs/msiexec/Makefile.in | 11 ++++------- programs/notepad/Makefile.in | 13 +++++-------- programs/regedit/Makefile.in | 11 ++++------- programs/regsvr32/Makefile.in | 10 ++++------ programs/wineboot/Makefile.in | 10 ++++------ programs/winecfg/Makefile.in | 14 +++++--------- programs/wineconsole/Makefile.in | 10 ++++------ programs/winedbg/Makefile.in | 15 ++++++--------- programs/winefile/Makefile.in | 13 +++++-------- programs/winemine/Makefile.in | 13 +++++-------- programs/winepath/Makefile.in | 6 +++--- server/Makefile.in | 8 +++----- tools/make_makefiles | 11 +---------- tools/widl/Makefile.in | 17 ++++++----------- tools/winebuild/Makefile.in | 6 +++--- tools/winedump/Makefile.in | 6 +++--- tools/winegcc/Makefile.in | 9 ++++----- tools/winemaker/Makefile.in | 2 +- tools/wmc/Makefile.in | 7 +++---- tools/wrc/Makefile.in | 19 +++++++------------ 20 files changed, 80 insertions(+), 131 deletions(-)

1 0

Giovanni Mascellani : ci: Run tests using dxcompiler.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 1bd8baf4209892d9828b8e88d24ec69d03bf8acb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bd8baf4209892d9828b8e88d24ec… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 2 14:07:28 2023 +0200 ci: Run tests using dxcompiler. The dxcompiler is only used for 64 bit builds, because no official 32 bit implementation is distributed. This might change in the future building the compiler ourselves and using vkd3d-shader to sign the generated shaders. --- gitlab/build-linux | 3 ++- gitlab/image.docker | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 9a26849c..ee00e61e 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,8 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ +export LD_LIBRARY_PATH=/usr/local/lib +../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) && \ make -j$(nproc) check || \ touch ../pipeline_failed diff --git a/gitlab/image.docker b/gitlab/image.docker index ec63dee4..b7e40ee0 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -14,7 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y build-essential pkg-config gcc-multilib gcc-mingw-w64 \ - autoconf automake libtool flex bison \ + autoconf automake libtool flex bison curl \ git ca-certificates rsync \ doxygen doxygen-latex graphviz \ mesa-vulkan-drivers mesa-vulkan-drivers:i386 \ @@ -35,6 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd ../.. && \ rm -rf wine && \ apt-get clean && \ + curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2… | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ groupadd host-render -g 800 && \ useradd -m gitlab -G host-render

1 0

Giovanni Mascellani : ci: Build the DXIL parser.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 680a5aaa78943d78d7257fe873590b4e07fb813d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/680a5aaa78943d78d7257fe873590… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 4 12:51:02 2023 +0200 ci: Build the DXIL parser. --- gitlab/build-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 661180f5..9a26849c 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos CFLAGS="-g -O2 -Werror" && \ +../configure --enable-demos CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) && \ make -j$(nproc) check || \ touch ../pipeline_failed

1 0

Giovanni Mascellani : ci: Build widl for 64 bit.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 1ee0cbb627997694263be5e3b0f857bb04c36482 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ee0cbb627997694263be5e3b0f85… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 26 16:33:09 2023 +0200 ci: Build widl for 64 bit. --- gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/image.docker b/gitlab/image.docker index dd6923cb..ec63dee4 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -29,7 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd wine && \ mkdir build && \ cd build && \ - ../configure --without-x --without-freetype && \ + ../configure --enable-win64 --without-x --without-freetype && \ make tools/widl/widl && \ cp tools/widl/widl /usr/local/bin && \ cd ../.. && \

1 0

Giovanni Mascellani : tests: Fail if dxcompiler is not available at runtime.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: c1de65a99ba851f97cb5f345b66a2bba1fc98fc2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c1de65a99ba851f97cb5f345b66a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 2 14:08:44 2023 +0200 tests: Fail if dxcompiler is not available at runtime. --- tests/shader_runner.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index cae0bf02..423f42bd 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1457,23 +1457,20 @@ static IDxcCompiler3 *dxcompiler_create() HRESULT hr; void *dll; - if (!(dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER))) - { - trace("Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); + dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER); + ok(dll, "Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); + if (!dll) return NULL; - } - if (!(create_instance = (DxcCreateInstanceProc)vkd3d_dlsym(dll, "DxcCreateInstance"))) - { - trace("Failed to get DxcCreateInstance() pointer.\n"); + create_instance = (DxcCreateInstanceProc)vkd3d_dlsym(dll, "DxcCreateInstance"); + ok(create_instance, "Failed to get DxcCreateInstance() pointer.\n"); + if (!create_instance) return NULL; - } - if (FAILED(hr = create_instance(&CLSID_DxcCompiler, &IID_IDxcCompiler3, (void **)&compiler))) - { - trace("Failed to create instance, hr %#x.\n", hr); + hr = create_instance(&CLSID_DxcCompiler, &IID_IDxcCompiler3, (void **)&compiler); + ok(SUCCEEDED(hr), "Failed to create instance, hr %#x.\n", hr); + if (FAILED(hr)) return NULL; - } return compiler; }

1 0

Tag wine-8.18 : Alexandre Julliard : Release 8.18
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: refs/tags/wine-8.18 Tag: f13b73c535fe4c1d5176422aa4ea707f2270d6d5 URL: https://gitlab.winehq.org/wine/wine/-/tags/f13b73c535fe4c1d5176422aa4ea707f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 23:00:12 2023 +0200 Release 8.18

1 0

Alexandre Julliard : Release 8.18.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 9d78031de6261f29d42e18db04f9925cfba24108 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d78031de6261f29d42e18db04f992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 23:00:12 2023 +0200 Release 8.18. --- ANNOUNCE | 746 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 382 insertions(+), 384 deletions(-)

1 0

Nikolay Sivov : d3dx9: Check for tx_1_0 blob magic earlier in D3DXCreateTextureShader().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: f6907843385c01e58cdeb2d7701fdba085735d37 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6907843385c01e58cdeb2d7701fdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 01:12:52 2023 +0200 d3dx9: Check for tx_1_0 blob magic earlier in D3DXCreateTextureShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 2 ++ dlls/d3dx9_36/preshader.c | 1 - dlls/d3dx9_36/shader.c | 3 +++ dlls/d3dx9_36/tests/texture.c | 14 +++++++++++--- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 5d8f5b332f8..991ff5b79b5 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -32,6 +32,8 @@ #define ULONG64_MAX (~(ULONG64)0) +#define FOURCC_TX_1 0x54580100 + struct vec4 { float x, y, z, w; diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index ebf62a99c6a..14cc2e234f4 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -144,7 +144,6 @@ static double pres_div(double *args, int n) {return 0.0;} #define FOURCC_CLIT 0x54494c43 #define FOURCC_FXLC 0x434c5846 #define FOURCC_PRSI 0x49535250 -#define FOURCC_TX_1 0x54580100 #define PRES_SIGN 0x46580000 struct op_info diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 7d06090aa15..f31a609ab04 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2653,6 +2653,9 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader if (!function || !texture_shader) return D3DERR_INVALIDCALL; + if (*function != FOURCC_TX_1) + return D3DXERR_INVALIDDATA; + if (!(size = D3DXGetShaderSize(function))) return D3DXERR_INVALIDDATA; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 30495508ac3..b0dd3c0c6c3 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2475,17 +2475,25 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR hr = D3DXCreateTextureShader(NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(NULL, &tx); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(shader_invalid, &tx); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(shader_zero, &tx); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); + tx = (void *)0xdeadbeef; hr = D3DXCreateTextureShader(shader_empty, &tx); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + ok(tx == (void *)0xdeadbeef, "Unexpected pointer %p.\n", tx); hr = D3DXCreateTextureShader(shader_code, &tx); ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);

1 0

Francois Gouget : user32/tests: Don't test GetWindowModuleFileName() on windows belonging to another process.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: e9f6ff8cd401c8e2cf3c12e155a8ea33c97abcd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9f6ff8cd401c8e2cf3c12e155a8ea… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 17:53:59 2023 +0200 user32/tests: Don't test GetWindowModuleFileName() on windows belonging to another process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55777 --- dlls/user32/tests/win.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cf5f0d932e8..2fd31be3314 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8777,27 +8777,12 @@ static void test_GetWindowModuleFileName(void) DestroyWindow(hwnd); - buf2[0] = 0; hwnd = (HWND)0xdeadbeef; SetLastError(0xdeadbeef); ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); ok(!ret1, "expected 0, got %u\n", ret1); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %lu\n", GetLastError()); - - hwnd = FindWindowA("Shell_TrayWnd", NULL); - ok(IsWindow(hwnd) || broken(!hwnd), "got invalid tray window %p\n", hwnd); - SetLastError(0xdeadbeef); - ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); - ok(!ret1, "expected 0, got %u\n", ret1); - ret1 = GetModuleFileNameA(0, buf1, sizeof(buf1)); - hwnd = GetDesktopWindow(); - ok(IsWindow(hwnd), "got invalid desktop window %p\n", hwnd); - SetLastError(0xdeadbeef); - ret2 = pGetWindowModuleFileNameA(hwnd, buf2, sizeof(buf2)); - ok(!ret2 || - ret1 == ret2, /* vista */ - "expected 0 or %u, got %u %s\n", ret1, ret2, buf2); } static void test_hwnd_message(void)

1 0

Francois Gouget : advapi32/tests: Better identify OpenEventLogA() failures.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: e6b5afcbd8c6e64dea8e3576b0ab26feb7972ee6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6b5afcbd8c6e64dea8e3576b0ab26… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 2 17:50:35 2023 +0100 advapi32/tests: Better identify OpenEventLogA() failures. --- dlls/advapi32/tests/eventlog.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 1a35efe1844..74a6be07b60 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -104,24 +104,24 @@ static void test_open_close(void) SetLastError(0xdeadbeef); handle = OpenEventLogA(NULL, NULL); - ok(handle == NULL, "Didn't expect a handle\n"); + ok(handle == NULL, "OpenEventLogA() succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); handle = OpenEventLogA("IDontExist", NULL); - ok(handle == NULL, "Didn't expect a handle\n"); + ok(handle == NULL, "OpenEventLogA(IDontExist,) succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); handle = OpenEventLogA("IDontExist", "deadbeef"); - ok(handle == NULL, "Didn't expect a handle\n"); + ok(handle == NULL, "OpenEventLogA(IDontExist,deadbeef) succeeded\n"); ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == RPC_S_INVALID_NET_ADDR, /* Some Vista and Win7 */ "Expected RPC_S_SERVER_UNAVAILABLE, got %ld\n", GetLastError()); /* This one opens the Application log */ handle = OpenEventLogA(NULL, "deadbeef"); - ok(handle != NULL, "Expected a handle : %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(deadbeef) failed : %ld\n", GetLastError()); ret = CloseEventLog(handle); ok(ret, "Expected success : %ld\n", GetLastError()); /* Close a second time */ @@ -135,11 +135,11 @@ static void test_open_close(void) /* Empty servername should be read as local server */ handle = OpenEventLogA("", "Application"); - ok(handle != NULL, "Expected a handle : %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA('',Application) failed : %ld\n", GetLastError()); CloseEventLog(handle); handle = OpenEventLogA(NULL, "Application"); - ok(handle != NULL, "Expected a handle : %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(Application) failed : %ld\n", GetLastError()); CloseEventLog(handle); } @@ -817,6 +817,7 @@ static void test_readwrite(void) Sleep(2000); handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); count = 0xdeadbeef; GetNumberOfEventLogRecords(handle, &count); if (count != 0) @@ -920,6 +921,7 @@ static void test_readwrite(void) } handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected success : %ld\n", GetLastError()); @@ -955,7 +957,7 @@ static void test_readwrite(void) /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); - ok(handle != NULL, "Failed to open Event Log, got %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); i = 0; for (;;) { @@ -1056,7 +1058,7 @@ static void test_readwrite(void) /* Test clearing a real eventlog */ handle = OpenEventLogA(NULL, eventlogname); - ok(handle != NULL, "Failed to open Event Log, got %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); @@ -1330,7 +1332,7 @@ static void test_eventlog_start(void) handle = OpenEventLogW(0, L"System"); if (!handle && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip( "Can't open event log\n" ); + win_skip( "Can't open System event log\n" ); return; } ok(handle != NULL, "OpenEventLogW(System) failed : %ld\n", GetLastError());

1 0