January 2023 - Wine-commits

Rémi Bernon : dinput: Rename lpdid local variable to device.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: adbc9ae185e166c4411cb493fb34bb0d146afd36 URL: https://gitlab.winehq.org/wine/wine/-/commit/adbc9ae185e166c4411cb493fb34bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 21 22:18:59 2023 +0100 dinput: Rename lpdid local variable to device. --- dlls/dinput/dinput.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c index 2b1ce6d2e33..08d36246071 100644 --- a/dlls/dinput/dinput.c +++ b/dlls/dinput/dinput.c @@ -498,8 +498,8 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con static const GUID *guids[2] = {&GUID_SysKeyboard, &GUID_SysMouse}; static const DWORD actionMasks[] = {DIKEYBOARD_MASK, DIMOUSE_MASK}; struct dinput *impl = impl_from_IDirectInput8W( iface ); + IDirectInputDevice8W *device; DIDEVICEINSTANCEW didevi; - IDirectInputDevice8W *lpdid; unsigned int i = 0; HRESULT hr; int remain; @@ -530,15 +530,15 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con for (i = 0; i < params.instance_count; i++) { callbackFlags = diactionformat_priorityW( action_format, action_format->dwGenre ); - IDirectInput_CreateDevice( iface, &params.instances[i].guidInstance, &lpdid, NULL ); + IDirectInput_CreateDevice( iface, &params.instances[i].guidInstance, &device, NULL ); - if (callback( &params.instances[i], lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) + if (callback( &params.instances[i], device, callbackFlags, --remain, context ) == DIENUM_STOP) { free( params.instances ); - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); return DI_OK; } - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); } free( params.instances ); @@ -552,15 +552,15 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con { callbackFlags = diactionformat_priorityW( action_format, actionMasks[i] ); - IDirectInput_CreateDevice( iface, guids[i], &lpdid, NULL ); - IDirectInputDevice_GetDeviceInfo( lpdid, &didevi ); + IDirectInput_CreateDevice( iface, guids[i], &device, NULL ); + IDirectInputDevice_GetDeviceInfo( device, &didevi ); - if (callback( &didevi, lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) + if (callback( &didevi, device, callbackFlags, --remain, context ) == DIENUM_STOP) { - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); return DI_OK; } - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); } }

1 0

