March 2015 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw: Update the palette before presents to the NULL window.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 02be2e38a8e3ff783132b675dabbfe41173841d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02be2e38a8e3ff783132b675d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 20 12:47:10 2015 +0100 ddraw: Update the palette before presents to the NULL window. --- dlls/ddraw/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b8c9872..0d2d731 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -81,6 +81,8 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE ERR("Failed to get surface DC, hr %#x.\n", hr); return hr; } + if (surface->palette) + wined3d_palette_apply_to_dc(surface->palette->wineD3DPalette, surface_dc); if (!(screen_dc = GetDC(NULL))) {

1 0

Henri Verbeet : d3d10core: Also pass unused input layout elements to wined3d.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 88f230b56e13c26e4b7a2040bc103850ef6f0078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f230b56e13c26e4b7a2040b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:16 2015 +0100 d3d10core: Also pass unused input layout elements to wined3d. While these won't be used by the shader, they potentially affect the calculated offset for WINED3D_APPEND_ALIGNED_ELEMENT elements. --- dlls/d3d10core/inputlayout.c | 41 +++++++++++++++++++--------------------- dlls/d3d9/vertexdeclaration.c | 2 +- dlls/wined3d/context.c | 6 +++++- dlls/wined3d/vertexdeclaration.c | 2 +- include/wine/wined3d.h | 3 +++ 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index bb3e4c5..fa08822 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -41,7 +41,7 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, - struct wined3d_vertex_element **wined3d_elements, UINT *wined3d_element_count) + struct wined3d_vertex_element **wined3d_elements) { struct wined3d_shader_signature is; HRESULT hr; @@ -61,33 +61,32 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME HeapFree(GetProcessHeap(), 0, is.elements); return E_OUTOFMEMORY; } - *wined3d_element_count = 0; for (i = 0; i < element_count; ++i) { + struct wined3d_vertex_element *e = &(*wined3d_elements)[i]; + const D3D10_INPUT_ELEMENT_DESC *f = &element_descs[i]; UINT j; + e->format = wined3dformat_from_dxgi_format(f->Format); + e->input_slot = f->InputSlot; + e->offset = f->AlignedByteOffset; + e->output_slot = WINED3D_OUTPUT_SLOT_UNUSED; + e->method = WINED3D_DECL_METHOD_DEFAULT; + e->usage = 0; + e->usage_idx = 0; + + if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) + FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); + if (f->InstanceDataStepRate) + FIXME("Ignoring instance data step rate (%#x)\n", f->InstanceDataStepRate); + for (j = 0; j < is.element_count; ++j) { if (!strcmp(element_descs[i].SemanticName, is.elements[j].semantic_name) && element_descs[i].SemanticIndex == is.elements[j].semantic_idx) { - struct wined3d_vertex_element *e = &(*wined3d_elements)[(*wined3d_element_count)++]; - const D3D10_INPUT_ELEMENT_DESC *f = &element_descs[i]; - - e->format = wined3dformat_from_dxgi_format(f->Format); - e->input_slot = f->InputSlot; - e->offset = f->AlignedByteOffset; e->output_slot = is.elements[j].register_idx; - e->method = WINED3D_DECL_METHOD_DEFAULT; - e->usage = 0; - e->usage_idx = 0; - - if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) - FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); - if (f->InstanceDataStepRate) - FIXME("Ignoring instance data step rate (%#x)\n", f->InstanceDataStepRate); - break; } } @@ -225,23 +224,21 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ const void *shader_byte_code, SIZE_T shader_byte_code_length) { struct wined3d_vertex_element *wined3d_elements; - UINT wined3d_element_count; HRESULT hr; layout->ID3D10InputLayout_iface.lpVtbl = &d3d10_input_layout_vtbl; layout->refcount = 1; wined3d_private_store_init(&layout->private_store); - hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, - shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); - if (FAILED(hr)) + if (FAILED(hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, + shader_byte_code, shader_byte_code_length, &wined3d_elements))) { WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); wined3d_private_store_cleanup(&layout->private_store); return hr; } - hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, wined3d_element_count, + hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, element_count, layout, &d3d10_input_layout_wined3d_parent_ops, &layout->wined3d_decl); HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 502b7d3..086ac70 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -353,7 +353,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem (*wined3d_elements)[i].format = d3d_dtype_lookup[d3d9_elements[i].Type].format; (*wined3d_elements)[i].input_slot = d3d9_elements[i].Stream; (*wined3d_elements)[i].offset = d3d9_elements[i].Offset; - (*wined3d_elements)[i].output_slot = ~0U; + (*wined3d_elements)[i].output_slot = WINED3D_OUTPUT_SLOT_SEMANTIC; (*wined3d_elements)[i].method = d3d9_elements[i].Method; (*wined3d_elements)[i].usage = d3d9_elements[i].Usage; (*wined3d_elements)[i].usage_idx = d3d9_elements[i].UsageIndex; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9cc68ab..894e259 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2771,7 +2771,11 @@ void context_stream_info_from_declaration(struct wined3d_context *context, if (use_vshader) { - if (element->output_slot == ~0U) + if (element->output_slot == WINED3D_OUTPUT_SLOT_UNUSED) + { + stride_used = FALSE; + } + else if (element->output_slot == WINED3D_OUTPUT_SLOT_SEMANTIC) { /* TODO: Assuming vertexdeclarations are usually used with the * same or a similar shader, it might be worth it to store the diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 97992d6..df54bdc 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -296,7 +296,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].format = format_id; elements[idx].input_slot = 0; elements[idx].offset = offset; - elements[idx].output_slot = 0; + elements[idx].output_slot = WINED3D_OUTPUT_SLOT_SEMANTIC; elements[idx].method = WINED3D_DECL_METHOD_DEFAULT; elements[idx].usage = usage; elements[idx].usage_idx = usage_idx; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6905585..b576e1a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1496,6 +1496,9 @@ enum wined3d_display_rotation #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff +#define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff +#define WINED3D_OUTPUT_SLOT_UNUSED 0xfffffffe + struct wined3d_display_mode { UINT width;

1 0

Henri Verbeet : wined3d: Merge some common shader initialization code into shader_init().
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: f3765e9f77af2d3e036255099aa4fbf026709f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3765e9f77af2d3e036255099… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:14 2015 +0100 wined3d: Merge some common shader initialization code into shader_init(). --- dlls/wined3d/shader.c | 206 ++++++++++++++++++++++---------------------------- 1 file changed, 90 insertions(+), 116 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9425ac4..f162fb5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -331,17 +331,6 @@ int shader_addline(struct wined3d_shader_buffer *buffer, const char *format, ... return ret; } -static void shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops) -{ - shader->ref = 1; - shader->device = device; - shader->parent = parent; - shader->parent_ops = parent_ops; - list_init(&shader->linked_programs); - list_add_head(&device->shaders, &shader->shader_list_entry); -} - /* Convert floating point offset relative to a register file to an absolute * offset for float constants. */ static unsigned int shader_get_float_offset(enum wined3d_shader_register_type register_type, UINT register_idx) @@ -2199,74 +2188,121 @@ BOOL vshader_get_input(const struct wined3d_shader *shader, return FALSE; } -static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT shader_signature_copy(struct wined3d_shader_signature *dst, + const struct wined3d_shader_signature *src, char **signature_strings) { - struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + struct wined3d_shader_signature_element *e; + unsigned int i; + SIZE_T len; + char *ptr; + + ptr = *signature_strings; + + dst->element_count = src->element_count; + if (!(dst->elements = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst->elements) * dst->element_count))) + return E_OUTOFMEMORY; + + for (i = 0; i < src->element_count; ++i) + { + e = &src->elements[i]; + dst->elements[i] = *e; + + len = strlen(e->semantic_name); + memcpy(ptr, e->semantic_name, len + 1); + dst->elements[i].semantic_name = ptr; + ptr += len + 1; + } + + *signature_strings = ptr; + + return WINED3D_OK; +} + +static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, + const struct wined3d_shader_desc *desc, DWORD float_const_count, enum wined3d_shader_type type, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + struct wined3d_shader_signature_element *e; + SIZE_T total, len; unsigned int i; HRESULT hr; - const DWORD vs_uniform_count = device->adapter->d3d_info.limits.vs_uniform_count; + char *ptr; if (!desc->byte_code) return WINED3DERR_INVALIDCALL; - shader_init(shader, device, parent, parent_ops); + shader->ref = 1; + shader->device = device; + shader->parent = parent; + shader->parent_ops = parent_ops; - if (desc->output_signature) + total = 0; + if (desc->input_signature) { - struct wined3d_shader_signature_element *e; - SIZE_T total, len; - char *ptr; - - total = 0; - for (i = 0; i < desc->output_signature->element_count; ++i) + for (i = 0; i < desc->input_signature->element_count; ++i) { - e = &desc->output_signature->elements[i]; + e = &desc->input_signature->elements[i]; len = strlen(e->semantic_name); if (len >= ~(SIZE_T)0 - total) - { - shader_cleanup(shader); return E_OUTOFMEMORY; - } total += len + 1; } - - if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - ptr = shader->signature_strings; - - shader->output_signature.element_count = desc->output_signature->element_count; - if (!(shader->output_signature.elements = HeapAlloc(GetProcessHeap(), 0, - sizeof(*shader->output_signature.elements) * shader->output_signature.element_count))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - + } + if (desc->output_signature) + { for (i = 0; i < desc->output_signature->element_count; ++i) { e = &desc->output_signature->elements[i]; - shader->output_signature.elements[i] = *e; - len = strlen(e->semantic_name); - memcpy(ptr, e->semantic_name, len + 1); - shader->output_signature.elements[i].semantic_name = ptr; - ptr += len + 1; + if (len >= ~(SIZE_T)0 - total) + return E_OUTOFMEMORY; + + total += len + 1; } } + if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) + return E_OUTOFMEMORY; + ptr = shader->signature_strings; + + if (desc->input_signature && FAILED(hr = shader_signature_copy(&shader->input_signature, + desc->input_signature, &ptr))) + { + HeapFree(GetProcessHeap(), 0, shader->signature_strings); + return hr; + } + if (desc->output_signature && FAILED(hr = shader_signature_copy(&shader->output_signature, + desc->output_signature, &ptr))) + { + HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); + HeapFree(GetProcessHeap(), 0, shader->signature_strings); + return hr; + } + + list_init(&shader->linked_programs); + list_add_head(&device->shaders, &shader->shader_list_entry); if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->output_signature, - vs_uniform_count, WINED3D_SHADER_TYPE_VERTEX, desc->max_version))) + float_const_count, type, desc->max_version))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); - return hr; } + return hr; +} + +static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_device *device, + const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + unsigned int i; + HRESULT hr; + + if (FAILED(hr = shader_init(shader, device, desc, device->adapter->d3d_info.limits.vs_uniform_count, + WINED3D_SHADER_TYPE_VERTEX, parent, parent_ops))) + return hr; + for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *input = &shader->input_signature.elements[i]; @@ -2290,14 +2326,9 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d { HRESULT hr; - shader_init(shader, device, parent, parent_ops); - if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->output_signature, - 0, WINED3D_SHADER_TYPE_GEOMETRY, desc->max_version))) - { - WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup(shader); + if (FAILED(hr = shader_init(shader, device, desc, 0, + WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) return hr; - } shader->load_local_constsF = shader->lconst_inf_or_nan; @@ -2486,67 +2517,10 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int i, highest_reg_used = 0, num_regs_used = 0; HRESULT hr; - const DWORD ps_uniform_count = device->adapter->d3d_info.limits.ps_uniform_count; - - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - - shader_init(shader, device, parent, parent_ops); - - if (desc->input_signature) - { - struct wined3d_shader_signature_element *e; - SIZE_T total, len; - char *ptr; - - total = 0; - for (i = 0; i < desc->input_signature->element_count; ++i) - { - e = &desc->input_signature->elements[i]; - len = strlen(e->semantic_name); - if (len >= ~(SIZE_T)0 - total) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - - total += len + 1; - } - - if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - ptr = shader->signature_strings; - - shader->input_signature.element_count = desc->input_signature->element_count; - if (!(shader->input_signature.elements = HeapAlloc(GetProcessHeap(), 0, - sizeof(*shader->input_signature.elements) * shader->input_signature.element_count))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - - for (i = 0; i < desc->input_signature->element_count; ++i) - { - e = &desc->input_signature->elements[i]; - shader->input_signature.elements[i] = *e; - - len = strlen(e->semantic_name); - memcpy(ptr, e->semantic_name, len + 1); - shader->input_signature.elements[i].semantic_name = ptr; - ptr += len + 1; - } - } - if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->output_signature, - ps_uniform_count, WINED3D_SHADER_TYPE_PIXEL, desc->max_version))) - { - WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup(shader); + if (FAILED(hr = shader_init(shader, device, desc, device->adapter->d3d_info.limits.ps_uniform_count, + WINED3D_SHADER_TYPE_PIXEL, parent, parent_ops))) return hr; - } for (i = 0; i < MAX_REG_INPUT; ++i) {

1 0

Henri Verbeet : wined3d: Store shader input signatures as a wined3d_shader_signature structure.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 002713de6d6afed8f1483316fd32fbfc0956b338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002713de6d6afed8f1483316f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:13 2015 +0100 wined3d: Store shader input signatures as a wined3d_shader_signature structure. --- dlls/wined3d/arb_program_shader.c | 182 ++++++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 62 ++++++------- dlls/wined3d/shader.c | 144 +++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 226 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=002713de6d6afed8f1483…

1 0

Nikolay Sivov : scrrun: Added support for VT_DATE keys, and BYREF float key types.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 94a1838b7ebb416b1cbbf0adb20f3199a0bf5a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a1838b7ebb416b1cbbf0adb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 08:18:30 2015 +0300 scrrun: Added support for VT_DATE keys, and BYREF float key types. --- dlls/scrrun/dictionary.c | 38 +++++++++++++++----------- dlls/scrrun/tests/dictionary.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 24ca094..2dc5d2c 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -761,6 +761,22 @@ static DWORD get_num_hash(FLOAT num) return (*((DWORD*)&num)) % DICT_HASH_MOD; } +static HRESULT get_flt_hash(FLOAT flt, LONG *hash) +{ + if (isinf(flt)) { + *hash = 0; + return S_OK; + } + else if (!isnan(flt)) { + *hash = get_num_hash(flt); + return S_OK; + } + + /* NaN case */ + *hash = ~0u; + return CTL_E_ILLEGALFUNCTIONCALL; +} + static DWORD get_ptr_hash(void *ptr) { return PtrToUlong(ptr) % DICT_HASH_MOD; @@ -810,23 +826,15 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V IUnknown_Release(unk); break; } + case VT_DATE|VT_BYREF: + case VT_DATE: + return get_flt_hash(V_VT(key) & VT_BYREF ? *V_DATEREF(key) : V_DATE(key), &V_I4(hash)); + case VT_R4|VT_BYREF: case VT_R4: + return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R4REF(key) : V_R4(key), &V_I4(hash)); + case VT_R8|VT_BYREF: case VT_R8: - { - FLOAT flt = V_VT(key) == VT_R4 ? V_R4(key) : V_R8(key); - - if (isinf(flt)) - { - V_I4(hash) = 0; - break; - } - else if (!isnan(flt)) - { - V_I4(hash) = get_num_hash(flt); - break; - } - /* fallthrough on NAN */ - } + return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R8REF(key) : V_R8(key), &V_I4(hash)); case VT_INT: case VT_UINT: case VT_I1: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index de65310..f53222f 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -499,6 +499,15 @@ static void test_hash_value(void) ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + V_VT(&key) = VT_DATE; + V_DATE(&key) = fx8.d; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + /* inf */ fx8.d = 10.0; fx8.i.m_lo = 0; @@ -513,7 +522,19 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + V_VT(&key) = VT_DATE; + V_DATE(&key) = fx8.d; + V_I4(&hash) = 10; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + for (i = 0; i < sizeof(float_hash_tests)/sizeof(float_hash_tests[0]); i++) { + double dbl; + FLOAT flt; + DATE date; + expected = get_num_hash(float_hash_tests[i]); V_VT(&key) = VT_R4; @@ -525,6 +546,16 @@ static void test_hash_value(void) ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + flt = float_hash_tests[i]; + V_VT(&key) = VT_R4|VT_BYREF; + V_R4REF(&key) = &flt; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + V_VT(&key) = VT_R8; V_R8(&key) = float_hash_tests[i]; VariantInit(&hash); @@ -533,6 +564,35 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + + dbl = float_hash_tests[i]; + V_VT(&key) = VT_R8|VT_BYREF; + V_R8REF(&key) = &dbl; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + + V_VT(&key) = VT_DATE; + V_DATE(&key) = float_hash_tests[i]; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + + V_VT(&key) = VT_DATE|VT_BYREF; + date = float_hash_tests[i]; + V_DATEREF(&key) = &date; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); } /* interface pointers as keys */

