January 2022 - Wine-Devel - list.winehq.org

Re: [PATCH 1/2] user32: Test Get/SetWindowPlacement with invalid length.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106113 Your paranoid android. === w10pro64 (32 bit report) === user32: win.c:2392: Test failed: style 0x200000: expected !100 win.c:2392: Test failed: style 0x300000: expected !100 === w10pro64 (64 bit report) === user32: win.c:2392: Test failed: style 0x200000: expected !100 win.c:2392: Test failed: style 0x300000: expected !100 === debian11 (32 bit Hindi:India report) === user32: win.c:11348: Test succeeded inside todo block: child should be topmost win.c:11351: Test failed: grandchild should be topmost win.c:11359: Test failed: child should NOT be topmost win.c:11362: Test succeeded inside todo block: grandchild should NOT be topmost win.c:11365: Test failed: 012A00B4: expected NOT topmost win.c:11184: Test succeeded inside todo block: 5: hwnd 009C00B6 is still topmost

Jan. 26, 2022

[PATCH 2/2] user32: Reject invalid length in SetWindowPlacement.

by Esme Povirk

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 2 -- dlls/user32/winpos.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b1ef97c01d6..60b19333978 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12092,10 +12092,8 @@ static void test_window_placement(void) wp.length = 0; SetLastError(0xdeadbeef); ret = SetWindowPlacement(hwnd, &wp); -todo_wine { ok(!ret, "SetWindowPlacement should have failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); -} DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index ff23206b395..eeae9337c33 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1530,6 +1530,11 @@ BOOL WINAPI SetWindowPlacement( HWND hwnd, const WINDOWPLACEMENT *wpl ) { UINT flags = PLACE_MAX | PLACE_RECT; if (!wpl) return FALSE; + if (wpl->length != sizeof(*wpl)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (wpl->flags & WPF_SETMINPOSITION) flags |= PLACE_MIN; return WINPOS_SetPlacement( hwnd, wpl, flags ); } -- 2.30.2

Jan. 26, 2022

[PATCH 1/2] user32: Test Get/SetWindowPlacement with invalid length.

by Esme Povirk

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cb6b61e59c0..b1ef97c01d6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12086,6 +12086,17 @@ static void test_window_placement(void) GetWindowRect(hwnd, &rect); ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + wp.length = 0; + SetLastError(0xdeadbeef); + ret = SetWindowPlacement(hwnd, &wp); +todo_wine { + ok(!ret, "SetWindowPlacement should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); +} + DestroyWindow(hwnd); } @@ -12245,7 +12256,7 @@ static void test_arrange_iconic_windows(void) static void other_process_proc(HWND hwnd) { HANDLE window_ready_event, test_done_event; - WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp = {0}; DWORD ret; window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); -- 2.30.2

Jan. 26, 2022

Re: [PATCH 10/12] d3dx9_36/tests: Fix misleading indentation warnings

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Jan. 26, 2022

Re: [PATCH 09/12] d3dx10_43/tests: Fix misleading indentation warnings

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Jan. 26, 2022

Re: [PATCH 08/12] d3dcompiler/tests: Fix misleading indentation warnings

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Jan. 26, 2022

Re: [PATCH 07/12] d3d10/tests: Fix misleading indentation warnings

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Jan. 26, 2022

Re: [PATCH 4/5] winegstreamer: Register WMA decoder transform stub.

by Rémi Bernon

On 1/26/22 00:38, Zebediah Figura (she/her) wrote: > Qua winegstreamer, this is: > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > It looks like this is going to be causing some regression in FFXIV, the game tries to create a WMA IMediaObject from this class id and expects at least COM aggregation to succeed. Maybe it's better to wait a bit until I sort it out. -- Rémi Bernon <rbernon(a)codeweavers.com>

Jan. 26, 2022

[PATCH] include: Define InterlockedExchangeAdd64() and InterlockedExchangeAddSizeT().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winnt.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 9296a3dc555..6e834da3ef2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6276,6 +6276,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #define InterlockedDecrement16 _InterlockedDecrement16 #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 #define InterlockedExchangePointer _InterlockedExchangePointer #define InterlockedIncrement _InterlockedIncrement #define InterlockedIncrement16 _InterlockedIncrement16 @@ -6291,6 +6292,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedCompareExchange64) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6307,6 +6309,7 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); +long long _InterlockedExchangeAdd64(long long volatile*,long long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6432,6 +6435,11 @@ static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG return __sync_fetch_and_add( dest, incr ); } +static FORCEINLINE LONGLONG WINAPI InterlockedExchangeAdd64( LONGLONG volatile *dest, LONGLONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { return __sync_add_and_fetch( dest, 1 ); @@ -6515,7 +6523,14 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 } #endif -#endif + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)(a), (b)) + +#else /* _WIN64 */ + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)(a), (b)) + +#endif /* _WIN64 */ static FORCEINLINE void YieldProcessor(void) { -- 2.34.1

Jan. 26, 2022

Re: [PATCH vkd3d v2] build: Disable crosstests as well if tests are disabled.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106110 Your paranoid android. === debian11 (build log) === error: patch failed: configure.ac:143 Task: Patch failed to apply === debian11 (build log) === error: patch failed: configure.ac:143 Task: Patch failed to apply

Jan. 26, 2022