[PATCH v11 0/4] MR9383: appbar: SHAppBarMessage: silence warnings about unknown message types
rate-limit these warnings: 0078:fixme:appbar:handle_appbarmessage SHAppBarMessage(ABM_GETSTATE): stub 0078:fixme:appbar:handle_appbarmessage SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=...): stub silence these warnings: 0024:fixme:appbar:SHAppBarMessage unknown msg: 4 0024:fixme:appbar:SHAppBarMessage unknown msg: 1 -- v11: shell32/systray: Mark NIM_ADD tests as flaky https://gitlab.winehq.org/wine/wine/-/merge_requests/9383
From: Matthias Schwarzott <zzam(a)gentoo.org> --- dlls/shell32/tests/appbar.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 8b71a90ba7a..291b8e2f867 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -412,6 +412,13 @@ static void test_appbarget(void) ok(abd.rc.left != 0xcccccccc, "rc not updated\n"); } + memset(&abd, 0xcc, sizeof(abd)); + abd.cbSize = sizeof(abd); + ret = SHAppBarMessage(ABM_GETSTATE, &abd); + ok(!(ret & ~(ABS_ALWAYSONTOP|ABS_AUTOHIDE)), "ret 0x%Ix which is not a recognized taskbar state\n", ret); + /* unclear what to expect. Windows does not touch it at all. Wine clips it to 32bits */ + ok(abd.hWnd == (HWND)0xcccccccc || abd.hWnd == (HWND)0xcccccccccccccccc, "hWnd overwritten hWnd=%p\n", abd.hWnd); + return; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9383
From: Matthias Schwarzott <zzam(a)gentoo.org> silence these warnings when using ABM_GETSTATE: 0024:fixme:appbar:SHAppBarMessage unknown msg: 4 and ABM_REMOVE: 0024:fixme:appbar:SHAppBarMessage unknown msg: 1 --- dlls/shell32/appbar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/appbar.c b/dlls/shell32/appbar.c index 68373dc2c15..47840fc7998 100644 --- a/dlls/shell32/appbar.c +++ b/dlls/shell32/appbar.c @@ -82,6 +82,10 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) TRACE("edge: %d\n", data->uEdge); break; + case ABM_REMOVE: + case ABM_GETSTATE: + break; + case ABM_QUERYPOS: case ABM_SETPOS: TRACE("edge: %d, rc: %s\n", data->uEdge, wine_dbgstr_rect(&data->rc)); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9383
From: Matthias Schwarzott <zzam(a)gentoo.org> Some applications produce a long stream of these messages: SHAppBarMessage(ABM_GETSTATE): stub SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub Signed-off-by: Matthias Schwarzott <zzam(a)gentoo.org> --- programs/explorer/appbar.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 18b125257ee..364f18446a4 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -198,10 +198,16 @@ static UINT_PTR handle_appbarmessage(DWORD msg, struct appbar_data_msg *abd) } return TRUE; case ABM_GETSTATE: - FIXME( "SHAppBarMessage(ABM_GETSTATE): stub\n" ); + { + static int once; + if (!once++) FIXME( "SHAppBarMessage(ABM_GETSTATE): stub\n" ); + } return ABS_ALWAYSONTOP | ABS_AUTOHIDE; case ABM_GETTASKBARPOS: - FIXME( "SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", hwnd ); + { + static int once; + if (!once++) FIXME( "SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", hwnd ); + } /* Report the taskbar is at the bottom of the screen. */ abd->rc.left = 0; abd->rc.right = GetSystemMetrics(SM_CXSCREEN); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9383
From: Matthias Schwarzott <zzam(a)gentoo.org> This always fails in my jenkins builds for win10 --- dlls/shell32/tests/systray.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 80621761240..4460a374800 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -46,7 +46,9 @@ static void test_cbsize(void) nidW.uCallbackMessage = WM_USER+17; SetLastError(0xdeadbeef); ret = pShell_NotifyIconW(NIM_ADD, &nidW); + flaky ok(ret, "NIM_ADD failed!\n"); + flaky ok(GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_NO_TOKEN, "GetLastError() = %lu\n", GetLastError()); /* using an invalid cbSize does work */ @@ -72,7 +74,9 @@ static void test_cbsize(void) nidA.hIcon = LoadIconA(NULL, (LPSTR)IDI_APPLICATION); nidA.uCallbackMessage = WM_USER+17; SetLastError(0xdeadbeef); + flaky ok(Shell_NotifyIconA(NIM_ADD, &nidA), "NIM_ADD failed!\n"); + flaky ok(GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_NO_TOKEN, "GetLastError() = %lu\n", GetLastError()); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9383
participants (2)
-
Matthias Schwarzott -
Matthias Schwarzott (＠zzam)