Frédéric Delanoy : shlwapi/tests: Avoid memory leaks (coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9be5df10ae131cdedd0d8bbd994b8eae06bb9634
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9be5df10ae131cdedd0d8bbd99...

Author: Frédéric Delanoy 
Date:   Mon Dec  2 22:24:49 2013 +0100

shlwapi/tests: Avoid memory leaks (coverity).

---

dlls/shlwapi/tests/ordinal.c |   11 ++++++++---
 dlls/shlwapi/tests/url.c     |    9 +++++----
 2 files changed, 13 insertions(+), 7 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..f53a545 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -1082,10 +1082,7 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla
     HRESULT hr;
     CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH];
     WCHAR wszReturnUrl[INTERNET_MAX_URL_LENGTH];
-    LPWSTR wszUrl1 = GetWideString(szUrl1);
-    LPWSTR wszUrl2 = GetWideString(szUrl2);
-    LPWSTR wszExpectUrl = GetWideString(szExpectUrl);
-    LPWSTR wszConvertedUrl;
+    LPWSTR wszUrl1, wszUrl2, wszExpectUrl, wszConvertedUrl;

DWORD dwSize;
     DWORD dwExpectLen = lstrlenA(szExpectUrl);
@@ -1095,6 +1092,10 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla
         return;
     }

+    wszUrl1 = GetWideString(szUrl1);
+    wszUrl2 = GetWideString(szUrl2);
+    wszExpectUrl = GetWideString(szExpectUrl);
+
     hr = pUrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags);
     ok(hr == E_INVALIDARG, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG);