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

[PATCH 5/5] wined3d: Pass a wined3d_context_gl structure to context_unit_free_for_vs().
by Henri Verbeet 09 May '19

09 May '19

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 09 May '19

09 May '19

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 09 May '19

09 May '19

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 09 May '19

09 May '19

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 09 May '19

09 May '19

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 09 May '19

09 May '19

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 09 May '19

09 May '19

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 09 May '19

09 May '19

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

[PATCH] kernel32/tests: Use ok_() so the TestBot can correctly detect the line.
by Francois Gouget 09 May '19

09 May '19

Otherwise the messages appear to change every time the line count changes, which making old errors new again. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b8dc72bc7f3..bc6f4ab59bf 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -627,13 +627,13 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG { if (!has_code && is_win64) { - ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ - "%u: loading failed err %u\n", line, GetLastError() ); + ok_(__FILE__,line)( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ + "loading failed err %u\n", GetLastError() ); } else { - ok( !mod, "%u: loading succeeded\n", line ); - ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); + ok_(__FILE__, line)( !mod, "loading succeeded\n" ); + ok_(__FILE__, line)( GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError() ); } } else -- 2.20.1

2 1

[PATCH] user32: Make point_win_to_phys_dpi() static.
by Francois Gouget 09 May '19

09 May '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/sysparams.c | 2 +- dlls/user32/win.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f5dc47ca4f7..9aad315b141 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3243,7 +3243,7 @@ POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) /********************************************************************** * point_win_to_phys_dpi */ -POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) +static POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) { return map_dpi_point( pt, GetDpiForWindow( hwnd ), get_win_monitor_dpi( hwnd ) ); } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 1f51fd63314..2ddca634536 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -129,7 +129,6 @@ extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; -extern POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; -- 2.20.1

2 1