From ce313a5b0ee30c02da36d39d8adb38bf095b9e6d Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@wanadoo.fr>
Date: Fri, 29 Aug 2008 11:11:54 +0200
Subject: [PATCH] d3dxof: Fix guid syntax.

---
 dlls/d3dxof/d3dxof.c       | 4 ++--
 dlls/d3dxof/tests/d3dxof.c | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index 128134668a..30c8bdbd29 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/dlls/d3dxof/d3dxof.c
@@ -77,7 +77,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 #define TOKEN_CSTRING     51
 #define TOKEN_ARRAY       52
 
-#define CLSIDFMT "<%08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X>"
+#define CLSIDFMT "<%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X>"
 
 typedef struct {
   /* Buffer to parse */
@@ -383,7 +383,7 @@ static BOOL is_guid(parse_buffer* buf)
   }
   tmp[pos++] = '>';
   tmp[pos] = 0;
-  if (pos != 37 /* <+35+> */)
+  if (pos != 38 /* <+36+> */)
   {
     TRACE("Wrong guid %s (%d) \n", tmp, pos);
     return FALSE;
diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c
index b38fa5d61b..bdc1431034 100644
--- a/dlls/d3dxof/tests/d3dxof.c
+++ b/dlls/d3dxof/tests/d3dxof.c
@@ -30,10 +30,10 @@ char template[] =
 "xof 0302txt 0064\n"
 "template Header\n"
 "{\n"
-"<3D82AB43-62DA-11CF-AB390020AF71E433>\n"
-"WORD major ;\n"
-"WORD minor ;\n"
-"DWORD flags ;\n"
+"<3D82AB43-62DA-11CF-AB39-0020AF71E433>\n"
+"WORD major;\n"
+"WORD minor;\n"
+"DWORD flags;\n"
 "}\n";
 
 static void init_function_pointers(void)
@@ -79,7 +79,6 @@ static void test_d3dxof(void)
     ref = IDirectXFile_Release(lpDirectXFile);
     ok(ref == 1, "Got refcount %ld, expected 1\n", ref);
 
-    /* RegisterTemplates does not support txt format yet */
     hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, strlen(template));
     ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr);