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

Stefan Dösinger : ddraw/tests: Correct executebuffer offsets.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 70c6666d1e84d2e602e0c51a89ff6aaea7f1d76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c6666d1e84d2e602e0c51a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 20 12:47:12 2015 +0100 ddraw/tests: Correct executebuffer offsets. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ca61f13..68821e4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6189,7 +6189,7 @@ static void test_texturemapblend(void) memcpy(exec_desc.lpData, test2_quads, sizeof(test2_quads)); - ptr = ((BYTE *)exec_desc.lpData) + sizeof(test1_quads); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(test2_quads); emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 8); emit_set_rs(&ptr, D3DRENDERSTATE_ALPHABLENDENABLE, FALSE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); @@ -6202,7 +6202,7 @@ static void test_texturemapblend(void) inst_length -= sizeof(test2_quads); hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); - set_execute_data(execute_buffer, 8, sizeof(test1_quads), inst_length); + set_execute_data(execute_buffer, 8, sizeof(test2_quads), inst_length); hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Take the input slot into account when handling WINED3D_APPEND_ALIGNED_ELEMENT.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: cbe717b8f3429a4ca30c1ac6276902cf486f1c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe717b8f3429a4ca30c1ac62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:15 2015 +0100 wined3d: Take the input slot into account when handling WINED3D_APPEND_ALIGNED_ELEMENT. --- dlls/wined3d/vertexdeclaration.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index df3d8ba..97992d6 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -218,14 +218,18 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (e->offset == WINED3D_APPEND_ALIGNED_ELEMENT) { - if (!i) - { - e->offset = 0; - } - else + const struct wined3d_vertex_declaration_element *prev; + unsigned int j; + + e->offset = 0; + for (j = 1; j <= i; ++j) { - struct wined3d_vertex_declaration_element *prev = &declaration->elements[i - 1]; - e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + prev = &declaration->elements[i - j]; + if (prev->input_slot == e->input_slot) + { + e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + break; + } } }

1 0

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

March 23, 2015

Module: wine Branch: master Commit: 2e5ad1b6e327c5be4d2dc9abe02ebf92dcf2bf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5ad1b6e327c5be4d2dc9abe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:12 2015 +0100 wined3d: Store shader output signatures as a wined3d_shader_signature structure. Instead of a fixed array of wined3d_shader_signature_element structures. Shader model 4 shaders can have different semantics in a single register, e.g. v1.xy TEXCOORD0 and v1.zw TEXCOORD1, so having a single wined3d_shader_signature_element structure per register isn't necessarily sufficient. --- dlls/wined3d/arb_program_shader.c | 98 +++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 72 ++++++++++++++------------ dlls/wined3d/shader.c | 105 ++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 167 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e5ad1b6e327c5be4d2dc…

1 0

