Commit 4e743cc6 authored by pkasting@chromium.org's avatar pkasting@chromium.org

Unreviewed, build fix.

* StringsNotToBeLocalized.txt: Add function names I forgot.
* platform/win/SystemInfo.cpp: #if out some uncalled functions on WinCE,
  since they don't compile anyway.  Use ZeroMemory() instead of "= {0}"
  since Qt is stupid and (sometimes?!) warns about it.
(WebCore::windowsVersion):
(WebCore::processorArchitecture):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@80694 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c61257b1
2011-03-09 Peter Kasting <pkasting@google.com>
Unreviewed, build fix.
* StringsNotToBeLocalized.txt: Add function names I forgot.
* platform/win/SystemInfo.cpp: #if out some uncalled functions on WinCE,
since they don't compile anyway. Use ZeroMemory() instead of "= {0}"
since Qt is stupid and (sometimes?!) warns about it.
(WebCore::windowsVersion):
(WebCore::processorArchitecture):
2011-03-09 Peter Kasting <pkasting@google.com>
Reviewed by Ryosuke Niwa.
......
......@@ -185,6 +185,7 @@
"GCS_COMPATTR"
"GEN_DOMObject"
"GET"
"GetNativeSystemInfo"
"GroupName"
"HIDictionaryWindowShow"
"HTTP "
......@@ -231,6 +232,7 @@
"InsertNewline"
"InsertTab"
"Intel"
"IsWow64Process"
"JSDOMWindowShell"
"JavaScript"
"JavaScriptFreeSize"
......
......@@ -40,10 +40,11 @@ WindowsVersion windowsVersion(int* major, int* minor)
if (!initialized) {
initialized = true;
#if OS(WINCE)
OSVERSIONINFO versionInfo = {0};
OSVERSIONINFO versionInfo;
#else
OSVERSIONINFOEX versionInfo = {0};
OSVERSIONINFOEX versionInfo;
#endif
ZeroMemory(&versionInfo, sizeof(versionInfo));
versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&versionInfo));
majorVersion = versionInfo.dwMajorVersion;
......@@ -113,6 +114,7 @@ static String osVersionForUAString()
return makeString(familyName, String::number(major), '.', String::number(minor));
}
#if !OS(WINCE)
static bool isWOW64()
{
static bool initialized = false;
......@@ -147,7 +149,8 @@ static WORD processorArchitecture()
typedef VOID (WINAPI* GetNativeSystemInfoFunc)(LPSYSTEM_INFO);
GetNativeSystemInfoFunc getNativeSystemInfo = reinterpret_cast<GetNativeSystemInfoFunc>(GetProcAddress(kernel32Module, "GetNativeSystemInfo"));
if (getNativeSystemInfo) {
SYSTEM_INFO systemInfo = {0};
SYSTEM_INFO systemInfo;
ZeroMemory(&systemInfo, sizeof(systemInfo));
getNativeSystemInfo(&systemInfo);
architecture = systemInfo.wProcessorArchitecture;
}
......@@ -155,6 +158,7 @@ static WORD processorArchitecture()
return architecture;
}
#endif
static String architectureTokenForUAString()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment