[v3 PATCH] d3drm/tests: Build without -DWINE_NO_LONG_TYPES.

Nikolay Sivov nsivov at codeweavers.com
Fri May 13 02:59:27 CDT 2022


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---

v3: rebased

 dlls/d3drm/tests/Makefile.in |    1 -
 dlls/d3drm/tests/d3drm.c     | 3117 +++++++++++++++++-----------------
 dlls/d3drm/tests/vector.c    |    8 +-
 3 files changed, 1561 insertions(+), 1565 deletions(-)

diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in
index ec4a030e949..4b39989531c 100644
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = d3drm.dll
 IMPORTS   = dxguid uuid d3drm ddraw user32
 
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 5e0acc14fcb..7b591958373 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -179,37 +179,37 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const
     HRESULT hr;
 
     hr = IDirect3DRMObject_GetClassName(object, NULL, cname);
-    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetClassName(object, NULL, NULL);
-    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
 
     size = 0;
     hr = IDirect3DRMObject_GetClassName(object, &size, NULL);
-    ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+    ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
 
     size = size2 = !!*name;
     hr = IDirect3DRMObject_GetClassName(object, &size, cname);
-    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == size2, "Got size %u.\n", size);
+    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == size2, "Got size %lu.\n", size);
 
     size = sizeof(cname);
     hr = IDirect3DRMObject_GetClassName(object, &size, cname);
-    ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+    ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
     ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
 
     size = strlen(name) + 1;
     hr = IDirect3DRMObject_GetClassName(object, &size, cname);
-    ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+    ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
     ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
 
     size = strlen(name);
     strcpy(cname, "XXX");
     hr = IDirect3DRMObject_GetClassName(object, &size, cname);
-    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %u.\n", size);
+    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %lu.\n", size);
     ok_(__FILE__, line)(!strcmp(cname, "XXX"), "Expected unchanged buffer, but got \"%s\".\n", cname);
 }
 
@@ -221,70 +221,70 @@ static void test_object_name_(unsigned int line, IDirect3DRMObject *object)
     DWORD size;
 
     hr = IDirect3DRMObject_GetName(object, NULL, NULL);
-    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
 
     name[0] = 0x1f;
     hr = IDirect3DRMObject_GetName(object, NULL, name);
-    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+    ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
     ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected buffer contents, %#x.\n", name[0]);
 
     /* Name is not set yet. */
     size = 100;
     hr = IDirect3DRMObject_GetName(object, &size, NULL);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
 
     size = sizeof(name);
     name[0] = 0x1f;
     hr = IDirect3DRMObject_GetName(object, &size, name);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
     ok_(__FILE__, line)(name[0] == 0, "Unexpected name \"%s\".\n", name);
 
     size = 0;
     name[0] = 0x1f;
     hr = IDirect3DRMObject_GetName(object, &size, name);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
     ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected name \"%s\".\n", name);
 
     hr = IDirect3DRMObject_SetName(object, NULL);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMObject_SetName(object, "name");
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#x.\n", hr);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#lx.\n", hr);
 
     size = 0;
     hr = IDirect3DRMObject_GetName(object, &size, NULL);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
 
     size = strlen("name") + 1;
     hr = IDirect3DRMObject_GetName(object, &size, name);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
     ok_(__FILE__, line)(!strcmp(name, "name"), "Unexpected name \"%s\".\n", name);
 
     size = 2;
     name[0] = 0x1f;
     hr = IDirect3DRMObject_GetName(object, &size, name);
-    ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == 2, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == 2, "Unexpected size %lu.\n", size);
     ok_(__FILE__, line)(name[0] == 0x1f, "Got unexpected name \"%s\".\n", name);
 
     hr = IDirect3DRMObject_SetName(object, NULL);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#x.\n", hr);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#lx.\n", hr);
 
     size = 1;
     hr = IDirect3DRMObject_GetName(object, &size, NULL);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
 
     size = 1;
     name[0] = 0x1f;
     hr = IDirect3DRMObject_GetName(object, &size, name);
-    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
-    ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+    ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
     ok_(__FILE__, line)(name[0] == 0, "Got unexpected name \"%s\".\n", name);
 }
 
@@ -454,31 +454,31 @@ static void test_MeshBuilder(void)
     IUnknown *unk;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
 
     hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMObject, (void **)&unk);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
     IUnknown_Release(unk);
 
     hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMVisual, (void **)&unk);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
     IUnknown_Release(unk);
 
     hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void **)&meshbuilder3);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMMeshBuilder3, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMObject, (void **)&unk);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
     IUnknown_Release(unk);
 
     hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMVisual, (void **)&unk);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
     IUnknown_Release(unk);
 
@@ -490,36 +490,36 @@ static void test_MeshBuilder(void)
     info.lpMemory = data_bad_version;
     info.dSize = strlen(data_bad_version);
     hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
 
     info.lpMemory = data_no_mesh;
     info.dSize = strlen(data_no_mesh);
     hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
 
     info.lpMemory = data_ok;
     info.dSize = strlen(data_ok);
     hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
 
     size = sizeof(name);
     hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
-    ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
     ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name);
     size = strlen("Object"); /* No space for null character */
     hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
-    ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL);
-    ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
     size = sizeof(name);
     hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
-    ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
-    ok(size == 0, "Size should be 0 instead of %u\n", size);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
+    ok(size == 0, "Size should be 0 instead of %lu.\n", size);
     hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, "");
-    ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
     size = sizeof(name);
     hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
-    ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
     ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name);
 
     val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
@@ -529,14 +529,14 @@ static void test_MeshBuilder(void)
     ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
 
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL);
-    ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
-    ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
-    ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2);
-    ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3);
+    ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+    ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
+    ok(val2 == 4, "Wrong number of normals %ld (must be 4)\n", val2);
+    ok(val3 == 22, "Wrong number of face data bytes %ld (must be 22)\n", val3);
 
     /* Check that Load method generated default normals */
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL);
-    ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
     expect_vector(&n[0],  0.577350f, 0.577350f, 0.577350f, 32);
     expect_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32);
     expect_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32);
@@ -546,58 +546,58 @@ static void test_MeshBuilder(void)
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv);
-    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
 
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv);
-    ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
     hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv);
-    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
 
     valu = 0.0f;
     valv = 0.0f;
     hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
     ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
 
     IDirect3DRMMeshBuilder_Release(pMeshBuilder);
 
     hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
 
     /* No group in mesh when mesh builder is not loaded */
     hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
-    ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+    ok(hr == D3DRM_OK, "CreateMesh failed returning hr %#lx.\n", hr);
     if (hr == D3DRM_OK)
     {
         DWORD nb_groups;
 
         nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
-        ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups);
+        ok(nb_groups == 0, "GetCroupCount returned %lu\n", nb_groups);
 
         IDirect3DRMMesh_Release(mesh);
     }
@@ -605,7 +605,7 @@ static void test_MeshBuilder(void)
     info.lpMemory = data_full;
     info.dSize = strlen(data_full);
     hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
 
     val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
     ok(val == 3, "Wrong number of vertices %d (must be 3)\n", val);
@@ -616,43 +616,43 @@ static void test_MeshBuilder(void)
     /* Check no buffer size and too small buffer size errors */
     val1 = 1; val2 = 3; val3 = 8;
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
-    ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f);
-    ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     val1 = 3; val2 = 1; val3 = 8;
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
-    ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f);
-    ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     val1 = 3; val2 = 3; val3 = 1;
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
-    ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f);
-    ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     val1 = 3; val2 = 3; val3 = 8;
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
-    ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
-    ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
-    ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
-    ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3);
+    ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+    ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
+    ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+    ok(val3 == 8, "Wrong number of face data bytes %ld (must be 8)\n", val3);
     expect_vector(&v[0], 0.1f, 0.2f, 0.3f, 32);
     expect_vector(&v[1], 0.4f, 0.5f, 0.6f, 32);
     expect_vector(&v[2], 0.7f, 0.8f, 0.9f, 32);
     expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32);
     expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32);
     expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32);
-    ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]);
-    ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]);
-    ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]);
-    ok(f[3] == 1 , "Wrong component f[3] = %d (expected 1)\n", f[3]);
-    ok(f[4] == 1 , "Wrong component f[4] = %d (expected 1)\n", f[4]);
-    ok(f[5] == 2 , "Wrong component f[5] = %d (expected 2)\n", f[5]);
-    ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]);
-    ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]);
+    ok(f[0] == 3 , "Wrong component f[0] = %ld (expected 3)\n", f[0]);
+    ok(f[1] == 0 , "Wrong component f[1] = %ld (expected 0)\n", f[1]);
+    ok(f[2] == 0 , "Wrong component f[2] = %ld (expected 0)\n", f[2]);
+    ok(f[3] == 1 , "Wrong component f[3] = %ld (expected 1)\n", f[3]);
+    ok(f[4] == 1 , "Wrong component f[4] = %ld (expected 1)\n", f[4]);
+    ok(f[5] == 2 , "Wrong component f[5] = %ld (expected 2)\n", f[5]);
+    ok(f[6] == 2 , "Wrong component f[6] = %ld (expected 2)\n", f[6]);
+    ok(f[7] == 0 , "Wrong component f[7] = %ld (expected 0)\n", f[7]);
 
     hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
-    ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
     if (hr == D3DRM_OK)
     {
         DWORD nb_groups;
@@ -663,30 +663,30 @@ static void test_MeshBuilder(void)
         D3DVALUE values[3];
 
         nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
-        ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups);
+        ok(nb_groups == 1, "GetCroupCount returned %lu.\n", nb_groups);
         hr = IDirect3DRMMesh_GetGroup(mesh, 1, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
-        ok(hr == D3DRMERR_BADVALUE, "GetCroup returned hr = %x\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
         hr = IDirect3DRMMesh_GetGroup(mesh, 0, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
-        ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr);
+        ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
         ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices);
         ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces);
         ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices);
-        ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size);
+        ok(data_size == 3, "Wrong number of face data bytes %lu (must be 3)\n", data_size);
         color = IDirect3DRMMesh_GetGroupColor(mesh, 0);
-        ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00);
+        ok(color == 0xff00ff00, "Wrong color returned %#lx instead of %#x\n", color, 0xff00ff00);
         hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);
-        ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr);
+        ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
         ok(texture == NULL, "No texture should be present\n");
         hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material);
-        ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr);
+        ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
         ok(material != NULL, "No material present\n");
         hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);
-        ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#x.\n", hr);
+        ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#lx.\n", hr);
         ok(values[0] == 0.5f, "Got unexpected red component %.8e.\n", values[0]);
         ok(values[1] == 0.5f, "Got unexpected green component %.8e.\n", values[1]);
         ok(values[2] == 0.5f, "Got unexpected blue component %.8e.\n", values[2]);
         hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]);
-        ok(hr == D3DRM_OK, "Failed to get specular color, hr %#x.\n", hr);
+        ok(hr == D3DRM_OK, "Failed to get specular color, hr %#lx.\n", hr);
         ok(values[0] == 1.0f, "Got unexpected red component %.8e.\n", values[0]);
         ok(values[1] == 0.0f, "Got unexpected green component %.8e.\n", values[1]);
         ok(values[2] == 0.0f, "Got unexpected blue component %.8e.\n", values[2]);
@@ -698,12 +698,12 @@ static void test_MeshBuilder(void)
     }
 
     hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4);
-    ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr);
+    ok(hr == D3DRM_OK, "Scale failed returning hr %#lx.\n", hr);
 
     hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
-    ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
-    ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
-    ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
+    ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+    ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+    ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
 
     expect_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32);
     expect_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32);
@@ -730,17 +730,17 @@ static void test_MeshBuilder3(void)
     D3DVALUE valu, valv;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
     {
-        win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+        win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
         IDirect3DRM_Release(d3drm);
         return;
     }
 
     hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface, hr %#lx\n", hr);
 
     test_class_name((IDirect3DRMObject *)pMeshBuilder3, "Builder");
     test_object_name((IDirect3DRMObject *)pMeshBuilder3);
@@ -748,17 +748,17 @@ static void test_MeshBuilder3(void)
     info.lpMemory = data_bad_version;
     info.dSize = strlen(data_bad_version);
     hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
 
     info.lpMemory = data_no_mesh;
     info.dSize = strlen(data_no_mesh);
     hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
 
     info.lpMemory = data_ok;
     info.dSize = strlen(data_ok);
     hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
 
     val = IDirect3DRMMeshBuilder3_GetVertexCount(pMeshBuilder3);
     ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);
@@ -767,48 +767,48 @@ static void test_MeshBuilder3(void)
     ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
 
     hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL);
-    ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
-    ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
+    ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+    ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
 
     /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
     ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
     hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv);
-    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
 
     valu = 1.23f;
     valv = 3.21f;
     hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv);
-    ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
     hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv);
-    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
 
     valu = 0.0f;
     valv = 0.0f;
     hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
-    ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
     ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
     ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
 
@@ -825,20 +825,20 @@ static void test_Mesh(void)
     IUnknown *unk;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     hr = IDirect3DRM_CreateMesh(d3drm, &mesh);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface, hr %#lx\n", hr);
 
     test_class_name((IDirect3DRMObject *)mesh, "Mesh");
     test_object_name((IDirect3DRMObject *)mesh);
 
     hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     IUnknown_Release(unk);
 
     hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     IUnknown_Release(unk);
 
     IDirect3DRMMesh_Release(mesh);
@@ -865,19 +865,19 @@ static void test_Face(void)
     int icount;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     hr = IDirect3DRM_CreateFace(d3drm, &face1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
     if (FAILED(hr))
     {
-        skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr);
+        skip("Cannot get IDirect3DRMFace interface, hr %#lx, skipping tests\n", hr);
         IDirect3DRM_Release(d3drm);
         return;
     }
 
     hr = IDirect3DRMFace_QueryInterface(face1, &IID_IDirect3DRMObject, (void **)&obj);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
     IDirect3DRMObject_Release(obj);
 
@@ -891,13 +891,13 @@ static void test_Face(void)
 
     if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2)))
     {
-        win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr);
+        win_skip("Cannot get IDirect3DRM2 interface, hr %#lx, skipping tests\n", hr);
         IDirect3DRM_Release(d3drm);
         return;
     }
 
     hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface, hr %#lx\n", hr);
 
     icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
     ok(!icount, "wrong FaceCount: %i\n", icount);
@@ -905,10 +905,10 @@ static void test_Face(void)
     array1 = NULL;
     hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
     todo_wine
-    ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
 
     hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
 
     icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
     todo_wine
@@ -917,16 +917,16 @@ static void test_Face(void)
     array1 = NULL;
     hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
     todo_wine
-    ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
     todo_wine
     ok(array1 != NULL, "pArray = %p\n", array1);
     if (array1)
     {
         IDirect3DRMFace *face;
         count = IDirect3DRMFaceArray_GetSize(array1);
-        ok(count == 1, "count = %u\n", count);
+        ok(count == 1, "count = %lu\n", count);
         hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
-        ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
         IDirect3DRMFace_Release(face);
         IDirect3DRMFaceArray_Release(array1);
     }
@@ -939,25 +939,25 @@ static void test_Face(void)
 
     if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
     {
-        win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+        win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
         IDirect3DRM_Release(d3drm);
         return;
     }
 
     hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
 
     icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3);
     ok(!icount, "wrong FaceCount: %i\n", icount);
 
     hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
 
     hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMObject, (void **)&obj);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMFace, (void **)&face1);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
     ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
 
     IDirect3DRMFace_Release(face1);
