]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
[v9_9] win32: vs2015 compliance
authorEvan Hunt <each@isc.org>
Mon, 17 Aug 2015 18:37:00 +0000 (11:37 -0700)
committerEvan Hunt <each@isc.org>
Mon, 17 Aug 2015 18:37:00 +0000 (11:37 -0700)
bin/win32/BINDInstall/BINDInstallDlg.cpp
bin/win32/BINDInstall/VersionInfo.cpp

index 6270c45012cc0dedf8c6b8b42d6d03f4f9e3f96d..f040258a379913eb2cd7dd908c8f3c97d8e14d85 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2010, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -1298,7 +1298,7 @@ void CBINDInstallDlg::ProgramGroup(BOOL create) {
                        {
                                IPersistFile* ppf;
                                sprintf(linkpath, "%s\\BINDCtrl.lnk", path);
-                               sprintf(fileloc, "%s\\BINDCtrl.exe", m_binDir);
+                               sprintf(fileloc, "%s\\BINDCtrl.exe", (LPCTSTR) m_binDir);
 
                                psl->SetPath(fileloc);
                                psl->SetDescription("BIND Control Panel");
@@ -1313,7 +1313,7 @@ void CBINDInstallDlg::ProgramGroup(BOOL create) {
                                }
 
                                if (GetFileAttributes("readme.txt") != -1) {
-                                       sprintf(fileloc, "%s\\Readme.txt", m_targetDir);
+                                       sprintf(fileloc, "%s\\Readme.txt", (LPCTSTR) m_targetDir);
                                        sprintf(linkpath, "%s\\Readme.lnk", path);
 
                                        psl->SetPath(fileloc);
index e940e9e042291c25decd0e68d85a1cba25e62fce..c5dc2dc799a610fc1530af50037d74092c2f060e 100644 (file)
@@ -277,7 +277,8 @@ CString CVersionInfo::QueryStringValue(CString value)
                // You probably should change this to match it.
                DWORD codePage = 0x040904B0;
 
-               sprintf(queryString, "\\StringFileInfo\\%08X\\%s", codePage, value);
+               sprintf(queryString, "\\StringFileInfo\\%08X\\%s",
+                       codePage, (LPCTSTR) value);
 
                if(VerQueryValue(m_versionInfo, queryString, &viBlob, &blobLen))
                        return((char *)viBlob);