wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

[PATCH v2 0/6] MR22: winegstreamer: Implement more sample attributes and timestamps.
by Rémi Bernon (＠rbernon) 05 May '22

05 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 -- v2: winegstreamer: Support dynamic wg_transform output format change. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Remove width/height from caps when format uses 0. winegstreamer: Only resize buffer when read is incomplete. winegstreamer: Support the MFSampleExtension_CleanPoint sample attribute. winegstreamer: Add timestamp and duration to struct wg_sample. https://gitlab.winehq.org/wine/wine/-/merge_requests/22

3 8

Re: [PATCH v2 0/1] MR13: kernelbase: Add support for progress callback in CopyFileEx.
by Nikolay Sivov (＠nsivov) 05 May '22

05 May '22

Thank you. It's actually possible to test access mode through the callback, and it does look like DELETE is used internally, so that's good. My only concern now is whether we need stream-switch call at all? Have you tested if it's used for regular files, or on filesystems where streams are not supported. Maybe it could be dropped. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/13#note_626

1 0

[PATCH] d3drm/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 05 May '22

05 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/tests/Makefile.in | 1 - dlls/d3drm/tests/d3drm.c | 3115 +++++++++++++++++----------------- 2 files changed, 1556 insertions(+), 1560 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 51d10d797bc..665c56ccdae 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); @@ -4279,66 +4279,66 @@ 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_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); @@ -4349,37 +4349,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); @@ -4390,39 +4390,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); @@ -4452,16 +4452,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. */ @@ -4473,64 +4473,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); @@ -4538,17 +4538,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); @@ -4558,7 +4558,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); @@ -4568,23 +4568,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); @@ -4594,12 +4594,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); @@ -4624,20 +4624,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. */ @@ -4649,66 +4649,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); @@ -4716,20 +4716,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); @@ -4739,7 +4739,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); @@ -4749,23 +4749,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); @@ -4775,12 +4775,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); @@ -4806,20 +4806,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. */ @@ -4831,66 +4831,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); @@ -4898,19 +4898,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); @@ -4920,7 +4920,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); @@ -4930,23 +4930,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); @@ -4955,25 +4955,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); @@ -4981,12 +4981,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); @@ -4996,28 +4996,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); @@ -5036,7 +5036,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); @@ -5046,7 +5046,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 @@ -5064,7 +5064,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); @@ -5103,13 +5103,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 */ @@ -5124,83 +5124,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); @@ -5208,61 +5208,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); @@ -5272,61 +5272,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); @@ -5334,12 +5333,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); @@ -5362,7 +5361,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); @@ -5372,7 +5371,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)) @@ -5398,7 +5397,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); @@ -5440,15 +5439,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 */ @@ -5464,74 +5463,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); @@ -5539,94 +5538,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); @@ -5638,44 +5637,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); @@ -5683,14 +5681,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); @@ -5723,15 +5721,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 */ @@ -5747,72 +5745,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); @@ -5820,94 +5818,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); @@ -5919,44 +5917,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); @@ -5964,14 +5961,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); @@ -5989,13 +5986,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); } @@ -6008,15 +6005,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); @@ -6030,15 +6027,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); @@ -6139,10 +6136,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) @@ -6166,10 +6163,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) { @@ -6265,58 +6262,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); @@ -6324,56 +6321,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); @@ -6381,24 +6378,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); @@ -6499,34 +6496,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); @@ -6535,7 +6532,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); } @@ -6628,31 +6625,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); @@ -6661,17 +6658,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); @@ -6696,14 +6693,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; } @@ -6719,7 +6716,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); @@ -6729,7 +6726,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)) @@ -6755,7 +6752,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) @@ -6769,7 +6766,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) @@ -6879,17 +6876,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); @@ -6898,10 +6895,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); @@ -6922,14 +6919,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); } @@ -6956,87 +6953,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); @@ -7044,38 +7041,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); @@ -7110,29 +7107,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) @@ -7160,156 +7157,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); @@ -7320,28 +7317,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); @@ -7384,22 +7381,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)); @@ -7410,82 +7407,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); @@ -7493,7 +7490,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"); @@ -7504,13 +7501,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"); @@ -7543,27 +7540,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"); @@ -7572,35 +7569,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); @@ -7609,70 +7606,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; @@ -7681,20 +7678,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); @@ -7710,23 +7707,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); } } } @@ -7734,86 +7731,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); @@ -7826,27 +7823,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); @@ -7856,12 +7853,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); @@ -7945,26 +7942,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)); @@ -7981,10 +7978,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, ""); @@ -8067,13 +8064,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); -- 2.35.1

1 0

[PATCH 1/2] ntdll: Partially implement NtUnmapViewOfSectionEx().
by Nikolay Sivov 05 May '22

05 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/virtual.c | 9 +++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 13 +++++++++++++ include/winternl.h | 1 + 6 files changed, 27 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a7a39a0bce2..b1650ab4306 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -427,6 +427,7 @@ @ stdcall -syscall NtUnlockFile(long ptr ptr ptr ptr) @ stdcall -syscall NtUnlockVirtualMemory(long ptr ptr long) @ stdcall -syscall NtUnmapViewOfSection(long ptr) +@ stdcall -syscall NtUnmapViewOfSectionEx(long ptr long) # @ stub NtVdmControl # @ stub NtW32Call @ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr) @@ -1454,6 +1455,7 @@ @ stdcall -private -syscall ZwUnlockFile(long ptr ptr ptr ptr) NtUnlockFile @ stdcall -private -syscall ZwUnlockVirtualMemory(long ptr ptr long) NtUnlockVirtualMemory @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection +@ stdcall -private -syscall ZwUnmapViewOfSectionEx(long ptr long) NtUnmapViewOfSectionEx # @ stub ZwVdmControl # @ stub ZwW32Call @ stdcall -private -syscall ZwWaitForAlertByThreadId(ptr ptr) NtWaitForAlertByThreadId diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cad760a1445..7f85582adf3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -336,6 +336,7 @@ static void * const syscalls[] = NtUnlockFile, NtUnlockVirtualMemory, NtUnmapViewOfSection, + NtUnmapViewOfSectionEx, NtWaitForAlertByThreadId, NtWaitForDebugEvent, NtWaitForKeyedEvent, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 02478cceb06..6ecca9cb98a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4610,6 +4610,15 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) return status; } +/*********************************************************************** + * NtUnmapViewOfSectionEx (NTDLL.@) + * ZwUnmapViewOfSectionEx (NTDLL.@) + */ +NTSTATUS WINAPI NtUnmapViewOfSectionEx( HANDLE process, PVOID addr, ULONG flags ) +{ + if (flags) FIXME("Ignoring flags %#x.\n", flags); + return NtUnmapViewOfSection( process, addr ); +} /****************************************************************************** * virtual_fill_image_information diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 3b364d909d7..bd107ce0ef5 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -237,6 +237,7 @@ SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ + SYSCALL_ENTRY( NtUnmapViewOfSectionEx ) \ SYSCALL_ENTRY( NtWaitForAlertByThreadId ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 61c84e5d7be..c21464857fa 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -525,6 +525,19 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) } +/********************************************************************** + * wow64_NtUnmapViewOfSectionEx + */ +NTSTATUS WINAPI wow64_NtUnmapViewOfSectionEx( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = get_ptr( &args ); + ULONG flags = get_ulong( &args ); + + return NtUnmapViewOfSectionEx( process, addr, flags ); +} + + /********************************************************************** * wow64_NtWow64AllocateVirtualMemory64 */ diff --git a/include/winternl.h b/include/winternl.h index 1d358fc0b2d..84babcbb0e9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4160,6 +4160,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE); NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); +NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSectionEx(HANDLE,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); NTSYSAPI NTSTATUS WINAPI NtWaitForAlertByThreadId(const void*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*); -- 2.35.1

