wine-devel September 2020

wine-devel@winehq.org

79 participants
771 discussions

[PATCH] ntdll: Add SIGQUIT to server block set.
by Paul Gofman 14 Sep '20

14 Sep '20

Receiving SIGQUIT for forced thread termination may leave sync objects (like virtual_mutex) locked. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49532 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- While the issue I observed in the referenced bug (happening during the process termination only) can be solved in different ways, I suppose protecting the locks from SIGQUIT is preferred because the thread can also be aborted the same way with NtTerminateThread apart from the whole process tear down. dlls/ntdll/unix/server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cadbbe70a25..ac250c5d9d8 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1432,6 +1432,7 @@ void server_init_process(void) sigaddset( &server_block_set, SIGUSR1 ); sigaddset( &server_block_set, SIGUSR2 ); sigaddset( &server_block_set, SIGCHLD ); + sigaddset( &server_block_set, SIGQUIT ); pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ -- 2.26.2

2 3

[PATCH] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu 14 Sep '20

14 Sep '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/unix/sync.c | 26 ++++++++++++++++++++++++-- server/process.c | 23 +++++++++++++++++++++++ server/protocol.def | 9 +++++++++ 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ca991ea..d53f058 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2669,15 +2669,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2692,17 +2688,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 2d027b8..646caa0 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -780,10 +780,32 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process = info; + DWORD count, i; if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; - memset( process, 0, sizeof(*process) ); - if (ret_len) *ret_len = sizeof(*process); + + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( query_job_pids ) + { + req->job = wine_server_user_handle(handle); + wine_server_set_reply(req, process, count * sizeof(process_id_t)); + if ((ret = wine_server_call(req)) != STATUS_SUCCESS) + return ret; + if (count < reply->count) + return STATUS_MORE_ENTRIES; + count = reply->count; + } + SERVER_END_REQ; + + /* start from the end to not overwrite */ + for (i = count; i--;) + process->ProcessIdList[i] = ((process_id_t*)process)[i]; + process->NumberOfAssignedProcesses = count; + process->NumberOfProcessIdsInList = count; + + if (ret_len) *ret_len = (char*)(&process->ProcessIdList[count]) - (char*)process; return STATUS_SUCCESS; } case JobObjectExtendedLimitInformation: diff --git a/server/process.c b/server/process.c index 9bf5e44..822104e 100644 --- a/server/process.c +++ b/server/process.c @@ -1705,6 +1705,29 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* get a list of the pids associated with the job */ +DECL_HANDLER(query_job_pids) +{ + struct job *job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ); + struct process *process; + process_id_t *data; + data_size_t len; + + if (!job) return; + + reply->count = job->num_processes; + len = min( get_reply_max_size(), job->num_processes * sizeof(*data) ); + if (len && ((data = set_reply_data_size( len )))) + { + process_id_t *end = data + len; + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (data >= end) break; + *data++ = process->id; + } + } +} + /* retrieve information about a job */ DECL_HANDLER(get_job_info) { diff --git a/server/protocol.def b/server/protocol.def index 92290af..7ef284d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3670,6 +3670,15 @@ struct handle_info @END +/* Query a list of pids associated with the job */ +@REQ(query_job_pids) + obj_handle_t job; /* handle to the job */ +@REPLY + data_size_t count; /* number of processes associated with the job */ + VARARG(pids,uints); /* list of pids */ +@END + + /* Set limit flags on a job */ @REQ(set_job_limits) obj_handle_t handle; /* handle to the job */ -- 2.21.0

1 0

[PATCH 1/4] shell32: Add ShellLinkObject stubs.
by Myah Caron 14 Sep '20