@@ -973,16 +973,16 @@ static void test_Face(void)
     array1 = NULL;
     hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
     todo_wine
-    ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
     todo_wine
     ok(array1 != NULL, "pArray = %p\n", array1);
     if (array1)
     {
         IDirect3DRMFace *face;
         count = IDirect3DRMFaceArray_GetSize(array1);
-        ok(count == 1, "count = %u\n", count);
+        ok(count == 1, "count = %lu\n", count);
         hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
-        ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
         IDirect3DRMFace_Release(face);
         IDirect3DRMFaceArray_Release(array1);
     }
@@ -993,7 +993,7 @@ static void test_Face(void)
     info.lpMemory = data_ok;
     info.dSize = strlen(data_ok);
     hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
-    ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
 
     icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3);
     ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount);
@@ -1007,29 +1007,29 @@ static void test_Face(void)
 
     count = 4;
     hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1);
-    ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
-    ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count);
+    ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+    ok(count == 4, "Wrong number of vertices %ld (must be 4)\n", count);
 
     hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1);
-    ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr);
-    ok(count == 4, "Wrong number of normals %d (must be 4)\n", count);
+    ok(hr == D3DRM_OK, "Cannot get normals information, hr %#lx\n", hr);
+    ok(count == 4, "Wrong number of normals %ld (must be 4)\n", count);
 
     array1 = NULL;
     hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
     todo_wine
-    ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
     todo_wine
     ok(array1 != NULL, "pArray = %p\n", array1);
     if (array1)
     {
         IDirect3DRMFace *face;
         count = IDirect3DRMFaceArray_GetSize(array1);
-        ok(count == 4, "count = %u\n", count);
+        ok(count == 4, "count = %lu\n", count);
         hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face);
-        ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
         hr = IDirect3DRMFace_GetVertices(face, &count, v2, n2);
-        ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
-        ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count);
+        ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+        ok(count == 3, "Wrong number of vertices %ld (must be 3)\n", count);
 
         vector_eq(&v1[0], &v2[0]);
         vector_eq(&v1[1], &v2[1]);
@@ -1045,14 +1045,14 @@ static void test_Face(void)
 
     /* Setting face color. */
     hr = IDirect3DRMFace2_SetColor(face2, 0x1f180587);
-    ok(SUCCEEDED(hr), "Failed to set face color, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set face color, hr %#lx.\n", hr);
     color = IDirect3DRMFace2_GetColor(face2);
-    ok(color == 0x1f180587, "Unexpected color %8x.\n", color);
+    ok(color == 0x1f180587, "Unexpected color %8lx.\n", color);
 
     hr = IDirect3DRMFace2_SetColorRGB(face2, 0.5f, 0.5f, 0.5f);
-    ok(SUCCEEDED(hr), "Failed to set color, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set color, hr %#lx.\n", hr);
     color = IDirect3DRMFace2_GetColor(face2);
-    ok(color == 0xff7f7f7f, "Unexpected color %8x.\n", color);
+    ok(color == 0xff7f7f7f, "Unexpected color %8lx.\n", color);
 
     IDirect3DRMFace2_Release(face2);
     IDirect3DRMMeshBuilder3_Release(MeshBuilder3);
@@ -1084,11 +1084,11 @@ static void test_Frame(void)
     D3DCOLOR color;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     ref = get_refcount((IUnknown *)d3drm);
     hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameC, 1);
     ref2 = get_refcount((IUnknown *)d3drm);
     ok(ref2 > ref, "Expected d3drm object to be referenced.\n");
@@ -1097,93 +1097,93 @@ static void test_Frame(void)
     test_object_name((IDirect3DRMObject *)pFrameC);
 
     hr = IDirect3DRMFrame_GetParent(pFrameC, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
     pFrameTmp = (void*)0xdeadbeef;
     hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
-    ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
     ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
     CHECK_REFCOUNT(pFrameC, 1);
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameC, &frame_array);
-    ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
     ok(!!frame_array, "frame_array = %p\n", frame_array);
     if (frame_array)
     {
         count = IDirect3DRMFrameArray_GetSize(frame_array);
-        ok(count == 0, "count = %u\n", count);
+        ok(count == 0, "count = %lu\n", count);
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
-        ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
         ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
         IDirect3DRMFrameArray_Release(frame_array);
     }
 
     hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
 
     /* GetParent with NULL pointer */
     hr = IDirect3DRMFrame_GetParent(pFrameP1, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 1);
 
     /* [Add/Delete]Child with NULL pointer */
     hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 1);
 
     hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 1);
 
     /* Add child to first parent */
     pFrameTmp = (void*)0xdeadbeef;
     hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp);
-    ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
     ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
 
     hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC);
-    ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 1);
     CHECK_REFCOUNT(pFrameC, 2);
 
     hr = IDirect3DRMFrame_GetScene(pFrameC, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
-    ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
     ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
     CHECK_REFCOUNT(pFrameP1, 2);
     IDirect3DRMFrame_Release(scene_frame);
     hr = IDirect3DRMFrame_GetScene(pFrameP1, &scene_frame);
-    ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
     ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
     CHECK_REFCOUNT(pFrameP1, 2);
     IDirect3DRMFrame_Release(scene_frame);
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
-    ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
     /* In some older version of d3drm, creating IDirect3DRMFrameArray object with GetChildren does not increment refcount of children frames */
     ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
-            "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+            "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
     if (frame_array)
     {
         count = IDirect3DRMFrameArray_GetSize(frame_array);
-        ok(count == 1, "count = %u\n", count);
+        ok(count == 1, "count = %lu\n", count);
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
-        ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
         ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
         ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3),
-                "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC));
+                "Invalid refcount. Expected 4 (or 3) got %ld\n", get_refcount((IUnknown*)pFrameC));
         IDirect3DRMFrame_Release(pFrameTmp);
         ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
-                "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+                "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
         IDirect3DRMFrameArray_Release(frame_array);
         CHECK_REFCOUNT(pFrameC, 2);
     }
 
     pFrameTmp = (void*)0xdeadbeef;
     hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
-    ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
     ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
     CHECK_REFCOUNT(pFrameP1, 2);
     IDirect3DRMFrame_Release(pFrameTmp);
@@ -1191,21 +1191,21 @@ static void test_Frame(void)
 
     /* Add child to second parent */
     hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
 
     hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
-    ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameC, 2);
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
-    ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
     if (frame_array)
     {
         count = IDirect3DRMFrameArray_GetSize(frame_array);
-        ok(count == 1, "count = %u\n", count);
+        ok(count == 1, "count = %lu\n", count);
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
-        ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
         ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
         IDirect3DRMFrame_Release(pFrameTmp);
         IDirect3DRMFrameArray_Release(frame_array);
@@ -1213,31 +1213,31 @@ static void test_Frame(void)
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
-    ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
     if (frame_array)
     {
         count = IDirect3DRMFrameArray_GetSize(frame_array);
-        ok(count == 0, "count = %u\n", count);
+        ok(count == 0, "count = %lu\n", count);
         pFrameTmp = (void*)0xdeadbeef;
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
-        ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
         ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
         IDirect3DRMFrameArray_Release(frame_array);
     }
     hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
-    ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
     ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
     CHECK_REFCOUNT(pFrameP2, 2);
     IDirect3DRMFrame_Release(scene_frame);
     hr = IDirect3DRMFrame_GetScene(pFrameP2, &scene_frame);
-    ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
     ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
     CHECK_REFCOUNT(pFrameP2, 2);
     IDirect3DRMFrame_Release(scene_frame);
 
     pFrameTmp = (void*)0xdeadbeef;
     hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
-    ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
     ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp);
     CHECK_REFCOUNT(pFrameP2, 2);
     CHECK_REFCOUNT(pFrameC, 2);
@@ -1246,18 +1246,18 @@ static void test_Frame(void)
 
     /* Add child again */
     hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
-    ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameC, 2);
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
-    ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
     if (frame_array)
     {
         count = IDirect3DRMFrameArray_GetSize(frame_array);
-        ok(count == 1, "count = %u\n", count);
+        ok(count == 1, "count = %lu\n", count);
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
-        ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
         ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
         IDirect3DRMFrame_Release(pFrameTmp);
         IDirect3DRMFrameArray_Release(frame_array);
@@ -1265,50 +1265,50 @@ static void test_Frame(void)
 
     /* Delete child */
     hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC);
-    ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot delete child frame, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameC, 1);
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
-    ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
     if (frame_array)
     {
         count = IDirect3DRMFrameArray_GetSize(frame_array);
-        ok(count == 0, "count = %u\n", count);
+        ok(count == 0, "count = %lu\n", count);
         pFrameTmp = (void*)0xdeadbeef;
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
-        ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
         ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
         IDirect3DRMFrameArray_Release(frame_array);
     }
 
     pFrameTmp = (void*)0xdeadbeef;
     hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
-    ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
     ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
 
     /* Add two children */
     hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
-    ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameC, 2);
 
     hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1);
-    ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
 
     frame_array = NULL;
     hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
-    ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
     if (frame_array)
     {
         count = IDirect3DRMFrameArray_GetSize(frame_array);
-        ok(count == 2, "count = %u\n", count);
+        ok(count == 2, "count = %lu\n", count);
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
-        ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
         ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
         IDirect3DRMFrame_Release(pFrameTmp);
         hr = IDirect3DRMFrameArray_GetElement(frame_array, 1, &pFrameTmp);
-        ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
         ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
         IDirect3DRMFrame_Release(pFrameTmp);
         IDirect3DRMFrameArray_Release(frame_array);
@@ -1316,33 +1316,33 @@ static void test_Frame(void)
 
     /* [Add/Delete]Visual with NULL pointer */
     hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
 
     hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
 
     /* Create Visual */
     hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
     visual1 = (IDirect3DRMVisual *)mesh_builder;
 
     /* Add Visual to first parent */
     hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
-    ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot add visual, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
     CHECK_REFCOUNT(visual1, 2);
 
     visual_array = NULL;
     hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array);
-    ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get visuals, hr %#lx\n", hr);
     if (visual_array)
     {
         count = IDirect3DRMVisualArray_GetSize(visual_array);
-        ok(count == 1, "count = %u\n", count);
+        ok(count == 1, "count = %lu\n", count);
         hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp);
-        ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
         ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp);
         IDirect3DRMVisual_Release(visual_tmp);
         IDirect3DRMVisualArray_Release(visual_array);
@@ -1350,38 +1350,38 @@ static void test_Frame(void)
 
     /* Delete Visual */
     hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
-    ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot delete visual, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
     IDirect3DRMMeshBuilder_Release(mesh_builder);
 
     /* [Add/Delete]Light with NULL pointer */
     hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
 
     hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
 
     /* Create Light */
     hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
 
     /* Add Light to first parent */
     hr = IDirect3DRMFrame_AddLight(pFrameP1, light1);
-    ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot add light, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
     CHECK_REFCOUNT(light1, 2);
 
     light_array = NULL;
     hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array);
-    ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get lights, hr %#lx\n", hr);
     if (light_array)
     {
         count = IDirect3DRMLightArray_GetSize(light_array);
-        ok(count == 1, "count = %u\n", count);
+        ok(count == 1, "count = %lu\n", count);
         hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp);
-        ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+        ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
         ok(light_tmp == light1, "light_tmp = %p\n", light_tmp);
         IDirect3DRMLight_Release(light_tmp);
         IDirect3DRMLightArray_Release(light_array);
@@ -1389,57 +1389,57 @@ static void test_Frame(void)
 
     /* Delete Light */
     hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1);
-    ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot delete light, hr %#lx\n", hr);
     CHECK_REFCOUNT(pFrameP1, 2);
     IDirect3DRMLight_Release(light1);
 
     /* Test SceneBackground on first parent */
     color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
-    ok(color == 0xff000000, "wrong color (%x)\n", color);
+    ok(color == 0xff000000, "wrong color %lx.\n", color);
 
     hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587);
-    ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
     color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
-    ok(color == 0xff180587, "wrong color (%x)\n", color);
+    ok(color == 0xff180587, "wrong color %lx.\n", color);
 
     hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5);
-    ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
     color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
-    ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+    ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
 
     /* Traversal options. */
     hr = IDirect3DRMFrame_QueryInterface(pFrameP2, &IID_IDirect3DRMFrame3, (void **)&frame3);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     options = 0;
     hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
-    ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
-    ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#x.\n", options);
+    ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+    ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#lx.\n", options);
 
     hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0);
-    ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000 | D3DRMFRAME_PICKENABLE);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     options = 0xf;
     hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
-    ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
-    ok(options == 0, "Unexpected traversal options %#x.\n", options);
+    ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+    ok(options == 0, "Unexpected traversal options %#lx.\n", options);
 
     hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, D3DRMFRAME_PICKENABLE);
-    ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#lx.\n", hr);
 
     options = 0;
     hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
-    ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
-    ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#x.\n", options);
+    ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+    ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#lx.\n", options);
 
     IDirect3DRMFrame3_Release(frame3);
 
@@ -1495,12 +1495,12 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
     int i;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr);
+    ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface, hr %#lx.\n", test_idx, hr);
 
     hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
-    ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
     hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     IUnknown_Release(unknown);
 
     context.called = 0;
@@ -1508,33 +1508,33 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
     context.obj = obj;
 
     hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context);
-    ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE, hr %#lx.\n", test_idx, hr);
 
     hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     corder[2].callback = &destroy_callback;
     corder[2].context = &context;
 
     /* same callback added twice */
     hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     corder[1].callback = &destroy_callback;
     corder[1].context = &context;
 
     hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
 
     hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
 
     /* add one more */
     hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     corder[0].callback = &destroy_callback1;
     corder[0].context = &context;
 
     hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE, hr %#lx.\n", test_idx, hr);
 
     context.called = 0;
     IDirect3DRMObject_Release(obj);
@@ -1549,30 +1549,30 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
 
     /* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
     hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
-    ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
     hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     IUnknown_Release(unknown);
 
     hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     corder[1].callback = &destroy_callback;
     corder[1].context = &context;
 
     hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     corder[0].callback = &destroy_callback1;
     corder[0].context = &context;
 
     hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
 
     hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
 
     context.called = 0;
     hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj);
-    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+    ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
     IDirect3DRMObject_Release(context.obj);
     IUnknown_Release(unknown);
     ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called);
@@ -1631,92 +1631,92 @@ static void test_object(void)
     int i;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown);
-    ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr);
+    ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#lx.\n", hr);
     ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
 
     for (i = 0; i < ARRAY_SIZE(tests); ++i)
     {
         unknown = (IUnknown *)0xdeadbeef;
         hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);
-        ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
         ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
         unknown = (IUnknown *)0xdeadbeef;
         hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown);
-        ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
         ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
         hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL);
-        ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
 
         hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
-        ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
         if (SUCCEEDED(hr))
         {
             ref2 = get_refcount((IUnknown *)d3drm1);
             if (tests[i].takes_d3drm_ref)
-                ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+                ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             else
-                ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+                ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
 
             ref3 = get_refcount((IUnknown *)d3drm2);
-            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
             ref4 = get_refcount((IUnknown *)d3drm3);
-            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
             IUnknown_Release(unknown);
             ref2 = get_refcount((IUnknown *)d3drm1);
-            ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+            ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             ref3 = get_refcount((IUnknown *)d3drm2);
-            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
             ref4 = get_refcount((IUnknown *)d3drm3);
-            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
 
             /* test Add/Destroy callbacks */
             test_destroy_callback(i, tests[i].clsid, tests[i].iid);
 
             hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
