Changeset 66234 in webkit

Timestamp:

Aug 27, 2010 10:35:18 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-27 Dawit Alemayehu <​adawit@kde.org>

Reviewed by Simon Hausmann.

[Qt] Search the Windows registry for the location of the Java plugin DLL.
​https://bugs.webkit.org/show_bug.cgi?id=38911

This change, in addition to the ones 34539 and 38911, is needed to
make Java applet work in QtWebKit on the Windows platform.

• plugins/win/PluginDatabaseWin.cpp: (WebCore::addJavaPluginDirectory): (WebCore::PluginDatabase::defaultPluginDirectories):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/win/PluginDatabaseWin.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-27  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Search the Windows registry for the location of the Java plugin DLL.
+        https://bugs.webkit.org/show_bug.cgi?id=38911
+
+        This change, in addition to the ones 34539 and 38911, is needed to
+        make Java applet work in QtWebKit on the Windows platform.
+
+        * plugins/win/PluginDatabaseWin.cpp:
+        (WebCore::addJavaPluginDirectory):
+        (WebCore::PluginDatabase::defaultPluginDirectories):
+
 2010-08-27  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/plugins/win/PluginDatabaseWin.cpp

@@ -333 +333 @@
 }
 
+static inline void addJavaPluginDirectory(Vector<String>& directories)
+{
+    HKEY key;
+    HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\JavaSoft\\Java Plug-in"), 0, KEY_READ, &key);
+    if (result != ERROR_SUCCESS)
+        return;
+
+    WCHAR name[128];
+    FILETIME lastModified;
+
+    Vector<int> latestJavaVersion;
+    String latestJavaVersionString;
+
+    // Enumerate subkeys
+    for (int i = 0;; i++) {
+        DWORD nameLen = sizeof(name) / sizeof(WCHAR);
+        result = RegEnumKeyExW(key, i, name, &nameLen, 0, 0, 0, &lastModified);
+
+        if (result != ERROR_SUCCESS)
+            break;
+
+        Vector<int> javaVersion = parseVersionString(String(name, nameLen));
+        if (compareVersions(javaVersion, latestJavaVersion)) {
+            latestJavaVersion = javaVersion;
+            latestJavaVersionString = String(name, nameLen);
+        }
+    }
+
+    if (!latestJavaVersionString.isEmpty()) {
+        DWORD type;
+        WCHAR javaInstallPathStr[_MAX_PATH];
+        DWORD javaInstallPathSize = sizeof(javaInstallPathStr);
+        DWORD useNewPluginValue;
+        DWORD useNewPluginSize;
+
+        String javaPluginKeyPath = "Software\\JavaSoft\\Java Plug-in\\" + latestJavaVersionString;
+        result = SHGetValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination(), TEXT("UseNewJavaPlugin"), &type, (LPVOID)&useNewPluginValue, &useNewPluginSize);
+
+        if (result == ERROR_SUCCESS && useNewPluginValue == 1) {
+            result = SHGetValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination(), TEXT("JavaHome"), &type, (LPBYTE)javaInstallPathStr, &javaInstallPathSize);
+            if (result == ERROR_SUCCESS) {
+                String javaPluginDirectory = String(javaInstallPathStr, javaInstallPathSize / sizeof(WCHAR) - 1) + "\\bin\\new_plugin";
+                directories.append(javaPluginDirectory);
+            }
+        }
+    }
+
+    RegCloseKey(key);
+}
+
 static inline String safariPluginsDirectory()
 {
@@ -386 +436 @@
     addWindowsMediaPlayerPluginDirectory(directories);
     addMacromediaPluginDirectories(directories);
+#if PLATFORM(QT)
+    addJavaPluginDirectory(directories);
+#endif
 
     return directories;