14 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This was done somewhat blindly, copied from other classes in the file. Here are some things that may need to be fixed: - I'm not sure if it should be named ShellLinkObject_* or IShellLinkDual[2]_* - Some of the other classes (ShellDispatch) used QueryInterface in Constructor, while others didn't (FolderItem). I decided not to use it for simplicity. - Should .item be AddRef'd? dlls/shell32/shell32_main.h | 1 + dlls/shell32/shelldispatch.c | 308 ++++++++++++++++++++++++++++++++++- 2 files changed, 308 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 11a96309e8b..3465a3c8445 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -222,6 +222,7 @@ enum tid_t { FolderItems3_tid, FolderItemVerb_tid, FolderItemVerbs_tid, + IShellLinkDual2_tid, LAST_tid }; diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index c6d1dab7f62..f4947c815f1 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -51,7 +51,8 @@ static const IID * const tid_ids[] = &IID_FolderItem2, &IID_FolderItems3, &IID_FolderItemVerb, - &IID_FolderItemVerbs + &IID_FolderItemVerbs, + &IID_IShellLinkDual2 }; static ITypeInfo *typeinfos[LAST_tid]; @@ -102,6 +103,15 @@ typedef struct { BSTR name; } FolderItemVerbImpl; +typedef struct { + IShellLinkDual2 IShellLinkDual2_iface; + LONG ref; + + FolderItemImpl *item; + IShellLinkW *shell_link; + IPersistFile *persist_file; +} ShellLinkObjectImpl; + static inline ShellDispatch *impl_from_IShellDispatch6(IShellDispatch6 *iface) { return CONTAINING_RECORD(iface, ShellDispatch, IShellDispatch6_iface); @@ -132,6 +142,11 @@ static inline FolderItemVerbImpl *impl_from_FolderItemVerb(FolderItemVerb *iface return CONTAINING_RECORD(iface, FolderItemVerbImpl, FolderItemVerb_iface); } +static inline ShellLinkObjectImpl *impl_from_IShellLinkDual(IShellLinkDual2 *iface) +{ + return CONTAINING_RECORD(iface, ShellLinkObjectImpl, IShellLinkDual2_iface); +} + static HRESULT load_typelib(void) { ITypeLib *tl; @@ -617,6 +632,297 @@ failed: return hr; } +static HRESULT WINAPI ShellLinkObject_QueryInterface(IShellLinkDual2 *iface, REFIID riid, + LPVOID *ppv) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IDispatch, riid) || + IsEqualIID(&IID_IShellLinkDual, riid) || + IsEqualIID(&IID_IShellLinkDual2, riid)) + *ppv = &This->IShellLinkDual2_iface; + else + { + WARN("not implemented for %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ShellLinkObject_AddRef(IShellLinkDual2 *iface) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", iface, ref); + + if (!ref) + { + if (This->persist_file) IPersistFile_Release(This->persist_file); + if (This->shell_link) IShellLinkW_Release(This->shell_link); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ShellLinkObject_GetTypeInfoCount(IShellLinkDual2 *iface, UINT *pctinfo) +{ + TRACE("(%p,%p)\n", iface, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ShellLinkObject_GetTypeInfo(IShellLinkDual2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HRESULT hr; + + TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IShellLinkDual2_tid, ppTInfo); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*ppTInfo); + + return hr; +} + +static HRESULT WINAPI ShellLinkObject_GetIDsOfNames(IShellLinkDual2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + rgDispId); + + hr = get_typeinfo(IShellLinkDual2_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, rgszNames, cNames, rgDispId); + return hr; +} + +static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IShellLinkDual2_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, This, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return hr; +} + +static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Description(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Description(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_WorkingDirectory(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_WorkingDirectory(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Arguments(IShellLinkDual2 *iface, BSTR *pbs) +{ + FIXME("(%p, %p)\n", iface, pbs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Arguments(IShellLinkDual2 *iface, BSTR bs) +{ + FIXME("(%p, %s)\n", iface, debugstr_w(bs)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Hotkey(IShellLinkDual2 *iface, int *piHK) +{ + FIXME("(%p, %p)\n", iface, piHK); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_Hotkey(IShellLinkDual2 *iface, int iHK) +{ + FIXME("(%p, %d)\n", iface, iHK); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_ShowCommand(IShellLinkDual2 *iface, int *piShowCommand) +{ + FIXME("(%p, %p)\n", iface, piShowCommand); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_put_ShowCommand(IShellLinkDual2 *iface, int iShowCommand) +{ + FIXME("(%p, %d)\n", iface, iShowCommand); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_Resolve(IShellLinkDual2 *iface, int fFlags) +{ + FIXME("(%p, %d)\n", iface, fFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_GetIconLocation(IShellLinkDual2 *iface, BSTR *pbs, + int *piIcon) +{ + FIXME("(%p, %p, %p)\n", iface, pbs, piIcon); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_SetIconLocation(IShellLinkDual2 *iface, BSTR bs, + int iIcon) +{ + FIXME("(%p, %s, %d)\n", iface, debugstr_w(bs), iIcon); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_Save(IShellLinkDual2 *iface, VARIANT vWhere) +{ + FIXME("(%p, %s)\n", iface, debugstr_variant(&vWhere)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellLinkObject_get_Target(IShellLinkDual2 *iface, FolderItem **ppfi) +{ + FIXME("(%p, %p)\n", iface, ppfi); + + return E_NOTIMPL; +} + +static const IShellLinkDual2Vtbl ShellLinkObjectVtbl = { + ShellLinkObject_QueryInterface, + ShellLinkObject_AddRef, + ShellLinkObject_Release, + ShellLinkObject_GetTypeInfoCount, + ShellLinkObject_GetTypeInfo, + ShellLinkObject_GetIDsOfNames, + ShellLinkObject_Invoke, + ShellLinkObject_get_Path, + ShellLinkObject_put_Path, + ShellLinkObject_get_Description, + ShellLinkObject_put_Description, + ShellLinkObject_get_WorkingDirectory, + ShellLinkObject_put_WorkingDirectory, + ShellLinkObject_get_Arguments, + ShellLinkObject_put_Arguments, + ShellLinkObject_get_Hotkey, + ShellLinkObject_put_Hotkey, + ShellLinkObject_get_ShowCommand, + ShellLinkObject_put_ShowCommand, + ShellLinkObject_Resolve, + ShellLinkObject_GetIconLocation, + ShellLinkObject_SetIconLocation, + ShellLinkObject_Save, + ShellLinkObject_get_Target, +}; + +static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 **link) +{ + HRESULT hr; + ShellLinkObjectImpl *This; + + TRACE("%p\n", item); + + *link = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->IShellLinkDual2_iface.lpVtbl = &ShellLinkObjectVtbl; + This->ref = 1; + + This->item = item; + + This->shell_link = NULL; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&This->shell_link); + if (hr != S_OK) goto free_this; + + This->persist_file = NULL; + IShellLinkW_QueryInterface(This->shell_link, &IID_IPersistFile, + (LPVOID*)&This->persist_file); + if (hr != S_OK) goto free_this; + + hr = IPersistFile_Load(This->persist_file, item->path, STGM_READ); + if (hr != S_OK) goto free_this; + + IShellLinkDual2_AddRef(&This->IShellLinkDual2_iface); + + *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; + return S_OK; + + free_this: + heap_free(This); + return hr; +} + static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, REFIID riid, LPVOID *ppv) { -- 2.28.0

