This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94 (commit)
via e0cf77b3109e74cbc4c050e9907dacc9f0f40f70 (commit)
from 1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94
commit b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94
Merge: 1bc2c6d e0cf77b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Aug 31 16:37:44 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 31 16:37:44 2015 -0400
Merge topic 'vs-store-phone-cert-thumbs' into next
e0cf77b3 cmSystemTools: Use CreateFileW explicitly to pass wchar_t path
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0cf77b3109e74cbc4c050e9907dacc9f0f40f70
commit e0cf77b3109e74cbc4c050e9907dacc9f0f40f70
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Aug 31 16:32:17 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Aug 31 16:33:46 2015 -0400
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).
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 583e1d0..0cbe15c 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)
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmSystemTools.cxx | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