1 1

[PATCH 1/2] dlls/winealsa.drv: use correct integral types
by Eric Pouech 05 May '22

05 May '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/winealsa.drv/alsa.c | 4 ++-- dlls/winealsa.drv/mmdevdrv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 8b6a87aa864c..33b405a884cf 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -637,7 +637,7 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) return format; } -static int alsa_channel_index(DWORD flag) +static int alsa_channel_index(UINT flag) { switch(flag){ case SPEAKER_FRONT_LEFT: @@ -702,7 +702,7 @@ static HRESULT map_channels(EDataFlow flow, const WAVEFORMATEX *fmt, int *alsa_c if(flow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - DWORD mask, flag = SPEAKER_FRONT_LEFT; + UINT mask, flag = SPEAKER_FRONT_LEFT; UINT i = 0; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1a99f0ac26c9..855fb68f457a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1363,7 +1363,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT32*)flags; params.devpos = devpos; params.qpcpos = qpcpos;

1 1

[PATCH 1/6] server: Do not signal read/write bits if there are read/write asyncs waiting.
by Zebediah Figura 05 May '22

05 May '22

This is validated by tests introduced in 59beffb46c813a3de2eae6f28e3f7f321f666e89 etc. This commit alone doesn't fix said tests, because: * on this poll, we will alert the waiting async; * when reselecting, we will still request POLLIN, because the AFD_POLL_READ request is still active, * when POLLIN is subsequently signaled, we do not remove it in sock_dispatch_asyncs(), because we check async_waiting(), not async_queued(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 29dd1ca7fa8..db0df5ecf79 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1179,10 +1179,9 @@ static void sock_poll_event( struct fd *fd, int event ) break; } - complete_async_polls( sock, event, error ); - event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); + complete_async_polls( sock, event, error ); sock_reselect( sock ); } -- 2.34.1

1 5

[PATCH v6 1/5] include/ddk: Add winusbio.h file.
by Mohamad Al-Jaf 05 May '22

05 May '22

Needed by winusb.h. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/ddk/winusbio.h | 66 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 include/ddk/winusbio.h diff --git a/include/Makefile.in b/include/Makefile.in index f3e62c4bb5a..58bf7db1e13 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -211,6 +211,7 @@ SOURCES = \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ + ddk/winusbio.h \ ddk/wsk.h \ ddraw.h \ ddrawgdi.h \ diff --git a/include/ddk/winusbio.h b/include/ddk/winusbio.h new file mode 100644 index 00000000000..14d8230d87f --- /dev/null +++ b/include/ddk/winusbio.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINUSBIO_H_ +#define _WINUSBIO_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(WinUSB_TestGuid, 0XDA812BFF, 0X12C3, 0X46A2, 0X8E, 0X2B, 0XDB, 0XD3, 0XB7, 0X83, 0X4C, 0X43); + +#define SHORT_PACKET_TERMINATE 0x01 +#define AUTO_CLEAR_STALL 0x02 +#define PIPE_TRANSFER_TIMEOUT 0x03 +#define IGNORE_SHORT_PACKETS 0x04 +#define ALLOW_PARTIAL_READS 0x05 +#define AUTO_FLUSH 0x06 +#define RAW_IO 0x07 +#define MAXIMUM_TRANSFER_SIZE 0x08 +#define RESET_PIPE_ON_RESUME 0x09 + +typedef struct _WINUSB_PIPE_INFORMATION { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; +} WINUSB_PIPE_INFORMATION, *PWINUSB_PIPE_INFORMATION; + +#define AUTO_SUSPEND 0x81 +#define SUSPEND_DELAY 0x83 + +#define DEVICE_SPEED 0x01 + +#define LowSpeed 0x01 +#define FullSpeed 0x02 +#define HighSpeed 0x03 + +typedef struct _WINUSB_PIPE_INFORMATION_EX { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; + ULONG MaximumBytesPerInterval; +} WINUSB_PIPE_INFORMATION_EX, *PWINUSB_PIPE_INFORMATION_EX; + +#ifdef __cplusplus +} +#endif + +#endif /* _WINUSBIO_H_ */ -- 2.36.0

1 5

[PATCH v2 resend] ntdll: Avoid the lower 2GB region for large allocations on win64.
by Elaine Lefler 05 May '22

05 May '22

Fixes a crash in PaintTool SAI when allocating more than 2GB of memory. Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com> --- v2: Removed todo_wine from appropriate tests, along with a note about why that test is broken on win32. --- dlls/ntdll/tests/info.c | 16 ++++++++++++---- dlls/ntdll/unix/virtual.c | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 89503093b17..4f2441d95d8 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1839,8 +1839,13 @@ static void test_query_process_vm(void) ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc", &pvi); - todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); +#ifndef _WIN64 + /* Fails on win32 due to mapping in reserved areas. The unused regions + * should be subtracted from VirtualSize for it to succeed. */ + todo_wine +#endif + ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); VirtualFree( ptr, 0, MEM_RELEASE); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); @@ -1856,8 +1861,11 @@ static void test_query_process_vm(void) ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc(MEM_RESERVE)", &pvi); - todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); +#ifndef _WIN64 + todo_wine +#endif + ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); prev_size = pvi.VirtualSize; ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 02478cceb06..93a4495adb9 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1917,7 +1917,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, alloc.top_down = top_down; alloc.limit = (void*)(get_zero_bits_mask( zero_bits ) & (UINT_PTR)user_space_limit); - if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) + if ( +#ifdef _WIN64 + size < 2 * 1024 * 1024 && +#endif + mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); -- 2.32.0 (Apple Git-132)

