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

Jacek Caban : ucrtbase/tests: Use ucrtbase functions directly in string.c.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 02cc47c141d00797fa21c83bd7370e7ad0ccfdb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02cc47c141d00797fa21c83b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:44:41 2020 +0100 ucrtbase/tests: Use ucrtbase functions directly in string.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 168 +++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02cc47c141d00797fa21…

1 0

Jacek Caban : memory.h: Add _memicmp_l declaration.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: e12fa1f341e4063b4f2819821375f3515b51ec0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e12fa1f341e4063b4f281982… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:44:27 2020 +0100 memory.h: Add _memicmp_l declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstring.h | 1 + include/msvcrt/memory.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 8485716e30..10ab894328 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -21,6 +21,7 @@ _ACRTIMP errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); _ACRTIMP void* __cdecl memset(void*,int,size_t); _ACRTIMP void* __cdecl _memccpy(void*,const void*,int,unsigned int); _ACRTIMP int __cdecl _memicmp(const void*,const void*,unsigned int); +_ACRTIMP int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h index 17677f47a8..21198e8f8b 100644 --- a/include/msvcrt/memory.h +++ b/include/msvcrt/memory.h @@ -24,6 +24,7 @@ errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); void* __cdecl memset(void*,int,size_t); void* __cdecl _memccpy(void*,const void*,int,unsigned int); int __cdecl _memicmp(const void*,const void*,unsigned int); +int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); }

1 0

