June 2017 - Wine-commits - list.winehq.org

Jacek Caban : urlmon.idl: Added BINDINFO_OPTIONS declaration.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 53a95d4104b0aade465c8ce194889f288c9b058d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a95d4104b0aade465c8ce19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 1 15:12:04 2017 +0200 urlmon.idl: Added BINDINFO_OPTIONS declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/urlmon.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 1f7205d..d7e97ad 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -196,6 +196,25 @@ interface IBindStatusCallback : IUnknown typedef enum { + BINDINFO_OPTIONS_WININETFLAG = 0x00010000, + BINDINFO_OPTIONS_ENABLE_UTF8 = 0x00020000, + BINDINFO_OPTIONS_DISABLE_UTF8 = 0x00040000, + BINDINFO_OPTIONS_USE_IE_ENCODING = 0x00080000, + BINDINFO_OPTIONS_BINDTOOBJECT = 0x00100000, + BINDINFO_OPTIONS_SECURITYOPTOUT = 0x00200000, + BINDINFO_OPTIONS_IGNOREMIMETEXTPLAIN = 0x00400000, + BINDINFO_OPTIONS_USEBINDSTRINGCREDS = 0x00800000, + BINDINFO_OPTIONS_IGNOREHTTPHTTPSREDIRECTS = 0x01000000, + BINDINFO_OPTIONS_IGNORE_SSLERRORS_ONCE = 0x02000000, + BINDINFO_WPC_DOWNLOADBLOCKED = 0x08000000, + BINDINFO_WPC_LOGGING_ENABLED = 0x10000000, + BINDINFO_OPTIONS_ALLOWCONNECTDATA = 0x20000000, + BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS = 0x40000000, + BINDINFO_OPTIONS_SHDOCVW_NAVIGATE = (int)0x80000000 + } BINDINFO_OPTIONS; + + typedef enum + { BSCF_FIRSTDATANOTIFICATION = 0x01, BSCF_INTERMEDIATEDATANOTIFICATION = 0x02, BSCF_LASTDATANOTIFICATION = 0x04,

1 0

Hugh McMaster : regedit: Fix handling of 'Copy Key Name' menu items.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 898ee58aa03caad53dd24bdb4e3f6cb6e45d9d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=898ee58aa03caad53dd24bdb4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:32:48 2017 +0000 regedit: Fix handling of 'Copy Key Name' menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0aec59a..6930d7a 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -158,7 +158,7 @@ static void update_copy_keyname_item(HMENU hMenu, WCHAR *keyName) { unsigned int state = MF_ENABLED; - if (!g_pChildWnd->nFocusPanel && !keyName) + if (!keyName) state = MF_GRAYED; EnableMenuItem(hMenu, ID_EDIT_COPYKEYNAME, state | MF_BYCOMMAND);

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalDirectionalLight().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 69f93748c1a212f08ea0565894e2c4ba33be0883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f93748c1a212f08ea056589… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:35 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalDirectionalLight(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 3843abe..b709321 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2898,7 +2898,7 @@ static void test_D3DXSHEvalDirectionalLight(void) dir.x = 1.1f; dir.y= 1.2f; dir.z = 2.76f; - for (l = 0; l < sizeof( test ) / sizeof( test[0] ); l++) + for (l = 0; l < ARRAY_SIZE(test); ++l) { startindex = 0; @@ -2908,7 +2908,7 @@ static void test_D3DXSHEvalDirectionalLight(void) green_out = test[l].green_in; blue_out = test[l].blue_in; - for (j = 0; j < 49; j++) + for (j = 0; j < ARRAY_SIZE(rout); ++j) { red_out[j] = 1.01f + j; if ( green_out ) @@ -2920,7 +2920,7 @@ static void test_D3DXSHEvalDirectionalLight(void) hr = D3DXSHEvalDirectionalLight(order, &dir, 1.7f, 2.6f, 3.5f, red_out, green_out, blue_out); ok(hr == D3D_OK, "Expected %#x, got %#x\n", D3D_OK, hr); - for (j = 0; j < 49; j++) + for (j = 0; j < ARRAY_SIZE(rout); ++j) { if ( j >= order * order ) expected = j + test[l].roffset;

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply4().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 1b83660c593fa02d370c904500a5721cafac4ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b83660c593fa02d370c90450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:36 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply4(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index b709321..22fd5d3 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3323,7 +3323,7 @@ static void test_D3DXSHMultiply4(void) 1.80000007e+00f, 1.89999998e+00f, }; - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = 1.0f + i / 100.0f; b[i] = 3.0f - i / 100.0f; @@ -3331,30 +3331,30 @@ static void test_D3DXSHMultiply4(void) } D3DXSHMultiply4(c, a, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[i], 16); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[i], c[i]); } - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(b); ++i) { b[i] = 3.0f - i / 100.0f; c[i] = i; } D3DXSHMultiply4(c, c, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[20 + i], 32); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[20 + i], c[i]); } - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) c[i] = 0.1f * i; D3DXSHMultiply4(c, c, c); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[40 + i], 8); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[40 + i], c[i]);

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotate().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 141da778900aa4829dee8d0c13df11a0bfbcb7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=141da778900aa4829dee8d0c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:37 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 22fd5d3..6f81de4 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3424,11 +3424,11 @@ static void test_D3DXSHRotate(void) else out_temp = in; - for (j = 0; j < 4; j++) + for (j = 0; j < ARRAY_SIZE(m); ++j) { for (order = 0; order <= D3DXSH_MAXORDER; order++) { - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(out); ++i) { out[i] = ( i + 1.0f ) * ( i + 1.0f ); in[i] = i + 1.01f; @@ -3438,7 +3438,7 @@ static void test_D3DXSHRotate(void) ok(received_ptr == out_temp, "Order %u, expected %p, received %p.\n", order, out, received_ptr); - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(out); ++i) { if ((i > 0) && ((i >= order * order) || (order > D3DXSH_MAXORDER))) {

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotateZ().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: af7125e56b898c734458b9c4cdbdd9cebffd4952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7125e56b898c734458b9c4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:38 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotateZ(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6f81de4..15fb945 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3546,11 +3546,11 @@ static void test_D3DXSHRotateZ(void) else end = 48; - for (j = 0; j < 3; j++) + for (j = 0; j < ARRAY_SIZE(angle); ++j) { for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(out); ++i) { out[i] = ( i + 1.0f ) * ( i + 1.0f ); in[i] = i + 1.01f;

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHScale().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: e56adf98847e0518b1f6f51e77a221c7d0ca52f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e56adf98847e0518b1f6f51e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:39 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHScale(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 15fb945..8882907 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3586,7 +3586,7 @@ static void test_D3DXSHScale(void) unsigned int i, order; BOOL equal; - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = i; b[i] = i; @@ -3597,7 +3597,7 @@ static void test_D3DXSHScale(void) received_array = D3DXSHScale(b, order, a, 5.0f); ok(received_array == b, "Expected %p, received %p\n", b, received_array); - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(b); ++i) { if (i < order * order) expected = 5.0f * a[i];

1 0

Paul Gofman : d3dx9: Factor out get_const_upload_info() function.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 09e089cc66c1303d43e8ae1c5c523c2621bd2c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e089cc66c1303d43e8ae1c5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:28 2017 +0300 d3dx9: Factor out get_const_upload_info() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 78 +++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 29a2346..8bb2217 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -260,6 +260,15 @@ struct d3dx_pres_ins struct d3dx_pres_operand output; }; +struct const_upload_info +{ + BOOL transpose; + unsigned int major, minor; + unsigned int major_stride; + unsigned int major_count; + unsigned int count; +}; + static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; @@ -979,6 +988,30 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) HeapFree(GetProcessHeap(), 0, peval); } +static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set, + struct const_upload_info *info) +{ + struct d3dx_parameter *param = const_set->param; + unsigned int table = const_set->table; + + info->transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) + || (param->class == D3DXPC_MATRIX_COLUMNS && const_set->constant_class == D3DXPC_MATRIX_ROWS); + if (const_set->constant_class == D3DXPC_MATRIX_COLUMNS) + { + info->major = param->columns; + info->minor = param->rows; + } + else + { + info->major = param->rows; + info->minor = param->columns; + } + info->major_stride = max(info->minor, get_offset_reg(table, 1)); + info->major_count = min(info->major * info->major_stride, + get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; + info->count = info->major_count * info->minor; +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -990,51 +1023,36 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; enum pres_value_type table_type = table_info[table].type; - unsigned int i, j, n, start_offset; - unsigned int minor, major, major_stride, param_offset; - BOOL transpose; - unsigned int count; + unsigned int i, j, start_offset; + unsigned int param_offset; + struct const_upload_info info; if (!is_param_dirty(param, const_tab->update_version)) continue; - transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) - || (param->class == D3DXPC_MATRIX_COLUMNS && const_set->constant_class == D3DXPC_MATRIX_ROWS); - if (const_set->constant_class == D3DXPC_MATRIX_COLUMNS) - { - major = param->columns; - minor = param->rows; - } - else - { - major = param->rows; - minor = param->columns; - } + get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - major_stride = max(minor, get_offset_reg(table, 1)); - n = min(major * major_stride, - get_offset_reg(table, const_set->register_count) + major_stride - 1) / major_stride; - count = n * minor; + if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) - && !transpose && minor == major_stride - && count == get_offset_reg(table, const_set->register_count) - && count * sizeof(unsigned int) <= param->bytes) + && !info.transpose && info.minor == info.major_stride + && info.count == get_offset_reg(table, const_set->register_count) + && info.count * sizeof(unsigned int) <= param->bytes) { - regstore_set_values(rs, table, param->data, start_offset, count); + regstore_set_values(rs, table, param->data, start_offset, info.count); continue; } - for (i = 0; i < n; ++i) + for (i = 0; i < info.major_count; ++i) { - for (j = 0; j < minor; ++j) + for (j = 0; j < info.minor; ++j) { unsigned int out; unsigned int *in; unsigned int offset; - offset = start_offset + i * major_stride + j; + offset = start_offset + i * info.major_stride + j; if (get_reg_offset(table, offset) >= rs->table_sizes[table]) { if (table != PRES_REGTAB_OBCONST) @@ -1042,10 +1060,10 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const debugstr_a(param->name), i); break; } - if (transpose) - param_offset = i + j * major; + if (info.transpose) + param_offset = i + j * info.major; else - param_offset = i * minor + j; + param_offset = i * info.minor + j; if (param_offset * sizeof(unsigned int) >= param->bytes) { WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i);

1 0

Paul Gofman : d3dx9: Factor out table_type_from_param_type() function.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 6cefc5fa6c7c55050ee0daf43b654440086fb0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cefc5fa6c7c55050ee0daf43… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:29 2017 +0300 d3dx9: Factor out table_type_from_param_type() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 8bb2217..e2bd26b 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -193,7 +193,8 @@ enum pres_value_type PRES_VT_FLOAT, PRES_VT_DOUBLE, PRES_VT_INT, - PRES_VT_BOOL + PRES_VT_BOOL, + PRES_VT_COUNT }; static const struct @@ -269,6 +270,22 @@ struct const_upload_info unsigned int count; }; +static enum pres_value_type table_type_from_param_type(D3DXPARAMETER_TYPE type) +{ + switch (type) + { + case D3DXPT_FLOAT: + return PRES_VT_FLOAT; + case D3DXPT_INT: + return PRES_VT_INT; + case D3DXPT_BOOL: + return PRES_VT_BOOL; + default: + FIXME("Unsupported type %u.\n", type); + return PRES_VT_COUNT; + } +} + static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; @@ -392,6 +409,9 @@ static void regstore_set_double(struct d3dx_regstore *rs, unsigned int table, un case PRES_VT_DOUBLE: *(double *)p = v; break; case PRES_VT_INT : *(int *)p = lrint(v); break; case PRES_VT_BOOL : *(BOOL *)p = !!v; break; + default: + FIXME("Bad type %u.\n", table_info[table].type); + break; } reg_idx = get_reg_offset(table, offset); rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] |= @@ -1033,9 +1053,7 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) - || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) - || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) + if (table_type_from_param_type(param->type) == table_type && !info.transpose && info.minor == info.major_stride && info.count == get_offset_reg(table, const_set->register_count) && info.count * sizeof(unsigned int) <= param->bytes)

