January 2023 - Wine-commits

Alexandre Julliard : Release 8.0-rc3.
by Alexandre Julliard 07 Jan '23

07 Jan '23

Module: wine Branch: master Commit: 9e33e4f4a26091fc02106a1cd874f77098b99883 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e33e4f4a26091fc02106a1cd874f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 7 11:36:52 2023 +0100 Release 8.0-rc3. --- ANNOUNCE | 339 ++++++++++++++++++++------------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 118 insertions(+), 242 deletions(-)

1 0

Tag wine-8.0-rc3 : Alexandre Julliard : Release 8.0-rc3
by Alexandre Julliard 07 Jan '23

07 Jan '23

Module: wine Branch: refs/tags/wine-8.0-rc3 Tag: ddbeca2190df9e68aca4f846adc50eb4773b0f07 URL: https://gitlab.winehq.org/wine/wine/-/tags/ddbeca2190df9e68aca4f846adc50eb4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 7 11:40:28 2023 +0100 Release 8.0-rc3

1 0

Philip K. Gisslow : msi: Initialize all members of WINTRUST_DATA.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: 904bedb3e96bc68101652e151db102532399abe8 URL: https://gitlab.winehq.org/wine/wine/-/commit/904bedb3e96bc68101652e151db102… Author: Philip K. Gisslow <ripxorip(a)gmail.com> Date: Thu Jan 5 08:08:05 2023 +0100 msi: Initialize all members of WINTRUST_DATA. The pSignatureSettings field was not unitilized so it got a random value from the stack causing a later crash when it was dereferenced in Wintrust (SoftPubloadSignature). --- dlls/msi/msi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index db04babb899..3ebfd94a9f0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2544,18 +2544,15 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( const WCHAR *path, DWORD flags, info.hFile = NULL; info.pgKnownSubject = NULL; + memset( &data, 0, sizeof(data) ); data.cbStruct = sizeof(data); - data.pPolicyCallbackData = NULL; - data.pSIPClientData = NULL; data.dwUIChoice = WTD_UI_NONE; data.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; data.dwUnionChoice = WTD_CHOICE_FILE; data.u.pFile = &info; data.dwStateAction = WTD_STATEACTION_VERIFY; - data.hWVTStateData = NULL; - data.pwszURLReference = NULL; - data.dwProvFlags = 0; data.dwUIContext = WTD_UICONTEXT_INSTALL; + hr = WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data ); *cert = NULL; if (FAILED(hr)) goto done;

1 0

