Re: [PATCH 4/4] d3dx9_36: Remove todo in tests as it works now with last d3dxof fixes.

[Christian Costa]

Le 30/04/2013 14:14, Matteo Bruni a écrit :

2013/4/29 Christian Costa <titan.co...@gmail.com>:

---
  dlls/d3dx9_36/tests/xfile.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c
index 1238bcd..e514a5f 100644
--- a/dlls/d3dx9_36/tests/xfile.c
+++ b/dlls/d3dx9_36/tests/xfile.c
@@ -77,7 +77,7 @@ static void test_templates(void)
      ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected 
%#x\n", ret, D3DXFERR_BADFILEFLOATSIZE);

      ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, 
templates_parse_error, sizeof(templates_parse_error) - 1);
-    todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, 
expected %#x\n", ret, D3DXFERR_PARSEERROR);
+    ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected 
%#x\n", ret, D3DXFERR_PARSEERROR);

      ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, 
sizeof(templates) - 1);
      ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret);

Hi Christian,
good catch for that todo_wine. However, this should be merged with the
patch actually fixing the test (I guess it's patch 2).

Hi Matteo,
Indeed but Alexandre beat me at it. ;)