- Wine-Devel - list.winehq.org

[PATCH 3/4] include: Add IMFMetadata interface in mfidl.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

2 1

[PATCH 2/4] include: Fix CancelObjectCreation name in IMFSourceResolver interface.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

2 1

[PATCH 1/4] include: Add MFPMPSESSION_CREATION_FLAGS enumeration in mfidl.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

2 1

[PATCH vkd3d v2] include: Add ID3D12InfoQueue interface in d3d12sdklayers.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

1 0

[PATCH vkd3d] include: Add ID3D12InfoQueue interface in d3d12sdklayers.idl.
by Biswapriyo Nath Oct. 6, 2020

Oct. 6, 2020

1 1

[PATCH] vbscript/tests: Use wide-char string literals.
by Michael Stefaniuc Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 4 +--- dlls/vbscript/tests/run.c | 28 +++++++++------------------- dlls/vbscript/tests/vbscript.c | 5 +---- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 34a9def89d5..c0a653fb1ea 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -88,8 +88,6 @@ DEFINE_EXPECT(Caller_QS_SecMgr); DEFINE_EXPECT(QI_IObjectWithSite); DEFINE_EXPECT(SetSite); -static const WCHAR testW[] = {'t','e','s','t',0}; - static HRESULT QS_SecMgr_hres; static HRESULT ProcessUrlAction_hres; static DWORD ProcessUrlAction_policy; @@ -753,7 +751,7 @@ static IActiveScriptParse *create_script(BOOL use_sec_mgr) hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(script, testW, + hres = IActiveScript_AddNamedItem(script, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6dcd13bf752..bb33e6576ea 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -155,9 +155,6 @@ DEFINE_EXPECT(OnLeaveScript); #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code) -static const WCHAR testW[] = {'t','e','s','t',0}; -static const WCHAR emptyW[] = {0}; - static BOOL strict_dispid_check, is_english, allow_ui; static int first_day_of_week; static const char *test_name = "(null)"; @@ -1957,7 +1954,7 @@ static IActiveScript *create_and_init_script(DWORD flags, BOOL start) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|flags); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2046,9 +2043,6 @@ static void test_parse_context(void) BSTR str; HRESULT hres; - static const WCHAR xW[] = {'x',0}; - static const WCHAR yW[] = {'y',0}; - global_ref = 1; engine = create_and_init_script(0, TRUE); if(!engine) @@ -2063,7 +2057,7 @@ static void test_parse_context(void) /* unknown identifier context is not a valid argument */ str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"y", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); @@ -2080,14 +2074,14 @@ static void test_parse_context(void) /* known global variable is not a valid context */ str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, xW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"x", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == E_INVALIDARG, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); str = a2bstr("Call reportSuccess()\n"); - hres = IActiveScriptParse_ParseScriptText(parser, str, testW, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, str, L"test", NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); SysFreeString(str); CHECK_CALLED(global_success_d); @@ -2109,10 +2103,8 @@ static void _parse_htmlscript_a(unsigned line, const char *src) BSTR tmp; HRESULT hres; - static const WCHAR script_delimW[] = {'<','/','S','C','R','I','P','T','>',0}; - tmp = a2bstr(src); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, script_delimW); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, L"</SCRIPT>"); SysFreeString(tmp); ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -2124,10 +2116,8 @@ static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, co BSTR str; HRESULT hres; - static const WCHAR delimiterW[] = {'\"',0}; - str = a2bstr(src); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, emptyW, NULL, NULL, delimiterW, 0, 0, + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, L"", NULL, NULL, L"\"", 0, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS|flags, &disp); SysFreeString(str); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); @@ -2158,7 +2148,7 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, emptyW, NULL, NULL, NULL, 0, 0, 0, &disp); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, L"", NULL, NULL, NULL, 0, 0, 0, &disp); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); IDispatch_Release(disp); @@ -2385,7 +2375,7 @@ static void test_gc(void) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2643,7 +2633,7 @@ static HRESULT test_global_vars_ref(BOOL use_close) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 04e7545da2d..8e6f0995c59 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1500,9 +1500,6 @@ static void test_vbscript_uninitializing(void) ULONG ref; HRESULT hres; - static const WCHAR script_textW[] = - {'F','u','n','c','t','i','o','n',' ','f','\n','E','n','d',' ','F','u','n','c','t','i','o','n','\n',0}; - script = create_vbscript(); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); @@ -1529,7 +1526,7 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); - hres = IActiveScriptParse_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parse, L"Function f\nEnd Function\n", NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.26.2

2 1

[PATCH] vbscript: Avoid double frees on error path (Coverity).
by Sven Baars Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/vbscript/global.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4b1c23b838c..18504a43b9a 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2423,7 +2423,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, } hres = SafeArrayAccessData(sa, (void**)&data); if(FAILED(hres)) { - SafeArrayDestroy(sa); goto error; } @@ -2440,7 +2439,6 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, hres = VariantCopyInd(data+i, &var); if(FAILED(hres)) { SafeArrayUnaccessData(sa); - SafeArrayDestroy(sa); goto error; } start = indices[i]+delimiterlen; @@ -2452,7 +2450,7 @@ error: V_VT(res) = VT_ARRAY|VT_VARIANT; V_ARRAY(res) = sa; }else { - if (sa) SafeArrayDestroy(sa); + SafeArrayDestroy(sa); } heap_free(indices); -- 2.25.1

