[PATCH 0/3] MR10733: mshtml/tests: Remove unused variables.
Fixes -Wunused-but-set-global warnings on Clang git. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10733
From: Jacek Caban <jacek@codeweavers.com> --- dlls/mshtml/tests/activex.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index df4038d655c..815d6eb4c8a 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -100,7 +100,6 @@ DEFINE_EXPECT(wrapped_AddRef); DEFINE_EXPECT(wrapped_Release); DEFINE_EXPECT(wrapped_func); DEFINE_EXPECT(OnAmbientPropertyChange_UNKNOWN); -DEFINE_EXPECT(GetTypeInfo); DEFINE_EXPECT(GetClassInfo); DEFINE_EXPECT(FindConnectionPoint); DEFINE_EXPECT(Advise); @@ -115,7 +114,7 @@ enum { TEST_DISPONLY }; -static ITypeInfo *actxtest_typeinfo, *class_typeinfo; +static ITypeInfo *class_typeinfo; static HWND container_hwnd, plugin_hwnd; static int plugin_behavior; static BOOL no_quickact; @@ -681,11 +680,8 @@ static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - CHECK_EXPECT(GetTypeInfo); - - ITypeInfo_AddRef(actxtest_typeinfo); - *ppTInfo = actxtest_typeinfo; - return S_OK; + ok(0, "unexpected call\n"); + return E_NOTIMPL; } static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, @@ -2686,9 +2682,6 @@ static void load_typelib(void) hres = LoadTypeLib(path, &typelib); ok(hres == S_OK, "LoadTypeLib failed: %08lx\n", hres); - hres = ITypeLib_GetTypeInfoOfGuid(typelib, &DIID_DispActiveXTest, &actxtest_typeinfo); - ok(hres == S_OK, "GetTypeInfoOfGuid(DIID_DispActiveXTest) failed: %08lx\n", hres); - hres = ITypeLib_GetTypeInfoOfGuid(typelib, &CLSID_ActiveXTest, &class_typeinfo); ok(hres == S_OK, "GetTypeInfoOfGuid(CLSID_ActiveXTest) failed: %08lx\n", hres); @@ -2794,8 +2787,6 @@ START_TEST(activex) skip("Could not register ActiveX\n"); } - if(actxtest_typeinfo) - ITypeInfo_Release(actxtest_typeinfo); if(class_typeinfo) ITypeInfo_Release(class_typeinfo); DestroyWindow(container_hwnd); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10733
From: Jacek Caban <jacek@codeweavers.com> --- dlls/mshtml/tests/events.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 77c76957144..43451cdba6a 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3280,9 +3280,10 @@ static void test_message_event(IHTMLDocument2 *doc) hres = IDispatchEx_InvokeEx(dispex, dispid, 0, DISPATCH_METHOD, &dp, NULL, NULL, &caller_sp_stub); ok(hres == (document_mode < 9 ? E_ABORT : S_OK), "InvokeEx(postMessage) returned: %08lx\n", hres); CHECK_CALLED(QS_IActiveScriptSite); - if(document_mode < 9) + if(document_mode < 9) { CHECK_CALLED(QS_GetCaller); - else { + CLEAR_CALLED(QS_IActiveScriptSite_parent); + } else { SET_EXPECT(onmessage); pump_msgs(&called_onmessage); CHECK_CALLED(onmessage); @@ -3307,6 +3308,8 @@ static void test_message_event(IHTMLDocument2 *doc) } if(document_mode < 9) { + CHECK_CALLED(QS_GetCaller); + CHECK_CALLED(QS_IActiveScriptSite_parent); SET_EXPECT(QS_GetCaller_parent2); SET_EXPECT(onmessage); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10733
From: Jacek Caban <jacek@codeweavers.com> --- dlls/mshtml/tests/htmldoc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 86845ce4d84..3f4f43205c0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -179,7 +179,6 @@ DEFINE_EXPECT(BindToStorage); DEFINE_EXPECT(IsSystemMoniker); DEFINE_EXPECT(GetBindResult); DEFINE_EXPECT(GetClassID); -DEFINE_EXPECT(Abort); DEFINE_EXPECT(Read); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(Start); @@ -197,7 +196,6 @@ DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); DEFINE_EXPECT(Frame_EnableModeless_TRUE); DEFINE_EXPECT(Frame_EnableModeless_FALSE); -DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(Advise_Close); DEFINE_EXPECT(OnViewChange); @@ -232,7 +230,7 @@ static BOOL set_clientsite, container_locked; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, ignore_external_qi; static BOOL inplace_deactivated, open_call; -static BOOL complete, loading_js, loading_hash, is_refresh, is_from_hist; +static BOOL loading_js, loading_hash, is_refresh, is_from_hist; static DWORD status_code = HTTP_STATUS_OK; static BOOL asynchronous_binding = FALSE; static BOOL support_wbapp, allow_new_window, no_travellog; @@ -1469,7 +1467,7 @@ static ULONG WINAPI Binding_Release(IBinding *iface) static HRESULT WINAPI Binding_Abort(IBinding *iface) { - CHECK_EXPECT(Abort); + ok(0, "unexpected call\n"); if(asynchronous_binding) PeekMessageA(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE); return S_OK; @@ -1998,7 +1996,7 @@ static ULONG WINAPI InPlaceFrame_Release(IOleInPlaceFrame *iface) static HRESULT WINAPI InPlaceFrame_GetWindow(IOleInPlaceFrame *iface, HWND *phwnd) { - CHECK_EXPECT(Frame_GetWindow); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -3533,10 +3531,9 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember CHECK_EXPECT(Invoke_OnReadyStateChange_Interactive); else if(!lstrcmpW(state, L"loading")) CHECK_EXPECT(Invoke_OnReadyStateChange_Loading); - else if(!lstrcmpW(state, L"complete")) { + else if(!lstrcmpW(state, L"complete")) CHECK_EXPECT(Invoke_OnReadyStateChange_Complete); - complete = TRUE; - } else + else ok(0, "Unexpected readyState: %s\n", wine_dbgstr_w(state)); SysFreeString(state); @@ -8383,7 +8380,6 @@ static void init_test(enum load_state_t ls) { nav_url = NULL; ipsex = FALSE; inplace_deactivated = FALSE; - complete = FALSE; testing_submit = FALSE; expect_uihandler_iface = &DocHostUIHandler; is_mhtml = FALSE; @@ -9545,7 +9541,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED(GetWindow); if(use_ipsex) { CHECK_CALLED(OnInPlaceActivateEx); - SET_EXPECT(RequestUIActivate); + CHECK_CALLED(RequestUIActivate); } else CHECK_CALLED(OnInPlaceActivate); @@ -9782,7 +9778,7 @@ static void test_com_aggregation(const CLSID *clsid) SET_EXPECT(outer_QI_IPersistMoniker); /* Some IE version QI for that. */ hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CreateInstance returned: %08lx\n", hres); - SET_CALLED(outer_QI_IPersistMoniker); + CLEAR_CALLED(outer_QI_IPersistMoniker); hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&unk2); ok(hres == S_OK, "Could not get IDispatch iface: %08lx\n", hres); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10733
participants (2)
-
Jacek Caban -
Jacek Caban (＠jacek)