Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 19:50:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor code review

Browse Source
This commit is contained in:
Chuck Walbourn 2019-02-07 14:52:57 -08:00
parent a35fb23349
commit 031115465b
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DDSView/ddsview.cpp
View File

@ -108,7 +108,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
if ( !*lpCmdLine ) if ( !*lpCmdLine )
{ {
MessageBox( nullptr, L"Usage: ddsview <filename>", L"DDSView", MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( nullptr, L"Usage: ddsview <filename>", L"DDSView", MB_OK | MB_ICONEXCLAMATION );
return 0; return 0;
} }
@ -118,7 +118,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
{ {
wchar_t buff[2048] = {}; wchar_t buff[2048] = {};
swprintf_s( buff, L"Failed to open texture file\n\nFilename = %ls\nHRESULT %08X", lpCmdLine, hr ); swprintf_s( buff, L"Failed to open texture file\n\nFilename = %ls\nHRESULT %08X", lpCmdLine, hr );
MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION );
return 0; return 0;
} }
@ -139,7 +139,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
{ {
wchar_t buff[2048] = {}; wchar_t buff[2048] = {};
swprintf_s( buff, L"Arrays of volume textures are not supported\n\nFilename = %ls\nArray size %zu", lpCmdLine, mdata.arraySize ); swprintf_s( buff, L"Arrays of volume textures are not supported\n\nFilename = %ls\nArray size %zu", lpCmdLine, mdata.arraySize );
MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION );
return 0; return 0;
} }
@ -162,7 +162,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
{ {
wchar_t buff[2048] = {}; wchar_t buff[2048] = {};
swprintf_s( buff, L"BC6H/BC7 requires DirectX 11 hardware\n\nFilename = %ls\nDXGI Format %d\nFeature Level %d", lpCmdLine, mdata.format, g_featureLevel ); swprintf_s( buff, L"BC6H/BC7 requires DirectX 11 hardware\n\nFilename = %ls\nDXGI Format %d\nFeature Level %d", lpCmdLine, mdata.format, g_featureLevel );
MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION );
return 0; return 0;
} }
break; break;
@ -175,7 +175,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
{ {
wchar_t buff[2048] = {}; wchar_t buff[2048] = {};
swprintf_s( buff, L"Format not supported by DirectX hardware\n\nFilename = %ls\nDXGI Format %d\nFeature Level %d\nHRESULT = %08X", lpCmdLine, mdata.format, g_featureLevel, hr ); swprintf_s( buff, L"Format not supported by DirectX hardware\n\nFilename = %ls\nDXGI Format %d\nFeature Level %d\nHRESULT = %08X", lpCmdLine, mdata.format, g_featureLevel, hr );
MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION );
return 0; return 0;
} }
} }
@ -188,7 +188,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
{ {
wchar_t buff[2048] = {}; wchar_t buff[2048] = {};
swprintf_s( buff, L"Failed to load texture file\n\nFilename = %ls\nHRESULT %08X", lpCmdLine, hr ); swprintf_s( buff, L"Failed to load texture file\n\nFilename = %ls\nHRESULT %08X", lpCmdLine, hr );
MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION );
return 0; return 0;
} }
@ -200,7 +200,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
{ {
wchar_t buff[2048] = {}; wchar_t buff[2048] = {};
swprintf_s( buff, L"Failed creating texture from file\n\nFilename = %ls\nHRESULT = %08X", lpCmdLine, hr ); swprintf_s( buff, L"Failed creating texture from file\n\nFilename = %ls\nHRESULT = %08X", lpCmdLine, hr );
MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); MessageBoxW( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION );
return 0; return 0;
} }
@ -228,8 +228,8 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
HRESULT InitWindow( HINSTANCE hInstance, int nCmdShow, const TexMetadata& mdata ) HRESULT InitWindow( HINSTANCE hInstance, int nCmdShow, const TexMetadata& mdata )
{ {
// Register class // Register class
WNDCLASSEX wcex; WNDCLASSEXW wcex;
wcex.cbSize = sizeof( WNDCLASSEX ); wcex.cbSize = sizeof( WNDCLASSEXW );
wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.style = CS_HREDRAW | CS_VREDRAW;
wcex.lpfnWndProc = WndProc; wcex.lpfnWndProc = WndProc;
wcex.cbClsExtra = 0; wcex.cbClsExtra = 0;
@ -241,7 +241,7 @@ HRESULT InitWindow( HINSTANCE hInstance, int nCmdShow, const TexMetadata& mdata
wcex.lpszMenuName = nullptr; wcex.lpszMenuName = nullptr;
wcex.lpszClassName = L"DDSViewWindowClass"; wcex.lpszClassName = L"DDSViewWindowClass";
wcex.hIconSm = LoadIcon( wcex.hInstance, ( LPCTSTR )IDI_MAIN_ICON ); wcex.hIconSm = LoadIcon( wcex.hInstance, ( LPCTSTR )IDI_MAIN_ICON );
if( !RegisterClassEx( &wcex ) ) if( !RegisterClassExW( &wcex ) )
return E_FAIL; return E_FAIL;
// Create window // Create window
@ -265,7 +265,7 @@ HRESULT InitWindow( HINSTANCE hInstance, int nCmdShow, const TexMetadata& mdata
rc.bottom = screenY; rc.bottom = screenY;
AdjustWindowRect( &rc, WS_OVERLAPPEDWINDOW, FALSE ); AdjustWindowRect( &rc, WS_OVERLAPPEDWINDOW, FALSE );
g_hWnd = CreateWindow( L"DDSViewWindowClass", L"DDS View", WS_OVERLAPPEDWINDOW, g_hWnd = CreateWindowW( L"DDSViewWindowClass", L"DDS View", WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT, CW_USEDEFAULT, rc.right - rc.left, rc.bottom - rc.top, nullptr, nullptr, hInstance, CW_USEDEFAULT, CW_USEDEFAULT, rc.right - rc.left, rc.bottom - rc.top, nullptr, nullptr, hInstance,
nullptr ); nullptr );
if( !g_hWnd ) if( !g_hWnd )

6
Texassemble/texassemble.cpp
View File

@ -329,7 +329,7 @@ namespace
void SearchForFiles(const wchar_t* path, std::list<SConversion>& files, bool recursive) void SearchForFiles(const wchar_t* path, std::list<SConversion>& files, bool recursive)
{ {
// Process files // Process files
WIN32_FIND_DATA findData = {}; WIN32_FIND_DATAW findData = {};
ScopedFindHandle hFile(safe_handle(FindFirstFileExW(path, ScopedFindHandle hFile(safe_handle(FindFirstFileExW(path,
FindExInfoBasic, &findData, FindExInfoBasic, &findData,
FindExSearchNameMatch, nullptr, FindExSearchNameMatch, nullptr,
@ -349,7 +349,7 @@ namespace
files.push_back(conv); files.push_back(conv);
} }
if (!FindNextFile(hFile.get(), &findData)) if (!FindNextFileW(hFile.get(), &findData))
break; break;
} }
} }
@ -394,7 +394,7 @@ namespace
} }
} }
if (!FindNextFile(hFile.get(), &findData)) if (!FindNextFileW(hFile.get(), &findData))
break; break;
} }
} }

