wine-commits January 2023

wine-commits@winehq.org

1 participants
467 discussions

Paul Gofman : cryptnet: Check cached revocation status in verify_cert_revocation().
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 67de946ca9bdc8f39adffca57a336165936e62e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/67de946ca9bdc8f39adffca57a3361… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 11 14:00:48 2023 -0600 cryptnet: Check cached revocation status in verify_cert_revocation(). --- dlls/cryptnet/cryptnet_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 19de1ed2d8e..01ded96d88f 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1696,9 +1696,6 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * return CRYPT_E_REVOCATION_OFFLINE; } - if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, time, status)) - return status->dwError; - if (!CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &url_array_size, NULL, NULL)) return GetLastError(); @@ -2146,6 +2143,12 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, DWORD error = ERROR_SUCCESS; PCERT_EXTENSION ext; + if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) + { + if (pRevStatus->dwError == ERROR_SUCCESS || pRevStatus->dwError == CRYPT_E_REVOKED) + return pRevStatus->dwError; + } + if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus);

1 0

Rémi Bernon : wininet: Allocate returned options strings with the process heap.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: c23c43e9eb24b6520ab63c665555089d95dc32cb URL: https://gitlab.winehq.org/wine/wine/-/commit/c23c43e9eb24b6520ab63c66555508… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 20:24:17 2023 +0100 wininet: Allocate returned options strings with the process heap. --- dlls/wininet/internet.c | 43 +++++++++++++++++++++++++++++++++++++------ dlls/wininet/tests/internet.c | 3 +++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 26d262b9665..2926fbccf9b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2522,6 +2522,37 @@ static WCHAR *get_proxy_autoconfig_url(void) return ret; } +static WCHAR *copy_optionW(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = (wcslen(value) + 1) * sizeof(WCHAR); + if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + return NULL; + + return memcpy(tmp, value, len); +} + +static char *copy_optionA(WCHAR *value) +{ + DWORD len; + void *tmp; + + if (!value) + return NULL; + + len = wcslen(value) * 3 + 1; + if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + return NULL; + + WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); + return tmp; +} + static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { /* FIXME: This function currently handles more options than it should. Options requiring @@ -2642,25 +2673,25 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u case INTERNET_PER_CONN_PROXY_SERVER: if (unicode) - optionW->Value.pszValue = wcsdup(pi.proxy); + optionW->Value.pszValue = copy_optionW(pi.proxy); else - optionA->Value.pszValue = strdupWtoA(pi.proxy); + optionA->Value.pszValue = copy_optionA(pi.proxy); break; case INTERNET_PER_CONN_PROXY_BYPASS: if (unicode) - optionW->Value.pszValue = wcsdup(pi.proxyBypass); + optionW->Value.pszValue = copy_optionW(pi.proxyBypass); else - optionA->Value.pszValue = strdupWtoA(pi.proxyBypass); + optionA->Value.pszValue = copy_optionA(pi.proxyBypass); break; case INTERNET_PER_CONN_AUTOCONFIG_URL: if (!url) optionW->Value.pszValue = NULL; else if (unicode) - optionW->Value.pszValue = wcsdup(url); + optionW->Value.pszValue = copy_optionW(url); else - optionA->Value.pszValue = strdupWtoA(url); + optionA->Value.pszValue = copy_optionA(url); break; case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0d58a12558e..04b7f1041f7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1307,6 +1307,9 @@ static void test_Option_PerConnectionOption(void) list.pOptions[1].Value.dwValue); verifyProxyEnable(1); + ret = HeapValidate(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + ok(ret, "HeapValidate failed, last error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions);

1 0