Jacek Caban : string.h: Add __strncnt declaration.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: d0d6e35eadfc23a11c2d644435ebcc0bedde8ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0d6e35eadfc23a11c2d6444… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:44:17 2020 +0100 string.h: Add __strncnt declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/string.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index f21cc73d9c..2beb429f03 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -19,6 +19,7 @@ extern "C" { #endif +_ACRTIMP size_t __cdecl __strncnt(const char*,size_t); _ACRTIMP int __cdecl _strcmpi(const char*,const char*); _ACRTIMP int __cdecl _strcoll_l(const char*, const char*, _locale_t); _ACRTIMP char* __cdecl _strdup(const char*);

1 0

Jacek Caban : ctype.h: Add _to[w]lower_l and _to[w]upper_l declarations.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: e59970a60b0dc4e5510b3385f4685f20c8d2bb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e59970a60b0dc4e5510b3385… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 18 18:43:49 2020 +0100 ctype.h: Add _to[w]lower_l and _to[w]upper_l declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wctype.h | 2 ++ include/msvcrt/ctype.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index d090538fae..b9929383d0 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -24,6 +24,8 @@ extern "C" { #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ +wchar_t __cdecl _towlower_l(wchar_t,_locale_t); +wchar_t __cdecl _towupper_l(wchar_t,_locale_t); int __cdecl is_wctype(wint_t,wctype_t); int __cdecl isleadbyte(int); int __cdecl iswalnum(wint_t); diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index 00e77c959b..6b6cf07cd9 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -24,7 +24,9 @@ int __cdecl __iscsymf(int); int __cdecl __toascii(int); int __cdecl _isctype(int,int); int __cdecl _tolower(int); +int __cdecl _tolower_l(int,_locale_t); int __cdecl _toupper(int); +int __cdecl _toupper_l(int,_locale_t); int __cdecl isalnum(int); int __cdecl isalpha(int); int __cdecl iscntrl(int);

1 0

Gabriel Ivăncescu : jscript: Create separate script dispatches for each named item.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 23bc78c199eb523f45e4542979a2b0f93bf4cb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=23bc78c199eb523f45e45429… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 18 15:19:50 2020 +0200 jscript: Create separate script dispatches for each named item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 13 +++++++++---- dlls/jscript/tests/jscript.c | 18 ------------------ 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index f54c34ab5a..31277c6fec 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -110,10 +110,15 @@ static inline BOOL is_started(script_ctx_t *ctx) HRESULT create_named_item_script_obj(script_ctx_t *ctx, named_item_t *item) { - /* FIXME: Create a separate script dispatch instead of using the global */ - item->script_obj = ctx->global; - IDispatchEx_AddRef(&item->script_obj->IDispatchEx_iface); - return S_OK; + static const builtin_info_t disp_info = { + JSCLASS_GLOBAL, + {NULL, NULL, 0}, + 0, NULL, + NULL, + NULL + }; + + return create_dispex(ctx, &disp_info, NULL, &item->script_obj); } static void release_named_item_script_obj(named_item_t *item) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 284390b860..d79b974e9b 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1203,7 +1203,6 @@ static void test_named_items(void) ok(dispex == dispex2, "get_script_dispatch returned different dispatch objects.\n"); IDispatchEx_Release(dispex2); dispex2 = get_script_dispatch(script, L"codeOnlyItem"); - todo_wine ok(dispex != dispex2, "get_script_dispatch returned same dispatch objects.\n"); SET_EXPECT(OnStateChange_INITIALIZED); @@ -1333,9 +1332,7 @@ static void test_named_items(void) id = 0; hr = IDispatchEx_GetDispID(dispex2, bstr, 0, &id); - todo_wine ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(global_idents[i]), hr); - todo_wine ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(global_idents[i]), id); SysFreeString(bstr); } @@ -1345,9 +1342,7 @@ static void test_named_items(void) bstr = SysAllocString(context_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr); - todo_wine ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id); id = 0; hr = IDispatchEx_GetDispID(dispex2, bstr, 0, &id); @@ -1381,12 +1376,9 @@ static void test_named_items(void) SET_EXPECT(OnScriptError); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - todo_wine ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr); CHECK_CALLED(OnEnterScript); - todo_wine_if(i != 0) CHECK_CALLED(GetIDsOfNames); - todo_wine CHECK_CALLED(OnScriptError); CHECK_CALLED(OnLeaveScript); @@ -1496,9 +1488,7 @@ static void test_named_items(void) bstr = SysAllocString(context_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine_if(i != 0) ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr); - todo_wine_if(i != 0) ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id); SysFreeString(bstr); } @@ -1537,9 +1527,7 @@ static void test_named_items(void) bstr = SysAllocString(global_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(global_idents[i]), hr); - todo_wine ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(global_idents[i]), id); SysFreeString(bstr); } @@ -1549,9 +1537,7 @@ static void test_named_items(void) bstr = SysAllocString(context_idents[i]); id = 0; hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id); - todo_wine_if(i != 0) ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr); - todo_wine_if(i != 0) ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id); SysFreeString(bstr); } @@ -1579,10 +1565,8 @@ static void test_named_items(void) SET_EXPECT(OnScriptError); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - todo_wine_if(i != 0) ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr); CHECK_CALLED(OnEnterScript); - todo_wine_if(i != 0) CHECK_CALLED(OnScriptError); CHECK_CALLED(OnLeaveScript); @@ -1590,10 +1574,8 @@ static void test_named_items(void) SET_EXPECT(OnScriptError); SET_EXPECT(OnLeaveScript); hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], L"codeOnlyItem", NULL, NULL, 0, 0, 0, NULL, NULL); - todo_wine_if(i != 0) ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr); CHECK_CALLED(OnEnterScript); - todo_wine_if(i != 0) CHECK_CALLED(OnScriptError); CHECK_CALLED(OnLeaveScript); }

1 0

