rpcrt4/tests: Enable compilation with long types.

dlls/rpcrt4/tests/Makefile.in

 TESTDLL   = rpcrt4.dll
 IMPORTS   = oleaut32 ole32 rpcrt4 secur32 advapi32
 EXTRAIDLFLAGS = --prefix-server=s_
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DPROXY_DELEGATION
+EXTRADEFS = -DPROXY_DELEGATION
 
 server_EXTRAIDLFLAGS = -Os --prefix-client=mixed_
 server_interp_EXTRAIDLFLAGS = -Oicf --prefix-client=interp_

dlls/rpcrt4/tests/rpc_async.c

@@ -34,27 +34,27 @@ static void test_RpcAsyncInitializeHandle(void)
     void *unset_ptr;
 
     status = RpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer));
-    ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status);
+    ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %ld\n", status);
 
     status = RpcAsyncInitializeHandle(&async, sizeof(async) - 1);
-    ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status);
+    ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %ld\n", status);
 
     memset(&async, 0xcc, sizeof(async));
     memset(&unset_ptr, 0xcc, sizeof(unset_ptr));
     status = RpcAsyncInitializeHandle(&async, sizeof(async));
-    ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status);
+    ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %ld\n", status);
 
     ok(async.Size == sizeof(async), "async.Size wrong: %d\n", async.Size);
-    ok(async.Signature == 0x43595341, "async.Signature should be 0x43595341, but is 0x%x instead\n", async.Signature);
-    ok(async.Lock == 0, "async.Lock should be 0, but is %d instead\n", async.Lock);
-    ok(async.Flags == 0, "async.Flags should be 0, but is %d instead\n", async.Flags);
+    ok(async.Signature == 0x43595341, "async.Signature should be 0x43595341, but is 0x%lx instead\n", async.Signature);
+    ok(async.Lock == 0, "async.Lock should be 0, but is %ld instead\n", async.Lock);
+    ok(async.Flags == 0, "async.Flags should be 0, but is %ld instead\n", async.Flags);
     ok(async.StubInfo == NULL, "async.StubInfo should be NULL, not %p\n", async.StubInfo);
     ok(async.UserInfo == unset_ptr, "async.UserInfo should be unset, not %p\n", async.UserInfo);
     ok(async.RuntimeInfo == NULL, "async.RuntimeInfo should be NULL, not %p\n", async.RuntimeInfo);
     ok(async.Event == 0xcccccccc, "async.Event should be unset, not %d\n", async.Event);
     ok(async.NotificationType == 0xcccccccc, "async.NotificationType should be unset, not %d\n", async.NotificationType);
     for (i = 0; i < 4; i++)
-        ok(async.Reserved[i] == 0x0, "async.Reserved[%d] should be 0x0, not 0x%lx\n", i, async.Reserved[i]);
+        ok(async.Reserved[i] == 0x0, "async.Reserved[%d] should be 0x0, not 0x%Ix\n", i, async.Reserved[i]);
 }
 
 static void test_RpcAsyncGetCallStatus(void)
@@ -63,16 +63,16 @@ static void test_RpcAsyncGetCallStatus(void)
     RPC_STATUS status;
 
     status = RpcAsyncInitializeHandle(&async, sizeof(async));
-    ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status);
+    ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %ld\n", status);
 
     status = RpcAsyncGetCallStatus(&async);
     todo_wine
-    ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status);
+    ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %ld\n", status);
 
     memset(&async, 0, sizeof(async));
     status = RpcAsyncGetCallStatus(&async);
     todo_wine
-    ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status);
+    ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %ld\n", status);
 }
 
 START_TEST( rpc_async )