2 1

[PATCH 1/3] shell32: Add SHBindToFolderIDListParent semi-stub.
by Mohamad Al-Jaf 04 May '22

04 May '22

Called by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/shell32/pidl.c | 9 +++++++++ dlls/shell32/shell32.spec | 1 + include/shlobj.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 4c66a14c700..a87a8762a26 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1285,6 +1285,15 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si return SUCCEEDED(hr); } +/************************************************************************* + * SHBindToFolderIDListParent [SHELL32.@] + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +{ + FIXME("(%p, %p, %s, %p, %p) - semi-stub\n", psf, pidl, debugstr_guid(riid), ppv, ppidlLast); + return SHBindToParent(pidl, riid, ppv, ppidlLast); +} + /************************************************************************* * SHBindToParent [shell version 5.0] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..6348fcb3a6d 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -333,6 +333,7 @@ @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) diff --git a/include/shlobj.h b/include/shlobj.h index d30944662f7..f4ef2edf76b 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1639,6 +1639,11 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF */ HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *); +/**************************************************************************** + * SHBindToFolderIDListParent API + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast); + /**************************************************************************** * SHBindToParent API */ -- 2.36.0

2 6

[PATCH v3 1/2] ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31.
by Brendan Shanks 04 May '22

04 May '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v3: Only run test on 64-bit (it can never fail on 32-bit). dlls/ntdll/tests/virtual.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..5d6a7d1eac0 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -904,6 +904,33 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL file image mapping */ + if (is_win64) + { + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + todo_wine + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + NtClose(mapping); + CloseHandle(file); + } + TerminateProcess(process, 0); CloseHandle(process); } -- 2.35.1

2 2

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Use a more sensible source location in add_constructor().
by Giovanni Mascellani 04 May '22

04 May '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 905dbfc5..e518430f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2049,7 +2049,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type continue; } - initialize_var_components(ctx, params->instrs, var, &idx, arg, &loc); + initialize_var_components(ctx, params->instrs, var, &idx, arg, &arg->loc); } if (!(load = hlsl_new_var_load(ctx, var, loc))) -- 2.36.0

4 28

[PATCH 0/5] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl (＠besentv) 04 May '22

04 May '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/34

3 6

[PATCH 7/7] wineoss: Implement Wow64 aux entry point in the Unix library.
by Huw Davies 04 May '22

04 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/oss.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 0c9fef90d58..e9616a84b36 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1961,6 +1961,29 @@ static NTSTATUS wow64_set_event_handle(void *args) return STATUS_SUCCESS; } +static NTSTATUS wow64_aux_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + } *params32 = args; + struct aux_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + }; + return aux_message(&params); +} + unixlib_entry_t __wine_unix_call_wow64_funcs[] = { test_connect, @@ -1990,7 +2013,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_midi_out_message, wow64_midi_in_message, wow64_midi_notify_wait, - aux_message, + wow64_aux_message, }; #endif /* _WIN64 */ -- 2.25.1

2 1

[PATCH 6/7] wineoss: Implement Wow64 midi entry points in the Unix library.
by Huw Davies 04 May '22