Gabriel Ivăncescu : jscript: Lookup and ref the named item's dispatch first, during interpretion.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 0cc48cfd87e698a304e882312b82f106447a390d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc48cfd87e698a304e88231… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 18 15:19:49 2020 +0200 jscript: Lookup and ref the named item's dispatch first, during interpretion. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 59f37779a1..896ba6067c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -669,6 +669,15 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } } + + if(ctx->call_ctx->bytecode->named_item) { + jsdisp_t *script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + hres = jsdisp_get_id(script_obj, identifier, 0, &id); + if(SUCCEEDED(hres)) { + exprval_set_disp_ref(ret, to_disp(script_obj), id); + return S_OK; + } + } } hres = jsdisp_get_id(ctx->global, identifier, 0, &id); @@ -1260,13 +1269,17 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne return hres; if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + jsdisp_t *script_obj = ctx->global; DISPID id; - hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); + if(ctx->call_ctx->bytecode->named_item) + script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + + hres = jsdisp_get_id(script_obj, identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; - exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); + exprval_set_disp_ref(&exprval, to_disp(script_obj), id); } if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) {

1 0

Gabriel Ivăncescu : jscript: Use the proper variable_obj for bytecodes with named items.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: b7ddcbbc18addf504d477cdc505af44259cc1e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ddcbbc18addf504d477cdc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 18 15:19:48 2020 +0200 jscript: Use the proper variable_obj for bytecodes with named items. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8914e760ed..59f37779a1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3030,6 +3030,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi }else if(!(flags & (EXEC_GLOBAL | EXEC_EVAL))) { hres = create_dispex(ctx, NULL, NULL, &variable_obj); if(FAILED(hres)) return hres; + }else if(bytecode->named_item) { + variable_obj = jsdisp_addref(bytecode->named_item->script_obj); }else { variable_obj = jsdisp_addref(ctx->global); }

1 0

Matteo Bruni : wined3d: Don't pass the whole context to needs_srgb_write().
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 4ff594e885cd999604d3f6cde67b38b3a83f7baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff594e885cd999604d3f6cd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:25 2020 +0100 wined3d: Don't pass the whole context to needs_srgb_write(). 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/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 633d5176ba..1c15c25859 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3414,7 +3414,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); if (rt_count && gl_info->supported[ARB_FRAMEBUFFER_SRGB]) { - if (needs_srgb_write(&context_gl->c, state, fb)) + if (needs_srgb_write(context_gl->c.d3d_info, state, fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42d645d201..0a0c4c526c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -426,7 +426,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c wined3d_texture_invalidate_location(texture, rtv->sub_resource_idx, ~rtv->resource->draw_binding); } - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context->d3d_info, state, fb)) { if (rt_count > 1) WARN("Clearing multiple sRGB render targets without GL_ARB_framebuffer_sRGB " diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3e2a756757..95db994ff3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3904,7 +3904,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (!d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb)) + if (!d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb)) { static unsigned int warned = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fb55bfe0f3..b5d54db5b3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4474,7 +4474,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (needs_srgb_write(context, state, state->fb)) + if (needs_srgb_write(context->d3d_info, state, state->fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54866da533..f3ed3b3cec 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6236,7 +6236,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } - settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb); + settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, state->fb); if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8ee3c6446..db806adf71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5118,10 +5118,10 @@ static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context * return FALSE; } -static inline BOOL needs_srgb_write(const struct wined3d_context *context, +static inline BOOL needs_srgb_write(const struct wined3d_d3d_info *d3d_info, const struct wined3d_state *state, const struct wined3d_fb_state *fb) { - return (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + return (!(d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) || state->render_states[WINED3D_RS_SRGBWRITEENABLE]) && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; }

1 0

