There's no need to add this to d3drm.c and d3drm3.c. The versions in d3drm1.c, d3drm2.c and d3drm3.c are enough. Ideally d3drm.c will go away at some point.
I was planning in removing them from the start - but I must've forgotten to remove them while sending the patch over. I'll do the same and resend the patches.
- hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n",
hr);
- test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests,
sizeof(tests) / sizeof(*tests));
- IDirect3DRM_Release(d3drm);
This test is version independent because there is only one way to create the d3drm object. You can just keep it in d3drm.c for now, or move it to d3drm1.c in a separate patch if you want.
So I should remove this test from d3drm1.c, d3drm2.c and d3drm3.c aswell? I'll keep this test in d3drm.c as it is. I agree that we should keep version independent tests in d3drm.c, and the rest in their respective files.
--- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -2,4 +2,7 @@ TESTDLL = d3drm.dll IMPORTS = d3drm dxguid ddraw user32 uuid C_SRCS = \ d3drm.c \
d3drm1.c \d3drm2.c \d3drm3.c \ vector.cThis doesn't match the Makefile.in file I have. You have a reordered IMPORTS line. This is why the testbot failed. Do you have other patches in your tree?
I might've modified them a couple weeks ago. I'll resend the patch with the proper ordered Makefile.in
+* Copyright 2012 Andr� Hentschel
This shows up wrong in my mail client. It may be a setup issue on my side. It shows up OK on http://source.winehq.org/patches/data/110484 when viewed with the browser, but if I download the patch with wget it is broken as well. Please make sure your text editor is configured to save the files as UTF8.
I used visual studio to copy these lines from d3drm.c. I'll fix it
accordingly and resend the patch.