diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-06-17 09:10:13 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-29 09:23:51 (GMT) |
| commit | 4a82d7cc185bd98ec8183fb0ccadefd3196b3ee2 (patch) | |
| tree | a3cc40008a7954705469eae7e27600dec3b52664 | |
| parent | f40ec4700d0162f741d872996f65162968064496 (diff) | |
| download | Qt-4a82d7cc185bd98ec8183fb0ccadefd3196b3ee2.zip Qt-4a82d7cc185bd98ec8183fb0ccadefd3196b3ee2.tar.gz Qt-4a82d7cc185bd98ec8183fb0ccadefd3196b3ee2.tar.bz2 | |
Re-apply change d5270cd1254e8df4a4ad39ef19d76fffaaecf41f by Friedemann Kleint
Re-apply change cac74b70d0a7f1ba5b70311450d86906c4436d6d 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.cpp | 17 |
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; |