Changeset 274769 in webkit for trunk/Source/JavaScriptCore/shell

Timestamp:

Mar 22, 2021, 12:00:44 PM (4 years ago)

Author:

[email protected]

Message:

AppleWin can't start due to "Failed to determine path to AAS directory." because iTunes changed the registry key
​https://bugs.webkit.org/show_bug.cgi?id=219015

Patch by Tyler Wilcock <Tyler Wilcock> on 2021-03-22
Reviewed by Alex Christensen.

It appears that iTunes no longer sets the Apple Application Support
Source/JavaScriptCore:

registry entry. Fall back to trying to find the iTunes installation
directory if the AAS directory is not present.

• shell/DLLLauncherMain.cpp:

(iTunesDirectory): Added.
(modifyPath):

Tools:

registry entry. Fallback to trying to find the iTunes installation
directory if the AAS directory is not present.

• win/DLLLauncher/DLLLauncherMain.cpp:

(iTunesDirectory): Added.
(modifyPath):

File:

• trunk/Source/JavaScriptCore/shell/DLLLauncherMain.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/shell/DLLLauncherMain.cpp

@@ -83 +83 @@
 }
 
+static std::wstring iTunesDirectory()
+{
+    return applePathFromRegistry(L"SOFTWARE\\Apple Computer, Inc.\\iTunes\\", L"InstallDir");
+}
+
 static bool prependPath(const std::wstring& directoryToPrepend)
 {
@@ -129 +134 @@
 
 #else
-
-    const std::wstring& pathPrefix = appleApplicationSupportDirectory();
-
-    if (!directoryExists(pathPrefix)) {
-        fatalError(programName, L"Failed to determine path to AAS directory.");
-        return false;
-    }
-
-    if (prependPath(pathPrefix))
+    auto modifyPathWith = [&] (const std::wstring& pathPrefix) {
+        if (!prependPath(pathPrefix)) {
+            fatalError(programName, L"Failed to modify PATH environment variable.");
+            return false;
+        }
         return true;
-
-    fatalError(programName, L"Failed to modify PATH environment variable.");
+    };
+
+    const std::wstring& applicationSupportPathPrefix = appleApplicationSupportDirectory();
+    if (directoryExists(applicationSupportPathPrefix))
+        return modifyPathWith(applicationSupportPathPrefix);
+
+    const std::wstring& iTunesPathPrefix = iTunesDirectory();
+    if (directoryExists(iTunesPathPrefix))
+        return modifyPathWith(iTunesPathPrefix);
+
+    fatalError(programName, L"Couldn't find path to Apple Application Support (AAS) or iTunes via the registry.  Do you have iTunes installed?");
     return false;
 #endif