Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits: f31ec27b by Steve Lhomme at 2021-06-30T12:59:29+02:00 dwrite: use a LONG for the IDWriteTextAnalysisSource refcount That's what is expected by InterlockedIncrement/InterlockedDecrement and how it's done elsewhere. (cherry picked from commit 2daf3cbf719d490bbb05d14a9d6cbacfd3126064) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 44ed58ee by Steve Lhomme at 2021-06-30T12:59:29+02:00 d3d11_fmt: lookup the GPU in the registry in case-insensitive way It seems newer AMD drivers/GPUs use upper case for the MatchingDeviceId string. Fixes #25863 (cherry picked from commit fe250af922d3a927643ecf3287a03996700c9363)(edited) - the 3.0 branch uses TCHAR instead of wchar_t Signed-off-by: Steve Lhomme <[email protected]> - - - - - 2 changed files: - modules/text_renderer/freetype/fonts/dwrite.cpp - modules/video_chroma/d3d11_fmt.c Changes: ===================================== modules/text_renderer/freetype/fonts/dwrite.cpp ===================================== @@ -215,7 +215,7 @@ class TextSource : public IDWriteTextAnalysisSource IDWriteNumberSubstitution *mp_substitution; wchar_t mpwsz_text[ 3 ]; uint32_t mi_text_length; - ULONG ml_ref_count; + LONG ml_ref_count; public: TextSource( IDWriteFactory *p_factory, IDWriteNumberSubstitution *p_substitution, ===================================== modules/video_chroma/d3d11_fmt.c ===================================== @@ -166,7 +166,7 @@ static HKEY GetAdapterRegistry(vlc_object_t *obj, DXGI_ADAPTER_DESC *adapterDesc len = sizeof(szData); ret = RegQueryValueEx( hKey, TEXT("MatchingDeviceId"), NULL, NULL, (LPBYTE) &szData, &len ); if ( ret == ERROR_SUCCESS ) { - if (_tcsncmp(lookup, szData, _tcslen(lookup)) == 0) + if (_tcsnicmp(lookup, szData, _tcslen(lookup)) == 0) return hKey; msg_Dbg(obj, "different %d device %s vs %s", i, lookup, szData); } View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5fe1fc9f7380ece6910cb26221f9b3e5f5299802...44ed58ee9d9271c0ae08d52f8a9411026a783804 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5fe1fc9f7380ece6910cb26221f9b3e5f5299802...44ed58ee9d9271c0ae08d52f8a9411026a783804 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
