<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184490] releases/WebKitGTK/webkit-2.4/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184490">184490</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-18 09:47:39 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[W32] windowsVersion() and osVersionForUAString() are outdated
https://bugs.webkit.org/show_bug.cgi?id=143771
Patch by Руслан Ижбулатов <lrn1986@gmail.com> on 2015-04-15
Reviewed by Darin Adler
Update windowsVersion() and osVersionForUAString()
Add support for newer Windows versions to windowsVersion(), handle
all defined cases in osVersionForUAString(), avoiding warnings like
../webkitgtk-2.4.8/Source/WebCore/platform/win/SystemInfo.cpp: In function 'WTF::String WebCore::osVersionForUAString()':
../webkitgtk-2.4.8/Source/WebCore/platform/win/SystemInfo.cpp:94:12: warning: enumeration value 'WindowsCE5' not handled in switch [-Wswitch]
repeated for each unhandled value
* platform/win/SystemInfo.cpp:
(WebCore::windowsVersion):
(WebCore::osVersionForUAString):
* platform/win/SystemInfo.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformwinSystemInfocpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformwinSystemInfoh">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184489 => 184490)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 16:17:06 UTC (rev 184489)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 16:47:39 UTC (rev 184490)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
+
+ [W32] windowsVersion() and osVersionForUAString() are outdated
+ https://bugs.webkit.org/show_bug.cgi?id=143771
+
+ Reviewed by Darin Adler
+
+ Update windowsVersion() and osVersionForUAString()
+
+ Add support for newer Windows versions to windowsVersion(), handle
+ all defined cases in osVersionForUAString(), avoiding warnings like
+ ../webkitgtk-2.4.8/Source/WebCore/platform/win/SystemInfo.cpp: In function 'WTF::String WebCore::osVersionForUAString()':
+ ../webkitgtk-2.4.8/Source/WebCore/platform/win/SystemInfo.cpp:94:12: warning: enumeration value 'WindowsCE5' not handled in switch [-Wswitch]
+ repeated for each unhandled value
+
+ * platform/win/SystemInfo.cpp:
+ (WebCore::windowsVersion):
+ (WebCore::osVersionForUAString):
+ * platform/win/SystemInfo.h:
+
</ins><span class="cx"> 2015-04-17 Milan Crha <mcrha@redhat.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Replace M_SQRT2 with sqrtOfTwoDouble
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformwinSystemInfocpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.cpp (184489 => 184490)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.cpp 2015-05-18 16:17:06 UTC (rev 184489)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.cpp 2015-05-18 16:47:39 UTC (rev 184490)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx"> #include <windows.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#ifndef SM_SERVERR2
+#define SM_SERVERR2 89
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> WindowsVersion windowsVersion(int* major, int* minor)
</span><span class="lines">@@ -65,15 +69,75 @@
</span><span class="cx"> version = (minorVersion == 10) ? Windows98 : WindowsME;
</span><span class="cx"> } else {
</span><span class="cx"> if (majorVersion == 5) {
</span><del>- if (!minorVersion)
</del><ins>+ switch (minorVersion) {
+ default:
+ case 0:
</ins><span class="cx"> version = Windows2000;
</span><del>- else
- version = (minorVersion == 1) ? WindowsXP : WindowsServer2003;
- } else if (majorVersion >= 6) {
- if (versionInfo.wProductType == VER_NT_WORKSTATION)
- version = (majorVersion == 6 && !minorVersion) ? WindowsVista : Windows7;
- else
- version = WindowsServer2008;
</del><ins>+ break;
+ case 1:
+ version = WindowsXP;
+ break;
+ case 2:
+ if (versionInfo.wProductType == VER_NT_WORKSTATION)
+ version = WindowsXP64;
+ else {
+ if (!GetSystemMetrics(SM_SERVERR2))
+ version = WindowsServer2003;
+ else
+ version = WindowsServer2003R2;
+ }
+ break;
+ }
+ } else if (majorVersion == 6) {
+ if (versionInfo.wProductType == VER_NT_WORKSTATION) {
+ switch (minorVersion) {
+ default:
+ case 0:
+ version = WindowsVista;
+ break;
+ case 1:
+ version = Windows7;
+ break;
+ case 2:
+ version = Windows8;
+ break;
+ case 3:
+ version = Windows81;
+ break;
+ }
+ } else {
+ switch (minorVersion) {
+ default:
+ case 0:
+ version = WindowsServer2008;
+ break;
+ case 1:
+ version = WindowsServer2008R2;
+ break;
+ case 2:
+ version = WindowsServer2012;
+ break;
+ case 3:
+ version = WindowsServer2012R2;
+ break;
+ }
+ }
+ } else if (majorVersion == 10) {
+ if (versionInfo.wProductType == VER_NT_WORKSTATION) {
+ switch (minorVersion) {
+ default:
+ case 0:
+ version = Windows10;
+ break;
+ }
+ } else {
+ switch (minorVersion) {
+ default:
+ case 0:
+ version = WindowsServer2016;
+ break;
+ }
+ }
</ins><span class="cx"> } else
</span><span class="cx"> version = (majorVersion == 4) ? WindowsNT4 : WindowsNT3;
</span><span class="cx"> }
</span><span class="lines">@@ -97,6 +161,9 @@
</span><span class="cx"> case WindowsCE3:
</span><span class="cx"> return "Windows CE";
</span><span class="cx"> case WindowsCE4:
</span><ins>+ case WindowsCE5:
+ case WindowsCE6:
+ case WindowsCE7:
</ins><span class="cx"> return "Windows CE .NET";
</span><span class="cx"> case Windows3_1:
</span><span class="cx"> return "Windows 3.1";
</span><span class="lines">@@ -106,8 +173,40 @@
</span><span class="cx"> return "Windows 98";
</span><span class="cx"> case WindowsME:
</span><span class="cx"> return "Windows 98; Win 9x 4.90";
</span><ins>+ case WindowsNT3:
+ return "WinNT3.0";
</ins><span class="cx"> case WindowsNT4:
</span><span class="cx"> return "WinNT4.0";
</span><ins>+ case Windows2000:
+ return "Windows 2000";
+ case WindowsXP:
+ return "Windows XP";
+ case WindowsServer2003:
+ return "Windows Server 2003";
+ case WindowsXP64:
+ return "Windows XP Professional x64 Edition";
+ case WindowsServer2003R2:
+ return "Windows Server 2003 R2";
+ case WindowsVista:
+ return "Windows Vista";
+ case WindowsServer2008:
+ return "Windows Server 2008";
+ case Windows7:
+ return "Windows 7";
+ case WindowsServer2008R2:
+ return "Windows Server 2008 R2";
+ case Windows8:
+ return "Windows 8";
+ case WindowsServer2012:
+ return "Windows Server 2012";
+ case Windows81:
+ return "Windows 8.1";
+ case WindowsServer2012R2:
+ return "Windows Server 2012 R2";
+ case Windows10:
+ return "Windows 10";
+ case WindowsServer2016:
+ return "Windows Server 2016";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* familyName = (version >= WindowsNT3) ? "Windows NT " : "Windows CE ";
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformwinSystemInfoh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.h (184489 => 184490)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.h 2015-05-18 16:17:06 UTC (rev 184489)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/win/SystemInfo.h 2015-05-18 16:47:39 UTC (rev 184490)
</span><span class="lines">@@ -54,9 +54,18 @@
</span><span class="cx"> Windows2000,
</span><span class="cx"> WindowsXP,
</span><span class="cx"> WindowsServer2003,
</span><ins>+ WindowsXP64,
+ WindowsServer2003R2,
</ins><span class="cx"> WindowsVista,
</span><span class="cx"> WindowsServer2008,
</span><span class="cx"> Windows7,
</span><ins>+ WindowsServer2008R2,
+ Windows8,
+ WindowsServer2012,
+ Windows81,
+ WindowsServer2012R2,
+ Windows10,
+ WindowsServer2016,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // If supplied, |major| and |minor| are set to the OSVERSIONINFO::dwMajorVersion
</span></span></pre>
</div>
</div>
</body>
</html>