From 757f5ebc966a236cb2d9a345b1f7a88dbb2079ea Mon Sep 17 00:00:00 2001 From: Alberto Fustinoni Date: Mon, 24 Oct 2016 21:19:31 +0900 Subject: [PATCH] Refactoring --- taglib/toolkit/tfilestream.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp index 19199c10..8599bccd 100644 --- a/taglib/toolkit/tfilestream.cpp +++ b/taglib/toolkit/tfilestream.cpp @@ -50,21 +50,17 @@ namespace FileHandle openFile(const FileName &path, bool readOnly) { const DWORD access = readOnly ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE); - - if(!path.wstr().empty()) + #if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602) - return CreateFile2(path.wstr().c_str(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL); + return CreateFile2(path.toString().toCWString(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL); #else + if(!path.wstr().empty()) return CreateFileW(path.wstr().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); -#endif else if(!path.str().empty()) -#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602) - return CreateFile2(path.toString().toCWString(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL); -#else return CreateFileA(path.str().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); -#endif else return InvalidFileHandle; +#endif } void closeFile(FileHandle file) -- 2.40.0