- Wine-Commits - list.winehq.org

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

Francois Gouget : advapi32/tests: Don't check the content of the buffer if ReadEventLog() fails.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 0e44c658b6d1e3ad87f0fe58e75910a95c10f015 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e44c658b6d1e3ad87f0fe58e75910… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 12:42:19 2023 +0200 advapi32/tests: Don't check the content of the buffer if ReadEventLog() fails. --- dlls/advapi32/tests/eventlog.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 7bd0c5a7cd2..ee24771edcb 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -996,7 +996,11 @@ static void test_readwrite(void) ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, needed, &read, &needed); ok(ret, "Expected success: %ld\n", GetLastError()); - + if (!ret) + { + winetest_pop_context(); + break; + } record = (EVENTLOGRECORD *)buf; ok(record->Length == read,

1 0

Eric Pouech : winedbg: Correctly read LDT entries for wow64 debuggee.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 44ab1206617a48aeed01fc1349f8309021a8b818 URL: https://gitlab.winehq.org/wine/wine/-/commit/44ab1206617a48aeed01fc1349f830… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Oct 13 09:58:23 2023 +0200 winedbg: Correctly read LDT entries for wow64 debuggee. This mostly matters for Mac as segment CS is handled as a real LDT entry. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/be_i386.c | 7 ++++++- programs/winedbg/tgt_active.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 9f22dd5f3d4..1bac5f382b2 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -40,7 +40,12 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const WOW64_CONTEXT *ctx, /* null or system selector */ if (!(sel & 4) || ((sel >> 3) < first_ldt_entry)) return AddrModeFlat; if (dbg_curr_process->process_io->get_selector(hThread, sel, &le)) - return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; + { + ULONG base = (le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow; + if (le.HighWord.Bits.Default_Big) + return base == 0 ? AddrModeFlat : AddrMode1632; + return AddrMode1616; + } /* selector doesn't exist */ return -1; } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5ac9a4d1229..17578857133 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -1067,7 +1067,17 @@ static BOOL tgt_process_active_write(HANDLE hProcess, void* addr, static BOOL tgt_process_active_get_selector(HANDLE hThread, DWORD sel, LDT_ENTRY* le) { +#ifdef _WIN64 + THREAD_DESCRIPTOR_INFORMATION desc = { .Selector = sel }; + ULONG retlen; + + if (RtlWow64GetThreadSelectorEntry( hThread, &desc, sizeof(desc), &retlen )) + return FALSE; + *le = desc.Entry; + return TRUE; +#else return GetThreadSelectorEntry( hThread, sel, le ); +#endif } static struct be_process_io be_process_active_io =

1 0

Eric Pouech : winedbg: Set first LDT entry value as ntdll does.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 91ba80df262b93b9a5edabd7cc0259fcbedf51d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/91ba80df262b93b9a5edabd7cc0259… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Oct 13 09:58:23 2023 +0200 winedbg: Set first LDT entry value as ntdll does. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/be_i386.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 503a182641d..9f22dd5f3d4 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -30,13 +30,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) +static const unsigned first_ldt_entry = 32; + static ADDRESS_MODE get_selector_type(HANDLE hThread, const WOW64_CONTEXT *ctx, WORD sel) { LDT_ENTRY le; if (IS_VM86_MODE(ctx)) return AddrModeReal; /* null or system selector */ - if (!(sel & 4) || ((sel >> 3) < 17)) return AddrModeFlat; + if (!(sel & 4) || ((sel >> 3) < first_ldt_entry)) return AddrModeFlat; if (dbg_curr_process->process_io->get_selector(hThread, sel, &le)) return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; /* selector doesn't exist */ @@ -52,7 +54,7 @@ static void* be_i386_linearize(HANDLE hThread, const ADDRESS64* addr) case AddrModeReal: return (void*)((DWORD_PTR)(LOWORD(addr->Segment) << 4) + (DWORD_PTR)addr->Offset); case AddrMode1632: - if (!(addr->Segment & 4) || ((addr->Segment >> 3) < 17)) + if (!(addr->Segment & 4) || ((addr->Segment >> 3) < first_ldt_entry)) return (void*)(DWORD_PTR)addr->Offset; /* fall through */ case AddrMode1616:

1 0

Francois Gouget : advapi32/tests: Avoid unneeded reallocations of the ReadEventLog() buffer.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: b34ec64537dea91af45ac40df616172348016bf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b34ec64537dea91af45ac40df61617… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 12:41:22 2023 +0200 advapi32/tests: Avoid unneeded reallocations of the ReadEventLog() buffer. Also we don't care about the content of the buffer so using HeapRealloc() makes no sense. --- dlls/advapi32/tests/eventlog.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 5e5e311bcbd..7bd0c5a7cd2 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -780,6 +780,7 @@ static void test_readwrite(void) DWORD i; char *localcomputer = NULL; DWORD size; + void* buf; if (pCreateWellKnownSid) { @@ -962,9 +963,10 @@ static void test_readwrite(void) handle = OpenEventLogA(NULL, eventlogname); ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); i = 0; + size = sizeof(EVENTLOGRECORD) + 128; + buf = HeapAlloc(GetProcessHeap(), 0, size); for (;;) { - void *buf; DWORD read, needed; EVENTLOGRECORD *record; char *sourcename, *computername; @@ -973,7 +975,6 @@ static void test_readwrite(void) BOOL run_sidtests = read_write[i].evt_sid & sidavailable; winetest_push_context("%lu", i); - buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, @@ -981,13 +982,17 @@ static void test_readwrite(void) ok(!ret, "Expected failure\n"); if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - HeapFree(GetProcessHeap(), 0, buf); ok(GetLastError() == ERROR_HANDLE_EOF, "record %ld, got %ld\n", i, GetLastError()); winetest_pop_context(); break; } - buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); + if (needed > size) + { + HeapFree(GetProcessHeap(), 0, buf); + size = needed; + buf = HeapAlloc(GetProcessHeap(), 0, size); + } ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, needed, &read, &needed); ok(ret, "Expected success: %ld\n", GetLastError()); @@ -1057,10 +1062,10 @@ static void test_readwrite(void) ok(record->Length == *(DWORD *)((BYTE *)buf + record->Length - sizeof(DWORD)), "Expected the closing DWORD to contain the length of the record\n"); - HeapFree(GetProcessHeap(), 0, buf); winetest_pop_context(); i++; } + HeapFree(GetProcessHeap(), 0, buf); CloseEventLog(handle); /* Test clearing a real eventlog */

1 0

Francois Gouget : advapi32/tests: Add the read_write info to the failures context.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: e0c3530a741adec459e6701799a2c0c6631c27d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0c3530a741adec459e6701799a2c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 15:24:57 2023 +0200 advapi32/tests: Add the read_write info to the failures context. Otherwise it's impossible to know which iteration failed. --- dlls/advapi32/tests/eventlog.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 74a6be07b60..5e5e311bcbd 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -882,6 +882,8 @@ static void test_readwrite(void) DWORD oldest; BOOL run_sidtests = read_write[i].evt_sid & sidavailable; + winetest_push_context("%lu:%s", i, read_write[i].evt_src); + /* We don't need to use RegisterEventSource to report events */ if (i % 2) handle = OpenEventLogA(NULL, read_write[i].evt_src); @@ -918,6 +920,7 @@ static void test_readwrite(void) else ret = DeregisterEventSource(handle); ok(ret, "Expected success : %ld\n", GetLastError()); + winetest_pop_context(); } handle = OpenEventLogA(NULL, eventlogname); @@ -969,7 +972,9 @@ static void test_readwrite(void) char *ptr; BOOL run_sidtests = read_write[i].evt_sid & sidavailable; + winetest_push_context("%lu", i); buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); + SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); @@ -978,6 +983,7 @@ static void test_readwrite(void) { HeapFree(GetProcessHeap(), 0, buf); ok(GetLastError() == ERROR_HANDLE_EOF, "record %ld, got %ld\n", i, GetLastError()); + winetest_pop_context(); break; } @@ -1052,6 +1058,7 @@ static void test_readwrite(void) "Expected the closing DWORD to contain the length of the record\n"); HeapFree(GetProcessHeap(), 0, buf); + winetest_pop_context(); i++; } CloseEventLog(handle);

