Asteroids: fix c++17 build issues

Author: TheMostDiligent

Samples/Asteroids/src/DDSTextureLoader.cpp

@@ -63,12 +63,12 @@ DXGI_FORMAT MAKE_SRGB( _In_ DXGI_FORMAT format )
 
 
 //--------------------------------------------------------------------------------------
-HRESULT LoadTextureDataFromFile( __in_z const WCHAR* szFileName, BYTE** ppHeapData,
+HRESULT LoadTextureDataFromFile( __in_z const CHAR* szFileName, BYTE** ppHeapData,
                                 DDS_HEADER** ppHeader,
                                 BYTE** ppBitData, UINT* pBitSize )
 {
     // open the file
-    HANDLE hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
+    HANDLE hFile = CreateFileA(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
                                FILE_FLAG_SEQUENTIAL_SCAN, NULL );
     if( INVALID_HANDLE_VALUE == hFile )
         return HRESULT_FROM_WIN32( GetLastError() );
@@ -1064,7 +1064,7 @@ static HRESULT CreateTextureFromDDS( ID3D11Device* pDev, DDS_HEADER* pHeader, __
 
 
 //--------------------------------------------------------------------------------------
-HRESULT CreateDDSTextureFromFile( __in ID3D11Device* pDev, __in_z const WCHAR* szFileName, __out_opt ID3D11ShaderResourceView** ppSRV, bool sRGB )
+HRESULT CreateDDSTextureFromFile( __in ID3D11Device* pDev, __in_z const CHAR* szFileName, __out_opt ID3D11ShaderResourceView** ppSRV, bool sRGB )
 {
     if ( !pDev || !szFileName || !ppSRV )
         return E_INVALIDARG;
@@ -1087,15 +1087,7 @@ HRESULT CreateDDSTextureFromFile( __in ID3D11Device* pDev, __in_z const WCHAR* s
 #if defined(DEBUG) || defined(PROFILE)
     if ( *ppSRV )
     {
-        CHAR strFileA[MAX_PATH];
-        WideCharToMultiByte( CP_ACP, 0, szFileName, -1, strFileA, MAX_PATH, NULL, FALSE );
-        CHAR* pstrName = strrchr( strFileA, '\\' );
-        if( pstrName == NULL )
-            pstrName = strFileA;
-        else
-            pstrName++;
-        
-        (*ppSRV)->SetPrivateData( WKPDID_D3DDebugObjectName, lstrlenA(pstrName), pstrName );
+        (*ppSRV)->SetPrivateData( WKPDID_D3DDebugObjectName, lstrlenA(szFileName), szFileName );
     }
 #endif
 

Samples/Asteroids/src/DDSTextureLoader.h

@@ -9,10 +9,10 @@
 #include "DDS.h"
 #include <d3d11.h>
 
-HRESULT CreateDDSTextureFromFile( __in ID3D11Device* pDev, __in_z const WCHAR* szFileName, __out_opt ID3D11ShaderResourceView** ppSRV, bool sRGB = false );
+HRESULT CreateDDSTextureFromFile( __in ID3D11Device* pDev, __in_z const CHAR* szFileName, __out_opt ID3D11ShaderResourceView** ppSRV, bool sRGB = false );
 
 // INTEL: Exposed this from the internals so we can load the data into D3D12, etc.
 DXGI_FORMAT GetDXGIFormat( const DDS_PIXELFORMAT& ddpf );
-HRESULT LoadTextureDataFromFile(__in_z const WCHAR* szFileName, BYTE** ppHeapData,
+HRESULT LoadTextureDataFromFile(__in_z const CHAR* szFileName, BYTE** ppHeapData,
                                 DDS_HEADER** ppHeader,
                                 BYTE** ppBitData, UINT* pBitSize);

Samples/Asteroids/src/asteroids_d3d11.cpp

@@ -191,7 +191,7 @@ Asteroids::Asteroids(AsteroidsSimulation* asteroids, GUI* gui, bool warp)
     CreateGUIResources();
 
     // Load textures
-    ThrowIfFailed(CreateDDSTextureFromFile(mDevice, L"media/starbox_1024.dds", &mSkyboxSRV, true));
+    ThrowIfFailed(CreateDDSTextureFromFile(mDevice, "media/starbox_1024.dds", &mSkyboxSRV, true));
 }
 
 Asteroids::~Asteroids()
@@ -426,9 +426,8 @@ void Asteroids::CreateGUIResources()
     for (int i = -1; i < (int)mGUI->size(); ++i) {
         auto control = i >= 0 ? (*mGUI)[i] : mD3D11Sprite;
         if (control->TextureFile().length() > 0 && mSpriteTextures.find(control->TextureFile()) == mSpriteTextures.end()) {
-            std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;            
             ID3D11ShaderResourceView* textureSRV = nullptr;
-            ThrowIfFailed(CreateDDSTextureFromFile(mDevice, converter.from_bytes(control->TextureFile()).c_str(), &textureSRV, true));
+            ThrowIfFailed(CreateDDSTextureFromFile(mDevice, control->TextureFile().c_str(), &textureSRV, true));
             mSpriteTextures[control->TextureFile()] = textureSRV;
         }
     }

Samples/Asteroids/src/texture.cpp

@@ -220,10 +220,7 @@ HRESULT CreateTexture2DFromDDS_XXXX8(
     BYTE* bitData = nullptr;
     UINT bitSize = 0;
 
-    std::wostringstream wfileName;
-    wfileName << fileName;
-
-    HRESULT hr = LoadTextureDataFromFile(wfileName.str().c_str(), &heapData, &header, &bitData, &bitSize);
+    HRESULT hr = LoadTextureDataFromFile(fileName, &heapData, &header, &bitData, &bitSize);
     if (FAILED(hr)) {
         delete[] heapData;
         return hr;