[PATCH] user32: Remove no longer needed assert() workarounds for MinGW.
We build with msvcrt, so we don't link against MinGW's assert() anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/user_private.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3b542ea1452..d1016780658 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -296,12 +296,6 @@ typedef struct extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; -/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ -#ifdef __MINGW32__ -#undef assert -#define assert(expr) ((void)0) -#endif - extern struct user_api_hook *user_api DECLSPEC_HIDDEN; LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; -- 2.34.1
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 4 ---- dlls/user32/tests/win.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 89a524407bf..f2d9694bd6f 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -30,10 +30,6 @@ #include "winuser.h" #include "winnls.h" -#ifndef SPI_GETDESKWALLPAPER -# define SPI_GETDESKWALLPAPER 0x0073 -#endif - static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL (WINAPI *pIsProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDPIAware)(void); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ba9b16d89bd..5ce7eb02f1c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -34,10 +34,6 @@ #include "wine/test.h" -#ifndef SPI_GETDESKWALLPAPER -#define SPI_GETDESKWALLPAPER 0x0073 -#endif - #ifndef WM_SYSTIMER #define WM_SYSTIMER 0x0118 #endif -- 2.34.1
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=106662 Your paranoid android. === w8 (32 bit report) === user32: sysparams.c:2490: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w8adm (32 bit report) === user32: sysparams.c:2490: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w864 (32 bit report) === user32: sysparams.c:2490: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064v1809 (32 bit report) === user32: sysparams.c:2490: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064 (32 bit report) === user32: sysparams.c:2490: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064_tsign (32 bit report) === user32: sysparams.c:2490: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w10pro64 (32 bit report) === user32: sysparams.c:2490: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === debian11 (32 bit Chinese:China report) === user32: win.c:10660: Test failed: Expected foreground window 0, got 00F700B6 win.c:10666: Test failed: Expected foreground window 0002005C, got 00F700B6 === debian11 (32 bit WoW report) === user32: win.c:10666: Test failed: Expected foreground window 0002005C, got 00F700B6
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winsta/winsta.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winsta/winsta.h b/dlls/winsta/winsta.h index d908aa855cc..c4f5e986f16 100644 --- a/dlls/winsta/winsta.h +++ b/dlls/winsta/winsta.h @@ -82,11 +82,7 @@ typedef struct _TS_ALL_PROCESSES_INFO { PTS_SYS_PROCESS_INFORMATION pTsProcessInfo; DWORD SizeOfSid; -#ifdef MIDL_PASS - [size_is(SizeOfSid)] PBYTE pSid; -#else PBYTE pSid; -#endif } TS_ALL_PROCESSES_INFO, *PTS_ALL_PROCESSES_INFO; BOOLEAN WINAPI WinStationEnumerateW(HANDLE,PSESSIONIDW *,PULONG); -- 2.34.1
participants (2)
-
Marvin -
Zebediah Figura