04 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/oss.c | 6 +- dlls/wineoss.drv/ossmidi.c | 354 +++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 6 + 3 files changed, 363 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9f2cba68f86..0c9fef90d58 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1987,9 +1987,9 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_set_event_handle, is_started, midi_release, - midi_out_message, - midi_in_message, - midi_notify_wait, + wow64_midi_out_message, + wow64_midi_in_message, + wow64_midi_notify_wait, aux_message, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 6677609a5a6..09eed8085c4 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1771,3 +1771,357 @@ NTSTATUS midi_notify_wait(void *args) return STATUS_SUCCESS; } + +#ifdef _WIN64 + +typedef UINT PTR32; + +struct notify_context32 +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + UINT param_1; + UINT param_2; + UINT callback; + UINT flags; + PTR32 device; + UINT instance; +}; + +static void notify_to_notify32(struct notify_context32 *notify32, + const struct notify_context *notify) +{ + notify32->send_notify = notify->send_notify; + notify32->dev_id = notify->dev_id; + notify32->msg = notify->msg; + notify32->param_1 = notify->param_1; + notify32->param_2 = notify->param_2; + notify32->callback = notify->callback; + notify32->flags = notify->flags; + notify32->device = PtrToUlong(notify->device); + notify32->instance = notify->instance; +} + +struct midi_open_desc32 +{ + PTR32 hMidi; + UINT dwCallback; + UINT dwInstance; + UINT dnDevNode; + UINT cIds; + MIDIOPENSTRMID rgIds; +}; + +struct midi_hdr32 +{ + PTR32 lpData; + UINT dwBufferLength; + UINT dwBytesRecorded; + UINT dwUser; + UINT dwFlags; + PTR32 lpNext; + UINT reserved; + UINT dwOffset; + UINT dwReserved[8]; +}; + +static UINT wow64_midi_out_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static UINT wow64_midi_out_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + +NTSTATUS wow64_midi_out_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_open_desc32 *desc32; + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIOPENDESC open_desc; + MIDIHDR hdr; + struct midi_out_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + .notify = &notify + }; + notify32->send_notify = FALSE; + + switch (params32->msg) + { + case MODM_OPEN: + desc32 = ULongToPtr(params32->param_1); + + open_desc.hMidi = ULongToPtr(desc32->hMidi); + open_desc.dwCallback = desc32->dwCallback; + open_desc.dwInstance = desc32->dwInstance; + open_desc.dnDevNode = desc32->dnDevNode; + open_desc.cIds = desc32->cIds; + open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID; + open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID; + + params.param_1 = (UINT_PTR)&open_desc; + break; + + case MODM_LONGDATA: + hdr32 = ULongToPtr(params32->param_1); + + memset(&hdr, 0, sizeof(hdr)); + hdr.lpData = ULongToPtr(hdr32->lpData); + hdr.dwBufferLength = hdr32->dwBufferLength; + hdr.dwFlags = hdr32->dwFlags; + + params.param_1 = (UINT_PTR)&hdr; + params.param_2 = sizeof(hdr); + break; + + case MODM_PREPARE: /* prepare and unprepare are easier to handle explicitly */ + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_out_prepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + + case MODM_UNPREPARE: + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_out_unprepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + } + + midi_out_message(&params); + + switch (params32->msg) + { + case MODM_LONGDATA: + hdr32 = ULongToPtr(params32->param_1); + + hdr32->dwFlags = hdr.dwFlags; + break; + } + + if (notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MOM_DONE) + notify32->param_1 = params32->param_1; /* restore the 32-bit hdr */ + } + return STATUS_SUCCESS; +} + +static UINT wow64_midi_in_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + + return MMSYSERR_NOERROR; +} + +static UINT wow64_midi_in_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + + return MMSYSERR_NOERROR; +} + +NTSTATUS wow64_midi_in_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_open_desc32 *desc32; + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIOPENDESC open_desc; + MIDIHDR *hdr = NULL; + struct midi_in_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + .notify = &notify + }; + notify32->send_notify = FALSE; + + switch (params32->msg) + { + case MIDM_OPEN: + desc32 = ULongToPtr(params32->param_1); + + open_desc.hMidi = ULongToPtr(desc32->hMidi); + open_desc.dwCallback = desc32->dwCallback; + open_desc.dwInstance = desc32->dwInstance; + open_desc.dnDevNode = desc32->dnDevNode; + open_desc.cIds = desc32->cIds; + open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID; + open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID; + + params.param_1 = (UINT_PTR)&open_desc; + break; + + case MIDM_ADDBUFFER: + hdr32 = ULongToPtr(params32->param_1); + + hdr = calloc(1, sizeof(*hdr)); + hdr->lpData = ULongToPtr(hdr32->lpData); + hdr->dwBufferLength = hdr32->dwBufferLength; + hdr->dwFlags = hdr32->dwFlags; + hdr->dwReserved[7] = params32->param_1; /* keep hdr32 for MIM_LONGDATA notification */ + + params.param_1 = (UINT_PTR)hdr; + params.param_2 = sizeof(*hdr); + break; + + case MIDM_PREPARE: /* prepare and unprepare are easier to handle explicitly */ + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_in_prepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + + case MIDM_UNPREPARE: + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_in_unprepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + } + + midi_in_message(&params); + + switch (params32->msg) + { + case MIDM_ADDBUFFER: + hdr32 = ULongToPtr(params32->param_1); + + if (!*params.err) + { + hdr32->dwFlags = hdr->dwFlags; + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->lpNext = 0; + } + else + free(hdr); + break; + } + + if (notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MIM_LONGDATA) + { + hdr = (MIDIHDR *)notify.param_1; + notify32->param_1 = hdr->dwReserved[7]; + hdr32 = ULongToPtr(notify32->param_1); + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->dwFlags = hdr->dwFlags; + free(hdr); + } + } + return STATUS_SUCCESS; +} + +NTSTATUS wow64_midi_notify_wait(void *args) +{ + struct + { + PTR32 quit; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIHDR *hdr; + struct midi_notify_wait_params params = + { + .quit = ULongToPtr(params32->quit), + .notify = &notify + }; + notify32->send_notify = FALSE; + + midi_notify_wait(&params); + + if (!*params.quit && notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MIM_LONGDATA) + { + hdr = (MIDIHDR *)notify.param_1; + notify32->param_1 = hdr->dwReserved[7]; + hdr32 = ULongToPtr(notify32->param_1); + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->dwFlags = hdr->dwFlags; + free(hdr); + } + } + return STATUS_SUCCESS; +} + +#endif /* _WIN64 */ diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 208dec7f69d..e36c82ff35b 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -297,6 +297,12 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; +#ifdef _WIN64 +NTSTATUS wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +#endif + extern unixlib_handle_t oss_handle; #define OSS_CALL(func, params) __wine_unix_call(oss_handle, oss_ ## func, params) -- 2.25.1

2 1

[PATCH 5/7] wineoss: Implement Wow64 mmdevapi entry points in the Unix libraray.
by Huw Davies 04 May '22