2 3

[PATCH v2] ieframe: Implement IWebBrowser2::get_LocationName().
by Gijs Vermeulen 14 Sep '20

14 Sep '20

Based on a patch by Andrey Turkin <andrey.turkin(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 16 ++++++++++++++++ dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9c2c393aaf..2b32b588e7 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -256,6 +256,20 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const WCHAR *exur } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *wb, const WCHAR *exname) +{ + BSTR name = (void*)0xdeadbeef; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); +todo_wine_if(!is_http && *exname) + ok_(__FILE__,line) (!lstrcmpW(name, exname) || (is_http && broken(!lstrcmpW(name, current_url))) /* Win10 2004 */, + "expected %s, got %s\n", wine_dbgstr_w(exname), wine_dbgstr_w(name)); + SysFreeString(name); +} + #define test_ready_state(a,b) _test_ready_state(__LINE__,a,b) static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL expect_busy) { @@ -2791,11 +2805,13 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static void test_Navigate2(IWebBrowser2 *webbrowser, const WCHAR *nav_url) { + const WCHAR *title = L"WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; VARIANT url; BOOL is_file; HRESULT hres; test_LocationURL(webbrowser, is_first_load ? L"" : current_url); + test_LocationName(webbrowser, is_first_load ? L"" : (is_http ? title : current_url)); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE, VARIANT_FALSE); is_http = !memcmp(nav_url, "http:", 5); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 87b74b8e01..965cd5f0ee 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -539,8 +539,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + if(This->doc_host.document && + SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc))) { + hres = IHTMLDocument2_get_title(doc, LocationName); + IHTMLDocument2_Release(doc); + } else if(This->doc_host.url) { + *LocationName = SysAllocString(This->doc_host.url); + hres = S_OK; + } else { + static const WCHAR null_char = 0; + *LocationName = SysAllocString(&null_char); + hres = S_FALSE; + } + + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.28.0

2 2

[PATCH] ntdll: Use the MacOS file handle limit workaround from libs/wine/loader.c.
by Stefan Dösinger 14 Sep '20

