[PATCH v4 2/5] dplayx/tests: Use common code to set the firewall.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/dplayx/tests/dplayx.c | 176 ++-----------------------------------
 1 file changed, 5 insertions(+), 171 deletions(-)

diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c
index ba0f73194f6..6dbc57871da 100644
--- a/dlls/dplayx/tests/dplayx.c
+++ b/dlls/dplayx/tests/dplayx.c
@@ -18,12 +18,12 @@
  */

#define COBJMACROS
-#include "wine/test.h"
 #include <stdio.h>
 #define INITGUID
 #include <dplay.h>
 #include <dplobby.h>
-#include <netfw.h>
+#include "wine/test.h"
+#include "wine/test_fw.h"

static HRESULT (WINAPI *pDirectPlayEnumerateA)( LPDPENUMDPCALLBACKA, void* );
 static HRESULT (WINAPI *pDirectPlayEnumerateW)( LPDPENUMDPCALLBACKW, void* );
@@ -6711,160 +6711,6 @@ static void test_COM_dplobby(void)
     ok(refcount == 0, "refcount == %lu, expected 0\n", refcount);
 }

-enum firewall_op
-{
-    APP_ADD,
-    APP_REMOVE
-};
-
-static BOOL is_process_elevated(void)
-{
-    HANDLE token;
-    if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token ))
-    {
-        TOKEN_ELEVATION_TYPE type;
-        DWORD size;
-        BOOL ret;
-
-        ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size );
-        CloseHandle( token );
-        return (ret && type == TokenElevationTypeFull);
-    }
-    return FALSE;
-}
-
-static BOOL is_firewall_enabled(void)
-{
-    HRESULT hr, init;
-    INetFwMgr *mgr = NULL;
-    INetFwPolicy *policy = NULL;
-    INetFwProfile *profile = NULL;
-    VARIANT_BOOL enabled = VARIANT_FALSE;
-
-    init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED );
-
-    hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr,
-                           (void **)&mgr );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    hr = INetFwMgr_get_LocalPolicy( mgr, &policy );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    hr = INetFwPolicy_get_CurrentProfile( policy, &profile );
-    if (hr != S_OK) goto done;
-
-    hr = INetFwProfile_get_FirewallEnabled( profile, &enabled );
-    ok( hr == S_OK, "got %08lx\n", hr );
-
-done:
-    if (policy) INetFwPolicy_Release( policy );
-    if (profile) INetFwProfile_Release( profile );
-    if (mgr) INetFwMgr_Release( mgr );
-    if (SUCCEEDED( init )) CoUninitialize();
-    return (enabled == VARIANT_TRUE);
-}
-
-static HRESULT set_firewall( enum firewall_op op )
-{
-    HRESULT hr, init;
-    INetFwMgr *mgr = NULL;
-    INetFwPolicy *policy = NULL;
-    INetFwProfile *profile = NULL;
-    INetFwAuthorizedApplication *app = NULL;
-    INetFwAuthorizedApplications *apps = NULL;
-    BSTR name, image = SysAllocStringLen( NULL, MAX_PATH );
-    WCHAR path[MAX_PATH];
-
-    if (!GetModuleFileNameW( NULL, image, MAX_PATH ))
-    {
-        SysFreeString( image );
-        return E_FAIL;
-    }
-
-    if(!GetSystemDirectoryW(path, MAX_PATH))
-    {
-        SysFreeString( image );
-        return E_FAIL;
-    }
-    lstrcatW( path, L"\dplaysvr.exe" );
-
-    init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED );
-
-    hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr,
-                           (void **)&mgr );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    hr = INetFwMgr_get_LocalPolicy( mgr, &policy );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    hr = INetFwPolicy_get_CurrentProfile( policy, &profile );
-    if (hr != S_OK) goto done;
-
-    hr = INetFwProfile_get_AuthorizedApplications( profile, &apps );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER,
-                           &IID_INetFwAuthorizedApplication, (void **)&app );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image );
-    if (hr != S_OK) goto done;
-
-    name = SysAllocString( L"dplay_client" );
-    hr = INetFwAuthorizedApplication_put_Name( app, name );
-    SysFreeString( name );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    if (op == APP_ADD)
-        hr = INetFwAuthorizedApplications_Add( apps, app );
-    else if (op == APP_REMOVE)
-        hr = INetFwAuthorizedApplications_Remove( apps, image );
-    else
-        hr = E_INVALIDARG;
-    if (hr != S_OK) goto done;
-
-    INetFwAuthorizedApplication_Release( app );
-    hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER,
-                           &IID_INetFwAuthorizedApplication, (void **)&app );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    SysFreeString( image );
-    image = SysAllocString( path );
-    hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image );
-    if (hr != S_OK) goto done;
-
-    name = SysAllocString( L"dplay_server" );
-    hr = INetFwAuthorizedApplication_put_Name( app, name );
-    SysFreeString( name );
-    ok( hr == S_OK, "got %08lx\n", hr );
-    if (hr != S_OK) goto done;
-
-    if (op == APP_ADD)
-        hr = INetFwAuthorizedApplications_Add( apps, app );
-    else if (op == APP_REMOVE)
-        hr = INetFwAuthorizedApplications_Remove( apps, image );
-    else
-        hr = E_INVALIDARG;
-
-done:
-    if (app) INetFwAuthorizedApplication_Release( app );
-    if (apps) INetFwAuthorizedApplications_Release( apps );
-    if (policy) INetFwPolicy_Release( policy );
-    if (profile) INetFwProfile_Release( profile );
-    if (mgr) INetFwMgr_Release( mgr );
-    if (SUCCEEDED( init )) CoUninitialize();
-    SysFreeString( image );
-    return hr;
-}
-
 /* taken from programs/winetest/main.c */
 static BOOL is_stub_dll(const char *filename)
 {
@@ -6894,8 +6740,6 @@ static BOOL is_stub_dll(const char *filename)

START_TEST(dplayx)
 {
-    BOOL firewall_enabled;
-    HRESULT hr;
     char path[MAX_PATH];
     HMODULE module;

@@ -6912,22 +6756,12 @@ START_TEST(dplayx)
         return;
     }

-    if ((firewall_enabled = is_firewall_enabled()) && !is_process_elevated())
+    if (!winetest_set_firewall(L"dplay_server", WINETEST_FW_APP_ADD))
     {
-        skip("no privileges, skipping tests to avoid firewall dialog\n");
+        skip("can't authorize app in firewall\n");
         return;
     }

-    if (firewall_enabled)
-    {
-        hr = set_firewall(APP_ADD);
-        if (hr != S_OK)
-        {
-            skip("can't authorize app in firewall %08lx\n", hr);
-            return;
-        }
-    }
-
     CoInitialize( NULL );

module = LoadLibraryA("dplayx.dll");
@@ -6991,5 +6825,5 @@ START_TEST(dplayx)
 done:
     FreeLibrary(module);
     CoUninitialize();
-    if (firewall_enabled) set_firewall(APP_REMOVE);
+    winetest_set_firewall(L"dplay_server", WINETEST_FW_APP_REMOVE);
 }