July 2015 - Wine-commits - list.winehq.org

Hans Leidekker : ieframe: Implement IViewObject::GetAdvise and IViewObject ::SetAdvise.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 99613c003ed43f5725ef08d32fea440f737e8aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=99613c003ed43f5725ef08d32… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:35:45 2015 +0200 ieframe: Implement IViewObject::GetAdvise and IViewObject::SetAdvise. --- dlls/ieframe/ieframe.h | 4 ++ dlls/ieframe/oleobject.c | 5 ++ dlls/ieframe/tests/webbrowser.c | 121 ++++++++++++++++++++++++++++++++++++++++ dlls/ieframe/view.c | 28 ++++++++-- 4 files changed, 154 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index f8c204c..a83ff35 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -191,6 +191,10 @@ struct WebBrowser { IOleContainer *container; IOleInPlaceSiteEx *inplace; + IAdviseSink *sink; + DWORD sink_aspects; + DWORD sink_flags; + /* window context */ HWND frame_hwnd; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 330804b..53c0e36 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -288,6 +288,11 @@ static void release_client_site(WebBrowser *This) IOleClientSite_Release(This->client); This->client = NULL; } + + if(This->sink) { + IAdviseSink_Release(This->sink); + This->sink = NULL; + } } typedef struct { diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index b19ae7c..4d3ab24 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3841,6 +3841,126 @@ static void test_FileProtocol(void) DeleteFileA(file_path); } +struct sink +{ + IAdviseSink IAdviseSink_iface; +}; + +static inline struct sink *impl_from_IAdviseSink(IAdviseSink *iface) +{ + return CONTAINING_RECORD(iface, struct sink, IAdviseSink_iface); +} + +static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void **obj) +{ + struct sink *sink = impl_from_IAdviseSink(iface); + + trace("%p, %p, %p\n", iface, riid, obj); + + if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = &sink->IAdviseSink_iface; + } + else + { + return E_NOINTERFACE; + } + IAdviseSink_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI sink_AddRef(IAdviseSink *iface) +{ + trace("%p\n", iface); + return 2; +} + +static ULONG WINAPI sink_Release(IAdviseSink *iface) +{ + trace("%p\n", iface); + return 1; +} + +static void WINAPI sink_OnDataChange(IAdviseSink *iface, FORMATETC *format, STGMEDIUM *medium) +{ + trace("%p, %p, %p\n", iface, format, medium); +} + +static void WINAPI sink_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) +{ + trace("%p, %08x, %d\n", iface, aspect, index); +} + +static void WINAPI sink_OnRename(IAdviseSink *iface, IMoniker *moniker) +{ + trace("%p, %p\n", iface, moniker); +} + +static void WINAPI sink_OnSave(IAdviseSink *iface) +{ + trace("%p\n", iface); +} + +static void WINAPI sink_OnClose(IAdviseSink *iface) +{ + trace("%p\n", iface); +} + +static const IAdviseSinkVtbl sink_vtbl = +{ + sink_QueryInterface, + sink_AddRef, + sink_Release, + sink_OnDataChange, + sink_OnViewChange, + sink_OnRename, + sink_OnSave, + sink_OnClose +}; + +static IAdviseSink test_sink = { &sink_vtbl }; + +static void test_SetAdvise(void) +{ + HRESULT hr; + IWebBrowser2 *browser; + IViewObject2 *view; + IAdviseSink *sink; + DWORD aspects, flags; + + if (!(browser = create_webbrowser())) return; + init_test(browser, 0); + + hr = IWebBrowser2_QueryInterface(browser, &IID_IViewObject2, (void **)&view); + ok(hr == S_OK, "got %08x\n", hr); + if (FAILED(hr)) return; + + aspects = flags = 0xdeadbeef; + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(!aspects, "got %08x\n", aspects); + ok(!flags, "got %08x\n", aspects); + ok(sink == NULL, "got %p\n", sink); + + hr = IViewObject2_SetAdvise(view, DVASPECT_CONTENT, 0, (IAdviseSink *)&test_sink); + ok(hr == S_OK, "got %08x\n", hr); + + aspects = flags = 0xdeadbeef; + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(aspects == DVASPECT_CONTENT, "got %08x\n", aspects); + ok(!flags, "got %08x\n", aspects); + ok(sink == &test_sink, "got %p\n", sink); + + hr = IViewObject2_SetAdvise(view, 0, 0, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + IViewObject2_Release(view); + IWebBrowser2_Release(browser); +} + START_TEST(webbrowser) { OleInitialize(NULL); @@ -3867,6 +3987,7 @@ START_TEST(webbrowser) trace("Testing WebBrowserV1...\n"); test_WebBrowserV1(); test_FileProtocol(); + test_SetAdvise(); OleUninitialize(); } diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 2bf14b5..3e44991 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -92,16 +92,36 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, D IAdviseSink *pAdvSink) { WebBrowser *This = impl_from_IViewObject2(iface); - FIXME("(%p)->(%d %08x %p)\n", This, aspects, advf, pAdvSink); - return E_NOTIMPL; + + TRACE("(%p)->(%d %08x %p)\n", This, aspects, advf, pAdvSink); + + if (aspects || advf) FIXME("aspects and/or flags not supported yet\n"); + + This->sink_aspects = aspects; + This->sink_flags = advf; + if (This->sink) IAdviseSink_Release(This->sink); + This->sink = pAdvSink; + if (This->sink) IAdviseSink_AddRef(This->sink); + + return S_OK; } static HRESULT WINAPI ViewObject_GetAdvise(IViewObject2 *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { WebBrowser *This = impl_from_IViewObject2(iface); - FIXME("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); + + if (pAspects) *pAspects = This->sink_aspects; + if (pAdvf) *pAdvf = This->sink_flags; + if (ppAdvSink) + { + *ppAdvSink = This->sink; + if (*ppAdvSink) IAdviseSink_AddRef(*ppAdvSink); + } + + return S_OK; } static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwAspect, LONG lindex,

1 0

Hans Leidekker : ieframe: Never pass a NULL string pointer with DISPID_STATUSTEXTCHANGE.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 05d6003147e08ce54e71ea4fe02f3c5abb126fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d6003147e08ce54e71ea4fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:36:07 2015 +0200 ieframe: Never pass a NULL string pointer with DISPID_STATUSTEXTCHANGE. --- dlls/ieframe/navigate.c | 2 +- dlls/ieframe/tests/webbrowser.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 2eaf200..b1753a6 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -115,7 +115,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR } V_VT(&arg) = VT_BSTR; - V_BSTR(&arg) = str ? SysAllocString(buffer) : NULL; + V_BSTR(&arg) = str ? SysAllocString(buffer) : SysAllocString(emptyW); TRACE("=> %s\n", debugstr_w(V_BSTR(&arg))); call_sink(This->doc_host->cps.wbe2, DISPID_STATUSTEXTCHANGE, &dispparams); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4d3ab24..a70428f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -833,6 +833,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs); ok(V_VT(pDispParams->rgvarg) == VT_BSTR, "V_VT(pDispParams->rgvarg)=%d, expected VT_BSTR\n", V_VT(pDispParams->rgvarg)); + ok(V_BSTR(pDispParams->rgvarg) != NULL, "V_BSTR(pDispParams->rgvarg) is NULL\n"); /* TODO: Check text */ break;

1 0

Hans Leidekker : user32: Add a stub implementation of UnregisterPowerSettingNotification.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 4ad09a150ea91bafaa28aac9b79b5d9a3297b1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad09a150ea91bafaa28aac9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:36:35 2015 +0200 user32: Add a stub implementation of UnregisterPowerSettingNotification. --- dlls/user32/misc.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index b3615e8..5d2042a 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -721,6 +721,15 @@ HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUI } /********************************************************************** + * UnregisterPowerSettingNotification [USER32.@] + */ +BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p): stub\n", handle); + return TRUE; +} + +/********************************************************************** * SetGestureConfig [USER32.@] */ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 5cc0f55..204ccd4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -736,6 +736,7 @@ @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) # @ stub UnregisterMessagePumpHook +@ stdcall UnregisterPowerSettingNotification(ptr) # @ stub UnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) diff --git a/include/winuser.h b/include/winuser.h index 118aa73..06ca054 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4027,6 +4027,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); #define UnregisterClass WINELIB_NAME_AW(UnregisterClass) WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); +WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); WINUSERAPI UINT WINAPI UserRealizePalette(HDC);

