May 2019 - Wine-commits - list.winehq.org

Ken Thomases : loader: On Mac, move the top-down allocations area down to avoid regions reserved by the system.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 9ebf93be20662a24f741985f8b956574d7b7001a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ebf93be20662a24f741985f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 31 17:08:25 2019 -0600 loader: On Mac, move the top-down allocations area down to avoid regions reserved by the system. On macOS 10.14 (Mojave), there's a system-wide VM mapping for common system libraries starting at 0x00007fff00000000. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 07d80641d074d7aed5da83515d87765dcc6606ff) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 83d24af..ff62d32 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -78,7 +78,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ - { (void *)0x7fff40000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 635d2417a9b7e823f3752ceb748417460884b342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=635d2417a9b7e823f3752ceb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 26 21:05:28 2017 +0200 tools: Get the ANNOUNCE bug list from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index 83d869a..b38b7b0 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; use open ':encoding(utf8)'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Michael Stefaniuc : Release 4.0.1.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: d44428826800678260380d375b446f7f6cf92ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44428826800678260380d37… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Apr 27 22:57:22 2019 +0200 Release 4.0.1. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 666 +++++++++++++++++++------------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 210 insertions(+), 477 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4442882680067826038…

1 0

Tag wine-4.0.1 : Alexandre Julliard : Release 4.0.1
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: refs/tags/wine-4.0.1 Tag: 2ee0dbc58ac195dba03ab629da4e60c998dea573 URL: https://source.winehq.org/git/wine.git/?a=tag;h=2ee0dbc58ac195dba03ab629da4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 21:30:42 2019 +0200 Release 4.0.1

1 0

Sven Baars : mstask: Fix some memory leaks on error path (Valgrind).
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: cf05d6679d770316c14129c1efa744778157ef4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf05d6679d770316c14129c1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Feb 6 11:48:18 2019 +0100 mstask: Fix some memory leaks on error path (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3804b99e7253a13b383549a6a851e80300841cc5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mstask/task.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 6c27b76..9a39fc9 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1690,7 +1690,11 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta hfile = CreateFileW(task_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, disposition, 0, 0); if (hfile != INVALID_HANDLE_VALUE) break; - if (try++ >= 3) return HRESULT_FROM_WIN32(GetLastError()); + if (try++ >= 3) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } Sleep(100); } @@ -1781,13 +1785,16 @@ failed: CoTaskMemFree(comment); CoTaskMemFree(user_data); - CloseHandle(hfile); - if (hr != S_OK) - DeleteFileW(task_name); - else if (remember) + if (hfile != INVALID_HANDLE_VALUE) { - heap_free(This->task_name); - This->task_name = heap_strdupW(task_name); + CloseHandle(hfile); + if (hr != S_OK) + DeleteFileW(task_name); + else if (remember) + { + heap_free(This->task_name); + This->task_name = heap_strdupW(task_name); + } } return hr; }

1 0

Sven Baars : mstask: Move memory allocation to avoid a memory leak ( Valgrind).
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: c9dad2c6ce96539d487b5a27f3bcd72dd725ad92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9dad2c6ce96539d487b5a27… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Feb 6 11:48:19 2019 +0100 mstask: Move memory allocation to avoid a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4f15a297f301bb3c484a827a152e5f10184ff61) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mstask/task_scheduler.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 7998b3a..ebf25d0 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -143,10 +143,6 @@ static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPW enumerated = 0; list = NULL; - allocated = 64; - list = CoTaskMemAlloc(allocated * sizeof(list[0])); - if (!list) return E_OUTOFMEMORY; - if (This->handle == INVALID_HANDLE_VALUE) { GetWindowsDirectoryW(path, MAX_PATH); @@ -161,6 +157,10 @@ static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPW return S_FALSE; } + allocated = 64; + list = CoTaskMemAlloc(allocated * sizeof(list[0])); + if (!list) return E_OUTOFMEMORY; + do { if (is_file(&data))

1 0

Sven Baars : taskschd: Fix some memory leaks (Valgrind).
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 1d47e2bc99769d3596f73a95b69dff4fb0ddcfbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d47e2bc99769d3596f73a95… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Feb 6 11:48:21 2019 +0100 taskschd: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bff3918553eafc80366731b6d60c42151a298856) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/regtask.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 5c81821..74f95d9 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -350,6 +350,7 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit SysFreeString(xml); return hr; } + SysFreeString(xml); heap_free(full_name); full_name = heap_strdupW(actual_path); @@ -366,6 +367,7 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit { heap_free(full_name); heap_free(regtask); + MIDL_user_free(xml); return hr; } MIDL_user_free(xml);

1 0

