Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (140929 => 140930)
--- trunk/Source/_javascript_Core/ChangeLog 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-01-28 00:26:55 UTC (rev 140930)
@@ -1,3 +1,12 @@
+2013-01-27 Zoltan Arvai <[email protected]>
+
+ Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
+ https://bugs.webkit.org/show_bug.cgi?id=106740
+
+ Reviewed by Benjamin Poulain.
+
+ * config.h:
+
2013-01-25 Filip Pizlo <[email protected]>
DFG variable event stream shouldn't use NodeIndex
Modified: trunk/Source/_javascript_Core/config.h (140929 => 140930)
--- trunk/Source/_javascript_Core/config.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/_javascript_Core/config.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -40,11 +40,11 @@
#if OS(WINDOWS)
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0502
#endif
#ifndef WINVER
-#define WINVER 0x0501
+#define WINVER 0x0502
#endif
// If we don't define these, they get defined in windef.h.
Modified: trunk/Source/WTF/ChangeLog (140929 => 140930)
--- trunk/Source/WTF/ChangeLog 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WTF/ChangeLog 2013-01-28 00:26:55 UTC (rev 140930)
@@ -1,3 +1,23 @@
+2013-01-27 Zoltan Arvai <[email protected]>
+
+ Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
+ https://bugs.webkit.org/show_bug.cgi?id=106740
+
+ Reviewed by Benjamin Poulain.
+
+ Adding int64_t type atomicIncrement and atomicDecrement implementations for Windows
+ into Atomics.h required by WebKit2 after r139514. Separating WinCE implementation
+ that does not support WebKit2 and has no support for 64 bit interlocked methods.
+
+ Increasing WINVER and _WIN32_WINNT to XP SP2, because the 64 bit type interlocked methods
+ are not supported on previous versions on 32 bit target.
+
+ * config.h:
+ * wtf/Atomics.h:
+ (WTF):
+ (WTF::atomicIncrement):
+ (WTF::atomicDecrement):
+
2013-01-26 Andras Becsi <[email protected]>
Unreviewed fix after r140451 to make GIT-SVN repositories happy.
Modified: trunk/Source/WTF/config.h (140929 => 140930)
--- trunk/Source/WTF/config.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WTF/config.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -33,11 +33,11 @@
#if OS(WINDOWS)
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0502
#endif
#ifndef WINVER
-#define WINVER 0x0501
+#define WINVER 0x0502
#endif
// If we don't define these, they get defined in windef.h.
Modified: trunk/Source/WTF/wtf/Atomics.h (140929 => 140930)
--- trunk/Source/WTF/wtf/Atomics.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WTF/wtf/Atomics.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -76,12 +76,21 @@
#if OS(WINDOWS)
#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
+#if OS(WINCE)
inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
+#elif COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER)
+inline int atomicIncrement(int* addend) { return InterlockedIncrement(reinterpret_cast<long*>(addend)); }
+inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
+
+inline int64_t atomicIncrement(int64_t* addend) { return InterlockedIncrement64(reinterpret_cast<long long*>(addend)); }
+inline int64_t atomicDecrement(int64_t* addend) { return InterlockedDecrement64(reinterpret_cast<long long*>(addend)); }
#else
inline int atomicIncrement(int volatile* addend) { return InterlockedIncrement(reinterpret_cast<long volatile*>(addend)); }
inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
+
+inline int64_t atomicIncrement(int64_t volatile* addend) { return InterlockedIncrement64(reinterpret_cast<long long volatile*>(addend)); }
+inline int64_t atomicDecrement(int64_t volatile* addend) { return InterlockedDecrement64(reinterpret_cast<long long volatile*>(addend)); }
#endif
#elif OS(QNX)
Modified: trunk/Source/WebCore/ChangeLog (140929 => 140930)
--- trunk/Source/WebCore/ChangeLog 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WebCore/ChangeLog 2013-01-28 00:26:55 UTC (rev 140930)
@@ -1,3 +1,13 @@
+2013-01-27 Zoltan Arvai <[email protected]>
+
+ Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
+ https://bugs.webkit.org/show_bug.cgi?id=106740
+
+ Reviewed by Benjamin Poulain.
+
+ * WebCorePrefix.h:
+ * config.h:
+
2013-01-27 Jochen Eisinger <[email protected]>
Check notification permissions in the show() method
Modified: trunk/Source/WebCore/WebCorePrefix.h (140929 => 140930)
--- trunk/Source/WebCore/WebCorePrefix.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WebCore/WebCorePrefix.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -38,11 +38,11 @@
#if defined(WIN32) || defined(_WIN32)
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0502
#endif
#ifndef WINVER
-#define WINVER 0x0501
+#define WINVER 0x0502
#endif
#ifndef WTF_USE_CURL
Modified: trunk/Source/WebCore/config.h (140929 => 140930)
--- trunk/Source/WebCore/config.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WebCore/config.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -45,11 +45,11 @@
#if OS(WINDOWS)
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0502
#endif
#ifndef WINVER
-#define WINVER 0x0501
+#define WINVER 0x0502
#endif
// If we don't define these, they get defined in windef.h.
Modified: trunk/Source/WebKit/win/ChangeLog (140929 => 140930)
--- trunk/Source/WebKit/win/ChangeLog 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WebKit/win/ChangeLog 2013-01-28 00:26:55 UTC (rev 140930)
@@ -1,3 +1,12 @@
+2013-01-27 Zoltan Arvai <[email protected]>
+
+ Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
+ https://bugs.webkit.org/show_bug.cgi?id=106740
+
+ Reviewed by Benjamin Poulain.
+
+ * WebKitPrefix.h:
+
2013-01-26 Alexey Proskuryakov <[email protected]>
Remove code for handling NetworkProcess authentication challenges in WebProcess
Modified: trunk/Source/WebKit/win/WebKitPrefix.h (140929 => 140930)
--- trunk/Source/WebKit/win/WebKitPrefix.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WebKit/win/WebKitPrefix.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -27,11 +27,11 @@
*/
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0502
#endif
#ifndef WINVER
-#define WINVER 0x0500
+#define WINVER 0x0502
#endif
// If we don't define these, they get defined in windef.h.
Modified: trunk/Source/WebKit2/ChangeLog (140929 => 140930)
--- trunk/Source/WebKit2/ChangeLog 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-28 00:26:55 UTC (rev 140930)
@@ -1,3 +1,12 @@
+2013-01-27 Zoltan Arvai <[email protected]>
+
+ Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
+ https://bugs.webkit.org/show_bug.cgi?id=106740
+
+ Reviewed by Benjamin Poulain.
+
+ * config.h:
+
2013-01-27 Sam Weinig <[email protected]>
Add support for launching WebKit2 plugins using XPC
Modified: trunk/Source/WebKit2/config.h (140929 => 140930)
--- trunk/Source/WebKit2/config.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Source/WebKit2/config.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -62,11 +62,11 @@
#if defined(WIN32) || defined(_WIN32)
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0502
#endif
#ifndef WINVER
-#define WINVER 0x0500
+#define WINVER 0x0502
#endif
/* If we don't define these, they get defined in windef.h. */
Modified: trunk/Tools/ChangeLog (140929 => 140930)
--- trunk/Tools/ChangeLog 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Tools/ChangeLog 2013-01-28 00:26:55 UTC (rev 140930)
@@ -1,3 +1,13 @@
+2013-01-27 Zoltan Arvai <[email protected]>
+
+ Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
+ https://bugs.webkit.org/show_bug.cgi?id=106740
+
+ Reviewed by Benjamin Poulain.
+
+ * DumpRenderTree/config.h:
+ * WinLauncher/stdafx.h:
+
2013-01-26 David Farler <[email protected]>
Makefiles should work for arbitrary SDKs and architectures on Apple ports
Modified: trunk/Tools/DumpRenderTree/config.h (140929 => 140930)
--- trunk/Tools/DumpRenderTree/config.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Tools/DumpRenderTree/config.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -85,10 +85,10 @@
#endif
#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0502
#undef WINVER
-#define WINVER 0x0500
+#define WINVER 0x0502
#undef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
Modified: trunk/Tools/WinLauncher/stdafx.h (140929 => 140930)
--- trunk/Tools/WinLauncher/stdafx.h 2013-01-27 21:53:24 UTC (rev 140929)
+++ trunk/Tools/WinLauncher/stdafx.h 2013-01-28 00:26:55 UTC (rev 140930)
@@ -32,12 +32,12 @@
// Modify the following defines if you have to target a platform prior to the ones specified below.
// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER // Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#ifndef WINVER // Allow use of features specific to Windows XP SP2 or later.
+#define WINVER 0x0502 // Change this to the appropriate value to target other versions of Windows.
#endif
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP SP2 or later.
+#define _WIN32_WINNT 0x0502 // Change this to the appropriate value to target other versions of Windows.
#endif
#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
