May 2019 - Wine-Devel - list.winehq.org

[PATCH 1/2] windowscodecs: Byte swap png read/write for 16-bpp data.
by Vincent Povirk May 9, 2019

May 9, 2019

From: Bryon Roche <kain(a)kain.org> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46558 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/windowscodecs/pngformat.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index db0fa9ed507..a79e7e1cffa 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -332,6 +332,7 @@ MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS); MAKE_FUNCPTR(png_set_tRNS_to_alpha); MAKE_FUNCPTR(png_set_write_fn); +MAKE_FUNCPTR(png_set_swap); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); @@ -398,6 +399,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_tRNS); LOAD_FUNCPTR(png_set_tRNS_to_alpha); LOAD_FUNCPTR(png_set_write_fn); + LOAD_FUNCPTR(png_set_swap); LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); @@ -642,6 +644,10 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); + /* PNGs with bit-depth greater than 8 are network byte order. Windows does not expect this. */ + if (bit_depth > 8) + ppng_set_swap(This->png_ptr); + /* check for color-keyed alpha */ transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); @@ -1643,6 +1649,10 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, } } + /* Tell PNG we need to byte swap if writing a >8-bpp image */ + if (This->format->bit_depth > 8) + ppng_set_swap(This->png_ptr); + ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, This->format->bit_depth, This->format->color_type, This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, -- 2.17.1

1 0

[PATCH appdb] Show 10 latest Wine versions on test report form
by Rosanne DiMesio May 9, 2019

May 9, 2019

Increases the number of Wine versions shown in the dropdown list from 8 to 10. This is needed to prevent the newest stable release from dropping off the list prematurely when it is followed by an update to the previous stable version (see bug 47118). Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/util.php b/include/util.php index f948f6d..27fff17 100644 --- a/include/util.php +++ b/include/util.php @@ -156,7 +156,7 @@ function get_bugzilla_versions($bReturnIds = false) foreach($aBranches as $sBranch) { $sWhere = "WHERE product_id =".BUGZILLA_PRODUCT_ID." AND value LIKE '$sBranch%'"; - $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 8"; + $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 10"; $hResult = query_bugzilladb($sQuery); if($hResult) { -- 2.16.4

1 0

[PATCH 5/5] wined3d: Pass a wined3d_context_gl structure to context_unit_free_for_vs().
by Henri Verbeet May 9, 2019

May 9, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e6b45039055..a1976043e11 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3365,10 +3365,10 @@ static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_ } } -static BOOL context_unit_free_for_vs(const struct wined3d_context *context, - const struct wined3d_shader_resource_info *ps_resource_info, DWORD unit) +static BOOL wined3d_context_gl_unit_free_for_vs(const struct wined3d_context_gl *context_gl, + const struct wined3d_shader_resource_info *ps_resource_info, unsigned int unit) { - DWORD current_mapping = context->rev_tex_unit_map[unit]; + unsigned int current_mapping = context_gl->c.rev_tex_unit_map[unit]; /* Not currently used */ if (current_mapping == WINED3D_UNMAPPED_STAGE) @@ -3381,7 +3381,8 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context, if (!ps_resource_info) { /* No pixel shader, check fixed function */ - return current_mapping >= WINED3D_MAX_TEXTURES || !(context->fixed_function_usage_map & (1u << current_mapping)); + return current_mapping >= WINED3D_MAX_TEXTURES + || !(context_gl->c.fixed_function_usage_map & (1u << current_mapping)); } /* Pixel shader, check the shader's sampler map */ @@ -3414,7 +3415,7 @@ static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_ { while (start >= 0) { - if (context_unit_free_for_vs(&context_gl->c, ps_resource_info, start)) + if (wined3d_context_gl_unit_free_for_vs(context_gl, ps_resource_info, start)) { if (context_gl->c.tex_unit_map[vsampler_idx] != start) { -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_map_vsamplers().
by Henri Verbeet May 9, 2019

May 9, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 936ad5be73c..e6b45039055 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3391,13 +3391,13 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context, return TRUE; } -static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, const struct wined3d_state *state) +static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_gl, + BOOL ps, const struct wined3d_state *state) { const struct wined3d_shader_resource_info *vs_resource_info = state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_shader_resource_info *ps_resource_info = NULL; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; int start = min(WINED3D_MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; int i; @@ -3414,12 +3414,12 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { while (start >= 0) { - if (context_unit_free_for_vs(context, ps_resource_info, start)) + if (context_unit_free_for_vs(&context_gl->c, ps_resource_info, start)) { - if (context->tex_unit_map[vsampler_idx] != start) + if (context_gl->c.tex_unit_map[vsampler_idx] != start) { wined3d_context_gl_map_stage(context_gl, vsampler_idx, start); - context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(vsampler_idx)); } --start; @@ -3428,7 +3428,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons --start; } - if (context->tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) + if (context_gl->c.tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) WARN("Couldn't find a free texture unit for vertex sampler %u.\n", i); } } @@ -3458,7 +3458,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s wined3d_context_gl_map_fixed_function_samplers(context_gl, state); if (vs) - context_map_vsamplers(context, ps, state); + wined3d_context_gl_map_vsamplers(context_gl, ps, state); } /* Context activation is done by the caller. */ -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_map_psamplers().
by Henri Verbeet May 9, 2019

May 9, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 275861950f2..936ad5be73c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3346,22 +3346,21 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex } } -static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) +static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; unsigned int i; for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) { - if (resource_info[i].type && context->tex_unit_map[i] != i) + if (resource_info[i].type && context_gl->c.tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(context, STATE_SAMPLER(i)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); if (i < d3d_info->limits.ffp_blend_stages) - context_invalidate_texture_stage(context, i); + context_invalidate_texture_stage(&context_gl->c, i); } } } @@ -3454,7 +3453,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s return; if (ps) - context_map_psamplers(context, state); + wined3d_context_gl_map_psamplers(context_gl, state); else wined3d_context_gl_map_fixed_function_samplers(context_gl, state); -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_map_fixed_function_samplers().
by Henri Verbeet May 9, 2019