Paul Gofman : cryptnet: Cache revocation status in verify_cert_revocation().
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 6e782449ab72cc5d20877934c580a45e8df46a04 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e782449ab72cc5d20877934c580a4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 24 11:51:08 2023 -0600 cryptnet: Cache revocation status in verify_cert_revocation(). --- dlls/cryptnet/cryptnet_main.c | 56 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 516bbad9ca4..211b5c3cf8c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1683,7 +1683,8 @@ static const CRL_CONTEXT *retrieve_crl_from_dist_points(const CRYPT_URL_ARRAY *a } static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, - FILETIME *time, DWORD flags, const CERT_REVOCATION_PARA *params, CERT_REVOCATION_STATUS *status) + FILETIME *time, DWORD flags, const CERT_REVOCATION_PARA *params, CERT_REVOCATION_STATUS *status, + FILETIME *next_update) { DWORD url_array_size, error; CRYPT_URL_ARRAY *url_array; @@ -1719,7 +1720,7 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * error = verify_cert_revocation_with_crl_online(cert, crl, time, status); - cache_revocation_status(&cert->pCertInfo->SerialNumber, &crl->pCrlInfo->NextUpdate, status); + *next_update = crl->pCrlInfo->NextUpdate; CertFreeCRLContext(crl); CryptMemFree(url_array); @@ -1920,12 +1921,11 @@ static DWORD check_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *is } static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *issuer, - const CRYPT_OBJID_BLOB *blob) + const CRYPT_OBJID_BLOB *blob, FILETIME *next_update) { 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; @@ -1935,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, &next_update))) 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))) @@ -1964,16 +1964,6 @@ 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); @@ -1983,7 +1973,7 @@ done: } static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer, const BYTE *encoded, - DWORD encoded_size) + DWORD encoded_size, FILETIME *next_update) { OCSP_RESPONSE_INFO *info; DWORD size, error = CRYPT_E_NO_REVOCATION_CHECK; @@ -1999,7 +1989,7 @@ static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer FIXME("unhandled response type %s\n", debugstr_a(info->pszObjId)); break; } - error = verify_signed_ocsp_response_info(cert, issuer, &info->Value); + error = verify_signed_ocsp_response_info(cert, issuer, &info->Value, next_update); break; default: @@ -2012,7 +2002,7 @@ static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer } static DWORD verify_cert_revocation_with_ocsp(const CERT_CONTEXT *cert, const WCHAR *base_url, - const CERT_REVOCATION_PARA *revpara) + const CERT_REVOCATION_PARA *revpara, FILETIME *next_update) { HINTERNET ses, con, req = NULL; BYTE *request_data = NULL, *response_data = NULL; @@ -2081,7 +2071,8 @@ static DWORD verify_cert_revocation_with_ocsp(const CERT_CONTEXT *cert, const WC !response_len || !(response_data = malloc(response_len)) || !InternetReadFile(req, response_data, response_len, &count) || count != response_len) goto done; - ret = handle_ocsp_response(cert->pCertInfo, revpara->pIssuerCert->pCertInfo, response_data, response_len); + ret = handle_ocsp_response(cert->pCertInfo, revpara->pIssuerCert->pCertInfo, response_data, response_len, + next_update); done: free(url); @@ -2093,7 +2084,8 @@ done: } static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, - FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) + FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus, + FILETIME *next_update) { BOOL ret; DWORD size, i, error = CRYPT_E_NO_REVOCATION_CHECK; @@ -2111,7 +2103,7 @@ static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, c { const WCHAR *url = aia->rgAccDescr[i].AccessLocation.u.pwszURL; TRACE("OCSP URL = %s\n", debugstr_w(url)); - error = verify_cert_revocation_with_ocsp(cert, url, pRevPara); + error = verify_cert_revocation_with_ocsp(cert, url, pRevPara, next_update); } else { @@ -2157,6 +2149,7 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) { DWORD error = ERROR_SUCCESS; + FILETIME next_update = {0}; PCERT_EXTENSION ext; if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) @@ -2167,15 +2160,17 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, 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); + error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus, + &next_update); TRACE("verify_cert_revocation_from_aia_ext() returned %08lx\n", error); - if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) return error; + if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) goto done; } if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { - error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus); + error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus, + &next_update); TRACE("verify_cert_revocation_from_dist_points_ext() returned %08lx\n", error); - if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) return error; + if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) goto done; } if (!ext) { @@ -2247,6 +2242,17 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, error = CRYPT_E_NO_REVOCATION_CHECK; } } +done: + if ((next_update.dwLowDateTime || next_update.dwHighDateTime) + && (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED)) + { + CERT_REVOCATION_STATUS rev_status; + + memset(&rev_status, 0, sizeof(rev_status)); + rev_status.cbSize = sizeof(rev_status); + rev_status.dwError = error; + cache_revocation_status(&cert->pCertInfo->SerialNumber, &next_update, &rev_status); + } return error; }

1 0