Matteo Bruni : wined3d: Introduce a get_texture_matrix() function.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 74cda79ac3d813aa8d9364e4d619d4c4605a09c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cda79ac3d813aa8d9364e4d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 20 13:50:55 2015 +0100 wined3d: Introduce a get_texture_matrix() function. --- dlls/wined3d/state.c | 40 +++++++++-------------------------- dlls/wined3d/utils.c | 47 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 5 ++--- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9a40876..bfef4b0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3278,12 +3278,10 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st void transform_texture(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD texUnit = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - const struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; - DWORD mapped_stage = context->tex_unit_map[texUnit]; - BOOL generated; - int coordIdx; + unsigned int tex = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + unsigned int mapped_stage = context->tex_unit_map[tex]; + struct wined3d_matrix mat; /* Ignore this when a vertex shader is used, or if the streams aren't sorted out yet */ if (use_vs(state) || isStateDirty(context, STATE_VDECL)) @@ -3296,31 +3294,13 @@ void transform_texture(struct wined3d_context *context, const struct wined3d_sta if (mapped_stage >= gl_info->limits.textures) return; context_active_texture(context, gl_info, mapped_stage); - generated = (state->texture_states[texUnit][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU; - coordIdx = min(state->texture_states[texUnit][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], MAX_TEXTURES - 1); - - set_texture_matrix(gl_info, &state->transforms[WINED3D_TS_TEXTURE0 + texUnit], - state->texture_states[texUnit][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], - generated, context->last_was_rhw, - context->stream_info.use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)) - ? context->stream_info.elements[WINED3D_FFP_TEXCOORD0 + coordIdx].format->id - : WINED3DFMT_UNKNOWN, - device->shader_backend->shader_has_ffp_proj_control(device->shader_priv)); - - /* The sampler applying function calls us if this changes */ - if ((context->lastWasPow2Texture & (1 << texUnit)) && state->textures[texUnit]) - { - if(generated) { - FIXME("Non-power2 texture being used with generated texture coords\n"); - } - /* NP2 texcoord fixup is implemented for pixelshaders so only enable the - fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ - if (!use_ps(state)) - { - TRACE("Non power two matrix multiply fixup\n"); - gl_info->gl_ops.gl.p_glMultMatrixf(state->textures[texUnit]->pow2_matrix); - } - } + gl_info->gl_ops.gl.p_glMatrixMode(GL_TEXTURE); + checkGLcall("glMatrixMode(GL_TEXTURE)"); + + get_texture_matrix(context, state, mapped_stage, &mat); + + gl_info->gl_ops.gl.p_glLoadMatrixf(&mat._11); + checkGLcall("glLoadMatrixf"); } static void unload_tex_coords(const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4452f7c..b28142c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3203,19 +3203,15 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w } /* Setup this textures matrix according to the texture flags. */ -/* Context activation is done by the caller (state handler). */ -void set_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, DWORD flags, - BOOL calculated_coords, BOOL transformed, enum wined3d_format_id format_id, BOOL ffp_proj_control) +static void compute_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, + DWORD flags, BOOL calculated_coords, BOOL transformed, enum wined3d_format_id format_id, + BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) { struct wined3d_matrix mat; - gl_info->gl_ops.gl.p_glMatrixMode(GL_TEXTURE); - checkGLcall("glMatrixMode(GL_TEXTURE)"); - if (flags == WINED3D_TTFF_DISABLE || flags == WINED3D_TTFF_COUNT1 || transformed) { - gl_info->gl_ops.gl.p_glLoadIdentity(); - checkGLcall("glLoadIdentity()"); + get_identity_matrix(out_matrix); return; } @@ -3314,8 +3310,39 @@ void set_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wine } } - gl_info->gl_ops.gl.p_glLoadMatrixf(&mat._11); - checkGLcall("glLoadMatrixf(mat)"); + *out_matrix = mat; +} + +void get_texture_matrix(const struct wined3d_context *context, const struct wined3d_state *state, + unsigned int tex, struct wined3d_matrix *mat) +{ + const struct wined3d_device *device = context->swapchain->device; + const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL generated = (state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) + != WINED3DTSS_TCI_PASSTHRU; + unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], + MAX_TEXTURES - 1); + + compute_texture_matrix(gl_info, &state->transforms[WINED3D_TS_TEXTURE0 + tex], + state->texture_states[tex][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], + generated, context->last_was_rhw, + context->stream_info.use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coord_idx)) + ? context->stream_info.elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->id + : WINED3DFMT_UNKNOWN, + device->shader_backend->shader_has_ffp_proj_control(device->shader_priv), mat); + + if ((context->lastWasPow2Texture & (1 << tex)) && state->textures[tex]) + { + if (generated) + FIXME("Non-power-of-two texture being used with generated texture coords.\n"); + /* NP2 texcoord fixup is implemented for pixelshaders so only enable the + * fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ + if (!use_ps(state)) + { + TRACE("Non-power-of-two texture matrix multiply fixup.\n"); + multiply_matrix(mat, mat, (struct wined3d_matrix *)state->textures[tex]->pow2_matrix); + } + } } /* This small helper function is used to convert a bitmask into the number of masked bits */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd4f2e2..4e36969 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2782,9 +2782,6 @@ BOOL is_invalid_op(const struct wined3d_state *state, int stage, void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha, int stage, enum wined3d_texture_op op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; -void set_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, - DWORD flags, BOOL calculated_coords, BOOL transformed, enum wined3d_format_id format_id, - BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; void texture_activate_dimensions(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void sampler_texdim(struct wined3d_context *context, @@ -3039,6 +3036,8 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi struct wined3d_matrix *mat) DECLSPEC_HIDDEN; void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; +void get_texture_matrix(const struct wined3d_context *context, const struct wined3d_state *state, + unsigned int tex, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Vincent Povirk : gdiplus: Fonts in UnitWorld shouldn' t be scaled to the page unit.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 137128fa50dc6e7cb69ba47d305c1b2271977605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137128fa50dc6e7cb69ba47d3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 20 16:04:39 2015 -0500 gdiplus: Fonts in UnitWorld shouldn't be scaled to the page unit. --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f485058..850f44a 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -465,7 +465,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW matrix = graphics->worldtrans; - if (font->unit == UnitPixel) + if (font->unit == UnitPixel || font->unit == UnitWorld) { height = units_to_pixels(font->emSize, graphics->unit, graphics->yres); if (graphics->unit != UnitDisplay) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5284b99..7485a3c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2123,7 +2123,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT unscaled_font; TEXTMETRICW textmet; - if (font->unit == UnitPixel) + if (font->unit == UnitPixel || font->unit == UnitWorld) font_height = font->emSize; else { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 77de9e4..f237090 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3695,6 +3695,62 @@ todo_wine GdipDeleteFont(font); } + /* Font with units = UnitWorld */ + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + GpPointF pt = {0.0, 100.0}; + GpImage* image; + REAL expected_width, expected_height; + + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); + + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &pt, 1); + expect(Ok, status); + + status = GdipCreateFont(family, pt.Y, FontStyleRegular, UnitWorld, &font); + expect(Ok, status); + + status = GdipGetFontUnit(font, &font_unit); + expect(Ok, status); + expect(UnitWorld, font_unit); + + lf.lfHeight = 0xdeadbeef; + status = GdipGetLogFontW(font, graphics, &lf); + expect(Ok, status); + ok(lf.lfHeight == -100, "%u: expected -100, got %d\n", i, lf.lfHeight); + + set_rect_empty(&rc); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); + expect(Ok, status); + + if (i == 0) + { + base_cx = bounds.Width; + base_cy = bounds.Height; + } + + pt.X = 1.0; + pt.Y = 1.0; + + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &pt, 1); + expect(Ok, status); + + /* height is constant in device space, width is proportional to height in world space */ + expected_width = base_cx * pt.Y; + expected_height = base_cy * pt.Y; + + if (td[i].unit == UnitDisplay || td[i].unit == UnitPixel) + ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); + else + todo_wine ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); + ok(fabs(expected_height - bounds.Height) <= 0.001, "%u: expected %f, got %f\n", i, expected_height, bounds.Height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage(image); + GdipDeleteFont(font); + } + GdipDeleteFontFamily(family); GdipDeleteStringFormat(format); }

