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

Matteo Bruni : wined3d: Use a separate STATE_VIEWPORT state handler in the GLSL pipeline.
by Alexandre Julliard 23 Mar '15

23 Mar '15

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

Matteo Bruni : wined3d: Introduce a get_projection_matrix() function.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 2d270f31c67f1e7f93917bde3ba18936d384195a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d270f31c67f1e7f93917bde3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 20 13:50:53 2015 +0100 wined3d: Introduce a get_projection_matrix() function. Notice that I'm using floats instead of doubles in the new function, mostly to be able to use struct wined3d_matrix and multiply_matrix(). At a rough estimate the precision should still be good enough. --- dlls/wined3d/state.c | 68 +++--------------------------------------- dlls/wined3d/utils.c | 64 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 70 insertions(+), 64 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 774e6dd..9a40876 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4052,74 +4052,14 @@ static void transform_view(struct wined3d_context *context, const struct wined3d void transform_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_matrix projection; gl_info->gl_ops.gl.p_glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); - /* There are a couple of additional things we have to take into account - * here besides the projection transformation itself: - * - We need to flip along the y-axis in case of offscreen rendering. - * - OpenGL Z range is {-Wc,...,Wc} while D3D Z range is {0,...,Wc}. - * - D3D coordinates refer to pixel centers while GL coordinates refer - * to pixel corners. - * - D3D has a top-left filling convention. We need to maintain this - * even after the y-flip mentioned above. - * In order to handle the last two points, we translate by - * (63.0 / 128.0) / VPw and (63.0 / 128.0) / VPh. This is equivalent to - * translating slightly less than half a pixel. We want the difference to - * be large enough that it doesn't get lost due to rounding inside the - * driver, but small enough to prevent it from interfering with any - * anti-aliasing. */ - - if (context->last_was_rhw) - { - /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ - double x = state->viewport.x; - double y = state->viewport.y; - double w = state->viewport.width; - double h = state->viewport.height; - double x_scale = 2.0 / w; - double x_offset = ((63.0 / 64.0) - (2.0 * x) - w) / w; - double y_scale = context->render_offscreen ? 2.0 / h : 2.0 / -h; - double y_offset = context->render_offscreen - ? ((63.0 / 64.0) - (2.0 * y) - h) / h - : ((63.0 / 64.0) - (2.0 * y) - h) / -h; - enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? - state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; - double z_scale = zenable ? 2.0f : 0.0f; - double z_offset = zenable ? -1.0f : 0.0f; - const GLdouble projection[] = - { - x_scale, 0.0, 0.0, 0.0, - 0.0, y_scale, 0.0, 0.0, - 0.0, 0.0, z_scale, 0.0, - x_offset, y_offset, z_offset, 1.0, - }; - - gl_info->gl_ops.gl.p_glLoadMatrixd(projection); - checkGLcall("glLoadMatrixd"); - } - else - { - double y_scale = context->render_offscreen ? -1.0 : 1.0; - double x_offset = (63.0 / 64.0) / state->viewport.width; - double y_offset = context->render_offscreen - ? (63.0 / 64.0) / state->viewport.height - : -(63.0 / 64.0) / state->viewport.height; - const GLdouble projection[] = - { - 1.0, 0.0, 0.0, 0.0, - 0.0, y_scale, 0.0, 0.0, - 0.0, 0.0, 2.0, 0.0, - x_offset, y_offset, -1.0, 1.0, - }; - - gl_info->gl_ops.gl.p_glLoadMatrixd(projection); - checkGLcall("glLoadMatrixd"); - - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_PROJECTION]._11); - checkGLcall("glLoadMatrixf"); - } + get_projection_matrix(context, state, &projection); + gl_info->gl_ops.gl.p_glLoadMatrixf(&projection._11); + checkGLcall("glLoadMatrixf"); } /* This should match any arrays loaded in load_vertex_data. diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a43029c..4452f7c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3138,6 +3138,70 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi multiply_matrix(mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(0)]); } +void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, + struct wined3d_matrix *mat) +{ + /* There are a couple of additional things we have to take into account + * here besides the projection transformation itself: + * - We need to flip along the y-axis in case of offscreen rendering. + * - OpenGL Z range is {-Wc,...,Wc} while D3D Z range is {0,...,Wc}. + * - D3D coordinates refer to pixel centers while GL coordinates refer + * to pixel corners. + * - D3D has a top-left filling convention. We need to maintain this + * even after the y-flip mentioned above. + * In order to handle the last two points, we translate by + * (63.0 / 128.0) / VPw and (63.0 / 128.0) / VPh. This is equivalent to + * translating slightly less than half a pixel. We want the difference to + * be large enough that it doesn't get lost due to rounding inside the + * driver, but small enough to prevent it from interfering with any + * anti-aliasing. */ + + if (context->last_was_rhw) + { + /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ + float x = state->viewport.x; + float y = state->viewport.y; + float w = state->viewport.width; + float h = state->viewport.height; + float x_scale = 2.0f / w; + float x_offset = (float)((63.0 / 64.0 - (2.0 * x) - w) / w); + float y_scale = context->render_offscreen ? 2.0f / h : 2.0f / -h; + float y_offset = (float)(context->render_offscreen + ? (63.0 / 64.0 - (2.0 * y) - h) / h + : (63.0 / 64.0 - (2.0 * y) - h) / -h); + enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? + state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; + float z_scale = zenable ? 2.0f : 0.0f; + float z_offset = zenable ? -1.0f : 0.0f; + const struct wined3d_matrix projection = + { + x_scale, 0.0f, 0.0f, 0.0f, + 0.0f, y_scale, 0.0f, 0.0f, + 0.0f, 0.0f, z_scale, 0.0f, + x_offset, y_offset, z_offset, 1.0f, + }; + + *mat = projection; + } + else + { + float y_scale = context->render_offscreen ? -1.0f : 1.0f; + float x_offset = 63.0f / 64.0f * (1.0f / state->viewport.width); + float y_offset = context->render_offscreen + ? 63.0f / 64.0f * (1.0f / state->viewport.height) + : -63.0f / 64.0f * (1.0f / state->viewport.height); + const struct wined3d_matrix projection = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, y_scale, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + x_offset, y_offset, -1.0f, 1.0f, + }; + + multiply_matrix(mat, &projection, &state->transforms[WINED3D_TS_PROJECTION]); + } +} + /* 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, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 98df60c..bd4f2e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3037,6 +3037,8 @@ static inline BOOL shader_constant_is_local(const struct wined3d_shader *shader, void get_identity_matrix(struct wined3d_matrix *mat) DECLSPEC_HIDDEN; void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, 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; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : wined3d: Introduce a get_texture_matrix() function.
by Alexandre Julliard 23 Mar '15

23 Mar '15

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

Sebastian Lackner : user32: Use C_ASSERT to ensure user_thread_info fits into TEB->Win32ClientInfo.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 5e5adcffb5e665d3d1562fd8598c5e1ae016054f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5adcffb5e665d3d1562fd85… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 23 14:12:38 2015 +0100 user32: Use C_ASSERT to ensure user_thread_info fits into TEB->Win32ClientInfo. --- dlls/user32/user_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index adf3f7d..919540d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -189,10 +189,10 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; - - ULONG pad[6]; /* Available for more data */ }; +C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); + struct hook_extra_info { HHOOK handle;

1 0

Jacek Caban : mshtml.idl: Added IHTMLSelectionObject2 declaration.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 88edfb5701843522fd4da989deede04ca752a92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88edfb5701843522fd4da989d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 16:00:00 2015 +0100 mshtml.idl: Added IHTMLSelectionObject2 declaration. --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index e65a049..722686a 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1759,6 +1759,10 @@ #define DISPID_IHTMLSELECTIONOBJECT_CLEAR (DISPID_SELECTOBJ+3) #define DISPID_IHTMLSELECTIONOBJECT_TYPE (DISPID_SELECTOBJ+4) +/* IHTMLSelectionObject2 */ +#define DISPID_IHTMLSELECTIONOBJECT2_CREATERANGECOLLECTION DISPID_SELECTOBJ+5 +#define DISPID_IHTMLSELECTIONOBJECT2_TYPEDETAIL DISPID_SELECTOBJ+6 + /* IHTMLSelection */ #define DISPID_IHTMLSELECTION_ANCHORNODE DISPID_HTMLSELECTION+1 #define DISPID_IHTMLSELECTION_ANCHOROFFSET DISPID_HTMLSELECTION+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index 0c5a874..ba45677 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9494,6 +9494,24 @@ interface IHTMLSelectionObject : IDispatch } /***************************************************************************** + * IHTMLSelectionObject2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f7ec-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLSelectionObject2 : IDispatch +{ + [id(DISPID_IHTMLSELECTIONOBJECT2_CREATERANGECOLLECTION)] + HRESULT createRangeCollection([out, retval] IDispatch **rangeCollection); + + [propget, id(DISPID_IHTMLSELECTIONOBJECT2_TYPEDETAIL)] + HRESULT typeDetail([out, retval] BSTR *p); +} + +/***************************************************************************** * IHTMLSelection interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLSelectionObject2 stub implementation.
by Alexandre Julliard 23 Mar '15

23 Mar '15

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

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

23 Mar '15

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

Sebastian Lackner : gdiplus: Add missing returns in initialize_decoder_wic (Coverity).
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 2af09b49a8ff66acf0d846fc4cafd19ddad2c1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af09b49a8ff66acf0d846fc4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 20 22:34:49 2015 +0100 gdiplus: Add missing returns in initialize_decoder_wic (Coverity). --- dlls/gdiplus/image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8eb1419..77b9305 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3425,13 +3425,13 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB TRACE("%p,%s\n", stream, wine_dbgstr_guid(container)); hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); hr = IWICImagingFactory_CreateDecoder(factory, container, NULL, decoder); IWICImagingFactory_Release(factory); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); hr = IWICBitmapDecoder_Initialize(*decoder, stream, WICDecodeMetadataCacheOnLoad); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); return Ok; }

1 0

Bruno Jesus : netapi32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 23 Mar '15

23 Mar '15

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

Bruno Jesus : netapi32: Return an empty comment instead of NULL pointer in NetServerGetInfo.
by Alexandre Julliard 23 Mar '15

23 Mar '15

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