Paul Gofman : cryptnet: Use cert data hash as cache id instead of serial number.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: f114ab57d268bfc7803bbba82e9877cc6178fd0d URL: https://gitlab.winehq.org/wine/wine/-/commit/f114ab57d268bfc7803bbba82e9877… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 24 11:54:23 2023 -0600 cryptnet: Use cert data hash as cache id instead of serial number. --- dlls/cryptnet/cryptnet_main.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 211b5c3cf8c..7d1c01363c0 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1537,11 +1537,16 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, static const char revocation_cache_signature[] = "Wine cached revocation"; -static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const WCHAR *mode, int sharing) +#define CACHED_CERT_HASH_SIZE 20 + +static FILE *open_cached_revocation_file(const CERT_CONTEXT *cert, const WCHAR *mode, int sharing) { + BYTE hash_data[CACHED_CERT_HASH_SIZE]; WCHAR path[MAX_PATH]; WCHAR *appdata_path; - DWORD len, i; + DWORD len, i, size; + HCRYPTPROV prov; + HCRYPTHASH hash; HRESULT hr; if (FAILED(hr = SHGetKnownFolderPath(&FOLDERID_LocalAppDataLow, 0, NULL, &appdata_path))) @@ -1553,24 +1558,32 @@ static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const len = swprintf(path, ARRAY_SIZE(path), L"%s\\Microsoft\\CryptnetUrlCache\\Content\\", appdata_path); CoTaskMemFree(appdata_path); - if (len + serial->cbData * 2 * sizeof(WCHAR) > ARRAY_SIZE(path) - 1) + if (len + CACHED_CERT_HASH_SIZE * 2 * sizeof(WCHAR) > ARRAY_SIZE(path) - 1) { - WARN("Serial length exceeds static buffer; not caching.\n"); + WARN("Hash length exceeds static buffer; not caching.\n"); return INVALID_HANDLE_VALUE; } + CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); + CryptHashData(hash, cert->pbCertEncoded, cert->cbCertEncoded, 0); + size = sizeof(hash_data); + CryptGetHashParam(hash, HP_HASHVAL, hash_data, &size, 0); + CryptDestroyHash(hash); + CryptReleaseContext(prov, 0); + SHCreateDirectoryExW(NULL, path, NULL); - for (i = 0; i < serial->cbData; ++i) + for (i = 0; i < CACHED_CERT_HASH_SIZE; ++i) { - swprintf(path + len, 3, L"%02x", serial->pbData[i]); + swprintf(path + len, 3, L"%02x", hash_data[i]); len += 2; } return _wfsopen(path, mode, sharing); } -static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, +static BOOL find_cached_revocation_status(const CERT_CONTEXT *cert, const FILETIME *time, CERT_REVOCATION_STATUS *status) { char buffer[sizeof(revocation_cache_signature)]; @@ -1578,7 +1591,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, FILE *file; int len; - if (!(file = open_cached_revocation_file(serial, L"rb", _SH_DENYWR))) + if (!(file = open_cached_revocation_file(cert, L"rb", _SH_DENYWR))) return FALSE; if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) @@ -1621,12 +1634,12 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, return TRUE; } -static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, +static void cache_revocation_status(const CERT_CONTEXT *cert, const FILETIME *time, const CERT_REVOCATION_STATUS *status) { FILE *file; - if (!(file = open_cached_revocation_file(serial, L"wb", _SH_DENYRW))) + if (!(file = open_cached_revocation_file(cert, L"wb", _SH_DENYRW))) return; fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); fwrite(time, sizeof(*time), 1, file); @@ -2152,7 +2165,7 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, FILETIME next_update = {0}; PCERT_EXTENSION ext; - if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) + if (find_cached_revocation_status(cert, pTime, pRevStatus)) { if (pRevStatus->dwError == ERROR_SUCCESS || pRevStatus->dwError == CRYPT_E_REVOKED) return pRevStatus->dwError; @@ -2251,7 +2264,7 @@ done: memset(&rev_status, 0, sizeof(rev_status)); rev_status.cbSize = sizeof(rev_status); rev_status.dwError = error; - cache_revocation_status(&cert->pCertInfo->SerialNumber, &next_update, &rev_status); + cache_revocation_status(cert, &next_update, &rev_status); } return error; }

1 0

