July 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 8.0.2
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: website Branch: master Commit: 103e68c2061c43d36bd7dbbd9d0c7bda62ddab3d URL: https://gitlab.winehq.org/winehq/winehq/-/commit/103e68c2061c43d36bd7dbbd9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 17:33:49 2023 +0200 Wine release 8.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023071901.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2023071901.xml b/news/en/2023071901.xml new file mode 100644 index 00000000..54cd020a --- /dev/null +++ b/news/en/2023071901.xml @@ -0,0 +1,13 @@ +<news> +<date>July 19, 2023</date> +<title>Wine 8.0.2 Released</title> +<body> + The Wine stable release 8.0.2 is now available. + <a href="{$root}/announce/8.0.2">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0.2.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.2 : Alexandre Julliard : Release 8.0.2
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: refs/tags/wine-8.0.2 Tag: ff237b232945095a9ffe93c4619966da10cd7b6a URL: https://gitlab.winehq.org/wine/wine/-/tags/ff237b232945095a9ffe93c4619966da… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 17:31:45 2023 +0200 Release 8.0.2

1 0

Michael Stefaniuc : Release 8.0.2.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 0e34edfd8098552a3453f1de1987b81f95d2d9e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e34edfd8098552a3453f1de1987b8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 26 22:16:20 2023 +0200 Release 8.0.2. --- ANNOUNCE | 314 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 159 insertions(+), 176 deletions(-)

1 0

Hans Leidekker : winhttp/tests: Fix a test failure.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: b465683ed23f61516a0e06f8976347fe5b108f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/b465683ed23f61516a0e06f8976347… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 22 08:42:43 2023 +0200 winhttp/tests: Fix a test failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54960 (cherry picked from commit e2458a88c8482669e66f192dfac9af11aa5e483e) --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 76f12837e86..ce2ce795209 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3608,7 +3608,7 @@ static void test_websocket(int port) error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); ok(!error, "got %lu\n", error); ok(buf[0] == 'R', "got %c\n", buf[0]); - ok(count == 26, "got %lu\n", count); + ok(count, "got zero count\n"); ok(type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, "got %u\n", type); error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 1);

1 0

Eric Pouech : winedump: Fix out of bounds access (spotted by GCC13).
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 697aacdd7f2d6947af1ddfe11d66b766f2e21de8 URL: https://gitlab.winehq.org/wine/wine/-/commit/697aacdd7f2d6947af1ddfe11d66b7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 4 19:02:43 2023 +0200 winedump: Fix out of bounds access (spotted by GCC13). Anyway, it's a pain that we have to maintain two MS symbols demanglers (this one and the one in dlls/msvcrt). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> (cherry picked from commit 020b6e094f04b27e4127e7cf647bac0987aaa418) --- tools/winedump/msmangle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index f9440c04a45..4408e418191 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -573,10 +573,10 @@ static char *demangle_datatype (char **str, compound_type *ct, case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ - if (sym->argc >= (size_t)('0' - *iter)) + if (sym->argc >= (size_t)(*iter - '0')) return NULL; - ct->dest_type = sym->arg_type ['0' - *iter]; - ct->expression = xstrdup (sym->arg_text ['0' - *iter]); + ct->dest_type = sym->arg_type [*iter - '0']; + ct->expression = xstrdup (sym->arg_text [*iter - '0']); iter++; break; default :

1 0

Alexandre Julliard : wininet/tests: Update expected WineHQ certificate.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: bdf1dcdd6a867a134fde77d093929316c2d4ad2d URL: https://gitlab.winehq.org/wine/wine/-/commit/bdf1dcdd6a867a134fde77d0939293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 16:12:02 2023 +0200 wininet/tests: Update expected WineHQ certificate. (cherry picked from commit 1dd6ea7049f857f0d4e7a78ec8314c3bac71625b) --- dlls/wininet/tests/http.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index efa3e5928b6..c1fe335b29d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6320,9 +6320,7 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" "Minnesota\r\n" - "Saint Paul\r\n" - "\"CodeWeavers, Inc.\"\r\n" - "IT\r\n" + "CodeWeavers\r\n" "*.winehq.org", "US\r\n"

1 0

Piotr Caban : localspl: Don't pass original document name to cupsStartDocument.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: c26663944496739d967c6d0b66b3a0d5416ac78d URL: https://gitlab.winehq.org/wine/wine/-/commit/c26663944496739d967c6d0b66b3a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 7 20:22:21 2023 +0200 localspl: Don't pass original document name to cupsStartDocument. It's used by the function to find document content type. Fixes regression introduced by e164b8cefb9dfbf0af5b83e176a386eb2c490d6b. (cherry picked from commit 8171cfb79b4dbd57184ade9b7a66aed47aba8427) --- dlls/localspl/cups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index cd2fc0301ba..20d5b1b6c24 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -362,7 +362,7 @@ static BOOL cups_write_doc(doc_t *doc, const BYTE *buf, unsigned int size) } if (pcupsStartDocument(CUPS_HTTP_DEFAULT, doc->cups.queue, job_id, - doc->cups.doc_title, format, TRUE) != HTTP_STATUS_CONTINUE) + NULL, format, TRUE) != HTTP_STATUS_CONTINUE) { if (pcupsLastErrorString) WARN("cupsStartDocument failed: %s\n", debugstr_a(pcupsLastErrorString()));

1 0

