[PATCH 0/3] MR10738: urlmon,itss: Fix -Wunused-but-set-global warnings.
From: Jacek Caban <jacek@codeweavers.com> --- dlls/urlmon/tests/protocol.c | 3 +-- dlls/urlmon/tests/stream.c | 17 +++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a7692319c35..c45bf8cf91f 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -125,7 +125,6 @@ DEFINE_EXPECT(MimeFilter_LockRequest); DEFINE_EXPECT(MimeFilter_UnlockRequest); DEFINE_EXPECT(MimeFilter_Read); DEFINE_EXPECT(MimeFilter_Switch); -DEFINE_EXPECT(MimeFilter_Continue); DEFINE_EXPECT(Stream_Seek); DEFINE_EXPECT(Stream_Read); DEFINE_EXPECT(Redirect); @@ -2418,7 +2417,7 @@ static HRESULT WINAPI MimeProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU static HRESULT WINAPI Protocol_Continue(IInternetProtocolEx *iface, PROTOCOLDATA *pProtocolData) { - CHECK_EXPECT(MimeFilter_Continue); + ok(0, "unexpected call\n"); return E_NOTIMPL; } diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 0d8c17ac978..def31e91124 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -65,12 +65,9 @@ DEFINE_EXPECT(QueryInterface_IServiceProvider); DEFINE_EXPECT(OnStartBinding); -DEFINE_EXPECT(OnProgress_FINDINGRESOURCE); -DEFINE_EXPECT(OnProgress_CONNECTING); DEFINE_EXPECT(OnProgress_SENDINGREQUEST); DEFINE_EXPECT(OnProgress_MIMETYPEAVAILABLE); DEFINE_EXPECT(OnProgress_BEGINDOWNLOADDATA); -DEFINE_EXPECT(OnProgress_DOWNLOADINGDATA); DEFINE_EXPECT(OnProgress_ENDDOWNLOADDATA); DEFINE_EXPECT(OnStopBinding); DEFINE_EXPECT(OnDataAvailable); @@ -140,12 +137,6 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { switch(ulStatusCode) { - case BINDSTATUS_FINDINGRESOURCE: - CHECK_EXPECT(OnProgress_FINDINGRESOURCE); - break; - case BINDSTATUS_CONNECTING: - CHECK_EXPECT(OnProgress_CONNECTING); - break; case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(OnProgress_SENDINGREQUEST); break; @@ -156,9 +147,6 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP CHECK_EXPECT(OnProgress_BEGINDOWNLOADDATA); ok(szStatusText != NULL, "szStatusText == NULL\n"); break; - case BINDSTATUS_DOWNLOADINGDATA: - CHECK_EXPECT2(OnProgress_DOWNLOADINGDATA); - break; case BINDSTATUS_ENDDOWNLOADDATA: CHECK_EXPECT(OnProgress_ENDDOWNLOADDATA); ok(szStatusText != NULL, "szStatusText == NULL\n"); @@ -166,6 +154,11 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP case BINDSTATUS_CACHEFILENAMEAVAILABLE: ok(szStatusText != NULL, "szStatusText == NULL\n"); break; + case BINDSTATUS_CONNECTING: + case BINDSTATUS_FINDINGRESOURCE: + case BINDSTATUS_DOWNLOADINGDATA: + ok(0, "unexpected code %ld\n", ulStatusCode); + break; default: todo_wine { ok(0, "unexpected code %ld\n", ulStatusCode); } }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10738
From: Jacek Caban <jacek@codeweavers.com> --- dlls/urlmon/tests/url.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index e24f6ed5189..16742d20ff7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1323,7 +1323,7 @@ static ULONG WINAPI HttpSecurity_Release(IHttpSecurity *iface) static HRESULT WINAPI HttpSecurity_GetWindow(IHttpSecurity *iface, REFGUID rguidReason, HWND *phwnd) { if(IsEqualGUID(rguidReason, &IID_IHttpSecurity)) - CHECK_EXPECT(GetWindow_IHttpSecurity); + CHECK_EXPECT2(GetWindow_IHttpSecurity); else if(IsEqualGUID(rguidReason, &IID_IWindowForBindingUI)) CHECK_EXPECT2(GetWindow_IWindowForBindingUI); else if(IsEqualGUID(rguidReason, &IID_ICodeInstall)) @@ -3255,10 +3255,15 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CHECK_CALLED(QueryInterface_IHttpSecurity); CHECK_CALLED(QueryService_IHttpSecurity); CHECK_CALLED(OnSecurityProblem); + if(onsecurityproblem_hres == S_FALSE) + CHECK_CALLED(GetWindow_IHttpSecurity); + else + CHECK_NOT_CALLED(GetWindow_IHttpSecurity); }else { CHECK_NOT_CALLED(QueryInterface_IHttpSecurity); CHECK_NOT_CALLED(QueryService_IHttpSecurity); CHECK_NOT_CALLED(OnSecurityProblem); + CHECK_NOT_CALLED(GetWindow_IHttpSecurity); } } if(!no_callback) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10738
From: Jacek Caban <jacek@codeweavers.com> --- dlls/itss/tests/protocol.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index db4c3ef2f45..22752e2db92 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -293,7 +293,7 @@ static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWS if(expect_mime) SET_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(test_protocol == MK_PROTOCOL) - SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + SET_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); SET_CALLED(ReportData); if(test_protocol == ITS_PROTOCOL) SET_CALLED(ReportProgress_BEGINDOWNLOADDATA); @@ -306,7 +306,8 @@ static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWS if(expect_mime) CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(test_protocol == MK_PROTOCOL) - SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + todo_wine + CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); CHECK_CALLED(ReportData); if(test_protocol == ITS_PROTOCOL) CHECK_CALLED(ReportProgress_BEGINDOWNLOADDATA); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10738
participants (2)
-
Jacek Caban -
Jacek Caban (＠jacek)