1 0

Nikolay Sivov : scrrun: Added support for interface pointers as keys for dictionary.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 5189dc417aa2c4fb95c46a3446d2b69e03230ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5189dc417aa2c4fb95c46a344… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 21 23:30:56 2015 +0300 scrrun: Added support for interface pointers as keys for dictionary. --- dlls/scrrun/dictionary.c | 34 ++++++- dlls/scrrun/tests/dictionary.c | 214 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 242 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5189dc417aa2c4fb95c46…

1 0

Piotr Caban : oleacc: Added AccessibleChildren tests.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: cc737bd4606be9dae0f0dd79c446dca8324f60c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc737bd4606be9dae0f0dd79c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:23 2015 +0100 oleacc: Added AccessibleChildren tests. --- dlls/oleacc/tests/main.c | 351 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc737bd4606be9dae0f0d…

1 0

Piotr Caban : oleacc: Added AccessibleChildren implementation.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 88b5b6a51ed532214541bb8e097a5eba994064c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b5b6a51ed532214541bb8e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:09 2015 +0100 oleacc: Added AccessibleChildren implementation. --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index fa7d592..4d9c55e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -568,3 +568,50 @@ UINT WINAPI GetStateTextA(DWORD state_bit, CHAR *state_str, UINT state_str_len) return LoadStringA(oleacc_handle, state_id, tmp, sizeof(tmp)); } } + +HRESULT WINAPI AccessibleChildren(IAccessible *container, + LONG start, LONG count, VARIANT *children, LONG *children_cnt) +{ + IEnumVARIANT *ev; + LONG i, child_no; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", container, start, count, children, children_cnt); + + if(!container || !children || !children_cnt) + return E_INVALIDARG; + + for(i=0; i<count; i++) + VariantInit(children+i); + + hr = IAccessible_QueryInterface(container, &IID_IEnumVARIANT, (void**)&ev); + if(SUCCEEDED(hr)) { + hr = IEnumVARIANT_Reset(ev); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Skip(ev, start); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Next(ev, count, children, (ULONG*)children_cnt); + IEnumVARIANT_Release(ev); + return hr; + } + + hr = IAccessible_get_accChildCount(container, &child_no); + if(FAILED(hr)) + return hr; + + for(i=0; i<count && start+i+1<=child_no; i++) { + IDispatch *disp; + + V_VT(children+i) = VT_I4; + V_I4(children+i) = start+i+1; + + hr = IAccessible_get_accChild(container, children[i], &disp); + if(SUCCEEDED(hr) && disp) { + V_VT(children+i) = VT_DISPATCH; + V_DISPATCH(children+i) = disp; + } + } + + *children_cnt = i; + return i==count ? S_OK : S_FALSE; +} diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 9f3a9a0..4cff0b8 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,4 +1,4 @@ -@ stub AccessibleChildren +@ stdcall AccessibleChildren(ptr long long ptr ptr) @ stub AccessibleObjectFromEvent @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr)

1 0

Piotr Caban : oleacc: Added client IEnumVARIANT tests.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 15e13220f18ea68df4c7621fa9ce9ae6dc704f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15e13220f18ea68df4c7621fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:03 2015 +0100 oleacc: Added client IEnumVARIANT tests. --- dlls/oleacc/tests/main.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 0a091df..d11c344 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -384,6 +384,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; IOleWindow *ow; + IEnumVARIANT *ev; HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; @@ -391,6 +392,7 @@ static void test_default_client_accessible_object(void) POINT pt; RECT rect; LONG l, left, top, width, height; + ULONG fetched; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -432,6 +434,31 @@ static void test_default_client_accessible_object(void) ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + hr = IAccessible_QueryInterface(acc, &IID_IEnumVARIANT, (void**)&ev); + ok(hr == S_OK, "got %x\n", hr); + + hr = IEnumVARIANT_Skip(ev, 100); + ok(hr == S_FALSE, "Skip returned %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 1; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_FALSE, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(fetched == 0, "fetched = %d\n", fetched); + + hr = IEnumVARIANT_Reset(ev); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 2; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + IDispatch_Release(V_DISPATCH(&v)); + ok(fetched == 1, "fetched = %d\n", fetched); + IEnumVARIANT_Release(ev); + V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str);

1 0

Matteo Bruni : wined3d: Use a separate STATE_VIEWPORT state handler in the GLSL pipeline.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 65c8c40b18fc1445939809655d18c4fd0be64338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c8c40b18fc1445939809655… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 20 13:50:52 2015 +0100 wined3d: Use a separate STATE_VIEWPORT state handler in the GLSL pipeline. --- dlls/wined3d/glsl_shader.c | 13 ++++++++++++- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4240b08..0b307d3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7100,6 +7100,17 @@ static void glsl_vertex_pipe_projection(struct wined3d_context *context, transform_projection(context, state, state_id); } +static void glsl_vertex_pipe_viewport(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) + glsl_vertex_pipe_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)) + && state->render_states[WINED3D_RS_POINTSCALEENABLE]) + state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); + context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POS_FIXUP; +} + static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, glsl_vertex_pipe_vdecl }, WINED3D_GL_EXT_NONE }, @@ -7150,7 +7161,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_ACTIVELIGHT(6), {STATE_ACTIVELIGHT(6), light }, WINED3D_GL_EXT_NONE }, {STATE_ACTIVELIGHT(7), {STATE_ACTIVELIGHT(7), light }, WINED3D_GL_EXT_NONE }, /* Viewport */ - {STATE_VIEWPORT, {STATE_VIEWPORT, viewport_vertexpart }, WINED3D_GL_EXT_NONE }, + {STATE_VIEWPORT, {STATE_VIEWPORT, glsl_vertex_pipe_viewport}, WINED3D_GL_EXT_NONE }, /* Transform states */ {STATE_TRANSFORM(WINED3D_TS_VIEW), {STATE_TRANSFORM(WINED3D_TS_VIEW), glsl_vertex_pipe_view }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_PROJECTION), {STATE_TRANSFORM(WINED3D_TS_PROJECTION), glsl_vertex_pipe_projection}, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1c5edb3..774e6dd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4790,7 +4790,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine checkGLcall("glViewport"); } -void viewport_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void viewport_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70f07a1..98df60c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2814,8 +2814,6 @@ void transform_texture(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_ambient(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void viewport_vertexpart(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void light(struct wined3d_context *context,

1 0