October 2019 - Wine-Commits

Zebediah Figura : quartz/videorenderer: Get rid of CreateRenderingSubsystem().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 229a8dfbcd8861f8ccc4e155e34dbcb42e24da32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=229a8dfbcd8861f8ccc4e155… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:48 2019 -0500 quartz/videorenderer: Get rid of CreateRenderingSubsystem(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87365d9212..db5ee0fbf4 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,21 +82,6 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); } -static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) -{ - This->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - if (!This->hEvent) - return FALSE; - - if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow))) - { - CloseHandle(This->hEvent); - return FALSE; - } - - return TRUE; -} - static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -873,8 +858,11 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - if (!CreateRenderingSubsystem(pVideoRenderer)) { - hr = E_FAIL; + pVideoRenderer->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) + { + CloseHandle(pVideoRenderer->hEvent); goto fail; }

1 0

Paul Gofman : wined3d: Factor out wined3d_texture_gl_upload_bo() function.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 7474d665beaa9a1759c95744ea7d43d4673c6bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7474d665beaa9a1759c95744… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:53 2019 +0300 wined3d: Factor out wined3d_texture_gl_upload_bo() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 231 +++++++++++++++++++++++++------------------------ 1 file changed, 120 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7474d665beaa9a1759c9…

1 0

Paul Gofman : wined3d: Pass correct map size in wined3d_texture_gl_upload_data().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: b7d2ba9d8f42d62ca3e179d0a6d990961d1e0657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7d2ba9d8f42d62ca3e179d0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:54 2019 +0300 wined3d: Pass correct map size in wined3d_texture_gl_upload_data(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dd61ac8ae1..d103581b8d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2077,7 +2077,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, } src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, - src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); if (decompress) compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d);

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_blend_factor().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 3c24654deabc111a96e5d35680d6bfb961105777 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c24654deabc111a96e5d356… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:05 2019 -0500 wined3d: Introduce wined3d_stateblock_set_blend_factor(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 42d1d9d4d8..a96093295c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1434,6 +1434,15 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); } +void CDECL wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, + const struct wined3d_color *blend_factor) +{ + TRACE("stateblock %p, blend_factor %p.\n", stateblock, blend_factor); + + stateblock->stateblock_state.blend_factor = *blend_factor; + stateblock->changed.blend_state = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 488b1c4e65..c7b10a2b56 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8d13a245ad..445ecd2f55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, + const struct wined3d_color *blend_factor); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants);

1 0