-            ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+            ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
             ref2 = get_refcount((IUnknown *)d3drm1);
             if (tests[i].takes_d3drm_ref)
-                ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+                ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             else
-                ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+                ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             ref3 = get_refcount((IUnknown *)d3drm2);
-            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
             ref4 = get_refcount((IUnknown *)d3drm3);
-            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
             IUnknown_Release(unknown);
             ref2 = get_refcount((IUnknown *)d3drm1);
-            ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+            ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             ref3 = get_refcount((IUnknown *)d3drm2);
-            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
             ref4 = get_refcount((IUnknown *)d3drm3);
-            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
 
             hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
-            ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+            ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
             ref2 = get_refcount((IUnknown *)d3drm1);
             if (tests[i].takes_d3drm_ref)
-                ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+                ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             else
-                ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+                ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             ref3 = get_refcount((IUnknown *)d3drm2);
-            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
             ref4 = get_refcount((IUnknown *)d3drm3);
-            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
             IUnknown_Release(unknown);
             ref2 = get_refcount((IUnknown *)d3drm1);
-            ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+            ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
             ref3 = get_refcount((IUnknown *)d3drm2);
-            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+            ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
             ref4 = get_refcount((IUnknown *)d3drm3);
-            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+            ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
         }
     }
 
@@ -1754,35 +1754,35 @@ static void test_Viewport(void)
     GetClientRect(window, &rc);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     initial_ref1 = get_refcount((IUnknown *)d3drm1);
     initial_ref2 = get_refcount((IUnknown *)d3drm2);
     initial_ref3 = get_refcount((IUnknown *)d3drm3);
 
     hr = DirectDrawCreateClipper(0, &clipper, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
 
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
-    ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
 
     memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
     hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
     hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &tmp_frame1);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &tmp_frame3);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
 
     ref1 = get_refcount((IUnknown *)d3drm1);
     ref2 = get_refcount((IUnknown *)d3drm2);
@@ -1791,233 +1791,233 @@ static void test_Viewport(void)
     frame_ref = get_refcount((IUnknown *)frame);
 
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, 0, 0, 0, 0, &viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device1);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame);
-    ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+    ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
 
     hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
     ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
     IDirect3DRMDevice_Release(d3drm_device1);
 
     hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
     IDirect3DRMFrame_Release(d3drm_frame);
 
     hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
     IDirect3DRMFrame_Release(d3drm_frame);
 
     IDirect3DRMViewport_Release(viewport);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device1);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame);
-    ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+    ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
 
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, 0, 0, 0, 0, &viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device1);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame);
-    ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+    ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
 
     hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
     ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
     IDirect3DRMDevice_Release(d3drm_device1);
 
     hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
     IDirect3DRMFrame_Release(d3drm_frame);
 
     hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
     IDirect3DRMFrame_Release(d3drm_frame);
 
     IDirect3DRMViewport_Release(viewport);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device1);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame);
-    ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+    ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
 
     device_ref = get_refcount((IUnknown *)device3);
     frame_ref2 = get_refcount((IUnknown *)frame3);
 
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, 0, 0, 0, 0, &viewport2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device3);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame3);
-    ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+    ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
 
     hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
     ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
     IDirect3DRMDevice3_Release(d3drm_device3);
 
     hr = IDirect3DRMViewport2_SetCamera(viewport2, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(frame3 == d3drm_frame3, "Expected frame returned = %p, got %p.\n", frame3, d3drm_frame3);
     IDirect3DRMFrame3_Release(d3drm_frame3);
 
     hr = IDirect3DRMViewport2_SetCamera(viewport2, tmp_frame3);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(d3drm_frame3 == tmp_frame3, "Got unexpected frame %p, expected %p.\n", d3drm_frame3, tmp_frame3);
     IDirect3DRMFrame3_Release(d3drm_frame3);
 
     IDirect3DRMViewport2_Release(viewport2);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device3);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame3);
-    ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+    ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
 
     /* Test all failures together */
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     viewport = (IDirect3DRMViewport *)0xdeadbeef;
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
     viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
     viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
     viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
     viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     viewport_ref = get_refcount((IUnknown *)d3d_viewport);
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
 
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     vp.dwSize = sizeof(vp);
     hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
-    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
-    ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
-    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
-    ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
-    ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+    ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+    ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+    ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
     expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
     ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
     ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2029,28 +2029,28 @@ static void test_Viewport(void)
     IDirect3DRMViewport_Release(viewport);
 
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     viewport_ref = get_refcount((IUnknown *)d3d_viewport);
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
 
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     vp.dwSize = sizeof(vp);
     hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
-    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
-    ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
-    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
-    ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
-    ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+    ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+    ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+    ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
     expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
     ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
     ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2062,28 +2062,28 @@ static void test_Viewport(void)
     IDirect3DRMViewport2_Release(viewport2);
 
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     viewport_ref = get_refcount((IUnknown *)d3d_viewport);
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
 
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     vp.dwSize = sizeof(vp);
     hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
-    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
-    ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
-    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
-    ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
-    ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+    ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+    ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+    ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
     expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
     ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
     ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2094,14 +2094,14 @@ static void test_Viewport(void)
     IDirect3DViewport_Release(d3d_viewport);
 
     hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
     ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport);
 
     hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
 
     hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
     ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj);
     ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2);
 
@@ -2114,22 +2114,22 @@ static void test_Viewport(void)
 
     /* AppData */
     hr = IDirect3DRMViewport_SetAppData(viewport, 0);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
 
     hr = IDirect3DRMViewport_SetAppData(viewport, 0);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
 
     hr = IDirect3DRMViewport_SetAppData(viewport, 1);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
 
     hr = IDirect3DRMViewport_SetAppData(viewport, 1);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
 
     hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
-    ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
 
     data = IDirect3DRMViewport2_GetAppData(viewport2);
-    ok(data == 1, "got %x\n", data);
+    ok(data == 1, "got %lx\n", data);
     IDirect3DRMViewport2_Release(viewport2);
     IDirect3DRMViewport_Release(viewport);
 
@@ -2139,25 +2139,25 @@ static void test_Viewport(void)
     ref3 = get_refcount((IUnknown *)d3drm3);
     hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport,
             (void **)&viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
 
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     field = IDirect3DRMViewport_GetField(viewport);
     ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
     left = right = bottom = top = 10.0f;
     hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
     ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
     ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2170,71 +2170,71 @@ static void test_Viewport(void)
     ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
 
     hr = IDirect3DRMViewport_SetCamera(viewport, frame);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetField(viewport, 0.5f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetPlane(viewport, -0.5f, 0.5f, -0.5f, 0.5f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetFront(viewport, 1.0f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetBack(viewport, 100.0f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
 
     /* Test all failures together */
     hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_Init(viewport, device1, NULL, rc.left, rc.top, rc.right, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
 
     device_ref = get_refcount((IUnknown *)device1);
     frame_ref = get_refcount((IUnknown *)frame);
     hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device1);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame);
-    ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+    ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
 
     hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
     ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
     IDirect3DRMDevice_Release(d3drm_device1);
 
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     viewport_ref = get_refcount((IUnknown *)d3d_viewport);
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
 
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     vp.dwSize = sizeof(vp);
     hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
-    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
-    ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
-    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
-    ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
-    ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+    ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+    ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+    ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
     expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
     ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
     ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2247,7 +2247,7 @@ static void test_Viewport(void)
     field = IDirect3DRMViewport_GetField(viewport);
     ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
     hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
     ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
     ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2260,97 +2260,97 @@ static void test_Viewport(void)
     ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
 
     hr = IDirect3DRMViewport_SetField(viewport, 1.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     field = IDirect3DRMViewport_GetField(viewport);
     ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
     hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
     ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
     ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
     ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
 
     hr = IDirect3DRMViewport_SetPlane(viewport, 5.0f, 3.0f, 2.0f, 0.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     field = IDirect3DRMViewport_GetField(viewport);
     ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
     hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
     ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
     ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
     ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
     hr = IDirect3DRMViewport_SetFront(viewport, 2.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     front = IDirect3DRMViewport_GetFront(viewport);
     ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
     hr = IDirect3DRMViewport_SetBack(viewport, 200.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     back = IDirect3DRMViewport_GetBack(viewport);
     ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
     hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     projection = IDirect3DRMViewport_GetProjection(viewport);
     ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
 
     hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetDevice(viewport, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetCamera(viewport, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetField(viewport, 0.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetField(viewport, -1.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetFront(viewport, 0.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetFront(viewport, -1.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     front = IDirect3DRMViewport_GetFront(viewport);
     hr = IDirect3DRMViewport_SetBack(viewport, front);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_SetBack(viewport, front / 2.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
 
     IDirect3DRMViewport_Release(viewport);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device1);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame);
-    todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+    todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
 
     ref1 = get_refcount((IUnknown *)d3drm1);
     ref2 = get_refcount((IUnknown *)d3drm2);
     ref3 = get_refcount((IUnknown *)d3drm3);
     hr = IDirect3DRM3_CreateObject(d3drm2, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport2,
             (void **)&viewport2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
 
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     field = IDirect3DRMViewport2_GetField(viewport2);
     ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
     left = right = bottom = top = 10.0f;
     hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
     ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
     ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2363,64 +2363,64 @@ static void test_Viewport(void)
     ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
 
     hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetField(viewport2, 0.5f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetPlane(viewport2, -0.5f, 0.5f, -0.5f, 0.5f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetFront(viewport2, 1.0f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE);
-    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
 
     device_ref = get_refcount((IUnknown *)device3);
     frame_ref2 = get_refcount((IUnknown *)frame3);
     hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)device3);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame3);
-    ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+    ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
 
     hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
     ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
     IDirect3DRMDevice3_Release(d3drm_device3);
 
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     viewport_ref = get_refcount((IUnknown *)d3d_viewport);
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
     ref4 = get_refcount((IUnknown *)d3d_viewport);
-    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+    ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
     IDirect3DViewport_Release(d3d_viewport);
 
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
     vp.dwSize = sizeof(vp);
     hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
-    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
-    ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
-    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
-    ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
-    ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+    ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+    ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+    ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+    ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+    ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
     expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
     ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
     ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2433,7 +2433,7 @@ static void test_Viewport(void)
     field = IDirect3DRMViewport2_GetField(viewport2);
     ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
     hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
     ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
     ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2446,103 +2446,103 @@ static void test_Viewport(void)
     ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
 
     hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     field = IDirect3DRMViewport2_GetField(viewport2);
     ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
     hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
     ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
     ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
     ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
 
     hr = IDirect3DRMViewport2_SetPlane(viewport2, 5.0f, 3.0f, 2.0f, 0.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     field = IDirect3DRMViewport2_GetField(viewport2);
     ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
     hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
     ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
     ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
     ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
     hr = IDirect3DRMViewport2_SetFront(viewport2, 2.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     front = IDirect3DRMViewport2_GetFront(viewport2);
     ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
     hr = IDirect3DRMViewport2_SetBack(viewport2, 200.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     back = IDirect3DRMViewport2_GetBack(viewport2);
     ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
     hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     projection = IDirect3DRMViewport2_GetProjection(viewport2);
     ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
 
     hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_GetCamera(viewport2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetFront(viewport2, 0.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetFront(viewport2, -1.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     front = IDirect3DRMViewport2_GetFront(viewport2);
     hr = IDirect3DRMViewport2_SetBack(viewport2, front);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_SetBack(viewport2, front / 2.0f);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
 
     IDirect3DRMViewport2_Release(viewport2);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+    ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+    ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
     ref4 = get_refcount((IUnknown *)device3);
-    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+    ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame3);
-    todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+    todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
 
     IDirect3DRMDevice3_Release(device3);
     IDirect3DRMDevice_Release(device1);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+    ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+    ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+    ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
     ref4 = get_refcount((IUnknown *)frame);
-    ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+    ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
     ref4 = get_refcount((IUnknown *)frame3);
-    ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+    ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
 
     IDirect3DRMFrame3_Release(tmp_frame3);
     IDirect3DRMFrame3_Release(frame3);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+    ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+    ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+    ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
 
     IDirect3DRMFrame3_Release(tmp_frame1);
     IDirect3DRMFrame_Release(frame);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+    ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
     ref4 = get_refcount((IUnknown *)d3drm2);
-    ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+    ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+    ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
     IDirectDrawClipper_Release(clipper);
 
     IDirect3DRM3_Release(d3drm3);
@@ -2561,13 +2561,13 @@ static void test_Light(void)
     D3DCOLOR color;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
 
     hr = IDirect3DRMLight_QueryInterface(light, &IID_IDirect3DRMObject, (void **)&object);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
     IDirect3DRMObject_Release(object);
 
     test_class_name((IDirect3DRMObject *)light, "Light");
@@ -2577,38 +2577,38 @@ static void test_Light(void)
     ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);
 
     color = IDirect3DRMLight_GetColor(light);
-    ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+    ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
 
     hr = IDirect3DRMLight_SetType(light, D3DRMLIGHT_POINT);
-    ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set type, hr %#lx\n", hr);
     type = IDirect3DRMLight_GetType(light);
-    ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type);
+    ok(type == D3DRMLIGHT_POINT, "wrong type %u.\n", type);
 
     hr = IDirect3DRMLight_SetColor(light, 0xff180587);
-    ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
     color = IDirect3DRMLight_GetColor(light);
-    ok(color == 0xff180587, "wrong color (%x)\n", color);
+    ok(color == 0xff180587, "wrong color %#lx.\n", color);
 
     hr = IDirect3DRMLight_SetColor(light, 0x00c0c0c0);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     color = IDirect3DRMLight_GetColor(light);
-    ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+    ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
 
     hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5);
-    ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
     color = IDirect3DRMLight_GetColor(light);
-    ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+    ok(color == 0xff7f7f7f, "wrong color %#lx.\n", color);
 
     IDirect3DRMLight_Release(light);
 
     hr = IDirect3DRM_CreateLight(d3drm, D3DRMLIGHT_SPOT, 0x00c0c0c0, &light);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
 
     type = IDirect3DRMLight_GetType(light);
     ok(type == D3DRMLIGHT_SPOT, "Got unexpected type %#x.\n", type);
 
     color = IDirect3DRMLight_GetColor(light);
-    ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+    ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
 
     IDirect3DRMLight_Release(light);
 
@@ -2624,17 +2624,17 @@ static void test_Material2(void)
     D3DVALUE r, g, b;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
     {
-        win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+        win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
         IDirect3DRM_Release(d3drm);
         return;
     }
 
     hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &material2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface, hr %#lx\n", hr);
 
     test_class_name((IDirect3DRMObject *)material2, "Material");
     test_object_name((IDirect3DRMObject *)material2);
@@ -2643,38 +2643,38 @@ static void test_Material2(void)
     ok(r == 18.5f, "wrong power (%f)\n", r);
 
     hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
-    ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
     ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong emissive r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
 
     hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
-    ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
     ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b);
 
     hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
-    ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
     ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong ambient r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
 
     hr = IDirect3DRMMaterial2_SetPower(material2, 5.87f);
-    ok(hr == D3DRM_OK, "Cannot set power (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set power, hr %#lx\n", hr);
     r = IDirect3DRMMaterial2_GetPower(material2);
     ok(r == 5.87f, "wrong power (%f)\n", r);
 
     hr = IDirect3DRMMaterial2_SetEmissive(material2, 0.5f, 0.5f, 0.5f);
-    ok(hr == D3DRM_OK, "Cannot set emissive (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set emissive, hr %#lx\n", hr);
     hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
-    ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
     ok(r == 0.5f && g == 0.5f && b == 0.5f, "wrong emissive r=%f g=%f b=%f, expected r=0.5 g=0.5 b=0.5\n", r, g, b);
 
     hr = IDirect3DRMMaterial2_SetSpecular(material2, 0.6f, 0.6f, 0.6f);
-    ok(hr == D3DRM_OK, "Cannot set specular (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set specular, hr %#lx\n", hr);
     hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
-    ok(hr == D3DRM_OK, "Cannot get specular (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get specular, hr %#lx\n", hr);
     ok(r == 0.6f && g == 0.6f && b == 0.6f, "wrong specular r=%f g=%f b=%f, expected r=0.6 g=0.6 b=0.6\n", r, g, b);
 
     hr = IDirect3DRMMaterial2_SetAmbient(material2, 0.7f, 0.7f, 0.7f);
-    ok(hr == D3DRM_OK, "Cannot set ambient (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot set ambient, hr %#lx\n", hr);
     hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
-    ok(hr == D3DRM_OK, "Cannot get ambient (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get ambient, hr %#lx\n", hr);
     ok(r == 0.7f && g == 0.7f && b == 0.7f, "wrong ambient r=%f g=%f b=%f, expected r=0.7 g=0.7 b=0.7\n", r, g, b);
 
     IDirect3DRMMaterial2_Release(material2);
@@ -2712,44 +2712,44 @@ static void test_Texture(void)
     ULONG ref1, ref2, ref3, ref4;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
 
     /* Test NULL params */
     texture1 = (IDirect3DRMTexture *)0xdeadbeef;
     hr = IDirect3DRM_CreateTexture(d3drm1, NULL, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
     hr = IDirect3DRM_CreateTexture(d3drm1, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
     hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, &texture2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
     hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, &texture3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
     hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     /* Tests for validation of D3DRMIMAGE struct */
     hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
     hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
     hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
     IDirect3DRMTexture_Release(texture1);
     IDirect3DRMTexture2_Release(texture2);
     IDirect3DRMTexture3_Release(texture3);
@@ -2758,11 +2758,11 @@ static void test_Texture(void)
     testimg.palette = (void *)0xdeadbeef;
     testimg.palette_size = 0x39;
     hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
     hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
     hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
     IDirect3DRMTexture_Release(texture1);
     IDirect3DRMTexture2_Release(texture2);
     IDirect3DRMTexture3_Release(texture3);
@@ -2770,81 +2770,81 @@ static void test_Texture(void)
     initimg.rgb = 0;
     texture1 = (IDirect3DRMTexture *)0xdeadbeef;
     hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!texture1, "Expected texture == NULL, got %p.\n", texture1);
     texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
     hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!texture2, "Expected texture == NULL, got %p.\n", texture2);
     texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(!texture3, "Expected texture == NULL, got %p.\n", texture3);
     initimg.rgb = 1;
     initimg.red_mask = 0;
     hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     initimg.red_mask = 0x000000ff;
     initimg.green_mask = 0;
     hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     initimg.green_mask = 0x0000ff00;
     initimg.blue_mask = 0;
     hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     initimg.blue_mask = 0x00ff0000;
     initimg.buffer1 = NULL;
     hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     initimg.buffer1 = &pixel;
     hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
     hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
     hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
 
     /* Created from image, GetSurface() does not work. */
     hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "GetSurface() expected to fail, %#x\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface);
-    ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr);
+    ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "Unexpected hr %#lx.\n", hr);
 
     /* Test all failures together */
     test_class_name((IDirect3DRMObject *)texture1, "Texture");
@@ -2860,11 +2860,11 @@ static void test_Texture(void)
 
     IDirect3DRMTexture_Release(texture1);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
 
     d3drm_img = NULL;
     d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
@@ -2873,11 +2873,11 @@ static void test_Texture(void)
 
     IDirect3DRMTexture2_Release(texture2);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
 
     d3drm_img = NULL;
     d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -2886,11 +2886,11 @@ static void test_Texture(void)
 
     IDirect3DRMTexture3_Release(texture3);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
 
     /* InitFromImage tests */
     /* Tests for validation of D3DRMIMAGE struct */
@@ -2899,14 +2899,14 @@ static void test_Texture(void)
     testimg.palette_size = 0;
     hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
             (void **)&texture2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
             (void **)&texture3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
     IDirect3DRMTexture2_Release(texture2);
     IDirect3DRMTexture3_Release(texture3);
 
@@ -2915,78 +2915,78 @@ static void test_Texture(void)
     testimg.palette_size = 0x39;
     hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
             (void **)&texture2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
             (void **)&texture3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
     IDirect3DRMTexture2_Release(texture2);
     IDirect3DRMTexture3_Release(texture3);
 
     hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
             (void **)&texture2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)texture2);
     hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)texture2);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
 
     hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
             (void **)&texture3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)texture3);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)texture3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
 
     initimg.rgb = 0;
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     initimg.rgb = 1;
     initimg.red_mask = 0;
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     initimg.red_mask = 0x000000ff;
     initimg.green_mask = 0;
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     initimg.green_mask = 0x0000ff00;
     initimg.blue_mask = 0;
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     initimg.blue_mask = 0x00ff0000;
     initimg.buffer1 = NULL;
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
     initimg.buffer1 = &pixel;
 
     d3drm_img = NULL;
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
 
     hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     /* Release leaked reference to d3drm1 */
     IDirect3DRM_Release(d3drm1);
 
@@ -2995,24 +2995,24 @@ static void test_Texture(void)
     ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
     IDirect3DRMTexture2_Release(texture2);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
 
     d3drm_img = NULL;
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
-    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
 
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     IDirect3DRM_Release(d3drm1);
 
     d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -3020,11 +3020,11 @@ static void test_Texture(void)
     ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
     IDirect3DRMTexture3_Release(texture3);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref4 = get_refcount((IUnknown *)d3drm3);
-    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+    ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
 
     IDirect3DRM3_Release(d3drm3);
     IDirect3DRM2_Release(d3drm2);
@@ -3046,17 +3046,17 @@ static void test_Device(void)
     GetClientRect(window, &rc);
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     hr = DirectDrawCreateClipper(0, &pClipper, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
 
     hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window);
-    ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
 
     memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
 
     test_class_name((IDirect3DRMObject *)device, "Device");
     test_object_name((IDirect3DRMObject *)device);
@@ -3064,7 +3064,7 @@ static void test_Device(void)
     /* WinDevice */
     if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device)))
     {
-        win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr);
+        win_skip("Cannot get IDirect3DRMWinDevice interface, hr %#lx, skipping tests\n", hr);
         goto cleanup;
     }
 
