Skip to content

Commit 64e154d

Browse files
walbournwalbourn
committed
Always use CreateFile2
1 parent 83bd7fa commit 64e154d

13 files changed

+84
-175
lines changed

‎Auxiliary/DirectXTexEXR.cpp

-25
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,10 @@ HRESULT DirectX::GetMetadataFromEXRFile(const wchar_t* szFile, TexMetadata& meta
240240
}
241241
}
242242

243-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
244243
ScopedHandle hFile(safe_handle(CreateFile2(
245244
szFile,
246245
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
247246
nullptr)));
248-
#else
249-
ScopedHandle hFile(safe_handle(CreateFileW(
250-
szFile,
251-
GENERIC_READ, FILE_SHARE_READ,
252-
nullptr,
253-
OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
254-
nullptr)));
255-
#endif
256247
if (!hFile)
257248
{
258249
return HRESULT_FROM_WIN32(GetLastError());
@@ -358,19 +349,10 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
358349
}
359350
}
360351

361-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
362352
ScopedHandle hFile(safe_handle(CreateFile2(
363353
szFile,
364354
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
365355
nullptr)));
366-
#else
367-
ScopedHandle hFile(safe_handle(CreateFileW(
368-
szFile,
369-
GENERIC_READ, FILE_SHARE_READ,
370-
nullptr,
371-
OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
372-
nullptr)));
373-
#endif
374356
if (!hFile)
375357
{
376358
return HRESULT_FROM_WIN32(GetLastError());
@@ -508,19 +490,12 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
508490
}
509491