Mark Jansen : msi: Do not leak rootkey.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 2e87908e0013cdeef22d1585f59ab705fc46a7a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e87908e0013cdeef22d1585… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Sun Feb 17 16:52:46 2019 +0100 msi: Do not leak rootkey. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c91f254a7740dacd5cb6bc3f8817cd1806bddeb4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/source.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 904589e..e2cf7fc 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -98,6 +98,7 @@ static UINT OpenSourceKey(LPCWSTR szProduct, HKEY* key, DWORD dwOptions, if (rc != ERROR_SUCCESS) rc = ERROR_BAD_CONFIGURATION; } + RegCloseKey(rootkey); return rc; }

1 0

Sven Baars : dinput: Free the device after a callback (Valgrind).
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: ab61ff13b1543dec12c708bc3faed577603ad9c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab61ff13b1543dec12c708bc… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 29 00:11:00 2019 +0100 dinput: Free the device after a callback (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf1b9fe2c7b78b1d5ad02d0bd56de263f8d1dd06) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/dinput_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 7074704..54777da 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1104,10 +1104,12 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) { + IDirectInputDevice_Release(lpdid); HeapFree(GetProcessHeap(), 0, didevis); HeapFree(GetProcessHeap(), 0, username_w); return DI_OK; } + IDirectInputDevice_Release(lpdid); } HeapFree(GetProcessHeap(), 0, didevis); @@ -1130,9 +1132,11 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) { + IDirectInputDevice_Release(lpdid); HeapFree(GetProcessHeap(), 0, username_w); return DI_OK; } + IDirectInputDevice_Release(lpdid); } }

1 0

Sven Baars : riched20: Fix IRichEditOle COM aggregation (Valgrind).
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: stable Commit: 2eac88925a94b900cc3443d554b01b51ad0aa5b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eac88925a94b900cc3443d5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Jan 30 22:03:20 2019 +0100 riched20: Fix IRichEditOle COM aggregation (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d917f0ef096d55928e1631a77cda1e683c906f07) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 13 ++++++++----- dlls/riched20/editor.h | 1 - dlls/riched20/editstr.h | 2 +- dlls/riched20/richole.c | 8 +------- dlls/riched20/txtsrv.c | 5 +---- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2bb2858..b7254d2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1124,6 +1124,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB LPOLECLIENTSITE lpClientSite = NULL; LPDATAOBJECT lpDataObject = NULL; LPOLECACHE lpOleCache = NULL; + LPRICHEDITOLE lpReOle = NULL; STGMEDIUM stgm; FORMATETC fm; CLSID clsid; @@ -1156,7 +1157,8 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && - IRichEditOle_GetClientSite(editor->reOle, &lpClientSite) == S_OK && + IUnknown_QueryInterface(editor->reOle, &IID_IRichEditOle, (void**)&lpReOle) == S_OK && + IRichEditOle_GetClientSite(lpReOle, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && @@ -1188,6 +1190,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB if (lpStorage) IStorage_Release(lpStorage); if (lpDataObject) IDataObject_Release(lpDataObject); if (lpOleCache) IOleCache_Release(lpOleCache); + if (lpReOle) IRichEditOle_Release(lpReOle); return hr; } @@ -3215,7 +3218,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) ITextHost_Release(editor->texthost); if (editor->reOle) { - IRichEditOle_Release(editor->reOle); + IUnknown_Release(editor->reOle); editor->reOle = NULL; } OleUninitialize(); @@ -4820,9 +4823,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (!editor->reOle) if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle)) return 0; - *(LPVOID *)lParam = editor->reOle; - IRichEditOle_AddRef(editor->reOle); - return 1; + if (IUnknown_QueryInterface(editor->reOle, &IID_IRichEditOle, (LPVOID *)lParam) == S_OK) + return 1; + return 0; } case EM_GETPASSWORDCHAR: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2da7365..2633fa8 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -239,7 +239,6 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPE void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; -void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 96c9a1f..28be524 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -385,7 +385,7 @@ typedef struct tagME_TextEditor { HWND hWnd, hwndParent; ITextHost *texthost; - IRichEditOle *reOle; + IUnknown *reOle; BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dc1a3b8..447e7d4 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5471,7 +5471,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->outer_unk = outer_unk; else reo->outer_unk = &reo->IUnknown_inner; - *ppvObj = &reo->IRichEditOle_iface; + *ppvObj = &reo->IUnknown_inner; return 1; } @@ -5691,9 +5691,3 @@ void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) IOleClientSite_AddRef(dst->polesite); } } - -void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) -{ - IRichEditOleImpl *This = impl_from_IRichEditOle(iface); - *ppvObj = &This->ITextDocument2Old_iface; -} diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 18c2ca9..639a94f 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -83,10 +83,7 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r if (!This->editor->reOle) if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) return E_OUTOFMEMORY; - if (IsEqualIID(riid, &IID_ITextDocument) || IsEqualIID(riid, &IID_ITextDocument2Old)) - ME_GetITextDocument2OldInterface(This->editor->reOle, ppv); - else - *ppv = This->editor->reOle; + return IUnknown_QueryInterface(This->editor->reOle, riid, ppv); } else { *ppv = NULL; FIXME("Unknown interface: %s\n", debugstr_guid(riid));

1 0