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

Gabriel Ivăncescu : jscript: Fix jsstr leak after changing variant type to BSTR.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b4948244177930e2af6737ebdd702bf7b328957e URL: https://gitlab.winehq.org/wine/wine/-/commit/b4948244177930e2af6737ebdd702b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 13 22:31:54 2023 +0200 jscript: Fix jsstr leak after changing variant type to BSTR. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 5ddeae6ac1ed0713166d6ea01b37fb0bac4f2c03) --- dlls/jscript/jsutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3dfcd08f14c..ffe6116e929 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -947,6 +947,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY break; hres = jsstr_to_bstr(str, &V_BSTR(dst)); + jsstr_release(str); break; } case VT_EMPTY:

1 0

Serkan Önder : po: Update Turkish translation.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 90c5775819245ca149e2e3b52e68a5f4db3399b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/90c5775819245ca149e2e3b52e68a5… Author: Serkan Önder <serkanonder(a)outlook.com> Date: Sun Feb 26 17:19:29 2023 +0000 po: Update Turkish translation. Conflicts: po/tr.po (cherry picked from commit 56db5b0bf1aa6df5edbedbec03e0a1db39d6639b) --- po/tr.po | 1406 ++++++++++++++++++++++++++++---------------------------------- 1 file changed, 644 insertions(+), 762 deletions(-)

1 0

K.B.Dharun Krishna : po: Update Tamil translation.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: fc2fdfe28af28420807c1b836009d84e450c7dc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc2fdfe28af28420807c1b836009d8… Author: K.B.Dharun Krishna <kbdharunkrishna(a)gmail.com> Date: Mon Jan 30 11:38:22 2023 +0530 po: Update Tamil translation. (cherry picked from commit b46bcd2cb182cbf29cc550d489f7759c1660b3b3) --- po/ta.po | 674 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 361 insertions(+), 313 deletions(-)

1 0

Florian Will : gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: ea4487fe0603a49043970a991f27db6fa2222268 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea4487fe0603a49043970a991f27db… Author: Florian Will <florian.will(a)gmail.com> Date: Tue Feb 28 11:56:56 2023 +0100 gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile(). ZusiDisplay sometimes loads the same font file into two different PrivateFontCollections using two threads, so there is a race condition when the file is opened without the FILE_SHARE_READ sharing mode. The second call to GdipPrivateAddFontFile() might fail if the first one hasn't closed the file handle yet. (cherry picked from commit b3bf30e7e21f25ca539ade9607cdaaed77067d08) --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 03678623606..fc298c102de 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1110,7 +1110,7 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON if (!collection || !name) return InvalidParameter; - file = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) return InvalidParameter; if (!GetFileSizeEx(file, &size) || size.u.HighPart) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7fbe619cd93..a2aea904bb1 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -91,7 +91,7 @@ static void test_long_name(void) ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed: %ld\n", GetLastError()); stat = GdipPrivateAddFontFile(fonts, path); - todo_wine ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); + ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); CloseHandle(file);

1 0

Florian Will : gdiplus/tests: Test for GdipPrivateAddFontFile() sharing violation.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 760b01cbeeae404d03b7c47f3575fb7775a9d7a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/760b01cbeeae404d03b7c47f3575fb… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Mar 1 08:47:34 2023 +0100 gdiplus/tests: Test for GdipPrivateAddFontFile() sharing violation. (cherry picked from commit 0ebf3222e57d2ac7da790a4ddb572fad5751806a) --- dlls/gdiplus/tests/font.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index ccdb7a2ef96..7fbe619cd93 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -76,6 +76,7 @@ static void test_long_name(void) WCHAR path[MAX_PATH]; GpStatus stat; GpFontCollection *fonts; + HANDLE file; INT num_families; GpFontFamily *family, *cloned_family; WCHAR family_name[LF_FACESIZE]; @@ -86,8 +87,19 @@ static void test_long_name(void) create_testfontfile(L"wine_longname.ttf", 1, path); + file = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed: %ld\n", GetLastError()); + stat = GdipPrivateAddFontFile(fonts, path); - ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); + todo_wine ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); + + CloseHandle(file); + + if (stat != Ok) { + /* try again without opened file handle */ + stat = GdipPrivateAddFontFile(fonts, path); + ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); + } stat = GdipGetFontCollectionFamilyCount(fonts, &num_families); ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed: %d\n", stat);

1 0

Dmitry Timoshkov : rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 29ba0953ae07affb5df801d268a6402268aff6cf URL: https://gitlab.winehq.org/wine/wine/-/commit/29ba0953ae07affb5df801d268a640… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 13 20:57:18 2022 -0600 rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer(). (cherry picked from commit 4ec4bdff7365193f71806f7fc0c31c0cbf724a57) --- dlls/rpcrt4/cproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b2c86d54422..b51ba41a45f 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -586,7 +586,7 @@ void WINAPI NdrProxyFreeBuffer(void *This, { IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg); - pStubMsg->fBufferValid = TRUE; + pStubMsg->fBufferValid = FALSE; } IRpcChannelBuffer_Release(pStubMsg->pRpcChannelBuffer); pStubMsg->pRpcChannelBuffer = NULL;

1 0