@@ -3089,13 +3089,13 @@ static void test_frame_transform(void)
     HRESULT hr;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             1.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 1.0f, 0.0f, 0.0f,
@@ -3113,9 +3113,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 2.0f, 0.0f,
             0.0f, 0.0f, 0.0f, 1.0f);
     hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             1.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 1.0f, 0.0f, 0.0f,
@@ -3128,9 +3128,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 2.0f, 0.0f,
             0.0f, 0.0f, 0.0f, 1.0f);
     hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             2.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 2.0f, 0.0f, 0.0f,
@@ -3143,9 +3143,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 2.0f, 0.0f,
             0.0f, 0.0f, 0.0f, 1.0f);
     hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             2.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 2.0f, 0.0f, 0.0f,
@@ -3154,7 +3154,7 @@ static void test_frame_transform(void)
 
     add_matrix[3][3] = 2.0f;
     hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
 
     frame_set_transform(frame,
             2.0f, 0.0f, 0.0f, 0.0f,
@@ -3162,9 +3162,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 2.0f, 0.0f,
             0.0f, 0.0f, 0.0f, 1.0f);
     hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             1.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 1.0f, 0.0f, 0.0f,
@@ -3177,9 +3177,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 2.0f, 0.0f,
             0.0f, 0.0f, 0.0f, 1.0f);
     hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             2.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 2.0f, 0.0f, 0.0f,
@@ -3192,9 +3192,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 2.0f, 0.0f,
             0.0f, 0.0f, 0.0f, 1.0f);
     hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             2.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 2.0f, 0.0f, 0.0f,
@@ -3207,9 +3207,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 1.0f, 0.0f,
             3.0f, 3.0f, 3.0f, 1.0f);
     hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             2.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 2.0f, 0.0f, 0.0f,
@@ -3222,9 +3222,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 1.0f, 0.0f,
             3.0f, 3.0f, 3.0f, 1.0f);
     hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             2.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 2.0f, 0.0f, 0.0f,
@@ -3237,9 +3237,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 1.0f, 0.0f,
             3.0f, 3.0f, 3.0f, 1.0f);
     hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_matrix(matrix,
             2.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 2.0f, 0.0f, 0.0f,
@@ -3252,7 +3252,7 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 1.0f, 0.0f,
             3.0f, 3.0f, 3.0f, 1.0f);
     hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 1.0f, 0.0f, 0.0f, M_PI_2);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
     matrix_sanitise(matrix);
     expect_matrix(matrix,
@@ -3267,9 +3267,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 1.0f, 0.0f,
             3.0f, 3.0f, 3.0f, 1.0f);
     hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_BEFORE, 1.0f, 0.0f, 0.0f, M_PI_2);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     matrix_sanitise(matrix);
     expect_matrix(matrix,
             1.0f,  0.0f, 0.0f, 0.0f,
@@ -3283,9 +3283,9 @@ static void test_frame_transform(void)
             0.0f, 0.0f, 1.0f, 0.0f,
             3.0f, 3.0f, 3.0f, 1.0f);
     hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_AFTER, 1.0f, 0.0f, 0.0f, M_PI_2);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     matrix_sanitise(matrix);
     expect_matrix(matrix,
             1.0f,  0.0f, 0.0f, 0.0f,
@@ -3294,9 +3294,9 @@ static void test_frame_transform(void)
             3.0f, -3.0f, 3.0f, 1.0f, 1);
 
     hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 1.0f, M_PI_2);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     matrix_sanitise(matrix);
     expect_matrix(matrix,
              0.0f, 1.0f, 0.0f, 0.0f,
@@ -3305,9 +3305,9 @@ static void test_frame_transform(void)
              0.0f, 0.0f, 0.0f, 1.0f, 1);
 
     hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 0.0f, M_PI_2);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     hr = IDirect3DRMFrame_GetTransform(frame, matrix);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     matrix_sanitise(matrix);
     expect_matrix(matrix,
             1.0f,  0.0f, 0.0f, 0.0f,
@@ -3321,7 +3321,7 @@ static void test_frame_transform(void)
              0.0f,  0.0f,  8.0f, 0.0f,
             64.0f, 64.0f, 64.0f, 1.0f);
     hr = IDirect3DRM_CreateFrame(d3drm, frame, &subframe);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     frame_set_transform(subframe,
              1.0f,  0.0f,  0.0f, 0.0f,
              0.0f,  1.0f,  0.0f, 0.0f,
@@ -3330,11 +3330,11 @@ static void test_frame_transform(void)
     set_vector(&v1, 3.0f, 5.0f, 7.0f);
 
     hr = IDirect3DRMFrame_Transform(frame, &v2, &v1);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_vector(&v2, 70.0f, 84.0f, 120.0f, 1);
 
     hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1);
-    ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
     expect_vector(&v2, 92.0f, 128.0f, 208.0f, 1);
 
     IDirect3DRMFrame_Release(subframe);
@@ -3367,13 +3367,13 @@ static void test_d3drm_load(void)
     const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial };
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     info.lpMemory = data_d3drm_load;
     info.dSize = strlen(data_d3drm_load);
     hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID **)req_refiids, 3, D3DRMLOAD_FROMMEMORY,
             object_load_callback, (void *)0xdeadbeef, NULL, NULL, NULL);
-    ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot load data, hr %#lx\n", hr);
     ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);
 
     IDirect3DRM_Release(d3drm);
@@ -3391,23 +3391,23 @@ static void __cdecl object_load_callback_frame(IDirect3DRMObject *object, REFIID
     char name[128];
 
     hr = IDirect3DRMObject_QueryInterface(object, &IID_IDirect3DRMFrame, (void**)&frame);
-    ok(hr == D3DRM_OK, "IDirect3DRMObject_QueryInterface returned %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMFrame_GetVisuals(frame, &array);
-    ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetVisuals returned %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
 
     size = IDirect3DRMVisualArray_GetSize(array);
-    ok(size == 1, "Wrong size %u returned, expected 1\n", size);
+    ok(size == 1, "Wrong size %lu returned, expected 1\n", size);
 
     hr = IDirect3DRMVisualArray_GetElement(array, 0, &visual);
-    ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetElement returned %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMVisual_QueryInterface(visual, &IID_IDirect3DRMMeshBuilder, (void**)&mesh_builder);
-    ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetSize returned %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
 
     size = sizeof(name);
     hr = IDirect3DRMMeshBuilder_GetName(mesh_builder, &size, name);
-    ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
     ok(!strcmp(name, "mesh1"), "Wrong name %s, expected mesh1\n", name);
 
     IDirect3DRMVisual_Release(visual);
@@ -3443,18 +3443,18 @@ static void test_frame_mesh_materials(void)
     int i;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
 
     info.lpMemory = data_frame_mesh_materials;
     info.dSize = strlen(data_frame_mesh_materials);
     hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback_frame, (void*)0xdeadbeef, NULL, NULL, NULL);
-    ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMMeshBuilder_CreateMesh(mesh_builder, &mesh);
-    ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_CreateMesh returned %x\n", hr);
+    ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
 
     size = IDirect3DRMMesh_GetGroupCount(mesh);
-    ok(size == 3, "Wrong size %u returned, expected 3\n", size);
+    ok(size == 3, "Unexpected count %lu.\n", size);
 
     for (i = 0; i < size; i++)
     {
@@ -3464,33 +3464,33 @@ static void test_frame_mesh_materials(void)
         DWORD face_data_size;
 
         hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL);
-        ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroup returned %x\n", i, hr);
+        ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
         ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count);
         ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count);
         ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face);
-        ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %d, expected %d\n", i, face_data_size, groups[i].face_data_size);
+        ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %ld, expected %d\n", i, face_data_size, groups[i].face_data_size);
 
         color = IDirect3DRMMesh_GetGroupColor(mesh, i);
-        ok(color == groups[i].color, "Group %d: Wrong color %x, expected %x\n", i, color, groups[i].color);
+        ok(color == groups[i].color, "Group %d: Wrong color %lx, expected %lx.\n", i, color, groups[i].color);
 
         hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material);
-        ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupMaterial returned %x\n", i, hr);
+        ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
         ok(material != NULL, "Group %d: No material\n", i);
         power = IDirect3DRMMaterial_GetPower(material);
         ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power,  groups[i].power);
         hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue);
-        ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetSpecular returned %x\n", i, hr);
+        ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
         ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]);
         ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]);
         ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]);
         hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue);
