kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmSystemTools: Use CreateFileW explicitly to pass wchar_t path

Browse Source 
The call to CreateFile added by commit ac0bb433 (VS: Windows Store/Phone
package cert thumbprint, 2015-08-21) passes a wide character path
explicitly so we should call CreateFileW directly.  Otherwise it does
not build without -DUNICODE (e.g. in bootstrap on MSYS).
This commit is contained in:
Brad King 2015-08-31 16:32:17 -04:00
parent ac0bb4333d
commit e0cf77b310
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmSystemTools.cxx
View File

@ -1025,13 +1025,14 @@ std::string cmSystemTools::ComputeCertificateThumbprint(
HCERTSTORE certStore = NULL; HCERTSTORE certStore = NULL;
PCCERT_CONTEXT certContext = NULL; PCCERT_CONTEXT certContext = NULL;
HANDLE certFile = CreateFile(cmsys::Encoding::ToWide(source.c_str()).c_str(), HANDLE certFile =
GENERIC_READ, CreateFileW(cmsys::Encoding::ToWide(source.c_str()).c_str(),
FILE_SHARE_READ, GENERIC_READ,
NULL, FILE_SHARE_READ,
OPEN_EXISTING, NULL,
FILE_ATTRIBUTE_NORMAL, OPEN_EXISTING,
NULL); FILE_ATTRIBUTE_NORMAL,
NULL);
if (certFile != INVALID_HANDLE_VALUE && certFile != NULL) if (certFile != INVALID_HANDLE_VALUE && certFile != NULL)
{ {