Matteo Bruni : ddraw: Store primary stateblock state pointer in the device.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 140186b0c3911e092d91005231f7adb3297d2928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=140186b0c3911e092d910052… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:23 2020 +0100 ddraw: Store primary stateblock state pointer in the device. 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/ddraw/ddraw.c | 1 + dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 23 ++++++++++++----------- dlls/ddraw/vertexbuffer.c | 4 ++-- dlls/ddraw/viewport.c | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index de45751159..050f625f71 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5048,6 +5048,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de wined3d_decref(ddraw->wined3d); return hr; } + ddraw->stateblock_state = wined3d_stateblock_get_state(ddraw->state); return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 515a622e37..f4fe970a61 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -132,6 +132,7 @@ struct ddraw UINT numConvertedDecls, declArraySize; struct wined3d_stateblock *state; + const struct wined3d_stateblock_state *stateblock_state; }; #define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" @@ -356,6 +357,7 @@ struct d3d_device struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; struct wined3d_stateblock *recording, *state, *update_state; + const struct wined3d_stateblock_state *stateblock_state; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3c0ae71196..048ba7fba6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2302,7 +2302,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - device_state = wined3d_stateblock_get_state(device->state); + device_state = device->stateblock_state; switch (state) { case D3DRENDERSTATE_TEXTUREMAG: @@ -2451,7 +2451,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, *value = 0; wined3d_mutex_lock(); - if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) + if ((tex = device->stateblock_state->textures[0])) { /* The parent of the texture is the IDirectDrawSurface7 * interface of the ddraw surface. */ @@ -2673,7 +2673,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) return; - if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) + if ((tex = device->stateblock_state->textures[0])) { struct wined3d_resource_desc desc; @@ -3233,7 +3233,7 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[wined3d_state], sizeof(*matrix)); + memcpy(matrix, &device->stateblock_state->transforms[wined3d_state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; @@ -3886,7 +3886,7 @@ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIP FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); - vp = wined3d_stateblock_get_state(device->state)->viewport; + vp = device->stateblock_state->viewport; clip_status->minx = vp.x; clip_status->maxx = vp.x + vp.width; clip_status->miny = vp.y; @@ -4566,7 +4566,7 @@ static void prepare_clip_space_planes(struct d3d_device *device, struct wined3d_ /* We want the wined3d matrices since those include the legacy viewport * transformation. */ wined3d_mutex_lock(); - state = wined3d_stateblock_get_state(device->state); + state = device->stateblock_state; multiply_matrix(&m, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD]); multiply_matrix(&m, &state->transforms[WINED3D_TS_PROJECTION], &m); wined3d_mutex_unlock(); @@ -4725,7 +4725,7 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, } wined3d_mutex_lock(); - if (!(wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[stage])) + if (!(wined3d_texture = device->stateblock_state->textures[stage])) { *texture = NULL; wined3d_mutex_unlock(); @@ -4936,7 +4936,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - device_state = wined3d_stateblock_get_state(device->state); + device_state = device->stateblock_state; if (l->sampler_state) { @@ -5391,7 +5391,7 @@ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; + wined3d_viewport = device->stateblock_state->viewport; wined3d_mutex_unlock(); viewport->dwX = wined3d_viewport.x; @@ -5493,7 +5493,7 @@ static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); + memcpy(material, &device->stateblock_state->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK; @@ -6577,7 +6577,7 @@ static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_mutex_lock(); if (idx < WINED3D_MAX_CLIP_DISTANCES) - memcpy(plane, &wined3d_stateblock_get_state(device->state)->clip_planes[idx], sizeof(struct wined3d_vec4)); + memcpy(plane, &device->stateblock_state->clip_planes[idx], sizeof(struct wined3d_vec4)); else { WARN("Clip plane %u is not supported.\n", idx); @@ -6997,6 +6997,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->wined3d_device = ddraw->wined3d_device; wined3d_device_incref(ddraw->wined3d_device); device->update_state = device->state = ddraw->state; + device->stateblock_state = ddraw->stateblock_state; wined3d_stateblock_incref(ddraw->state); /* Render to the back buffer */ diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index afd798cb9f..584d9d162b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -85,7 +85,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) * stream source in wined3d and they should get unset there before * they are destroyed. */ wined3d_mutex_lock(); - if (wined3d_stateblock_get_state(buffer->ddraw->state)->streams[0].buffer == buffer->wined3d_buffer) + if (buffer->ddraw->stateblock_state->streams[0].buffer == buffer->wined3d_buffer) wined3d_stateblock_set_stream_source(buffer->ddraw->state, 0, NULL, 0, 0); wined3d_vertex_declaration_decref(buffer->wined3d_declaration); @@ -275,7 +275,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_mutex_lock(); - state = wined3d_stateblock_get_state(device_impl->state); + state = device_impl->stateblock_state; /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index ac56928e4f..4a415c4daf 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -520,7 +520,7 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, if (activate) viewport_activate(viewport, TRUE); - state = wined3d_stateblock_get_state(device->state); + state = device->stateblock_state; multiply_matrix(&mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(0)]); multiply_matrix(&mat, &state->transforms[WINED3D_TS_PROJECTION], &mat);