10
Texconv/texconv.cpp
View File

@ -482,7 +482,7 @@ namespace
void SearchForFiles(const wchar_t* path, std::list<SConversion>& files, bool recursive) void SearchForFiles(const wchar_t* path, std::list<SConversion>& files, bool recursive)
{ {
// Process files // Process files
WIN32_FIND_DATA findData = {}; WIN32_FIND_DATAW findData = {};
ScopedFindHandle hFile(safe_handle(FindFirstFileExW(path, ScopedFindHandle hFile(safe_handle(FindFirstFileExW(path,
FindExInfoBasic, &findData, FindExInfoBasic, &findData,
FindExSearchNameMatch, nullptr, FindExSearchNameMatch, nullptr,
@ -502,7 +502,7 @@ namespace
files.push_back(conv); files.push_back(conv);
} }
if (!FindNextFile(hFile.get(), &findData)) if (!FindNextFileW(hFile.get(), &findData))
break; break;
} }
} }
@ -547,7 +547,7 @@ namespace
} }
} }
if (!FindNextFile(hFile.get(), &findData)) if (!FindNextFileW(hFile.get(), &findData))
break; break;
} }
} }
@ -679,7 +679,7 @@ namespace
if (!s_CreateDXGIFactory1) if (!s_CreateDXGIFactory1)
{ {
HMODULE hModDXGI = LoadLibrary(L"dxgi.dll"); HMODULE hModDXGI = LoadLibraryW(L"dxgi.dll");
if (!hModDXGI) if (!hModDXGI)
return false; return false;
@ -804,7 +804,7 @@ namespace
if (!s_DynamicD3D11CreateDevice) if (!s_DynamicD3D11CreateDevice)
{ {
HMODULE hModD3D11 = LoadLibrary(L"d3d11.dll"); HMODULE hModD3D11 = LoadLibraryW(L"d3d11.dll");
if (!hModD3D11) if (!hModD3D11)
return false; return false;

6
Texdiag/texdiag.cpp
View File

@ -394,7 +394,7 @@ namespace
void SearchForFiles(const wchar_t* path, std::list<SConversion>& files, bool recursive) void SearchForFiles(const wchar_t* path, std::list<SConversion>& files, bool recursive)
{ {
// Process files // Process files
WIN32_FIND_DATA findData = {}; WIN32_FIND_DATAW findData = {};
ScopedFindHandle hFile(safe_handle(FindFirstFileExW(path, ScopedFindHandle hFile(safe_handle(FindFirstFileExW(path,
FindExInfoBasic, &findData, FindExInfoBasic, &findData,
FindExSearchNameMatch, nullptr, FindExSearchNameMatch, nullptr,
@ -414,7 +414,7 @@ namespace
files.push_back(conv); files.push_back(conv);
} }
if (!FindNextFile(hFile.get(), &findData)) if (!FindNextFileW(hFile.get(), &findData))
break; break;
} }
} }
@ -459,7 +459,7 @@ namespace
} }
} }
if (!FindNextFile(hFile.get(), &findData)) if (!FindNextFileW(hFile.get(), &findData))
break; break;
} }
} }