2099. [port] win32: more manifiest issues.

diff --git a/CHANGES b/CHANGES
index 713ef39c40951399660771b2dc6ced6dcaf03823..a5d0abb6f08a2bddaaee55cafc1fbea2e295b37c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@
 2100.  [port]          win32: copy libeay32.dll to Build\Debug.
                        Copy Debug\named-checkzone to Debug\named-compilezone.
 
+2099.  [port]          win32: more manifiest issues.
+
 2098.  [bug]           Race in rbtdb.c:no_references(), which occasionally
                        triggered an INSIST failure about the node lock
                        reference.  [RT #16411]

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 6d878d68ba9112af7f3533fddb9392750a92635d..ab16eeefc36f157ca530f652a875afd68e854dcb 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.15.18.9 2006/09/27 00:29:46 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.15.18.10 2006/11/08 01:51:10 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -114,8 +114,15 @@ const FileData installFiles[] =
 #  endif
 #endif
 #if _MSC_VER >= 1400
-       {"mfc80.dll", FileData::WinSystem, FileData::Critical, TRUE},
-       {"msvcr80.dll", FileData::WinSystem, FileData::Critical, TRUE},
+       {"mfc80.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"mfc80u.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"mfcm80.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"mfcm80u.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"Microsoft.VC80.MFC.manifest", FileData::BinDir, FileData::Critical, FALSE},
+       {"msvcm80.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"msvcp80.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"msvcr80.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"Microsoft.VC80.CRT.manifest", FileData::BinDir, FileData::Critical, FALSE},
 #elif _MSC_VER >= 1310
        {"mfc71.dll", FileData::WinSystem, FileData::Critical, TRUE},
        {"msvcr71.dll", FileData::WinSystem, FileData::Critical, TRUE},
@@ -123,13 +130,13 @@ const FileData installFiles[] =
        {"mfc70.dll", FileData::WinSystem, FileData::Critical, TRUE},
        {"msvcr70.dll", FileData::WinSystem, FileData::Critical, TRUE},
 #endif
-       {"bindevt.dll", FileData::WinSystem, FileData::Normal, FALSE},
-       {"libbind9.dll", FileData::WinSystem, FileData::Critical, FALSE},
-       {"libisc.dll", FileData::WinSystem, FileData::Critical, FALSE},
-       {"libisccfg.dll", FileData::WinSystem, FileData::Critical, FALSE},
-       {"libisccc.dll", FileData::WinSystem, FileData::Critical, FALSE},
-       {"libdns.dll", FileData::WinSystem, FileData::Critical, FALSE},
-       {"liblwres.dll", FileData::WinSystem, FileData::Critical, FALSE},
+       {"bindevt.dll", FileData::BinDir, FileData::Normal, FALSE},
+       {"libbind9.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"libisc.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"libisccfg.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"libisccc.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"libdns.dll", FileData::BinDir, FileData::Critical, FALSE},
+       {"liblwres.dll", FileData::BinDir, FileData::Critical, FALSE},
        {"libeay32.dll", FileData::BinDir, FileData::Critical, FALSE},
        {"named.exe", FileData::BinDir, FileData::Critical, FALSE},
        {"nsupdate.exe", FileData::BinDir, FileData::Normal, FALSE},