March 2021 - Wine-commits - list.winehq.org

Sven Baars : shell32: Fix a leak on error path (Coverity).
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 01f7e4bafc8091f783e23421235e432064d78352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01f7e4bafc8091f783e23421… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 18:10:23 2020 +0200 shell32: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2dac80524440bbae0ee0ef67c470bc0073b8bfaf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index a37b1bf5881..48d5fe4ecb6 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1251,7 +1251,10 @@ static HRESULT WINAPI ShellFolder2_GetDisplayNameOf(IShellFolder2* iface, LPWSTR pwszDosFileName = wine_get_dos_file_name(This->m_pszPath); if (!pwszDosFileName) return HRESULT_FROM_WIN32(GetLastError()); lpName->u.pOleStr = SHAlloc((lstrlenW(pwszDosFileName) + 1) * sizeof(WCHAR)); - if (!lpName->u.pOleStr) return HRESULT_FROM_WIN32(GetLastError()); + if (!lpName->u.pOleStr) { + heap_free(pwszDosFileName); + return HRESULT_FROM_WIN32(GetLastError()); + } lstrcpyW(lpName->u.pOleStr, pwszDosFileName); PathRemoveBackslashW(lpName->u.pOleStr); heap_free(pwszDosFileName);

1 0

Haidong Yu : inetcpl.cpl: Fix memory leak in security_on_initdialog.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 160047def273649036595d668eecf09fb1b9b4d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=160047def273649036595d66… Author: Haidong Yu <yhd986(a)163.com> Date: Sun Dec 13 08:38:34 2020 +0800 inetcpl.cpl: Fix memory leak in security_on_initdialog. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa0296e378aa49e69daa2d2c97d47663eca4d658) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index e11caf1fc3e..4c60c42ca0e 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -323,6 +323,7 @@ static INT_PTR security_on_initdialog(HWND hsec) TRACE("using imagelist: %p\n", sd->himages); if (!sd->himages) { ERR("ImageList_Create failed!\n"); + security_on_destroy(sd); return FALSE; } SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)sd->himages);

1 0

Haidong Yu : ieframe: Fix memory leak in PersistFile_Save.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: c6553e54dbaee103c105785e0b54b317130b0efe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6553e54dbaee103c105785e… Author: Haidong Yu <yhd986(a)163.com> Date: Fri Dec 18 16:39:49 2020 +0800 ieframe: Fix memory leak in PersistFile_Save. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e8741f08178070ff025e6e5280b552ad64af9249) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/intshcut.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 13a5582dbc7..6c64eb5b3b2 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -614,6 +614,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam WriteFile(file, str_ICONFILE, lstrlenA(str_ICONFILE), &bytesWritten, NULL); WriteFile(file, iconfile, lstrlenA(iconfile), &bytesWritten, NULL); WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + heap_free(iconfile); } sprintf(indexString, "ICONINDEX=%d", pvread[1].u.iVal);

1 0

Michael Stefaniuc : Release 5.0.4.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: aa3c86d6b61ea4fa26986548f2a2b207ba8cc2f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa3c86d6b61ea4fa26986548… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 4 22:38:41 2021 +0100 Release 5.0.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 434 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 8 ++ VERSION | 2 +- configure | 18 +-- 4 files changed, 266 insertions(+), 196 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa3c86d6b61ea4fa2698…

1 0

Tag wine-5.0.4 : Alexandre Julliard : Release 5.0.4
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: refs/tags/wine-5.0.4 Tag: 227ed9aa0cc30d7e99633e3f4fe18d2c29ca09a1 URL: https://source.winehq.org/git/wine.git/?a=tag;h=227ed9aa0cc30d7e99633e3f4fe… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 23 21:06:05 2021 +0100 Release 5.0.4

1 0