May 9, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9146b81d758..275861950f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3301,29 +3301,28 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont } } -static void context_map_fixed_function_samplers(struct wined3d_context *context, +static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; unsigned int i, tex; WORD ffu_map; - ffu_map = context->fixed_function_usage_map; + ffu_map = context_gl->c.fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages - || context->lowest_disabled_stage <= d3d_info->limits.ffp_textures) + || context_gl->c.lowest_disabled_stage <= d3d_info->limits.ffp_textures) { for (i = 0; ffu_map; ffu_map >>= 1, ++i) { if (!(ffu_map & 1)) continue; - if (context->tex_unit_map[i] != i) + if (context_gl->c.tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(context, STATE_SAMPLER(i)); - context_invalidate_texture_stage(context, i); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); + context_invalidate_texture_stage(&context_gl->c, i); } } return; @@ -3336,11 +3335,11 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (!(ffu_map & 1)) continue; - if (context->tex_unit_map[i] != tex) + if (context_gl->c.tex_unit_map[i] != tex) { wined3d_context_gl_map_stage(context_gl, i, tex); - context_invalidate_state(context, STATE_SAMPLER(i)); - context_invalidate_texture_stage(context, i); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); + context_invalidate_texture_stage(&context_gl->c, i); } ++tex; @@ -3438,6 +3437,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL vs = use_vs(state); BOOL ps = use_ps(state); @@ -3456,7 +3456,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s if (ps) context_map_psamplers(context, state); else - context_map_fixed_function_samplers(context, state); + wined3d_context_gl_map_fixed_function_samplers(context_gl, state); if (vs) context_map_vsamplers(context, ps, state); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_map_stage().
by Henri Verbeet May 9, 2019

