[PATCH 1/2] hnetcfg/tests: Fix BSTR usage in test_NetFwAuthorizedApplication().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/hnetcfg/tests/policy.c | 52 ++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c
index 4ee19d8..012bbcd 100644
--- a/dlls/hnetcfg/tests/policy.c
+++ b/dlls/hnetcfg/tests/policy.c
@@ -105,48 +105,42 @@ static void test_interfaces(void)
 static void test_NetFwAuthorizedApplication(void)
 {
     INetFwAuthorizedApplication *app;
+    static WCHAR empty[] = {0};
+    WCHAR image[MAX_PATH];
     HRESULT hr;
+    BSTR bstr;

hr = CoCreateInstance(&CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
             &IID_INetFwAuthorizedApplication, (void**)&app);
     ok(hr == S_OK, "got: %08x\n", hr);
-    if(hr == S_OK)
-    {
-        BSTR image = SysAllocStringLen( NULL, MAX_PATH );
-        static WCHAR empty[] = {0};
-        BSTR bstr;

-        if (!GetModuleFileNameW( NULL, image, MAX_PATH ))
-        {
-            ok(0, "Failed to get filename\n");
-            SysFreeString( image );
-            return;
-        }
+    hr = GetModuleFileNameW(NULL, image, sizeof(image));
+    ok(hr, "GetModuleFileName failed: %u\n", GetLastError());

-        hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL);
-        ok(hr == E_POINTER, "got: %08x\n", hr);
+    hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL);
+    ok(hr == E_POINTER, "got: %08x\n", hr);

-        hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr);
-        ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr);
-        ok(!bstr, "got: %s\n",  wine_dbgstr_w(bstr));
+    hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr);
+    ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr);
+    ok(!bstr, "got: %s\n",  wine_dbgstr_w(bstr));

-        hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL);
-        ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr);
+    hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL);
+    ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr);

-        hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty);
-        ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr);
+    hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty);
+    ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr);

-        hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, image);
-        ok(hr == S_OK, "got: %08x\n", hr);
+    bstr = SysAllocString(image);
+    hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, bstr);
+    ok(hr == S_OK, "got: %08x\n", hr);
+    SysFreeString(bstr);

-        hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr);
-        ok(hr == S_OK, "got: %08x\n", hr);
-        ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr));
-        SysFreeString( bstr );
+    hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr);
+    ok(hr == S_OK, "got: %08x\n", hr);
+    ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr));
+    SysFreeString(bstr);

-        SysFreeString( image );
-        INetFwAuthorizedApplication_Release(app);
-    }
+    INetFwAuthorizedApplication_Release(app);
 }

START_TEST(policy)