Piotr Caban : msvcirt: Don't fail in streambuf_xsputn on 0xff character.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: dbe6244f103aaef9f0c32b8008a2e1748b686e73 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbe6244f103aaef9f0c32b8008a2e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 5 19:21:35 2023 +0100 msvcirt: Don't fail in streambuf_xsputn on 0xff character. --- dlls/msvcirt/msvcirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 35f532425d3..9ad0f45cbed 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -820,7 +820,7 @@ int __thiscall streambuf_xsputn(streambuf *this, const char *data, int length) while (copied < length) { if (this->unbuffered || this->pptr == this->epptr) { - if (call_streambuf_overflow(this, data[copied]) == EOF) + if (call_streambuf_overflow(this, (unsigned char)data[copied]) == EOF) break; copied++; } else {

1 0

Piotr Caban : msvcirt: Fix ostream_print_char on 0 character.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: 8028ef5be8afb786e9905d3b0668770aa29b18b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/8028ef5be8afb786e9905d3b066877… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 5 19:22:17 2023 +0100 msvcirt: Fix ostream_print_char on 0 character. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54180 --- dlls/msvcirt/msvcirt.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9ad0f45cbed..8d83fca7c94 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2670,15 +2670,12 @@ ostream* __thiscall ostream_write(ostream *this, const char *str, int count) return this; } -/* ?writepad(a)ostream@@AAEAAV1(a)PBD0@Z */ -/* ?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z */ -DEFINE_THISCALL_WRAPPER(ostream_writepad, 12) -ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char *str2) +static ostream* ostream_writepad_len(ostream *this, const char *str1, const char *str2, int len2) { ios *base = ostream_get_ios(this); - int len1 = strlen(str1), len2 = strlen(str2), i; + int len1 = strlen(str1), i; - TRACE("(%p %p %p)\n", this, str1, str2); + TRACE("(%p %p %p %d)\n", this, str1, str2, len2); /* left of the padding */ if (base->flags & (FLAGS_left|FLAGS_internal)) { @@ -2703,6 +2700,14 @@ ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char return this; } +/* ?writepad(a)ostream@@AAEAAV1(a)PBD0@Z */ +/* ?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z */ +DEFINE_THISCALL_WRAPPER(ostream_writepad, 12) +ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char *str2) +{ + return ostream_writepad_len(this, str1, str2, strlen(str2)); +} + static ostream* ostream_internal_print_integer(ostream *ostr, int n, BOOL unsig, BOOL shrt) { ios *base = ostream_get_ios(ostr); @@ -2792,12 +2797,10 @@ static ostream* ostream_internal_print_float(ostream *ostr, double d, BOOL dbl) DEFINE_THISCALL_WRAPPER(ostream_print_char, 8) ostream* __thiscall ostream_print_char(ostream *this, char c) { - const char c_str[2] = {c, 0}; - - TRACE("(%p %c)\n", this, c); + TRACE("(%p %d)\n", this, c); if (ostream_opfx(this)) { - ostream_writepad(this, "", c_str); + ostream_writepad_len(this, "", &c, 1); ostream_osfx(this); } return this;

1 0

Zhiyi Zhang : d2d1/tests: Fix memory leaks.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: 066221a9f955f6353e7019e47cc51d45060134ad URL: https://gitlab.winehq.org/wine/wine/-/commit/066221a9f955f6353e7019e47cc51d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 3 22:56:51 2023 +0800 d2d1/tests: Fix memory leaks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53995 --- dlls/d2d1/tests/d2d1.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bfa28ead732..93a8c6b43b8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6154,6 +6154,7 @@ static void test_hwnd_target(BOOL d3d11) D2D1_SIZE_U size; unsigned int i; HRESULT hr; + ULONG ref; static const struct format_test { @@ -6235,6 +6236,8 @@ static void test_hwnd_target(BOOL d3d11) { todo_wine ok(FAILED(hr), "Got unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ID2D1HwndRenderTarget_Release(rt); winetest_pop_context(); continue; } @@ -6251,7 +6254,8 @@ static void test_hwnd_target(BOOL d3d11) } DestroyWindow(hwnd_rt_desc.hwnd); - ID2D1Factory_Release(factory); + ref = ID2D1Factory_Release(factory); + ok(!ref, "Factory has %lu references left.\n", ref); } #define test_compatible_target_size(r) test_compatible_target_size_(__LINE__, r)

1 0

Vladislav Timonin : comctl32/listview: Exclude header area in WM_NCPAINT.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: b3ab1f8fb303a157bcc1d315632ee7ea61746b1c URL: https://gitlab.winehq.org/wine/wine/-/commit/b3ab1f8fb303a157bcc1d315632ee7… Author: Vladislav Timonin <timoninvlad(a)yandex.ru> Date: Thu Dec 22 02:41:17 2022 +0700 comctl32/listview: Exclude header area in WM_NCPAINT. An improvement of 5f0dcf79185941c4faff35d1cc9c758160f3a27d, which, depending on theme, had an issue with drawing the top border clipped inside the header. --- dlls/comctl32/listview.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7c394d60273..07bea8574b6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10712,15 +10712,15 @@ static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) if (region != (HRGN)1) CombineRgn (cliprgn, cliprgn, region, RGN_AND); - OffsetRect(&r, -r.left, -r.top); + dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW | DCX_INTERSECTRGN); if (infoPtr->hwndHeader && LISTVIEW_IsHeaderEnabled(infoPtr)) { GetWindowRect(infoPtr->hwndHeader, &window_rect); - r.top = min(r.bottom, r.top + window_rect.bottom - window_rect.top); + OffsetRect(&window_rect, -r.left, -r.top); + ExcludeClipRect(dc, window_rect.left, window_rect.top, window_rect.right, window_rect.bottom); } - dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN); - + OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(infoPtr->hwndSelf, dc, &r); DrawThemeBackground (theme, dc, 0, 0, &r, 0);

1 0

Alistair Leslie-Hughes : xactengine3_7/tests: Skip tests when XACTEngine Initialization fails.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: 7ac173fb439299c5f554c5cb2f58e8ecc9f28d05 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ac173fb439299c5f554c5cb2f58e8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 5 17:42:22 2023 +1100 xactengine3_7/tests: Skip tests when XACTEngine Initialization fails. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54151 --- dlls/xactengine3_7/tests/xact3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 2a97f5f7c5c..48a5f0a4374 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -206,7 +206,13 @@ static void test_notifications(void) params.fnNotificationCallback = notification_cb; hr = IXACT3Engine_Initialize(engine, &params); - ok(hr == S_OK, "Cannot initialize engine, hr %#lx\n", hr); + ok(hr == S_OK || broken(hr == XAUDIO2_E_INVALID_CALL), "Cannot initialize engine, hr %#lx\n", hr); + if(FAILED(hr)) + { + win_skip("Unable to Initialize XACT. No speakers attached?\n"); + IXACT3Engine_Release(engine); + return; + } notification_desc.type = 0; notification_desc.flags = 0;

1 0

Alistair Leslie-Hughes : include: Add missing enum XHR_PROP_ values.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: 51a27f3124bd1916b8fce0b76d3b0cca22638124 URL: https://gitlab.winehq.org/wine/wine/-/commit/51a27f3124bd1916b8fce0b76d3b0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 5 17:41:38 2023 +1100 include: Add missing enum XHR_PROP_ values. --- include/msxml6.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 4948de39f1f..458c43e389d 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -267,6 +267,9 @@ typedef [v1_enum] enum _XHR_PROPERTY XHR_PROP_EXTENDED_ERROR, XHR_PROP_QUERY_STRING_UTF8, XHR_PROP_IGNORE_CERT_ERRORS, + XHR_PROP_ONDATA_THRESHOLD, + XHR_PROP_SET_ENTERPRISEID, + XHR_PROP_MAX_CONNECTIONS } XHR_PROPERTY; typedef struct tagXHR_COOKIE

1 0

Nikolay Sivov : comctl32/tests: Ignore some IME messages in monthcal tests.
by Alexandre Julliard 06 Jan '23

06 Jan '23

Module: wine Branch: master Commit: 136a576d8c4445e2a2f3206af84f0648cc87bb0c URL: https://gitlab.winehq.org/wine/wine/-/commit/136a576d8c4445e2a2f3206af84f06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 5 09:15:41 2023 +0300 comctl32/tests: Ignore some IME messages in monthcal tests. --- dlls/comctl32/tests/monthcal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 8b01173e86e..58060e66e35 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -71,8 +71,6 @@ static const struct message create_parent_window_seq[] = { { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, /* Win9x adds SWP_NOZORDER below */ { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, @@ -517,7 +515,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && - message != WM_DEVICECHANGE) + message != WM_DEVICECHANGE && + message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY) { msg.message = message; msg.flags = sent|wparam|lparam;

1 0