godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on UWP

Browse Source 
It appears that MSVC and Mingw disagree about what conversions are legal
here. We just use the 'wide' version of the call and use our native
CharType instead of TCHAR.
This commit is contained in:
Hein-Pieter van Braam 2019-01-26 16:27:10 +01:00
parent 18c3ed245a
commit a8510331c0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/windows/dir_access_windows.cpp
View File

@ -354,13 +354,13 @@ String DirAccessWindows::get_filesystem_type() const {
String unit = path.substr(0,unit_end+1) + "\\"; String unit = path.substr(0,unit_end+1) + "\\";
print_line("unit: "+unit); print_line("unit: "+unit);
TCHAR szVolumeName[100] = ""; WCHAR szVolumeName[100];
TCHAR szFileSystemName[10] = ""; WCHAR szFileSystemName[10];
DWORD dwSerialNumber = 0; DWORD dwSerialNumber = 0;
DWORD dwMaxFileNameLength = 0; DWORD dwMaxFileNameLength = 0;
DWORD dwFileSystemFlags = 0; DWORD dwFileSystemFlags = 0;
if(::GetVolumeInformation(unit.utf8().get_data(), if(::GetVolumeInformationW(unit.c_str(),
szVolumeName, szVolumeName,
sizeof(szVolumeName), sizeof(szVolumeName),
&dwSerialNumber, &dwSerialNumber,