[PATCH 07/31] dlls/dbghelp/tests: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/dbghelp/tests/Makefile.in |    1 -
 dlls/dbghelp/tests/dbghelp.c   |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/dbghelp/tests/Makefile.in b/dlls/dbghelp/tests/Makefile.in
index 408431fb516..31e5b01e8a8 100644
--- a/dlls/dbghelp/tests/Makefile.in
+++ b/dlls/dbghelp/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = dbghelp.dll
 IMPORTS   = dbghelp

diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c
index b7e828281cd..73f8ee5f14f 100644
--- a/dlls/dbghelp/tests/dbghelp.c
+++ b/dlls/dbghelp/tests/dbghelp.c
@@ -26,7 +26,7 @@
 static DWORD CALLBACK stack_walk_thread(void *arg)
 {
     DWORD count = SuspendThread(GetCurrentThread());
-    ok(!count, "got %d\n", count);
+    ok(!count, "got %ld\n", count);
     return 0;
 }

@@ -86,7 +86,7 @@ static void test_stack_walk(void)
     /* first invocation just calculates the return address */
     ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL,
         SymFunctionTableAccess64, SymGetModuleBase64, NULL);
-    ok(ret, "StackWalk64() failed: %u\n", GetLastError());
+    ok(ret, "StackWalk64() failed: %lu\n", GetLastError());
     ok(frame.AddrPC.Offset == frame0.AddrPC.Offset, "expected %s, got %s\n",
         wine_dbgstr_longlong(frame0.AddrPC.Offset),
         wine_dbgstr_longlong(frame.AddrPC.Offset));
@@ -102,7 +102,7 @@ static void test_stack_walk(void)

ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL,
             SymFunctionTableAccess64, SymGetModuleBase64, NULL);
-        ok(ret, "StackWalk64() failed: %u\n", GetLastError());
+        ok(ret, "StackWalk64() failed: %lu\n", GetLastError());

addr = (void *)(DWORD_PTR)frame.AddrPC.Offset;

@@ -199,11 +199,11 @@ START_TEST(dbghelp)
     SetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", NULL);

ret = SymInitialize(GetCurrentProcess(), NULL, TRUE);
-    ok(ret, "got error %u\n", GetLastError());
+    ok(ret, "got error %lu\n", GetLastError());

test_stack_walk();
     test_search_path();

ret = SymCleanup(GetCurrentProcess());
-    ok(ret, "got error %u\n", GetLastError());
+    ok(ret, "got error %lu\n", GetLastError());
 }