May 2013 - Wine-Commits - list.winehq.org

Christian Costa : d3dcompiler: Add a LUT to find compilation targets info.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 6e77816301dfca0e07de2625daf8b358128ad879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e77816301dfca0e07de2625d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:55:51 2013 +0200 d3dcompiler: Add a LUT to find compilation targets info. --- dlls/d3dcompiler_43/compiler.c | 135 ++++++++++++++++++++++++----- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 +- 2 files changed, 115 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4942985..985fc72 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -490,6 +490,103 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } +struct target_info { + const char *name; + enum shader_type type; + DWORD sm_major; + DWORD sm_minor; + DWORD level_major; + DWORD level_minor; + BOOL sw; + BOOL support; +}; + +/* Must be kept sorted for binary search */ +static const struct target_info targets_info[] = { + { "cs_4_0", ST_UNKNOWN, 4, 0, 0, 0, FALSE, FALSE }, + { "cs_4_1", ST_UNKNOWN, 4, 1, 0, 0, FALSE, FALSE }, + { "cs_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "ds_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "fx_2_0", ST_UNKNOWN, 2, 0, 0, 0, FALSE, FALSE }, + { "fx_4_0", ST_UNKNOWN, 4, 0, 0, 0, FALSE, FALSE }, + { "fx_4_1", ST_UNKNOWN, 4, 1, 0, 0, FALSE, FALSE }, + { "fx_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "gs_4_0", ST_UNKNOWN, 4, 0, 0, 0, FALSE, FALSE }, + { "gs_4_1", ST_UNKNOWN, 4, 1, 0, 0, FALSE, FALSE }, + { "gs_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "hs_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "ps.1.0", ST_PIXEL, 1, 0, 0, 0, FALSE, TRUE }, + { "ps.1.1", ST_PIXEL, 1, 1, 0, 0, FALSE, FALSE }, + { "ps.1.2", ST_PIXEL, 1, 2, 0, 0, FALSE, FALSE }, + { "ps.1.3", ST_PIXEL, 1, 3, 0, 0, FALSE, FALSE }, + { "ps.1.4", ST_PIXEL, 1, 4, 0, 0, FALSE, FALSE }, + { "ps.2.0", ST_PIXEL, 2, 0, 0, 0, FALSE, TRUE }, + { "ps.2.a", ST_PIXEL, 2, 1, 0, 0, FALSE, FALSE }, + { "ps.2.b", ST_PIXEL, 2, 2, 0, 0, FALSE, FALSE }, + { "ps.2.sw", ST_PIXEL, 2, 0, 0, 0, TRUE, FALSE }, + { "ps.3.0", ST_PIXEL, 3, 0, 0, 0, FALSE, TRUE }, + { "ps_1_0", ST_PIXEL, 1, 0, 0, 0, FALSE, TRUE }, + { "ps_1_1", ST_PIXEL, 1, 1, 0, 0, FALSE, FALSE }, + { "ps_1_2", ST_PIXEL, 1, 2, 0, 0, FALSE, FALSE }, + { "ps_1_3", ST_PIXEL, 1, 3, 0, 0, FALSE, FALSE }, + { "ps_1_4", ST_PIXEL, 1, 4, 0, 0, FALSE, FALSE }, + { "ps_2_0", ST_PIXEL, 2, 0, 0, 0, FALSE, TRUE }, + { "ps_2_a", ST_PIXEL, 2, 1, 0, 0, FALSE, FALSE }, + { "ps_2_b", ST_PIXEL, 2, 2, 0, 0, FALSE, FALSE }, + { "ps_2_sw", ST_PIXEL, 2, 0, 0, 0, TRUE, FALSE }, + { "ps_3_0", ST_PIXEL, 3, 0, 0, 0, FALSE, TRUE }, + { "ps_3_sw", ST_PIXEL, 3, 0, 0, 0, TRUE, FALSE }, + { "ps_4_0", ST_PIXEL, 4, 0, 0, 0, FALSE, TRUE }, + { "ps_4_0_level_9_0", ST_PIXEL, 4, 0, 9, 0, FALSE, FALSE }, + { "ps_4_0_level_9_1", ST_PIXEL, 4, 0, 9, 1, FALSE, FALSE }, + { "ps_4_0_level_9_3", ST_PIXEL, 4, 0, 9, 3, FALSE, FALSE }, + { "ps_4_1", ST_PIXEL, 4, 1, 0, 0, FALSE, TRUE }, + { "ps_5_0", ST_PIXEL, 5, 0, 0, 0, FALSE, TRUE }, + { "tx_1_0", ST_UNKNOWN, 1, 0, 0, 0, FALSE, FALSE }, + { "vs.1.0", ST_VERTEX, 1, 0, 0, 0, FALSE, TRUE }, + { "vs.1.1", ST_VERTEX, 1, 1, 0, 0, FALSE, TRUE }, + { "vs.2.0", ST_VERTEX, 2, 0, 0, 0, FALSE, TRUE }, + { "vs.2.a", ST_VERTEX, 2, 1, 0, 0, FALSE, FALSE }, + { "vs.2.sw", ST_VERTEX, 2, 0, 0, 0, TRUE, FALSE }, + { "vs.3.0", ST_VERTEX, 3, 0, 0, 0, FALSE, TRUE }, + { "vs.3.sw", ST_VERTEX, 3, 0, 0, 0, TRUE, FALSE }, + { "vs_1_0", ST_VERTEX, 1, 0, 0, 0, FALSE, TRUE }, + { "vs_1_1", ST_VERTEX, 1, 1, 0, 0, FALSE, TRUE }, + { "vs_2_0", ST_VERTEX, 2, 0, 0, 0, FALSE, TRUE }, + { "vs_2_a", ST_VERTEX, 2, 1, 0, 0, FALSE, FALSE }, + { "vs_2_sw", ST_VERTEX, 2, 0, 0, 0, TRUE, FALSE }, + { "vs_3_0", ST_VERTEX, 3, 0, 0, 0, FALSE, TRUE }, + { "vs_3_sw", ST_VERTEX, 3, 0, 0, 0, TRUE, FALSE }, + { "vs_4_0", ST_VERTEX, 4, 0, 0, 0, FALSE, TRUE }, + { "vs_4_0_level_9_0", ST_VERTEX, 4, 0, 9, 0, FALSE, FALSE }, + { "vs_4_0_level_9_1", ST_VERTEX, 4, 0, 9, 1, FALSE, FALSE }, + { "vs_4_0_level_9_3", ST_VERTEX, 4, 0, 9, 3, FALSE, FALSE }, + { "vs_4_1", ST_VERTEX, 4, 1, 0, 0, FALSE, TRUE }, + { "vs_5_0", ST_VERTEX, 5, 0, 0, 0, FALSE, TRUE }, +}; + +static const struct target_info * get_target_info(const char *target) +{ + LONG min = 0; + LONG max = sizeof(targets_info) / sizeof(targets_info[0]) - 1; + LONG cur; + int res; + + while (min <= max) + { + cur = (min + max) / 2; + res = strcmp(target, targets_info[cur].name); + if (res < 0) + max = cur - 1; + else if (res > 0) + min = cur + 1; + else + return &targets_info[cur]; + } + + return NULL; +} + static HRESULT compile_shader(const char *preproc_shader, const char *target, const char *entrypoint, ID3DBlob **shader_blob, ID3DBlob **error_messages) { @@ -500,38 +597,32 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co ID3DBlob *buffer; char *pos; enum shader_type shader_type; + const struct target_info *info; TRACE("Preprocessed shader source: %s\n", debugstr_a(preproc_shader)); - TRACE("Parsing compilation target %s.\n", debugstr_a(target)); - if (strlen(target) != 6 || target[1] != 's' || target[2] != '_' || target[4] != '_') + TRACE("Checking compilation target %s\n", debugstr_a(target)); + info = get_target_info(target); + if (!info) { - FIXME("Unknown compilation target %s.\n", debugstr_a(target)); + FIXME("Unknown compilation target %s\n", debugstr_a(target)); return D3DERR_INVALIDCALL; } - - if (target[0] == 'v') - shader_type = ST_VERTEX; - else if (target[0] == 'p') - shader_type = ST_PIXEL; else { - FIXME("Unsupported shader target type %s.\n", debugstr_a(target)); - return D3DERR_INVALIDCALL; + if (!info->support) + { + FIXME("Compilation target %s not yet supported\n", debugstr_a(target)); + return D3DERR_INVALIDCALL; + } + else + { + shader_type = info->type; + major = info->sm_major; + minor = info->sm_minor; + } } - major = target[3] - '0'; - if (major == 0 || major > 5) - { - FIXME("Unsupported shader target major version %d.\n", major); - return D3DERR_INVALIDCALL; - } - minor = target[5] - '0'; - if (minor > 1 || (minor == 1 && (shader_type != ST_VERTEX || major > 1))) - { - FIXME("Unsupported shader target minor version %d.\n", minor); - return D3DERR_INVALIDCALL; - } shader = parse_hlsl_shader(preproc_shader, shader_type, major, minor, entrypoint, &messages); if (messages) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index c8a92f1..d25b4e5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -49,8 +49,9 @@ const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) D enum shader_type { + ST_UNKNOWN, ST_VERTEX, - ST_PIXEL, + ST_PIXEL }; typedef enum BWRITER_COMPARISON_TYPE {

1 0

Francois Gouget : comdlg32/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: fb9d76816a6fea4957fad8485ff8a2792418d4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9d76816a6fea4957fad8485… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 12 13:55:27 2013 +0200 comdlg32/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/comdlg32/tests/printdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 7acbdb0..83be893 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -255,7 +255,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1234 || broken(pDlg->nCopies == 1), "expected nCopies 1234, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(dm->dmCopies == 1, "expected dm->dmCopies 1, got %d\n", dm->dmCopies); + ok(S1(U1(*dm)).dmCopies == 1, "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); @@ -269,7 +269,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(dm->dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", dm->dmCopies); + ok(S1(U1(*dm)).dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames);

1 0

Sam Edwards : winex11: Cache XRandR 1.0 display mode.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 3fc2bccac25c93f820afab53bddd5b228c169b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc2bccac25c93f820afab53b… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Fri May 10 09:51:21 2013 -0600 winex11: Cache XRandR 1.0 display mode. --- dlls/winex11.drv/xrandr.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5ec8842..36b9fe9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ static int primary_crtc; static struct x11drv_mode_info *dd_modes; static SizeID *xrandr10_modes; static unsigned int xrandr_mode_count; +static int xrandr_current_mode = -1; static int load_xrandr(void) { @@ -125,6 +126,9 @@ static int xrandr10_get_current_mode(void) unsigned int i; int res = -1; + if (xrandr_current_mode != -1) + return xrandr_current_mode; + sc = pXRRGetScreenInfo (gdi_display, DefaultRootWindow( gdi_display )); size = pXRRConfigCurrentConfiguration (sc, &rot); rate = pXRRConfigCurrentRate (sc); @@ -141,8 +145,10 @@ static int xrandr10_get_current_mode(void) if (res == -1) { ERR("In unknown mode, returning default\n"); - res = 0; + return 0; } + + xrandr_current_mode = res; return res; } @@ -177,6 +183,7 @@ static LONG xrandr10_set_current_mode( int mode ) if (stat == RRSetConfigSuccess) { + xrandr_current_mode = mode; X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); return DISP_CHANGE_SUCCESSFUL; }

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.30
by Jeremy Newman May 13, 2013

May 13, 2013

Module: website Branch: master Commit: 3957b0d0121716373bcbd2471074ed43e92d491c URL: http://source.winehq.org/git/website.git/?a=commit;h=3957b0d0121716373bcbd2… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat May 11 13:04:54 2013 +0800 Simplified Chinese translation for release 1.5.30 --- news/zh-cn/2013051001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013051001.xml b/news/zh-cn/2013051001.xml new file mode 100644 index 0000000..b9db394 --- /dev/null +++ b/news/zh-cn/2013051001.xml @@ -0,0 +1,15 @@ +<news> +<date>五月 10, 2013</date> +<title>Wine 1.5.30 发布</title> +<body> + Wine 开发版 1.5.30 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.30">更新</a>： +<ul> + <li>Mac 后端驱动对鼠标捕获的支持。</li> + <li>WinHTTP 的 NTLM 和 Negotiate 认证。</li> + <li>WinInet 对代理旁路的支持。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.30
by Jeremy Newman May 13, 2013

May 13, 2013

Module: website Branch: master Commit: 59f5869340caa7eedc4b167859809522a24e998f URL: http://source.winehq.org/git/website.git/?a=commit;h=59f5869340caa7eedc4b16… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 10 21:50:21 2013 +0200 French translation for release 1.5.30 --- news/fr/2013051001.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013051001.xml b/news/fr/2013051001.xml new file mode 100644 index 0000000..1c3945d --- /dev/null +++ b/news/fr/2013051001.xml @@ -0,0 +1,14 @@ +<news> +<date>10 mai 2013</date> +<title>Sortie de Wine 1.5.30</title> +<body> + La version de développement 1.5.30 de Wine est disponible. + <a href="{$root}/announce/1.5.30">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la capture de la souris dans le pilote Mac.</li> + <li>Authentification NTLM et Negotiate dans WinHTTP.</li> + <li>Prise en charge du contournement de proxy dans WinInet.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.5.30 freigegeben
by Jeremy Newman May 13, 2013

May 13, 2013

Module: website Branch: master Commit: eb1836f1a9d912fd4555607ff3f597f00be143fe URL: http://source.winehq.org/git/website.git/?a=commit;h=eb1836f1a9d912fd455560… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 15:55:55 2013 +0200 Wine 1.5.30 freigegeben --- news/de/2013051001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013051001.xml b/news/de/2013051001.xml new file mode 100644 index 0000000..b444868 --- /dev/null +++ b/news/de/2013051001.xml @@ -0,0 +1,15 @@ +<news> +<date>10. Mai 2013</date> +<title>Wine 1.5.30 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.30 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.30">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Erfassung von Mausbewegungen im Mac Treiber.</li> + <li>NTLM und Negotiate Authentifikation in WinHTTP.</li> + <li>Unterstützung für Proxy Umgehung in WinInet.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.30
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: website Branch: master Commit: 43580ef26ccb6ba611d6106f47814dc67952153c URL: http://source.winehq.org/git/website.git/?a=commit;h=43580ef26ccb6ba611d610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 20:40:47 2013 +0200 Wine release 1.5.30 --- news/en/2013051001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013051001.xml b/news/en/2013051001.xml new file mode 100644 index 0000000..a3ae900 --- /dev/null +++ b/news/en/2013051001.xml @@ -0,0 +1,15 @@ +<news> +<date>May 10, 2013</date> +<title>Wine 1.5.30 Released</title> +<body> + The Wine development release 1.5.30 is now available. + <a href="{$root}/announce/1.5.30">What's new</a> in this release: +<ul> + <li>Mouse capture support in the Mac driver.</li> + <li>NTLM and Negotiate authentication in WinHTTP.</li> + <li>Support for proxy bypass in WinInet.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.30 : Alexandre Julliard : Release 1.5.30
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: refs/tags/wine-1.5.30 Tag: 4476473ea9cffcb5fd8dd18fa608122e2d6d861c URL: http://source.winehq.org/git/wine.git/?a=tag;h=4476473ea9cffcb5fd8dd18fa608… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 20:30:10 2013 +0200 Release 1.5.30

1 0

Alexandre Julliard : Release 1.5.30.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: 35aaa42669f0e5048b0f3b7583ec8230a5f4d7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=35aaa42669f0e5048b0f3b758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 20:30:10 2013 +0200 Release 1.5.30. --- ANNOUNCE | 633 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 298 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35aaa42669f0e5048b0f3…

1 0

Christian Costa : d3dx9_36/tests: Add dump function for X files.
by Alexandre Julliard May 10, 2013

May 10, 2013

Module: wine Branch: master Commit: 5966a087d3eece749f62ae8bb8fb89c588049948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5966a087d3eece749f62ae8bb… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 8 07:31:43 2013 +0200 d3dx9_36/tests: Add dump function for X files. --- dlls/d3dx9_36/tests/xfile.c | 149 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index e514a5f..49c96ea 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> + #include "wine/test.h" #include "d3dx9.h" #include "d3dx9xof.h" @@ -126,8 +128,155 @@ static void test_lock_unlock(void) d3dxfile->lpVtbl->Release(d3dxfile); } +static inline void debugstr_guid(char* buf, const GUID *id) +{ + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); +} + +static void process_data(ID3DXFileData *xfile_data, int level) +{ + HRESULT ret; + char name[100]; + GUID clsid; + GUID clsid_type; + char str_clsid[40]; + char str_clsid_type[40]; + SIZE_T len = sizeof(name); + int i; + const BYTE *data; + SIZE_T size; + SIZE_T children; + + ret = xfile_data->lpVtbl->GetId(xfile_data, &clsid); + ok(ret == S_OK, "ID3DXFileData_GetId failed with %#x\n", ret); + ret = xfile_data->lpVtbl->GetName(xfile_data, name, &len); + ok(ret == S_OK, "ID3DXFileData_GetName failed with %#x\n", ret); + ret = xfile_data->lpVtbl->GetType(xfile_data, &clsid_type); + ok(ret == S_OK, "IDirectXFileData_GetType failed with %#x\n", ret); + ret = xfile_data->lpVtbl->Lock(xfile_data, &size, (const void**)&data); + ok(ret == S_OK, "IDirectXFileData_Lock failed with %#x\n", ret); + + for (i = 0; i < level; i++) + printf(" "); + debugstr_guid(str_clsid, &clsid); + debugstr_guid(str_clsid_type, &clsid_type); + + printf("Found object '%s' - %s - %s - %lu\n", len ? name : "", str_clsid, str_clsid_type, size); + + if (size) + { + int j; + for (j = 0; j < size; j++) + { + if (j && !(j%16)) + printf("\n"); + printf("%02x ", data[j]); + } + printf("\n"); + } + + ret = xfile_data->lpVtbl->Unlock(xfile_data); + ok(ret == S_OK, "ID3DXFileData_Unlock failed with %#x\n", ret); + + ret = xfile_data->lpVtbl->GetChildren(xfile_data, &children); + ok(ret == S_OK, "ID3DXFileData_GetChildren failed with %#x\n", ret); + + level++; + + for (i = 0; i < children; i++) + { + ID3DXFileData *child; + int j; + + ret = xfile_data->lpVtbl->GetChild(xfile_data, i, &child); + ok(ret == S_OK, "ID3DXFileData_GetChild failed with %#x\n", ret); + for (j = 0; j < level; j++) + printf(" "); + if (child->lpVtbl->IsReference(child)) + printf("Found Data Reference (%d)\n", i + 1); + else + printf("Found Data (%d)\n", i + 1); + + process_data(child, level); + + child->lpVtbl->Release(child); + } +} + +/* Dump an X file 'objects.x' and its related templates file 'templates.x' if they are both presents + * Useful for debug by comparing outputs from native and builtin dlls */ +static void test_dump(void) +{ + HRESULT ret; + ULONG ref; + ID3DXFile *xfile = NULL; + ID3DXFileEnumObject *xfile_enum_object = NULL; + HANDLE file; + void *data; + DWORD size; + SIZE_T children; + int i; + + /* Dump data only if there is an object and a template */ + file = CreateFileA("objects.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) + return; + CloseHandle(file); + + file = CreateFileA("templates.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) + return; + + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 10000); + + if (!ReadFile(file, data, 10000, &size, NULL)) + { + skip("Templates file is too big\n"); + goto exit; + } + + printf("Load templates file (%d bytes)\n", size); + + ret = D3DXFileCreate(&xfile); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + ret = xfile->lpVtbl->RegisterTemplates(xfile, data, size); + ok(ret == S_OK, "ID3DXFileImpl_RegisterTemplates failed with %#x\n", ret); + + ret = xfile->lpVtbl->CreateEnumObject(xfile, (void*)"objects.x", D3DXF_FILELOAD_FROMFILE, &xfile_enum_object); + ok(ret == S_OK, "ID3DXFile_CreateEnumObject failed with %#x\n", ret); + + ret = xfile_enum_object->lpVtbl->GetChildren(xfile_enum_object, &children); + ok(ret == S_OK, "ID3DXFileEnumObject_GetChildren failed with %#x\n", ret); + + for (i = 0; i < children; i++) + { + ID3DXFileData *child; + ret = xfile_enum_object->lpVtbl->GetChild(xfile_enum_object, i, &child); + ok(ret == S_OK, "ID3DXFileEnumObject_GetChild failed with %#x\n", ret); + printf("\n"); + process_data(child, 0); + child->lpVtbl->Release(child); + } + + ref = xfile_enum_object->lpVtbl->Release(xfile_enum_object); + ok(ref == 0, "Got refcount %u, expected 0\n", ref); + + ref = xfile->lpVtbl->Release(xfile); + ok(ref == 0, "Got refcount %u, expected 0\n", ref); + + +exit: + CloseHandle(file); + HeapFree(GetProcessHeap(), 0, data); +} + START_TEST(xfile) { test_templates(); test_lock_unlock(); + test_dump(); }

1 0