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

Andrew Eikum : winmm: Don't count unused frames.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 0627ddcf1528c98ad6b2a5efb56184b80a3b6198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0627ddcf1528c98ad6b2a5efb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 26 14:17:06 2013 -0500 winmm: Don't count unused frames. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 76d624a..752e64d 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1901,7 +1901,7 @@ static void WID_PullData(WINMM_Device *device) if(packet > 0) WARN("losing %u frames\n", packet); - device->played_frames += packet_len; + device->played_frames += packet_len - packet; } exit:

1 0

Rico Schüller : d3dx9: Use d3dx_technique instead of D3DXHANDLE.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 695921564bcdb559505d755c53c0652c913cde02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=695921564bcdb559505d755c5… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 09:51:44 2013 +0200 d3dx9: Use d3dx_technique instead of D3DXHANDLE. --- dlls/d3dx9_36/effect.c | 98 ++++++++++++++++------------------------------- 1 files changed, 34 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=695921564bcdb559505d7…

1 0

Rico Schüller : d3dx9: Use d3dx_pass instead of D3DXHANDLE.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: cb4724558509df8454712b88fdb726938c6dd58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4724558509df8454712b88f… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 09:51:53 2013 +0200 d3dx9: Use d3dx_pass instead of D3DXHANDLE. --- dlls/d3dx9_36/effect.c | 73 ++++++++++++++++------------------------------- 1 files changed, 25 insertions(+), 48 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f9207f0..0be0d1e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -149,7 +149,7 @@ struct d3dx_technique UINT annotation_count; D3DXHANDLE *annotation_handles; - D3DXHANDLE *pass_handles; + struct d3dx_pass *passes; }; struct ID3DXBaseEffectImpl @@ -175,7 +175,7 @@ struct ID3DXEffectImpl struct IDirect3DDevice9 *device; struct ID3DXEffectPool *pool; struct d3dx_technique *active_technique; - D3DXHANDLE active_pass; + struct d3dx_pass *active_pass; ID3DXBaseEffect *base_effect; }; @@ -421,11 +421,6 @@ static inline struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) return (struct d3dx_parameter *) handle; } -static inline struct d3dx_pass *get_pass_struct(D3DXHANDLE handle) -{ - return (struct d3dx_pass *) handle; -} - static inline D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) { return (D3DXHANDLE) parameter; @@ -479,10 +474,8 @@ static struct d3dx_pass *get_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHA for (k = 0; k < technique->pass_count; ++k) { - if (technique->pass_handles[k] == pass) - { - return get_pass_struct(pass); - } + if (get_pass_handle(&technique->passes[k]) == pass) + return &technique->passes[k]; } } @@ -544,7 +537,7 @@ static struct d3dx_parameter *get_valid_parameter(struct ID3DXBaseEffectImpl *ba for (k = 0; k < technique->pass_count; ++k) { - struct d3dx_pass *pass = get_pass_struct(technique->pass_handles[k]); + struct d3dx_pass *pass = &technique->passes[k]; for (m = 0; m < pass->annotation_count; ++m) { @@ -701,10 +694,9 @@ static void free_parameter_state(D3DXHANDLE handle, BOOL element, BOOL child, en HeapFree(GetProcessHeap(), 0, param); } -static void free_pass(D3DXHANDLE handle) +static void free_pass(struct d3dx_pass *pass) { unsigned int i; - struct d3dx_pass *pass = get_pass_struct(handle); TRACE("Free pass %p\n", pass); @@ -732,7 +724,6 @@ static void free_pass(D3DXHANDLE handle) } HeapFree(GetProcessHeap(), 0, pass->name); - HeapFree(GetProcessHeap(), 0, pass); } static void free_technique(struct d3dx_technique *technique) @@ -753,13 +744,12 @@ static void free_technique(struct d3dx_technique *technique) HeapFree(GetProcessHeap(), 0, technique->annotation_handles); } - if (technique->pass_handles) + if (technique->passes) { for (i = 0; i < technique->pass_count; ++i) - { - free_pass(technique->pass_handles[i]); - } - HeapFree(GetProcessHeap(), 0, technique->pass_handles); + free_pass(&technique->passes[i]); + HeapFree(GetProcessHeap(), 0, technique->passes); + technique->passes = NULL; } HeapFree(GetProcessHeap(), 0, technique->name); @@ -1359,8 +1349,8 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3D if (tech && index < tech->pass_count) { - TRACE("Returning pass %p\n", tech->pass_handles[index]); - return tech->pass_handles[index]; + TRACE("Returning pass %p\n", &tech->passes[index]); + return get_pass_handle(&tech->passes[index]); } WARN("Invalid argument specified.\n"); @@ -1381,12 +1371,12 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPassByName(ID3DXBaseEffect *ifac for (i = 0; i < tech->pass_count; ++i) { - struct d3dx_pass *pass = get_pass_struct(tech->pass_handles[i]); + struct d3dx_pass *pass = &tech->passes[i]; if (!strcmp(pass->name, name)) { - TRACE("Returning pass %p\n", tech->pass_handles[i]); - return tech->pass_handles[i]; + TRACE("Returning pass %p\n", pass); + return get_pass_handle(pass); } } } @@ -3498,7 +3488,7 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) if (technique && pass < technique->pass_count && !This->active_pass) { - This->active_pass = technique->pass_handles[pass]; + This->active_pass = &technique->passes[pass]; FIXME("No states applied, yet!\n"); @@ -5262,7 +5252,6 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co HRESULT hr; unsigned int i; D3DXHANDLE *annotation_handles = NULL; - D3DXHANDLE *pass_handles = NULL; char *name = NULL; read_dword(ptr, &offset); @@ -5314,8 +5303,9 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co if (technique->pass_count) { - pass_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pass_handles) * technique->pass_count); - if (!pass_handles) + technique->passes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*technique->passes) * technique->pass_count); + if (!technique->passes) { ERR("Out of memory\n"); hr = E_OUTOFMEMORY; @@ -5324,18 +5314,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co for (i = 0; i < technique->pass_count; ++i) { - struct d3dx_pass *pass; - - pass = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pass)); - if (!pass) - { - hr = E_OUTOFMEMORY; - goto err_out; - } - - pass_handles[i] = get_pass_handle(pass); - - hr = d3dx9_parse_effect_pass(pass, data, ptr, objects); + hr = d3dx9_parse_effect_pass(&technique->passes[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse pass %u\n", i); @@ -5345,20 +5324,18 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co } technique->name = name; - technique->pass_handles = pass_handles; technique->annotation_handles = annotation_handles; return D3D_OK; err_out: - if (pass_handles) + if (technique->passes) { for (i = 0; i < technique->pass_count; ++i) - { - free_pass(pass_handles[i]); - } - HeapFree(GetProcessHeap(), 0, pass_handles); + free_pass(&technique->passes[i]); + HeapFree(GetProcessHeap(), 0, technique->passes); + technique->passes = NULL; } if (annotation_handles) @@ -5448,7 +5425,7 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char return E_FAIL; } - pass = get_pass_struct(technique->pass_handles[index]); + pass = &technique->passes[index]; if (state_index >= pass->state_count) { FIXME("Index out of bounds: state_index %u >= state_count %u\n", state_index, pass->state_count);

1 0

Jacek Caban : urlmon: Fallback to URL-based MIME search in FindMimeFromData if found MIME is not concrete .
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: e5d09bea249d9b8b6d1a9fb7e7967dc5fac2b38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d09bea249d9b8b6d1a9fb7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:44 2013 +0200 urlmon: Fallback to URL-based MIME search in FindMimeFromData if found MIME is not concrete. --- dlls/urlmon/mimefilter.c | 208 +++++++++++++++++++++++++++------------------- 1 files changed, 122 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5d09bea249d9b8b6d1a9…

1 0

Jacek Caban : urlmon/tests: MIME tests clean up.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 6b73e8fb9f0099f8aafd5e9a5419a5e1313323f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b73e8fb9f0099f8aafd5e9a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:09 2013 +0200 urlmon/tests: MIME tests clean up. --- dlls/urlmon/tests/misc.c | 318 ++++++++++++++++++++++------------------------ 1 files changed, 153 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b73e8fb9f0099f8aafd5…

1 0

Jacek Caban : urlmon/tests: Make array-based MIME tests more generic.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: e7ca2655e8947b629fe309400a1e371e1d1f63da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ca2655e8947b629fe309400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:19 2013 +0200 urlmon/tests: Make array-based MIME tests more generic. --- dlls/urlmon/tests/misc.c | 81 ++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 98947fd..1a5a3bb 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -87,6 +87,26 @@ static int strcmp_wa(const WCHAR *strw, const char *stra) return lstrcmpW(strw, buf); } +static void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +static WCHAR *a2w(const char *str) +{ + WCHAR *ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + static void test_CreateFormatEnum(void) { IEnumFORMATETC *fenum = NULL, *fenum2 = NULL; @@ -561,6 +581,8 @@ static const struct { const char *mime; const char *mime_pjpeg; const char *broken_mime; + const char *url; + const char *proposed_mime; } mime_tests2[] = { {data1, sizeof(data1), "text/plain"}, {data2, sizeof(data2), "application/octet-stream", "image/pjpeg"}, @@ -657,13 +679,18 @@ static const struct { {data93, sizeof(data93), "text/xml", "text/plain"}, {data94, sizeof(data94), "text/html", "text/plain"}, {data95, sizeof(data95), "text/xml", "text/richtext"}, - {data96, sizeof(data96), "text/plain"} + {data96, sizeof(data96), "text/plain"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {NULL, 0, "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, + {NULL, sizeof(data1), "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, }; static void test_FindMimeFromData(void) { + WCHAR *mime, *proposed_mime, *url; HRESULT hres; - LPWSTR mime; BYTE b; int i; @@ -701,14 +728,18 @@ static void test_FindMimeFromData(void) } for(i=0; i < sizeof(mime_tests2)/sizeof(mime_tests2[0]); i++) { - hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, - NULL, 0, &mime, 0); + url = a2w(mime_tests2[i].url); + proposed_mime = a2w(mime_tests2[i].proposed_mime); + hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, + proposed_mime, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); b = !strcmp_wa(mime, mime_tests2[i].mime); ok(b || broken(mime_tests2[i].broken_mime && !strcmp_wa(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + heap_free(proposed_mime); + heap_free(url); CoTaskMemFree(mime); - if(!b) + if(!b || url || proposed_mime) continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, @@ -746,46 +777,6 @@ static void test_FindMimeFromData(void) CoTaskMemFree(mime); } - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), app_octet_streamW, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url4, data1, sizeof(data1), app_octet_streamW, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, NULL, 0, NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, NULL, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, 0, 0, NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, 0, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres);

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix row array test.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 6705073016ce6b332448f75e3056ba34e1d0e3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6705073016ce6b332448f75e3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:17 2013 +0200 d3dx9/tests: Add ID3DXConstantTable matrix row array test. --- dlls/d3dx9_36/tests/shader.c | 521 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 521 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6705073016ce6b332448f…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable struct test.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: cf5a2b641715cdee478e5e51751e84016ed7e829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5a2b641715cdee478e5e517… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:27 2013 +0200 d3dx9/tests: Add ID3DXConstantTable struct test. --- dlls/d3dx9_36/tests/shader.c | 308 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 308 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf5a2b641715cdee478e5…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix row test.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 4e925d7d313af4c2f962c500325b766415cc59aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e925d7d313af4c2f962c5003… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:06 2013 +0200 d3dx9/tests: Add ID3DXConstantTable matrix row test. --- dlls/d3dx9_36/tests/shader.c | 332 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 332 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e925d7d313af4c2f962c…

1 0

Rico Schüller : d3dx9: Add support for structs to ID3DXConstantTable.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: bdec3f951b26d9dec2e706b5ac0bfc3081f40e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdec3f951b26d9dec2e706b5a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:21 2013 +0200 d3dx9: Add support for structs to ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d44316f..15dbb7a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -958,8 +958,83 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, /* D3DXPC_STRUCT is somewhat special */ if (desc->Class == D3DXPC_STRUCT) { - FIXME("Structs are not supported, yet.\n"); - return 0; + /* + * Struct array sets the last complete input to the first struct element, all other + * elements are not set. + * E.g.: struct {int i;} s1[2]; + * SetValue(device, "s1", [1, 2], 8) => s1 = {2, x}; + * + * struct {int i; int n} s2[2]; + * SetValue(device, "s2", [1, 2, 3, 4, 5], 20) => s1 = {{3, 4}, {x, x}}; + */ + if (desc->Elements > 1) + { + UINT offset = *size / (desc->Rows * desc->Columns) - 1; + + offset = min(desc->Elements - 1, offset); + last = offset * desc->Rows * desc->Columns; + + if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + { + set(table, device, &constant->constants[0], NULL, intype, size, incol, inclass, 0, is_pointer); + } + else + { + last += set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, + index + last, is_pointer); + } + } + else + { + /* + * D3DXRS_BOOL is always set. As there are only 16 bools and there are + * exactly 16 input values, use matrix transpose. + */ + if (inclass == D3DXPC_MATRIX_ROWS && desc->RegisterSet == D3DXRS_BOOL) + { + D3DXMATRIX mat, *m, min; + D3DXMatrixTranspose(&mat, &min); + + if (is_pointer) + min = *(D3DXMATRIX *)(indata[index / 16]); + else + min = **(D3DXMATRIX **)indata; + + D3DXMatrixTranspose(&mat, &min); + m = &mat; + for (i = 0; i < desc->StructMembers; ++i) + { + last += set(table, device, &constant->constants[i], (const void **)&m, intype, size, incol, + D3DXPC_SCALAR, index + last, is_pointer); + } + } + /* + * For pointers or for matrix rows, only the first member is set. + * All other members are set to 0. This is not true for D3DXRS_BOOL. + * E.g.: struct {int i; int n} s; + * SetValue(device, "s", [1, 2], 8) => s = {1, 0}; + */ + else if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + { + last = set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, + index + last, is_pointer); + + for (i = 1; i < desc->StructMembers; ++i) + { + set(table, device, &constant->constants[i], NULL, intype, size, incol, inclass, 0, is_pointer); + } + } + else + { + for (i = 0; i < desc->StructMembers; ++i) + { + last += set(table, device, &constant->constants[i], indata, intype, size, incol, D3DXPC_SCALAR, + index + last, is_pointer); + } + } + } + + return last; } /* elements */

1 0