- Wine-Commits - list.winehq.org

Alexandre Julliard : Update copyright info for 2023.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: 1c83f47893af5344a817a536b36c04ff5b4418ac URL: https://gitlab.winehq.org/wine/wine/-/commit/1c83f47893af5344a817a536b36c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 8 12:12:25 2023 +0100 Update copyright info for 2023. --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index e8275c2cfc9..f8aa2b9658d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2023 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index b8e01166a44..63d526ffe00 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2023 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index a70dee3b678..95ab04666e8 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -80,7 +80,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2023 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Jeremy White : gitlab: Add tools for using gitlab-runner with libvirt.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: tools Branch: master Commit: aec25a1a92850342768bbb37e514f47e003bd94e URL: https://gitlab.winehq.org/winehq/tools/-/commit/aec25a1a92850342768bbb37e51… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jan 9 17:00:56 2023 +0100 gitlab: Add tools for using gitlab-runner with libvirt. --- gitlab/virtrunner/README | 57 ++++++++++ gitlab/virtrunner/cleanup.sh | 7 ++ gitlab/virtrunner/config | 20 ++++ gitlab/virtrunner/config.toml.example | 29 ++++++ gitlab/virtrunner/prepare.sh | 27 +++++ gitlab/virtrunner/qemu-agent.py | 190 ++++++++++++++++++++++++++++++++++ gitlab/virtrunner/run.sh | 15 +++ 7 files changed, 345 insertions(+)

1 0

Alexandre Julliard : Wine release 8.0-rc3
by Alexandre Julliard Jan. 7, 2023

Jan. 7, 2023

Module: website Branch: master Commit: 55e491b7797eaa16d7534162af780a1b973d83a3 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/55e491b7797eaa16d7534162af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 7 11:42:46 2023 +0100 Wine release 8.0-rc3 --- news/en/2023010701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2023010701.xml b/news/en/2023010701.xml new file mode 100644 index 00000000..06efd494 --- /dev/null +++ b/news/en/2023010701.xml @@ -0,0 +1,13 @@ +<news> +<date>January 7, 2023</date> +<title>Wine 8.0-rc3 Released</title> +<body> + The Wine development release 8.0-rc3 is now available. + <a href="{$root}/announce/8.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0-rc3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.0-rc3 : Alexandre Julliard : Release 8.0-rc3
by Alexandre Julliard Jan. 7, 2023

Jan. 7, 2023

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

Alexandre Julliard : Release 8.0-rc3.
by Alexandre Julliard Jan. 7, 2023

Jan. 7, 2023

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

Piotr Caban : msvcirt: Fix ostream_print_char on 0 character.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

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

Philip K. Gisslow : msi: Initialize all members of WINTRUST_DATA.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

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 Jan. 6, 2023

Jan. 6, 2023

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

Alistair Leslie-Hughes : include: Add missing enum XHR_PROP_ values.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

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

Zhiyi Zhang : d2d1/tests: Fix memory leaks.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

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