1 0

Hans Leidekker : user32: Return a fake handle from RegisterPowerSettingNotification.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 80cee36b6a0155373888ed22270e163e259331f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cee36b6a0155373888ed222… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:37:01 2015 +0200 user32: Return a fake handle from RegisterPowerSettingNotification. --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5d2042a..e395d2f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -717,7 +717,7 @@ BOOL WINAPI UserHandleGrantAccess(HANDLE handle, HANDLE job, BOOL grant) HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUID *guid, DWORD flags) { FIXME("(%p,%s,%x): stub\n", recipient, debugstr_guid(guid), flags); - return NULL; + return (HPOWERNOTIFY)0xdeadbeef; } /**********************************************************************

1 0

Hans Leidekker : server: Make returning used privileges optional in token_access_check.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: e0206d9f8a7a8c4abedad1346ade99305c48d042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0206d9f8a7a8c4abedad1346… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:37:24 2015 +0200 server: Make returning used privileges optional in token_access_check. --- server/token.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/token.c b/server/token.c index c235ece..42cfb3d 100644 --- a/server/token.c +++ b/server/token.c @@ -848,7 +848,7 @@ static unsigned int token_access_check( struct token *token, /* fail if desired_access contains generic rights */ if (desired_access & (GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE|GENERIC_ALL)) { - *priv_count = 0; + if (priv_count) *priv_count = 0; return STATUS_GENERIC_NOT_MAPPED; } @@ -856,14 +856,14 @@ static unsigned int token_access_check( struct token *token, owner = sd_get_owner( sd ); if (!owner || !sd_get_group( sd )) { - *priv_count = 0; + if (priv_count) *priv_count = 0; return STATUS_INVALID_SECURITY_DESCR; } /* 1: Grant desired access if the object is unprotected */ if (!dacl_present || !dacl) { - *priv_count = 0; + if (priv_count) *priv_count = 0; *granted_access = desired_access; return *status = STATUS_SUCCESS; } @@ -899,7 +899,7 @@ static unsigned int token_access_check( struct token *token, } else { - *priv_count = 0; + if (priv_count) *priv_count = 0; *status = STATUS_PRIVILEGE_NOT_HELD; return STATUS_SUCCESS; } @@ -1002,8 +1002,7 @@ int check_object_access(struct object *obj, unsigned int *access) { GENERIC_MAPPING mapping; struct token *token = current->token ? current->token : current->process->token; - LUID_AND_ATTRIBUTES priv; - unsigned int status, priv_count = 1; + unsigned int status; int res; mapping.GenericAll = obj->ops->map_access( obj, GENERIC_ALL ); @@ -1019,7 +1018,7 @@ int check_object_access(struct object *obj, unsigned int *access) mapping.GenericWrite = obj->ops->map_access( obj, GENERIC_WRITE ); mapping.GenericExecute = obj->ops->map_access( obj, GENERIC_EXECUTE ); - res = token_access_check( token, obj->sd, *access, &priv, &priv_count, + res = token_access_check( token, obj->sd, *access, NULL, NULL, &mapping, access, &status ) == STATUS_SUCCESS && status == STATUS_SUCCESS;

1 0

Sebastian Lackner : shell32: Ensure that commandline is null-terminated when no parameters are given.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 7d3f13a129e4c0dd410208b03bf2adfae5398731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f13a129e4c0dd410208b03… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 17 04:54:24 2015 +0200 shell32: Ensure that commandline is null-terminated when no parameters are given. --- dlls/shell32/shlexec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 3196149..ba83a57 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1774,6 +1774,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) memcpy(wcmd+1, wszApplicationName, len * sizeof(WCHAR)); len++; wcmd[len++] = '\"'; + wcmd[len] = 0; if (sei_tmp.lpParameters[0]) { wcmd[len++] = ' '; strcpyW(wcmd+len, wszParameters);

1 0

Andrew Cook : server: Implement JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 453458f2946edeb4744d40ca6e80a49947cf221b URL: http://source.winehq.org/git/wine.git/?a=commit;h=453458f2946edeb4744d40ca6… Author: Andrew Cook <ariscop(a)gmail.com> Date: Fri Jul 17 06:17:08 2015 +0200 server: Implement JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE. --- dlls/kernel32/tests/process.c | 1 - server/process.c | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4145dce..9f62e13 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2452,7 +2452,6 @@ static void test_KillOnJobClose(void) CloseHandle(job); dwret = WaitForSingleObject(pi.hProcess, 1000); - todo_wine ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); diff --git a/server/process.c b/server/process.c index 569a8fe..0bf7194 100644 --- a/server/process.c +++ b/server/process.c @@ -140,6 +140,7 @@ static void job_dump( struct object *obj, int verbose ); static struct object_type *job_get_type( struct object *obj ); static int job_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int job_map_access( struct object *obj, unsigned int access ); +static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void job_destroy( struct object *obj ); struct job @@ -170,7 +171,7 @@ static const struct object_ops job_ops = default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ - no_close_handle, /* close_handle */ + job_close_handle, /* close_handle */ job_destroy /* destroy */ }; @@ -287,6 +288,19 @@ static void terminate_job( struct job *job, int exit_code ) wake_up( &job->obj, 0 ); } +static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) +{ + struct job *job = (struct job *)obj; + assert( obj->ops == &job_ops ); + + if (obj->handle_count == 1) /* last handle */ + { + if (job->limit_flags & JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE) + terminate_job( job, 0 ); + } + return 1; +} + static void job_destroy( struct object *obj ) { struct job *job = (struct job *)obj;

1 0

Sebastian Lackner : ntdll: Avoid possible deadlock by using _exit() in NtTerminateProcess.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 4a1629c4117fda9eca63b6f56ea45771dc9734ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1629c4117fda9eca63b6f56… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 17 06:46:47 2015 +0200 ntdll: Avoid possible deadlock by using _exit() in NtTerminateProcess. When threads are killed with SIGQUIT some locks can be in an undefined state, and it not safe to call exit handlers. --- dlls/ntdll/process.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c69de5e..ca9462a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -21,11 +21,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -60,7 +65,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self && handle) exit( exit_code ); + if (self && handle) _exit( exit_code ); return ret; }

1 0

Dan Kegel : vcomp: Implement stub for _vcomp_fork.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: ad1077f94bfe5b8b762f30b1d2174cce61dfbb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1077f94bfe5b8b762f30b1d… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jul 16 15:00:07 2015 +0200 vcomp: Implement stub for _vcomp_fork. --- dlls/vcomp/main.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 4 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8ec3616..93d418e 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -3,6 +3,7 @@ * vcomp implementation * * Copyright 2011 Austin English + * Copyright 2012 Dan Kegel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,6 +41,89 @@ struct vcomp_thread_data int fork_threads; }; +#if defined(__i386__) + +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +__ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "movl 12(%ebp),%edx\n\t" + "movl %esp,%edi\n\t" + "shll $2,%edx\n\t" + "jz 1f\n\t" + "subl %edx,%edi\n\t" + "andl $~15,%edi\n\t" + "movl %edi,%esp\n\t" + "movl 12(%ebp),%ecx\n\t" + "movl 16(%ebp),%esi\n\t" + "cld\n\t" + "rep; movsl\n" + "1:\tcall *8(%ebp)\n\t" + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) + +#elif defined(__x86_64__) + +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +__ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "pushq %rsi\n\t" + __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") + "pushq %rdi\n\t" + __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") + "movq %rcx,%rax\n\t" + "movq $4,%rcx\n\t" + "cmp %rcx,%rdx\n\t" + "cmovgq %rdx,%rcx\n\t" + "leaq 0(,%rcx,8),%rdx\n\t" + "subq %rdx,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movq %rsp,%rdi\n\t" + "movq %r8,%rsi\n\t" + "rep; movsq\n\t" + "movq 0(%rsp),%rcx\n\t" + "movq 8(%rsp),%rdx\n\t" + "movq 16(%rsp),%r8\n\t" + "movq 24(%rsp),%r9\n\t" + "callq *%rax\n\t" + "leaq -16(%rbp),%rsp\n\t" + "popq %rdi\n\t" + __ASM_CFI(".cfi_same_value %rdi\n\t") + "popq %rsi\n\t" + __ASM_CFI(".cfi_same_value %rsi\n\t") + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret") + +#else + +static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args) +{ + ERR("Not implemented for this architecture\n"); +} + +#endif + static inline struct vcomp_thread_data *vcomp_get_thread_data(void) { return (struct vcomp_thread_data *)TlsGetValue(vcomp_context_tls); @@ -160,6 +244,17 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) +{ + __ms_va_list valist; + + TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); + + __ms_va_start(valist, wrapper); + _vcomp_fork_call_wrapper(wrapper, nargs, valist); + __ms_va_end(valist); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", instance, reason, reserved); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 306dd15..d446574 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -64,7 +64,7 @@ @ stub _vcomp_for_static_init_i8 @ stub _vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 -@ stub _vcomp_fork +@ varargs _vcomp_fork(long long ptr) @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 39cf91c..2c04e91 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -64,7 +64,7 @@ @ stub _vcomp_for_static_init_i8 @ stub _vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 -@ stub _vcomp_fork +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 39cf91c..2c04e91 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -64,7 +64,7 @@ @ stub _vcomp_for_static_init_i8 @ stub _vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 -@ stub _vcomp_fork +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier

1 0

Sebastian Lackner : vcomp: Add multithreaded implementation for _vcomp_fork.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: ee34265f8f7a45a998ef076bbb5967637347f635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee34265f8f7a45a998ef076bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 15:00:20 2015 +0200 vcomp: Add multithreaded implementation for _vcomp_fork. --- dlls/vcomp/main.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 172 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 93d418e..3830879 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -4,6 +4,7 @@ * * Copyright 2011 Austin English * Copyright 2012 Dan Kegel + * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,22 +24,52 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +static struct list vcomp_idle_threads = LIST_INIT(vcomp_idle_threads); static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; +static HMODULE vcomp_module; static int vcomp_max_threads; static int vcomp_num_threads; static BOOL vcomp_nested_fork = FALSE; +static RTL_CRITICAL_SECTION vcomp_section; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &vcomp_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": vcomp_section") } +}; +static RTL_CRITICAL_SECTION vcomp_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + struct vcomp_thread_data { + struct vcomp_team_data *team; int thread_num; int fork_threads; + + /* only used for concurrent tasks */ + struct list entry; + CONDITION_VARIABLE cond; +}; + +struct vcomp_team_data +{ + CONDITION_VARIABLE cond; + int num_threads; + int finished_threads; + + /* callback arguments */ + int nargs; + void *wrapper; + __ms_va_list valist; }; #if defined(__i386__) @@ -145,8 +176,9 @@ static struct vcomp_thread_data *vcomp_init_thread_data(void) ExitProcess(1); } - thread_data->thread_num = 0; - thread_data->fork_threads = 0; + thread_data->team = NULL; + thread_data->thread_num = 0; + thread_data->fork_threads = 0; vcomp_set_thread_data(thread_data); return thread_data; @@ -187,8 +219,9 @@ int CDECL omp_get_num_procs(void) int CDECL omp_get_num_threads(void) { - TRACE("stub\n"); - return 1; + struct vcomp_team_data *team_data = vcomp_init_thread_data()->team; + TRACE("()\n"); + return team_data ? team_data->num_threads : 1; } int CDECL omp_get_thread_num(void) @@ -244,15 +277,145 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } +static DWORD WINAPI _vcomp_fork_worker(void *param) +{ + struct vcomp_thread_data *thread_data = param; + vcomp_set_thread_data(thread_data); + + TRACE("starting worker thread for %p\n", thread_data); + + EnterCriticalSection(&vcomp_section); + for (;;) + { + struct vcomp_team_data *team = thread_data->team; + if (team != NULL) + { + LeaveCriticalSection(&vcomp_section); + _vcomp_fork_call_wrapper(team->wrapper, team->nargs, team->valist); + EnterCriticalSection(&vcomp_section); + + thread_data->team = NULL; + list_remove(&thread_data->entry); + list_add_tail(&vcomp_idle_threads, &thread_data->entry); + if (++team->finished_threads >= team->num_threads) + WakeAllConditionVariable(&team->cond); + } + + if (!SleepConditionVariableCS(&thread_data->cond, &vcomp_section, 5000) && + GetLastError() == ERROR_TIMEOUT && !thread_data->team) + { + break; + } + } + list_remove(&thread_data->entry); + LeaveCriticalSection(&vcomp_section); + + TRACE("terminating worker thread for %p\n", thread_data); + + HeapFree(GetProcessHeap(), 0, thread_data); + vcomp_set_thread_data(NULL); + FreeLibraryAndExitThread(vcomp_module, 0); + return 0; +} + void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) { - __ms_va_list valist; + struct vcomp_thread_data *prev_thread_data = vcomp_init_thread_data(); + struct vcomp_thread_data thread_data; + struct vcomp_team_data team_data; + int num_threads; TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); - __ms_va_start(valist, wrapper); - _vcomp_fork_call_wrapper(wrapper, nargs, valist); - __ms_va_end(valist); + if (!ifval) + num_threads = 1; + else if (prev_thread_data->team && !vcomp_nested_fork) + num_threads = 1; + else if (prev_thread_data->fork_threads) + num_threads = prev_thread_data->fork_threads; + else + num_threads = vcomp_num_threads; + + InitializeConditionVariable(&team_data.cond); + team_data.num_threads = 1; + team_data.finished_threads = 0; + team_data.nargs = nargs; + team_data.wrapper = wrapper; + __ms_va_start(team_data.valist, wrapper); + + thread_data.team = &team_data; + thread_data.thread_num = 0; + thread_data.fork_threads = 0; + list_init(&thread_data.entry); + InitializeConditionVariable(&thread_data.cond); + + if (num_threads > 1) + { + struct list *ptr; + EnterCriticalSection(&vcomp_section); + + /* reuse existing threads (if any) */ + while (team_data.num_threads < num_threads && (ptr = list_head(&vcomp_idle_threads))) + { + struct vcomp_thread_data *data = LIST_ENTRY(ptr, struct vcomp_thread_data, entry); + data->team = &team_data; + data->thread_num = team_data.num_threads++; + data->fork_threads = 0; + list_remove(&data->entry); + list_add_tail(&thread_data.entry, &data->entry); + WakeAllConditionVariable(&data->cond); + } + + /* spawn additional threads */ + while (team_data.num_threads < num_threads) + { + struct vcomp_thread_data *data; + HMODULE module; + HANDLE thread; + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + if (!data) break; + + data->team = &team_data; + data->thread_num = team_data.num_threads; + data->fork_threads = 0; + InitializeConditionVariable(&data->cond); + + thread = CreateThread(NULL, 0, _vcomp_fork_worker, data, 0, NULL); + if (!thread) + { + HeapFree(GetProcessHeap(), 0, data); + break; + } + + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (const WCHAR *)vcomp_module, &module); + team_data.num_threads++; + list_add_tail(&thread_data.entry, &data->entry); + CloseHandle(thread); + } + + LeaveCriticalSection(&vcomp_section); + } + + vcomp_set_thread_data(&thread_data); + _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, team_data.valist); + vcomp_set_thread_data(prev_thread_data); + prev_thread_data->fork_threads = 0; + + if (team_data.num_threads > 1) + { + EnterCriticalSection(&vcomp_section); + + team_data.finished_threads++; + while (team_data.finished_threads < team_data.num_threads) + SleepConditionVariableCS(&team_data.cond, &vcomp_section, INFINITE); + + LeaveCriticalSection(&vcomp_section); + assert(list_empty(&thread_data.entry)); + } + + __ms_va_end(team_data.valist); } BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) @@ -275,6 +438,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) } GetSystemInfo(&sysinfo); + vcomp_module = instance; vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; break;

1 0