Zhiyi Zhang : user32/tests: Test winstation and desktop access rights.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 4748dbfbf3c1ed82d971c4ac813bc89683c085a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4748dbfbf3c1ed82d971c4ac813bc8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 15 10:32:55 2023 +0800 user32/tests: Test winstation and desktop access rights. (cherry picked from commit 44b92e577716f5b91fd8b6130a79a81ae13d426f) --- dlls/user32/tests/winstation.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9c27b5afd01..fc775546502 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -121,7 +121,9 @@ static void test_handles(void) char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + OBJECT_BASIC_INFORMATION info; TOKEN_STATISTICS token_stats; + NTSTATUS status; /* win stations */ @@ -133,6 +135,12 @@ static void test_handles(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() ); print_object( w1 ); + status = NtQueryObject( w1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + flags = 0; ok( GetHandleInformation( w1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) || @@ -270,6 +278,12 @@ static void test_handles(void) ok( GetHandleInformation( d1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), "handle %p PROTECT_FROM_CLOSE set\n", d1 ); + status = NtQueryObject( d1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + SetLastError( 0xdeadbeef ); ok( !CloseDesktop(d1), "closing thread desktop succeeded\n" ); ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */

1 0

Carlos Rodriguez : wined3d: Add GPU information for another Intel UHD 630 GPU.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b09046cd1598b53648ce7509b5f7e65afb4ff51e URL: https://gitlab.winehq.org/wine/wine/-/commit/b09046cd1598b53648ce7509b5f7e6… Author: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Date: Wed Mar 8 14:45:08 2023 +0000 wined3d: Add GPU information for another Intel UHD 630 GPU. (cherry picked from commit 318b0bbed60a769fe74ffc0bc7c206543f3a612c) --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b6901d25c0..1d3beb8962c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -626,7 +626,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, - {HW_VENDOR_INTEL, CARD_INTEL_UHD630, "Intel(R) UHD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD630_1, "Intel(R) UHD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD630_2, "Intel(R) UHD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e06a7c14d7..e2410ac88ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3288,7 +3288,8 @@ enum wined3d_pci_device CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b, - CARD_INTEL_UHD630 = 0x3e9b, + CARD_INTEL_UHD630_1 = 0x3e9b, + CARD_INTEL_UHD630_2 = 0x3e91, }; struct wined3d_fbo_ops

1 0

Eric Pouech : winedbg: Use debuggee's bitness for 'examine /a' command.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 49ca079bdeb396da0d649feaf0942cc8be8c8502 URL: https://gitlab.winehq.org/wine/wine/-/commit/49ca079bdeb396da0d649feaf0942c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 23 11:19:35 2023 +0100 winedbg: Use debuggee's bitness for 'examine /a' command. Also fixes stack dump in crash summary and 'info stack' command. (We were using debugger's bitness instead). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> (cherry picked from commit 5fc54e32196276228cc8422e8371fc9eb4d7b6ca) --- programs/winedbg/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index c1a714626b2..8237e719dae 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -248,13 +248,13 @@ void memory_examine(const struct dbg_lvalue *lvalue, int count, char format) case 'd': DO_DUMP(unsigned int, 4, " %4.4d"); break; case 'w': DO_DUMP(unsigned short, 8, " %04x"); break; case 'a': - if (sizeof(DWORD_PTR) == 4) + if (ADDRSIZE == 4) { - DO_DUMP(DWORD_PTR, 4, " %8.8Ix"); + DO_DUMP(DWORD, 4, " %8.8lx"); } else { - DO_DUMP(DWORD_PTR, 2, " %16.16Ix"); + DO_DUMP(DWORD64, 2, " %16.16I64x"); } break; case 'c': DO_DUMP2(char, 32, " %c", (_v < 0x20) ? ' ' : _v); break;

1 0

Alex Henrie : wldap32: Handle null LDAPMessage in ldap_parse_result.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 68f91a82136377f33ba3bde473e8c87d912b8306 URL: https://gitlab.winehq.org/wine/wine/-/commit/68f91a82136377f33ba3bde473e8c8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 15 22:30:50 2023 -0600 wldap32: Handle null LDAPMessage in ldap_parse_result. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54690 (cherry picked from commit 0c1dcfd3548e29f4af9a8c7bbf02835955c90967) --- dlls/wldap32/parse.c | 2 ++ dlls/wldap32/tests/parse.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 436d38d5c42..26e8de14c85 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -148,6 +148,7 @@ ULONG CDECL ldap_parse_resultA( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re free ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; ret = ldap_parse_resultW( ld, result, retcode, &matchedW, &errorW, &referralsW, &serverctrlsW, free ); @@ -177,6 +178,7 @@ ULONG CDECL ldap_parse_resultW( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re free ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; + if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED; ret = map_error( ldap_parse_result( CTX(ld), MSG(result), (int *)retcode, &matchedU, &errorU, &referralsU, &serverctrlsU, free ) ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 161a0672cdc..375acbbe776 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -68,6 +68,12 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ok( !ret, "ldap_search_ext_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); + ret = ldap_parse_resultA( NULL, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret ); + ret = ldap_parse_resultA( NULL, res, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret ); + ret = ldap_parse_resultA( ld, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + ok( ret == LDAP_NO_RESULTS_RETURNED, "ldap_parse_resultA should fail, got %#lx\n", ret ); result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); ok( !ret, "ldap_parse_resultA failed %#lx\n", ret );

1 0