14 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49624 Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bc5b627cbc..82fabc5cde 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -212,7 +212,18 @@ static void set_max_limit( int limit ) if (!getrlimit( limit, &rlimit )) { rlimit.rlim_cur = rlimit.rlim_max; - setrlimit( limit, &rlimit ); + if (setrlimit( limit, &rlimit ) != 0) + { +#if defined(__APPLE__) && defined(RLIMIT_NOFILE) && defined(OPEN_MAX) + /* On Leopard, setrlimit(RLIMIT_NOFILE, ...) fails on attempts to set + * rlim_cur above OPEN_MAX (even if rlim_max > OPEN_MAX). */ + if (limit == RLIMIT_NOFILE && rlimit.rlim_cur > OPEN_MAX) + { + rlimit.rlim_cur = OPEN_MAX; + setrlimit( limit, &rlimit ); + } +#endif + } } } -- 2.24.3 (Apple Git-128)

1 0

[PATCH] widl: Emit a guard around library contents.
by Nikolay Sivov 14 Sep '20

14 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/header.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index c8a12556cc9..743d86f0ee9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1755,8 +1755,11 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons break; } case STMT_LIBRARY: + fprintf(header, "#ifndef __%s_LIBRARY_DEFINED__\n", stmt->u.lib->name); + fprintf(header, "#define __%s_LIBRARY_DEFINED__\n", stmt->u.lib->name); write_library(header, stmt->u.lib); write_header_stmts(header, stmt->u.lib->stmts, NULL, FALSE); + fprintf(header, "#endif /* __%s_LIBRARY_DEFINED__ */\n", stmt->u.lib->name); break; case STMT_CPPQUOTE: fprintf(header, "%s\n", stmt->u.str); -- 2.28.0

1 0

[v2 PATCH 1/4] include: Add inclusion guards for schema API enums.
by Nikolay Sivov 14 Sep '20

14 Sep '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/msxml2.idl | 3 +++ include/msxml6.idl | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/msxml2.idl b/include/msxml2.idl index cfafc421336..452338bb01d 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -133,6 +133,8 @@ typedef enum tagDOMNodeType } DOMNodeType; cpp_quote("#endif") +cpp_quote("#ifndef __msxml_som_enums__") +cpp_quote("#define __msxml_som_enums__") typedef enum _SOMITEMTYPE { SOMITEM_SCHEMA = 0x1000, @@ -260,6 +262,7 @@ typedef enum _SCHEMATYPEVARIETY SCHEMATYPEVARIETY_LIST = 1, SCHEMATYPEVARIETY_UNION = 2, } SCHEMATYPEVARIETY; +cpp_quote("#endif /* __msxml_som_enums__ */") [ local, diff --git a/include/msxml6.idl b/include/msxml6.idl index 1f657a8cde9..a595fbf4f5a 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -133,6 +133,8 @@ typedef enum tagDOMNodeType } DOMNodeType; cpp_quote("#endif") +cpp_quote("#ifndef __msxml_som_enums__") +cpp_quote("#define __msxml_som_enums__") typedef enum _SOMITEMTYPE { SOMITEM_SCHEMA = 0x1000, @@ -260,6 +262,7 @@ typedef enum _SCHEMATYPEVARIETY SCHEMATYPEVARIETY_LIST = 1, SCHEMATYPEVARIETY_UNION = 2, } SCHEMATYPEVARIETY; +cpp_quote("#endif /* __msxml_som_enums__ */") [ local, -- 2.28.0

1 3

[PATCH] msvcr120: Add [_]strtoimax[_l] and [_]strtoumax[_l].
by Gijs Vermeulen 14 Sep '20

14 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49738 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 8 ++++---- include/msvcrt/stdlib.h | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index bb42e83b9f..cc16be4f37 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1734,7 +1734,7 @@ @ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @@ -1742,7 +1742,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @@ -2387,7 +2387,7 @@ @ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtof(str ptr) MSVCRT_strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) MSVCRT_strtoi64 @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol @@ -2395,7 +2395,7 @@ @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) MSVCRT_strtoui64 @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) MSVCRT_swscanf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e9917d844e..9086ffad53 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1445,7 +1445,7 @@ @ cdecl _strtof_l(str ptr ptr) msvcr120._strtof_l @ cdecl -ret64 _strtoi64(str ptr long) msvcr120._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) msvcr120._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) msvcr120._strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @@ -1453,7 +1453,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) msvcr120._strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) msvcr120._strtoull_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) msvcr120._strtoumax_l @ cdecl _strupr(str) msvcr120._strupr @ cdecl _strupr_l(str ptr) msvcr120._strupr_l @ cdecl _strupr_s(str long) msvcr120._strupr_s @@ -2050,7 +2050,7 @@ @ cdecl strstr(str str) msvcr120.strstr @ cdecl strtod(str ptr) msvcr120.strtod @ cdecl strtof(str ptr) msvcr120.strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) msvcr120.strtoimax @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol @@ -2058,7 +2058,7 @@ @ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul @ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) msvcr120.strtoumax @ cdecl strxfrm(ptr str long) msvcr120.strxfrm @ varargs swprintf_s(ptr long wstr) msvcr120.swprintf_s @ varargs swscanf(wstr wstr) msvcr120.swscanf diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f14256c18f..00acd37434 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -215,6 +215,10 @@ __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); +__int64 __cdecl strtoimax(const char*,char**,int); +__int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); +unsigned __int64 __cdecl strtoumax(const char*,char**,int); +unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); __int64 __cdecl _strtoi64(const char*,char**,int); __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl _strtoui64(const char*,char**,int); -- 2.28.0

