January 2023 - Wine-commits

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

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

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

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

Paul Gofman : cryptnet: Also cache revocation status when using OCSP.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: ca40454f47ee18f769dee2261eeac0182b205726 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca40454f47ee18f769dee2261eeac0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 11 14:17:47 2023 -0600 cryptnet: Also cache revocation status when using OCSP. --- dlls/cryptnet/cryptnet_main.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 01ded96d88f..516bbad9ca4 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1895,11 +1895,12 @@ static BOOL match_cert_id(const OCSP_CERT_ID *id, const CERT_INFO *cert, const C } static DWORD check_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *issuer, - const CRYPT_OBJID_BLOB *blob, DWORD *status) + const CRYPT_OBJID_BLOB *blob, DWORD *status, FILETIME *next_update) { OCSP_BASIC_RESPONSE_INFO *info; DWORD size, i; + memset(next_update, 0, sizeof(*next_update)); if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); @@ -1907,7 +1908,11 @@ static DWORD check_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *is for (i = 0; i < info->cResponseEntry; i++) { OCSP_BASIC_RESPONSE_ENTRY *entry = &info->rgResponseEntry[i]; - if (match_cert_id(&entry->CertId, cert, issuer)) *status = map_ocsp_status(entry->dwCertStatus); + if (match_cert_id(&entry->CertId, cert, issuer)) + { + *status = map_ocsp_status(entry->dwCertStatus); + *next_update = entry->NextUpdate; + } } LocalFree(info); @@ -1920,6 +1925,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ OCSP_BASIC_SIGNED_RESPONSE_INFO *info; DWORD size, error, status = CRYPT_E_REVOCATION_OFFLINE; CRYPT_ALGORITHM_IDENTIFIER *alg; + FILETIME next_update; CRYPT_BIT_BLOB *sig; HCRYPTPROV prov = 0; HCRYPTHASH hash = 0; @@ -1929,7 +1935,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); - if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; + if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status, &next_update))) goto done; alg = &info->SignatureInfo.SignatureAlgorithm; if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId))) @@ -1958,6 +1964,16 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ else error = ERROR_SUCCESS; done: + if (next_update.dwLowDateTime || next_update.dwHighDateTime) + { + CERT_REVOCATION_STATUS rev_status; + + memset(&rev_status, 0, sizeof(rev_status)); + rev_status.cbSize = sizeof(rev_status); + rev_status.dwError = status; + cache_revocation_status(&cert->SerialNumber, &next_update, &rev_status); + } + CryptDestroyKey(key); CryptDestroyHash(hash); CryptReleaseContext(prov, 0);

1 0

Rémi Bernon : comctl32: Avoid mismatching heap in ProgressWindowProc.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 0bb029eb597f3502b2960b05c01688bfd5b8dcbf URL: https://gitlab.winehq.org/wine/wine/-/commit/0bb029eb597f3502b2960b05c01688… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 20:27:31 2023 +0100 comctl32: Avoid mismatching heap in ProgressWindowProc. When free-ing an Alloc-ed pointer. --- dlls/comctl32/progress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index a329995a40e..6d556f10094 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -576,7 +576,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_DESTROY: TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd); - free (infoPtr); + Free (infoPtr); SetWindowLongPtrW(hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme);

1 0

Rémi Bernon : dinput/tests: Remove the async cancel tests.
by Alexandre Julliard 13 Jan '23

13 Jan '23

