Changeset 25193 in webkit


Ignore:
Timestamp:
Aug 22, 2007 4:56:13 PM (17 years ago)
Author:
andersca
Message:

Reviewed by Adam.

<rdar://problem/5430584>
​http://bugs.webkit.org/show_bug.cgi?id=15053
WebKit does not check Windows Registry HKEY_CURRENT_USER for NPAPI plugin locations


  • plugins/win/PluginDatabaseWin.cpp: (WebCore::addPluginsFromRegistry): (WebCore::PluginDatabaseWin::getPluginsInPaths):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r25192 r25193  
     12007-08-22  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam.
     4
     5        <rdar://problem/5430584>
     6        http://bugs.webkit.org/show_bug.cgi?id=15053       
     7        WebKit does not check Windows Registry HKEY_CURRENT_USER for NPAPI plugin locations
     8       
     9        * plugins/win/PluginDatabaseWin.cpp:
     10        (WebCore::addPluginsFromRegistry):
     11        (WebCore::PluginDatabaseWin::getPluginsInPaths):
     12
    1132007-08-22  Justin Garcia  <justin.garcia@apple.com>
    214

  • trunk/WebCore/plugins/win/PluginDatabaseWin.cpp

    r23877 r25193  
    120120}
    121121
    122 static inline void addPluginsFromRegistry(PluginSet& plugins)
     122static inline void addPluginsFromRegistry(HKEY rootKey, PluginSet& plugins)
    123123{
    124124    HKEY key;
    125     HRESULT result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\MozillaPlugins", 0, KEY_ENUMERATE_SUB_KEYS, &key);
     125    HRESULT result = RegOpenKeyExW(rootKey, L"Software\\MozillaPlugins", 0, KEY_ENUMERATE_SUB_KEYS, &key);
    126126
    127127    if (result != ERROR_SUCCESS)
    … …  
    209209    }
    210210
    211     addPluginsFromRegistry(plugins);
     211    addPluginsFromRegistry(HKEY_LOCAL_MACHINE, plugins);
     212    addPluginsFromRegistry(HKEY_CURRENT_USER, plugins);
    212213
    213214    // If both the old and new WMP plugin are present in the plugins set,
Note: See TracChangeset for help on using the changeset viewer.