Paul Gofman : cryptnet: Also hash issuer cert for cache id.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 66b1a4f333e0687922062cb859bd73e5545608bd URL: https://gitlab.winehq.org/wine/wine/-/commit/66b1a4f333e0687922062cb859bd73… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 24 12:07:31 2023 -0600 cryptnet: Also hash issuer cert for cache id. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54353 --- dlls/cryptnet/cryptnet_main.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 7d1c01363c0..75fa4028d12 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1539,7 +1539,8 @@ static const char revocation_cache_signature[] = "Wine cached revocation"; #define CACHED_CERT_HASH_SIZE 20 -static FILE *open_cached_revocation_file(const CERT_CONTEXT *cert, const WCHAR *mode, int sharing) +static FILE *open_cached_revocation_file(const CERT_CONTEXT *cert, const CERT_REVOCATION_PARA *params, + const WCHAR *mode, int sharing) { BYTE hash_data[CACHED_CERT_HASH_SIZE]; WCHAR path[MAX_PATH]; @@ -1567,6 +1568,16 @@ static FILE *open_cached_revocation_file(const CERT_CONTEXT *cert, const WCHAR * CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); CryptHashData(hash, cert->pbCertEncoded, cert->cbCertEncoded, 0); + if (params && params->pIssuerCert) + { + CryptHashData(hash, (BYTE *)&params->pIssuerCert->cbCertEncoded, sizeof(params->pIssuerCert->cbCertEncoded), 0); + CryptHashData(hash, params->pIssuerCert->pbCertEncoded, params->pIssuerCert->cbCertEncoded, 0); + } + else + { + size = 0; + CryptHashData(hash, (BYTE *)&size, sizeof(size), 0); + } size = sizeof(hash_data); CryptGetHashParam(hash, HP_HASHVAL, hash_data, &size, 0); CryptDestroyHash(hash); @@ -1583,7 +1594,7 @@ static FILE *open_cached_revocation_file(const CERT_CONTEXT *cert, const WCHAR * return _wfsopen(path, mode, sharing); } -static BOOL find_cached_revocation_status(const CERT_CONTEXT *cert, +static BOOL find_cached_revocation_status(const CERT_CONTEXT *cert, const CERT_REVOCATION_PARA *params, const FILETIME *time, CERT_REVOCATION_STATUS *status) { char buffer[sizeof(revocation_cache_signature)]; @@ -1591,7 +1602,7 @@ static BOOL find_cached_revocation_status(const CERT_CONTEXT *cert, FILE *file; int len; - if (!(file = open_cached_revocation_file(cert, L"rb", _SH_DENYWR))) + if (!(file = open_cached_revocation_file(cert, params, L"rb", _SH_DENYWR))) return FALSE; if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) @@ -1634,12 +1645,12 @@ static BOOL find_cached_revocation_status(const CERT_CONTEXT *cert, return TRUE; } -static void cache_revocation_status(const CERT_CONTEXT *cert, +static void cache_revocation_status(const CERT_CONTEXT *cert, const CERT_REVOCATION_PARA *params, const FILETIME *time, const CERT_REVOCATION_STATUS *status) { FILE *file; - if (!(file = open_cached_revocation_file(cert, L"wb", _SH_DENYRW))) + if (!(file = open_cached_revocation_file(cert, params, L"wb", _SH_DENYRW))) return; fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); fwrite(time, sizeof(*time), 1, file); @@ -2165,10 +2176,13 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, FILETIME next_update = {0}; PCERT_EXTENSION ext; - if (find_cached_revocation_status(cert, pTime, pRevStatus)) + if (find_cached_revocation_status(cert, pRevPara, pTime, pRevStatus)) { if (pRevStatus->dwError == ERROR_SUCCESS || pRevStatus->dwError == CRYPT_E_REVOKED) + { + TRACE("Returning cached status.\n"); return pRevStatus->dwError; + } } if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) @@ -2264,7 +2278,7 @@ done: memset(&rev_status, 0, sizeof(rev_status)); rev_status.cbSize = sizeof(rev_status); rev_status.dwError = error; - cache_revocation_status(cert, &next_update, &rev_status); + cache_revocation_status(cert, pRevPara, &next_update, &rev_status); } return error; }

1 0

Hans Leidekker : advapi32: Bump random buffer size.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 369e0cfae6052937ef6b90e8c9fe916ea6765d9b URL: https://gitlab.winehq.org/wine/wine/-/commit/369e0cfae6052937ef6b90e8c9fe91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 25 15:20:43 2023 +0100 advapi32: Bump random buffer size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54364 --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 66ad7db3ab2..73c9b1d219d 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2390,7 +2390,7 @@ static CRITICAL_SECTION_DEBUG random_debug = }; static CRITICAL_SECTION random_cs = { &random_debug, -1, 0, 0, 0, 0 }; -#define MAX_CPUS 128 +#define MAX_CPUS 256 static char random_buf[sizeof(SYSTEM_INTERRUPT_INFORMATION) * MAX_CPUS]; static ULONG random_len; static ULONG random_pos;

1 0

