October 2019 - Wine-commits

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

18 Oct '19

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

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

18 Oct '19

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 18 Oct '19

18 Oct '19

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

Jacek Caban : vbscript: Move init_global call to CreateInstance.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: cef14ac3380ee30e04eb3f77f151d0c28f32eb97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef14ac3380ee30e04eb3f77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:40 2019 +0200 vbscript: Move init_global call to CreateInstance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 8b81b7a5e3..56c53b4015 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -128,18 +128,6 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag return NULL; } -static HRESULT set_ctx_site(VBScript *This) -{ - HRESULT hres; - - hres = init_global(This->ctx); - if(FAILED(hres)) - return hres; - - change_state(This, SCRIPTSTATE_INITIALIZED); - return S_OK; -} - static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; @@ -434,7 +422,9 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->ctx->lcid = lcid; - return This->is_initialized ? set_ctx_site(This) : S_OK; + if(This->is_initialized) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -748,7 +738,9 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - return This->ctx->site ? set_ctx_site(This) : S_OK; + if(This->ctx->site) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, @@ -968,6 +960,12 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU list_init(&ctx->code_list); list_init(&ctx->named_items); + hres = init_global(ctx); + if(FAILED(hres)) { + IActiveScript_Release(&ret->IActiveScript_iface); + return hres; + } + hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); return hres;

1 0

Jacek Caban : vbscript/tests: Add more named items tests.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: f449c361ce4e05025adc1a339033a6c761f3ed43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f449c361ce4e05025adc1a33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:50 2019 +0200 vbscript/tests: Add more named items tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 206 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f449c361ce4e05025adc…

1 0

Hans Leidekker : wininet/tests: Fix FTP test failures.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: bbf74ea22a5310978c9aecbdc648c562c26fa0fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf74ea22a5310978c9aecbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 18 16:46:23 2019 +0200 wininet/tests: Fix FTP test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/ftp.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 6f50104f3b..317b291495 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -71,7 +71,7 @@ static void test_connect(HINTERNET hInternet) */ SetLastError(0xdeadbeef); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (hFtp) /* some servers accept an empty password */ { ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); @@ -701,7 +701,7 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } -static void test_command(HINTERNET hFtp, HINTERNET hConnect) +static void test_command(HINTERNET hFtp) { BOOL ret; DWORD error; @@ -716,17 +716,18 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) { { FALSE, ERROR_INVALID_PARAMETER, NULL }, { FALSE, ERROR_INVALID_PARAMETER, "" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "HELO" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " SIZE" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg " }, - { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, - { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, - { TRUE, ERROR_SUCCESS, "PWD" } + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "invalid" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size" }, + { TRUE, ERROR_SUCCESS, "type i" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " size" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg " }, + { TRUE, ERROR_SUCCESS, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "pwd welcome.msg" }, + { TRUE, ERROR_SUCCESS, "pwd" } }; if (!pFtpCommandA) @@ -964,7 +965,7 @@ static void test_status_callbacks(HINTERNET hInternet) cb = pInternetSetStatusCallbackA(hInternet, status_callback); ok(cb == NULL, "expected NULL got %p\n", cb); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 1); if (!hFtp) { @@ -998,7 +999,7 @@ START_TEST(ftp) hInternet = InternetOpenA("winetest", 0, NULL, NULL, 0); ok(hInternet != NULL, "InternetOpen failed: %u\n", GetLastError()); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (!hFtp) { InternetCloseHandle(hInternet); @@ -1031,7 +1032,7 @@ START_TEST(ftp) test_putfile(hFtp, hHttp); test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); - test_command(hFtp, hHttp); + test_command(hFtp); test_find_first_file(hFtp, hHttp); test_get_current_dir(hFtp, hHttp); test_status_callbacks(hInternet);

1 0

Zebediah Figura : quartz/tests: Relax system clock timing tests a bit.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: ebf82cd6868b795009989c5746895acb124e96e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf82cd6868b795009989c57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:46 2019 -0500 quartz/tests: Relax system clock timing tests a bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index cd291e1490..3c493a0f38 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -89,8 +89,8 @@ static void test_get_time(void) Sleep(100); hr = IReferenceClock_GetTime(clock, &time2); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(time2 - time1 > 98 * 10000, "Expected about %s, but got %s.\n", - wine_dbgstr_longlong(time1 + 98 * 10000), wine_dbgstr_longlong(time2)); + ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 80 * 10000), wine_dbgstr_longlong(time2)); ref = IReferenceClock_Release(clock); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -160,11 +160,11 @@ static void test_advise(void) hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!WaitForSingleObject(semaphore, 10), "Semaphore should be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 20), "Semaphore should be signaled.\n"); for (i = 0; i < 5; ++i) { - ok(WaitForSingleObject(semaphore, 480) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); - ok(!WaitForSingleObject(semaphore, 40), "Semaphore should be signaled.\n"); + ok(WaitForSingleObject(semaphore, 460) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 60), "Semaphore should be signaled.\n"); } hr = IReferenceClock_Unadvise(clock, cookie);

1 0

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

18 Oct '19

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

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

18 Oct '19

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

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

18 Oct '19

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