Zebediah Figura : wined3d: Write into a mapped BO when replacing the entire destination in wined3d_context_gl_copy_bo_address().
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 69a730090abe81c5829c6504aac373babbe9e8a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/69a730090abe81c5829c6504aac373… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 14:19:21 2023 -0600 wined3d: Write into a mapped BO when replacing the entire destination in wined3d_context_gl_copy_bo_address(). Instead of using glBufferSubData(). In practice, this means that we will either discard and rename the BO (if it's still in use) or write directly into it (if not). This improves performance drastically on NVidia GL drivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53408 --- dlls/wined3d/context_gl.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8c27b661617..0217e12d903 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3118,14 +3118,23 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else if (dst_bo && !src_bo) { - wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); - for (i = 0; i < range_count; ++i) - GL_EXTCALL(glBufferSubData(dst_bo->binding, - dst_bo->b.buffer_offset + (GLintptr)dst->addr + ranges[i].offset, - ranges[i].size, src->addr + ranges[i].offset)); - checkGLcall("buffer upload"); + if ((map_flags & WINED3D_MAP_DISCARD) && (dst_bo->flags & GL_MAP_WRITE_BIT)) + { + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, dst_bo->size, map_flags); + memcpy(dst_ptr, src->addr, dst_bo->size); + wined3d_context_gl_unmap_bo_address(context_gl, dst, range_count, ranges); + } + else + { + wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); + for (i = 0; i < range_count; ++i) + GL_EXTCALL(glBufferSubData(dst_bo->binding, + dst_bo->b.buffer_offset + (GLintptr)dst->addr + ranges[i].offset, + ranges[i].size, src->addr + ranges[i].offset)); + checkGLcall("buffer upload"); - wined3d_context_gl_reference_bo(context_gl, dst_bo); + wined3d_context_gl_reference_bo(context_gl, dst_bo); + } } else {

1 0

Zebediah Figura : wined3d: Map the destination BO with WINED3D_MAP_DISCARD when replacing the entire destination in wined3d_context_gl_copy_bo_address().
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 19c3e1d4437f3bc0892f4f26d1aeec1195632892 URL: https://gitlab.winehq.org/wine/wine/-/commit/19c3e1d4437f3bc0892f4f26d1aeec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 19:29:51 2023 -0600 wined3d: Map the destination BO with WINED3D_MAP_DISCARD when replacing the entire destination in wined3d_context_gl_copy_bo_address(). Analogous to the Vulkan backend. This is not particularly impactful, though, since it only affects buffer-buffer copies in the case where ARB_copy_buffer is not supported. --- dlls/wined3d/context_gl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 65d40f05ab2..8c27b661617 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3062,6 +3062,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, unsigned int range_count, const struct wined3d_range *ranges) { + uint32_t map_flags = WINED3D_MAP_WRITE; const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *src_bo, *dst_bo; BYTE *dst_ptr, *src_ptr; @@ -3071,6 +3072,9 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, src_bo = src->buffer_object ? wined3d_bo_gl(src->buffer_object) : NULL; dst_bo = dst->buffer_object ? wined3d_bo_gl(dst->buffer_object) : NULL; + if (dst_bo && !dst->addr && !ranges->offset && ranges->size == dst_bo->size) + map_flags |= WINED3D_MAP_DISCARD; + if (dst_bo && src_bo) { if (gl_info->supported[ARB_COPY_BUFFER]) @@ -3092,7 +3096,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, src_bo->size - (uintptr_t)src->addr, WINED3D_MAP_READ); dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, - dst_bo->size - (uintptr_t)dst->addr, WINED3D_MAP_WRITE); + dst_bo->size - (uintptr_t)dst->addr, map_flags); for (i = 0; i < range_count; ++i) memcpy(dst_ptr + ranges[i].offset, src_ptr + ranges[i].offset, ranges[i].size);

1 0

Rémi Bernon : msv1_0: Avoid double free when SpInitLsaModeContext fails.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: b17629045f9416342ebeb8e6073a1f0b3e8ee9d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b17629045f9416342ebeb8e6073a1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 13 12:13:07 2023 +0100 msv1_0: Avoid double free when SpInitLsaModeContext fails. --- dlls/msv1_0/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index e4890d00a42..a877d974486 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -862,7 +862,7 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA } done: - if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) + if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED && !ctx_handle && !input) { ntlm_cleanup( ctx ); free( ctx );

1 0

Rémi Bernon : msv1_0: Avoid double free when SpAcceptLsaModeContext fails.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 3a143c0938f7937b82e50d751feea55ec888933a URL: https://gitlab.winehq.org/wine/wine/-/commit/3a143c0938f7937b82e50d751feea5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 22:59:51 2023 +0100 msv1_0: Avoid double free when SpAcceptLsaModeContext fails. And a previously created context is passed, which may later be destroyed on its own, causing a double free. --- dlls/msv1_0/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index d416da13465..e4890d00a42 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -1078,7 +1078,7 @@ static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, L } done: - if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) + if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED && !ctx_handle) { ntlm_cleanup( ctx ); free( ctx );

1 0

Gerald Pfeifer : wrc: Avoid undefined behavior in the FreeBSD case.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: f221465a3c689e6c20c29b99f9c9f6a50ec7ff38 URL: https://gitlab.winehq.org/wine/wine/-/commit/f221465a3c689e6c20c29b99f9c9f6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 13 13:10:55 2023 +0100 wrc: Avoid undefined behavior in the FreeBSD case. init_argv0_dir has a special case for FreeBSD where one branch led to an unitialized variable and undefined behavior. Initialize properly. --- tools/wrc/wrc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index a1e59c3d2b3..9f231603ad4 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -305,6 +305,8 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); + else + dir = NULL; free( path ); #else dir = realpath( argv0, NULL );

1 0

Conor McCarthy : d3d11: Apply the 'KEEP' options when sending RTVs and UAVs to wined3d.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 696515d8d4d322f6bfbb1b7ca8015cbd02dde041 URL: https://gitlab.winehq.org/wine/wine/-/commit/696515d8d4d322f6bfbb1b7ca8015c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 13 14:36:31 2023 +1000 d3d11: Apply the 'KEEP' options when sending RTVs and UAVs to wined3d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53761 --- dlls/d3d11/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 65706a414d8..5cb84c59dee 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1156,8 +1156,9 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere } } - wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, ARRAY_SIZE(wined3d_rtvs), - wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ARRAY_SIZE(wined3d_uavs), wined3d_uavs, + wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, + render_target_view_count == ~0u ? ~0u : ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, + dsv ? dsv->wined3d_view : NULL, uav_count == ~0u ? ~0u : ARRAY_SIZE(wined3d_uavs), wined3d_uavs, wined3d_initial_counts); }

1 0

Rémi Bernon : rpcrt4/tests: Avoid invalid free of static string.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 3356ba6810513cd19e87b4d773458f1894e6d6f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3356ba6810513cd19e87b4d773458f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 5 23:04:38 2022 +0100 rpcrt4/tests: Avoid invalid free of static string. --- dlls/rpcrt4/tests/server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5fe803e5a1d..8e87a468f86 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -867,7 +867,9 @@ s123_t * __cdecl s_get_s123(void) str_t __cdecl s_get_filename(void) { - return (char *)__FILE__; + void *ptr = MIDL_user_allocate(strlen(__FILE__) + 1); + strcpy(ptr, __FILE__); + return (char *)ptr; } int __cdecl s_echo_ranged_int(int i, int j, int k)

1 0

Hans Leidekker : ntdll/tests: Mark some test results on Windows 11 as broken.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: c5c2db52a31589348de88652015a58d9676daa9a URL: https://gitlab.winehq.org/wine/wine/-/commit/c5c2db52a31589348de88652015a58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 12 17:25:09 2023 +0100 ntdll/tests: Mark some test results on Windows 11 as broken. --- dlls/ntdll/tests/large_int.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 29b5795b31d..6f7321f2d3c 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -143,6 +143,7 @@ typedef struct { USHORT MaximumLength; const char *Buffer; NTSTATUS result; + int broken_len; } largeint2str_t; /* @@ -271,17 +272,17 @@ static const largeint2str_t largeint2str[] = { */ { 2, 32768, 16, 17, "1000000000000000\0--------------------------------------------------", STATUS_SUCCESS}, - { 2, 32768, 16, 16, "1000000000000000---------------------------------------------------", STATUS_SUCCESS}, + { 2, 32768, 16, 16, "1000000000000000---------------------------------------------------", STATUS_SUCCESS, 1}, { 2, 65536, 17, 18, "10000000000000000\0-------------------------------------------------", STATUS_SUCCESS}, - { 2, 65536, 17, 17, "10000000000000000--------------------------------------------------", STATUS_SUCCESS}, + { 2, 65536, 17, 17, "10000000000000000--------------------------------------------------", STATUS_SUCCESS, 1}, { 2, 131072, 18, 19, "100000000000000000\0------------------------------------------------", STATUS_SUCCESS}, - { 2, 131072, 18, 18, "100000000000000000-------------------------------------------------", STATUS_SUCCESS}, + { 2, 131072, 18, 18, "100000000000000000-------------------------------------------------", STATUS_SUCCESS, 1}, {16, 0xffffffff, 8, 9, "FFFFFFFF\0----------------------------------------------------------", STATUS_SUCCESS}, - {16, 0xffffffff, 8, 8, "FFFFFFFF-----------------------------------------------------------", STATUS_SUCCESS}, - {16, 0xffffffff, 8, 7, "-------------------------------------------------------------------", STATUS_BUFFER_OVERFLOW}, + {16, 0xffffffff, 8, 8, "FFFFFFFF-----------------------------------------------------------", STATUS_SUCCESS, 1}, + {16, 0xffffffff, 8, 7, "-------------------------------------------------------------------", STATUS_BUFFER_OVERFLOW, 1}, {16, 0xa, 1, 2, "A\0-----------------------------------------------------------------", STATUS_SUCCESS}, - {16, 0xa, 1, 1, "A------------------------------------------------------------------", STATUS_SUCCESS}, - {16, 0, 1, 0, "-------------------------------------------------------------------", STATUS_BUFFER_OVERFLOW}, + {16, 0xa, 1, 1, "A------------------------------------------------------------------", STATUS_SUCCESS, 1}, + {16, 0, 1, 0, "-------------------------------------------------------------------", STATUS_BUFFER_OVERFLOW, 1}, {20, 0xdeadbeef, 0, 9, "-------------------------------------------------------------------", STATUS_INVALID_PARAMETER}, {-8, 07654321, 0, 12, "-------------------------------------------------------------------", STATUS_INVALID_PARAMETER}, }; @@ -355,7 +356,8 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, "(test %d): RtlInt64ToUnicodeString(0x%I64x, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", test_num, largeint2str->value, largeint2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); - ok(unicode_string.Length == expected_unicode_string.Length, + ok(unicode_string.Length == expected_unicode_string.Length || + broken(largeint2str->broken_len && !unicode_string.Length) /* win11 */, "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) string has Length %d, expected: %d\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, unicode_string.Length, expected_unicode_string.Length);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2023