From 353dcfd307853da289fdd245410e2e07358624a0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 17 Jun 2009 11:10:13 +0200 Subject: Re-apply change 89e6d626f1e23858735659a1596408cd7a521c02 by Friedemann Kleint Commented out code that breaks MinGW. Reviewed-by: Simon Hausmann --- .../webkit/WebCore/plugins/win/PluginViewWin.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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(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(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 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; -- cgit v0.12