- Wine-Commits - list.winehq.org

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

Jactry Zeng : wordpad: Resize buttons of toolbar to make them align with height of the font list combox.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: fcfbafe41950858741266b2f5dadcc144133510f URL: https://gitlab.winehq.org/wine/wine/-/commit/fcfbafe41950858741266b2f5dadcc… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri May 12 03:35:11 2023 -0500 wordpad: Resize buttons of toolbar to make them align with height of the font list combox. The current size set to these buttons is too small when in HiDPI. (cherry picked from commit 996271fc2ff63ea4df21b65ced1dce6de7075311) --- programs/wordpad/wordpad.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 4a3aa2375bf..2a0d380a101 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1937,6 +1937,8 @@ static LRESULT OnCreate( HWND hWnd ) GetWindowRect(hFontListWnd, &rect); height = max(height, rect.bottom - rect.top); + SendMessageW(hToolBarWnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); + rbb.cbSize = REBARBANDINFOW_V6_SIZE; rbb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_STYLE | RBBIM_ID; rbb.fStyle = RBBS_CHILDEDGE | RBBS_BREAK | RBBS_NOGRIPPER; @@ -1977,6 +1979,7 @@ static LRESULT OnCreate( HWND hWnd ) IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); SendMessageW(hFormatBarWnd, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS); + SendMessageW(hFormatBarWnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC);

1 0

Michael Stefaniuc : threadpoolwinrt: Forward a Release() to a Release() method.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 30bad5e164511a74785ab3361bc49ce931f5bb13 URL: https://gitlab.winehq.org/wine/wine/-/commit/30bad5e164511a74785ab3361bc49c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 18:59:16 2023 +0200 threadpoolwinrt: Forward a Release() to a Release() method. (cherry picked from commit 572a9f6a68c3ab4ac2dad54f279d8d239492b685) --- dlls/threadpoolwinrt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/threadpoolwinrt/main.c b/dlls/threadpoolwinrt/main.c index 9fa475487ca..fb59a777e30 100644 --- a/dlls/threadpoolwinrt/main.c +++ b/dlls/threadpoolwinrt/main.c @@ -202,7 +202,7 @@ static ULONG STDMETHODCALLTYPE async_info_AddRef(IAsyncInfo *iface) static ULONG STDMETHODCALLTYPE async_info_Release(IAsyncInfo *iface) { struct async_action *action = impl_from_IAsyncInfo(iface); - return IAsyncAction_AddRef(&action->IAsyncAction_iface); + return IAsyncAction_Release(&action->IAsyncAction_iface); } static HRESULT STDMETHODCALLTYPE async_info_GetIids(IAsyncInfo *iface, ULONG *iid_count, IID **iids)

1 0

Brendan Shanks : winemac: Initialize retina_on to avoid incorrect cached display data in high-res/retina mode.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 8b798ab30ecf29379105d5e386893f537de127d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b798ab30ecf29379105d5e386893f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 9 15:22:44 2023 -0700 winemac: Initialize retina_on to avoid incorrect cached display data in high-res/retina mode. retina_on was being set (indirectly) by check_retina_status(), but it relies on retina_on itself. This resulted in incorrect (non-retina) monitor and work RECTs being cached, causing odd application bugs like a window that won't resize larger than 1/4 of the screen. Initialize retina_on to the value of retina_enabled, so later calls to check_retina_status() don't result in incorrect data being cached. (cherry picked from commit d2789ef0678619d7c56a9e0c1aaa06f582a41ee3) --- dlls/winemac.drv/macdrv_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index eeed9a4bcbe..db4426db782 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -383,6 +383,8 @@ static void setup_options(void) if (!get_config_key(hkey, NULL, "RetinaMode", buffer, sizeof(buffer))) retina_enabled = IS_OPTION_TRUE(buffer[0]); + retina_on = retina_enabled; + if (appkey) NtClose(appkey); if (hkey) NtClose(hkey); }

1 0