Module: wine Branch: master Commit: 3a0de91ecf7c0b2b968c51bf90f9c1e5f9904a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a0de91ecf7c0b2b968c51bf90f9c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 13 10:30:45 2023 +0100 dinput/tests: Remove the async cancel tests. The tests are actually racy, and the async operation is cancellable in a very short period of time after its creation, but before it started executing. This will be hard to test precisely and it's not related to dinput tests in any way. Let's remove this to fix some spurious Windows failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54283 --- dlls/dinput/tests/force_feedback.c | 105 ------------------------------------- 1 file changed, 105 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index b40c8446e09..1e68748a07d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5605,24 +5605,6 @@ static void test_windows_gaming_input(void) .report_len = 2, .report_buf = {1, 0x04}, }; - static struct hid_expect expect_reset_delay[] = - { - /* device control */ - { - .code = IOCTL_HID_WRITE_REPORT, - .ret_status = STATUS_PENDING, - .report_id = 1, - .report_len = 2, - .report_buf = {1, 0x01}, - }, - /* device gain */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 6, - .report_len = 2, - .report_buf = {6, 0x7f}, - }, - }; struct hid_expect expect_reset[] = { /* device control */ @@ -6274,93 +6256,6 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); - /* canceling the async op is just ignored */ - - set_hid_expect( file, expect_reset_delay, sizeof(expect_reset_delay) ); - hr = IForceFeedbackMotor_TryResetAsync( motor, &bool_async ); - ok( hr == S_OK, "TryResetAsync returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Started, S_OK, FALSE ); - - bool_async_handler = default_bool_async_handler; - bool_async_handler.event = CreateEventW( NULL, FALSE, FALSE, NULL ); - ok( !!bool_async_handler.event, "CreateEventW failed, error %lu\n", GetLastError() ); - - hr = IAsyncOperation_boolean_put_Completed( bool_async, &bool_async_handler.IAsyncOperationCompletedHandler_boolean_iface ); - ok( hr == S_OK, "put_Completed returned %#lx\n", hr ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); - ok( hr == S_OK, "get_Completed returned %#lx\n", hr ); - ok( tmp_handler == &bool_async_handler.IAsyncOperationCompletedHandler_boolean_iface, - "got handler %p\n", tmp_handler ); - - hr = IAsyncOperation_boolean_QueryInterface( bool_async, &IID_IAsyncInfo, (void **)&async_info ); - ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); - hr = IAsyncInfo_Cancel( async_info ); - ok( hr == S_OK, "Cancel returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Canceled, S_OK, FALSE ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - IAsyncInfo_Release( async_info ); - - wait_hid_pending( file, 100 ); - ret = WaitForSingleObject( bool_async_handler.event, 500 ); - ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); - CloseHandle( bool_async_handler.event ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - - ok( bool_async_handler.invoked, "handler not invoked\n" ); - ok( bool_async_handler.async == bool_async, "got async %p\n", bool_async_handler.async ); - ok( bool_async_handler.status == Completed, "got status %u\n", bool_async_handler.status ); - hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); - ok( hr == S_OK, "get_Completed returned %#lx\n", hr ); - ok( tmp_handler == NULL, "got handler %p\n", tmp_handler ); - - IAsyncOperation_boolean_Release( bool_async ); - - - /* canceling then closing it calls the handler with closed state */ - - set_hid_expect( file, expect_reset_delay, sizeof(expect_reset_delay) ); - hr = IForceFeedbackMotor_TryResetAsync( motor, &bool_async ); - ok( hr == S_OK, "TryResetAsync returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Started, S_OK, FALSE ); - - bool_async_handler = default_bool_async_handler; - bool_async_handler.event = CreateEventW( NULL, FALSE, FALSE, NULL ); - ok( !!bool_async_handler.event, "CreateEventW failed, error %lu\n", GetLastError() ); - - hr = IAsyncOperation_boolean_put_Completed( bool_async, &bool_async_handler.IAsyncOperationCompletedHandler_boolean_iface ); - ok( hr == S_OK, "put_Completed returned %#lx\n", hr ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - - hr = IAsyncOperation_boolean_QueryInterface( bool_async, &IID_IAsyncInfo, (void **)&async_info ); - ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); - hr = IAsyncInfo_Close( async_info ); - ok( hr == E_ILLEGAL_STATE_CHANGE, "Close returned %#lx\n", hr ); - hr = IAsyncInfo_Cancel( async_info ); - ok( hr == S_OK, "Cancel returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Canceled, S_OK, FALSE ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - hr = IAsyncInfo_Close( async_info ); - ok( hr == S_OK, "Close returned %#lx\n", hr ); - check_bool_async( bool_async, 1, 4, S_OK, FALSE ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - IAsyncInfo_Release( async_info ); - - wait_hid_pending( file, 100 ); - ret = WaitForSingleObject( bool_async_handler.event, 500 ); - ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); - CloseHandle( bool_async_handler.event ); - check_bool_async( bool_async, 1, 4, S_OK, FALSE ); - - ok( bool_async_handler.invoked, "handler not invoked\n" ); - ok( bool_async_handler.async == bool_async, "got async %p\n", bool_async_handler.async ); - ok( bool_async_handler.status == 4, "got status %u\n", bool_async_handler.status ); - hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); - ok( hr == E_ILLEGAL_METHOD_CALL, "get_Completed returned %#lx\n", hr ); - - IAsyncOperation_boolean_Release( bool_async ); - - set_hid_expect( file, &expect_enable, sizeof(expect_enable) ); hr = IForceFeedbackMotor_TryEnableAsync( motor, &bool_async ); ok( hr == S_OK, "TryEnableAsync returned %#lx\n", hr );

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

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

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