From e0cf77b3109e74cbc4c050e9907dacc9f0f40f70 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 31 Aug 2015 16:32:17 -0400 Subject: [PATCH] cmSystemTools: Use CreateFileW explicitly to pass wchar_t path 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). --- Source/cmSystemTools.cxx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 583e1d0ee..0cbe15c33 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1025,13 +1025,14 @@ std::string cmSystemTools::ComputeCertificateThumbprint( HCERTSTORE certStore = NULL; PCCERT_CONTEXT certContext = NULL; - HANDLE certFile = CreateFile(cmsys::Encoding::ToWide(source.c_str()).c_str(), - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); + HANDLE certFile = + CreateFileW(cmsys::Encoding::ToWide(source.c_str()).c_str(), + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); if (certFile != INVALID_HANDLE_VALUE && certFile != NULL) {