2 2

[PATCH] vbscript: Implement redim preserve
by Kevin Puetz Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- dlls/vbscript/compile.c | 14 +++++---- dlls/vbscript/interp.c | 57 ++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 56 +++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 164c2d15cf..2e991b0c0a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1128,16 +1128,18 @@ static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *st unsigned arg_cnt; HRESULT hres; - if(stat->preserve) { - FIXME("Preserving redim not supported\n"); - return E_NOTIMPL; - } - hres = compile_args(ctx, stat->dims, &arg_cnt); if(FAILED(hres)) return hres; - return push_instr_bstr_uint(ctx, OP_redim, stat->identifier, arg_cnt); + hres = push_instr_bstr_uint(ctx, stat->preserve ? OP_redim_preserve : OP_redim, stat->identifier, arg_cnt); + if(FAILED(hres)) + return hres; + + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT compile_const_statement(compile_ctx_t *ctx, const_statement_t *stat) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 342b7820ec..4f861ad5d8 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1291,6 +1291,63 @@ static HRESULT interp_redim(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_redim_preserve(exec_ctx_t *ctx) +{ + BSTR identifier = ctx->instr->arg1.bstr; + const unsigned dim_cnt = ctx->instr->arg2.uint; + unsigned i; + SAFEARRAYBOUND *bounds; + SAFEARRAY *array; + ref_t ref; + HRESULT hres; + + TRACE("%s %u\n", debugstr_w(identifier), dim_cnt); + + hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + if(!(V_VT(ref.u.v) & VT_ARRAY)) { + FIXME("ReDim Preserve not valid on type %d\n", V_VT(ref.u.v)); + return E_FAIL; + } + + array = V_ARRAY(ref.u.v); + + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); + if(FAILED(hres)) + return hres; + + if(array == NULL || array->cDims == 0) { + /* can initially allocate the array */ + array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); + VariantClear(ref.u.v); + V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(ref.u.v) = array; + return S_OK; + } else if(array->cDims != dim_cnt) { + /* can't otherwise change the number of dimensions */ + TRACE("Can't resize %s, cDims %d != %d\n", debugstr_w(identifier), array->cDims, dim_cnt); + return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + } else { + /* can resize the last dimensions (if others match */ + for(i = 0; i+1 < dim_cnt; ++i) { + if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) { + TRACE("Can't resize %s, bound[%d] %d != %d\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); + return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + } + } + return SafeArrayRedim(array, &bounds[dim_cnt-1]); + } +} + static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dc16c50fae..fc762450a3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1412,6 +1412,28 @@ x = 1 redim x(3) ok ubound(x) = 3, "ubound(x) = " & ubound(x) +x(0) = 1 +x(1) = 2 +x(2) = 3 +x(2) = 4 + +redim preserve x(1) +ok ubound(x) = 1, "ubound(x) = " & ubound(x) +ok x(0) = 1, "x(0) = " & x(1) +ok x(1) = 2, "x(1) = " & x(1) + +redim preserve x(2) +ok ubound(x) = 2, "ubound(x) = " & ubound(x) +ok x(0) = 1, "x(0) = " & x(0) +ok x(1) = 2, "x(1) = " & x(1) +ok x(2) = vbEmpty, "x(2) = " & x(2) + +on error resume next +redim preserve x(2,2) +e = err.number +on error goto 0 +ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, cannot change cDims + x = Array(1, 2) redim x(-1) ok lbound(x) = 0, "lbound(x) = " & lbound(x) @@ -1422,6 +1444,40 @@ ok ubound(x) = 3, "ubound(x) = " & ubound(x) ok ubound(x, 1) = 3, "ubound(x, 1) = " & ubound(x, 1) ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) & " expected 2" +redim x(1, 3) +x(0,0) = 1.1 +x(0,1) = 1.2 +x(0,2) = 1.3 +x(0,3) = 1.4 +x(1,0) = 2.1 +x(1,1) = 2.2 +x(1,2) = 2.3 +x(1,3) = 2.4 + +redim preserve x(1,1) +ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 1, "ubound(x, 2) = " & ubound(x, 2) +ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) +ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) +ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) +ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) + +redim preserve x(1,2) +ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) +ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) +ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) +ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) +ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) +ok x(0,2) = vbEmpty, "x(0,2) = " & x(0,2) +ok x(1,2) = vbEmpty, "x(1,2) = " & x(1,1) + +on error resume next +redim preserve x(2,2) +e = err.number +on error goto 0 +ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, can only change rightmost dimension + dim staticarray(4) on error resume next redim staticarray(3) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1edf7906af..869fb05b6e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -265,6 +265,7 @@ typedef enum { X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ X(redim, 1, ARG_BSTR, ARG_UINT) \ + X(redim_preserve, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) \ X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \

2 1

[PATCH 1/3] wined3d: Use struct wined3d_swapchain_state for Alt+Enter hooking.
by Zhiyi Zhang Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 20 ++++--- dlls/dxgi/utils.c | 2 +- dlls/wined3d/swapchain.c | 4 -- dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_main.c | 99 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 - include/wine/wined3d.h | 8 +-- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index e43ee59461c..906fe914cba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -177,6 +177,7 @@ struct d3d11_swapchain LONG refcount; struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_state *state; IWineDXGIDevice *device; IDXGIFactory *factory; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f3b74389d29..9d6ec0246ce 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -249,6 +249,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); + wined3d_swapchain_state_unregister(swapchain->state); wined3d_swapchain_decref(swapchain->wined3d_swapchain); if (device) IWineDXGIDevice_Release(device); @@ -388,7 +389,6 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_swapchain_state *state; struct dxgi_output *dxgi_output; HRESULT hr; @@ -412,11 +412,10 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen dxgi_output = unsafe_impl_from_IDXGIOutput(target); wined3d_mutex_lock(); - state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; - hr = wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); + hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &swapchain_desc, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -556,13 +555,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i const DXGI_MODE_DESC *target_mode_desc) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_swapchain_state *state; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); - state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); - - return dxgi_swapchain_resize_target(state, target_mode_desc); + return dxgi_swapchain_resize_target(swapchain->state, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) @@ -814,6 +810,7 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { + struct wined3d *wined3d; BOOL fullscreen; HRESULT hr; @@ -856,13 +853,14 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } + swapchain->state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); + wined3d = wined3d_device_get_wined3d(device->wined3d_device); + wined3d_swapchain_state_register(swapchain->state, wined3d); + swapchain->target = NULL; if (fullscreen) { - struct wined3d_swapchain_state *state; - desc->windowed = FALSE; - state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(&swapchain->IDXGISwapChain1_iface, &swapchain->target))) @@ -872,7 +870,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } - if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(state, desc, NULL))) + if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, desc, NULL))) { WARN("Failed to set fullscreen state, hr %#x.\n", hr); IDXGIOutput_Release(swapchain->target); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 665413e4c62..0c83b912c6f 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -520,7 +520,7 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT \ - | WINED3D_SWAPCHAIN_HOOK | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) + | WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d0d93417a18..2cf36d189cb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -34,7 +34,6 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); - wined3d_unhook_swapchain(swapchain); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -1627,9 +1626,6 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win desc, parent, parent_ops, &object))) return hr; - if (desc->flags & WINED3D_SWAPCHAIN_HOOK) - wined3d_hook_swapchain(object); - if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) { wined3d_mutex_lock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d11e06d0c34..816108e8b3b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -292,8 +292,10 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) +@ cdecl wined3d_swapchain_state_register(ptr ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) +@ cdecl wined3d_swapchain_state_unregister(ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index c98aee18bdd..bb3ad7ffa51 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -56,25 +56,26 @@ struct wined3d_window_hook unsigned int count; }; -struct wined3d_hooked_swapchain +struct wined3d_registered_swapchain_state { - struct wined3d_swapchain *swapchain; + struct wined3d_swapchain_state *state; + struct wined3d *wined3d; DWORD thread_id; }; -struct wined3d_hook_table +struct wined3d_swapchain_state_table { struct wined3d_window_hook *hooks; SIZE_T hooks_size; SIZE_T hook_count; - struct wined3d_hooked_swapchain *swapchains; - SIZE_T swapchains_size; - SIZE_T swapchain_count; + struct wined3d_registered_swapchain_state *states; + SIZE_T states_size; + SIZE_T state_count; }; static struct wined3d_wndproc_table wndproc_table; -static struct wined3d_hook_table hook_table; +static struct wined3d_swapchain_state_table swapchain_state_table; static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = @@ -425,13 +426,13 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) } heap_free(wndproc_table.entries); - heap_free(hook_table.swapchains); - for (i = 0; i < hook_table.hook_count; ++i) + heap_free(swapchain_state_table.states); + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - WARN("Leftover hook table entry %p.\n", &hook_table.hooks[i]); - UnhookWindowsHookEx(hook_table.hooks[i].hook); + WARN("Leftover swapchain state hook %p.\n", &swapchain_state_table.hooks[i]); + UnhookWindowsHookEx(swapchain_state_table.hooks[i].hook); } - heap_free(hook_table.hooks); + heap_free(swapchain_state_table.hooks); heap_free(wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); @@ -573,8 +574,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) { + struct wined3d_registered_swapchain_state *registered_state; struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_swapchain *swapchain; struct wined3d_wndproc *entry; struct wined3d_output *output; MSG *msg = (MSG *)lparam; @@ -586,28 +587,28 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam { wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain = hook_table.swapchains[i].swapchain; + registered_state = &swapchain_state_table.states[i]; - if (swapchain->state.device_window != msg->hwnd) + if (registered_state->state->device_window != msg->hwnd) continue; - if ((entry = wined3d_find_wndproc(msg->hwnd, swapchain->device->wined3d)) + if ((entry = wined3d_find_wndproc(msg->hwnd, registered_state->wined3d)) && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) continue; - wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + swapchain_desc = registered_state->state->desc; swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_get_output_from_window(swapchain->device->wined3d, - swapchain->state.device_window))) + if (!(output = wined3d_get_output_from_window(registered_state->wined3d, + registered_state->state->device_window))) { - ERR("Failed to get output from window %p.\n", swapchain->state.device_window); + ERR("Failed to get output from window %p.\n", registered_state->state->device_window); break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, NULL); + wined3d_swapchain_state_set_fullscreen(registered_state->state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); @@ -764,82 +765,84 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) { unsigned int i; - for (i = 0; i < hook_table.hook_count; ++i) + for (i = 0; i < swapchain_state_table.hook_count; ++i) { - if (hook_table.hooks[i].thread_id == thread_id) - return &hook_table.hooks[i]; + if (swapchain_state_table.hooks[i].thread_id == thread_id) + return &swapchain_state_table.hooks[i]; } return NULL; } -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) +void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d) { - struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; wined3d_wndproc_mutex_lock(); - if (!wined3d_array_reserve((void **)&hook_table.swapchains, &hook_table.swapchains_size, - hook_table.swapchain_count + 1, sizeof(*swapchain_entry))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.states, &swapchain_state_table.states_size, + swapchain_state_table.state_count + 1, sizeof(*state_entry))) { wined3d_wndproc_mutex_unlock(); return; } - swapchain_entry = &hook_table.swapchains[hook_table.swapchain_count++]; - swapchain_entry->swapchain = swapchain; - swapchain_entry->thread_id = GetWindowThreadProcessId(swapchain->state.device_window, NULL); + state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; + state_entry->state = state; + state_entry->wined3d = wined3d; + state_entry->thread_id = GetWindowThreadProcessId(state->device_window, NULL); - if ((hook = wined3d_find_hook(swapchain_entry->thread_id))) + if ((hook = wined3d_find_hook(state_entry->thread_id))) { ++hook->count; wined3d_wndproc_mutex_unlock(); return; } - if (!wined3d_array_reserve((void **)&hook_table.hooks, &hook_table.hooks_size, - hook_table.hook_count + 1, sizeof(*hook))) + if (!wined3d_array_reserve((void **)&swapchain_state_table.hooks, &swapchain_state_table.hooks_size, + swapchain_state_table.hook_count + 1, sizeof(*hook))) { - --hook_table.swapchain_count; + --swapchain_state_table.state_count; wined3d_wndproc_mutex_unlock(); return; } - hook = &hook_table.hooks[hook_table.hook_count++]; - hook->thread_id = swapchain_entry->thread_id; + hook = &swapchain_state_table.hooks[swapchain_state_table.hook_count++]; + hook->thread_id = state_entry->thread_id; hook->hook = SetWindowsHookExW(WH_GETMESSAGE, wined3d_hook_proc, 0, hook->thread_id); hook->count = 1; wined3d_wndproc_mutex_unlock(); } -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) +void CDECL wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state) { - struct wined3d_hooked_swapchain *swapchain_entry, *last_swapchain_entry; + struct wined3d_registered_swapchain_state *state_entry, *last_state_entry; struct wined3d_window_hook *hook, *last_hook; unsigned int i; wined3d_wndproc_mutex_lock(); - for (i = 0; i < hook_table.swapchain_count; ++i) + for (i = 0; i < swapchain_state_table.state_count; ++i) { - swapchain_entry = &hook_table.swapchains[i]; + state_entry = &swapchain_state_table.states[i]; - if (swapchain_entry->swapchain != swapchain) + if (state_entry->state != state) continue; - if ((hook = wined3d_find_hook(swapchain_entry->thread_id)) && !--hook->count) + if ((hook = wined3d_find_hook(state_entry->thread_id)) && !--hook->count) { UnhookWindowsHookEx(hook->hook); - last_hook = &hook_table.hooks[--hook_table.hook_count]; + last_hook = &swapchain_state_table.hooks[--swapchain_state_table.hook_count]; if (hook != last_hook) *hook = *last_hook; } - last_swapchain_entry = &hook_table.swapchains[--hook_table.swapchain_count]; - if (swapchain_entry != last_swapchain_entry) - *swapchain_entry = *last_swapchain_entry; + last_state_entry = &swapchain_state_table.states[--swapchain_state_table.state_count]; + if (state_entry != last_state_entry) + *state_entry = *last_state_entry; break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c783d28bc2..7c88e04f5e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3514,9 +3514,7 @@ struct wined3d }; BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; -void wined3d_hook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_unhook_swapchain(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 238961006a0..3f2361e55a5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -904,9 +904,8 @@ enum wined3d_shader_type #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3D_SWAPCHAIN_GDI_COMPATIBLE 0x00008000u #define WINED3D_SWAPCHAIN_IMPLICIT 0x00010000u -#define WINED3D_SWAPCHAIN_HOOK 0x00020000u -#define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00040000u -#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00080000u +#define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00020000u +#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00040000u #define WINED3DDP_MAXTEXCOORD 8 @@ -2807,10 +2806,13 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); +void __cdecl wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, + struct wined3d *wined3d); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); +void __cdecl wined3d_swapchain_state_unregister(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -- 2.25.1

1 0

[PATCH] server: Remove leftover dump in key_get_full_name().
by Paul Gofman Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/registry.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index c4451f3901d..e13f2a18645 100644 --- a/server/registry.c +++ b/server/registry.c @@ -410,7 +410,6 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) for (key = (struct key *)obj; key != root_key; key = key->parent) { memcpy( ret + len - key->namelen, key->name, key->namelen ); - dump_strW( (WCHAR *)(ret + len - key->namelen), key->namelen, stderr, "" ); len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } -- 2.26.2

1 0