-        ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetEmissive returned %x\n", i, hr);
+        ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
         ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]);
         ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]);
         ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]);
 
         hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture);
-        ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupTexture returned %x\n", i, hr);
+        ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
         ok(!texture, "Group %d: Unexpected texture\n", i);
 
         if (material)
@@ -3523,13 +3523,13 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
     for (i = 0; i < entry_count; ++i)
     {
         hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1);
-        ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i);
+        ok(hr == tests[i].hr, "Got hr %#lx for test \"%s\" %u.\n", hr, test_name, i);
         if (SUCCEEDED(hr))
         {
             for (j = 0; j < entry_count; ++j)
             {
                 hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2);
-                ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j);
+                ok(hr == tests[j].hr, "Got hr %#lx for test \"%s\" %u, %u.\n", hr, test_name, i, j);
                 if (SUCCEEDED(hr))
                 {
                     expected_refcount = 0;
@@ -3538,7 +3538,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
                     if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid))
                         ++expected_refcount;
                     refcount = IUnknown_Release(iface2);
-                    ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n",
+                    ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, %u, expected %lu.\n",
                                 refcount, test_name, i, j, expected_refcount);
                     if (tests[i].vtable_iid && tests[j].vtable_iid && IsEqualGUID(tests[i].vtable_iid, tests[j].vtable_iid))
                         ok(iface1 == iface2,
@@ -3555,7 +3555,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
             if (IsEqualGUID(refcount_iid, tests[i].refcount_iid))
                 ++expected_refcount;
             refcount = IUnknown_Release(iface1);
-            ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n",
+            ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, expected %lu.\n",
                         refcount, test_name, i, expected_refcount);
         }
     }
@@ -3638,7 +3638,7 @@ static void test_d3drm_qi(void)
     IDirect3DRM *d3drm;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, ARRAY_SIZE(tests));
 
@@ -3727,32 +3727,32 @@ static void test_frame_qi(void)
     IUnknown *unknown;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
 
     hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
-    ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Failed to create frame1, hr %#lx\n", hr);
     hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown);
-    ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1, hr %#lx\n", hr);
     IDirect3DRMFrame_Release(frame1);
     test_qi("frame1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2);
-    ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Failed to create frame2, hr %#lx\n", hr);
     hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown);
-    ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2, hr %#lx\n", hr);
     IDirect3DRMFrame2_Release(frame2);
     test_qi("frame2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
-    ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Failed to create frame3, hr %#lx\n", hr);
     hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown);
-    ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr);
+    ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3, hr %#lx\n", hr);
     IDirect3DRMFrame3_Release(frame3);
     test_qi("frame3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
@@ -3851,37 +3851,37 @@ static void test_device_qi(void)
     window = create_window();
     GetClientRect(window, &rc);
     hr = DirectDrawCreateClipper(0, &clipper, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
-    ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
     memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
     hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice, hr %#lx\n", hr);
     IDirect3DRMDevice_Release(device1);
     test_qi("device1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx\n", hr);
     hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2 (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2, hr %#lx\n", hr);
     IDirect3DRMDevice2_Release(device2);
     test_qi("device2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
     hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3, hr %#lx\n", hr);
     IDirect3DRMDevice3_Release(device3);
     test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
@@ -3930,60 +3930,60 @@ static void test_create_device_from_clipper1(void)
     window = create_window();
     GetClientRect(window, &rc);
     hr = DirectDrawCreateClipper(0, &clipper, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
-    ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
     cref1 = get_refcount((IUnknown *)clipper);
 
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 0, 0, &device1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
     ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
 
     /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, NULL, &driver, 300, 200, &device1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, &device1);
-    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
     cref2 = get_refcount((IUnknown *)clipper);
-    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
     ret_val = IDirect3DRMDevice_GetWidth(device1);
-    ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice_GetHeight(device1);
-    ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
 
     /* Fetch immediate mode device in order to access render target */
     hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
-    ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+    ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
 
     /* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
     hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
-    ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
     IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
     hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     IUnknown_Release(unknown);
     hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &d3drm_primary, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
     hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
-    ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
     ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
 
     IDirectDrawClipper_Release(d3drm_clipper);
@@ -3994,37 +3994,37 @@ static void test_create_device_from_clipper1(void)
     /* Check properties of render target and depth surface */
     surface_desc.dwSize = sizeof(surface_desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+    ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
             surface_desc.dwWidth, surface_desc.dwHeight);
     ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
-            "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+            "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+    ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     desc.dwSize = sizeof(desc);
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
-    ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+    ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
             surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+    ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
             desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
-    ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
-    ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+    ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
 
     /* Release old objects and check refcount of device and clipper */
     IDirectDrawSurface_Release(ds);
@@ -4035,37 +4035,37 @@ static void test_create_device_from_clipper1(void)
     d3ddevice1 = NULL;
     IDirect3DRMDevice_Release(device1);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     cref2 = get_refcount((IUnknown *)clipper);
-    ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+    ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
 
     /* Test if render target format follows the screen format */
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
     hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
-    ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
 
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
-    ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+    ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
-    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     surface_desc.dwSize = sizeof(surface_desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
-    ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+    ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
             surface_desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirectDraw2_RestoreDisplayMode(ddraw);
-    ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
 
     if (ds)
         IDirectDrawSurface_Release(ds);
@@ -4101,66 +4101,66 @@ static void test_create_device_from_clipper2(void)
     window = create_window();
     GetClientRect(window, &rc);
     hr = DirectDrawCreateClipper(0, &clipper, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
-    ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
     cref1 = get_refcount((IUnknown *)clipper);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm2);
 
     hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
 
     /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
     hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, 200, &device2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2);
-    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     cref2 = get_refcount((IUnknown *)clipper);
-    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
     ret_val = IDirect3DRMDevice2_GetWidth(device2);
-    ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice2_GetHeight(device2);
-    ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
 
     /* Fetch immediate mode device in order to access render target */
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
-    ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+    ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
 
     /* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
     hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
-    ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
     IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
     hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     IUnknown_Release(unknown);
     hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &d3drm_primary, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
     hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
-    ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
     ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
 
     IDirectDrawClipper_Release(d3drm_clipper);
@@ -4171,37 +4171,37 @@ static void test_create_device_from_clipper2(void)
     /* Check properties of render target and depth surface */
     surface_desc.dwSize = sizeof(surface_desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+    ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
             surface_desc.dwWidth, surface_desc.dwHeight);
     ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
-            "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+            "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+    ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     desc.dwSize = sizeof(desc);
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
-    ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+    ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
             surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+    ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
             desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
-    ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
-    ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+    ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Expected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
 
     /* Release old objects and check refcount of device and clipper */
     IDirectDrawSurface_Release(ds);
@@ -4212,39 +4212,39 @@ static void test_create_device_from_clipper2(void)
     d3ddevice2 = NULL;
     IDirect3DRMDevice2_Release(device2);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     cref2 = get_refcount((IUnknown *)clipper);
-    ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+    ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
 
     /* Test if render target format follows the screen format */
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
     hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
-    ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
 
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
-    ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+    ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
-    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     surface_desc.dwSize = sizeof(surface_desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
-    ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+    ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
             surface_desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirectDraw2_RestoreDisplayMode(ddraw);
-    ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
 
     IDirectDrawSurface_Release(surface);
     IDirect3DDevice2_Release(d3ddevice2);
@@ -4280,70 +4280,70 @@ static void test_create_device_from_clipper3(void)
     window = create_window();
     GetClientRect(window, &rc);
     hr = DirectDrawCreateClipper(0, &clipper, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
-    ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
     cref1 = get_refcount((IUnknown *)clipper);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm3);
 
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
 
     /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, 200, &device3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3);
-    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     cref2 = get_refcount((IUnknown *)clipper);
-    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+    ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
     ret_val = IDirect3DRMDevice3_GetWidth(device3);
-    ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice3_GetHeight(device3);
-    ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
 
     /* Fetch immediate mode device in order to access render target */
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice3, (void**)&d3ddevice3);
-    ok(hr == S_OK, "got %x.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     IDirect3DDevice3_Release(d3ddevice3);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
-    ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+    ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
 
     /* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
     hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
-    ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
     IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
     hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     IUnknown_Release(unknown);
     hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &d3drm_primary, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
     hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
-    ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
     ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
 
     IDirectDrawClipper_Release(d3drm_clipper);
@@ -4354,37 +4354,37 @@ static void test_create_device_from_clipper3(void)
     /* Check properties of render target and depth surface */
     surface_desc.dwSize = sizeof(surface_desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+    ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
             surface_desc.dwWidth, surface_desc.dwHeight);
     ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
-            "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+            "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+    ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     desc.dwSize = sizeof(desc);
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
-    ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+    ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
             surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+    ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
             desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
-    ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
-    ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+    ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
 
     /* Release old objects and check refcount of device and clipper */
     IDirectDrawSurface_Release(ds);
@@ -4395,39 +4395,39 @@ static void test_create_device_from_clipper3(void)
     d3ddevice2 = NULL;
     IDirect3DRMDevice3_Release(device3);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     cref2 = get_refcount((IUnknown *)clipper);
-    ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+    ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
 
     /* Test if render target format follows the screen format */
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
     hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
-    ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
 
     hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
-    ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
-    ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+    ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+    ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
-    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     surface_desc.dwSize = sizeof(surface_desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
-    ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+    ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
             surface_desc.ddpfPixelFormat.dwRGBBitCount);
 
     hr = IDirectDraw2_RestoreDisplayMode(ddraw);
-    ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
 
     IDirectDrawSurface_Release(surface);
     IDirect3DDevice2_Release(d3ddevice2);
@@ -4457,16 +4457,16 @@ static void test_create_device_from_surface1(void)
     HRESULT hr;
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
 
     window = create_window();
     GetClientRect(window, &rc);
 
     hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     /* Create a surface and use it to create the retained mode device. */
@@ -4478,64 +4478,64 @@ static void test_create_device_from_surface1(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
-    ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+    ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
     ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
     IDirectDrawSurface_Release(surface);
 
     desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
     surface_ref1 = get_refcount((IUnknown *)surface);
 
     hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, NULL, &device1);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
     hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, NULL, surface, &device1);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
     surface_ref2 = get_refcount((IUnknown *)surface);
-    ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+    ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
     ret_val = IDirect3DRMDevice_GetWidth(device1);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice_GetHeight(device1);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     /* Check if CreateDeviceFromSurface creates a primary surface */
     hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &d3drm_surface, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
 
     hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check properties of attached depth surface */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
     use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(ds);
     IDirect3DDevice_Release(d3ddevice1);
@@ -4543,17 +4543,17 @@ static void test_create_device_from_surface1(void)
 
     IDirect3DRMDevice_Release(device1);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     surface_ref2 = get_refcount((IUnknown *)surface);
-    ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+    ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
             surface_ref1, surface_ref2);
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     /*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
     ref1 = IDirectDrawSurface_Release(ds);
-    ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+    ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
     ref1 = IDirectDrawSurface_Release(surface);
-    ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+    ok(!ref1, "Unexpected refcount %lu.\n", ref1);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
@@ -4563,7 +4563,7 @@ static void test_create_device_from_surface1(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
@@ -4573,23 +4573,23 @@ static void test_create_device_from_surface1(void)
     desc.dwWidth = rc.right;
     desc.dwHeight = rc.bottom;
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
-    ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
     hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
-    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice2_GetDirect3DDevice(device1, &d3ddevice1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check if depth surface matches the one we created  */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     IDirectDrawSurface_Release(d3drm_ds);
@@ -4599,12 +4599,12 @@ static void test_create_device_from_surface1(void)
     IDirect3DDevice_Release(d3ddevice1);
     IDirect3DRMDevice_Release(device1);
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     /*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
     ref1 = IDirectDrawSurface_Release(ds);
-    ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+    ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
     ref1 = IDirectDrawSurface_Release(surface);
-    ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+    ok(!ref1, "Unexpected refcount %lu.\n", ref1);
     IDirect3DRM_Release(d3drm1);
     IDirectDraw_Release(ddraw);
     DestroyWindow(window);
@@ -4629,20 +4629,20 @@ static void test_create_device_from_surface2(void)
     HRESULT hr;
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
 
     window = create_window();
     GetClientRect(window, &rc);
 
     hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm2);
 
     /* Create a surface and use it to create the retained mode device. */
@@ -4654,66 +4654,66 @@ static void test_create_device_from_surface2(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
-    ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+    ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
     ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
     IDirectDrawSurface_Release(surface);
 
     desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
     surface_ref1 = get_refcount((IUnknown *)surface);
 
     hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, NULL, &device2);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, NULL, surface, &device2);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     surface_ref2 = get_refcount((IUnknown *)surface);
-    ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+    ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
     ret_val = IDirect3DRMDevice2_GetWidth(device2);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice2_GetHeight(device2);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     /* Check if CreateDeviceFromSurface creates a primary surface */
     hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &d3drm_surface, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
 
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check properties of attached depth surface */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
     use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(ds);
     IDirect3DDevice2_Release(d3ddevice2);
@@ -4721,20 +4721,20 @@ static void test_create_device_from_surface2(void)
 
     IDirect3DRMDevice2_Release(device2);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     surface_ref2 = get_refcount((IUnknown *)surface);
-    ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+    ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
             surface_ref1, surface_ref2);
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     /*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
     ref1 = IDirectDrawSurface_Release(ds);
-    ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+    ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
 
     ref1 = IDirectDrawSurface_Release(surface);
-    ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+    ok(!ref1, "Unexpected refcount %lu.\n", ref1);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
@@ -4744,7 +4744,7 @@ static void test_create_device_from_surface2(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
@@ -4754,23 +4754,23 @@ static void test_create_device_from_surface2(void)
     desc.dwWidth = rc.right;
     desc.dwHeight = rc.bottom;
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
-    ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
     hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
-    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check if depth surface matches the one we created  */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     IDirectDrawSurface_Release(d3drm_ds);
@@ -4780,12 +4780,12 @@ static void test_create_device_from_surface2(void)
     IDirect3DDevice2_Release(d3ddevice2);
     IDirect3DRMDevice2_Release(device2);
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     /*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
     ref1 = IDirectDrawSurface_Release(ds);
-    ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+    ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
     ref1 = IDirectDrawSurface_Release(surface);
-    ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+    ok(!ref1, "Unexpected refcount %lu.\n", ref1);
     IDirect3DRM2_Release(d3drm2);
     IDirect3DRM_Release(d3drm1);
     IDirectDraw_Release(ddraw);
@@ -4811,20 +4811,20 @@ static void test_create_device_from_surface3(void)
     HRESULT hr;
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
 
     window = create_window();
     GetClientRect(window, &rc);
 
     hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm3);
 
     /* Create a surface and use it to create the retained mode device. */
@@ -4836,66 +4836,66 @@ static void test_create_device_from_surface3(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
-    ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+    ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
     ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
     IDirectDrawSurface_Release(surface);
 
     desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
     surface_ref1 = get_refcount((IUnknown *)surface);
 
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, NULL, 0, &device3);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, NULL, surface, 0, &device3);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     surface_ref2 = get_refcount((IUnknown *)surface);
-    ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+    ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
     ret_val = IDirect3DRMDevice3_GetWidth(device3);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice3_GetHeight(device3);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     /* Check if CreateDeviceFromSurface creates a primary surface */
     hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &d3drm_surface, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
 
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check properties of attached depth surface */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
     use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(ds);
     IDirect3DDevice2_Release(d3ddevice2);
