[PATCH 17/25] dlls/slc/tests: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/slc/tests/Makefile.in |    1 -
 dlls/slc/tests/slc.c       |   18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/slc/tests/Makefile.in b/dlls/slc/tests/Makefile.in
index 86f77823a71..51b648cb854 100644
--- a/dlls/slc/tests/Makefile.in
+++ b/dlls/slc/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = slc.dll
 IMPORTS   = slc

diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c
index fc0b1c84ad7..10a87571e7d 100644
--- a/dlls/slc/tests/slc.c
+++ b/dlls/slc/tests/slc.c
@@ -33,30 +33,30 @@ static void test_SLGetWindowsInformationDWORD(void)
     HRESULT res;

res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", NULL);
-    ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res);
+    ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", res);

res = SLGetWindowsInformationDWORD(NULL, &value);
-    ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res);
+    ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", res);

value = 0xdeadbeef;
     res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", &value);
-    ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res);
-    ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value);
+    ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08lx\n", res);
+    ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %lu\n", value);

value = 0xdeadbeef;
     res = SLGetWindowsInformationDWORD(L"", &value);
     ok(res == SL_E_RIGHT_NOT_GRANTED || broken(res == 0xd000000d) /* Win 8 */,
-       "expected SL_E_RIGHT_NOT_GRANTED, got %08x\n", res);
-    ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value);
+       "expected SL_E_RIGHT_NOT_GRANTED, got %08lx\n", res);
+    ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %lu\n", value);

value = 0xdeadbeef;
     res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Language-Allowed", &value);
-    ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res);
-    ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value);
+    ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08lx\n", res);
+    ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %lu\n", value);

value = 0xdeadbeef;
     res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Number-Allowed", &value);
-    ok(res == S_OK, "expected S_OK, got %u\n", res);
+    ok(res == S_OK, "expected S_OK, got %lu\n", res);
     ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n");
 }