summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-06-17 09:10:13 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-29 11:59:22 (GMT)
commit6cdbca09b76285bc213a7b746e211df8b3a0a189 (patch)
treea5448794a63a71aea83ecbe8849bade258394fd9
parent107b7d767d99104aac9d236b3dc872663a236cd4 (diff)
downloadQt-6cdbca09b76285bc213a7b746e211df8b3a0a189.zip
Qt-6cdbca09b76285bc213a7b746e211df8b3a0a189.tar.gz
Qt-6cdbca09b76285bc213a7b746e211df8b3a0a189.tar.bz2
Re-apply change 353dcfd307853da289fdd245410e2e07358624a0 by Friedemann Kleint
Re-apply change 89e6d626f1e23858735659a1596408cd7a521c02 by Friedemann Kleint Commented out code that breaks MinGW. Reviewed-by: Simon Hausmann <shausman@trolltech.com>
-rw-r--r--src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp
index 67c34eb..e477965 100644
--- a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp
@@ -110,6 +110,11 @@ static BYTE* endPaint;
HDC WINAPI PluginView::hookedBeginPaint(HWND hWnd, PAINTSTRUCT* lpPaint)
{
+#if (COMPILER(MINGW))
+ Q_UNUSED(hWnd)
+ Q_UNUSED(lpPaint)
+ return 0;
+#else
PluginView* pluginView = reinterpret_cast<PluginView*>(GetProp(hWnd, kWebPluginViewProperty));
if (pluginView && pluginView->m_wmPrintHDC) {
// We're secretly handling WM_PRINTCLIENT, so set up the PAINTSTRUCT so
@@ -125,10 +130,16 @@ HDC WINAPI PluginView::hookedBeginPaint(HWND hWnd, PAINTSTRUCT* lpPaint)
__asm push lpPaint
__asm push hWnd
__asm call beginPaint
+#endif
}
BOOL WINAPI PluginView::hookedEndPaint(HWND hWnd, const PAINTSTRUCT* lpPaint)
{
+#if (COMPILER(MINGW))
+ Q_UNUSED(hWnd)
+ Q_UNUSED(lpPaint)
+ return FALSE;
+#else
PluginView* pluginView = reinterpret_cast<PluginView*>(GetProp(hWnd, kWebPluginViewProperty));
if (pluginView && pluginView->m_wmPrintHDC) {
// We're secretly handling WM_PRINTCLIENT, so we don't have to do any
@@ -141,8 +152,10 @@ BOOL WINAPI PluginView::hookedEndPaint(HWND hWnd, const PAINTSTRUCT* lpPaint)
__asm push lpPaint
__asm push hWnd
__asm call endPaint
+#endif
}
+#if (!COMPILER(MINGW))
static void hook(const char* module, const char* proc, unsigned& sysCallID, BYTE*& pProc, const void* pNewProc)
{
// See <http://www.fengyuan.com/article/wmprint.html> for an explanation of
@@ -183,6 +196,7 @@ static void setUpOffscreenPaintingHooks(HDC (WINAPI*hookedBeginPaint)(HWND, PAIN
hook("user32.dll", "BeginPaint", beginPaintSysCall, beginPaint, hookedBeginPaint);
hook("user32.dll", "EndPaint", endPaintSysCall, endPaint, hookedEndPaint);
}
+#endif
static bool registerPluginView()
{
@@ -926,8 +940,9 @@ void PluginView::init()
if (m_isWindowed) {
registerPluginView();
+#if (!COMPILER(MINGW))
setUpOffscreenPaintingHooks(hookedBeginPaint, hookedEndPaint);
-
+#endif
DWORD flags = WS_CHILD;
if (isSelfVisible())
flags |= WS_VISIBLE;