04 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/oss.c | 353 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 353 insertions(+) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 40b8879ef47..9f2cba68f86 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1641,3 +1641,356 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_notify_wait, aux_message, }; + +#ifdef _WIN64 + +typedef UINT PTR32; + +static NTSTATUS wow64_get_endpoint_ids(void *args) +{ + struct + { + EDataFlow flow; + PTR32 endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; + } *params32 = args; + struct get_endpoint_ids_params params = + { + .flow = params32->flow, + .endpoints = ULongToPtr(params32->endpoints), + .size = params32->size + }; + get_endpoint_ids(&params); + params32->size = params.size; + params32->result = params.result; + params32->num = params.num; + params32->default_idx = params.default_idx; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_create_stream(void *args) +{ + struct + { + PTR32 device; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + UINT flags; + REFERENCE_TIME duration; + REFERENCE_TIME period; + PTR32 fmt; + HRESULT result; + PTR32 stream; + } *params32 = args; + struct create_stream_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .share = params32->share, + .flags = params32->flags, + .duration = params32->duration, + .period = params32->period, + .fmt = ULongToPtr(params32->fmt), + .stream = ULongToPtr(params32->stream) + }; + create_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_release_stream(void *args) +{ + struct + { + stream_handle stream; + PTR32 timer_thread; + HRESULT result; + } *params32 = args; + struct release_stream_params params = + { + .stream = params32->stream, + .timer_thread = ULongToHandle(params32->timer_thread) + }; + release_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_render_buffer(void *args) +{ + struct + { + stream_handle stream; + UINT32 frames; + HRESULT result; + PTR32 data; + } *params32 = args; + BYTE *data = NULL; + struct get_render_buffer_params params = + { + .stream = params32->stream, + .frames = params32->frames, + .data = &data + }; + get_render_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_capture_buffer(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 data; + PTR32 frames; + PTR32 flags; + PTR32 devpos; + PTR32 qpcpos; + } *params32 = args; + BYTE *data = NULL; + struct get_capture_buffer_params params = + { + .stream = params32->stream, + .data = &data, + .frames = ULongToPtr(params32->frames), + .flags = ULongToPtr(params32->flags), + .devpos = ULongToPtr(params32->devpos), + .qpcpos = ULongToPtr(params32->qpcpos) + }; + get_capture_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +}; + +static NTSTATUS wow64_is_format_supported(void *args) +{ + struct + { + PTR32 device; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + PTR32 fmt_in; + PTR32 fmt_out; + HRESULT result; + } *params32 = args; + struct is_format_supported_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .share = params32->share, + .fmt_in = ULongToPtr(params32->fmt_in), + .fmt_out = ULongToPtr(params32->fmt_out) + }; + is_format_supported(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_mix_format(void *args) +{ + struct + { + PTR32 device; + EDataFlow flow; + PTR32 fmt; + HRESULT result; + } *params32 = args; + struct get_mix_format_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .fmt = ULongToPtr(params32->fmt) + }; + get_mix_format(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_buffer_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 size; + } *params32 = args; + struct get_buffer_size_params params = + { + .stream = params32->stream, + .size = ULongToPtr(params32->size) + }; + get_buffer_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_latency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 latency; + } *params32 = args; + struct get_latency_params params = + { + .stream = params32->stream, + .latency = ULongToPtr(params32->latency) + }; + get_latency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_current_padding(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 padding; + } *params32 = args; + struct get_current_padding_params params = + { + .stream = params32->stream, + .padding = ULongToPtr(params32->padding) + }; + get_current_padding(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_next_packet_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_next_packet_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + get_next_packet_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_frequency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frequency; + } *params32 = args; + struct get_frequency_params params = + { + .stream = params32->stream, + .frequency = ULongToPtr(params32->frequency) + }; + get_frequency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_position(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 position; + PTR32 qpctime; + } *params32 = args; + struct get_position_params params = + { + .stream = params32->stream, + .position = ULongToPtr(params32->position), + .qpctime = ULongToPtr(params32->qpctime) + }; + get_position(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_set_volumes(void *args) +{ + struct + { + stream_handle stream; + float master_volume; + PTR32 volumes; + PTR32 session_volumes; + } *params32 = args; + struct set_volumes_params params = + { + .stream = params32->stream, + .master_volume = params32->master_volume, + .volumes = ULongToPtr(params32->volumes), + .session_volumes = ULongToPtr(params32->session_volumes) + }; + return set_volumes(&params); +} + +static NTSTATUS wow64_set_event_handle(void *args) +{ + struct + { + stream_handle stream; + PTR32 event; + HRESULT result; + } *params32 = args; + struct set_event_handle_params params = + { + .stream = params32->stream, + .event = ULongToHandle(params32->event) + }; + + set_event_handle(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + test_connect, + wow64_get_endpoint_ids, + wow64_create_stream, + wow64_release_stream, + start, + stop, + reset, + timer_loop, + wow64_get_render_buffer, + release_render_buffer, + wow64_get_capture_buffer, + release_capture_buffer, + wow64_is_format_supported, + wow64_get_mix_format, + wow64_get_buffer_size, + wow64_get_latency, + wow64_get_current_padding, + wow64_get_next_packet_size, + wow64_get_frequency, + wow64_get_position, + wow64_set_volumes, + wow64_set_event_handle, + is_started, + midi_release, + midi_out_message, + midi_in_message, + midi_notify_wait, + aux_message, +}; + +#endif /* _WIN64 */ -- 2.25.1

2 2

[PATCH 4/7] wineoss: Limit Wow64 buffer allocations to 32-bit addresses.
by Huw Davies 04 May '22

04 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/oss.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 986ed274445..40b8879ef47 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -535,6 +535,15 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, return ret; } +static ULONG_PTR zero_bits(void) +{ +#ifdef _WIN64 + return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; +#else + return 0; +#endif +} + static NTSTATUS create_stream(void *args) { struct create_stream_params *params = args; @@ -597,8 +606,8 @@ static NTSTATUS create_stream(void *args) if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; } @@ -931,8 +940,8 @@ static NTSTATUS get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); } @@ -1041,8 +1050,8 @@ static NTSTATUS get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); } -- 2.25.1

2 1

[PATCH 3/7] wineoss: Return offsets rather than ptrs to the strings.
by Huw Davies 04 May '22

04 May '22

This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 12 +++++++----- dlls/wineoss.drv/oss.c | 18 ++++++++---------- dlls/wineoss.drv/unixlib.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c9aae98ec2e..9c1261ce05c 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -390,8 +390,10 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); - unsigned int dev_size = strlen(params.endpoints[i].device) + 1; + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + char *device = (char *)params.endpoints + params.endpoints[i].device; + unsigned int name_size = (wcslen(name) + 1) * sizeof(WCHAR); + unsigned int dev_size = strlen(device) + 1; OSSDevice *oss_dev; ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); @@ -401,12 +403,12 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], params.endpoints[i].name, name_size); - get_device_guid(flow, params.endpoints[i].device, guids + i); + memcpy(ids[i], name, name_size); + get_device_guid(flow, device, guids + i); oss_dev->flow = flow; oss_dev->guid = guids[i]; - memcpy(oss_dev->devnode, params.endpoints[i].device, dev_size); + memcpy(oss_dev->devnode, device, dev_size); device_add(oss_dev); } *def_index = params.default_idx; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a628548ddcd..986ed274445 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -226,11 +226,10 @@ static NTSTATUS get_endpoint_ids(void *args) WCHAR name[ARRAY_SIZE(ai.name) + ARRAY_SIZE(outW)]; char device[OSS_DEVNODE_SIZE]; } *info; - unsigned int i, j, num, needed, name_len, device_len, default_idx = 0; + unsigned int i, j, num, needed, name_len, device_len, offset, default_idx = 0; char default_device[OSS_DEVNODE_SIZE]; struct endpoint *endpoint; int mixer_fd; - char *ptr; mixer_fd = open("/dev/mixer", O_RDONLY, 0); if(mixer_fd < 0){ @@ -333,9 +332,8 @@ static NTSTATUS get_endpoint_ids(void *args) } close(mixer_fd); - needed = num * sizeof(*params->endpoints); + offset = needed = num * sizeof(*params->endpoints); endpoint = params->endpoints; - ptr = (char *)(endpoint + num); for(i = 0; i < num; i++){ name_len = wcslen(info[i].name) + 1; @@ -343,12 +341,12 @@ static NTSTATUS get_endpoint_ids(void *args) needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); if(needed <= params->size){ - endpoint->name = (WCHAR *)ptr; - memcpy(endpoint->name, info[i].name, name_len * sizeof(WCHAR)); - ptr += name_len * sizeof(WCHAR); - endpoint->device = ptr; - memcpy(endpoint->device, info[i].device, device_len); - ptr += (device_len + 1) & ~1; + endpoint->name = offset; + memcpy((char *)params->endpoints + offset, info[i].name, name_len * sizeof(WCHAR)); + offset += name_len * sizeof(WCHAR); + endpoint->device = offset; + memcpy((char *)params->endpoints + offset, info[i].device, device_len); + offset += (device_len + 1) & ~1; endpoint++; } } diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 278dfdbe612..208dec7f69d 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -36,8 +36,8 @@ struct test_connect_params struct endpoint { - WCHAR *name; - char *device; + unsigned int name; + unsigned int device; }; struct get_endpoint_ids_params -- 2.25.1