Sven Baars : wine.inf: Put the Clients key in the right place.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: afc97863ea1badd1bf2ea0c28f3238ea54c29c55 URL: https://gitlab.winehq.org/wine/wine/-/commit/afc97863ea1badd1bf2ea0c28f3238… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Oct 17 16:20:29 2022 +0200 wine.inf: Put the Clients key in the right place. (cherry picked from commit cabd68728d33817c966bdbf6acfed3b6daff2140) --- loader/wine.inf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 20dc77e56a8..ccfb22e8a2a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -521,11 +521,11 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo" [Misc] HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 +HKLM,Software\Clients,,16 HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,"DLLPath",2,"%11%\winemapi.dll" HKLM,Software\Microsoft\Advanced INF Setup,,16 -HKLM,Software\Microsoft\Clients,,16 HKLM,Software\Microsoft\Cryptography\Calais\Current,,16 HKLM,Software\Microsoft\Cryptography\Calais\Readers,,16 HKLM,Software\Microsoft\Cryptography\Services,,16 @@ -2504,7 +2504,7 @@ HKLM,Software\Classes\Wow6432Node\Interface,,16 HKLM,Software\Classes\Wow6432Node\Media Type,,16 HKLM,Software\Classes\Wow6432Node\MediaFoundation,,16 ; symlinks for shared keys under HKLM\Software -HKLM,Software\Wow6432Node\Microsoft\Clients,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Clients" +HKLM,Software\Wow6432Node\Clients,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Clients" HKLM,Software\Wow6432Node\Microsoft\Cryptography\Calais\Current,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Cryptography\Calais\Current" HKLM,Software\Wow6432Node\Microsoft\Cryptography\Calais\Readers,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Cryptography\Calais\Readers" HKLM,Software\Wow6432Node\Microsoft\Cryptography\Services,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Cryptography\Services"

1 0

Alex Henrie : winemenubuilder: Skip desktop integration for certain associations.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: cfe550ea2eb34d0027af25efea1617d4bd7583e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfe550ea2eb34d0027af25efea1617… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 5 19:26:38 2023 -0600 winemenubuilder: Skip desktop integration for certain associations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 (cherry picked from commit 9d80b367ce0746b98a221f3b72e03da758af7c20) --- programs/winemenubuilder/winemenubuilder.c | 54 +++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 1579ca8dafa..ae657d87bb1 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1974,6 +1974,46 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } +static BOOL on_exclude_list(const WCHAR *command) +{ + static const WCHAR default_exclude_list[] = L"ieframe.dll\0iexplore.exe\0notepad.exe\0" + L"winebrowser.exe\0wordpad.exe\0"; + WCHAR *exclude_list = NULL; + const WCHAR *pattern; + HKEY key; + DWORD size; + LSTATUS status; + BOOL found = FALSE; + + if ((key = open_associations_reg_key())) + { + status = RegGetValueW(key, NULL, L"Exclude", RRF_RT_REG_MULTI_SZ, NULL, NULL, &size); + if (status == ERROR_SUCCESS) + { + exclude_list = xmalloc(size); + status = RegGetValueW(key, NULL, L"Exclude", RRF_RT_REG_MULTI_SZ, NULL, exclude_list, &size); + if (status != ERROR_SUCCESS) + { + heap_free(exclude_list); + exclude_list = NULL; + } + } + RegCloseKey(key); + } + + for (pattern = exclude_list ? exclude_list : default_exclude_list; *pattern; pattern += wcslen(pattern) + 1) + { + if (wcsstr(command, pattern)) + { + found = TRUE; + break; + } + } + + heap_free(exclude_list); + return found; +} + static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) @@ -2054,6 +2094,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (on_exclude_list(commandW)) + /* command is on the exclude list => desktop integration is not desirable */ + goto end; + wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); @@ -2093,11 +2142,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, L"open"); if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL);

1 0

Tim Clem : winemac.drv: Force a window in front of its peers if its level is decreased.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 986c200a0b751f682f4161a6b11aeccca7a7d448 URL: https://gitlab.winehq.org/wine/wine/-/commit/986c200a0b751f682f4161a6b11aec… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri May 5 10:02:07 2023 -0700 winemac.drv: Force a window in front of its peers if its level is decreased. Working around a macOS bug: -setLevel: is documented to move a window in front of its new peers, but that doesn't happen on Ventura. (cherry picked from commit 222d20a585c454cb591e3dc539f3bd52427ea30c) --- dlls/winemac.drv/cocoa_app.m | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index d9d56da20f8..6a16d1ba832 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -633,18 +633,24 @@ static NSString* WineLocalizedString(unsigned int stringID) { [window setLevel:newLevel]; - // -setLevel: puts the window at the front of its new level. If - // we decreased the level, that's good (it was in front of that - // level before, so it should still be now). But if we increased - // the level, the window should be toward the back (but still - // ahead of the previous windows we did this to). if (origLevel < newLevel) { + // If we increased the level, the window should be toward the + // back of its new level (but still ahead of the previous + // windows we did this to). if (prev) [window orderWindow:NSWindowAbove relativeTo:[prev windowNumber]]; else [window orderBack:nil]; } + else + { + // If we decreased the level, we want the window at the top + // of its new level. -setLevel: is documented to do that on + // its own, but that's buggy on Ventura. Since we're looping + // back-to-front here, -orderFront: will do the right thing. + [window orderFront:nil]; + } } prev = window;

1 0