July 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : mfmediaengine: Handle Play() when called before topology is set.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: bf824dbb921eded8bbc37eeb8ec76a1d2933f2b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf824dbb921eded8bbc37eeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 22 17:46:11 2021 +0300 mfmediaengine: Handle Play() when called before topology is set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index bd3fd04aabd..a555d0dad99 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -84,6 +84,8 @@ enum media_engine_flags FLAGS_ENGINE_FIRST_FRAME = 0x2000, FLAGS_ENGINE_IS_ENDED = 0x4000, FLAGS_ENGINE_NEW_FRAME = 0x8000, + FLAGS_ENGINE_SOURCE_PENDING = 0x10000, + FLAGS_ENGINE_PLAY_PENDING = 0x20000, }; struct vec3 @@ -1181,9 +1183,18 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return hr; } +static void media_engine_start_playback(struct media_engine *engine) +{ + PROPVARIANT var; + + var.vt = VT_EMPTY; + IMFMediaSession_Start(engine->session, &GUID_NULL, &var); +} + static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_engine *engine = impl_from_load_handler_IMFAsyncCallback(iface); + unsigned int start_playback; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; IUnknown *object = NULL; @@ -1194,6 +1205,9 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, engine->network_state = MF_MEDIA_ENGINE_NETWORK_LOADING; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADSTART, 0, 0); + start_playback = engine->flags & FLAGS_ENGINE_PLAY_PENDING; + media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING | FLAGS_ENGINE_PLAY_PENDING, FALSE); + if (FAILED(hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object))) WARN("Failed to create source object, hr %#x.\n", hr); @@ -1210,6 +1224,8 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, if (SUCCEEDED(hr)) { engine->network_state = MF_MEDIA_ENGINE_NETWORK_IDLE; + if (start_playback) + media_engine_start_playback(engine); } else { @@ -1387,6 +1403,9 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) &IID_IPropertyStore, (void **)&props); hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, &engine->load_handler, NULL); + if (SUCCEEDED(hr)) + media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING, TRUE); + if (props) IPropertyStore_Release(props); } @@ -1723,7 +1742,6 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) { struct media_engine *engine = impl_from_IMFMediaEngine(iface); - PROPVARIANT var; TRACE("%p.\n", iface); @@ -1736,8 +1754,10 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); - var.vt = VT_EMPTY; - IMFMediaSession_Start(engine->session, &GUID_NULL, &var); + if (!(engine->flags & FLAGS_ENGINE_SOURCE_PENDING)) + media_engine_start_playback(engine); + else + media_engine_set_flag(engine, FLAGS_ENGINE_PLAY_PENDING, TRUE); media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); }

1 0

Nikolay Sivov : mfmediaengine: Handle B8G8R8X8 format for d3d11 texture output.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: aeabe991ff8ae69ee9959b908851f8b1148f7cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeabe991ff8ae69ee9959b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 22 17:46:12 2021 +0300 mfmediaengine: Handle B8G8R8X8 format for d3d11 texture output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index a555d0dad99..98504c5e269 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2018,6 +2018,7 @@ static void media_engine_update_d3d11_frame_surface(ID3D11DeviceContext *context switch (surface_desc.Format) { case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_B8G8R8X8_UNORM: surface_desc.Width *= 4; break; default:

1 0

Daniel Lehman : include: Add _tcsxfrm_l declaration.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: c518a5362b925379b1a79e8323d60e19863effc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c518a5362b925379b1a79e83… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jul 22 10:25:50 2021 -0700 include: Add _tcsxfrm_l declaration. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstring.h | 1 + include/msvcrt/string.h | 1 + include/tchar.h | 1 + 3 files changed, 3 insertions(+) diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 53537185f43..00e7863b5c3 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -47,6 +47,7 @@ _ACRTIMP wchar_t* __cdecl _wcsrev(wchar_t*); _ACRTIMP wchar_t* __cdecl _wcsset(wchar_t*,wchar_t); _ACRTIMP wchar_t* __cdecl _wcsupr(wchar_t*); _ACRTIMP errno_t __cdecl _wcsupr_s(wchar_t*, size_t); +_ACRTIMP size_t __cdecl _wcsxfrm_l(wchar_t*,const wchar_t*,size_t,_locale_t); _ACRTIMP wchar_t* __cdecl wcscat(wchar_t*,const wchar_t*); _ACRTIMP errno_t __cdecl wcscat_s(wchar_t*,size_t,const wchar_t*); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 2beb429f036..5e3d51076c6 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -40,6 +40,7 @@ _ACRTIMP char* __cdecl _strrev(char*); _ACRTIMP char* __cdecl _strset(char*,int); _ACRTIMP char* __cdecl _strupr(char*); _ACRTIMP errno_t __cdecl _strupr_s(char *, size_t); +_ACRTIMP size_t __cdecl _strxfrm_l(char*,const char*,size_t,_locale_t); _ACRTIMP errno_t __cdecl memmove_s(void*,size_t,const void*,size_t); _ACRTIMP char* __cdecl strcat(char*,const char*); diff --git a/include/tchar.h b/include/tchar.h index a8e64b4bf6a..1231edc565c 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -154,6 +154,7 @@ extern "C" { #define _tcsupr WINE_tchar_routine(_strupr, _mbsupr, _wcsupr) #define _tcsupr_s WINE_tchar_routine(_strupr_s, _mbsupr_s, _wcsupr_s) #define _tcsxfrm WINE_tchar_routine(strxfrm, strxfrm, wcsxfrm) +#define _tcsxfrm_l WINE_tchar_routine(_strxfrm_l, _strxfrm_l, _ wcsxfrm_l) #define _tctime WINE_tchar_routine(ctime, ctime, _wctime) #define _tenviron WINE_tchar_routine(_environ, _environ, _wenviron) #define _texecl WINE_tchar_routine(execl, _execl, _wexecl)

1 0

Zebediah Figura : cryptnet: Check only the first successfully retrieved CRL in verify_cert_revocation_from_dist_points_ext().
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 13a349540ae0230f83466c04e003209656a889c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a349540ae0230f83466c04… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 00:21:06 2021 -0500 cryptnet: Check only the first successfully retrieved CRL in verify_cert_revocation_from_dist_points_ext(). >From RFC 5280 § 4.2.1.13: If the DistributionPointName contains multiple values, each name describes a different mechanism to obtain the same CRL. For example, the same CRL could be available for retrieval through both LDAP and HTTP. Steam attempts to validate a certificate containing what are apparently two different mirrored URLs to the same 20 MB CRL, which currently takes over 400ms to parse in Wine. According to my reading of the RFC, we should only need to parse one of them, cutting the time in half. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 111 ++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index f4088021a0e..b1e2829d881 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1528,66 +1528,71 @@ static DWORD verify_cert_revocation_with_crl_online(const CERT_CONTEXT *cert, return ERROR_SUCCESS; } +/* Try to retrieve a CRL from any one of the specified distribution points. */ +static const CRL_CONTEXT *retrieve_crl_from_dist_points(const CRYPT_URL_ARRAY *array, + DWORD verify_flags, DWORD timeout) +{ + DWORD retrieve_flags = 0; + const CRL_CONTEXT *crl; + DWORD i; + + if (verify_flags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) + retrieve_flags |= CRYPT_CACHE_ONLY_RETRIEVAL; + + /* Yes, this is a weird algorithm, but the documentation for + * CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT specifies this, and + * tests seem to bear it out for CertVerifyRevocation() as well. */ + if (verify_flags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) + timeout /= 2; + + for (i = 0; i < array->cUrl; ++i) + { + if (CryptRetrieveObjectByUrlW(array->rgwszUrl[i], CONTEXT_OID_CRL, retrieve_flags, + timeout, (void **)&crl, NULL, NULL, NULL, NULL)) + return crl; + + /* We don't check the current time here. This may result in less + * accurate timeouts, but this too seems to be true of Windows. */ + if ((verify_flags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && GetLastError() == ERROR_TIMEOUT) + timeout /= 2; + } + + return NULL; +} + static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, - FILETIME *pTime, DWORD dwFlags, const CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) + FILETIME *time, DWORD flags, const CERT_REVOCATION_PARA *params, CERT_REVOCATION_STATUS *status) { - DWORD error = ERROR_SUCCESS, cbUrlArray; + DWORD url_array_size, error; + CRYPT_URL_ARRAY *url_array; + const CRL_CONTEXT *crl; + DWORD timeout = 0; + + if (!CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &url_array_size, NULL, NULL)) + return GetLastError(); + + if (!(url_array = CryptMemAlloc(url_array_size))) + return ERROR_OUTOFMEMORY; - if (CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &cbUrlArray, NULL, NULL)) + if (!CRYPT_GetUrlFromCRLDistPointsExt(value, url_array, &url_array_size, NULL, NULL)) { - CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); + CryptMemFree(url_array); + return GetLastError(); + } - if (urlArray) - { - DWORD j, retrievalFlags = 0, timeout = 0; - BOOL ret; - - ret = CRYPT_GetUrlFromCRLDistPointsExt(value, urlArray, - &cbUrlArray, NULL, NULL); - if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) - retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; - - if (pRevPara && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) - timeout = pRevPara->dwUrlRetrievalTimeout; - - /* Yes, this is a weird algorithm, but the documentation for - * CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT specifies this, and - * tests seem to bear it out for CertVerifyRevocation() as well. */ - if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) - timeout /= 2; - - if (!ret) - error = GetLastError(); - /* continue looping if one was offline; break if revoked or timed out */ - for (j = 0; (!error || error == CRYPT_E_REVOCATION_OFFLINE) && j < urlArray->cUrl; j++) - { - PCCRL_CONTEXT crl; + if (params && params->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) + timeout = params->dwUrlRetrievalTimeout; - ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], - CONTEXT_OID_CRL, retrievalFlags, timeout, (void **)&crl, - NULL, NULL, NULL, NULL); - if (ret) - { - error = verify_cert_revocation_with_crl_online(cert, crl, pTime, pRevStatus); - CertFreeCRLContext(crl); - } - else - { - /* We don't check the current time here. This may result in - * less accurate timeouts, but this too seems to be true of - * Windows. */ - if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && GetLastError() == ERROR_TIMEOUT) - timeout /= 2; - error = CRYPT_E_REVOCATION_OFFLINE; - } - } - CryptMemFree(urlArray); - } - else - error = ERROR_OUTOFMEMORY; + if (!(crl = retrieve_crl_from_dist_points(url_array, flags, timeout))) + { + CryptMemFree(url_array); + return CRYPT_E_REVOCATION_OFFLINE; } - else - error = GetLastError(); + + error = verify_cert_revocation_with_crl_online(cert, crl, time, status); + + CertFreeCRLContext(crl); + CryptMemFree(url_array); return error; }

1 0

Zebediah Figura : cryptnet: Cache the result of revocation checks on disk.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: b49ffc574cd18db73d4271a4bdace3968d60b626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49ffc574cd18db73d4271a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 00:21:07 2021 -0500 cryptnet: Cache the result of revocation checks on disk. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/Makefile.in | 2 +- dlls/cryptnet/cryptnet_main.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 1 deletion(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index 8482882cdce..1e97f26d9df 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = cryptnet.dll IMPORTLIB = cryptnet -IMPORTS = crypt32 +IMPORTS = crypt32 shell32 ole32 DELAYIMPORTS = wininet EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index b1e2829d881..2f4e2d895f7 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -21,6 +21,7 @@ #define NONAMELESSUNION #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS +#include <share.h> #include <stdio.h> #include <stdarg.h> @@ -31,6 +32,9 @@ #include "wininet.h" #include "objbase.h" #include "wincrypt.h" +#include "initguid.h" +#include "knownfolders.h" +#include "shlobj.h" #include "wine/debug.h" @@ -1514,6 +1518,124 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +/* Store successful revocation checks (whether the certificate was revoked or + * not) in an on-disk cache. This is not because of network latency—we already + * have a cache for that—but rather because parsing very large CRLs can take a + * long time (at the time of writing, 20 MB CRLs have been seen in the wild and + * can take several hundred milliseconds) and applications expect chain building + * to be much faster. + * + * The cache is treated as invalid once we pass the nextUpdate field of the CRL. + * This isn't quite what the field is meant for (it's rather meant to specify a + * later bound for the next time the CRL will be reissued, and doesn't prescribe + * a date by which the CRL is invalid; see RFC 5280 § 5.1.2.5) but it's the way + * it's used in practice. + * + * The location of the cache roughly matches Windows, but the file name and + * contents do not. + */ + +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) +{ + WCHAR path[MAX_PATH]; + WCHAR *appdata_path; + DWORD len, i; + HRESULT hr; + + if (FAILED(hr = SHGetKnownFolderPath(&FOLDERID_LocalAppDataLow, 0, NULL, &appdata_path))) + { + ERR("Failed to get LocalAppDataLow path, hr %#x.\n", hr); + return INVALID_HANDLE_VALUE; + } + + 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) + { + WARN("Serial length exceeds static buffer; not caching.\n"); + return INVALID_HANDLE_VALUE; + } + + SHCreateDirectoryExW(NULL, path, NULL); + + for (i = 0; i < serial->cbData; ++i) + { + swprintf(path + len, 3, L"%02x", serial->pbData[i]); + len += 2; + } + + return _wfsopen(path, mode, sharing); +} + +static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, + const FILETIME *time, CERT_REVOCATION_STATUS *status) +{ + char buffer[sizeof(revocation_cache_signature)]; + FILETIME update_time; + FILE *file; + int len; + + if (!(file = open_cached_revocation_file(serial, L"r", _SH_DENYWR))) + return FALSE; + + if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) + || memcmp(buffer, revocation_cache_signature, len)) + { + ERR("Invalid cache signature.\n"); + fclose(file); + return FALSE; + } + + if (fread(&update_time, sizeof(update_time), 1, file) != 1) + { + ERR("Failed to read update time.\n"); + fclose(file); + return FALSE; + } + + if (CompareFileTime(time, &update_time) > 0) + { + TRACE("Cached revocation status is potentially out of date.\n"); + fclose(file); + return FALSE; + } + + if (fread(&status->dwError, sizeof(status->dwError), 1, file) != 1) + { + ERR("Failed to read error code.\n"); + fclose(file); + return FALSE; + } + + if (status->dwError == CERT_E_REVOKED && fread(&status->dwReason, sizeof(status->dwReason), 1, file) != 1) + { + ERR("Failed to read revocation reason.\n"); + fclose(file); + return FALSE; + } + + TRACE("Using cached status %#x, reason %#x.\n", status->dwError, status->dwReason); + return TRUE; +} + +static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, + const FILETIME *time, const CERT_REVOCATION_STATUS *status) +{ + FILE *file; + + if (!(file = open_cached_revocation_file(serial, L"w", _SH_DENYRW))) + return; + fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); + fwrite(time, sizeof(*time), 1, file); + fwrite(&status->dwError, sizeof(status->dwError), 1, file); + if (status->dwError == CERT_E_REVOKED) + fwrite(&status->dwReason, sizeof(status->dwReason), 1, file); + fclose(file); +} + static DWORD verify_cert_revocation_with_crl_online(const CERT_CONTEXT *cert, const CRL_CONTEXT *crl, FILETIME *pTime, CERT_REVOCATION_STATUS *pRevStatus) { @@ -1591,6 +1713,8 @@ 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); + CertFreeCRLContext(crl); CryptMemFree(url_array); return error; @@ -1663,6 +1787,9 @@ 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)) + return pRevStatus->dwError; + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) {

1 0

Jacek Caban : gdi32: Use free_gdi_handle directly for NtGdiDeleteClientObj.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 808d1818a1842a8db7090a4e5dcf71c20bec1fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808d1818a1842a8db7090a4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:23:54 2021 +0200 gdi32: Use free_gdi_handle directly for NtGdiDeleteClientObj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 9059f817636..16a7b897e30 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -971,9 +971,12 @@ HANDLE WINAPI NtGdiCreateClientObj( ULONG type ) /*********************************************************************** * NtGdiDeleteClientObj (win32u.@) */ -BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ obj ) +BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ handle ) { - return NtGdiDeleteObjectApp( obj ); + void *obj; + if (!(obj = free_gdi_handle( handle ))) return FALSE; + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } /***********************************************************************

1 0

Daniel Lehman : gdi32/tests: Add a test for double-free on repeated calls to Delete[Enh]MetaFile.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 323416920f4e9c07ba224237a6bd0539803d7709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=323416920f4e9c07ba224237… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jul 22 11:24:15 2021 +0200 gdi32/tests: Add a test for double-free on repeated calls to Delete[Enh]MetaFile. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 921ac888247..4f72079a615 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3049,7 +3049,13 @@ static void test_metafile_file(void) EnumMetaFile(0, metafile, mf_enum_proc, 0); } - DeleteMetaFile(metafile); + ret = DeleteMetaFile(metafile); + ok(ret, "Could not delete metafile: %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteMetaFile(metafile); + ok(!ret, "DeleteMetaFile succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); SetLastError(0xdeadbeef); metafile = CloseMetaFile(dc); @@ -3144,7 +3150,13 @@ static void test_enhmetafile_file(void) dump_emf_records(metafile, "emf_Bezier"); } - DeleteEnhMetaFile(metafile); + ret = DeleteEnhMetaFile(metafile); + ok(ret, "Could not delete emf: %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteEnhMetaFile(metafile); + ok(!ret, "DeleteEnhMetaFile succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); SetLastError(0xdeadbeef); metafile = CloseEnhMetaFile(dc);

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for PolyPolygon implementation.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 1b7a15e4cc96f85078c031d8e7ba0aa2d2b482b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7a15e4cc96f85078c031d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:25:17 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for PolyPolygon implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 12 ++++++++++-- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 10 +++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/painting.c | 29 +++++++++++++++++++---------- include/ntgdi.h | 10 ++++++++++ 10 files changed, 73 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b7a15e4cc96f85078c0…

1 0

Jacek Caban : winex11: Don't use pPolygon graphics driver entry point.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 3a7c1630ea8fedb2ff717762f42b2a4eda39c68a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7c1630ea8fedb2ff717762… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:25:30 2021 +0200 winex11: Don't use pPolygon graphics driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/graphics.c | 4 +++- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 77ca60ec44d..e2b8b9d3233 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1074,7 +1074,7 @@ BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) /********************************************************************** * X11DRV_Polygon */ -BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) +static BOOL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); int i; @@ -1123,6 +1123,8 @@ BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, POINT *points; BOOL ret = FALSE; + if (polygons == 1) return X11DRV_Polygon( dev, pt, *counts ); + for (i = 0; i < polygons; i++) { if (counts[i] < 2) return FALSE; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ff3d5317697..66603d2a240 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -416,7 +416,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pPolyDraw */ X11DRV_PolyPolygon, /* pPolyPolygon */ X11DRV_PolyPolyline, /* pPolyPolyline */ - X11DRV_Polygon, /* pPolygon */ + NULL, /* pPolygon */ NULL, /* pPolyline */ NULL, /* pPolylineTo */ X11DRV_PutImage, /* pPutImage */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c23cd512eb9..e14e131d819 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -168,7 +168,6 @@ extern BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines) DECLSPEC_HIDDEN; extern DWORD CDECL X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for Polygon implementation.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: c64bfb5433e0405f1dc5a82ea012879c581f3b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64bfb5433e0405f1dc5a82e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:26:00 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for Polygon implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 14 +++++++------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 20 -------------------- 11 files changed, 34 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c64bfb5433e0405f1dc5…

1 0