510492
// Create file and write header
511-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
512-
ScopedHandle hFile(safe_handle(CreateFile2(
513-
szFile,
514-
GENERIC_WRITE, 0, CREATE_ALWAYS,
515-
nullptr)));
516-
#else
517493
ScopedHandle hFile(safe_handle(CreateFileW(
518494
szFile,
519495
GENERIC_WRITE, 0,
520496
nullptr,
521497
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL,
522498
nullptr)));
523-
#endif
524499
if (!hFile)
525500
{
526501
return HRESULT_FROM_WIN32(GetLastError());

‎Auxiliary/DirectXTexXboxDDS.cpp

+12-20
Original file line numberDiff line numberDiff line change
@@ -439,12 +439,10 @@ HRESULT Xbox::GetMetadataFromDDSFileEx(
439439

440440
isXbox = false;
441441

442-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
443-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
444-
#else
445-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
446-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
447-
#endif
442+
ScopedHandle hFile(safe_handle(CreateFile2(
443+
szFile,
444+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
445+
nullptr)));
448446
if (!hFile)
449447
{
450448
return HRESULT_FROM_WIN32(GetLastError());
@@ -591,13 +589,10 @@ HRESULT Xbox::LoadFromDDSFileEx(
591589

592590
xbox.Release();
593591

594-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
595-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
596-
#else
597-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
598-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
599-
#endif
600-
592+
ScopedHandle hFile(safe_handle(CreateFile2(
593+
szFile,
594+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
595+
nullptr)));
601596
if (!hFile)
602597
{
603598
return HRESULT_FROM_WIN32(GetLastError());
@@ -742,13 +737,10 @@ HRESULT Xbox::SaveToDDSFile(const XboxImage& xbox, const wchar_t* szFile)
742737
return hr;
743738

744739
// Create file and write header
745-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
746-
ScopedHandle hFile(safe_handle(CreateFile2(szFile,
747-
GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr)));
748-
#else
749-
ScopedHandle hFile(safe_handle(CreateFileW(szFile,
750-
GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
751-
#endif
740+
ScopedHandle hFile(safe_handle(CreateFile2(
741+
szFile,
742+
GENERIC_WRITE, 0, CREATE_ALWAYS,
743+
nullptr)));
752744
if (!hFile)
753745
{
754746
return HRESULT_FROM_WIN32(GetLastError());

‎CMakePresets.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
},
119119

120120
{
121-
"name": "Win7",
121+
"name": "Win8",
122122
"cacheVariables": {
123123
"BUILD_DX12": false
124124
},
@@ -294,10 +294,10 @@
294294
{ "name": "arm64-Debug-UWP" , "description": "MSVC for ARM64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "MSVC", "UWP" ] },
295295
{ "name": "arm64-Release-UWP", "description": "MSVC for ARM64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "MSVC", "UWP" ] },
296296

297-
{ "name": "x64-Debug-Win7" , "description": "MSVC for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "MSVC", "Win7" ] },
298-
{ "name": "x64-Release-Win7" , "description": "MSVC for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "MSVC", "Win7" ] },
299-
{ "name": "x86-Debug-Win7" , "description": "MSVC for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "MSVC", "Win7" ] },
300-
{ "name": "x86-Release-Win7" , "description": "MSVC for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "MSVC", "Win7" ] },
297+
{ "name": "x64-Debug-Win8" , "description": "MSVC for x64 (Debug) for Windows 8.1", "inherits": [ "base", "x64", "Debug", "MSVC", "Win8" ] },
298+
{ "name": "x64-Release-Win8" , "description": "MSVC for x64 (Release) for Windows 8.1", "inherits": [ "base", "x64", "Release", "MSVC", "Win8" ] },
299+
{ "name": "x86-Debug-Win8" , "description": "MSVC for x86 (Debug) for Windows 8.1", "inherits": [ "base", "x86", "Debug", "MSVC", "Win8" ] },
300+
{ "name": "x86-Release-Win8" , "description": "MSVC for x86 (Release) for Windows 8.1", "inherits": [ "base", "x86", "Release", "MSVC", "Win8" ] },
301301

302302
{ "name": "x64-Debug-Scarlett" , "description": "MSVC for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "MSVC", "Scarlett" ] },
303303
{ "name": "x64-Release-Scarlett" , "description": "MSVC for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "MSVC", "Scarlett" ] },
@@ -337,10 +337,10 @@
337337
{ "name": "arm64-Debug-UWP-Clang" , "description": "Clang/LLVM for AArch64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "Clang", "Clang-AArch64", "UWP" ] },
338338
{ "name": "arm64-Release-UWP-Clang", "description": "Clang/LLVM for AArch64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "Clang", "Clang-AArch64", "UWP" ] },
339339

340-
{ "name": "x64-Debug-Win7-Clang" , "description": "Clang/LLVM for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "Clang", "Win7" ] },
341-
{ "name": "x64-Release-Win7-Clang", "description": "Clang/LLVM for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "Clang", "Win7" ] },
342-
{ "name": "x86-Debug-Win7-Clang" , "description": "Clang/LLVM for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "Win7" ] },
343-
{ "name": "x86-Release-Win7-Clang", "description": "Clang/LLVM for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "Win7" ] },
340+
{ "name": "x64-Debug-Win8-Clang" , "description": "Clang/LLVM for x64 (Debug) for Windows 8.1", "inherits": [ "base", "x64", "Debug", "Clang", "Win8" ] },
341+
{ "name": "x64-Release-Win8-Clang", "description": "Clang/LLVM for x64 (Release) for Windows 8.1", "inherits": [ "base", "x64", "Release", "Clang", "Win8" ] },
342+
{ "name": "x86-Debug-Win8-Clang" , "description": "Clang/LLVM for x86 (Debug) for Windows 8.1", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "Win8" ] },
343+
{ "name": "x86-Release-Win8-Clang", "description": "Clang/LLVM for x86 (Release) for Windows 8.1", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "Win8" ] },
344344

345345
{ "name": "x64-Debug-Clang-VCPKG" , "description": "Clang/LLVM for x64 (Debug) using VCPKG/OpenEXR", "inherits": [ "base", "x64", "Debug", "Clang", "VCPKG" ] },
346346
{ "name": "x64-Release-Clang-VCPKG" , "description": "Clang/LLVM for x64 (Release) using VCPKG/OpenEXR", "inherits": [ "base", "x64", "Release", "Clang", "VCPKG" ] },

‎DDSTextureLoader/DDSTextureLoader11.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -239,20 +239,10 @@ namespace
239239
*bitSize = 0;
240240

241241
// open the file
242-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
243242
ScopedHandle hFile(safe_handle(CreateFile2(
244243
fileName,
245244
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
246245
nullptr)));
247-
#else
248-
ScopedHandle hFile(safe_handle(CreateFileW(
249-
fileName,
250-
GENERIC_READ, FILE_SHARE_READ,
251-
nullptr,
252-
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
253-
nullptr)));
254-
#endif
255-
256246
if (!hFile)
257247
{
258248
return HRESULT_FROM_WIN32(GetLastError());

‎DDSTextureLoader/DDSTextureLoader9.cpp

+3-15
Original file line numberDiff line numberDiff line change
@@ -204,22 +204,10 @@ namespace
204204
*bitSize = 0;
205205

206206
// open the file
207-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
208-
ScopedHandle hFile(safe_handle(CreateFile2(fileName,
209-
GENERIC_READ,
210-
FILE_SHARE_READ,
211-
OPEN_EXISTING,
207+
ScopedHandle hFile(safe_handle(CreateFile2(
208+
fileName,
209+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
212210
nullptr)));
213-
#else
214-
ScopedHandle hFile(safe_handle(CreateFileW(fileName,
215-
GENERIC_READ,
216-
FILE_SHARE_READ,
217-
nullptr,
218-
OPEN_EXISTING,
219-
FILE_ATTRIBUTE_NORMAL,
220-
nullptr)));
221-
#endif
222-
223211
if (!hFile)
224212
{
225213
return HRESULT_FROM_WIN32(GetLastError());

‎DirectXTex/DirectXTexDDS.cpp

+10-18
Original file line numberDiff line numberDiff line change
@@ -1878,12 +1878,10 @@ HRESULT DirectX::GetMetadataFromDDSFileEx(
18781878
return E_INVALIDARG;
18791879

18801880
#ifdef _WIN32
1881-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
1882-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
1883-
#else
1884-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
1885-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
1886-
#endif
1881+
ScopedHandle hFile(safe_handle(CreateFile2(
1882+
szFile,
1883+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
1884+
nullptr)));
18871885
if (!hFile)
18881886
{
18891887
return HRESULT_FROM_WIN32(GetLastError());
@@ -2064,12 +2062,10 @@ HRESULT DirectX::LoadFromDDSFileEx(
20642062
image.Release();
20652063

20662064
#ifdef _WIN32
2067-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
2068-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
2069-
#else
2070-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
2071-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
2072-
#endif
2065+
ScopedHandle hFile(safe_handle(CreateFile2(
2066+
szFile,
2067+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
2068+
nullptr)));
20732069
if (!hFile)
20742070
{
20752071
return HRESULT_FROM_WIN32(GetLastError());
@@ -2548,13 +2544,9 @@ HRESULT DirectX::SaveToDDSFile(
25482544

25492545
// Create file and write header
25502546
#ifdef _WIN32
2551-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
2552-
ScopedHandle hFile(safe_handle(CreateFile2(szFile,
2547+
ScopedHandle hFile(safe_handle(CreateFile2(
2548+
szFile,
25532549
GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr)));
2554-
#else
2555-
ScopedHandle hFile(safe_handle(CreateFileW(szFile,
2556-
GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
2557-
#endif
25582550
if (!hFile)
25592551
{
25602552
return HRESULT_FROM_WIN32(GetLastError());

‎DirectXTex/DirectXTexHDR.cpp

+10-18
Original file line numberDiff line numberDiff line change
@@ -617,12 +617,10 @@ HRESULT DirectX::GetMetadataFromHDRFile(const wchar_t* szFile, TexMetadata& meta
617617
return E_INVALIDARG;
618618

619619
#ifdef _WIN32
620-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
621-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
622-
#else
623-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
624-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
625-
#endif
620+
ScopedHandle hFile(safe_handle(CreateFile2(
621+
szFile,
622+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
623+
nullptr)));
626624
if (!hFile)
627625
{
628626
return HRESULT_FROM_WIN32(GetLastError());
@@ -921,12 +919,10 @@ HRESULT DirectX::LoadFromHDRFile(const wchar_t* szFile, TexMetadata* metadata, S
921919
image.Release();
922920

923921
#ifdef _WIN32
924-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
925-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
926-
#else
927-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
928-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
929-
#endif
922+
ScopedHandle hFile(safe_handle(CreateFile2(
923+
szFile,
924+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
925+
nullptr)));
930926
if (!hFile)
931927
{
932928
return HRESULT_FROM_WIN32(GetLastError());
@@ -1144,13 +1140,9 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
11441140

11451141
// Create file and write header
11461142
#ifdef _WIN32
1147-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
1148-
ScopedHandle hFile(safe_handle(CreateFile2(szFile,
1143+
ScopedHandle hFile(safe_handle(CreateFile2(
1144+
szFile,
11491145
GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr)));
1150-
#else
1151-
ScopedHandle hFile(safe_handle(CreateFileW(szFile,
1152-
GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
1153-
#endif
11541146
if (!hFile)
11551147
{
11561148
return HRESULT_FROM_WIN32(GetLastError());

‎DirectXTex/DirectXTexTGA.cpp

+12-19
Original file line numberDiff line numberDiff line change
@@ -1492,12 +1492,10 @@ HRESULT DirectX::GetMetadataFromTGAFile(const wchar_t* szFile, TGA_FLAGS flags,
14921492
return E_INVALIDARG;
14931493

14941494
#ifdef _WIN32
1495-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
1496-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
1497-
#else
1498-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
1499-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
1500-
#endif
1495+
ScopedHandle hFile(safe_handle(CreateFile2(
1496+
szFile,
1497+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
1498+
nullptr)));
15011499
if (!hFile)
15021500
{
15031501
return HRESULT_FROM_WIN32(GetLastError());
@@ -1758,12 +1756,10 @@ HRESULT DirectX::LoadFromTGAFile(
17581756
image.Release();
17591757

17601758
#ifdef _WIN32
1761-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
1762-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
1763-
#else
1764-
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
1765-
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
1766-
#endif
1759+
ScopedHandle hFile(safe_handle(CreateFile2(
1760+
szFile,
1761+
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
1762+
nullptr)));
17671763
if (!hFile)
17681764
{
17691765
return HRESULT_FROM_WIN32(GetLastError());
@@ -2357,13 +2353,10 @@ HRESULT DirectX::SaveToTGAFile(
23572353

23582354
// Create file and write header
23592355
#ifdef _WIN32
2360-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
2361-
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0,
2362-
CREATE_ALWAYS, nullptr)));
2363-
#else
2364-
ScopedHandle hFile(safe_handle(CreateFileW(szFile,
2365-
GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
2366-
#endif
2356+
ScopedHandle hFile(safe_handle(CreateFile2(
2357+
szFile,
2358+
GENERIC_WRITE, 0, CREATE_ALWAYS,
2359+
nullptr)));
23672360
if (!hFile)
23682361
{
23692362
return HRESULT_FROM_WIN32(GetLastError());

‎ScreenGrab/ScreenGrab11.cpp

+4-7
Original file line numberDiff line numberDiff line change
@@ -803,13 +803,10 @@ HRESULT DirectX::SaveDDSTextureToFile(
803803
return hr;
804804

805805
// Create file
806-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
807-
ScopedHandle hFile(safe_handle(CreateFile2(fileName,
808-
GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr)));
809-
#else
810-
ScopedHandle hFile(safe_handle(CreateFileW(fileName,
811-
GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
812-
#endif
806+
ScopedHandle hFile(safe_handle(CreateFile2(
807+
fileName,
808+
GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS,
809+
nullptr)));
813810
if (!hFile)
814811
return HRESULT_FROM_WIN32(GetLastError());
815812

‎ScreenGrab/ScreenGrab12.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,10 @@ HRESULT DirectX::SaveDDSTextureToFile(
967967

968968
// Create file
969969
#ifdef _WIN32
970-
ScopedHandle hFile(safe_handle(CreateFile2(fileName, GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr)));
970+
ScopedHandle hFile(safe_handle(CreateFile2(
971+
fileName,
972+
GENERIC_WRITE, 0, CREATE_ALWAYS,
973+
nullptr)));
971974
if (!hFile)
972975
return HRESULT_FROM_WIN32(GetLastError());
973976

‎ScreenGrab/ScreenGrab9.cpp

+4-7
Original file line numberDiff line numberDiff line change
@@ -590,13 +590,10 @@ HRESULT DirectX::SaveDDSTextureToFile(
590590
}
591591

592592
// Create file
593-
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
594-
ScopedHandle hFile(safe_handle(CreateFile2(fileName,
595-
GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr)));
596-
#else
597-
ScopedHandle hFile(safe_handle(CreateFileW(fileName,
598-
GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
599-
#endif
593+
ScopedHandle hFile(safe_handle(CreateFile2(
594+
fileName,
595+
GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS,
596+
nullptr)));
600597
if (!hFile)
601598
return HRESULT_FROM_WIN32(GetLastError());
602599

0 commit comments

Comments
 (0)