Dmitry Timoshkov : usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 70bbc9566431ad520fa48de4ce7e1fc8688f0095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70bbc9566431ad520fa48de4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 21 18:57:00 2020 +0800 usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts. Use same check as ScriptShapeOpenType() does, fixes painting of non-latin characters in Wordpad using MS Sans Serif font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 24e09ac5823083bfd2e283e8b19e96a60d745e6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f0978680a91..9f3847b657c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3606,10 +3606,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - fuOptions &= ETO_CLIPPED + ETO_OPAQUE; + fuOptions &= ETO_CLIPPED | ETO_OPAQUE; fuOptions |= ETO_IGNORELANGUAGE; - if (!psa->fNoGlyphIndex) /* Have Glyphs? */ - fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ + if (!psa->fNoGlyphIndex && *psc && ((ScriptCache *)*psc)->sfnt) + fuOptions |= ETO_GLYPH_INDEX; /* We do actually have glyph indices */ if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx)))) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: d822a9c15d23982d54345dbc1330d31d87496234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d822a9c15d23982d54345dbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 00:07:05 2020 +0300 ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c455053486e717b6518ec292444f0284ae442a2b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/stg_prop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8421353155b..fb3a5525918 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1884,6 +1884,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, HRESULT hr; LARGE_INTEGER seek; PROPERTYIDOFFSET propIdOffset; + ULARGE_INTEGER ularge; ULONG count; DWORD dwType, bytesWritten; @@ -1945,6 +1946,13 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count; break; } + case VT_I8: + case VT_UI8: + { + StorageUtl_WriteULargeInteger(&ularge, 0, &var->u.uhVal); + hr = IStream_Write(This->stm, &ularge, sizeof(ularge), &bytesWritten); + break; + } case VT_LPSTR: { DWORD len, dwTemp;

1 0

Akihiro Sagawa : d3dx9: Avoid closing invalid handles.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 81e772332bd3fbe9f7454a41db6a27b919d99cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e772332bd3fbe9f7454a41… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 21 22:44:00 2020 +0900 d3dx9: Avoid closing invalid handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e27a95e92097a601baa9b0e9dd6fcc5013c863fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 5be9083360a..39afe6740c0 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -134,8 +134,10 @@ HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) return S_OK; error: - CloseHandle(hmapping); - CloseHandle(hfile); + if (hmapping) + CloseHandle(hmapping); + if (hfile != INVALID_HANDLE_VALUE) + CloseHandle(hfile); return HRESULT_FROM_WIN32(GetLastError()); }

1 0

Giovanni Mascellani : d2d1: Implement ellipse drawing.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: ea029623b62faac321d03d96fcd5bd3f5871649b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea029623b62faac321d03d96… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Jan 28 16:35:45 2020 +0330 d2d1: Implement ellipse drawing. Currently the ellipse is approximated with quadratic Bézier curves. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aec8701399ff0e9a0f368e0392b0aedd2841ca94) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 14 +++ dlls/d2d1/factory.c | 20 +++- dlls/d2d1/geometry.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 306 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea029623b62faac321d0…

1 0

Zebediah Figura : user32/tests: Add some tests for release of capture via modal dialogs.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 3af67c2c6381afcfa9fa2598181ea8f360853f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af67c2c6381afcfa9fa2598… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:47 2021 -0600 user32/tests: Add some tests for release of capture via modal dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c75e06528830fb882f2664d42c1d1802707bc766) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/dialog.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 2a7d71f67a2..c7f80c7b734 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2176,6 +2176,89 @@ static void test_dialog_custom_data(void) DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); } +static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_USER, 0, (LPARAM)child); + } + else if (message == WM_USER) + { + HWND child = (HWND)lparam; + DWORD style; + + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + EndDialog(dialog, 1); + } + return FALSE; +} + +static INT_PTR CALLBACK capture_release_modeless_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_QUIT, 0, 0); + } + return FALSE; +} + +static void test_capture_release(void) +{ + HWND window, child, dialog; + INT_PTR ret; + MSG msg; + + /* Set the capture to a child window. The main window will receive + * WM_CANCELMODE when being disabled, but the child window will retain + * capture. */ + + window = CreateWindowA("static", "parent", 0, 100, 200, 300, 400, NULL, NULL, NULL, NULL); + child = CreateWindowA("static", "child", WS_CHILD, 10, 20, 100, 100, window, NULL, NULL, NULL); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", + window, capture_release_modeless_proc, (LPARAM)child); + ok(!!dialog, "failed to create dialog\n"); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + ShowWindow(dialog, SW_SHOWNORMAL); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + while (GetMessageA(&msg, NULL, 0, 0)) + DispatchMessageA(&msg); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + DestroyWindow(dialog); + + DestroyWindow(child); + DestroyWindow(window); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -2195,4 +2278,5 @@ START_TEST(dialog) test_SaveRestoreFocus(); test_timer_message(); test_MessageBox(); + test_capture_release(); }

1 0