Rémi Bernon : oledb32: Fix error info cleanup dispparams rgvarg index.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: e7fbdd1eb2f7e60e3ce3829c8468e39fdcb2ac3a URL: https://gitlab.winehq.org/wine/wine/-/commit/e7fbdd1eb2f7e60e3ce3829c8468e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 01:02:15 2023 +0100 oledb32: Fix error info cleanup dispparams rgvarg index. --- dlls/oledb32/errorinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index b6e0d10e8e0..6857caeb368 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -120,7 +120,7 @@ static ULONG WINAPI errorrecords_Release(IErrorInfo* iface) IUnknown_Release(This->records[i].custom_error); for (j = 0; j < dispparams->cArgs && dispparams->rgvarg; j++) - VariantClear(&dispparams->rgvarg[i]); + VariantClear(&dispparams->rgvarg[j]); CoTaskMemFree(dispparams->rgvarg); CoTaskMemFree(dispparams->rgdispidNamedArgs); }

1 0

Rémi Bernon : oledb32/tests: Avoid use-after-free and unused assignment.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: e091a7b8178cf515864b82ae8239f4e977f39179 URL: https://gitlab.winehq.org/wine/wine/-/commit/e091a7b8178cf515864b82ae8239f4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 02:10:29 2023 +0100 oledb32/tests: Avoid use-after-free and unused assignment. --- dlls/oledb32/tests/database.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 5d99aef7a89..26e3ebf2186 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1043,13 +1043,9 @@ static void test_odbc_provider(void) ok(propidlist.cPropertyIDs == 14, "got %ld\n", propinfoset->cPropertyInfos); for (i = 0; i < propidlist.cPropertyIDs; i++) - { ok(properties[i] == propidlist.rgPropertyIDs[i], "%ld, got %ld\n", i, propidlist.rgPropertyIDs[i]); - propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; - } - CoTaskMemFree(propidlist.rgPropertyIDs); CoTaskMemFree(propset); }

1 0

