Attachment 357301 Details for Bug 192688 – Patch for landing

[patch] Patch for landing

bug-192688-20181214145312.patch (text/plain), 5.65 KB, created by Fujii Hironori on 2018-12-13 21:53:13 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-13 21:53:13 PST

Size: 5.65 KB

patch

obsolete

>Subversion Revision: 239193
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index fd1204fc9e2f67f0c6fc8ec121913cfbed6853c6..9c4230870bc8f8b8d1403a5ce58b7a477596fa25 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-12-13  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WinCairo][Clang] DLLLauncherMain.cpp: warning: unused function 'prependPath' and 'appleApplicationSupportDirectory'
>+        https://bugs.webkit.org/show_bug.cgi?id=192688
>+
>+        Reviewed by Ross Kirsling.
>+
>+        These functions are used only in AppleWin port.
>+
>+        * shell/DLLLauncherMain.cpp:
>+        (copyEnvironmentVariable): Moved.
>+        (getStringValue): Enclosed with #if !defined(WIN_CAIRO).
>+        (applePathFromRegistry): Ditto.
>+        (appleApplicationSupportDirectory): Ditto.
>+        (prependPath): Ditto.
>+
> 2018-12-13  Mark Lam  <mark.lam@apple.com>
> 
>         Ensure that StructureFlags initialization always starts with Base::StructureFlags.
>diff --git a/Source/JavaScriptCore/shell/DLLLauncherMain.cpp b/Source/JavaScriptCore/shell/DLLLauncherMain.cpp
>index 33633c3110070d516ce542ecf5cba5b194ad9257..b9a5d010b0832b4c12fdf1cfe494a317568bce38 100644
>--- a/Source/JavaScriptCore/shell/DLLLauncherMain.cpp
>+++ b/Source/JavaScriptCore/shell/DLLLauncherMain.cpp
>@@ -56,6 +56,18 @@ static void enableTerminationOnHeapCorruption()
>     HeapSetInformation(0, heapEnableTerminationOnCorruption, 0, 0);
> }
> 
>+static std::wstring copyEnvironmentVariable(const std::wstring& variable)
>+{
>+    DWORD length = ::GetEnvironmentVariableW(variable.c_str(), 0, 0);
>+    if (!length)
>+        return std::wstring();
>+    std::vector<wchar_t> buffer(length);
>+    if (!GetEnvironmentVariable(variable.c_str(), &buffer[0], buffer.size()) || !buffer[0])
>+        return std::wstring();
>+    return &buffer[0];
>+}
>+
>+#if !defined(WIN_CAIRO)
> static std::wstring getStringValue(HKEY key, const std::wstring& valueName)
> {
>     DWORD type = 0;
>@@ -85,17 +97,6 @@ static std::wstring appleApplicationSupportDirectory()
>     return applePathFromRegistry(L"SOFTWARE\\Apple Inc.\\Apple Application Support", L"InstallDir");
> }
> 
>-static std::wstring copyEnvironmentVariable(const std::wstring& variable)
>-{
>-    DWORD length = ::GetEnvironmentVariableW(variable.c_str(), 0, 0);
>-    if (!length)
>-        return std::wstring();
>-    std::vector<wchar_t> buffer(length);
>-    if (!GetEnvironmentVariable(variable.c_str(), &buffer[0], buffer.size()) || !buffer[0])
>-        return std::wstring();
>-    return &buffer[0];
>-}
>-
> static bool prependPath(const std::wstring& directoryToPrepend)
> {
>     std::wstring pathVariable = L"PATH";
>@@ -103,6 +104,7 @@ static bool prependPath(const std::wstring& directoryToPrepend)
>     std::wstring newPath = directoryToPrepend + L';' + oldPath;
>     return ::SetEnvironmentVariableW(pathVariable.c_str(), newPath.c_str());
> }
>+#endif
> 
> static int fatalError(const std::wstring& programName, const std::wstring& message)
> {
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9078ea15e57188695f85eb446f48c79c1adfda09..53567cddb601b448cece0cfbeaed96e8d4504a65 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-13  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WinCairo][Clang] DLLLauncherMain.cpp: warning: unused function 'prependPath' and 'appleApplicationSupportDirectory'
>+        https://bugs.webkit.org/show_bug.cgi?id=192688
>+
>+        Reviewed by Ross Kirsling.
>+
>+        * win/DLLLauncher/DLLLauncherMain.cpp:
>+        (copyEnvironmentVariable): Moved.
>+        (getStringValue): Enclosed with #if !defined(WIN_CAIRO).
>+        (applePathFromRegistry): Ditto.
>+        (appleApplicationSupportDirectory): Ditto.
>+        (prependPath): Ditto.
>+
> 2018-12-13  Don Olmstead  <don.olmstead@sony.com>
> 
>         Unreviewed. Changed my status to a reviewer.
>diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>index 1d22daa4de04043cece13f1401668250abfa7932..14e6b23d40fbe840044565b17aef48a0df734ff2 100644
>--- a/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>+++ b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>@@ -55,6 +55,18 @@ static void enableTerminationOnHeapCorruption()
>     HeapSetInformation(0, heapEnableTerminationOnCorruption, 0, 0);
> }
> 
>+static wstring copyEnvironmentVariable(const wstring& variable)
>+{
>+    DWORD length = ::GetEnvironmentVariableW(variable.c_str(), 0, 0);
>+    if (!length)
>+        return wstring();
>+    vector<wchar_t> buffer(length);
>+    if (!GetEnvironmentVariable(variable.c_str(), &buffer[0], buffer.size()) || !buffer[0])
>+        return wstring();
>+    return &buffer[0];
>+}
>+
>+#if !defined(WIN_CAIRO)
> static wstring getStringValue(HKEY key, const wstring& valueName)
> {
>     DWORD type = 0;
>@@ -84,17 +96,6 @@ static wstring appleApplicationSupportDirectory()
>     return applePathFromRegistry(L"SOFTWARE\\Apple Inc.\\Apple Application Support", L"InstallDir");
> }
> 
>-static wstring copyEnvironmentVariable(const wstring& variable)
>-{
>-    DWORD length = ::GetEnvironmentVariableW(variable.c_str(), 0, 0);
>-    if (!length)
>-        return wstring();
>-    vector<wchar_t> buffer(length);
>-    if (!GetEnvironmentVariable(variable.c_str(), &buffer[0], buffer.size()) || !buffer[0])
>-        return wstring();
>-    return &buffer[0];
>-}
>-
> static bool prependPath(const wstring& directoryToPrepend)
> {
>     wstring pathVariable = L"PATH";
>@@ -102,6 +103,7 @@ static bool prependPath(const wstring& directoryToPrepend)
>     wstring newPath = directoryToPrepend + L';' + oldPath;
>     return ::SetEnvironmentVariableW(pathVariable.c_str(), newPath.c_str());
> }
>+#endif
> 
> static int fatalError(const wstring& programName, const wstring& message)
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 192688: 357291 | 357301