Jacek Caban : vbscript: Create script context in CreateInstance.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 271819e7501686f9376f7643a614b9385acec30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=271819e7501686f9376f7643… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:14 2019 +0200 vbscript: Create script context in CreateInstance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 54 +++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 760a7a3256..976e751919 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -57,6 +57,7 @@ struct VBScript { script_ctx_t *ctx; LONG thread_id; LCID lcid; + BOOL is_initialized; }; typedef struct { @@ -227,9 +228,7 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) This->site = NULL; } - if(This->ctx) - release_script(This->ctx); - + release_script(This->ctx); This->thread_id = 0; break; case SCRIPTSTATE_CLOSED: @@ -405,11 +404,8 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); if(!ref) { - if(This->ctx) { - decrease_state(This, SCRIPTSTATE_CLOSED); - destroy_script(This->ctx); - This->ctx = NULL; - } + decrease_state(This, SCRIPTSTATE_CLOSED); + destroy_script(This->ctx); if(This->site) IActiveScriptSite_Release(This->site); heap_free(This); @@ -442,7 +438,7 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->lcid = lcid; - return This->ctx ? set_ctx_site(This) : S_OK; + return This->is_initialized ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -470,7 +466,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE return S_OK; } - if(!This->ctx) + if(!This->is_initialized) return E_UNEXPECTED; switch(ss) { @@ -534,7 +530,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); - if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->state == SCRIPTSTATE_CLOSED) + if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { @@ -597,7 +593,7 @@ static HRESULT WINAPI VBScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR if(!ppdisp) return E_POINTER; - if(This->thread_id != GetCurrentThreadId() || !This->ctx || !This->ctx->script_obj) { + if(This->thread_id != GetCurrentThreadId() || !This->ctx->script_obj) { *ppdisp = NULL; return E_UNEXPECTED; } @@ -749,29 +745,14 @@ static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface) static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) { VBScript *This = impl_from_IActiveScriptParse(iface); - script_ctx_t *ctx, *old_ctx; TRACE("(%p)\n", This); - if(This->ctx) - return E_UNEXPECTED; - - ctx = heap_alloc_zero(sizeof(script_ctx_t)); - if(!ctx) - return E_OUTOFMEMORY; - - ctx->safeopt = This->safeopt; - heap_pool_init(&ctx->heap); - list_init(&ctx->objects); - list_init(&ctx->code_list); - list_init(&ctx->named_items); - - old_ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); - if(old_ctx) { - destroy_script(ctx); + if(This->is_initialized) return E_UNEXPECTED; - } + This->is_initialized = TRUE; + This->ctx->safeopt = This->safeopt; return This->site ? set_ctx_site(This) : S_OK; } @@ -961,6 +942,7 @@ static const IObjectSafetyVtbl VBScriptSafetyVtbl = { HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { + script_ctx_t *ctx; VBScript *ret; HRESULT hres; @@ -980,6 +962,18 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->state = SCRIPTSTATE_UNINITIALIZED; ret->safeopt = INTERFACE_USES_DISPEX; + ctx = ret->ctx = heap_alloc_zero(sizeof(*ctx)); + if(!ctx) { + heap_free(ret); + return E_OUTOFMEMORY; + } + + ctx->safeopt = INTERFACE_USES_DISPEX; + heap_pool_init(&ctx->heap); + list_init(&ctx->objects); + list_init(&ctx->code_list); + list_init(&ctx->named_items); + hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); return hres;

1 0

Jacek Caban : vbscript: Store lcid only in script context.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 7665051d67b82c4df4d0fbf50aa46d6cc4e16a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7665051d67b82c4df4d0fbf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:23 2019 +0200 vbscript: Store lcid only in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ae36e91588..02407594e8 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -55,7 +55,6 @@ struct VBScript { IActiveScriptSite *site; script_ctx_t *ctx; LONG thread_id; - LCID lcid; BOOL is_initialized; }; @@ -134,8 +133,6 @@ static HRESULT set_ctx_site(VBScript *This) { HRESULT hres; - This->ctx->lcid = This->lcid; - hres = init_global(This->ctx); if(FAILED(hres)) return hres; @@ -435,7 +432,7 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript hres = IActiveScriptSite_GetLCID(This->site, &lcid); if(hres == S_OK) - This->lcid = lcid; + This->ctx->lcid = lcid; return This->is_initialized ? set_ctx_site(This) : S_OK; }

1 0

Zebediah Figura : qcap/tests: Fix a double Release().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: b546ac39f36114945617ff550db50d5932cd767a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b546ac39f36114945617ff55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:47 2019 -0500 qcap/tests: Fix a double Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 062138e885..5532654650 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -117,7 +117,6 @@ START_TEST(videocapture) if (hr == S_OK) { test_capture(filter); - IBaseFilter_Release(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Jacek Caban : vbscript: Store script site only in script context.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: cbf620491b31b06ee9304dfad19c479ee4e230fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf620491b31b06ee9304dfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:27 2019 +0200 vbscript: Store script site only in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 02407594e8..ad5dea5498 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -52,7 +52,6 @@ struct VBScript { LONG ref; SCRIPTSTATE state; - IActiveScriptSite *site; script_ctx_t *ctx; LONG thread_id; BOOL is_initialized; @@ -70,8 +69,8 @@ static void change_state(VBScript *This, SCRIPTSTATE state) return; This->state = state; - if(This->site) - IActiveScriptSite_OnStateChange(This->site, state); + if(This->ctx->site) + IActiveScriptSite_OnStateChange(This->ctx->site, state); } static inline BOOL is_started(VBScript *This) @@ -137,9 +136,6 @@ static HRESULT set_ctx_site(VBScript *This) if(FAILED(hres)) return hres; - IActiveScriptSite_AddRef(This->site); - This->ctx->site = This->site; - change_state(This, SCRIPTSTATE_INITIALIZED); return S_OK; } @@ -218,12 +214,6 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) case SCRIPTSTATE_INITIALIZED: case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); - - if(This->site) { - IActiveScriptSite_Release(This->site); - This->site = NULL; - } - release_script(This->ctx); This->thread_id = 0; break; @@ -402,8 +392,6 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); destroy_script(This->ctx); - if(This->site) - IActiveScriptSite_Release(This->site); heap_free(This); } @@ -421,16 +409,16 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(!pass) return E_POINTER; - if(This->site) + if(This->ctx->site) return E_UNEXPECTED; if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) return E_UNEXPECTED; - This->site = pass; - IActiveScriptSite_AddRef(This->site); + This->ctx->site = pass; + IActiveScriptSite_AddRef(This->ctx->site); - hres = IActiveScriptSite_GetLCID(This->site, &lcid); + hres = IActiveScriptSite_GetLCID(This->ctx->site, &lcid); if(hres == S_OK) This->ctx->lcid = lcid; @@ -532,7 +520,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { IUnknown *unk; - hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); + hres = IActiveScriptSite_GetItemInfo(This->ctx->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { WARN("GetItemInfo failed: %08x\n", hres); return hres; @@ -748,7 +736,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - return This->site ? set_ctx_site(This) : S_OK; + return This->ctx->site ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface,

1 0

Jacek Caban : vbscript: Move create_script_disp call to SetScriptSite.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 229a583c543499f4fcb565fd39206c393124f15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=229a583c543499f4fcb565fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:34 2019 +0200 vbscript: Move create_script_disp call to SetScriptSite. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 12 ------------ dlls/vbscript/vbscript.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0f85f66bad..364ff0c02c 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2860,14 +2860,6 @@ void detach_global_objects(script_ctx_t *ctx) IDispatch_Release(&ctx->global_obj->IDispatch_iface); ctx->global_obj = NULL; } - - if(ctx->script_obj) { - ScriptDisp *script_obj = ctx->script_obj; - - ctx->script_obj = NULL; - script_obj->ctx = NULL; - IDispatchEx_Release(&script_obj->IDispatchEx_iface); - } } HRESULT init_global(script_ctx_t *ctx) @@ -2878,9 +2870,5 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_script_disp(ctx, &ctx->script_obj); - if(FAILED(hres)) - return hres; - return create_builtin_dispatch(ctx, err_props, ARRAY_SIZE(err_props), &ctx->err_obj); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ad5dea5498..8b81b7a5e3 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -182,6 +182,14 @@ static void release_script(script_ctx_t *ctx) ctx->site = NULL; } + if(ctx->script_obj) { + ScriptDisp *script_obj = ctx->script_obj; + + ctx->script_obj = NULL; + script_obj->ctx = NULL; + IDispatchEx_Release(&script_obj->IDispatchEx_iface); + } + detach_global_objects(ctx); heap_pool_free(&ctx->heap); heap_pool_init(&ctx->heap); @@ -415,6 +423,10 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) return E_UNEXPECTED; + hres = create_script_disp(This->ctx, &This->ctx->script_obj); + if(FAILED(hres)) + return hres; + This->ctx->site = pass; IActiveScriptSite_AddRef(This->ctx->site); @@ -514,7 +526,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); - if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) + if(This->thread_id != GetCurrentThreadId() || !This->ctx->site) return E_UNEXPECTED; if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) {

1 0

Zebediah Figura : strmbase: Get rid of the unused "lock" parameter to BaseControlWindow_Init().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 3f7fdcfd63335d796c3cf0e47cba846cd0296540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7fdcfd63335d796c3cf0e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:49 2019 -0500 strmbase: Get rid of the unused "lock" parameter to BaseControlWindow_Init(). We don't use a lock, and while it's true we probably should be, we already have access to one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 6 +++--- dlls/quartz/vmr9.c | 5 ++--- dlls/strmbase/window.c | 5 ++--- include/wine/strmbase.h | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index db5ee0fbf4..a11c2047a6 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -846,9 +846,9 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - hr = BaseControlWindow_Init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, - &pVideoRenderer->renderer.sink.pin, &renderer_BaseWindowFuncTable); + hr = strmbase_window_init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, + &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, + &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 59a5152cf5..c3b948f599 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2251,9 +2251,8 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) if (FAILED(hr)) goto fail; - hr = BaseControlWindow_Init(&pVMR->baseControlWindow, &IVideoWindow_VTable, - &pVMR->renderer.filter, &pVMR->renderer.filter.csFilter, - &pVMR->renderer.sink.pin, &renderer_BaseWindowFuncTable); + hr = strmbase_window_init(&pVMR->baseControlWindow, &IVideoWindow_VTable, + &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 23f37de52b..be6646c27a 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -144,9 +144,9 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) return S_OK; } -HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, +HRESULT WINAPI strmbase_window_init(BaseControlWindow *pControlWindow, const IVideoWindowVtbl *lpVtbl, struct strmbase_filter *owner, - CRITICAL_SECTION *lock, struct strmbase_pin *pPin, const BaseWindowFuncTable *pFuncsTable) + struct strmbase_pin *pPin, const BaseWindowFuncTable *pFuncsTable) { HRESULT hr; @@ -158,7 +158,6 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, pControlWindow->hwndDrain = NULL; pControlWindow->hwndOwner = NULL; pControlWindow->pFilter = owner; - pControlWindow->pInterfaceLock = lock; pControlWindow->pPin = pPin; } return hr; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 5be7caa371..74c8f4721b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -403,12 +403,11 @@ typedef struct tagBaseControlWindow HWND hwndDrain; HWND hwndOwner; struct strmbase_filter *pFilter; - CRITICAL_SECTION* pInterfaceLock; struct strmbase_pin *pPin; } BaseControlWindow; -HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *window, const IVideoWindowVtbl *vtbl, - struct strmbase_filter *filter, CRITICAL_SECTION *lock, struct strmbase_pin *pin, const BaseWindowFuncTable *ops); +HRESULT WINAPI strmbase_window_init(BaseControlWindow *window, const IVideoWindowVtbl *vtbl, + struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseWindowFuncTable *func_table); HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow); BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam);

1 0