Commit: a8d139ca20024fb3b63152989968ba2fd7434eae Author: Harley Acheson Date: Fri Apr 10 14:07:15 2020 -0700 Branches: master https://developer.blender.org/rBa8d139ca20024fb3b63152989968ba2fd7434eae
Fix for T75595: File Browser and Windows Unicode Paths Fix for incorrect conversion to utf16 in BLI_file_attributes(). Differential Revision: https://developer.blender.org/D7398 Reviewed by Brecht Van Lommel =================================================================== M source/blender/blenlib/intern/storage.c =================================================================== diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 9b437b02c0a..154fc966ca2 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -232,8 +232,9 @@ eFileAttributes BLI_file_attributes(const char *path) int ret = 0; # ifdef WIN32 - wchar_t wline[FILE_MAXDIR]; - BLI_strncpy_wchar_from_utf8(wline, path, ARRAY_SIZE(wline)); + WCHAR wline[FILE_MAXDIR]; + size_t bsize = count_utf_16_from_8(path); + conv_utf_8_to_16(path, wline, bsize); DWORD attr = GetFileAttributesW(wline); if (attr & FILE_ATTRIBUTE_READONLY) { ret |= FILE_ATTR_READONLY; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