@@ -4903,19 +4903,19 @@ static void test_create_device_from_surface3(void)
     IDirect3DRMDevice3_Release(device3);
 
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     surface_ref2 = get_refcount((IUnknown *)surface);
-    ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+    ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
             surface_ref1, surface_ref2);
     /* In version 3, d3drm will destroy all references of the depth surface it created internally. */
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x.\n", hr);
+    todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got hr %#lx.\n", hr);
     if (SUCCEEDED(hr))
         IDirectDrawSurface_Release(ds);
     ref1 = IDirectDrawSurface_Release(surface);
-    ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+    ok(!ref1, "Unexpected refcount %lu.\n", ref1);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
@@ -4925,7 +4925,7 @@ static void test_create_device_from_surface3(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
@@ -4935,23 +4935,23 @@ static void test_create_device_from_surface3(void)
     desc.dwWidth = rc.right;
     desc.dwHeight = rc.bottom;
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
-    ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
     hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
-    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check if depth surface matches the one we created  */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     IDirectDrawSurface_Release(d3drm_ds);
@@ -4960,25 +4960,25 @@ static void test_create_device_from_surface3(void)
     IDirect3DDevice2_Release(d3ddevice2);
     IDirect3DRMDevice3_Release(device3);
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     /* The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
     ref1 = IDirectDrawSurface_Release(ds);
-    ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+    ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
 
     /* What happens if we pass no flags and still attach our own depth surface? */
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check if depth surface matches the one we created  */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     IDirectDrawSurface_Release(d3drm_ds);
@@ -4986,12 +4986,12 @@ static void test_create_device_from_surface3(void)
     IDirect3DDevice2_Release(d3ddevice2);
     IDirect3DRMDevice3_Release(device3);
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     /*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
     ref1 = IDirectDrawSurface_Release(ds);
-    ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+    ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
     ref1 = IDirectDrawSurface_Release(surface);
-    ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+    ok(!ref1, "Unexpected refcount %lu.\n", ref1);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
@@ -5001,28 +5001,28 @@ static void test_create_device_from_surface3(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     /* What happens if we don't pass D3DRMDEVICE_NOZBUFFER and still not attach our own depth surface? */
     hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
-    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
     ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
 
     /* Check if depth surface matches the one we created  */
     hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
-    ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x).\n", hr);
+    ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
     IDirectDrawSurface_Release(d3drm_surface);
 
     IDirect3DDevice2_Release(d3ddevice2);
     IDirect3DRMDevice3_Release(device3);
     ref1 = IDirectDrawSurface_Release(surface);
-    ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+    ok(!ref1, "Unexpected refcount %lu.\n", ref1);
     IDirect3DRM3_Release(d3drm3);
     IDirect3DRM_Release(d3drm1);
     IDirectDraw_Release(ddraw);
@@ -5041,7 +5041,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
 
     GetClientRect(window, &rc);
     hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     memset(&surface_desc, 0, sizeof(surface_desc));
     surface_desc.dwSize = sizeof(surface_desc);
@@ -5051,7 +5051,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
     surface_desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     /* We used to use EnumDevices() for this, but it seems
     * D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual
@@ -5069,7 +5069,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
             continue;
 
         hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
-        ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+        ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
         if (FAILED(hr))
         {
             IDirectDrawSurface_Release(*ds);
@@ -5108,13 +5108,13 @@ static void test_create_device_from_d3d1(void)
     HRESULT hr;
 
     hr = DirectDrawCreate(NULL, &ddraw1, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
 
     window = create_window();
     GetClientRect(window, &rc);
 
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
-    ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
     d3d_ref1 = get_refcount((IUnknown *)d3d1);
 
     /* Create the immediate mode device */
@@ -5129,83 +5129,83 @@ static void test_create_device_from_d3d1(void)
     device_ref1 = get_refcount((IUnknown *)d3ddevice1);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, NULL, d3ddevice1, &device1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
     ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
     hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, NULL, &device1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, &device1);
-    ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface, hr %#lx\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     device_ref2 = get_refcount((IUnknown *)d3ddevice1);
-    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d1);
-    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
     ret_val = IDirect3DRMDevice_GetWidth(device1);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice_GetHeight(device1);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
-    ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
     ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
     IDirect3DRMDevice2_Release(device2);
 
     d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
     hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
-    ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
     IDirect3DRMDevice3_Release(device3);
 
     hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &surface, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
 
     hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
     ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1);
 
     /* Check properties of render target and depth surfaces */
     hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
     ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
-            "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+            "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(d3drm_ds);
     IDirectDrawSurface_Release(ds);
@@ -5213,61 +5213,61 @@ static void test_create_device_from_d3d1(void)
     IDirect3DDevice_Release(d3drm_d3ddevice1);
     IDirect3DRMDevice_Release(device1);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     device_ref2 = get_refcount((IUnknown *)d3ddevice1);
-    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
 
     /* InitFromD3D tests */
     hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice, (void **)&device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice_InitFromD3D(device1, NULL, d3ddevice1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
-    ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface, hr %#lx\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+    ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     device_ref2 = get_refcount((IUnknown *)d3ddevice1);
-    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
             device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d1);
-    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
     ret_val = IDirect3DRMDevice_GetWidth(device1);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice_GetHeight(device1);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3ddevice1);
-    ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+    ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
     ref3 = get_refcount((IUnknown *)d3d1);
-    ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+    ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
     /* Release leaked references */
     while (IDirect3DRM_Release(d3drm1) > ref2);
     while (IDirect3DDevice_Release(d3ddevice1) > device_ref2);
     while (IDirect3D_Release(d3d1) > d3d_ref2);
 
     hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
-    ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     ref4 = get_refcount((IUnknown *)temp_ddraw1);
 
     hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D, (void **)&temp_d3d1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
     temp_d3ddevice1 = create_device1(temp_ddraw1, window, &surface);
     hr = IDirect3DRMDevice_InitFromD3D(device1, temp_d3d1, temp_d3ddevice1);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)temp_d3ddevice1);
-    ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+    ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
     ref3 = get_refcount((IUnknown *)temp_d3d1);
-    todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+    todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
     /* Release leaked references */
     while (IDirect3DRM_Release(d3drm1) > ref2);
     while (IDirect3DDevice_Release(temp_d3ddevice1) > 0);
@@ -5277,61 +5277,60 @@ static void test_create_device_from_d3d1(void)
 
     d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
     hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
-    ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
     ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
     IDirect3DRMDevice2_Release(device2);
 
     d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
     hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
     IDirect3DRMDevice3_Release(device3);
 
     surface = NULL;
     hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &surface, surface_callback);
-    ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
 
     hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
     ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n",
             d3ddevice1, d3drm_d3ddevice1);
 
     /* Check properties of render target and depth surfaces */
     hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
-    ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
-    ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
     ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
-            "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+            "Unexpected caps got %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
-            DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(d3drm_ds);
     IDirectDrawSurface_Release(ds);
@@ -5339,12 +5338,12 @@ static void test_create_device_from_d3d1(void)
     IDirect3DDevice_Release(d3drm_d3ddevice1);
     IDirect3DRMDevice_Release(device1);
     ref2 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+    ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
     device_ref2 = get_refcount((IUnknown *)d3ddevice1);
-    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
             device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d1);
-    todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1,
+    todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1,
             d3d_ref2);
 
     IDirect3DRM_Release(d3drm1);
@@ -5367,7 +5366,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
 
     GetClientRect(window, &rc);
     hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     memset(&surface_desc, 0, sizeof(surface_desc));
     surface_desc.dwSize = sizeof(surface_desc);
@@ -5377,7 +5376,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
     surface_desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
     if (FAILED(hr))
@@ -5403,7 +5402,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
             continue;
 
         hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
-        ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+        ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
         if (FAILED(hr))
         {
             IDirectDrawSurface_Release(*ds);
@@ -5445,15 +5444,15 @@ static void test_create_device_from_d3d2(void)
     HRESULT hr;
 
     hr = DirectDrawCreate(NULL, &ddraw1, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
 
     window = create_window();
     GetClientRect(window, &rc);
 
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
-    ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
-    ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
     d3d_ref1 = get_refcount((IUnknown *)d3d2);
 
     /* Create the immediate mode device */
@@ -5469,74 +5468,74 @@ static void test_create_device_from_d3d2(void)
     device_ref1 = get_refcount((IUnknown *)d3ddevice2);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm2);
 
     hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, NULL, d3ddevice2, &device2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
     ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
     hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, NULL, &device2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
     hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, &device2);
-    ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface, hr %#lx\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d2);
-    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
     ret_val = IDirect3DRMDevice2_GetWidth(device2);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice2_GetHeight(device2);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &surface, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
 
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
     ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
 
     /* Check properties of render target and depth surfaces */
     hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
     ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
-            "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+            "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(d3drm_ds);
     IDirectDrawSurface_Release(ds);
@@ -5544,94 +5543,94 @@ static void test_create_device_from_d3d2(void)
     IDirect3DDevice2_Release(d3drm_d3ddevice2);
     IDirect3DRMDevice2_Release(device2);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d2);
-    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
 
     /* InitFromD3D tests */
     hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2, (void **)&device2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
     if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
     {
         hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, d3ddevice1);
-        ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+        ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
         hr = IDirect3DRMDevice2_InitFromD3D(device2, NULL, d3ddevice1);
-        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
         hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, NULL);
-        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
         hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IDirect3DRMDevice, (void **)&device1);
-        ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+        ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
         hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
-        todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+        todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
         IDirect3DRMDevice_Release(device1);
         if (SUCCEEDED(hr))
         {
             IDirect3DRMDevice_Release(device1);
             hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2,
                     (void **)&device2);
-            ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+            ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
         }
     }
     IDirect3D_Release(d3d1);
     IDirect3DDevice_Release(d3ddevice1);
 
     hr = IDirect3DRMDevice2_InitFromD3D2(device2, NULL, d3ddevice2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
-    ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
             device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d2);
-    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
     ret_val = IDirect3DRMDevice2_GetWidth(device2);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice2_GetHeight(device2);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3ddevice2);
-    ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+    ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
     ref3 = get_refcount((IUnknown *)d3d2);
-    ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+    ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
     /* Release leaked references */
     while (IDirect3DRM_Release(d3drm1) > ref4);
     while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
     while (IDirect3D2_Release(d3d2) > d3d_ref2);
 
     hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
-    ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
     ref5 = get_refcount((IUnknown *)temp_d3d2);
 
     hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
-    ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
 
     temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
     hr = IDirect3DRMDevice2_InitFromD3D2(device2, temp_d3d2, temp_d3ddevice2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+    ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
     ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
-    ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+    ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
     ref3 = get_refcount((IUnknown *)temp_d3d2);
-    ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+    ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
     /* Release leaked references */
     while (IDirect3DRM_Release(d3drm1) > ref4);
     while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5643,44 +5642,43 @@ static void test_create_device_from_d3d2(void)
     surface = NULL;
     hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &surface, surface_callback);
-    ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
 
     hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
     ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
             d3drm_d3ddevice2);
 
     /* Check properties of render target and depth surfaces */
     hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
-    ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
-    ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
     ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
-            "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+            "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
-            DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(d3drm_ds);
     IDirectDrawSurface_Release(ds);
@@ -5688,14 +5686,14 @@ static void test_create_device_from_d3d2(void)
     IDirect3DDevice2_Release(d3drm_d3ddevice2);
     IDirect3DRMDevice2_Release(device2);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm2);
-    ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
             device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d2);
-    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
 
     IDirect3DRM2_Release(d3drm2);
     IDirect3DRM_Release(d3drm1);
@@ -5728,15 +5726,15 @@ static void test_create_device_from_d3d3(void)
     HRESULT hr;
 
     hr = DirectDrawCreate(NULL, &ddraw1, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
 
     window = create_window();
     GetClientRect(window, &rc);
 
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
-    ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
-    ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
     d3d_ref1 = get_refcount((IUnknown *)d3d2);
 
     /* Create the immediate mode device */
@@ -5752,72 +5750,72 @@ static void test_create_device_from_d3d3(void)
     device_ref1 = get_refcount((IUnknown *)d3ddevice2);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     ref2 = get_refcount((IUnknown *)d3drm3);
 
     hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, NULL, d3ddevice2, &device3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
     ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
     hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, NULL, &device3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, &device3);
-    ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+    ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface, hr %#lx\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
     ret_val = IDirect3DRMDevice3_GetWidth(device3);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice3_GetHeight(device3);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &surface, surface_callback);
-    ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
 
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
     ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
 
     /* Check properties of render target and depth surfaces */
     hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
-    ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
-    ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
     ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
-            "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+            "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(d3drm_ds);
     IDirectDrawSurface_Release(ds);
@@ -5825,94 +5823,94 @@ static void test_create_device_from_d3d3(void)
     IDirect3DDevice2_Release(d3drm_d3ddevice2);
     IDirect3DRMDevice3_Release(device3);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d2);
-    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
 
     /* InitFromD3D tests */
     hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3, (void **)&device3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
 
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
     if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
     {
         hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, d3ddevice1);
-        ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+        ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
         hr = IDirect3DRMDevice3_InitFromD3D(device3, NULL, d3ddevice1);
-        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
         hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, NULL);
-        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+        ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
         hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
-        ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+        ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
         hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
-        todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+        todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
         IDirect3DRMDevice_Release(device1);
         if (SUCCEEDED(hr))
         {
             IDirect3DRMDevice_Release(device1);
             hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3,
                     (void **)&device3);
-            ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+            ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
         }
     }
     IDirect3D_Release(d3d1);
     IDirect3DDevice_Release(d3ddevice1);
 
     hr = IDirect3DRMDevice3_InitFromD3D2(device3, NULL, d3ddevice2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
-    ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
     ref4 = get_refcount((IUnknown *)d3drm1);
-    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+    ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+    ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
             device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d2);
-    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
     ret_val = IDirect3DRMDevice3_GetWidth(device3);
-    ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+    ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
     ret_val = IDirect3DRMDevice3_GetHeight(device3);
-    ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+    ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
 
     hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+    ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3ddevice2);
-    ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+    ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
     ref3 = get_refcount((IUnknown *)d3d2);
-    ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+    ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
     /* Release leaked references */
     while (IDirect3DRM_Release(d3drm1) > ref4);
     while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
     while (IDirect3D2_Release(d3d2) > d3d_ref2);
 
     hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
-    ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
     hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
     ref5 = get_refcount((IUnknown *)temp_d3d2);
 
     hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
-    ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
 
     temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
     hr = IDirect3DRMDevice3_InitFromD3D2(device3, temp_d3d2, temp_d3ddevice2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+    ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
     ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
-    ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+    ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
     ref3 = get_refcount((IUnknown *)temp_d3d2);
-    ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+    ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
     /* Release leaked references */
     while (IDirect3DRM_Release(d3drm1) > ref4);
     while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5924,44 +5922,43 @@ static void test_create_device_from_d3d3(void)
     surface = NULL;
     hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
             NULL, &surface, surface_callback);
-    ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
     ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
 
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
     ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
             d3drm_d3ddevice2);
 
     /* Check properties of render target and depth surfaces */
     hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
-    ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     memset(&desc, 0, sizeof(desc));
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
-    ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
     ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
-            "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+            "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
     expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
     ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
 
     desc.dwSize = sizeof(desc);
     hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
-    ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
 
-    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+    ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
             rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
-    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %#x.\n",
-            DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+    ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n",desc.ddsCaps.dwCaps);
     expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