May 9, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cf164d5e35e..9146b81d758 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3224,19 +3224,19 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; } -static void context_map_stage(struct wined3d_context *context, DWORD stage, DWORD unit) +static void wined3d_context_gl_map_stage(struct wined3d_context_gl *context_gl, unsigned int stage, unsigned int unit) { - DWORD i = context->rev_tex_unit_map[unit]; - DWORD j = context->tex_unit_map[stage]; + unsigned int i = context_gl->c.rev_tex_unit_map[unit]; + unsigned int j = context_gl->c.tex_unit_map[stage]; TRACE("Mapping stage %u to unit %u.\n", stage, unit); - context->tex_unit_map[stage] = unit; + context_gl->c.tex_unit_map[stage] = unit; if (i != WINED3D_UNMAPPED_STAGE && i != stage) - context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + context_gl->c.tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - context->rev_tex_unit_map[unit] = stage; + context_gl->c.rev_tex_unit_map[unit] = stage; if (j != WINED3D_UNMAPPED_STAGE && j != unit) - context->rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; + context_gl->c.rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; } static void context_invalidate_texture_stage(struct wined3d_context *context, DWORD stage) @@ -3304,6 +3304,7 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont static void context_map_fixed_function_samplers(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int i, tex; WORD ffu_map; @@ -3320,7 +3321,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (context->tex_unit_map[i] != i) { - context_map_stage(context, i, i); + wined3d_context_gl_map_stage(context_gl, i, i); context_invalidate_state(context, STATE_SAMPLER(i)); context_invalidate_texture_stage(context, i); } @@ -3337,7 +3338,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (context->tex_unit_map[i] != tex) { - context_map_stage(context, i, tex); + wined3d_context_gl_map_stage(context_gl, i, tex); context_invalidate_state(context, STATE_SAMPLER(i)); context_invalidate_texture_stage(context, i); } @@ -3348,6 +3349,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; @@ -3357,7 +3359,7 @@ static void context_map_psamplers(struct wined3d_context *context, const struct { if (resource_info[i].type && context->tex_unit_map[i] != i) { - context_map_stage(context, i, i); + wined3d_context_gl_map_stage(context_gl, i, i); context_invalidate_state(context, STATE_SAMPLER(i)); if (i < d3d_info->limits.ffp_blend_stages) context_invalidate_texture_stage(context, i); @@ -3395,6 +3397,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { const struct wined3d_shader_resource_info *vs_resource_info = state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_shader_resource_info *ps_resource_info = NULL; const struct wined3d_gl_info *gl_info = context->gl_info; int start = min(WINED3D_MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; @@ -3417,7 +3420,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { if (context->tex_unit_map[vsampler_idx] != start) { - context_map_stage(context, vsampler_idx, start); + wined3d_context_gl_map_stage(context_gl, vsampler_idx, start); context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); } -- 2.11.0

1 0

[PATCH website] about.template: remove dead links
by Rosanne DiMesio May 9, 2019

May 9, 2019

Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- templates/en/about.template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index ac7afd33..60ab646f 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -24,8 +24,7 @@ user-experience.</p> continue for 15 years before the program finally reached v1.0, the first stable release, in 2008. Several releases later, Wine is still under active development today, and although there is more work to be done, -<a href="https://wiki.winehq.org/UsageStatistics" title="Wine Usage -Statistics">millions of people</a> are estimated to use Wine to run +millions of people are estimated to use Wine to run their Windows software on the OS of their choice.</p> <h3>Open Source and User Driven</h3> @@ -56,9 +55,6 @@ may not be up-to-date)</i></p> <li><a href="https://wiki.winehq.org/ImportanceOfWine">Why Wine is so Important</a> </li> - <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">Common - Myths about Wine</a> - </li> <li><a href="https://wiki.winehq.org/WineHistory">History of the Wine Project</a> </li> -- 2.16.4

1 0

[PATCH] ntoskrnl.exe: Make run_work_item_worker() static.
by Francois Gouget May 9, 2019

May 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 86111b4cbad..0005ed2ca4f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1226,7 +1226,7 @@ void WINAPI IoFreeWorkItem( PIO_WORKITEM work_item ) } -void WINAPI run_work_item_worker(TP_CALLBACK_INSTANCE *instance, void *context) +static void WINAPI run_work_item_worker(TP_CALLBACK_INSTANCE *instance, void *context) { PIO_WORKITEM work_item = context; DEVICE_OBJECT *device = work_item->device; -- 2.20.1

2 1

[PATCH] jscript: Make the Enumerator_props functions static.
by Francois Gouget May 9, 2019

May 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/jscript/enumerator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index aa7737ac524..d0502f6afae 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -40,7 +40,7 @@ static void Enumerator_destructor(jsdisp_t *dispex) heap_free(dispex); } -HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_atEnd\n"); @@ -48,7 +48,7 @@ HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return E_NOTIMPL; } -HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_item\n"); @@ -56,7 +56,7 @@ HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return E_NOTIMPL; } -HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_moveFirst\n"); @@ -64,7 +64,7 @@ HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return E_NOTIMPL; } -HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_moveNext\n"); -- 2.20.1

2 1