Henri Verbeet : d3drm: Get rid of the Header typedef.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Oct  3 23:31:48 2013 +0200

d3drm: Get rid of the Header typedef.

---

dlls/d3drm/d3drm.c         |   10 +++++-----
 dlls/d3drm/d3drm_private.h |    5 +++--
 dlls/d3drm/meshbuilder.c   |    9 +++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index e1aa368..0ab62de 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -1326,7 +1326,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
     HRESULT hr;
     const GUID* pGuid;
     DWORD size;
-    Header* pHeader;
+    struct d3drm_file_header *header;
     HRESULT ret = D3DRMERR_BADOBJECT;
     DWORD i;

@@ -1382,14 +1382,14 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
         goto end;
     }

-    hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&pHeader);
-    if ((hr != DXFILE_OK) || (size != sizeof(Header)))
+    hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&header);
+    if ((hr != DXFILE_OK) || (size != sizeof(*header)))
         goto end;

-    TRACE("Version is %d %d %d\n", pHeader->major, pHeader->minor, pHeader->flags);
+    TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags);

/* Version must be 1.0.x */
-    if ((pHeader->major != 1) || (pHeader->minor != 0))
+    if ((header->major != 1) || (header->minor != 0))
     {
         ret = D3DRMERR_BADFILE;
         goto end;
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index d1f30be..3daf96a 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -37,11 +37,12 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HID
 HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data,
                        D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN;

-typedef struct {
+struct d3drm_file_header
+{
     WORD major;
     WORD minor;
     DWORD flags;
-} Header;
+};

extern char templates[];

diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index c198531..0262284 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -1521,11 +1521,12 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
     IDirectXFileData *data = NULL;
     const GUID* guid;
     DWORD size;
-    Header* header;
+    struct d3drm_file_header *header;
     HRESULT hr;
     HRESULT ret = D3DRMERR_BADOBJECT;

-    TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg);
+    TRACE("iface %p, filename %p, name %p, loadflags %#x, cb %p, arg %p.\n",
+            iface, filename, name, loadflags, cb, arg);

clean_mesh_builder_data(This);

@@ -1573,10 +1574,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
     }

hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&header);
-    if ((hr != DXFILE_OK) || (size != sizeof(Header)))
+    if ((hr != DXFILE_OK) || (size != sizeof(*header)))
         goto end;

-    TRACE("Version is %d %d %d\n", header->major, header->minor, header->flags);
+    TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags);

/* Version must be 1.0.x */
     if ((header->major != 1) || (header->minor != 0))