1 0

Alexandros Frantzis : winewayland.drv: Rename wayland_surface_configure_is_compatible for consistency.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 26c7dfb7e907e465cb3f28242fe852c2f9fa472a URL: https://gitlab.winehq.org/wine/wine/-/commit/26c7dfb7e907e465cb3f28242fe852… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Oct 2 10:54:26 2023 +0300 winewayland.drv: Rename wayland_surface_configure_is_compatible for consistency. Rename the function wayland_surface_configure_is_compatible to wayland_surface_config_is_compatible to match the associated struct name. --- dlls/winewayland.drv/wayland_surface.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index b581cec1b46..17d1fffc29b 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -319,14 +319,14 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, } /********************************************************************** - * wayland_surface_configure_is_compatible + * wayland_surface_config_is_compatible * - * Checks whether a wayland_surface_configure object is compatible with the + * Checks whether a wayland_surface_config object is compatible with the * the provided arguments. */ -static BOOL wayland_surface_configure_is_compatible(struct wayland_surface_config *conf, - int width, int height, - enum wayland_surface_config_state state) +static BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, + int width, int height, + enum wayland_surface_config_state state) { static enum wayland_surface_config_state mask = WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; @@ -451,9 +451,9 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) /* Acknowledge any compatible processed config. */ if (surface->processing.serial && surface->processing.processed && - wayland_surface_configure_is_compatible(&surface->processing, - width, height, - window->state)) + wayland_surface_config_is_compatible(&surface->processing, + width, height, + window->state)) { surface->current = surface->processing; memset(&surface->processing, 0, sizeof(surface->processing)); @@ -463,18 +463,18 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) * config, use that, in order to draw windows that don't go through the * message loop (e.g., some splash screens). */ else if (!surface->current.serial && surface->requested.serial && - wayland_surface_configure_is_compatible(&surface->requested, - width, height, - window->state)) + wayland_surface_config_is_compatible(&surface->requested, + width, height, + window->state)) { surface->current = surface->requested; memset(&surface->requested, 0, sizeof(surface->requested)); xdg_surface_ack_configure(surface->xdg_surface, surface->current.serial); } else if (!surface->current.serial || - !wayland_surface_configure_is_compatible(&surface->current, - width, height, - window->state)) + !wayland_surface_config_is_compatible(&surface->current, + width, height, + window->state)) { return FALSE; }

