Henri Verbeet : d3d10: Add a short description to skip_dword_unknown().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Sun Dec 11 21:43:29 2011 +0100

d3d10: Add a short description to skip_dword_unknown().

---

dlls/d3d10/d3d10_private.h |    2 +-
 dlls/d3d10/effect.c        |   12 ++++++------
 dlls/d3d10/utils.c         |    8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index f44afe0..e60ac9d 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -252,7 +252,7 @@ static inline void write_dword(char **ptr, DWORD d)
     *ptr += sizeof(d);
 }

-void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN;
+void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN;
 void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN;

#endif /* __WINE_D3D10_PRIVATE_H */
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index ca10ba5..350f63b 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -144,7 +144,7 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct
     read_dword(&ptr, &count);
     TRACE("%u elements\n", count);

-    skip_dword_unknown(&ptr, 1);
+    skip_dword_unknown("shader signature", &ptr, 1);

e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e));
     if (!e)
@@ -825,7 +825,7 @@ static HRESULT parse_fx10_annotation(struct d3d10_effect_variable *a, const char
     hr = parse_fx10_variable_head(a, ptr, data);
     if (FAILED(hr)) return hr;

-    skip_dword_unknown(ptr, 1);
+    skip_dword_unknown("annotation", ptr, 1);

/* mark the variable as annotation */
     a->flag = D3D10_EFFECT_VARIABLE_ANNOTATION;
@@ -1160,7 +1160,7 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char *
     read_dword(ptr, &v->buffer_offset);
     TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset);

-    skip_dword_unknown(ptr, 1);
+    skip_dword_unknown("variable", ptr, 1);

read_dword(ptr, &v->flag);
     TRACE("Variable flag: %#x.\n", v->flag);
@@ -1208,7 +1208,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const
     }
     TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic));

-    skip_dword_unknown(ptr, 1);
+    skip_dword_unknown("local variable", ptr, 1);

switch (v->type->basetype)
     {
@@ -1266,7 +1266,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const

for (j = 0; j < object_count; ++j)
                 {
-                    skip_dword_unknown(ptr, 4);
+                    skip_dword_unknown("state object attribute", ptr, 4);
                 }
             }
             break;
@@ -1363,7 +1363,7 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch
     read_dword(ptr, &l->type->member_count);
     TRACE("Local buffer member count: %#x.\n", l->type->member_count);

-    skip_dword_unknown(ptr, 1);
+    skip_dword_unknown("local buffer", ptr, 1);

read_dword(ptr, &l->annotation_count);
     TRACE("Local buffer has %u annotations.\n", l->annotation_count);
diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c
index 6806e5e..6bb7d05 100644
--- a/dlls/d3d10/utils.c
+++ b/dlls/d3d10/utils.c
@@ -146,12 +146,12 @@ void d3d10_rb_free(void *ptr)
     HeapFree(GetProcessHeap(), 0, ptr);
 }

-void skip_dword_unknown(const char **ptr, unsigned int count)
+void skip_dword_unknown(const char *location, const char **ptr, unsigned int count)
 {
     unsigned int i;
     DWORD d;

-    FIXME("Skipping %u unknown DWORDs:\n", count);
+    FIXME("Skipping %u unknown DWORDs (%s):\n", count, location);
     for (i = 0; i < count; ++i)
     {
         read_dword(ptr, &d);
@@ -191,9 +191,9 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size,
     }

/* checksum? */
-    skip_dword_unknown(&ptr, 4);
+    skip_dword_unknown("DXBC header", &ptr, 4);

-    skip_dword_unknown(&ptr, 1);
+    skip_dword_unknown("DXBC header", &ptr, 1);

read_dword(&ptr, &total_size);
     TRACE("total size: %#x\n", total_size);