2 1

[PATCH 2/7] wineoss: Use UINT64 handles to represent the stream.
by Huw Davies 04 May '22

04 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 6 +++--- dlls/wineoss.drv/oss.c | 43 +++++++++++++++++++++---------------- dlls/wineoss.drv/unixlib.h | 40 +++++++++++++++++----------------- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 93bf775ebc8..c9aae98ec2e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -96,7 +96,7 @@ struct ACImpl { EDataFlow dataflow; float *vols; UINT32 channel_count; - struct oss_stream *stream; + stream_handle stream; HANDLE timer_thread; @@ -239,7 +239,7 @@ int WINAPI AUDDRV_GetPriority(void) return params.priority; } -static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread) +static HRESULT stream_release(stream_handle stream, HANDLE timer_thread) { struct release_stream_params params; @@ -651,7 +651,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, { ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; - struct oss_stream *stream; + stream_handle stream; unsigned int i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 6490081e069..a628548ddcd 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -111,6 +111,11 @@ static NTSTATUS oss_unlock_result(struct oss_stream *stream, return STATUS_SUCCESS; } +static struct oss_stream *handle_get_stream(stream_handle h) +{ + return (struct oss_stream *)(UINT_PTR)h; +} + static NTSTATUS test_connect(void *args) { struct test_connect_params *params = args; @@ -615,7 +620,7 @@ exit: free(stream->fmt); free(stream); }else{ - *params->stream = stream; + *params->stream = (stream_handle)(UINT_PTR)stream; } return STATUS_SUCCESS; @@ -624,7 +629,7 @@ exit: static NTSTATUS release_stream(void *args) { struct release_stream_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); SIZE_T size; if(params->timer_thread){ @@ -653,7 +658,7 @@ static NTSTATUS release_stream(void *args) static NTSTATUS start(void *args) { struct start_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -671,7 +676,7 @@ static NTSTATUS start(void *args) static NTSTATUS stop(void *args) { struct stop_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -687,7 +692,7 @@ static NTSTATUS stop(void *args) static NTSTATUS reset(void *args) { struct reset_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -860,7 +865,7 @@ static void oss_read_data(struct oss_stream *stream) static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); LARGE_INTEGER delay, now, next; int adjust; @@ -902,7 +907,7 @@ static NTSTATUS timer_loop(void *args) static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 write_pos, frames = params->frames; BYTE **data = params->data; SIZE_T size; @@ -968,7 +973,7 @@ static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 writ static NTSTATUS release_render_buffer(void *args) { struct release_render_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 written_frames = params->written_frames; UINT flags = params->flags; BYTE *buffer; @@ -1008,7 +1013,7 @@ static NTSTATUS release_render_buffer(void *args) static NTSTATUS get_capture_buffer(void *args) { struct get_capture_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT64 *devpos = params->devpos, *qpcpos = params->qpcpos; UINT32 *frames = params->frames; UINT *flags = params->flags; @@ -1074,7 +1079,7 @@ static NTSTATUS get_capture_buffer(void *args) static NTSTATUS release_capture_buffer(void *args) { struct release_capture_buffer_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 done = params->done; oss_lock(stream); @@ -1231,7 +1236,7 @@ static NTSTATUS get_mix_format(void *args) static NTSTATUS get_buffer_size(void *args) { struct get_buffer_size_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1243,7 +1248,7 @@ static NTSTATUS get_buffer_size(void *args) static NTSTATUS get_latency(void *args) { struct get_latency_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1257,7 +1262,7 @@ static NTSTATUS get_latency(void *args) static NTSTATUS get_current_padding(void *args) { struct get_current_padding_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1269,7 +1274,7 @@ static NTSTATUS get_current_padding(void *args) static NTSTATUS get_next_packet_size(void *args) { struct get_next_packet_size_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT32 *frames = params->frames; oss_lock(stream); @@ -1282,7 +1287,7 @@ static NTSTATUS get_next_packet_size(void *args) static NTSTATUS get_frequency(void *args) { struct get_frequency_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT64 *freq = params->frequency; oss_lock(stream); @@ -1298,7 +1303,7 @@ static NTSTATUS get_frequency(void *args) static NTSTATUS get_position(void *args) { struct get_position_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); UINT64 *pos = params->position, *qpctime = params->qpctime; oss_lock(stream); @@ -1342,7 +1347,7 @@ static NTSTATUS get_position(void *args) static NTSTATUS set_volumes(void *args) { struct set_volumes_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); stream->mute = !params->master_volume; @@ -1354,7 +1359,7 @@ static NTSTATUS set_volumes(void *args) static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); @@ -1374,7 +1379,7 @@ static NTSTATUS set_event_handle(void *args) static NTSTATUS is_started(void *args) { struct is_started_params *params = args; - struct oss_stream *stream = params->stream; + struct oss_stream *stream = handle_get_stream(params->stream); oss_lock(stream); diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 25e9a7007b3..278dfdbe612 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,7 +18,7 @@ #include "mmdeviceapi.h" -struct stream_oss; +typedef UINT64 stream_handle; /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority @@ -60,42 +60,42 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; - struct oss_stream **stream; + stream_handle *stream; }; struct release_stream_params { - struct oss_stream *stream; + stream_handle stream; HANDLE timer_thread; HRESULT result; }; struct start_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; struct stop_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; struct reset_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; struct timer_loop_params { - struct oss_stream *stream; + stream_handle stream; }; struct get_render_buffer_params { - struct oss_stream *stream; + stream_handle stream; UINT32 frames; HRESULT result; BYTE **data; @@ -103,7 +103,7 @@ struct get_render_buffer_params struct release_render_buffer_params { - struct oss_stream *stream; + stream_handle stream; UINT32 written_frames; UINT flags; HRESULT result; @@ -111,7 +111,7 @@ struct release_render_buffer_params struct get_capture_buffer_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; BYTE **data; UINT32 *frames; @@ -122,7 +122,7 @@ struct get_capture_buffer_params struct release_capture_buffer_params { - struct oss_stream *stream; + stream_handle stream; UINT32 done; HRESULT result; }; @@ -147,42 +147,42 @@ struct get_mix_format_params struct get_buffer_size_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT32 *size; }; struct get_latency_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; REFERENCE_TIME *latency; }; struct get_current_padding_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT32 *padding; }; struct get_next_packet_size_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_frequency_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT64 *frequency; }; struct get_position_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; UINT64 *position; UINT64 *qpctime; @@ -190,7 +190,7 @@ struct get_position_params struct set_volumes_params { - struct oss_stream *stream; + stream_handle stream; float master_volume; const float *volumes; const float *session_volumes; @@ -198,14 +198,14 @@ struct set_volumes_params struct set_event_handle_params { - struct oss_stream *stream; + stream_handle stream; HANDLE event; HRESULT result; }; struct is_started_params { - struct oss_stream *stream; + stream_handle stream; HRESULT result; }; -- 2.25.1

2 1

[PATCH 1/7] wineoss: Pass a client ptr to the callback instead of a stream.
by Huw Davies 04 May '22

04 May '22

This is to allow stream handles to be larger than sizeof(void *). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c282ff14f01..93bf775ebc8 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -252,10 +252,10 @@ static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread) static DWORD WINAPI timer_thread(void *user) { - struct oss_stream *stream = user; struct timer_loop_params params; + struct ACImpl *This = user; - params.stream = stream; + params.stream = This->stream; OSS_CALL(timer_loop, &params); return 0; @@ -913,7 +913,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) OSS_CALL(start, &params); if(SUCCEEDED(params.result) && !This->timer_thread){ - This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL); + This->timer_thread = CreateThread(NULL, 0, timer_thread, This, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } -- 2.25.1

2 1

[PATCH 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Giovanni Mascellani (＠giomasce) 04 May '22

04 May '22

Right now, if the same tracked sample is released at the same time from two different threads it might happen that neither of them calls the callback, because they might go through the critical section at the same time (while neither has decremented the reference count yet). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/29

3 4

[PATCH 0/11] MR36: winex11: PE conversion preparation
by Jacek Caban (＠jacek) 04 May '22

04 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/36

2 11

[PATCH 1/2] ntdll: Add a partial implementation of NtMapViewOfSectionEx().
by Nikolay Sivov 04 May '22

04 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/virtual.c | 149 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/virtual.c | 12 +++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 34 +++++++++ include/winternl.h | 1 + 7 files changed, 200 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ba29b21d61d..a7a39a0bce2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -253,6 +253,7 @@ # @ stub NtMapUserPhysicalPages # @ stub NtMapUserPhysicalPagesScatter @ stdcall -syscall NtMapViewOfSection(long long ptr long long ptr ptr long long long) +@ stdcall -syscall NtMapViewOfSectionEx(long long ptr ptr ptr long long ptr long) # @ stub NtModifyBootEntry @ stdcall -syscall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) @ stdcall -syscall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) @@ -1279,6 +1280,7 @@ # @ stub ZwMapUserPhysicalPages # @ stub ZwMapUserPhysicalPagesScatter @ stdcall -private -syscall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection +@ stdcall -private -syscall ZwMapViewOfSectionEx(long long ptr ptr ptr long long ptr long) NtMapViewOfSectionEx # @ stub ZwModifyBootEntry @ stdcall -private -syscall ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall -private -syscall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..aeef2ed8fb9 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -39,6 +39,9 @@ static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); +static NTSTATUS (WINAPI *pNtMapViewOfSectionEx)(HANDLE, HANDLE, PVOID *, const LARGE_INTEGER *, SIZE_T *, + ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); + static const BOOL is_win64 = sizeof(void*) != sizeof(int); static BOOL is_wow64; @@ -908,6 +911,150 @@ static void test_NtMapViewOfSection(void) CloseHandle(process); } +static void test_NtMapViewOfSectionEx(void) +{ + static const char testfile[] = "testfile.xxx"; + static const char data[] = "test data for NtMapViewOfSectionEx"; + char buffer[sizeof(data)]; + HANDLE file, mapping, process; + DWORD status, written; + SIZE_T size, result; + LARGE_INTEGER offset; + void *ptr, *ptr2; + BOOL ret; + + if (!pNtMapViewOfSectionEx) + { + win_skip("NtMapViewOfSectionEx() is not supported.\n"); + return; + } + + if (!pIsWow64Process || !pIsWow64Process(NtCurrentProcess(), &is_wow64)) is_wow64 = FALSE; + + file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create test file\n"); + WriteFile(file, data, sizeof(data), &written, NULL); + SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetEndOfFile(file); + + /* read/write mapping */ + + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + process = create_target_process("sleep"); + ok(process != NULL, "Can't start process\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + + ret = ReadProcessMemory(process, ptr, buffer, sizeof(buffer), &result); + ok(ret, "ReadProcessMemory failed\n"); + ok(result == sizeof(buffer), "ReadProcessMemory didn't read all data (%Ix)\n", result); + ok(!memcmp(buffer, data, sizeof(buffer)), "Wrong data read\n"); + + /* mapping at the same page conflicts */ + ptr2 = ptr; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); + + /* offset has to be aligned */ + ptr2 = ptr; + size = 0; + offset.QuadPart = 1; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status); + + /* ptr has to be aligned */ + ptr2 = (char *)ptr + 42; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status); + + /* still not 64k aligned */ + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status); + + if (!is_win64 && !is_wow64) + { + /* new memory region conflicts with previous mapping */ + ptr2 = ptr; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); + + ptr2 = (char *)ptr + 42; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status); + + /* in contrary to regular NtMapViewOfSection, only 4kb align is enforced */ + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok((char *)ptr2 == (char *)ptr + 0x1000, + "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2); + status = NtUnmapViewOfSection(process, ptr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + /* the address is rounded down if not on a page boundary */ + ptr2 = (char *)ptr + 0x1001; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok((char *)ptr2 == (char *)ptr + 0x1000, + "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2); + status = NtUnmapViewOfSection(process, ptr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + ptr2 = (char *)ptr + 0x2000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status); + ok((char *)ptr2 == (char *)ptr + 0x2000, + "expected address %p, got %p\n", (char *)ptr + 0x2000, ptr2); + status = NtUnmapViewOfSection(process, ptr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + } + else + { + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0); + todo_wine + ok(status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %08lx\n", status); + } + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + NtClose(mapping); + + CloseHandle(file); + DeleteFileA(testfile); + + TerminateProcess(process, 0); + CloseHandle(process); +} + #define SUPPORTED_XSTATE_FEATURES ((1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | (1 << XSTATE_AVX)) static void test_user_shared_data(void) @@ -1160,6 +1307,7 @@ START_TEST(virtual) pRtlFindExportedRoutineByName = (void *)GetProcAddress(mod, "RtlFindExportedRoutineByName"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); + pNtMapViewOfSectionEx = (void *)GetProcAddress(mod, "NtMapViewOfSectionEx"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#lx\n", sbi.PageSize); @@ -1169,6 +1317,7 @@ START_TEST(virtual) test_NtAllocateVirtualMemory(); test_RtlCreateUserStack(); test_NtMapViewOfSection(); + test_NtMapViewOfSectionEx(); test_user_shared_data(); test_syscalls(); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d1c42ddc0f3..cad760a1445 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -207,6 +207,7 @@ static void * const syscalls[] = NtLockVirtualMemory, NtMakeTemporaryObject, NtMapViewOfSection, + NtMapViewOfSectionEx, NtNotifyChangeDirectoryFile, NtNotifyChangeKey, NtNotifyChangeMultipleKeys, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94b300c5057..02478cceb06 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4536,6 +4536,18 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p offset_ptr, size_ptr, alloc_type, protect ); } +/*********************************************************************** + * NtMapViewOfSectionEx (NTDLL.@) + * ZwMapViewOfSectionEx (NTDLL.@) + */ +NTSTATUS WINAPI NtMapViewOfSectionEx( HANDLE handle, HANDLE process, PVOID *addr_ptr, const LARGE_INTEGER *offset_ptr, + SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, MEM_EXTENDED_PARAMETER *params, ULONG params_count ) +{ + if (params) + FIXME("Ignoring extended parameters.\n"); + + return NtMapViewOfSection( handle, process, addr_ptr, 0, 0, offset_ptr, size_ptr, ViewShare, alloc_type, protect ); +} /*********************************************************************** * NtUnmapViewOfSection (NTDLL.@) diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index a3af9174c49..3b364d909d7 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -108,6 +108,7 @@ SYSCALL_ENTRY( NtLockVirtualMemory ) \ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ SYSCALL_ENTRY( NtMapViewOfSection ) \ + SYSCALL_ENTRY( NtMapViewOfSectionEx ) \ SYSCALL_ENTRY( NtNotifyChangeDirectoryFile ) \ SYSCALL_ENTRY( NtNotifyChangeKey ) \ SYSCALL_ENTRY( NtNotifyChangeMultipleKeys ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e89373f4239..61c84e5d7be 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -287,6 +287,40 @@ NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args ) return status; } +/********************************************************************** + * wow64_NtMapViewOfSectionEx + */ +NTSTATUS WINAPI wow64_NtMapViewOfSectionEx( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE process = get_handle( &args ); + ULONG *addr32 = get_ptr( &args ); + const LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *size32 = get_ptr( &args ); + ULONG alloc = get_ulong( &args ); + ULONG protect = get_ulong( &args ); + MEM_EXTENDED_PARAMETER *params = get_ptr( &args ); + ULONG params_count = get_ulong( &args ); + + void *addr; + SIZE_T size; + NTSTATUS status; + + status = NtMapViewOfSectionEx( handle, process, addr_32to64( &addr, addr32 ), offset, size_32to64( &size, size32 ), alloc, + protect, params, params_count ); + if (NT_SUCCESS(status)) + { + SECTION_IMAGE_INFORMATION info; + + if (!NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL )) + { + if (info.Machine == current_machine) init_image_mapping( addr ); + } + put_addr( addr32, addr ); + put_size( size32, size ); + } + return status; +} /********************************************************************** * wow64_NtProtectVirtualMemory diff --git a/include/winternl.h b/include/winternl.h index b4942d86b4c..1d358fc0b2d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4007,6 +4007,7 @@ NTSYSAPI NTSTATUS WINAPI NtLockFile(HANDLE,HANDLE,PIO_APC_ROUTINE,void*,PIO_STA NTSYSAPI NTSTATUS WINAPI NtLockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtMakeTemporaryObject(HANDLE); NTSYSAPI NTSTATUS WINAPI NtMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG_PTR,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI NtMapViewOfSectionEx(HANDLE,HANDLE,PVOID*,const LARGE_INTEGER*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeMultipleKeys(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); -- 2.35.1

1 1

[PATCH 0/5] MR33: windows.gaming.input: Split async info to a separate struct.
by Rémi Bernon (＠rbernon) 04 May '22

04 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/33

2 5

[PATCH v3 0/5] MR25: mf/tests: Add dmo / transform tests for the audio resampler and color converters.
by Rémi Bernon (＠rbernon) 04 May '22

04 May '22

I believe this doesn't conflict with https://gitlab.winehq.org/wine/wine/-/merge_requests/22 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 -- v3: mf/tests: Add tests for the ColorConvertDMO video transform. mf/tests: Check VideoProcessorMFT transform media types. mf/tests: Add tests for the ResamplerMediaObject audio transform. mf/tests: Add more DMO class name, media type and interface checks. mf/tests: Check expected class GUID in create_transform. https://gitlab.winehq.org/wine/wine/-/merge_requests/25

2 5

[PATCH v2 0/1] MR23: shell32: Sanitize Program Manager icon and group names
by Alex Henrie (＠alexhenrie) 04 May '22

04 May '22

All of the new tests that are marked todo_wine fail because Wine's PathCombineW does not handle ".", "...", "....", or "foobar." correctly. They will pass once PathCombineW is fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v2: shell32: Sanitize Program Manager icon and group names https://gitlab.winehq.org/wine/wine/-/merge_requests/23

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel