August 2012 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Also issue any queries for index buffers in drawPrimitive().
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: e35f773b0bbeb12e4af88c35fcacd25221f44505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35f773b0bbeb12e4af88c35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:09 2012 +0200 wined3d: Also issue any queries for index buffers in drawPrimitive(). --- dlls/wined3d/drawprim.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8df04a3..2aea660 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -580,6 +580,7 @@ static void remove_vbos(const struct wined3d_gl_info *gl_info, void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartIdx, BOOL indexed, const void *idxData) { const struct wined3d_state *state = &device->stateBlock->state; + struct wined3d_event_query *ib_query = NULL; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; unsigned int i; @@ -683,7 +684,10 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId if (!index_buffer->buffer_object || !stream_info->all_vbo) idxData = index_buffer->resource.allocatedMemory; else + { + ib_query = index_buffer->query; idxData = NULL; + } } if (state->index_format == WINED3DFMT_R16_UINT) @@ -764,7 +768,9 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId /* Finished updating the screen, restore lock */ LEAVE_GL(); - for(i = 0; i < device->num_buffer_queries; ++i) + if (ib_query) + wined3d_event_query_issue(ib_query, device); + for (i = 0; i < device->num_buffer_queries; ++i) { wined3d_event_query_issue(device->buffer_queries[i], device); }

1 0

