wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Matteo Bruni : wined3d: Get rid of wined3d_max_compat_varyings().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: fdf37d3e51ae04653424680e1b53c20642af51b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdf37d3e51ae04653424680e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Aug 13 22:02:09 2019 +0200 wined3d: Get rid of wined3d_max_compat_varyings(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/arb_program_shader.c | 1 - dlls/wined3d/glsl_shader.c | 22 ++++++++++------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0b7fcf4..8684a4e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3770,7 +3770,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; - d3d_info->limits.max_compat_varying_count = shader_caps.max_compat_varying_count; + d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b81898b..9502430 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4958,7 +4958,6 @@ static void shader_arb_get_caps(const struct wined3d_adapter *adapter, struct sh } caps->varying_count = 0; - caps->max_compat_varying_count = 0; caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (use_nv_clip(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5f5192..0f1a319 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -420,13 +420,12 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -unsigned int shader_glsl_max_compat_varyings(const struct wined3d_gl_info *gl_info) +unsigned int shader_glsl_full_ffp_varyings(const struct wined3d_gl_info *gl_info) { /* On core profile we have to also count diffuse and specular colours and * the fog coordinate. */ - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return WINED3D_MAX_TEXTURES * 4; - return (WINED3D_MAX_TEXTURES + 2) * 4 + 1; + return gl_info->limits.glsl_varyings >= (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] + ? WINED3D_MAX_TEXTURES * 4 : (WINED3D_MAX_TEXTURES + 2) * 4 + 1); } static void shader_glsl_append_imm_vec(struct wined3d_string_buffer *buffer, @@ -7155,8 +7154,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl if (texcoords_written_mask[i] != WINED3DSP_WRITEMASK_ALL) { - if (gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(gl_info) - && !texcoords_written_mask[i]) + if (!shader_glsl_full_ffp_varyings(gl_info) && !texcoords_written_mask[i]) continue; shader_glsl_write_mask_to_str(~texcoords_written_mask[i] & WINED3DSP_WRITEMASK_ALL, reg_mask); @@ -9066,7 +9064,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr if (settings->texcoords & (1u << i)) shader_addline(buffer, "ffp_varying_texcoord[%u] = ffp_texture_matrix[%u] * ffp_attrib_texcoord%u;\n", i, i, i); - else if (gl_info->limits.glsl_varyings >= shader_glsl_max_compat_varyings(gl_info)) + else if (shader_glsl_full_ffp_varyings(gl_info)) shader_addline(buffer, "ffp_varying_texcoord[%u] = vec4(0.0);\n", i); else output_legacy_texcoord = FALSE; @@ -11104,7 +11102,6 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s caps->vs_uniform_count = min(WINED3D_MAX_VS_CONSTS_F, gl_info->limits.glsl_vs_float_constants); caps->ps_uniform_count = min(WINED3D_MAX_PS_CONSTS_F, gl_info->limits.glsl_ps_float_constants); caps->varying_count = gl_info->limits.glsl_varyings; - caps->max_compat_varying_count = shader_glsl_max_compat_varyings(gl_info); /* FIXME: The following line is card dependent. -8.0 to 8.0 is the * Direct3D minimum requirement. @@ -11130,6 +11127,8 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s | WINED3D_SHADER_CAP_SRGB_WRITE; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; + if (shader_glsl_full_ffp_varyings(gl_info)) + caps->wined3d_caps |= WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) @@ -11555,8 +11554,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, * Likewise, we have to invalidate the shader when using per-vertex * colours and diffuse/specular attribute presence changes, or when * normal presence changes. */ - if (gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(gl_info) - || (state->render_states[WINED3D_RS_COLORVERTEX] + if (!shader_glsl_full_ffp_varyings(gl_info) || (state->render_states[WINED3D_RS_COLORVERTEX] && (diffuse != context->last_was_diffuse || specular != context->last_was_specular)) || normal != context->last_was_normal) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; @@ -12071,7 +12069,7 @@ static void glsl_fragment_pipe_vdecl(struct wined3d_context *context, const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; /* Because of settings->texcoords_initialized and args->texcoords_initialized. */ - if (gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(gl_info)) + if (!shader_glsl_full_ffp_varyings(gl_info)) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) @@ -12084,7 +12082,7 @@ static void glsl_fragment_pipe_vs(struct wined3d_context *context, const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; /* Because of settings->texcoords_initialized and args->texcoords_initialized. */ - if (gl_info->limits.glsl_varyings < shader_glsl_max_compat_varyings(gl_info)) + if (!shader_glsl_full_ffp_varyings(gl_info)) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8708995..4961dca 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4114,7 +4114,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } } - if (d3d_info->limits.varying_count < d3d_info->limits.max_compat_varying_count) + if (!d3d_info->full_ffp_varyings) { const struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b9cad2a..cf7c177 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6188,7 +6188,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d * Reading uninitialized varyings on core profile contexts results in an * error while with builtin varyings on legacy contexts you get undefined * behavior. */ - if (d3d_info->limits.varying_count && d3d_info->limits.varying_count < d3d_info->limits.max_compat_varying_count) + if (d3d_info->limits.varying_count && !d3d_info->full_ffp_varyings) { settings->texcoords_initialized = 0; for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) @@ -6395,7 +6395,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } - if (d3d_info->limits.varying_count >= d3d_info->limits.max_compat_varying_count) + if (d3d_info->full_ffp_varyings) settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; if (d3d_info->emulated_flatshading) @@ -6444,7 +6444,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } - if (d3d_info->limits.varying_count >= d3d_info->limits.max_compat_varying_count) + if (d3d_info->full_ffp_varyings) settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80ed41b..229974d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -176,7 +176,6 @@ struct wined3d_d3d_limits unsigned int max_rt_count; unsigned int max_clip_distances; - unsigned int max_compat_varying_count; unsigned int texture_size; float pointsize_max; }; @@ -218,6 +217,7 @@ struct wined3d_d3d_info uint32_t srgb_read_control : 1; uint32_t srgb_write_control : 1; uint32_t clip_control : 1; + uint32_t full_ffp_varyings : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -1309,6 +1309,7 @@ typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u #define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u #define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u +#define WINED3D_SHADER_CAP_FULL_FFP_VARYINGS 0x00000010u struct shader_caps { @@ -1323,7 +1324,6 @@ struct shader_caps unsigned int ps_uniform_count; float ps_1x_max_value; unsigned int varying_count; - unsigned int max_compat_varying_count; DWORD wined3d_caps; };

1 0

Matteo Bruni : wined3d: Fix color mask 1-3 state setting.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 4774db88800c806a1fe99ba4f08d5f4510e1b8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4774db88800c806a1fe99ba4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Aug 13 22:02:08 2019 +0200 wined3d: Fix color mask 1-3 state setting. Fixes a regression from commit 74b9ef2c1d7bc37c79b02b7c541d4b440de0b43d. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d860d13..6df5a6d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1584,17 +1584,17 @@ static void state_colorwrite0(struct wined3d_context *context, const struct wine static void state_colorwrite1(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - set_color_mask(wined3d_context_gl(context)->gl_info, 1, state->render_states[WINED3D_RS_COLORWRITEENABLE]); + set_color_mask(wined3d_context_gl(context)->gl_info, 1, state->render_states[WINED3D_RS_COLORWRITEENABLE1]); } static void state_colorwrite2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - set_color_mask(wined3d_context_gl(context)->gl_info, 2, state->render_states[WINED3D_RS_COLORWRITEENABLE]); + set_color_mask(wined3d_context_gl(context)->gl_info, 2, state->render_states[WINED3D_RS_COLORWRITEENABLE2]); } static void state_colorwrite3(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - set_color_mask(wined3d_context_gl(context)->gl_info, 3, state->render_states[WINED3D_RS_COLORWRITEENABLE]); + set_color_mask(wined3d_context_gl(context)->gl_info, 3, state->render_states[WINED3D_RS_COLORWRITEENABLE3]); } static void state_localviewer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Dmitry Timoshkov : msxml3: Register various XML character conversion routines if libxml2 doesn' t support them.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: a29aeccdaa0406d3fd6e405118b63bf88a1da530 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29aeccdaa0406d3fd6e4051… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 9 18:16:07 2019 +0800 msxml3: Register various XML character conversion routines if libxml2 doesn't support them. Apparently some distributions compile libxml2 without iconv support that leads to errors like 0009:err:msxml:doparse Unsupported encoding windows-1252 and inability to handle such documents. This patch fixes it by registering our own character conversion functions for libxml2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index debd84e..fb94bb2 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -230,6 +230,168 @@ static void init_libxslt(void) #endif } +static int to_utf8(int cp, unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + WCHAR *tmp; + int len; + + if (!in || !inlen) return 0; + + len = MultiByteToWideChar(cp, 0, (const char *)in, *inlen, NULL, 0); + tmp = heap_alloc(len * sizeof(WCHAR)); + if (!tmp) return -1; + MultiByteToWideChar(cp, 0, (const char *)in, *inlen, tmp, len); + + len = WideCharToMultiByte(CP_UTF8, 0, tmp, len, (char *)out, *outlen, NULL, NULL); + heap_free(tmp); + if (!len) return -1; + + *outlen = len; + return len; +} + +static int from_utf8(int cp, unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + WCHAR *tmp; + int len; + + if (!in || !inlen) return 0; + + len = MultiByteToWideChar(CP_UTF8, 0, (const char *)in, *inlen, NULL, 0); + tmp = heap_alloc(len * sizeof(WCHAR)); + if (!tmp) return -1; + MultiByteToWideChar(CP_UTF8, 0, (const char *)in, *inlen, tmp, len); + + len = WideCharToMultiByte(cp, 0, tmp, len, (char *)out, *outlen, NULL, NULL); + heap_free(tmp); + if (!len) return -1; + + *outlen = len; + return len; +} + +static int win1250_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1250, out, outlen, in, inlen); +} + +static int utf8_to_win1250(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1250, out, outlen, in, inlen); +} + +static int win1251_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1251, out, outlen, in, inlen); +} + +static int utf8_to_win1251(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1251, out, outlen, in, inlen); +} + +static int win1252_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1252, out, outlen, in, inlen); +} + +static int utf8_to_win1252(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1252, out, outlen, in, inlen); +} + +static int win1253_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1253, out, outlen, in, inlen); +} + +static int utf8_to_win1253(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1253, out, outlen, in, inlen); +} +static int win1254_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1254, out, outlen, in, inlen); +} + +static int utf8_to_win1254(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1254, out, outlen, in, inlen); +} + +static int win1255_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1255, out, outlen, in, inlen); +} + +static int utf8_to_win1255(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1255, out, outlen, in, inlen); +} + +static int win1256_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1256, out, outlen, in, inlen); +} + +static int utf8_to_win1256(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1256, out, outlen, in, inlen); +} + +static int win1257_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1257, out, outlen, in, inlen); +} + +static int utf8_to_win1257(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1257, out, outlen, in, inlen); +} + +static int win1258_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return to_utf8(1258, out, outlen, in, inlen); +} + +static int utf8_to_win1258(unsigned char *out, int *outlen, const unsigned char *in, int *inlen) +{ + return from_utf8(1258, out, outlen, in, inlen); +} + +static void init_char_encoders(void) +{ + static const struct + { + const char *encoding; + xmlCharEncodingInputFunc input; + xmlCharEncodingOutputFunc output; + } encoder[] = + { + { "windows-1250", win1250_to_utf8, utf8_to_win1250 }, + { "windows-1251", win1251_to_utf8, utf8_to_win1251 }, + { "windows-1252", win1252_to_utf8, utf8_to_win1252 }, + { "windows-1253", win1253_to_utf8, utf8_to_win1253 }, + { "windows-1254", win1254_to_utf8, utf8_to_win1254 }, + { "windows-1255", win1255_to_utf8, utf8_to_win1255 }, + { "windows-1256", win1256_to_utf8, utf8_to_win1256 }, + { "windows-1257", win1257_to_utf8, utf8_to_win1257 }, + { "windows-1258", win1258_to_utf8, utf8_to_win1258 } + }; + int i; + + xmlInitCharEncodingHandlers(); + + for (i = 0; i < ARRAY_SIZE(encoder); i++) + { + if (!xmlFindCharEncodingHandler(encoder[i].encoding)) + { + TRACE("Adding %s encoding handler\n", encoder[i].encoding); + xmlNewCharEncodingHandler(encoder[i].encoding, encoder[i].input, encoder[i].output); + } + } +} + #endif /* HAVE_LIBXML2 */ @@ -259,6 +421,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) wineXmlReadCallback, wineXmlFileCloseCallback) == -1) WARN("Failed to register callbacks\n"); + init_char_encoders(); + schemasInit(); init_libxslt(); #endif

1 0

Alistair Leslie-Hughes : comctl32/listview: Don' t report current item state in change notification when state change wasn' t requested.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 7bacd7aa387ce98acbbc5541ae9a0d091bc0bb57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bacd7aa387ce98acbbc5541… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 09:42:58 2019 +0300 comctl32/listview: Don't report current item state in change notification when state change wasn't requested. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 7 ++-- dlls/comctl32/tests/listview.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2717812..acf6f31 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4259,8 +4259,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; - nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); - nmlv.uOldState = item.state; + if (lpLVItem->mask & LVIF_STATE) + { + nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); + nmlv.uOldState = item.state; + } nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 48612db..48cd614 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6458,6 +6458,86 @@ static void test_LVM_GETCOUNTPERPAGE(void) ok(ret, "Failed to unregister test class.\n"); } +static void test_item_state_change(void) +{ + static const DWORD styles[] = { LVS_ICON, LVS_LIST, LVS_REPORT, LVS_SMALLICON }; + LVITEMA item; + HWND hwnd; + DWORD res; + int i; + + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hwnd = create_listview_control(styles[i]); + + insert_item(hwnd, 0); + + /* LVM_SETITEMSTATE with mask */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(res, "Failed to set item state.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == LVIS_SELECTED, "got new state 0x%08x\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "got old state 0x%08x\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_STATE, "got changed 0x%08x\n", g_nmlistview.uChanged); + + /* LVM_SETITEMSTATE 0 mask */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.state = 0; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(res, "Failed to set item state.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == 0, "Unexpected new state %#x.\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == LVIS_SELECTED, "Unexpected old state %#x.\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_STATE, "Unexpected change mask %#x.\n", g_nmlistview.uChanged); + + /* LVM_SETITEM changes state */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + item.mask = LVIF_STATE; + res = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(res, "Failed to set item.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == LVIS_SELECTED, "Unexpected new state %#x.\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "Unexpected old state %#x.\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_STATE, "Unexpected change mask %#x.\n", g_nmlistview.uChanged); + + /* LVM_SETITEM no state changes */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.lParam = 11; + item.mask = LVIF_PARAM; + res = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(res, "Failed to set item.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == 0, "Unexpected new state %#x.\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "Unexpected old state %#x.\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_PARAM, "Unexpected change mask %#x.\n", g_nmlistview.uChanged); + + DestroyWindow(hwnd); + } +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6521,6 +6601,7 @@ START_TEST(listview) test_LVSCW_AUTOSIZE(); test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); + test_item_state_change(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6565,6 +6646,7 @@ START_TEST(listview) test_LVSCW_AUTOSIZE(); test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); + test_item_state_change(); unload_v6_module(ctx_cookie, hCtx);

1 0

Zebediah Figura : widl: Move the "idx" parameter from struct func_details to var_t.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 8b2a065892b4010a2a31692d03c147e6fc2594c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b2a065892b4010a2a31692d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 13 21:08:07 2019 -0500 widl: Move the "idx" parameter from struct func_details to var_t. It's not a part of the type; e.g. it doesn't make sense on a function pointer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 4 ++-- tools/widl/typetree.c | 7 +++---- tools/widl/widltypes.h | 6 ++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 6f19ff1..466c462 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -614,14 +614,14 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) if (!is_local(func->attrs)) { const var_t *cas = is_callas(func->attrs); const char *cname = cas ? cas->name : NULL; - int idx = func->declspec.type->details.function->idx; + int idx = func->func_idx; if (cname) { const statement_t *stmt2; STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface)) { const var_t *m = stmt2->u.var; if (!strcmp(m->name, cname)) { - idx = m->declspec.type->details.function->idx; + idx = m->func_idx; break; } } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 0a8ae0f..e727d8c 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -174,7 +174,6 @@ type_t *type_new_function(var_list_t *args) t = make_type(TYPE_FUNCTION); t->details.function = xmalloc(sizeof(*t->details.function)); t->details.function->args = args; - t->details.function->idx = -1; return t; } @@ -413,9 +412,9 @@ type_t *type_new_bitfield(type_t *field, const expr_t *bits) return t; } -static int compute_method_indexes(type_t *iface) +static unsigned int compute_method_indexes(type_t *iface) { - int idx; + unsigned int idx; statement_t *stmt; if (!iface->details.iface) @@ -430,7 +429,7 @@ static int compute_method_indexes(type_t *iface) { var_t *func = stmt->u.var; if (!is_callas(func->attrs)) - func->declspec.type->details.function->idx = idx++; + func->func_idx = idx++; } return idx; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 729d712..5e0f34d 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -342,7 +342,6 @@ struct func_details { var_list_t *args; struct _var_t *retval; - int idx; }; struct iface_details @@ -460,9 +459,12 @@ struct _var_t { decl_spec_t declspec; attr_list_t *attrs; expr_t *eval; - unsigned int procstring_offset; + unsigned int typestring_offset; + /* fields specific to functions */ + unsigned int procstring_offset, func_idx; + struct _loc_info_t loc_info; /* parser-internal */

1 0

Zebediah Figura : widl: Use type_function_get_args() in more places.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: a55aa54c426b60f45d316031e272c2d75974460a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a55aa54c426b60f45d316031… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 13 21:08:06 2019 -0500 widl: Use type_function_get_args() in more places. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d45e682..daff825 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2668,7 +2668,10 @@ static void check_remoting_args(const var_t *func) const char *funcname = func->name; const var_t *arg; - if (func->declspec.type->details.function->args) LIST_FOR_EACH_ENTRY( arg, func->declspec.type->details.function->args, const var_t, entry ) + if (!type_function_get_args(func->declspec.type)) + return; + + LIST_FOR_EACH_ENTRY( arg, type_function_get_args(func->declspec.type), const var_t, entry ) { const type_t *type = arg->declspec.type; @@ -2818,7 +2821,7 @@ static void check_async_uuid(type_t *iface) var_t *begin_func, *finish_func, *func = stmt->u.var, *arg; var_list_t *begin_args = NULL, *finish_args = NULL, *args; - args = func->declspec.type->details.function->args; + args = type_function_get_args(func->declspec.type); if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) { if (is_attr(arg->attrs, ATTR_IN) || !is_attr(arg->attrs, ATTR_OUT)) @@ -2888,8 +2891,8 @@ static void check_all_user_types(const statement_list_t *stmts) const statement_t *stmt_func; STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(stmt->u.type)) { const var_t *func = stmt_func->u.var; - if (func->declspec.type->details.function->args) - LIST_FOR_EACH_ENTRY( v, func->declspec.type->details.function->args, const var_t, entry ) + if (type_function_get_args(func->declspec.type)) + LIST_FOR_EACH_ENTRY( v, type_function_get_args(func->declspec.type), const var_t, entry ) check_for_additional_prototype_types(v->declspec.type); check_for_additional_prototype_types(type_function_get_rettype(func->declspec.type)); }

1 0

Richard Pospesel : widl: Use type_pointer_get_default_fc() in declare_var( ).
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: ebac6a6ac442d00cb63ce1753eabd9befbe7e683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebac6a6ac442d00cb63ce175… Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Aug 13 21:08:05 2019 -0500 widl: Use type_pointer_get_default_fc() in declare_var(). Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ff6ed1f..d45e682 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1559,7 +1559,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl warning_loc_info(&v->loc_info, "%s: pointer attribute applied to interface " "pointer type has no effect\n", v->name); - if (!ptr_attr && top && (*pt)->details.pointer.def_fc != FC_RP) + if (!ptr_attr && top && type_pointer_get_default_fc(*pt) != FC_RP) { /* FIXME: this is a horrible hack to cope with the issue that we * store an offset to the typeformat string in the type object, but

1 0

Zebediah Figura : widl: Get rid of fix_incomplete().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: c4f5fb383bb7f28052cbbcc3c47ecbcd3aef1998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f5fb383bb7f28052cbbcc3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 13 21:08:04 2019 -0500 widl: Get rid of fix_incomplete(). This seems to have been broken since 0f7f7922bab; is_incomplete() will only return true for non-aliases. It could be fixed by reverting that hunk of 0f7f7922bab, but we intend rather to change the representation of aliases so that no "fixing" is needed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ff86765..ff6ed1f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -54,7 +54,6 @@ struct _import_t typelist_t incomplete_types = LIST_INIT(incomplete_types); -static void fix_incomplete(void); static void fix_incomplete_types(type_t *complete_type); static str_list_t *append_str(str_list_t *list, char *str); @@ -315,8 +314,7 @@ static typelib_t *current_typelib; %% -input: gbl_statements m_acf { fix_incomplete(); - check_statements($1, FALSE); +input: gbl_statements m_acf { check_statements($1, FALSE); check_all_user_types($1); write_header($1); write_id_data($1); @@ -1914,30 +1912,6 @@ void add_incomplete(type_t *t) list_add_tail(&incomplete_types, &tn->entry); } -static void fix_type(type_t *t) -{ - if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = type_alias_get_aliasee(t); - fix_type(ot); - if (type_get_type_detect_alias(ot) == TYPE_STRUCT || - type_get_type_detect_alias(ot) == TYPE_UNION || - type_get_type_detect_alias(ot) == TYPE_ENCAPSULATED_UNION) - t->details.structure = ot->details.structure; - t->defined = ot->defined; - } -} - -static void fix_incomplete(void) -{ - struct typenode *tn, *next; - - LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) { - fix_type(tn->type); - list_remove(&tn->entry); - free(tn); - } -} - static void fix_incomplete_types(type_t *complete_type) { struct typenode *tn, *next;

1 0

Richard Pospesel : widl: Use type_function_get_args() instead of type_get_function_args().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 083032b5ef4d38c1c584210cfe220f3a5dffd484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=083032b5ef4d38c1c584210c… Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Aug 13 21:08:03 2019 -0500 widl: Use type_function_get_args() instead of type_get_function_args(). Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 2 +- tools/widl/header.c | 36 ++++++++++++++++++------------------ tools/widl/proxy.c | 12 ++++++------ tools/widl/server.c | 6 +++--- tools/widl/typegen.c | 46 +++++++++++++++++++++++----------------------- tools/widl/widltypes.h | 5 ----- tools/widl/write_msft.c | 12 ++++++------ 7 files changed, 57 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=083032b5ef4d38c1c584…

1 0

Alistair Leslie-Hughes : include: Added tpcshrd.h.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: cd97a85e0f851ec2cedd4e3dbf234618bb02f36e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd97a85e0f851ec2cedd4e3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 00:38:00 2019 +0000 include: Added tpcshrd.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/tpcshrd.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4b50ade..94dd8a0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -633,6 +633,7 @@ SOURCES = \ tlogstg.idl \ tmschema.h \ tom.idl \ + tpcshrd.h \ traffic.h \ transact.idl \ twain.h \ diff --git a/include/tpcshrd.h b/include/tpcshrd.h new file mode 100644 index 0000000..e1565bd --- /dev/null +++ b/include/tpcshrd.h @@ -0,0 +1,29 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WISPSHRD_H +#define __WISPSHRD_H + +#define WM_TABLET_DEFBASE 0x02c0 +#define WM_TABLET_MAXOFFSET 0x20 +#define WM_TABLET_ADDED (WM_TABLET_DEFBASE + 8) +#define WM_TABLET_DELETED (WM_TABLET_DEFBASE + 9) +#define WM_TABLET_FLICK (WM_TABLET_DEFBASE + 11) +#define WM_TABLET_QUERYSYSTEMGESTURESTATUS (WM_TABLET_DEFBASE + 12) + + +#endif /* __WISPSHRD_H */

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019