File qt-4.6.0-webkit.patch of Package mingw64-libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File qt-4.6.0-webkit.patch of Package mingw64-libqt4 (Revision 135cfb705b80dc74a877a3e125bab2e8)

Currently displaying revision 135cfb705b80dc74a877a3e125bab2e8 , Show latest

--- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2009-12-18 19:57:33.000000000 +0100
+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2009-12-18 23:00:49.000000000 +0100
@@ -257,7 +257,7 @@
 #elif PLATFORM(WINCE)
     void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #elif PLATFORM(WIN_OS)
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
     void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
 #else
     void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
@@ -343,7 +343,7 @@
 #elif PLATFORM(WINCE)
     VirtualFree(block, 0, MEM_RELEASE);
 #elif PLATFORM(WIN_OS)
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
     __mingw_aligned_free(block);
 #else
     _aligned_free(block);
@@ -590,7 +590,7 @@
         MOV pTib, EAX
     }
     return static_cast<void*>(pTib->StackBase);
-#elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#elif PLATFORM(WIN_OS) && PLATFORM(X86_64)
     PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
     return reinterpret_cast<void*>(pTib->StackBase);
 #elif PLATFORM(WIN_OS) && PLATFORM(X86) && COMPILER(GCC)
--- src/3rdparty/webkit/WebCore/platform/Arena.h	2009-12-18 19:57:32.000000000 +0100
+++ src/3rdparty/webkit/WebCore/platform/Arena.h	2009-12-18 23:12:54.000000000 +0100
@@ -44,7 +44,11 @@
 
 namespace WebCore {
 
+#ifdef _WIN64
+typedef unsigned long long uword;
+#else
 typedef unsigned long uword;
+#endif
 
 struct Arena {
     Arena* next;        // next arena
--- src/3rdparty/webkit/WebCore/platform/text/TextStream.cpp	2009-12-18 19:57:32.000000000 +0100
+++ src/3rdparty/webkit/WebCore/platform/text/TextStream.cpp	2009-12-18 23:18:45.000000000 +0100
@@ -101,7 +101,7 @@
     return String::adopt(m_text);
 }
 
-#if PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#if PLATFORM(WIN_OS) && PLATFORM(X86_64)
 TextStream& TextStream::operator<<(__int64 i)
 {
     char buffer[printBufferSize];
--- src/3rdparty/webkit/WebCore/platform/text/TextStream.h	2009-12-18 19:57:32.000000000 +0100
+++ src/3rdparty/webkit/WebCore/platform/text/TextStream.h	2009-12-18 23:18:36.000000000 +0100
@@ -44,7 +44,7 @@
     TextStream& operator<<(double);
     TextStream& operator<<(const char*);
     TextStream& operator<<(const String&);
-#if PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#if PLATFORM(WIN_OS) && PLATFORM(X86_64)
     TextStream& operator<<(unsigned __int64);
     TextStream& operator<<(__int64);
 #endif
--- src/3rdparty/webkit/WebCore/plugins/PluginView.cpp	2009-12-18 19:57:32.000000000 +0100
+++ src/3rdparty/webkit/WebCore/plugins/PluginView.cpp	2009-12-18 23:15:23.000000000 +0100
@@ -319,7 +319,7 @@
         WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC);
 
         if (currentWndProc == PluginViewWndProc)
-            SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG)m_pluginWndProc);
+            SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)m_pluginWndProc);
 #endif
     }
 #endif // XP_WIN
--- src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp	2009-12-18 19:57:32.000000000 +0100
+++ src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp	2009-12-18 23:43:18.000000000 +0100
@@ -526,7 +526,7 @@
 
     NPEvent npEvent;
     npEvent.event = WM_WINDOWPOSCHANGED;
-    npEvent.lParam = reinterpret_cast<uint32>(&windowpos);
+    npEvent.lParam = reinterpret_cast<quintptr>(&windowpos);
     npEvent.wParam = 0;
 
     dispatchNPEvent(npEvent);
@@ -534,7 +534,7 @@
     setNPWindowRect(frameRect());
 
     npEvent.event = WM_PAINT;
-    npEvent.wParam = reinterpret_cast<uint32>(hdc);
+    npEvent.wParam = reinterpret_cast<quintptr>(hdc);
 
     // This is supposed to be a pointer to the dirty rect, but it seems that the Flash plugin
     // ignores it so we just pass null.
@@ -803,7 +803,7 @@
 #else
         WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC);
         if (currentWndProc != PluginViewWndProc)
-            m_pluginWndProc = (WNDPROC)SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG)PluginViewWndProc);
+            m_pluginWndProc = (WNDPROC)SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)PluginViewWndProc);
 #endif
     }
 }
@@ -995,7 +995,7 @@
 
         // Calling SetWindowLongPtrA here makes the window proc ASCII, which is required by at least
         // the Shockwave Director plug-in.
-#if PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#if PLATFORM(WIN_OS) && PLATFORM(X86_64)
         ::SetWindowLongPtrA(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)DefWindowProcA);
 #elif PLATFORM(WINCE)
         ::SetWindowLong(platformPluginWidget(), GWL_WNDPROC, (LONG)DefWindowProc);
--- src/3rdparty/webkit/WebCore/WebCore.pro	2009-12-18 19:57:32.000000000 +0100
+++ src/3rdparty/webkit/WebCore/WebCore.pro	2009-12-18 22:57:27.000000000 +0100
@@ -80,7 +80,7 @@
 }
 
 # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
-win32-g++ {
+win32*-g++ {
     TMPPATH            = $$quote($$(INCLUDE))
     QMAKE_INCDIR_POST += $$split(TMPPATH,";")
     TMPPATH            = $$quote($$(LIB))
@@ -3364,7 +3364,7 @@
     CONFIG += no_debug_info
 }
 
-!win32-g++:win32:contains(QMAKE_HOST.arch, x86_64):{
+!win32*-g++:win32:contains(QMAKE_HOST.arch, x86_64):{
     asm_compiler.commands = ml64 /c
     asm_compiler.commands +=  /Fo ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
     asm_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}

Places

File qt-4.6.0-webkit.patch of Package mingw64-libqt4 (Revision 135cfb705b80dc74a877a3e125bab2e8)

Places