1 0

Matteo Bruni : wined3d: Optimize scanning for changed state in wined3d_stateblock_apply().
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 97e1c1414b314fda0840a92fc8e82a729ffbadf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e1c1414b314fda0840a92f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:22 2020 +0100 wined3d: Optimize scanning for changed state in wined3d_stateblock_apply(). 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/stateblock.c | 81 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6d747f9731..b6c3169c4c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -985,6 +985,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (stateblock->changed.vertexShader) wined3d_stateblock_set_vertex_shader(device_state, state->vs); + if (stateblock->changed.pixelShader) + wined3d_stateblock_set_pixel_shader(device_state, state->ps); for (start = 0; ; start = range.offset + range.size) { @@ -1007,23 +1009,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_stateblock_set_vs_consts_b(device_state, range.offset, range.size, &state->vs_consts_b[range.offset]); } - if (stateblock->changed.lights) - { - for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) - { - const struct wined3d_light_info *light; - - LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) - { - wined3d_stateblock_set_light(device_state, light->OriginalIndex, &light->OriginalParms); - wined3d_stateblock_set_light_enable(device_state, light->OriginalIndex, light->glIndex != -1); - } - } - } - - if (stateblock->changed.pixelShader) - wined3d_stateblock_set_pixel_shader(device_state, state->ps); - for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(stateblock->changed.ps_consts_f, WINED3D_MAX_PS_CONSTS_F, start, &range)) @@ -1045,6 +1030,30 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_stateblock_set_ps_consts_b(device_state, range.offset, range.size, &state->ps_consts_b[range.offset]); } + if (stateblock->changed.transforms) + { + for (i = 0; i < stateblock->num_contained_transform_states; ++i) + { + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + + wined3d_stateblock_set_transform(device_state, transform, &state->transforms[transform]); + } + } + + if (stateblock->changed.lights) + { + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_stateblock_set_light(device_state, light->OriginalIndex, &light->OriginalParms); + wined3d_stateblock_set_light_enable(device_state, light->OriginalIndex, light->glIndex != -1); + } + } + } + if (stateblock->changed.alpha_to_coverage) { device_state->stateblock_state.alpha_to_coverage = state->alpha_to_coverage; @@ -1079,16 +1088,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, state->sampler_states[stage][sampler_state]); } - if (stateblock->changed.transforms) - { - for (i = 0; i < stateblock->num_contained_transform_states; ++i) - { - enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; - - wined3d_stateblock_set_transform(device_state, transform, &state->transforms[transform]); - } - } - if (stateblock->changed.indices) { wined3d_stateblock_set_index_buffer(device_state, state->index_buffer, state->index_format); @@ -1108,33 +1107,33 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_stateblock_set_scissor_rect(device_state, &state->scissor_rect); map = stateblock->changed.streamSource; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_stream_source(device_state, i, state->streams[i].buffer, - state->streams[i].offset, state->streams[i].stride); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_stream_source(device_state, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); } map = stateblock->changed.streamFreq; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_stream_source_freq(device_state, i, - state->streams[i].frequency | state->streams[i].flags); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_stream_source_freq(device_state, i, + state->streams[i].frequency | state->streams[i].flags); } map = stateblock->changed.textures; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_texture(device_state, i, state->textures[i]); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_texture(device_state, i, state->textures[i]); } map = stateblock->changed.clipplane; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_clip_plane(device_state, i, &state->clip_planes[i]); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_clip_plane(device_state, i, &state->clip_planes[i]); } TRACE("Applied stateblock %p.\n", stateblock);

1 0