Alexandre Julliard : tools: Move signal masking to the common make_temp_file() helper.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 9f0ae8c992f85f6b67ea484c83ad5c3b28f91a41 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f0ae8c992f85f6b67ea484c83ad5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 11:31:11 2023 +0100 tools: Move signal masking to the common make_temp_file() helper. --- configure | 47 ----------------------------------------------- configure.ac | 10 ---------- include/config.h.in | 6 ------ tools/tools.h | 13 +++++++++++++ tools/winegcc/winegcc.c | 41 ++++++++--------------------------------- 5 files changed, 21 insertions(+), 96 deletions(-) diff --git a/configure b/configure index 4c1b2f1da04..1e3ffabaebb 100755 --- a/configure +++ b/configure @@ -20077,17 +20077,6 @@ _ACEOF ;; esac -ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <sys/types.h> -#include <signal.h> -" -if test "x$ac_cv_type_sigset_t" = xyes -then : - -printf "%s\n" "#define HAVE_SIGSET_T 1" >>confdefs.h - - -fi - ac_fn_c_check_type "$LINENO" "request_sense" "ac_cv_type_request_sense" "#include <linux/cdrom.h> " if test "x$ac_cv_type_request_sense" = xyes @@ -20129,42 +20118,6 @@ printf "%s\n" "#define HAVE_STRUCT_XINPGEN 1" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5 -printf %s "checking for sigaddset... " >&6; } -if test ${wine_cv_have_sigaddset+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <signal.h> -int -main (void) -{ -sigset_t set; sigaddset(&set,SIGTERM); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - wine_cv_have_sigaddset=yes -else $as_nop - wine_cv_have_sigaddset=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_sigaddset" >&5 -printf "%s\n" "$wine_cv_have_sigaddset" >&6; } -if test "$wine_cv_have_sigaddset" = "yes" -then - -printf "%s\n" "#define HAVE_SIGADDSET 1" >>confdefs.h - -fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can use re-entrant gethostbyname_r Linux style" >&5 printf %s "checking whether we can use re-entrant gethostbyname_r Linux style... " >&6; } if test ${wine_cv_linux_gethostbyname_r_6+y} diff --git a/configure.ac b/configure.ac index 54f2b00fe76..c7217274b80 100644 --- a/configure.ac +++ b/configure.ac @@ -2058,8 +2058,6 @@ fi dnl **** Check for types **** AC_C_INLINE -AC_CHECK_TYPES([sigset_t],,,[#include <sys/types.h> -#include <signal.h>]) AC_CHECK_TYPES([request_sense],,,[#include <linux/cdrom.h>]) AC_CHECK_TYPES([struct xinpgen],,, @@ -2084,14 +2082,6 @@ AC_CHECK_TYPES([struct xinpgen],,, #include <netinet/in_pcb.h> #endif]) -AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no])) -if test "$wine_cv_have_sigaddset" = "yes" -then - AC_DEFINE(HAVE_SIGADDSET, 1, [Define if sigaddset is supported]) -fi - - AC_CACHE_CHECK([whether we can use re-entrant gethostbyname_r Linux style], wine_cv_linux_gethostbyname_r_6, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],[[ diff --git a/include/config.h.in b/include/config.h.in index 0e43013a8ab..fe2fc36a914 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -375,18 +375,12 @@ /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID -/* Define if sigaddset is supported */ -#undef HAVE_SIGADDSET - /* Define to 1 if `si_fd' is a member of `siginfo_t'. */ #undef HAVE_SIGINFO_T_SI_FD /* Define to 1 if you have the `sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define to 1 if the system has the type `sigset_t'. */ -#undef HAVE_SIGSET_T - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff --git a/tools/tools.h b/tools/tools.h index 4cadccb25b8..3c25bcc41a9 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -27,6 +27,7 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> +#include <signal.h> #include <fcntl.h> #include <time.h> #include <errno.h> @@ -369,7 +370,19 @@ static inline char *make_temp_file( const char *prefix, const char *suffix ) fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0600 ); if (fd >= 0) { +#ifdef HAVE_SIGPROCMASK /* block signals while manipulating the temp files list */ + sigset_t mask_set, old_set; + + sigemptyset( &mask_set ); + sigaddset( &mask_set, SIGHUP ); + sigaddset( &mask_set, SIGTERM ); + sigaddset( &mask_set, SIGINT ); + sigprocmask( SIG_BLOCK, &mask_set, &old_set ); strarray_add( &temp_files, name ); + sigprocmask( SIG_SETMASK, &old_set, NULL ); +#else + strarray_add( &temp_files, name ); +#endif close( fd ); return name; } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index beef9dba1cc..2261eca6c1d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -146,9 +146,6 @@ static const char *output_implib; static int keep_generated = 0; const char *temp_dir = NULL; struct strarray temp_files = { 0 }; -#ifdef HAVE_SIGSET_T -static sigset_t signal_mask; -#endif static const char *bindir; static const char *libdir; @@ -223,22 +220,6 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } -static char* get_temp_file(const char* prefix, const char* suffix) -{ - char *tmp; - -#ifdef HAVE_SIGPROCMASK - sigset_t old_set; - /* block signals while manipulating the temp files list */ - sigprocmask( SIG_BLOCK, &signal_mask, &old_set ); -#endif - tmp = make_temp_file( prefix, suffix ); -#ifdef HAVE_SIGPROCMASK - sigprocmask( SIG_SETMASK, &old_set, NULL ); -#endif - return tmp; -} - static int is_pe_target( const struct options *opts ) { switch (opts->target.platform) @@ -348,9 +329,9 @@ static struct strarray get_translator(struct options *opts) static int try_link( struct strarray prefix, struct strarray link_tool, const char *cflags ) { - const char *in = get_temp_file( "try_link", ".c" ); - const char *out = get_temp_file( "try_link", ".out" ); - const char *err = get_temp_file( "try_link", ".err" ); + const char *in = make_temp_file( "try_link", ".c" ); + const char *out = make_temp_file( "try_link", ".out" ); + const char *err = make_temp_file( "try_link", ".err" ); struct strarray link = empty_strarray; int sout = -1, serr = -1; int ret; @@ -407,7 +388,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n case PLATFORM_SOLARIS: { - char *mapfile = get_temp_file( output_name, ".map" ); + char *mapfile = make_temp_file( output_name, ".map" ); const char *align = opts->section_align ? opts->section_align : "0x1000"; create_file( mapfile, 0644, "text = A%s;\ndata = A%s;\n", align, align ); @@ -820,7 +801,7 @@ static const char* compile_to_object(struct options* opts, const char* file, con /* make a copy so we don't change any of the initial stuff */ /* a shallow copy is exactly what we want in this case */ copts = *opts; - copts.output_name = get_temp_file(get_basename_noext(file), ".o"); + copts.output_name = make_temp_file(get_basename_noext(file), ".o"); copts.compile_only = 1; copts.files = empty_strarray; strarray_add(&copts.files, file); @@ -894,8 +875,8 @@ static char *find_static_lib( const char *dll ) static const char *find_libgcc(struct strarray prefix, struct strarray link_tool) { - const char *out = get_temp_file( "find_libgcc", ".out" ); - const char *err = get_temp_file( "find_libgcc", ".err" ); + const char *out = make_temp_file( "find_libgcc", ".out" ); + const char *err = make_temp_file( "find_libgcc", ".err" ); struct strarray link = empty_strarray; int sout = -1, serr = -1; char *libgcc, *p; @@ -984,7 +965,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, strarray_add( &spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); } - spec_o_name = get_temp_file(output_name, ".spec.o"); + spec_o_name = make_temp_file(output_name, ".spec.o"); if (!is_pe) { if (opts->pic) strarray_add(&spec_args, "-fPIC"); @@ -1512,12 +1493,6 @@ int main(int argc, char **argv) #endif signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); -#ifdef HAVE_SIGADDSET - sigemptyset( &signal_mask ); - sigaddset( &signal_mask, SIGHUP ); - sigaddset( &signal_mask, SIGTERM ); - sigaddset( &signal_mask, SIGINT ); -#endif init_argv0_dir( argv[0] ); /* setup tmp file removal at exit */

