Diff
Modified: trunk/ChangeLog (216226 => 216227)
--- trunk/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,12 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/OptionsWin.cmake:
+
2017-05-03 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.17.1 release.
Modified: trunk/Source/_javascript_Core/ChangeLog (216226 => 216227)
--- trunk/Source/_javascript_Core/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,12 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ * config.h:
+
2017-05-04 Mark Lam <mark....@apple.com>
Gardening: Build fix for Windows after r216217.
Modified: trunk/Source/_javascript_Core/config.h (216226 => 216227)
--- trunk/Source/_javascript_Core/config.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/_javascript_Core/config.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -29,25 +29,6 @@
#include "JSExportMacros.h"
#endif
-#if OS(WINDOWS)
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0601
-#endif
-
-#if !COMPILER(MSVC7_OR_LOWER)
-// We need to define this before the first #include of stdlib.h or it won't contain rand_s.
-#ifndef _CRT_RAND_S
-#define _CRT_RAND_S
-#endif
-#endif // !COMPILER(MSVC7_OR_LOWER
-
-#endif // OS(WINDOWS)
-
#ifdef __cplusplus
#undef new
#undef delete
@@ -61,4 +42,3 @@
#else
#define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
#endif
-
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (216226 => 216227)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2017-05-05 02:11:26 UTC (rev 216227)
@@ -6,6 +6,13 @@
include/KHR
)
+if (WIN32)
+ # FIXME: DX11 support will not compile if this preprocessor definition is set
+ # DirectX Documentation is setting that version to 0x700 but there is no
+ # corresponding value in sdkddkver.h
+ remove_definitions(-D_WIN32_WINNT=0x601)
+endif ()
+
set(ANGLEEGL_SOURCES
src/libEGL/libEGL.cpp
)
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (216226 => 216227)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,12 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+
2017-04-20 Konstantin Tokarev <annu...@yandex.ru>
[cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
Modified: trunk/Source/WTF/ChangeLog (216226 => 216227)
--- trunk/Source/WTF/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WTF/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,12 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ * config.h:
+
2017-05-04 Mark Lam <mark....@apple.com>
NeverDestroyed<String>(ASCIILiteral(...)) is not thread safe.
Modified: trunk/Source/WTF/config.h (216226 => 216227)
--- trunk/Source/WTF/config.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WTF/config.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -26,25 +26,6 @@
#include <wtf/Platform.h>
#include <wtf/ExportMacros.h>
-#if OS(WINDOWS)
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0601
-#endif
-
-#if !COMPILER(MSVC7_OR_LOWER)
-// We need to define this before the first #include of stdlib.h or it won't contain rand_s.
-#ifndef _CRT_RAND_S
-#define _CRT_RAND_S
-#endif
-#endif
-
-#endif
-
#ifdef __cplusplus
#undef new
#undef delete
Modified: trunk/Source/WebCore/ChangeLog (216226 => 216227)
--- trunk/Source/WebCore/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,18 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ No new tests. No change in behavior.
+
+ * WebCorePrefix.h:
+ * config.h:
+ * platform/win/COMPtr.h:
+ * platform/win/WindowsTouch.h:
+ * testing/js/WebCoreTestSupportPrefix.h:
+
2017-05-04 Tim Horton <timothy_hor...@apple.com>
[Mac] Modernize image for dragged link
Modified: trunk/Source/WebCore/PAL/ChangeLog (216226 => 216227)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,14 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ No new tests. No change in behavior.
+
+ * config.h:
+
2017-05-04 Sam Weinig <s...@webkit.org>
Remove support for legacy Notifications
Modified: trunk/Source/WebCore/PAL/config.h (216226 => 216227)
--- trunk/Source/WebCore/PAL/config.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/PAL/config.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -27,22 +27,6 @@
#include <wtf/ExportMacros.h>
-#ifdef __APPLE__
-#define HAVE_FUNC_USLEEP 1
-#endif /* __APPLE__ */
-
-#if OS(WINDOWS)
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0601
-#endif
-
-#endif /* OS(WINDOWS) */
-
#ifdef __cplusplus
// These undefs match up with defines in WebCorePrefix.h for Mac OS X.
Modified: trunk/Source/WebCore/WebCorePrefix.h (216226 => 216227)
--- trunk/Source/WebCore/WebCorePrefix.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/WebCorePrefix.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -43,14 +43,6 @@
#if OS(WINDOWS)
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0601
-#endif
-
#if !USE(CURL)
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
@@ -183,4 +175,3 @@
#undef try
#undef catch
#endif
-
Modified: trunk/Source/WebCore/config.h (216226 => 216227)
--- trunk/Source/WebCore/config.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/config.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -44,14 +44,6 @@
#if OS(WINDOWS)
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0601
-#endif
-
// CURL needs winsock, so don't prevent inclusion of it
#if !USE(CURL)
#ifndef _WINSOCKAPI_
Modified: trunk/Source/WebCore/platform/win/COMPtr.h (216226 => 216227)
--- trunk/Source/WebCore/platform/win/COMPtr.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/platform/win/COMPtr.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -26,10 +26,6 @@
#ifndef COMPtr_h
#define COMPtr_h
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
#include <unknwn.h>
#include <wtf/Assertions.h>
#include <wtf/HashTraits.h>
Modified: trunk/Source/WebCore/platform/win/WindowsTouch.h (216226 => 216227)
--- trunk/Source/WebCore/platform/win/WindowsTouch.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/platform/win/WindowsTouch.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WindowsTouch_h
-#define WindowsTouch_h
+#pragma once
/*
* The following constants are used to determine multitouch and gesture behavior
@@ -70,47 +69,3 @@
// Press and tap Configuration Flags
#define GC_PRESSANDTAP 0x00000001
#define GC_ROLLOVER GC_PRESSANDTAP
-
-#if WINVER < 0x0601
-
-// GESTUREINFO struct definition
-typedef struct tagGESTUREINFO {
- UINT cbSize; // size, in bytes, of this structure (including variable length Args field)
- DWORD dwFlags; // see GF_* flags
- DWORD dwID; // gesture ID, see GID_* defines
- HWND hwndTarget; // handle to window targeted by this gesture
- POINTS ptsLocation; // current location of this gesture
- DWORD dwInstanceID; // internally used
- DWORD dwSequenceID; // internally used
- ULONGLONG ullArguments; // arguments for gestures whose arguments fit in 8 BYTES
- UINT cbExtraArgs; // size, in bytes, of extra arguments, if any, that accompany this gesture
-} GESTUREINFO, *PGESTUREINFO;
-typedef GESTUREINFO const * PCGESTUREINFO;
-
-// GESTURECONFIG struct defintion
-typedef struct tagGESTURECONFIG {
- DWORD dwID; // gesture ID
- DWORD dwWant; // settings related to gesture ID that are to be turned on
- DWORD dwBlock; // settings related to gesture ID that are to be turned off
-} GESTURECONFIG, *PGESTURECONFIG;
-
-/*
- * Gesture notification structure
- * - The WM_GESTURENOTIFY message lParam contains a pointer to this structure.
- * - The WM_GESTURENOTIFY message notifies a window that gesture recognition is
- * in progress and a gesture will be generated if one is recognized under the
- * current gesture settings.
- */
-typedef struct tagGESTURENOTIFYSTRUCT {
- UINT cbSize; // size, in bytes, of this structure
- DWORD dwFlags; // unused
- HWND hwndTarget; // handle to window targeted by the gesture
- POINTS ptsLocation; // starting location
- DWORD dwInstanceID; // internally used
-} GESTURENOTIFYSTRUCT, *PGESTURENOTIFYSTRUCT;
-
-DECLARE_HANDLE(HGESTUREINFO);
-
-#endif
-
-#endif
Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h (216226 => 216227)
--- trunk/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -43,14 +43,6 @@
#if OS(WINDOWS)
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0601
-#endif
-
#if !USE(CURL)
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
Modified: trunk/Source/WebKit/win/COMEnumVariant.h (216226 => 216227)
--- trunk/Source/WebKit/win/COMEnumVariant.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebKit/win/COMEnumVariant.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -26,12 +26,8 @@
#ifndef COMEnumVariant_h
#define COMEnumVariant_h
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
#include <unknwn.h>
-
#include "COMVariantSetter.h"
template<typename ContainerType>
Modified: trunk/Source/WebKit/win/COMPropertyBag.h (216226 => 216227)
--- trunk/Source/WebKit/win/COMPropertyBag.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebKit/win/COMPropertyBag.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -26,9 +26,6 @@
#ifndef COMPropertyBag_h
#define COMPropertyBag_h
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
#include <ocidl.h>
#include <unknwn.h>
Modified: trunk/Source/WebKit/win/ChangeLog (216226 => 216227)
--- trunk/Source/WebKit/win/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebKit/win/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,14 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ * COMEnumVariant.h:
+ * COMPropertyBag.h:
+ * WebKitPrefix.h:
+
2017-05-04 Sam Weinig <s...@webkit.org>
Remove support for legacy Notifications
Modified: trunk/Source/WebKit/win/WebKitPrefix.h (216226 => 216227)
--- trunk/Source/WebKit/win/WebKitPrefix.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/WebKit/win/WebKitPrefix.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -26,14 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0601
-#endif
-
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
#endif
@@ -55,4 +47,3 @@
// as WEBCORE_EXPORT
#undef WEBCORE_EXPORT
#define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
-
Modified: trunk/Source/cmake/OptionsWin.cmake (216226 => 216227)
--- trunk/Source/cmake/OptionsWin.cmake 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Source/cmake/OptionsWin.cmake 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,5 +1,12 @@
-add_definitions(-DNOMINMAX -DUNICODE -D_UNICODE -D_WINDOWS -DWINVER=0x601)
+# Define minimum supported Windows version
+# https://msdn.microsoft.com/en-us/library/6sehtctf.aspx
+#
+# Currently set to Windows 7
+add_definitions(-D_WINDOWS -DWINVER=0x601 -D_WIN32_WINNT=0x601)
+add_definitions(-DNOMINMAX)
+add_definitions(-DUNICODE -D_UNICODE)
+
WEBKIT_OPTION_BEGIN()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
Modified: trunk/Tools/ChangeLog (216226 => 216227)
--- trunk/Tools/ChangeLog 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Tools/ChangeLog 2017-05-05 02:11:26 UTC (rev 216227)
@@ -1,3 +1,14 @@
+2017-05-04 Don Olmstead <don.olmst...@am.sony.com>
+
+ [Win] Remove redundant macros that are set in the CMake config
+ https://bugs.webkit.org/show_bug.cgi?id=171571
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/config.h:
+ * MiniBrowser/win/stdafx.h:
+ * TestWebKitAPI/config.h:
+
2017-05-04 Said Abou-Hallawa <sabouhall...@apple.com>
Add testRunner.display() to force displaying the web page for testing
Modified: trunk/Tools/DumpRenderTree/config.h (216226 => 216227)
--- trunk/Tools/DumpRenderTree/config.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Tools/DumpRenderTree/config.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -47,12 +47,6 @@
#define USE_CFURLCONNECTION 1
#endif
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x601
-
-#undef WINVER
-#define WINVER 0x0601
-
#undef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
#endif // PLATFORM(WIN)
Modified: trunk/Tools/MiniBrowser/win/stdafx.h (216226 => 216227)
--- trunk/Tools/MiniBrowser/win/stdafx.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Tools/MiniBrowser/win/stdafx.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -30,24 +30,6 @@
#pragma once
-// 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 7 or later.
-#define WINVER 0x0601 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows 7 or later.
-#define _WIN32_WINNT 0x601 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 7 or later.
-#define _WIN32_WINDOWS 0x601 // Change this to the appropriate value to target Windows 7 or later.
-#endif
-
-#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
-#endif
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Needed for limit defines, like INTMAX_MAX, which is used by the std C++ library
@@ -55,10 +37,6 @@
#define __STDC_LIMIT_MACROS
#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
#include <assert.h>
#include <comip.h>
#include <commctrl.h>
Modified: trunk/Tools/TestWebKitAPI/config.h (216226 => 216227)
--- trunk/Tools/TestWebKitAPI/config.h 2017-05-05 02:07:22 UTC (rev 216226)
+++ trunk/Tools/TestWebKitAPI/config.h 2017-05-05 02:11:26 UTC (rev 216227)
@@ -44,10 +44,6 @@
#elif PLATFORM(WIN)
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
#if PLATFORM(WIN_CAIRO)
#undef USE_CG
#define USE_CAIRO 1