Marek Chmiel : dssenh/tests: Fixed failing block cipher mode tests on the DSSENH cryptographic service provider .
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 0dab059797840d1ae4121a1d355d556c6ea691c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dab059797840d1ae4121a1d3… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Fri Aug 17 16:44:22 2012 -0500 dssenh/tests: Fixed failing block cipher mode tests on the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index c3bea3b..1553ed1 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -649,15 +649,15 @@ struct ciphermode_test { static const BYTE encryptedCFB[] = { 0x51,0x15,0x77,0xab,0x62,0x1f,0x7d,0xcb, 0x35,0x1e,0xd8,0xd3,0x2a,0x00,0xf0,0x94, -0x7c,0xa5,0x28,0xda,0xb8,0x81,0x15,0x99, 0xd1,0xd5,0x06,0x18,0xb8,0x85,0xfc,0xc9 +0x7c,0xa5,0x28,0xda,0xb8,0x81,0x15,0x99, 0xd1,0xd5,0x06,0x1d,0xd3,0x46,0x7e,0xca }; static const BYTE encryptedCBC[] = { 0x8f,0x7b,0x56,0xeb,0xad,0x4d,0x76,0xc2, 0xd5,0x1d,0xf0,0x60,0x9d,0xde,0x96,0xe8, -0xb7,0x7b,0xeb,0x4b,0xee,0x3f,0xae,0x05, 0xdd,0x3b,0x62,0x47,0x7f,0x6f,0x79,0x6c +0xb7,0x7b,0xeb,0x4b,0xee,0x3f,0xae,0x05, 0x20,0xf5,0xe0,0x75,0xa0,0x1d,0xf9,0x39 }; static const BYTE encryptedECB[] = { 0x8f,0x7b,0x56,0xeb,0xad,0x4d,0x76,0xc2, 0x8b,0xe0,0x4e,0xe4,0x98,0x4f,0xb8,0x3b, -0xf3,0xeb,0x6f,0x0a,0x57,0x91,0xdd,0xc7, 0x64,0x8b,0xb9,0x50,0xe6,0x5e,0x76,0x72 +0xf3,0xeb,0x6f,0x0a,0x57,0x91,0xdd,0xc7, 0x34,0x5d,0x4c,0xa3,0x7e,0x97,0xbf,0xee }; static const struct ciphermode_test ciphermode_data[] = { @@ -742,7 +742,6 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) ok(result, "Expected release of the provider.\n"); } - START_TEST(dssenh) { test_acquire_context();

1 0

Marek Chmiel : dssenh/tests: Added signature tests on the DSSENH cryptographic service provider.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 681af11ee15c885f3698a69bde5fef1550667830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681af11ee15c885f3698a69bd… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Fri Aug 17 18:15:43 2012 -0500 dssenh/tests: Added signature tests on the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 251 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 251 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=681af11ee15c885f3698a…

1 0

Rico Schüller : d3dx9: Return NULL if name is not given.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 07ae14ad4c2acf8fe2d1250dd0faa4cad464bc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ae14ad4c2acf8fe2d1250dd… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:58:40 2012 +0200 d3dx9: Return NULL if name is not given. --- dlls/d3dx9_36/effect.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 80f7549..2a0b01c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -970,7 +970,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); - if (!name || !*name) return parameter; + if (!name || !*name) return NULL; element = atoi(name); part = strchr(name, ']') + 1; @@ -1009,7 +1009,7 @@ static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_param TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); - if (!name || !*name) return parameter; + if (!name || !*name) return NULL; length = strcspn( name, "[.@" ); part = name + length; @@ -1054,7 +1054,7 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl * TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); - if (!name || !*name) return parameter; + if (!name || !*name) return NULL; if (!parameter) {

1 0

Rico Schüller : d3dx9: Improve check for empty braces for elements.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 607c76a165c7c948f87c33052abb16c146b7ae65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=607c76a165c7c948f87c33052… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:58:52 2012 +0200 d3dx9: Improve check for empty braces for elements. --- dlls/d3dx9_36/effect.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2a0b01c..dec2f77 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -975,7 +975,8 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete element = atoi(name); part = strchr(name, ']') + 1; - if (parameter->element_count > element) + /* check for empty [] && element range */ + if ((part - name) > 1 && parameter->element_count > element) { temp_parameter = get_parameter_struct(parameter->member_handles[element]);

1 0

Rico Schüller : d3dx9: Make annotation handling more generic for techniques and passes.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 24ee16de099823e496b4bd1638855316e998ea8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ee16de099823e496b4bd163… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:01 2012 +0200 d3dx9: Make annotation handling more generic for techniques and passes. --- dlls/d3dx9_36/effect.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dec2f77..f4a3b86 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -190,7 +190,7 @@ struct ID3DXEffectCompilerImpl static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl *base, struct d3dx_parameter *parameter, LPCSTR name); -static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name); +static struct d3dx_parameter *get_annotation_by_name(UINT handlecount, D3DXHANDLE *handles, LPCSTR name); static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, const char **ptr, D3DXHANDLE *objects); static void free_parameter_state(D3DXHANDLE handle, BOOL element, BOOL child, enum STATE_TYPE st); @@ -986,7 +986,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(temp_parameter, part); + return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotation_handles, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -1002,22 +1002,22 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete return NULL; } -static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name) +static struct d3dx_parameter *get_annotation_by_name(UINT handlecount, D3DXHANDLE *handles, LPCSTR name) { UINT i, length; struct d3dx_parameter *temp_parameter; LPCSTR part; - TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); + TRACE("handlecount %u, handles %p, name %s\n", handlecount, handles, debugstr_a(name)); if (!name || !*name) return NULL; length = strcspn( name, "[.@" ); part = name + length; - for (i = 0; i < parameter->annotation_count; ++i) + for (i = 0; i < handlecount; ++i) { - temp_parameter = get_parameter_struct(parameter->annotation_handles[i]); + temp_parameter = get_parameter_struct(handles[i]); if (!strcmp(temp_parameter->name, name)) { @@ -1088,7 +1088,7 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl * return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(temp_parameter, part); + return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotation_handles, part); case '[': return get_parameter_element_by_name(temp_parameter, part); @@ -1558,7 +1558,8 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect struct d3dx_parameter *param = get_valid_parameter(This, object); struct d3dx_pass *pass = is_valid_pass(This, object); struct d3dx_technique *technique = is_valid_technique(This, object); - UINT annotation_count = 0, i; + struct d3dx_parameter *anno = NULL; + UINT annotation_count = 0; D3DXHANDLE *annotation_handles = NULL; FIXME("iface %p, object %p, name %s partial stub\n", This, object, debugstr_a(name)); @@ -1586,15 +1587,11 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect } /* Todo: add funcs */ - for (i = 0; i < annotation_count; i++) + anno = get_annotation_by_name(annotation_count, annotation_handles, name); + if (anno) { - struct d3dx_parameter *anno = get_parameter_struct(annotation_handles[i]); - - if (!strcmp(anno->name, name)) - { - TRACE("Returning parameter %p\n", anno); - return get_parameter_handle(anno); - } + TRACE("Returning parameter %p\n", anno); + return get_parameter_handle(anno); } WARN("Invalid argument specified\n");

1 0

Rico Schüller : d3dx9: Silence missing function handling in the effect interface.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 9c1c96413942f75dd69c73a7ff8ff715c155fcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1c96413942f75dd69c73a7f… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:05 2012 +0200 d3dx9: Silence missing function handling in the effect interface. --- dlls/d3dx9_36/effect.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f4a3b86..13c7f8a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1522,7 +1522,7 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac UINT annotation_count = 0; D3DXHANDLE *annotation_handles = NULL; - FIXME("iface %p, object %p, index %u partial stub\n", This, object, index); + TRACE("iface %p, object %p, index %u\n", This, object, index); if (pass) { @@ -1539,7 +1539,10 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac annotation_count = param->annotation_count; annotation_handles = param->annotation_handles; } - /* Todo: add funcs */ + else + { + FIXME("Functions are not handled, yet!\n"); + } if (index < annotation_count) { @@ -1562,7 +1565,7 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect UINT annotation_count = 0; D3DXHANDLE *annotation_handles = NULL; - FIXME("iface %p, object %p, name %s partial stub\n", This, object, debugstr_a(name)); + TRACE("iface %p, object %p, name %s\n", This, object, debugstr_a(name)); if (!name) { @@ -1585,7 +1588,10 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect annotation_count = param->annotation_count; annotation_handles = param->annotation_handles; } - /* Todo: add funcs */ + else + { + FIXME("Functions are not handled, yet!\n"); + } anno = get_annotation_by_name(annotation_count, annotation_handles, name); if (anno)

1 0

Rico Schüller : d3dx9: Use a separate function for the technique name.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 05818a3056468553f968122576450f3770178c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05818a3056468553f96812257… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:16 2012 +0200 d3dx9: Use a separate function for the technique name. --- dlls/d3dx9_36/effect.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 13c7f8a..2ae8bd2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -447,6 +447,26 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE) pass; } +static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl *base, LPCSTR name) +{ + UINT i; + + if (!name) return NULL; + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *tech = get_technique_struct(base->technique_handles[i]); + + if (!strcmp(tech->name, name)) + { + TRACE("Returning technique %p\n", tech); + return tech; + } + } + + return NULL; +} + static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) { unsigned int i; @@ -1419,25 +1439,15 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - unsigned int i; + struct d3dx_technique *tech = get_technique_by_name(This, name); TRACE("iface %p, name %s stub\n", This, debugstr_a(name)); - if (!name) - { - WARN("Invalid argument specified.\n"); - return NULL; - } - - for (i = 0; i < This->technique_count; ++i) + if (tech) { - struct d3dx_technique *tech = get_technique_struct(This->technique_handles[i]); - - if (!strcmp(tech->name, name)) - { - TRACE("Returning technique %p\n", This->technique_handles[i]); - return This->technique_handles[i]; - } + D3DXHANDLE t = get_technique_handle(tech); + TRACE("Returning technique %p\n", t); + return t; } WARN("Invalid argument specified.\n");

1 0

Rico Schüller : d3dx9: Move technique name handling to technique handle validation.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: c1193ab79b28e0e309e13d9002cb2c9344bec9bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1193ab79b28e0e309e13d900… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:31 2012 +0200 d3dx9: Move technique name handling to technique handle validation. --- dlls/d3dx9_36/effect.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2ae8bd2..ef8fb86 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -469,17 +469,21 @@ static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl * static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) { + struct d3dx_technique *tech = NULL; unsigned int i; for (i = 0; i < base->technique_count; ++i) { if (base->technique_handles[i] == technique) { - return get_technique_struct(technique); + tech = get_technique_struct(technique); + break; } } - return NULL; + if (!tech) tech = get_technique_by_name(base, technique); + + return tech; } static struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) @@ -1462,8 +1466,6 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3D TRACE("iface %p, technique %p, index %u\n", This, technique, index); - if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); - if (tech && index < tech->pass_count) { TRACE("Returning pass %p\n", tech->pass_handles[index]); @@ -1482,8 +1484,6 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPassByName(ID3DXBaseEffect *ifac TRACE("iface %p, technique %p, name %s\n", This, technique, debugstr_a(name)); - if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); - if (tech && name) { unsigned int i; @@ -3525,8 +3525,6 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL TRACE("iface %p, technique %p\n", This, technique); - if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); - if (tech) { UINT i;

1 0

Rico Schüller : d3dx9/tests: Add variable name test.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 98d196a808a7ecc828fee256988711f766953352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d196a808a7ecc828fee2569… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:35 2012 +0200 d3dx9/tests: Add variable name test. --- dlls/d3dx9_36/tests/effect.c | 284 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 284 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98d196a808a7ecc828fee…

1 0