Changeset 80693 in webkit

Timestamp:

Mar 9, 2011 10:31:32 PM (13 years ago)

Author:

pkasting@chromium.org

Message:

Add UA string tags for Windows 64.
​https://bugs.webkit.org/show_bug.cgi?id=55226

Reviewed by Ryosuke Niwa.

• StringsNotToBeLocalized.txt:
• platform/win/SystemInfo.cpp:

(WebCore::osVersionForUAString):
(WebCore::isWOW64):
(WebCore::processorArchitecture):
(WebCore::architectureTokenForUAString):
(WebCore::windowsVersionForUAString):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• StringsNotToBeLocalized.txt (modified) (3 diffs)
• platform/win/SystemInfo.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-09  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        Add UA string tags for Windows 64.
+        https://bugs.webkit.org/show_bug.cgi?id=55226
+
+        * StringsNotToBeLocalized.txt:
+        * platform/win/SystemInfo.cpp:
+        (WebCore::osVersionForUAString):
+        (WebCore::isWOW64):
+        (WebCore::processorArchitecture):
+        (WebCore::architectureTokenForUAString):
+        (WebCore::windowsVersionForUAString):
+
 2011-03-09  Peter Kasting  <pkasting@google.com>
 

trunk/Source/WebCore/StringsNotToBeLocalized.txt

@@ -100 +100 @@
 ":/?#"
 "; "
+"; WOW64"
+"; Win64; x64"
+"; Win64; IA64"
 "<!"
 "<%@ %@>"
@@ -512 +515 @@
 "WebWorkersPrivate"
 "Windows "
-"Windows CE"
-"Windows CE "
-"Windows CE .NET"
 "Windows 3.1"
 "Windows 95"
 "Windows 98"
 "Windows 98; Win 9x 4.90"
+"Windows CE"
+"Windows CE "
+"Windows CE .NET"
+"Windows NT "
 "WinNT4.0"
-"Windows NT "
 "WmvPlugin"
 "XSL"
@@ -688 +691 @@
 "jpeg"
 "js"
+"kernel32.dll"
 "kioskmode"
 "ks_c_5601-1987"

trunk/Source/WebCore/platform/win/SystemInfo.cpp

@@ -87 +87 @@
 }
 
-String windowsVersionForUAString()
+static String osVersionForUAString()
 {
     int major, minor;
@@ -114 +114 @@
 }
 
+static bool isWOW64()
+{
+    static bool initialized = false;
+    static bool wow64 = false;
+
+    if (!initialized) {
+        initialized = true;
+        HMODULE kernel32Module = GetModuleHandleA("kernel32.dll");
+        if (!kernel32Module)
+            return wow64;
+        typedef BOOL (WINAPI* IsWow64ProcessFunc)(HANDLE, PBOOL);
+        IsWow64ProcessFunc isWOW64Process = reinterpret_cast<IsWow64ProcessFunc>(GetProcAddress(kernel32Module, "IsWow64Process"));
+        if (isWOW64Process) {
+            BOOL result = FALSE;
+            wow64 = isWOW64Process(GetCurrentProcess(), &result) && result;
+        }
+    }
+
+    return wow64;
+}
+
+static WORD processorArchitecture()
+{
+    static bool initialized = false;
+    static WORD architecture = PROCESSOR_ARCHITECTURE_INTEL;
+
+    if (!initialized) {
+        initialized = true;
+        HMODULE kernel32Module = GetModuleHandleA("kernel32.dll");
+        if (!kernel32Module)
+            return architecture;
+        typedef VOID (WINAPI* GetNativeSystemInfoFunc)(LPSYSTEM_INFO);
+        GetNativeSystemInfoFunc getNativeSystemInfo = reinterpret_cast<GetNativeSystemInfoFunc>(GetProcAddress(kernel32Module, "GetNativeSystemInfo"));
+        if (getNativeSystemInfo) {
+            SYSTEM_INFO systemInfo = {0};
+            getNativeSystemInfo(&systemInfo);
+            architecture = systemInfo.wProcessorArchitecture;
+        }
+    }
+
+    return architecture;
+}
+
+static String architectureTokenForUAString()
+{
+#if !OS(WINCE)
+    if (isWOW64())
+        return "; WOW64";
+    if (processorArchitecture() == PROCESSOR_ARCHITECTURE_AMD64)
+        return "; Win64; x64";
+    if (processorArchitecture() == PROCESSOR_ARCHITECTURE_IA64)
+        return "; Win64; IA64";
+#endif
+    return String();
+}
+
+String windowsVersionForUAString()
+{
+    return makeString(osVersionForUAString(), architectureTokenForUAString());
+}
+
 } // namespace WebCore