April 2017 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml.idl: Added HTMLTextAreaElement coclass declaration.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 41a2d62d5a40077fff8b6b468050f649b9cfa9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a2d62d5a40077fff8b6b468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:08 2017 +0200 mshtml.idl: Added HTMLTextAreaElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltextarea.c | 4 ++-- include/mshtml.idl | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index e464819..d26de22 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -32,13 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTextAreaElement { HTMLElement element; IHTMLTextAreaElement IHTMLTextAreaElement_iface; nsIDOMHTMLTextAreaElement *nstextarea; -} HTMLTextAreaElement; +}; static inline HTMLTextAreaElement *impl_from_IHTMLTextAreaElement(IHTMLTextAreaElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 91d38cb..b6922c7 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11353,6 +11353,27 @@ methods: } /***************************************************************************** + * HTMLTextAreaElement coclass + */ +[ + noncreatable, + uuid(3050f2ac-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTextAreaElement +{ + [default] dispinterface DispHTMLTextAreaElement; + /* [source, default] dispinterface HTMLInputTextElementEvents; */ + /* [source] dispinterface HTMLInputTextElementEvents2; */ + [source] dispinterface HTMLTextContainerEvents; + [source] dispinterface HTMLTextContainerEvents2; + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLTextContainer; + interface IHTMLTextAreaElement; + /* interface IHTMLTextAreaElement2; */ +} + +/***************************************************************************** * IHTMLButtonElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLInputElement coclass declaration.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 85e9e2867cca8a830c65f705dffbb617739c3f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e9e2867cca8a830c65f705d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:00 2017 +0200 mshtml.idl: Added HTMLInputElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 4 ++-- include/mshtml.idl | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 3a03611..607e24f 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -34,14 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLInputElement { HTMLElement element; IHTMLInputElement IHTMLInputElement_iface; IHTMLInputTextElement IHTMLInputTextElement_iface; nsIDOMHTMLInputElement *nsinput; -} HTMLInputElement; +}; static const WCHAR forW[] = {'f','o','r',0}; diff --git a/include/mshtml.idl b/include/mshtml.idl index b34d7be..91d38cb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11148,6 +11148,35 @@ methods: } /***************************************************************************** + * HTMLInputElement coclass + */ +[ + noncreatable, + uuid(3050f5d8-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLInputElement +{ + [default] dispinterface DispHTMLInputElement; + /* [source, default] dispinterface HTMLInputTextElementEvents; */ + /* [source] dispinterface HTMLInputTextElementEvents2; */ + /* [source] dispinterface HTMLOptionButtonElementEvents; */ + /* [source] dispinterface HTMLButtonElementEvents; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLInputElement; + /* interface IHTMLInputElement2; */ + interface IHTMLInputTextElement; + /* interface IHTMLInputTextElement2; */ + /* interface IHTMLInputHiddenElement; */ + /* interface IHTMLInputButtonElement; */ + /* interface IHTMLInputFileElement; */ + /* interface IHTMLOptionButtonElement; */ + /* interface IHTMLInputImage; */ + /* interface IHTMLInputElement3; */ + /* interface IHTMLInputRangeElement; */ +} + +/***************************************************************************** * IHTMLTextAreaElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLLabelElement coclass declaration.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: a17e6b33c7189f13de6f96703d61b6cd7f77601c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17e6b33c7189f13de6f96703… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:35:40 2017 +0200 mshtml.idl: Added HTMLLabelElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 4 ++-- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 58919f5..3a03611 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1371,11 +1371,11 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem return S_OK; } -typedef struct { +struct HTMLLabelElement { HTMLElement element; IHTMLLabelElement IHTMLLabelElement_iface; -} HTMLLabelElement; +}; static inline HTMLLabelElement *impl_from_IHTMLLabelElement(IHTMLLabelElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 24721eb..a6072a6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10101,6 +10101,23 @@ methods: } /***************************************************************************** + * HTMLLabelElement coclass + */ +[ + noncreatable, + uuid(3050f32b-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLLabelElement +{ + [default] dispinterface DispHTMLLabelElement; + /* [source, default] dispinterface HTMLLabelEvents; */ + /* [source] dispinterface HTMLLabelEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLLabelElement; + interface IHTMLLabelElement2; +} + +/***************************************************************************** * IHTMLElementCollection interface */ [

1 0

Józef Kucia : wined3d: Prepare all layers for render target views.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 481999ce44fc919178f7a90dd8fb428cb2029371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481999ce44fc919178f7a90dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:12 2017 +0200 wined3d: Prepare all layers for render target views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 5 ++--- dlls/wined3d/view.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1c324a6..15b3791 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -512,7 +512,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } else { - wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_rendertarget_view_prepare_location(rtv, context, rtv->resource->draw_binding); } } @@ -524,12 +524,11 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note * that we never copy the stencil data.*/ DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) wined3d_rendertarget_view_load_location(dsv, context, location); else - wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); + wined3d_rendertarget_view_prepare_location(dsv, context, location); } if (!context_apply_draw_state(context, device, state)) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 93788df..e1e1956 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -398,6 +398,25 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg } } +void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, + struct wined3d_context *context, DWORD location) +{ + struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for resources %s.\n", debug_d3dresourcetype(resource->type)); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = view->sub_resource_idx; + for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); +} + void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 13e375a..ff5b242 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3460,6 +3460,8 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, + struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; struct wined3d_shader_resource_view {

1 0

Paul Gofman : d3dx9: Compare parameter definition instead of parameter handle in IsParameterUsed ().
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: c30b91d38235e34d5764ac196fd147212bbb894b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30b91d38235e34d5764ac196… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 14 13:17:07 2017 +0300 d3dx9: Compare parameter definition instead of parameter handle in IsParameterUsed(). 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/effect.c | 31 +++++++++++++++++++++++++------ dlls/d3dx9_36/tests/effect.c | 4 +--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 49e8a88..8dc4738 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3011,6 +3011,30 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 return ret; } +static BOOL is_same_parameter(void *param1_, struct d3dx_parameter *param2) +{ + struct d3dx_parameter *param1 = (struct d3dx_parameter *)param1_; + BOOL matches; + unsigned int i, member_count; + + matches = !strcmp(param1->name, param2->name) && param1->class == param2->class + && param1->type == param2->type && param1->rows == param2->rows + && param1->columns == param2->columns && param1->element_count == param2->element_count + && param1->member_count == param2->member_count; + + member_count = param1->element_count ? param1->element_count : param1->member_count; + + if (!matches || !member_count) + return matches; + + for (i = 0; i < member_count; ++i) + { + if (!is_same_parameter(&param1->members[i], &param2->members[i])) + return FALSE; + } + return TRUE; +} + static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); @@ -3733,11 +3757,6 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ return FALSE; } -static BOOL compare_param_ptr(void *param_comp, struct d3dx_parameter *param) -{ - return param_comp == param; -} - static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3756,7 +3775,7 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL pass = &tech->passes[i]; for (j = 0; j < pass->state_count; ++j) { - if (walk_state_dep(&pass->states[j], compare_param_ptr, param)) + if (walk_state_dep(&pass->states[j], is_same_parameter, param)) { TRACE("Returning TRUE.\n"); return TRUE; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a21d4e1..9c318b4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4532,12 +4532,10 @@ static void test_isparameterused_param_with_children_(unsigned int line, ID3DXEf param = effect->lpVtbl->GetParameterByName(effect, NULL, name); ok_(__FILE__, line)(!!param, "GetParameterByName failed for %s.\n", name); - todo_wine_if(effect2 && expected_result) ok_(__FILE__, line)(effect->lpVtbl->IsParameterUsed(effect, param, tech) == expected_result, "Unexpected IsParameterUsed() result for %s (referenced by handle).\n", name); - if (!effect2) - test_isparameterused_children(line, effect, tech, param); + test_isparameterused_children(line, effect, tech, param); } static void test_effect_isparameterused(IDirect3DDevice9 *device)

1 0

Paul Gofman : d3dx9: Use magic number instead of parameter tables for parameter handles.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 5029c2c0fd4f8998d3ed462f969b4b7fb8e02e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5029c2c0fd4f8998d3ed462f9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 14 13:17:06 2017 +0300 d3dx9: Use magic number instead of parameter tables for parameter handles. 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 | 3 +- dlls/d3dx9_36/effect.c | 95 ++++++++----------------------------------- dlls/d3dx9_36/tests/effect.c | 2 - 3 files changed, 18 insertions(+), 82 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index e50f4d3..145ab80 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -196,6 +196,7 @@ struct d3dx_param_eval struct d3dx_parameter { + char magic_string[4]; char *name; char *semantic; void *data; @@ -211,8 +212,6 @@ struct d3dx_parameter DWORD runtime_flags; DWORD object_id; - D3DXHANDLE handle; - struct d3dx_parameter *annotations; struct d3dx_parameter *members; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 813b57e..49e8a88 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -27,7 +27,7 @@ #define INT_FLOAT_MULTI 255.0f #define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) -#define INITIAL_PARAM_TABLE_SIZE 16 +static const char parameter_magic_string[4] = {'@', '!', '#', '\xFF'}; WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -137,12 +137,6 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -struct param_table -{ - struct d3dx_parameter **table; - unsigned int count, size; -}; - struct d3dx9_base_effect { struct ID3DXEffectImpl *effect; @@ -154,8 +148,6 @@ struct d3dx9_base_effect struct d3dx_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_object *objects; - - struct param_table param_table; }; struct ID3DXEffectImpl @@ -419,17 +411,17 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) static inline D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) { - return parameter ? parameter->handle : NULL; + return (D3DXHANDLE)parameter; } static inline D3DXHANDLE get_technique_handle(struct d3dx_technique *technique) { - return (D3DXHANDLE) technique; + return (D3DXHANDLE)technique; } static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) { - return (D3DXHANDLE) pass; + return (D3DXHANDLE)pass; } static struct d3dx_technique *get_technique_by_name(struct d3dx9_base_effect *base, const char *name) @@ -480,10 +472,11 @@ static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHAND static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter) { - struct d3dx_parameter **handle_param = (struct d3dx_parameter **)parameter; + struct d3dx_parameter *handle_param = (struct d3dx_parameter *)parameter; - if (handle_param >= base->param_table.table && handle_param < base->param_table.table + base->param_table.count) - return *handle_param; + if (handle_param && !strncmp(handle_param->magic_string, parameter_magic_string, + sizeof(parameter_magic_string))) + return handle_param; return get_parameter_by_name(base, NULL, parameter); } @@ -655,8 +648,6 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) TRACE("base %p.\n", base); - HeapFree(GetProcessHeap(), 0, base->param_table.table); - if (base->parameters) { for (i = 0; i < base->parameter_count; ++i) @@ -2573,7 +2564,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct { unsigned int array_idx; static const struct d3dx_parameter array_idx_param = - {NULL, NULL, NULL, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 0, 0, 0, 0, sizeof(array_idx)}; + {"", NULL, NULL, NULL, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 0, 0, 0, 0, sizeof(array_idx)}; HRESULT hr; struct d3dx_parameter *ref_param, *selected_param; @@ -5068,59 +5059,9 @@ static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int obje return D3D_OK; } -static void add_param_to_table(struct d3dx9_base_effect *base, struct d3dx_parameter *param) +static void param_set_magic_number(struct d3dx_parameter *param) { - struct param_table *table = &base->param_table; - - if (table->count >= table->size) - { - unsigned int new_size; - struct d3dx_parameter **new_alloc; - - if (!table->size) - { - new_size = INITIAL_PARAM_TABLE_SIZE; - new_alloc = HeapAlloc(GetProcessHeap(), 0, sizeof(*table->table) * new_size); - if (!new_alloc) - { - ERR("Out of memory.\n"); - return; - } - } - else - { - new_size = table->size * 2; - new_alloc = HeapReAlloc(GetProcessHeap(), 0, table->table, sizeof(*table->table) * new_size); - if (!new_alloc) - { - ERR("Out of memory.\n"); - return; - } - } - table->table = new_alloc; - table->size = new_size; - } - - table->table[table->count++] = param; -} - -static void sync_param_handles(struct d3dx9_base_effect *base) -{ - struct param_table *table = &base->param_table; - struct d3dx_parameter **new_alloc; - unsigned int i; - - if (table->count) - { - new_alloc = HeapReAlloc(GetProcessHeap(), 0, table->table, sizeof(*table->table) * table->count); - if (new_alloc) - table->table = new_alloc; - else - ERR("Out of memory.\n"); - } - - for (i = 0; i < table->count; ++i) - table->table[i]->handle = (D3DXHANDLE)&table->table[i]; + memcpy(param->magic_string, parameter_magic_string, sizeof(parameter_magic_string)); } static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct d3dx_parameter *param, @@ -5257,7 +5198,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct { *ptr = save_ptr; - add_param_to_table(base, &param->members[i]); + param_set_magic_number(&param->members[i]); hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, param, flags); if (hr != D3D_OK) { @@ -5282,7 +5223,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct for (i = 0; i < param->member_count; ++i) { - add_param_to_table(base, &param->members[i]); + param_set_magic_number(&param->members[i]); hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, NULL, flags); if (hr != D3D_OK) { @@ -5440,7 +5381,7 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru for (i = 0; i < param->annotation_count; ++i) { - add_param_to_table(base, &param->annotations[i]); + param_set_magic_number(&param->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &param->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -5502,7 +5443,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3 for (i = 0; i < pass->annotation_count; ++i) { - add_param_to_table(base, &pass->annotations[i]); + param_set_magic_number(&pass->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &pass->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -5598,7 +5539,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, stru for (i = 0; i < technique->annotation_count; ++i) { - add_param_to_table(base, &technique->annotations[i]); + param_set_magic_number(&technique->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &technique->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -5963,7 +5904,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da for (i = 0; i < base->parameter_count; ++i) { - add_param_to_table(base, &base->parameters[i]); + param_set_magic_number(&base->parameters[i]); hr = d3dx9_parse_effect_parameter(base, &base->parameters[i], data, &ptr, base->objects); if (hr != D3D_OK) { @@ -5996,8 +5937,6 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } } - sync_param_handles(base); - read_dword(&ptr, &stringcount); TRACE("String count: %u\n", stringcount); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9e357d5..a21d4e1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5735,13 +5735,11 @@ static void test_cross_effect_handle(IDirect3DDevice9 *device) ok(param1 != param2, "Got same parameter handle unexpectedly.\n"); hr = effect2->lpVtbl->SetValue(effect2, param1, expected_ivect, sizeof(expected_ivect)); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect1->lpVtbl->GetValue(effect1, param1, ivect, sizeof(ivect)); ok(hr == D3D_OK, "Got result %#x.\n", hr); - todo_wine ok(!memcmp(ivect, expected_ivect, sizeof(expected_ivect)), "Vector value mismatch.\n"); effect2->lpVtbl->Release(effect2);

1 0

Paul Gofman : d3dx9/tests: Add tests for cross effect handles usage.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 69f8d4852594f110f54501e7eaebcbfab2834df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f8d4852594f110f54501e7e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 14 13:17:05 2017 +0300 d3dx9/tests: Add tests for cross effect handles usage. 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/tests/effect.c | 96 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index de5ae69..9e357d5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4494,7 +4494,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) &op_tests[i]); } -static void test_isparameterused_children(ID3DXEffect *effect, D3DXHANDLE tech, D3DXHANDLE param) +static void test_isparameterused_children(unsigned int line, ID3DXEffect *effect, + D3DXHANDLE tech, D3DXHANDLE param) { D3DXPARAMETER_DESC desc; D3DXHANDLE param_child; @@ -4502,31 +4503,41 @@ static void test_isparameterused_children(ID3DXEffect *effect, D3DXHANDLE tech, HRESULT hr; hr = effect->lpVtbl->GetParameterDesc(effect, param, &desc); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "GetParameterDesc failed, result %#x.\n", hr); child_count = desc.Elements ? desc.Elements : desc.StructMembers; for (i = 0; i < child_count; ++i) { param_child = desc.Elements ? effect->lpVtbl->GetParameterElement(effect, param, i) : effect->lpVtbl->GetParameter(effect, param, i); - ok(!!param_child, "Failed getting child parameter %s[%u].\n", desc.Name, i); - ok(!effect->lpVtbl->IsParameterUsed(effect, param_child, tech), + ok_(__FILE__, line)(!!param_child, "Failed getting child parameter %s[%u].\n", desc.Name, i); + ok_(__FILE__, line)(!effect->lpVtbl->IsParameterUsed(effect, param_child, tech), "Unexpected IsParameterUsed() result for %s[%u].\n", desc.Name, i); - test_isparameterused_children(effect, tech, param_child); + test_isparameterused_children(line, effect, tech, param_child); } } -static void test_isparameterused_param_with_children(ID3DXEffect *effect, D3DXHANDLE tech, const char *name, - BOOL expected_result) +#define test_isparameterused_param_with_children(args...) \ + test_isparameterused_param_with_children_(__LINE__, args) +static void test_isparameterused_param_with_children_(unsigned int line, ID3DXEffect *effect, + ID3DXEffect *effect2, D3DXHANDLE tech, const char *name, BOOL expected_result) { D3DXHANDLE param; - param = effect->lpVtbl->GetParameterByName(effect, NULL, name); - ok(!!param, "GetParameterByName failed for %s.\n", name); + ok_(__FILE__, line)(effect->lpVtbl->IsParameterUsed(effect, (D3DXHANDLE)name, tech) + == expected_result, "Unexpected IsParameterUsed() result for %s (referenced by name).\n", name); + + if (effect2) + param = effect2->lpVtbl->GetParameterByName(effect2, NULL, name); + else + param = effect->lpVtbl->GetParameterByName(effect, NULL, name); + ok_(__FILE__, line)(!!param, "GetParameterByName failed for %s.\n", name); - ok(!effect->lpVtbl->IsParameterUsed(effect, param, tech) == !expected_result, - "Unexpected IsParameterUsed() result for %s.\n", name); + todo_wine_if(effect2 && expected_result) + ok_(__FILE__, line)(effect->lpVtbl->IsParameterUsed(effect, param, tech) == expected_result, + "Unexpected IsParameterUsed() result for %s (referenced by handle).\n", name); - test_isparameterused_children(effect, tech, param); + if (!effect2) + test_isparameterused_children(line, effect, tech, param); } static void test_effect_isparameterused(IDirect3DDevice9 *device) @@ -4555,7 +4566,7 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device) {"ts2", TRUE}, {"ts3", TRUE}, }; - ID3DXEffect *effect; + ID3DXEffect *effect, *effect2; HRESULT hr; D3DXHANDLE tech; unsigned int i; @@ -4568,9 +4579,26 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device) ok(!!tech, "GetTechniqueByName failed.\n"); for (i = 0; i < ARRAY_SIZE(check_parameters); ++i) - test_isparameterused_param_with_children(effect, tech, check_parameters[i].name, + test_isparameterused_param_with_children(effect, NULL, tech, check_parameters[i].name, + check_parameters[i].expected_result); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect2, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(check_parameters); ++i) + test_isparameterused_param_with_children(effect, effect2, tech, check_parameters[i].name, check_parameters[i].expected_result); + effect2->lpVtbl->Release(effect2); + + hr = D3DXCreateEffect(device, test_effect_states_effect_blob, sizeof(test_effect_states_effect_blob), + NULL, NULL, 0, NULL, &effect2, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_isparameterused_param_with_children(effect, effect2, tech, "sampler1", TRUE); + effect2->lpVtbl->Release(effect2); + effect->lpVtbl->Release(effect); } @@ -5681,6 +5709,45 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) ok(!refcount, "State manager was not properly freed, refcount %u.\n", refcount); } +static void test_cross_effect_handle(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect1, *effect2; + D3DXHANDLE param1, param2; + static int expected_ivect[4] = {28, 29, 30, 31}; + int ivect[4]; + HRESULT hr; + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect1, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect2, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ok(effect1 != effect2, "Got same effect unexpectedly.\n"); + + param1 = effect1->lpVtbl->GetParameterByName(effect1, NULL, "g_iVect"); + ok(!!param1, "GetParameterByName failed.\n"); + + param2 = effect2->lpVtbl->GetParameterByName(effect2, NULL, "g_iVect"); + ok(!!param2, "GetParameterByName failed.\n"); + + ok(param1 != param2, "Got same parameter handle unexpectedly.\n"); + + hr = effect2->lpVtbl->SetValue(effect2, param1, expected_ivect, sizeof(expected_ivect)); + todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect1->lpVtbl->GetValue(effect1, param1, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + todo_wine + ok(!memcmp(ivect, expected_ivect, sizeof(expected_ivect)), "Vector value mismatch.\n"); + + effect2->lpVtbl->Release(effect2); + effect1->lpVtbl->Release(effect1); +} + START_TEST(effect) { HWND wnd; @@ -5728,6 +5795,7 @@ START_TEST(effect) test_effect_commitchanges(device); test_effect_preshader_relative_addressing(device); test_effect_state_manager(device); + test_cross_effect_handle(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Alexandre Julliard : glu32: Import projection functions from Mesa.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 03c5ab2e725b52fafea388a2f13c38afff9a7e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c5ab2e725b52fafea388a2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 14 09:24:13 2017 +0200 glu32: Import projection functions from Mesa. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 4 +- dlls/glu32/glu.c | 66 ---------- dlls/glu32/glu32.spec | 12 +- dlls/glu32/project.c | 327 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 336 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03c5ab2e725b52fafea38…

1 0

Francois Gouget : testbot/WineRunTask: Rename some variables to avoid ambiguity.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: tools Branch: master Commit: 7212d7bb13339be0c8ad9f29a5d4585570c411e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7212d7bb13339be0c8ad9f29… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 12:16:14 2017 +0200 testbot/WineRunTask: Rename some variables to avoid ambiguity. $TaskTimedOut is set if the task timed out. It may not be set if an individual test unit times out when running WineTest for instance. $TaskFailures keeps track of the failure count for the task which is the cumulated failure count for all its test units. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 40e1780..cb12777 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -442,7 +442,7 @@ if (!$Pid) # my $NewStatus = 'completed'; -my ($TestFailures, $TimedOut, $TAError, $PossibleCrash); +my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { @@ -450,8 +450,8 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) if ($ErrMessage =~ /timed out waiting for the child process/) { LogTaskError("The task timed out\n"); - $TestFailures = 1; - $TimedOut = 1; + $TaskFailures = 1; + $TaskTimedOut = 1; } else { @@ -626,7 +626,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } close($LogFile); - if (!$IsWineTest or $TimedOut) + if (!$IsWineTest or $TaskTimedOut) { # This is either not a Wine test, which means the report need not follow # the Wine test standards, or the report got truncated due to the @@ -648,7 +648,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures++; } # $LogFailures can legitimately be undefined in case of a timeout - $TestFailures += $LogFailures || 0; + $TaskFailures += $LogFailures || 0; } else { @@ -674,4 +674,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TestFailures); +WrapUpAndExit($NewStatus, $TaskFailures);

1 0

Francois Gouget : testbot/WineRunTask: Improve some error messages.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: tools Branch: master Commit: 4c80ab399a94abc30ac02ccae8486af03039cbc8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c80ab399a94abc30ac02cca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 12:16:48 2017 +0200 testbot/WineRunTask: Improve some error messages. These error messages are shown separately from the place where the error is so it is important to provide context. Also always start with the dll and test unit for consistency. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index cb12777..8b9afab 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -478,7 +478,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) my ($Dll, $Unit) = ($1, $2); if ($CurrentDll ne "") { - LogTaskError("The done line is missing for $CurrentDll:$CurrentUnit\n"); + LogTaskError("$CurrentDll:$CurrentUnit has no done line\n"); $LogFailures++; } ($CurrentDll, $CurrentUnit) = ($Dll, $Unit); @@ -549,7 +549,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $CurrentIsPolluted = 1; if ($IsWineTest and ($Todo or $Failures)) { - LogTaskError("Found a misplaced '$Unit' test summary line.\n"); + LogTaskError("$CurrentDll:$CurrentUnit contains a misplaced test summary line for $Unit\n"); $LogFailures++; } } @@ -560,7 +560,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if ($IsWineTest and ($Dll ne $CurrentDll or $Unit ne $CurrentUnit)) { - LogTaskError("The start line is missing for $Dll:$Unit\n"); + LogTaskError("$Dll:$Unit had no start line\n"); $LogFailures++; $CurrentIsPolluted = 1; }

1 0