Austin English : psapi/tests: Remove an ugly macro.

[Alexandre Julliard]

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

Author: Austin English 
Date:   Sun Oct  3 17:53:03 2010 -0700

psapi/tests: Remove an ugly macro.

---

dlls/psapi/tests/psapi_main.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 55eb937..b9b8f2a 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -25,13 +25,6 @@
 #include "wine/test.h"
 #include "psapi.h"

-#define expect_eq_d(expected, actual) \
-    do { \
-      int value = (actual); \
-      ok((expected) == value, "Expected " #actual " to be %d (" #expected ") is %d\n", \
-          (expected), value); \
-    } while (0)
-
 #define PSAPI_GET_PROC(func) \
     p ## func = (void*)GetProcAddress(hpsapi, #func); \
     if(!p ## func) { \
@@ -223,7 +216,7 @@ static void test_GetProcessImageFileName(void)
     ret = pGetProcessImageFileNameW(hpQI, szImgPathW, sizeof(szImgPathW)/sizeof(WCHAR));
     ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n");
     ok(szImgPathW[0] == '\', "GetProcessImageFileNameW should have returned an NT path.\n");
-    expect_eq_d(lstrlenW(szImgPathW), ret);
+    ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW));

/* boundary values of 'size' */
     w32_err(pGetProcessImageFileNameW(hpQI, szImgPathW, ret), ERROR_INSUFFICIENT_BUFFER);
@@ -232,7 +225,7 @@ static void test_GetProcessImageFileName(void)
     ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ret + 1);
     ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n");
     ok(szImgPathW[0] == '\', "GetProcessImageFileNameW should have returned an NT path.\n");
-    expect_eq_d(lstrlenW(szImgPathW), ret);
+    ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW));
 }

static void test_GetModuleFileNameEx(void)