From 17da34e188ef6e06f8bd1f9fb3bdccbcaead96e6 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Thu, 26 May 2005 17:30:13 -0400 Subject: [PATCH] COMP: Fix for support of VS 8.0 beta 2 --- Modules/CMakeVS8FindMake.cmake | 2 +- Source/MFCDialog/CMakeSetupDialog.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/CMakeVS8FindMake.cmake b/Modules/CMakeVS8FindMake.cmake index ec3a3ca43e..59d38b1538 100644 --- a/Modules/CMakeVS8FindMake.cmake +++ b/Modules/CMakeVS8FindMake.cmake @@ -1,5 +1,5 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM - NAMES VCExpress + NAMES devenv VCExpress PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path] diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp index fc2a6dd6ce..594d060d6c 100644 --- a/Source/MFCDialog/CMakeSetupDialog.cpp +++ b/Source/MFCDialog/CMakeSetupDialog.cpp @@ -1269,8 +1269,9 @@ int CMakeSetupDialog::CreateShortcut() } // Ensure that the string consists of ANSI characters. - WORD wsz[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, link_name, -1, wsz, MAX_PATH); + WORD wszAr[MAX_PATH]; + LPWSTR wsz = (LPWSTR)wszAr; + MultiByteToWideChar(CP_ACP, 0, link_name, -1, (LPWSTR)(wsz), MAX_PATH); // Save the shortcut via the IPersistFile::Save member function. hres = ppf->Save(wsz, TRUE);