2 1

[PATCH] ws2_32: getaddrinfo map AI_ALL option.
by Alistair Leslie-Hughes 14 Sep '20

14 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 1 + include/ws2tcpip.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 246a0e2819..0ed1af3092 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -826,6 +826,7 @@ static const int ws_aiflag_map[][2] = #ifdef AI_V4MAPPED MAP_OPTION( AI_V4MAPPED ), #endif + MAP_OPTION( AI_ALL ), MAP_OPTION( AI_ADDRCONFIG ), }; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 5a444dcb5f..5ba891185b 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -72,6 +72,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define AI_CANONNAME 0x00000002 # define AI_NUMERICHOST 0x00000004 # define AI_NUMERICSERV 0x00000008 +# define AI_ALL 0x00000100 # define AI_ADDRCONFIG 0x00000400 # define AI_V4MAPPED 0x00000800 # define AI_NON_AUTHORITATIVE 0x00004000 @@ -93,6 +94,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_AI_CANONNAME 0x00000002 # define WS_AI_NUMERICHOST 0x00000004 # define WS_AI_NUMERICSERV 0x00000008 +# define WS_AI_ALL 0x00000100 # define WS_AI_ADDRCONFIG 0x00000400 # define WS_AI_V4MAPPED 0x00000800 # define WS_AI_NON_AUTHORITATIVE 0x00004000 -- 2.28.0

1 0

[PATCH] msvcrt: Add _snprintf_c[_l].
by Gijs Vermeulen 14 Sep '20

14 Sep '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49765 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a396ee38a7..b875351849 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1293,8 +1293,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT__snprintf +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b91a5df3ab..343597e45e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1650,8 +1650,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT__snprintf +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dd7d48a862..bb42e83b9f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1661,8 +1661,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT__snprintf +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b8ffbbc758..e9917d844e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1380,8 +1380,8 @@ @ cdecl _setmbcp(long) msvcr120._setmbcp @ cdecl _setmode(long long) msvcr120._setmode @ varargs _snprintf(ptr long str) msvcr120._snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) msvcr120._snprintf_c +@ varargs _snprintf_c_l(ptr long str ptr) msvcr120._snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) msvcr120._snprintf_l @ varargs _snprintf_s(ptr long long str) msvcr120._snprintf_s @ stub _snprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4050750123..091f031f61 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -973,8 +973,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT__snprintf +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5208d3e5f3..c2fee1b234 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -948,8 +948,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ stub _snprintf_c -@ stub _snprintf_c_l +@ varargs _snprintf_c(ptr long str) MSVCRT__snprintf +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2dc9c87e57..57c1c48d12 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -909,8 +909,8 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _snprintf(ptr long str) MSVCRT__snprintf -# stub _snprintf_c(ptr long str) -# stub _snprintf_c_l(ptr long str ptr) +@ varargs _snprintf_c(ptr long str) MSVCRT__snprintf +@ varargs _snprintf_c_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l(ptr long long str ptr) -- 2.28.0

2 1

← Newer
1
...
44
45
46
47
48
49
50
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel September 2020