1 0

Paul Gofman : d3dx9: Precompute and store a constant direct copy flag.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 1816d8a9fabc9aa0a8fd1379f1e6f6e17e8af7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1816d8a9fabc9aa0a8fd1379f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:30 2017 +0300 d3dx9: Precompute and store a constant direct copy flag. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 62213ac..ccb8e8a 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -154,6 +154,7 @@ struct d3dx_const_param_eval_output enum D3DXPARAMETER_CLASS constant_class; unsigned int register_index; unsigned int register_count; + BOOL direct_copy; }; struct d3dx_const_tab diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e2bd26b..5974329 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1050,17 +1050,14 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const if (!is_param_dirty(param, const_tab->update_version)) continue; - get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - - if (table_type_from_param_type(param->type) == table_type - && !info.transpose && info.minor == info.major_stride - && info.count == get_offset_reg(table, const_set->register_count) - && info.count * sizeof(unsigned int) <= param->bytes) + if (const_set->direct_copy) { - regstore_set_values(rs, table, param->data, start_offset, info.count); + regstore_set_values(rs, table, param->data, start_offset, + get_offset_reg(table, const_set->register_count)); continue; } + get_const_upload_info(const_set, &info); for (i = 0; i < info.major_count; ++i) { @@ -1149,6 +1146,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC unsigned int const_count, param_count, i; BOOL get_element; struct d3dx_const_param_eval_output const_set; + struct const_upload_info info; + enum pres_value_type table_type; HRESULT hr; if (FAILED(get_ctab_constant_desc(ctab, hc, &desc))) @@ -1225,6 +1224,17 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC return D3DERR_INVALIDCALL; } const_set.register_count = desc.RegisterCount; + table_type = table_info[const_set.table].type; + get_const_upload_info(&const_set, &info); + + if (table_type_from_param_type(param->type) == PRES_VT_COUNT) + return D3DERR_INVALIDCALL; + + const_set.direct_copy = table_type_from_param_type(param->type) == table_type + && !info.transpose && info.minor == info.major_stride + && info.count == get_offset_reg(const_set.table, const_set.register_count) + && info.count * sizeof(unsigned int) <= param->bytes; + if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0