-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Am 2015-04-01 um 18:15 schrieb Aaryaman Vasishta:
+++ b/dlls/d3drm/tests/d3drm.c @@ -1841,6 +1841,104 @@ static void test_d3drm_qi(void) IDirect3DRM_Release(d3drm); }
+static void test_frame_qi(void) +{
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.
- 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.
--- 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.c
This 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?
+* 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.
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.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Am 2015-04-01 um 19:43 schrieb Aaryaman Vasishta:
I agree that we should keep version independent tests in d3drm.c, and the rest in their respective files.
No, the idea is to have only d3drm1.c, d3drm2.c and d3drm3.c. I don't expect many version independent tests that deal with IDirect3DRM. I think this test is the only one, since everything else can be accessed through IDirect3DRM, IDirect3DRM2 and IDirect3DRM3.
There are some math and vector helper functions that are independent of the d3drm COM interfaces and are thus not versioned. They are in vector.c, and I think that's a good place for them.
On 1 April 2015 at 19:34, Stefan Dösinger stefandoesinger@gmail.com wrote:
+* Copyright 2012 Andr� Hentschel
This shows up wrong in my mail client. It may be a setup issue on my side.
It's not. It only looks correct on the patches site because it gets the encoding wrong, if you force it to utf-8 it's broken there as well.
-
Aaryaman Vasishta -
Henri Verbeet -
Stefan Dösinger