1 0

Piotr Caban : oleacc: Added window IEnumVARIANT stub.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: ee144b66abfc8a1b3ed81cc13f54713bf646acd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee144b66abfc8a1b3ed81cc13… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:52 2015 +0100 oleacc: Added window IEnumVARIANT stub. --- dlls/oleacc/window.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index f8090b5..64d7167 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; } Window; @@ -49,6 +50,8 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -346,6 +349,68 @@ static const IOleWindowVtbl WindowOleWindowVtbl = { Window_OleWindow_ContextSensitiveHelp }; +static inline Window* impl_from_Window_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Window, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl WindowEnumVARIANTVtbl = { + Window_EnumVARIANT_QueryInterface, + Window_EnumVARIANT_AddRef, + Window_EnumVARIANT_Release, + Window_EnumVARIANT_Next, + Window_EnumVARIANT_Skip, + Window_EnumVARIANT_Reset, + Window_EnumVARIANT_Clone +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -360,6 +425,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) window->IAccessible_iface.lpVtbl = &WindowVtbl; window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; + window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);

1 0

Jacek Caban : mshtml: Added IHTMLSelectionObject2 stub implementation.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 937405664417a682c7ebdffceecd48cbc767b8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=937405664417a682c7ebdffce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 16:00:17 2015 +0100 mshtml: Added IHTMLSelectionObject2 stub implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/selection.c | 93 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 10 +++++ 3 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2156d90..6d39a72 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -177,6 +177,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLScriptElement) \ XIID(IHTMLSelectElement) \ XIID(IHTMLSelectionObject) \ + XIID(IHTMLSelectionObject2) \ XIID(IHTMLStorage) \ XIID(IHTMLStyle) \ XIID(IHTMLStyle2) \ diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index f34154b..cfa5910 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; IHTMLSelectionObject IHTMLSelectionObject_iface; + IHTMLSelectionObject2 IHTMLSelectionObject2_iface; LONG ref; @@ -61,6 +62,8 @@ static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *i *ppv = &This->IHTMLSelectionObject_iface; }else if(IsEqualGUID(&IID_IHTMLSelectionObject, riid)) { *ppv = &This->IHTMLSelectionObject_iface; + }else if(IsEqualGUID(&IID_IHTMLSelectionObject2, riid)) { + *ppv = &This->IHTMLSelectionObject2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -234,13 +237,100 @@ static const IHTMLSelectionObjectVtbl HTMLSelectionObjectVtbl = { HTMLSelectionObject_get_type }; +static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject2(IHTMLSelectionObject2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject2_iface); +} + +static HRESULT WINAPI HTMLSelectionObject2_QueryInterface(IHTMLSelectionObject2 *iface, REFIID riid, void **ppv) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + + return IHTMLSelectionObject_QueryInterface(&This->IHTMLSelectionObject_iface, riid, ppv); +} + +static ULONG WINAPI HTMLSelectionObject2_AddRef(IHTMLSelectionObject2 *iface) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + + return IHTMLSelectionObject_AddRef(&This->IHTMLSelectionObject_iface); +} + +static ULONG WINAPI HTMLSelectionObject2_Release(IHTMLSelectionObject2 *iface) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + + return IHTMLSelectionObject_Release(&This->IHTMLSelectionObject_iface); +} + +static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfoCount(IHTMLSelectionObject2 *iface, UINT *pctinfo) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfo(IHTMLSelectionObject2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLSelectionObject2_GetIDsOfNames(IHTMLSelectionObject2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLSelectionObject2_Invoke(IHTMLSelectionObject2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLSelectionObject2_createRangeCollection(IHTMLSelectionObject2 *iface, IDispatch **rangeCollection) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + FIXME("(%p)->(%p)\n", This, rangeCollection); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLSelectionObject2_get_typeDetail(IHTMLSelectionObject2 *iface, BSTR *p) +{ + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLSelectionObject2Vtbl HTMLSelectionObject2Vtbl = { + HTMLSelectionObject2_QueryInterface, + HTMLSelectionObject2_AddRef, + HTMLSelectionObject2_Release, + HTMLSelectionObject2_GetTypeInfoCount, + HTMLSelectionObject2_GetTypeInfo, + HTMLSelectionObject2_GetIDsOfNames, + HTMLSelectionObject2_Invoke, + HTMLSelectionObject2_createRangeCollection, + HTMLSelectionObject2_get_typeDetail +}; + static const tid_t HTMLSelectionObject_iface_tids[] = { IHTMLSelectionObject_tid, + IHTMLSelectionObject2_tid, 0 }; static dispex_static_data_t HTMLSelectionObject_dispex = { NULL, - IHTMLSelectionObject_tid, + IHTMLSelectionObject_tid, /* FIXME: We have a test for that, but it doesn't expose IHTMLSelectionObject2 iface. */ NULL, HTMLSelectionObject_iface_tids }; @@ -256,6 +346,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect init_dispex(&selection->dispex, (IUnknown*)&selection->IHTMLSelectionObject_iface, &HTMLSelectionObject_dispex); selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; + selection->IHTMLSelectionObject2_iface.lpVtbl = &HTMLSelectionObject2Vtbl; selection->ref = 1; selection->nsselection = nsselection; /* We shouldn't call AddRef here */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bcb97b9..29356d7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -430,6 +430,15 @@ static const IID * const img_factory_iids[] = { NULL }; +static const IID * const selection_iids[] = { + &IID_IUnknown, + &IID_IDispatch, + &IID_IDispatchEx, + &IID_IHTMLSelectionObject, + &IID_IHTMLSelectionObject2, + NULL +}; + typedef struct { const char *tag; REFIID *iids; @@ -5151,6 +5160,7 @@ static void test_txtrange(IHTMLDocument2 *doc) ok(hres == S_OK, "IHTMLDocument2_get_selection failed: %08x\n", hres); test_disp((IUnknown*)selection, &IID_IHTMLSelectionObject, "[object]"); + test_ifaces((IUnknown*)selection, selection_iids); hres = IHTMLSelectionObject_createRange(selection, &disp_range); ok(hres == S_OK, "IHTMLSelectionObject_createRange failed: %08x\n", hres);

1 0

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

March 23, 2015

Module: wine Branch: master Commit: 843f463d2eaa81b11e3e34e086b4f600de9e146e URL: http://source.winehq.org/git/wine.git/?a=commit;h=843f463d2eaa81b11e3e34e08… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:45 2015 +0100 oleacc: Added client IEnumVARIANT stub. --- dlls/oleacc/client.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 9456f81..9409990 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; @@ -51,6 +52,8 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -496,6 +499,68 @@ static const IOleWindowVtbl ClientOleWindowVtbl = { Client_OleWindow_ContextSensitiveHelp }; +static inline Client* impl_from_Client_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Client, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { + Client_EnumVARIANT_QueryInterface, + Client_EnumVARIANT_AddRef, + Client_EnumVARIANT_Release, + Client_EnumVARIANT_Next, + Client_EnumVARIANT_Skip, + Client_EnumVARIANT_Reset, + Client_EnumVARIANT_Clone +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -510,6 +575,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; + client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; client->ref = 1; client->hwnd = hwnd;

1 0

Bruno Jesus : netapi32: Return an empty comment instead of NULL pointer in NetServerGetInfo.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: ea2507f461bb8401723e7233fe65509d009d125e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2507f461bb8401723e7233f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 21 01:18:40 2015 -0300 netapi32: Return an empty comment instead of NULL pointer in NetServerGetInfo. --- dlls/netapi32/netapi32.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f7701e3..f9bfb48 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1042,7 +1042,8 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu GetComputerNameW(computerName, &computerNameLen); computerNameLen++; /* include NULL terminator */ - size = sizeof(SERVER_INFO_101) + computerNameLen * sizeof(WCHAR); + /* Plus 1 for empty comment */ + size = sizeof(SERVER_INFO_101) + (computerNameLen + 1) * sizeof(WCHAR); ret = NetApiBufferAllocate(size, (LPVOID *)bufptr); if (ret == NERR_Success) { @@ -1060,7 +1061,9 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu info->sv101_version_minor = verInfo.dwMinorVersion; /* Use generic type as no wine equivalent of DC / Server */ info->sv101_type = SV_TYPE_NT; - info->sv101_comment = NULL; + info->sv101_comment = (LMSTR)(*bufptr + sizeof(SERVER_INFO_101) + + computerNameLen * sizeof(WCHAR)); + info->sv101_comment[0] = '\0'; } break; }

1 0

Bruno Jesus : netapi32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 1fa2986d00c4130eb01557c034425c15edf9222a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa2986d00c4130eb01557c03… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Mar 21 00:05:40 2015 -0300 netapi32/tests: Fix a memory leak (Valgrind). --- dlls/netapi32/tests/access.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index b71e1c8..7675cbf 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -348,6 +348,8 @@ static void run_localgroupgetinfo_tests(void) for(i=0;i<entries_read;i++) trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname)); + + pNetApiBufferFree(buffer); } START_TEST(access)

1 0