1 0

Alexandros Frantzis : winewayland.drv: Avoid resizing fullscreen windows.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 89c36c11fd44ec8a4921d05304afb83f907b47ae URL: https://gitlab.winehq.org/wine/wine/-/commit/89c36c11fd44ec8a4921d05304afb8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Oct 10 12:04:12 2023 +0300 winewayland.drv: Avoid resizing fullscreen windows. If the window is already fullscreen and its size is compatible with what the compositor is requesting, don't force a resize, since some applications are very insistent on a particular fullscreen size (which may not match the monitor size). --- dlls/winewayland.drv/wayland_surface.c | 6 +++--- dlls/winewayland.drv/waylanddrv.h | 3 +++ dlls/winewayland.drv/window.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 17d1fffc29b..ae4812ebb08 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -324,9 +324,9 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, * Checks whether a wayland_surface_config object is compatible with the * the provided arguments. */ -static BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, - int width, int height, - enum wayland_surface_config_state state) +BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, + int width, int height, + enum wayland_surface_config_state state) { static enum wayland_surface_config_state mask = WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index e1dc58bdc80..4bcd9e6706e 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -201,6 +201,9 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, HRGN surface_damage_region) DECLSPEC_HIDDEN; struct wayland_surface *wayland_surface_lock_hwnd(HWND hwnd) DECLSPEC_HIDDEN; BOOL wayland_surface_reconfigure(struct wayland_surface *surface) DECLSPEC_HIDDEN; +BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, + int width, int height, + enum wayland_surface_config_state state) DECLSPEC_HIDDEN; /********************************************************************** * Wayland SHM buffer diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 2854279bd90..57d2f15a06b 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -434,6 +434,21 @@ static void wayland_configure_window(HWND hwnd) flags |= SWP_FRAMECHANGED; } + /* If the window is already fullscreen and its size is compatible with what + * the compositor is requesting, don't force a resize, since some applications + * are very insistent on a particular fullscreen size (which may not match + * the monitor size). */ + if ((surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN) && + wayland_surface_config_is_compatible(&surface->processing, + surface->window.rect.right - + surface->window.rect.left, + surface->window.rect.bottom - + surface->window.rect.top, + surface->window.state)) + { + flags |= SWP_NOSIZE; + } + pthread_mutex_unlock(&surface->mutex); TRACE("processing=%dx%d,%#x\n", width, height, state);

1 0