Attachment 357291 Details for Bug 192688 – Patch

[patch] Patch

bug-192688-20181214130505.patch (text/plain), 4.50 KB, created by Fujii Hironori on 2018-12-13 20:05:06 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-13 20:05:06 PST

Size: 4.50 KB

patch

obsolete

>Subversion Revision: 239193
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index fd1204fc9e2f67f0c6fc8ec121913cfbed6853c6..9b073793efcb5e2f0ace998b25270248e24e414e 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        These functions are used only in AppleWin port.
>+
>+        * shell/DLLLauncherMain.cpp:
>+        (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..1958d92f21ff80eaffd963d146fbe42ef4b41296 100644
>--- a/Source/JavaScriptCore/shell/DLLLauncherMain.cpp
>+++ b/Source/JavaScriptCore/shell/DLLLauncherMain.cpp
>@@ -56,6 +56,7 @@ static void enableTerminationOnHeapCorruption()
>     HeapSetInformation(0, heapEnableTerminationOnCorruption, 0, 0);
> }
> 
>+#if !defined(WIN_CAIRO)
> static std::wstring getStringValue(HKEY key, const std::wstring& valueName)
> {
>     DWORD type = 0;
>@@ -84,6 +85,7 @@ static std::wstring appleApplicationSupportDirectory()
> {
>     return applePathFromRegistry(L"SOFTWARE\\Apple Inc.\\Apple Application Support", L"InstallDir");
> }
>+#endif
> 
> static std::wstring copyEnvironmentVariable(const std::wstring& variable)
> {
>@@ -96,6 +98,7 @@ static std::wstring copyEnvironmentVariable(const std::wstring& variable)
>     return &buffer[0];
> }
> 
>+#if !defined(WIN_CAIRO)
> static bool prependPath(const std::wstring& directoryToPrepend)
> {
>     std::wstring pathVariable = L"PATH";
>@@ -103,6 +106,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..7d3842319b42bcde1497d41a3a3272451b2465db 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+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 NOBODY (OOPS!).
>+
>+        * win/DLLLauncher/DLLLauncherMain.cpp:
>+        (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..fa55bc4cb71a2b1523c58847d8c39aaf6336c734 100644
>--- a/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>+++ b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>@@ -55,6 +55,7 @@ static void enableTerminationOnHeapCorruption()
>     HeapSetInformation(0, heapEnableTerminationOnCorruption, 0, 0);
> }
> 
>+#if !defined(WIN_CAIRO)
> static wstring getStringValue(HKEY key, const wstring& valueName)
> {
>     DWORD type = 0;
>@@ -83,6 +84,7 @@ static wstring appleApplicationSupportDirectory()
> {
>     return applePathFromRegistry(L"SOFTWARE\\Apple Inc.\\Apple Application Support", L"InstallDir");
> }
>+#endif
> 
> static wstring copyEnvironmentVariable(const wstring& variable)
> {
>@@ -95,6 +97,7 @@ static wstring copyEnvironmentVariable(const wstring& variable)
>     return &buffer[0];
> }
> 
>+#if !defined(WIN_CAIRO)
> static bool prependPath(const wstring& directoryToPrepend)
> {
>     wstring pathVariable = L"PATH";
>@@ -102,6 +105,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