diff --git a/dlls/qwave/tests/Makefile.in b/dlls/qwave/tests/Makefile.in
index 999c26f693f..713909ba191 100644
--- a/dlls/qwave/tests/Makefile.in
+++ b/dlls/qwave/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = qwave.dll
 IMPORTS   = qwave
 
diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c
index 10a32f7495b..7e8fddf64c4 100644
--- a/dlls/qwave/tests/qos.c
+++ b/dlls/qwave/tests/qos.c
@@ -30,19 +30,19 @@ static void test_QOSCreateHandle(void)
     SetLastError(0xdeadbeef);
     ret = QOSCreateHandle(NULL, NULL);
     ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 
     SetLastError(0xdeadbeef);
     ret = QOSCreateHandle(&ver, NULL);
     ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 
     SetLastError(0xdeadbeef);
     ver.MajorVersion = 0;
     ver.MinorVersion = 0;
     ret = QOSCreateHandle(&ver, &h);
     ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 
     ver.MajorVersion = 1;
     ver.MinorVersion = 0;
@@ -54,14 +54,14 @@ static void test_QOSCreateHandle(void)
     ver.MinorVersion = 5;
     ret = QOSCreateHandle(&ver, &h);
     ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 
     SetLastError(0xdeadbeef);
     ver.MajorVersion = 2;
     ver.MinorVersion = 0;
     ret = QOSCreateHandle(&ver, &h);
     ok(ret == FALSE, "Expected FALSE, got %d\n", ret);
-    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
 }
 
 START_TEST(qos)