shlwapi/tests: Avoid memory leaks (coverity) (try 2)

[Frédéric Delanoy]

CID 713714-713719
---
 dlls/shlwapi/tests/ordinal.c | 11 ++++++++---
 dlls/shlwapi/tests/url.c     |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 2f7de63..676c431 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -2272,7 +2272,7 @@ static const IServiceProviderVtbl IServiceProviderImpl_Vtbl =
 
 static void test_IUnknown_QueryServiceExec(void)
 {
-    IServiceProvider *provider = IServiceProviderImpl_Construct();
+    IServiceProvider *provider;
     static const GUID dummy_serviceid = { 0xdeadbeef };
     static const GUID dummy_groupid = { 0xbeefbeef };
     call_trace_t trace_expected;
@@ -2286,6 +2286,8 @@ static void test_IUnknown_QueryServiceExec(void)
         return;
     }
 
+    provider = IServiceProviderImpl_Construct();
+
     /* null source pointer */
     hr = pIUnknown_QueryServiceExec(NULL, &dummy_serviceid, &dummy_groupid, 0, 0, 0, 0);
     ok(hr == E_FAIL, "got 0x%08x\n", hr);
@@ -2384,8 +2386,8 @@ static const IProfferServiceVtbl IProfferServiceImpl_Vtbl =
 
 static void test_IUnknown_ProfferService(void)
 {
-    IServiceProvider *provider = IServiceProviderImpl_Construct();
-    IProfferService *proff = IProfferServiceImpl_Construct();
+    IServiceProvider *provider;
+    IProfferService *proff;
     static const GUID dummy_serviceid = { 0xdeadbeef };
     call_trace_t trace_expected;
     HRESULT hr;
@@ -2399,6 +2401,9 @@ static void test_IUnknown_ProfferService(void)
         return;
     }
 
+    provider = IServiceProviderImpl_Construct();
+    proff = IProfferServiceImpl_Construct();
+
     /* null source pointer */
     hr = pIUnknown_ProfferService(NULL, &dummy_serviceid, 0, 0);
     ok(hr == E_FAIL, "got 0x%08x\n", hr);
diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index 7c1fdb5..6200f83 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -1092,7 +1092,7 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla
 
     if (!pUrlCombineA) {
         win_skip("UrlCombineA not found\n");
-        return;
+        goto cleanup;
     }
 
     hr = pUrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags);
@@ -1136,6 +1136,7 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla
         }
     }
 
+cleanup:
     FreeWideString(wszUrl1);
     FreeWideString(wszUrl2);
     FreeWideString(wszExpectUrl);
-- 
1.8.5