-    ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+    ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
 
     IDirectDrawSurface_Release(d3drm_ds);
     IDirectDrawSurface_Release(ds);
@@ -5969,14 +5966,14 @@ static void test_create_device_from_d3d3(void)
     IDirect3DDevice2_Release(d3drm_d3ddevice2);
     IDirect3DRMDevice3_Release(device3);
     ref3 = get_refcount((IUnknown *)d3drm1);
-    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+    ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
     ref3 = get_refcount((IUnknown *)d3drm3);
-    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+    ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
     device_ref2 = get_refcount((IUnknown *)d3ddevice2);
-    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+    ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
             device_ref1, device_ref2);
     d3d_ref2 = get_refcount((IUnknown *)d3d2);
-    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+    ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
 
     IDirect3DRM3_Release(d3drm3);
     IDirect3DRM_Release(d3drm1);
@@ -5994,13 +5991,13 @@ static void test_create_device_1(void)
     HRESULT hr;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, &device);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got hr %#lx.\n", hr);
     ok(device == NULL, "Expected device returned == NULL, got %p.\n", device);
     hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     IDirect3DRM_Release(d3drm);
 }
@@ -6013,15 +6010,15 @@ static void test_create_device_2(void)
     HRESULT hr;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, &device2);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
     ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
     hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     IDirect3DRM2_Release(d3drm2);
     IDirect3DRM_Release(d3drm);
@@ -6035,15 +6032,15 @@ static void test_create_device_3(void)
     HRESULT hr;
 
     hr = Direct3DRMCreate(&d3drm);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
     hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, &device3);
-    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
     ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
     hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
 
     IDirect3DRM3_Release(d3drm3);
     IDirect3DRM_Release(d3drm);
@@ -6144,10 +6141,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
         ok(img->rgb == TRUE, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
         ok(img->bytes_per_line == w * 4, "Test %u: Got unexpected image bytes per line %u, expected %u.\n",
                 test_idx, img->bytes_per_line, w * 4);
-        ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
-        ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
-        ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
-        ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+        ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+        ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+        ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+        ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
         ok(!img->palette_size, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size);
         ok(!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
         for (i = 0; i < h; ++i)
@@ -6171,10 +6168,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
 
     ok(img->depth == 8, "Test %u: Got unexpected image depth %u.\n", test_idx, img->depth);
     ok(!img->rgb, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
-    ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
-    ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
-    ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
-    ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+    ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+    ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+    ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+    ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
     ok(!!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
     if (!palettized)
     {
@@ -6270,58 +6267,58 @@ static void test_load_texture(void)
     };
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#x.\n", hr);
+    ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#lx.\n", hr);
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#lx.\n", hr);
     ref1 = get_refcount((IUnknown *)d3drm1);
 
     /* Test all failures together. */
     texture1 = (IDirect3DRMTexture *)0xdeadbeef;
     hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
     ok(!texture1, "Got unexpected texture %p.\n", texture1);
     texture1 = (IDirect3DRMTexture *)0xdeadbeef;
     hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1);
-    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
     ok(!texture1, "Got unexpected texture %p.\n", texture1);
     hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
 
     texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
     hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2);
-    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
     ok(!texture2, "Got unexpected texture %p.\n", texture2);
     texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
     hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2);
-    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
     ok(!texture2, "Got unexpected texture %p.\n", texture2);
     hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
 
     texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
     hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3);
-    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
     ok(!texture3, "Got unexpected texture %p.\n", texture3);
     texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
     hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3);
-    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
     ok(!texture3, "Got unexpected texture %p.\n", texture3);
     hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
 
     for (i = 0; i < ARRAY_SIZE(tests); ++i)
     {
         filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized);
 
         hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
-        ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
         ref2 = get_refcount((IUnknown *)d3drm1);
-        ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+        ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
 
         hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         /* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */
         IDirect3DRM_Release(d3drm1);
         d3drm_img = IDirect3DRMTexture_GetImage(texture1);
@@ -6329,56 +6326,56 @@ static void test_load_texture(void)
         test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
         IDirect3DRMTexture_Release(texture1);
         ref2 = get_refcount((IUnknown *)d3drm1);
-        ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+        ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
         hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture,
                 NULL, &IID_IDirect3DRMTexture, (void **)&texture1);
-        ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture_InitFromFile(texture1, NULL);
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture_InitFromFile(texture1, "");
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
-        ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
         d3drm_img = IDirect3DRMTexture_GetImage(texture1);
         ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
         test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
         IDirect3DRMTexture_Release(texture1);
 
         hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
-        ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
         ref2 = get_refcount((IUnknown *)d3drm1);
-        ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+        ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
 
         hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         IDirect3DRM_Release(d3drm1);
         d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
         ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
         test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
         IDirect3DRMTexture2_Release(texture2);
         ref2 = get_refcount((IUnknown *)d3drm1);
-        ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+        ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
         hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture,
                 NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);
-        ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL);
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture2_InitFromFile(texture2, "");
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
-        ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
         d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
         ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
         test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
         IDirect3DRMTexture2_Release(texture2);
 
         hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
-        ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
         ref2 = get_refcount((IUnknown *)d3drm1);
-        ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+        ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
 
         hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         IDirect3DRM_Release(d3drm1);
         d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
         ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
@@ -6386,24 +6383,24 @@ static void test_load_texture(void)
         /* Test whether querying a version 1 texture from version 3 causes a
          * change in the loading behavior. */
         hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1);
-        ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr);
+        ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#lx.\n", hr);
         d3drm_img = IDirect3DRMTexture_GetImage(texture1);
         ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
         test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
         IDirect3DRMTexture_Release(texture1);
         IDirect3DRMTexture3_Release(texture3);
         ref2 = get_refcount((IUnknown *)d3drm1);
-        ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+        ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
 
         hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture,
                 NULL, &IID_IDirect3DRMTexture3, (void **)&texture3);
-        ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL);
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture3_InitFromFile(texture3, "");
-        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
         hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
-        ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+        ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#lx.\n", i, hr);
         d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
         ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
         test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
@@ -6504,34 +6501,34 @@ static void test_texture_qi(void)
     BOOL check;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
     filename = create_bitmap(1, 1, TRUE);
     hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
-    ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
     hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture, hr %#lx\n", hr);
     IDirect3DRMTexture_Release(texture1);
     test_qi("texture1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
-    ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
     hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2, hr %#lx\n", hr);
     IDirect3DRMTexture2_Release(texture2);
     test_qi("texture2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
-    ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
     hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3, hr %#lx\n", hr);
     IDirect3DRMTexture3_Release(texture3);
     test_qi("texture3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
@@ -6540,7 +6537,7 @@ static void test_texture_qi(void)
     IDirect3DRM2_Release(d3drm2);
     IDirect3DRM_Release(d3drm1);
     check = DeleteFileA(filename);
-    ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError());
+    ok(check, "Cannot delete image stored in %s (error = %ld).\n", filename, GetLastError());
     HeapFree(GetProcessHeap(), 0, filename);
 }
 
@@ -6633,31 +6630,31 @@ static void test_viewport_qi(void)
     };
 
     hr = DirectDrawCreateClipper(0, &clipper, NULL);
-    ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 640, 480, &device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
     hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
     hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, 640, 480, &viewport1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
     hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
     IDirect3DRMViewport_Release(viewport1);
     test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM2_CreateViewport(d3drm2, device1, camera1, 0, 0, 640, 480, &viewport1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
     hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
     IDirect3DRMViewport_Release(viewport1);
     test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
@@ -6666,17 +6663,17 @@ static void test_viewport_qi(void)
     IDirect3DRMFrame_Release(frame1);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 640, 480, &device3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
     hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, 640, 480, &viewport2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
     hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
     IDirect3DRMViewport_Release(viewport2);
     test_qi("viewport2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
@@ -6701,14 +6698,14 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y)
     surface_desc.dwSize = sizeof(surface_desc);
 
     hr = IDirectDrawSurface_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL);
-    ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to lock surface, hr %#lx.\n", hr);
     if (FAILED(hr))
         return 0xdeadbeef;
 
     color = *((DWORD *)surface_desc.lpSurface) & 0x00ffffff;
 
     hr = IDirectDrawSurface_Unlock(surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#lx.\n", hr);
 
     return color;
 }
@@ -6724,7 +6721,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
 
     GetClientRect(window, &rc);
     hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     memset(&surface_desc, 0, sizeof(surface_desc));
     surface_desc.dwSize = sizeof(surface_desc);
@@ -6734,7 +6731,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
     surface_desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
     if (FAILED(hr))
@@ -6760,7 +6757,7 @@ static void clear_depth_surface(IDirectDrawSurface *surface, DWORD value)
     U5(fx).dwFillDepth = value;
 
     hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx);
-    ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
 }
 
 static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex_count, UINT offset, UINT len)
@@ -6774,7 +6771,7 @@ static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex
     exec_data.dwInstructionOffset = offset;
     exec_data.dwInstructionLength = len;
     hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data);
-    ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set execute data, hr %#lx.\n", hr);
 }
 
 static void emit_set_ts(void **ptr, D3DTRANSFORMSTATETYPE state, DWORD value)
@@ -6884,17 +6881,17 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
     };
 
     hr = IDirect3DDevice_CreateMatrix(device, &world_handle);
-    ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+    ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
     hr = IDirect3DDevice_SetMatrix(device, world_handle, &mat);
-    ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+    ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
     hr = IDirect3DDevice_CreateMatrix(device, &view_handle);
-    ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+    ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
     hr = IDirect3DDevice_SetMatrix(device, view_handle, &mat);
-    ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+    ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
     hr = IDirect3DDevice_CreateMatrix(device, &proj_handle);
-    ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+    ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
     hr = IDirect3DDevice_SetMatrix(device, proj_handle, &mat);
-    ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+    ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
 
     memset(&exec_desc, 0, sizeof(exec_desc));
     exec_desc.dwSize = sizeof(exec_desc);
@@ -6903,10 +6900,10 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
     exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY;
 
     hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL);
-    ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#lx.\n", hr);
 
     hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc);
-    ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#lx.\n", hr);
 
     memcpy(exec_desc.lpData, quad_strip, sizeof(quad_strip));
     ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad_strip);
@@ -6927,14 +6924,14 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
     inst_length -= sizeof(quad_strip);
 
     hr = IDirect3DExecuteBuffer_Unlock(execute_buffer);
-    ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice_BeginScene(device);
     set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length);
     hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED);
-    ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#lx.\n", hr);
     hr = IDirect3DDevice_EndScene(device);
-    ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
 
     IDirect3DExecuteBuffer_Release(execute_buffer);
 }
@@ -6961,87 +6958,87 @@ static void test_viewport_clear1(void)
     GetClientRect(window, &rc);
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
 
     hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     hr = IDirectDraw_CreateClipper(ddraw, 0, &clipper, NULL);
-    ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
 
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
-    ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %#x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
 
     hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
     hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
 
     hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, rc.right,
             rc.bottom, &viewport1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
 
     /* Fetch immediate mode device and viewport */
     hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3d_device1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_GetDirect3DViewport(viewport1, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice_QueryInterface(d3d_device1, &IID_IDirectDrawSurface, (void **)&surface);
-    ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* Clear uses the scene frame's background color. */
     hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 1.0f, 1.0f, 1.0f);
-    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
     ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
-    ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+    ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
     hr = IDirect3DRMFrame_SetSceneBackgroundRGB(camera1, 0.0f, 1.0f, 0.0f);
-    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
     ret_color = IDirect3DRMFrame_GetSceneBackground(camera1);
-    ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+    ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
 
     CHECK_REFCOUNT(frame1, 1);
     hr = IDirect3DRMViewport_Clear(viewport1);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
     CHECK_REFCOUNT(frame1, 1);
 
     hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f);
-    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
     ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
-    ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+    ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
 
     hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_Clear(viewport1);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 100, 200);
-    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     d3d_draw_quad1(d3d_device1, d3d_viewport);
 
     ret_color = get_surface_color(surface, 100, 200);
-    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_Clear(viewport1);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 100, 200);
-    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* Fill the depth surface with a value lower than the quad's depth value. */
     clear_depth_surface(ds, 0x7fff);
@@ -7049,38 +7046,38 @@ static void test_viewport_clear1(void)
     /* Depth test passes here */
     d3d_draw_quad1(d3d_device1, d3d_viewport);
     ret_color = get_surface_color(surface, 100, 200);
-    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
     /* Depth test fails here */
     ret_color = get_surface_color(surface, 500, 400);
-    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* Check what happens if we release the depth surface that d3drm created, and clear the viewport */
     hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
-    ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
     d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+    ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
     ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
 
     clear_depth_surface(ds, 0x7fff);
     hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport_Clear(viewport1);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
 
     ret_color = get_surface_color(surface, 100, 200);
-    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
-    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
     IDirectDrawSurface_Release(ds);
 
     d3d_draw_quad1(d3d_device1, d3d_viewport);
 
     ret_color = get_surface_color(surface, 100, 200);
-    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
     ret_color = get_surface_color(surface, 500, 400);
-    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     IDirect3DViewport_Release(d3d_viewport);
     IDirectDrawSurface_Release(surface);
@@ -7115,29 +7112,29 @@ static void draw_quad2(IDirect3DDevice2 *device, IDirect3DViewport *viewport)
     HRESULT hr;
 
     hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat);
-    ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set world transform, hr %#lx.\n", hr);
     hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat);
-    ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set view transform, hr %#lx.\n", hr);
     hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat);
-    ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#lx.\n", hr);
 
     hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface, hr %#lx.\n", hr);
     hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2);
-    ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#lx.\n", hr);
     IDirect3DViewport2_Release(viewport2);
 
     hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE);
-    ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#lx.\n", hr);
     hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL);
-    ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set the z function, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_BeginScene(device);
-    ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr);
     hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, tquad, 4, 0);
-    ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr);
     hr = IDirect3DDevice2_EndScene(device);
-    ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
 }
 
 static void test_viewport_clear2(void)
@@ -7165,156 +7162,156 @@ static void test_viewport_clear2(void)
     GetClientRect(window, &rc);
 
     hr = DirectDrawCreate(NULL, &ddraw1, NULL);
-    ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
 
     hr = IDirectDraw_SetCooperativeLevel(ddraw1, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     hr = IDirectDraw_CreateClipper(ddraw1, 0, &clipper, NULL);
-    ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
 
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
-    ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface (hr = %#x)\n", hr);
+    ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
             rc.bottom, &viewport2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
 
     /* Fetch immediate mode device in order to access render target and test its color. */
     hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3d_device2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
-    ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* Clear uses the scene frame's background color. */
     hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
-    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
     ret_color = IDirect3DRMFrame3_GetSceneBackground(frame3);
-    ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+    ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
     hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(camera3, 0.0f, 1.0f, 0.0f);
-    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
     ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3);
-    ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+    ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
 
     CHECK_REFCOUNT(frame3, 1);
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
     CHECK_REFCOUNT(frame3, 1);
 
     hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
 
     /* d3drm seems to be calling BeginScene when Clear is called. */
     hr = IDirect3DDevice2_BeginScene(d3d_device2);
-    todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#x.\n", hr);
+    todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#lx.\n", hr);
     hr = IDirect3DDevice2_EndScene(d3d_device2);
-    ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
 
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* We're using d3d to draw using IDirect3DDevice2 created from d3drm. */
     draw_quad2(d3d_device2, d3d_viewport);
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* Without calling Configure, Clear doesn't work. */
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
 
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* Fetch attached depth surface and see if viewport clears it if it's detached from the render target. */
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
-    ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
 
     clear_depth_surface(ds, 0x39);
     draw_quad2(d3d_device2, d3d_viewport);
 
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
-    ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
     d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
     hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
-    ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+    ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
     ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
 
     clear_depth_surface(ds, 0x7fff);
 
     /* This version of Clear still clears the depth surface even if it's deleted from the render target. */
     hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
 
     hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
-    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     draw_quad2(d3d_device2, d3d_viewport);
     ret_color = get_surface_color(surface, 100, 200);
-    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
     ret_color = get_surface_color(surface, 500, 400);
-    todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     /* Remove old draw contents */
     hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 0.0f, 1.0f, 0.0f);
-    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
-    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
 
     /* Clear with no flags */
     hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Clear(viewport2, 0);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
-    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     IDirect3DViewport_Release(d3d_viewport);
     IDirectDrawSurface_Release(surface);
@@ -7325,28 +7322,28 @@ static void test_viewport_clear2(void)
 
     /* Create device without depth surface attached */
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
-    ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
     hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
     d3d_device2 = create_device2_without_ds(ddraw2, window);
     if (!d3d_device2)
         goto cleanup;
 
     hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3d_device2, &device3);
-    ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface, hr %#lx.\n", hr);
     hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
             rc.bottom, &viewport2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
     hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
-    ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
 
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
 
     hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ZBUFFER);
-    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
 
     IDirectDrawSurface_Release(surface);
     IDirect3DRMViewport2_Release(viewport2);
@@ -7389,22 +7386,22 @@ static void test_create_texture_from_surface(void)
     RECT rc;
 
     hr = DirectDrawCreate(NULL, &ddraw, NULL);
-    ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+    ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
 
     window = create_window();
     GetClientRect(window, &rc);
 
     hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
 
     /* Create a surface and use it to create a texture. */
     memset(&desc, 0, sizeof(desc));
@@ -7415,82 +7412,82 @@ static void test_create_texture_from_surface(void)
     desc.dwHeight = rc.bottom;
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL);
-    ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
 
     /* Test NULL params */
     texture1 = (IDirect3DRMTexture *)0xdeadbeef;
     hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
     ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
 
     hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
 
     texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
     hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
     ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
 
     hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
 
     texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
     hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
     ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
 
     hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
 
     ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
     hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1);
-    ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
 
     ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
     image = IDirect3DRMTexture_GetImage(texture1);
     ok(image == NULL, "Unexpected image, %p.\n", image);
     hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
     IDirect3DRMTexture_Release(texture1);
 
     ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
     hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2);
-    ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
     ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
     image = IDirect3DRMTexture2_GetImage(texture2);
     ok(image == NULL, "Unexpected image, %p.\n", image);
     hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
     IDirect3DRMTexture_Release(texture2);
 
     ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
     hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3);
-    ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
     ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
     image = IDirect3DRMTexture3_GetImage(texture3);
     ok(image == NULL, "Unexpected image, %p.\n", image);
     hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
     hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
     hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
-    ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
     ok(ds == surface, "Expected same surface back.\n");
     IDirectDrawSurface_Release(ds);
 
     /* Init already initialized texture with same surface. */
     hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
 
     /* Init already initialized texture with different surface. */
     hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
 
     hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
-    ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
     ok(ds == surface, "Expected same surface back.\n");
     IDirectDrawSurface_Release(ds);
 
@@ -7498,7 +7495,7 @@ static void test_create_texture_from_surface(void)
     ref2 = get_refcount((IUnknown *)d3drm2);
     ref3 = get_refcount((IUnknown *)d3drm3);
     hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
     ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
     ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
     ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7509,13 +7506,13 @@ static void test_create_texture_from_surface(void)
 
     /* Create from image, initialize from surface. */
     hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
-    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
 
     ref1 = get_refcount((IUnknown *)d3drm1);
     ref2 = get_refcount((IUnknown *)d3drm2);
     ref3 = get_refcount((IUnknown *)d3drm3);
     hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
-    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
     ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
     ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
     ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7548,27 +7545,27 @@ static void test_animation(void)
     D3DVECTOR v;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr 0x%08x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateAnimation(d3drm1, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr 0x%08x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     CHECK_REFCOUNT(d3drm1, 1);
     hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
-    ok(SUCCEEDED(hr), "Failed to create animation hr 0x%08x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
     CHECK_REFCOUNT(d3drm1, 2);
 
     test_class_name((IDirect3DRMObject *)animation, "Animation");
 
     hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMAnimation2, (void **)&animation2);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr 0x%08x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr %#lx.\n", hr);
     ok(animation != (void *)animation2, "Expected different interface pointer.\n");
 
     hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMObject, (void **)&obj);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IDirect3DRMObject, (void **)&obj2);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
 
     ok(obj == obj2 && obj == (IDirect3DRMObject *)animation, "Unexpected object pointer.\n");
 
@@ -7577,35 +7574,35 @@ static void test_animation(void)
 
     /* Set animated frame, get it back. */
     hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
-    ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create a frame, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
-    ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
 
     CHECK_REFCOUNT(frame, 1);
     hr = IDirect3DRMAnimation_SetFrame(animation, frame);
-    ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
     CHECK_REFCOUNT(frame, 1);
 
     hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3);
-    ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get the frame, hr %#lx.\n", hr);
     ok(frame3 != (void *)frame, "Unexpected interface pointer.\n");
     CHECK_REFCOUNT(frame, 2);
 
     IDirect3DRMFrame3_Release(frame3);
 
     hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
-    ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
 
     hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#lx.\n", hr);
 
     CHECK_REFCOUNT(frame3, 2);
     hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3);
-    ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
     CHECK_REFCOUNT(frame3, 2);
 
     IDirect3DRMFrame3_Release(frame3);
@@ -7614,70 +7611,70 @@ static void test_animation(void)
     /* Animation options. */
     options = IDirect3DRMAnimation_GetOptions(animation);
     ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
-            "Unexpected default options %#x.\n", options);
+            "Unexpected default options %#lx.\n", options);
 
     /* Undefined mask value */
     hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     options = IDirect3DRMAnimation_GetOptions(animation);
     ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
-            "Unexpected default options %#x.\n", options);
+            "Unexpected default options %#lx.\n", options);
 
     /* Ambiguous mask */
     hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     options = IDirect3DRMAnimation_GetOptions(animation);
     ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
-            "Unexpected default options %#x.\n", options);
+            "Unexpected default options %#lx.\n", options);
 
     /* Mask contains undefined bits together with valid one. */
     hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000 | D3DRMANIMATION_OPEN);
-    ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
 
     options = IDirect3DRMAnimation_GetOptions(animation);
-    ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#x.\n", options);
+    ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#lx.\n", options);
 
     hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION);
-    ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
 
     options = IDirect3DRMAnimation_GetOptions(animation);
-    ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#x.\n", options);
+    ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#lx.\n", options);
 
     hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN);
-    ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
 
     options = IDirect3DRMAnimation_GetOptions(animation);
-    ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+    ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
 
     hr = IDirect3DRMAnimation_SetOptions(animation, 0);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     options = IDirect3DRMAnimation_GetOptions(animation);
-    ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+    ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
 
     /* Key management. */
     hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 1.0f, 0.0f, 0.0f);
-    ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
-    ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 2.0f, 0.0f, 0.0f);
-    ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_AddPositionKey(animation, 99.0f, 3.0f, 1.0f, 0.0f);
-    ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_AddPositionKey(animation, 80.0f, 4.0f, 1.0f, 0.0f);
-    ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
 
     v.x = 1.0f;
     v.y = 0.0f;
@@ -7686,20 +7683,20 @@ static void test_animation(void)
 
     /* NULL quaternion pointer leads to a crash on Windows. */
     hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
-    ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
 
     count = 0;
     memset(keys, 0, sizeof(keys));
     hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 99.0f, &count, keys);
-    ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
-    ok(count == 6, "Unexpected key count %u.\n", count);
+    ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+    ok(count == 6, "Unexpected key count %lu.\n", count);
 
-    ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
-    ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
-    ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
-    ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
-    ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
-    ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+    ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+    ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+    ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+    ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+    ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+    ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
 
     /* Relative order, keys are returned sorted by time. */
     ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7715,23 +7712,23 @@ static void test_animation(void)
 
     for (i = 0; i < count; i++)
     {
-        ok(keys[i].dwSize == sizeof(*keys), "%u: unexpected dwSize value %u.\n", i, keys[i].dwSize);
+        ok(keys[i].dwSize == sizeof(*keys), "%lu: unexpected dwSize value %lu.\n", i, keys[i].dwSize);
 
     todo_wine
     {
         switch (keys[i].dwKeyType)
         {
         case D3DRMANIMATION_ROTATEKEY:
-            ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+            ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
             break;
         case D3DRMANIMATION_POSITIONKEY:
-            ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+            ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
             break;
         case D3DRMANIMATION_SCALEKEY:
-            ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+            ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
             break;
         default:
-            ok(0, "%u: unknown key type %d.\n", i, keys[i].dwKeyType);
+            ok(0, "%lu: unknown key type %ld.\n", i, keys[i].dwKeyType);
         }
     }
     }
@@ -7739,86 +7736,86 @@ static void test_animation(void)
     /* No keys in this range. */
     count = 10;
     hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, NULL);
-    ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
-    ok(count == 0, "Unexpected key count %u.\n", count);
+    ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+    ok(count == 0, "Unexpected key count %lu.\n", count);
 
     count = 10;
     hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, keys);
-    ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
-    ok(count == 0, "Unexpected key count %u.\n", count);
+    ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+    ok(count == 0, "Unexpected key count %lu.\n", count);
 
     count = 10;
     hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 0.0f, &count, NULL);
-    ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
-    ok(count == 4, "Unexpected key count %u.\n", count);
+    ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+    ok(count == 4, "Unexpected key count %lu.\n", count);
 
     hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     /* Time is 0-based. */
     hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, NULL, NULL);
-    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+    ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
 
     count = 10;
     hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, &count, NULL);
-    ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
-    ok(count == 0, "Unexpected key count %u.\n", count);
+    ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+    ok(count == 0, "Unexpected key count %lu.\n", count);
 
     count = 10;
     hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, 100.0f, &count, NULL);
-    ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
-    ok(count == 6, "Unexpected key count %u.\n", count);
+    ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+    ok(count == 6, "Unexpected key count %lu.\n", count);
 
     /* AddKey() tests. */
     hr = IDirect3DRMAnimation2_AddKey(animation2, NULL);
-    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     memset(&key, 0, sizeof(key));
     key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
     hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
-    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     memset(&key, 0, sizeof(key));
     key.dwSize = sizeof(key) - 1;
     key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
     hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
-    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     memset(&key, 0, sizeof(key));
     key.dwSize = sizeof(key) + 1;
     key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
     hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
-    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 
     memset(&key, 0, sizeof(key));
     key.dwSize = sizeof(key);
     key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
     key.dvPositionKey.x = 8.0f;
     hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
-    ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add key, hr %#lx.\n", hr);
 
     /* Delete tests. */
     hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
-    ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
-    ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
 
     count = 0;
     memset(keys, 0, sizeof(keys));
     hr = IDirect3DRMAnimation2_GetKeys(animation2, -1000.0f, 1000.0f, &count, keys);
-    ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
-    ok(count == 9, "Unexpected key count %u.\n", count);
-
-    ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
-    ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
-    ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
-    ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
-    ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
-    ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
-    ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[6].dwKeyType);
-    ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[7].dwKeyType);
-    ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[8].dwKeyType);
+    ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+    ok(count == 9, "Unexpected key count %lu.\n", count);
+
+    ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+    ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+    ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+    ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+    ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+    ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
+    ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[6].dwKeyType);
+    ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[7].dwKeyType);
+    ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[8].dwKeyType);
 
     ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
     ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7831,27 +7828,27 @@ static void test_animation(void)
     ok(keys[8].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[8].dvTime);
 
     hr = IDirect3DRMAnimation_DeleteKey(animation, -100.0f);
-    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_DeleteKey(animation, 100.0f);
-    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
 
     /* Only first Position keys are not removed. */
     hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
-    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
 
     count = 0;
     memset(keys, 0, sizeof(keys));
     hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, keys);
-    ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
-    ok(count == 6, "Unexpected key count %u.\n", count);
+    ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+    ok(count == 6, "Unexpected key count %lu.\n", count);
 
-    ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
-    ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
-    ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
-    ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
-    ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
-    ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+    ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+    ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+    ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+    ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+    ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+    ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
 
     ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
     ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7861,12 +7858,12 @@ static void test_animation(void)
     ok(keys[5].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[5].dvTime);
 
     hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
-    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
 
     count = 0;
     hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, NULL);
-    ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
-    ok(count == 3, "Unexpected key count %u.\n", count);
+    ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+    ok(count == 3, "Unexpected key count %lu.\n", count);
 
     IDirect3DRMAnimation2_Release(animation2);
     IDirect3DRMAnimation_Release(animation);
@@ -7950,26 +7947,26 @@ static void test_animation_qi(void)
     HRESULT hr;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
-    ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
     IDirect3DRMAnimation_Release(animation);
 
     test_qi("animation_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
 
     hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
-    ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#lx.\n", hr);
 
     hr = IDirect3DRM3_CreateAnimation(d3drm3, &animation2);
-    ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
 
     hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
     IDirect3DRMAnimation2_Release(animation2);
 
     test_qi("animation2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
@@ -7986,10 +7983,10 @@ static void test_wrap(void)
     HRESULT hr;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
-    ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
 
     test_class_name((IDirect3DRMObject *)wrap, "");
 
@@ -8072,13 +8069,13 @@ static void test_wrap_qi(void)
     HRESULT hr;
 
     hr = Direct3DRMCreate(&d3drm1);
-    ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
 
     hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
-    ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
 
     hr = IDirect3DRMWrap_QueryInterface(wrap, &IID_IUnknown, (void **)&unknown);
-    ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap (hr = %#x)\n", hr);
+    ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap, hr %#lx.\n", hr);
     IDirect3DRMWrap_Release(wrap);
     test_qi("wrap_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
     IUnknown_Release(unknown);
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 101a37e830d..1e8e6a83bee 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -236,7 +236,7 @@ static void ColorTest(void)
     blue=0.55f;
     expected_color=0xffcc4c8c;
     got_color=D3DRMCreateColorRGB(red,green,blue);
-    ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+    ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
 
 /*___________D3DRMCreateColorRGBA________________________*/
     red=0.1f;
@@ -245,7 +245,7 @@ static void ColorTest(void)
     alpha=0.58f;
     expected_color=0x931966b2;
     got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
-    ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+    ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
 
 /* if a component is <0 then, then one considers this component as 0. The following test proves this fact (test only with the red component). */
     red=-0.88f;
@@ -254,7 +254,7 @@ static void ColorTest(void)
     alpha=0.41f;
     expected_color=0x68006699;
     got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
-    ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+    ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
 
 /* if a component is >1 then, then one considers this component as 1. The following test proves this fact (test only with the red component). */
     red=2.37f;
@@ -263,7 +263,7 @@ static void ColorTest(void)
     alpha=0.41f;
     expected_color=0x68ff6699;
     got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
-    ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+    ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
 
 /*___________D3DRMColorGetAlpha_________________________*/
     color=0x0e4921bf;
-- 
2.35.1




More information about the wine-devel mailing list