1 0

Alexandre Julliard : tools: Add a common helper to setup signal handlers.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: ae8797c8e3e7a4f1c82a3881f9b9b8f48981d5d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae8797c8e3e7a4f1c82a3881f9b9b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 11:32:32 2023 +0100 tools: Add a common helper to setup signal handlers. --- tools/make_xftmpl.c | 7 +------ tools/makedep.c | 7 +------ tools/sfnt2fon/sfnt2fon.c | 7 +------ tools/tools.h | 10 ++++++++++ tools/widl/widl.c | 7 +------ tools/winebuild/main.c | 8 +------- tools/winegcc/winegcc.c | 7 +------ tools/wmc/wmc.c | 7 +------ tools/wrc/wrc.c | 7 +------ 9 files changed, 18 insertions(+), 49 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index d707dc06cd2..087020cdb99 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -20,7 +20,6 @@ #include "config.h" -#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -478,11 +477,7 @@ int main(int argc, char **argv) } else { output_file = option_outfile_name; atexit(cleanup_files); - signal(SIGTERM, exit_on_signal); - signal(SIGINT, exit_on_signal); -#ifdef SIGHUP - signal(SIGHUP, exit_on_signal); -#endif + init_signals( exit_on_signal ); if (!(outfile = fopen(output_file, "wb"))) { perror(option_outfile_name); goto error; diff --git a/tools/makedep.c b/tools/makedep.c index 6379b5b69d9..e91f5a3afe2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -27,7 +27,6 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> -#include <signal.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> @@ -4395,11 +4394,7 @@ int main( int argc, char *argv[] ) if (argc > 1) fatal_error( "Directory arguments not supported in this mode\n" ); atexit( cleanup_files ); - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); -#ifdef SIGHUP - signal( SIGHUP, exit_on_signal ); -#endif + init_signals( exit_on_signal ); for (i = 0; i < HASH_SIZE; i++) list_init( &files[i] ); for (i = 0; i < HASH_SIZE; i++) list_init( &global_includes[i] ); diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index b5a2086cac1..2c307dcce8a 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -23,7 +23,6 @@ #include <assert.h> #include <ctype.h> #include <errno.h> -#include <signal.h> #include <stdio.h> #include <stdlib.h> @@ -912,11 +911,7 @@ int main(int argc, char **argv) font_off = (fontdir_off + fontdir_len + 15) & ~0x0f; atexit( cleanup ); - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); -#ifdef SIGHUP - signal( SIGHUP, exit_on_signal ); -#endif + init_signals( exit_on_signal ); if (!output_name) /* build a default output name */ output_name = strmake( "%s%s", get_basename_noext( input_file ), diff --git a/tools/tools.h b/tools/tools.h index 3c25bcc41a9..70ef4bd2584 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -401,6 +401,16 @@ static inline void remove_temp_files(void) } +static inline void init_signals( void (*cleanup)(int) ) +{ + signal( SIGTERM, cleanup ); + signal( SIGINT, cleanup ); +#ifdef SIGHUP + signal( SIGHUP, cleanup ); +#endif +} + + static inline void *read_file( const char *name, size_t *size ) { struct stat st; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1b0a88e3709..7d3fa26f8d0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -28,7 +28,6 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include <signal.h> #include <limits.h> #include <sys/types.h> @@ -704,11 +703,7 @@ int main(int argc,char *argv[]) struct strarray files; char *input; - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); -#ifdef SIGHUP - signal( SIGHUP, exit_on_signal ); -#endif + init_signals( exit_on_signal ); init_argv0_dir( argv[0] ); target = init_argv0_target( argv[0] ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f416d9dd586..f216e4bf35d 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -26,7 +26,6 @@ #include <assert.h> #include <stdio.h> -#include <signal.h> #include <errno.h> #include <string.h> #include <stdarg.h> @@ -619,12 +618,7 @@ int main(int argc, char **argv) struct strarray files; DLLSPEC *spec = main_spec = alloc_dll_spec(); -#ifdef SIGHUP - signal( SIGHUP, exit_on_signal ); -#endif - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); - + init_signals( exit_on_signal ); target = init_argv0_target( argv[0] ); if (target.platform == PLATFORM_CYGWIN) target.platform = PLATFORM_MINGW; if (is_pe()) unwind_tables = 1; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2261eca6c1d..0770ccfbe2a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -91,7 +91,6 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <signal.h> #include <stdarg.h> #include <string.h> #include <errno.h> @@ -1488,11 +1487,7 @@ int main(int argc, char **argv) char* lang = 0; char* str; -#ifdef SIGHUP - signal( SIGHUP, exit_on_signal ); -#endif - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); + init_signals( exit_on_signal ); init_argv0_dir( argv[0] ); /* setup tmp file removal at exit */ diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index c2cf754f590..e4f2377e772 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <signal.h> #include <limits.h> #include <sys/types.h> @@ -221,11 +220,7 @@ int main(int argc,char *argv[]) struct strarray files; atexit( cleanup_files ); - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); -#ifdef SIGHUP - signal( SIGHUP, exit_on_signal ); -#endif + init_signals( exit_on_signal ); init_argv0_dir( argv[0] ); /* First rebuild the commandline to put in destination */ diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 0fe104e2ad3..48d5d2033d8 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -26,7 +26,6 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include <signal.h> #include <limits.h> #include <sys/types.h> @@ -396,11 +395,7 @@ int main(int argc,char *argv[]) { int i; - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); -#ifdef SIGHUP - signal( SIGHUP, exit_on_signal ); -#endif + init_signals( exit_on_signal ); init_argv0_dir( argv[0] ); /* Set the default defined stuff */

1 0

Alex Henrie : msvcrt: Change return type of _ctime32_s and _ctime64_s to errno_t.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 261d7418a8a5d4809ad5033f10a3414f66b38beb URL: https://gitlab.winehq.org/wine/wine/-/commit/261d7418a8a5d4809ad5033f10a341… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 13 18:38:14 2023 -0700 msvcrt: Change return type of _ctime32_s and _ctime64_s to errno_t. --- dlls/msvcrt/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index fb91aa2b1ec..56b80e84105 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1715,7 +1715,7 @@ char * CDECL _ctime64(const __time64_t *time) /********************************************************************* * _ctime64_s (MSVCRT.@) */ -int CDECL _ctime64_s(char *res, size_t len, const __time64_t *time) +errno_t CDECL _ctime64_s(char *res, size_t len, const __time64_t *time) { struct tm *t; @@ -1744,7 +1744,7 @@ char * CDECL _ctime32(const __time32_t *time) /********************************************************************* * _ctime32_s (MSVCRT.@) */ -int CDECL _ctime32_s(char *res, size_t len, const __time32_t *time) +errno_t CDECL _ctime32_s(char *res, size_t len, const __time32_t *time) { struct tm *t;

1 0