[PATCH 0/2] MR11042: jscript,vbscript: Remove unused variables.

[Jacek Caban (＠jacek)]

Fixes -Wunused-but-set-global warnings.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11042

[PATCH 1/2] jscript/tests: Remove unused variables.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes -Wunused-but-set-global warnings.
---
 dlls/jscript/tests/activex.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c
index d1026134295..69336572df1 100644
--- a/dlls/jscript/tests/activex.c
+++ b/dlls/jscript/tests/activex.c
@@ -86,7 +86,6 @@ DEFINE_EXPECT(ProcessUrlAction);
 DEFINE_EXPECT(QueryCustomPolicy);
 DEFINE_EXPECT(reportSuccess);
 DEFINE_EXPECT(Host_QS_SecMgr);
-DEFINE_EXPECT(Caller_QS_SecMgr);
 DEFINE_EXPECT(QI_IObjectWithSite);
 DEFINE_EXPECT(SetSite);
 
@@ -532,10 +531,8 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface,
         return E_NOINTERFACE;
 
     if(IsEqualGUID(&SID_SInternetHostSecurityManager, guidService)) {
-        if(iface == &ServiceProvider)
-            CHECK_EXPECT(Host_QS_SecMgr);
-        else
-            CHECK_EXPECT(Caller_QS_SecMgr);
+        ok(iface == &ServiceProvider, "called on non-host iface\n");
+        CHECK_EXPECT(Host_QS_SecMgr);
         ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid));
         if(SUCCEEDED(QS_SecMgr_hres))
             *ppv = &InternetHostSecurityManager;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11042

[PATCH 2/2] vbscript/tests: Remove unused variables.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

Fixes -Wunused-but-set-global warnings.
---
 dlls/vbscript/tests/createobj.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c
index 10f114ad6e4..7065b5b9c81 100644
--- a/dlls/vbscript/tests/createobj.c
+++ b/dlls/vbscript/tests/createobj.c
@@ -84,7 +84,6 @@ DEFINE_EXPECT(ProcessUrlAction);
 DEFINE_EXPECT(QueryCustomPolicy);
 DEFINE_EXPECT(reportSuccess);
 DEFINE_EXPECT(Host_QS_SecMgr);
-DEFINE_EXPECT(Caller_QS_SecMgr);
 DEFINE_EXPECT(QI_IObjectWithSite);
 DEFINE_EXPECT(SetSite);
 
@@ -538,10 +537,8 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface,
         return E_NOINTERFACE;
 
     if(IsEqualGUID(&SID_SInternetHostSecurityManager, guidService)) {
-        if(iface == &ServiceProvider)
-            CHECK_EXPECT(Host_QS_SecMgr);
-        else
-            CHECK_EXPECT(Caller_QS_SecMgr);
+        ok(iface == &ServiceProvider, "called on non-host iface\n");
+        CHECK_EXPECT(Host_QS_SecMgr);
         ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid));
         if(SUCCEEDED(QS_SecMgr_hres))
             *ppv = &InternetHostSecurityManager;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11042