Title: [125506] trunk/Source/WebCore
- Revision
- 125506
- Author
- [email protected]
- Date
- 2012-08-13 20:32:12 -0700 (Mon, 13 Aug 2012)
Log Message
WPARAM and LPARAM are incorrectly defined for x64
https://bugs.webkit.org/show_bug.cgi?id=89902
Patch by Alex Christensen <[email protected]> on 2012-08-13
Reviewed by Brent Fulgham.
Include WindowsExtras.h for PLATFORM(WIN) to define WPARAM and LPARAM correctly
* platform/PlatformKeyboardEvent.h:
* platform/PlatformMouseEvent.h:
* platform/PlatformWheelEvent.h:
* platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
* platform/win/WindowMessageListener.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125505 => 125506)
--- trunk/Source/WebCore/ChangeLog 2012-08-14 03:20:33 UTC (rev 125505)
+++ trunk/Source/WebCore/ChangeLog 2012-08-14 03:32:12 UTC (rev 125506)
@@ -1,3 +1,17 @@
+2012-08-13 Alex Christensen <[email protected]>
+
+ WPARAM and LPARAM are incorrectly defined for x64
+ https://bugs.webkit.org/show_bug.cgi?id=89902
+
+ Reviewed by Brent Fulgham.
+
+ Include WindowsExtras.h for PLATFORM(WIN) to define WPARAM and LPARAM correctly
+ * platform/PlatformKeyboardEvent.h:
+ * platform/PlatformMouseEvent.h:
+ * platform/PlatformWheelEvent.h:
+ * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
+ * platform/win/WindowMessageListener.h:
+
2012-08-13 John Bates <[email protected]>
[Chromium] Patch CCThreadProxy to call setTimebaseAndInterval on CCScheduler
Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (125505 => 125506)
--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2012-08-14 03:20:33 UTC (rev 125505)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2012-08-14 03:32:12 UTC (rev 125506)
@@ -28,6 +28,9 @@
#define PlatformKeyboardEvent_h
#include "PlatformEvent.h"
+#if OS(WINDOWS)
+#include "WindowsExtras.h"
+#endif
#include <wtf/text/WTFString.h>
#if PLATFORM(MAC)
@@ -35,12 +38,6 @@
OBJC_CLASS NSEvent;
#endif
-#if PLATFORM(WIN)
-typedef struct HWND__ *HWND;
-typedef unsigned WPARAM;
-typedef long LPARAM;
-#endif
-
#if PLATFORM(GTK)
typedef struct _GdkEventKey GdkEventKey;
#include "CompositionResults.h"
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (125505 => 125506)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2012-08-14 03:20:33 UTC (rev 125505)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2012-08-14 03:32:12 UTC (rev 125506)
@@ -28,6 +28,9 @@
#include "IntPoint.h"
#include "PlatformEvent.h"
+#if OS(WINDOWS)
+#include "WindowsExtras.h"
+#endif
#if PLATFORM(GTK)
typedef struct _GdkEventButton GdkEventButton;
@@ -40,13 +43,6 @@
typedef struct _Evas_Event_Mouse_Move Evas_Event_Mouse_Move;
#endif
-#if PLATFORM(WIN)
-typedef struct HWND__* HWND;
-typedef unsigned UINT;
-typedef unsigned WPARAM;
-typedef long LPARAM;
-#endif
-
#if PLATFORM(WX)
class wxMouseEvent;
#endif
Modified: trunk/Source/WebCore/platform/PlatformWheelEvent.h (125505 => 125506)
--- trunk/Source/WebCore/platform/PlatformWheelEvent.h 2012-08-14 03:20:33 UTC (rev 125505)
+++ trunk/Source/WebCore/platform/PlatformWheelEvent.h 2012-08-14 03:32:12 UTC (rev 125506)
@@ -28,6 +28,9 @@
#include "IntPoint.h"
#include "PlatformEvent.h"
+#if OS(WINDOWS)
+#include "WindowsExtras.h"
+#endif
#if PLATFORM(GTK)
typedef struct _GdkEventScroll GdkEventScroll;
@@ -37,12 +40,6 @@
typedef struct _Evas_Event_Mouse_Wheel Evas_Event_Mouse_Wheel;
#endif
-#if PLATFORM(WIN)
-typedef struct HWND__* HWND;
-typedef unsigned WPARAM;
-typedef long LPARAM;
-#endif
-
#if PLATFORM(WX)
class wxMouseEvent;
class wxPoint;
Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h (125505 => 125506)
--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h 2012-08-14 03:20:33 UTC (rev 125505)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h 2012-08-14 03:32:12 UTC (rev 125506)
@@ -26,19 +26,15 @@
#ifndef MediaPlayerPrivateFullscreenWindow_h
#define MediaPlayerPrivateFullscreenWindow_h
+#if OS(WINDOWS)
+#include "WindowsExtras.h"
+#endif
#include <wtf/RefPtr.h>
#if USE(ACCELERATED_COMPOSITING)
#include "CACFLayerTreeHostClient.h"
#endif
-typedef unsigned WPARAM;
-typedef long LPARAM;
-typedef struct HWND__* HWND;
-typedef _W64 long LONG_PTR;
-typedef LONG_PTR LRESULT;
-typedef unsigned int UINT;
-
namespace WebCore {
#if USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebCore/platform/win/WindowMessageListener.h (125505 => 125506)
--- trunk/Source/WebCore/platform/win/WindowMessageListener.h 2012-08-14 03:20:33 UTC (rev 125505)
+++ trunk/Source/WebCore/platform/win/WindowMessageListener.h 2012-08-14 03:32:12 UTC (rev 125506)
@@ -29,10 +29,9 @@
#ifndef WindowMessageListener_h
#define WindowMessageListener_h
-typedef struct HWND__* HWND;
-typedef long LPARAM;
-typedef unsigned UINT;
-typedef unsigned WPARAM;
+#if OS(WINDOWS)
+#include "WindowsExtras.h"
+#endif
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
