Alexandre Julliard : fusion/tests: Remove a broken macro.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7e50d67d7ea496371fab06d1b882b3c27c3bc23f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7e50d67d7ea496371fab06d1b8...

Author: Alexandre Julliard 
Date:   Wed Oct 24 11:38:34 2012 +0200

fusion/tests: Remove a broken macro.

---

dlls/fusion/tests/fusion.c |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c
index 6ebd455..3fc67ef 100644
--- a/dlls/fusion/tests/fusion.c
+++ b/dlls/fusion/tests/fusion.c
@@ -30,14 +30,6 @@ static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR szDllName, LPCWSTR szVersion,
 static HRESULT (WINAPI *pGetCORVersion)(LPWSTR pbuffer, DWORD cchBuffer,
                                         DWORD *dwLength);

-static CHAR string1[MAX_PATH], string2[MAX_PATH];
-
-#define ok_w2(format, szString1, szString2) \
-\
-    WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \
-    WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \
-    ok(!lstrcmpA(string1, string2), format, string1, string2)
-
 static BOOL init_functionpointers(void)
 {
     HRESULT hr;
@@ -127,14 +119,14 @@ static void test_GetCachePath(void)
     lstrcpyW(path, nochange);
     hr = pGetCachePath(ASM_CACHE_GAC, path, NULL);
     ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
-    ok_w2("Expected "%s",  got "%s"\n", nochange, path);
+    ok( !lstrcmpW( nochange, path ), "Expected %s,  got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path));

/* get the cache path */
     lstrcpyW(path, nochange);
     size = MAX_PATH;
     hr = pGetCachePath(ASM_CACHE_GAC, path, &size);
     ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
-    ok_w2("Expected "%s",  got "%s"\n", cachepath, path);
+    ok( !lstrcmpW( cachepath, path ), "Expected %s,  got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path));

/* pcchPath has no room for NULL terminator */
     lstrcpyW(path, nochange);
@@ -142,7 +134,7 @@ static void test_GetCachePath(void)
     hr = pGetCachePath(ASM_CACHE_GAC, path, &size);
     ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),
        "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr);
-    ok_w2("Expected "%s",  got "%s"\n", nochange, path);
+    ok( !lstrcmpW( nochange, path ), "Expected %s,  got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path));

lstrcpyW(cachepath, windir);
     lstrcatW(cachepath, backslash);
@@ -156,7 +148,7 @@ static void test_GetCachePath(void)
        broken(hr == E_INVALIDARG), /* .NET 1.1 */
        "Expected S_OK, got %08x\n", hr);
     if (hr == S_OK)
-        ok_w2("Expected "%s",  got "%s"\n", cachepath, path);
+        ok( !lstrcmpW( cachepath, path ), "Expected %s,  got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path));

if (pGetCORVersion)
     {
@@ -191,7 +183,7 @@ static void test_GetCachePath(void)
         size = MAX_PATH;
         hr = pGetCachePath(ASM_CACHE_ZAP, path, &size);
         ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
-        ok_w2("Expected "%s",  got "%s"\n", cachepath, path);
+        ok( !lstrcmpW( cachepath, path ), "Expected %s,  got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path));
     }

/* two flags at once */
@@ -199,7 +191,7 @@ static void test_GetCachePath(void)
     size = MAX_PATH;
     hr = pGetCachePath(ASM_CACHE_GAC | ASM_CACHE_ROOT, path, &size);
     ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr);
-    ok_w2("Expected "%s",  got "%s"\n", nochange, path);
+    ok( !lstrcmpW( nochange, path ), "Expected %s,  got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path));
 }

START_TEST(fusion)