From fa75757c5ff1fd5bc31a86236ee0932737d0ca2e Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 18 Jan 2021 14:21:16 -0800 Subject: [PATCH] Minor code cleanup --- DirectXTex/DirectXTexDDS.cpp | 6 ++++-- DirectXTex/DirectXTexHDR.cpp | 6 ++++-- DirectXTex/DirectXTexTGA.cpp | 6 ++++-- ScreenGrab/ScreenGrab11.cpp | 6 ++++-- ScreenGrab/ScreenGrab9.cpp | 6 ++++-- Texconv/PortablePixMap.cpp | 12 ++++++++---- 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/DirectXTex/DirectXTexDDS.cpp b/DirectXTex/DirectXTexDDS.cpp index 1bb1483..f64d557 100644 --- a/DirectXTex/DirectXTexDDS.cpp +++ b/DirectXTex/DirectXTexDDS.cpp @@ -2208,9 +2208,11 @@ HRESULT DirectX::SaveToDDSFile( // Create file and write header #ifdef WIN32 #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr))); + ScopedHandle hFile(safe_handle(CreateFile2(szFile, + GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr))); #else - ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, 0, nullptr))); + ScopedHandle hFile(safe_handle(CreateFileW(szFile, + GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr))); #endif if (!hFile) { diff --git a/DirectXTex/DirectXTexHDR.cpp b/DirectXTex/DirectXTexHDR.cpp index 907bde6..3d63b90 100644 --- a/DirectXTex/DirectXTexHDR.cpp +++ b/DirectXTex/DirectXTexHDR.cpp @@ -1127,9 +1127,11 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce // Create file and write header #ifdef WIN32 #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr))); + ScopedHandle hFile(safe_handle(CreateFile2(szFile, + GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr))); #else - ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, 0, nullptr))); + ScopedHandle hFile(safe_handle(CreateFileW(szFile, + GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr))); #endif if (!hFile) { diff --git a/DirectXTex/DirectXTexTGA.cpp b/DirectXTex/DirectXTexTGA.cpp index 68e1c70..6fe7a0c 100644 --- a/DirectXTex/DirectXTexTGA.cpp +++ b/DirectXTex/DirectXTexTGA.cpp @@ -2182,9 +2182,11 @@ HRESULT DirectX::SaveToTGAFile( // Create file and write header #ifdef WIN32 #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr))); + ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0, + CREATE_ALWAYS, nullptr))); #else - ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, 0, nullptr))); + ScopedHandle hFile(safe_handle(CreateFileW(szFile, + GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr))); #endif if (!hFile) { diff --git a/ScreenGrab/ScreenGrab11.cpp b/ScreenGrab/ScreenGrab11.cpp index cb6d3d6..82ab45b 100644 --- a/ScreenGrab/ScreenGrab11.cpp +++ b/ScreenGrab/ScreenGrab11.cpp @@ -792,9 +792,11 @@ HRESULT DirectX::SaveDDSTextureToFile( // Create file #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - ScopedHandle hFile(safe_handle(CreateFile2(fileName, GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr))); + ScopedHandle hFile(safe_handle(CreateFile2(fileName, + GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr))); #else - ScopedHandle hFile(safe_handle(CreateFileW(fileName, GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, 0, nullptr))); + ScopedHandle hFile(safe_handle(CreateFileW(fileName, + GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr))); #endif if (!hFile) return HRESULT_FROM_WIN32(GetLastError()); diff --git a/ScreenGrab/ScreenGrab9.cpp b/ScreenGrab/ScreenGrab9.cpp index 070d193..c9692c1 100644 --- a/ScreenGrab/ScreenGrab9.cpp +++ b/ScreenGrab/ScreenGrab9.cpp @@ -581,9 +581,11 @@ HRESULT DirectX::SaveDDSTextureToFile( // Create file #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - ScopedHandle hFile(safe_handle(CreateFile2(fileName, GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr))); + ScopedHandle hFile(safe_handle(CreateFile2(fileName, + GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr))); #else - ScopedHandle hFile(safe_handle(CreateFileW(fileName, GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, 0, nullptr))); + ScopedHandle hFile(safe_handle(CreateFileW(fileName, + GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr))); #endif if (!hFile) return HRESULT_FROM_WIN32(GetLastError()); diff --git a/Texconv/PortablePixMap.cpp b/Texconv/PortablePixMap.cpp index a348417..f671e9a 100644 --- a/Texconv/PortablePixMap.cpp +++ b/Texconv/PortablePixMap.cpp @@ -379,9 +379,11 @@ HRESULT __cdecl SaveToPortablePixMap( } #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr))); + ScopedHandle hFile(safe_handle(CreateFile2(szFile, + GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr))); #else - ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, 0, nullptr))); + ScopedHandle hFile(safe_handle(CreateFileW(szFile, + GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr))); #endif if (!hFile) return HRESULT_FROM_WIN32(GetLastError()); @@ -660,9 +662,11 @@ HRESULT __cdecl SaveToPortablePixMapHDR( tmpImage.Release(); #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr))); + ScopedHandle hFile(safe_handle(CreateFile2(szFile, + GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr))); #else - ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, 0, nullptr))); + ScopedHandle hFile(safe_handle(CreateFileW(szFile, + GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr))); #endif if (!hFile) return HRESULT_FROM_WIN32(GetLastError());