Christian Costa : d3dxof: Fix IDirectXFileDataImpl_GetType.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5c518d91e0070d2a8a45840c8cd3ec4e6e9bef6a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c518d91e0070d2a8a45840c8cd3ec4e6e9bef6a

Author: Christian Costa <titan.costa at wanadoo.fr>
Date:   Thu Sep 18 21:47:40 2008 +0200

d3dxof: Fix IDirectXFileDataImpl_GetType.

---

 dlls/d3dxof/d3dxof.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index 08d2885..23e4847 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/dlls/d3dxof/d3dxof.c
@@ -1390,8 +1390,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons
   if (!pguid)
     return DXFILEERR_BADVALUE;
 
-  /* Native dll returns object guid instead of object template one */
-  memcpy(&guid, &This->pobj->class_id, 16);
+  memcpy(&guid, &This->pobj->type, 16);
   *pguid = &guid;
 
   return DXFILE_OK;
@@ -1803,6 +1802,7 @@ static BOOL parse_object(parse_buffer * buf)
     if (!strcmp((char*)buf->value, buf->pdxf->xtemplates[i].name))
     {
       buf->pxt[buf->level] = &buf->pdxf->xtemplates[i];
+      memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16);
       break;
     }
   }
@@ -1811,6 +1811,7 @@ static BOOL parse_object(parse_buffer * buf)
     FIXME("Unknown template %s\n", (char*)buf->value);
     return FALSE;
   }
+
   if (check_TOKEN(buf) == TOKEN_NAME)
   {
     parse_TOKEN(buf);