Reviewed by Adam Roben.

        http://bugs.webkit.org/show_bug.cgi?id=15217
        Plugin complains that xpcom_core.dll missing

        * plugins/win/PluginDatabaseWin.cpp:
        (WebCore::PluginDatabaseWin::isPluginBlacklisted): Blacklist npmozax.dll.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27175 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 84dfb6faadbce50ff9b3ab87eb03da88910cccf8..5537268552760118ce8e2953ce453d174f315585 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-28  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15217
+        Plugin complains that xpcom_core.dll missing
+
+        * plugins/win/PluginDatabaseWin.cpp:
+        (WebCore::PluginDatabaseWin::isPluginBlacklisted): Blacklist npmozax.dll.
+
 2007-10-28  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Adam.

diff --git a/WebCore/plugins/win/PluginDatabaseWin.cpp b/WebCore/plugins/win/PluginDatabaseWin.cpp
index bba5e3e477d7b657caecd2538dd5a9adac79eebf..d022c25b43405a2949a136e5244da6bdf754108f 100644 (file)
--- a/WebCore/plugins/win/PluginDatabaseWin.cpp
+++ b/WebCore/plugins/win/PluginDatabaseWin.cpp
@@ -452,7 +452,10 @@ bool PluginDatabaseWin::isPluginBlacklisted(PluginPackageWin* plugin)
         if (fileVersionMS < silverlightPluginMinRequiredVersionMSDWORD ||
             (fileVersionMS == silverlightPluginMinRequiredVersionMSDWORD && fileVersionLS < silverlightPluginMinRequiredVersionLSDWORD))
             return true;
-    }
+    } else if (plugin->fileName() == "npmozax.dll")
+        // Bug 15217: Mozilla ActiveX control complains about missing xpcom_core.dll
+        return true;
+
     return false;
 }