diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-25 15:22:29 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-25 15:47:41 (GMT) |
| commit | 035f6e3454a512cef69fdf62a8f93c7f600ed553 (patch) | |
| tree | 9cd05899cafa3c635371bb3d44ed197c140190b6 | |
| parent | a628b94904d6e67fb18525fbbc8187abd76a29cd (diff) | |
| download | Qt-035f6e3454a512cef69fdf62a8f93c7f600ed553.zip Qt-035f6e3454a512cef69fdf62a8f93c7f600ed553.tar.gz Qt-035f6e3454a512cef69fdf62a8f93c7f600ed553.tar.bz2 | |
Fix crash of QtWebKit on any page with Flash when compiled witn MinGW.
Early push of this fix which should be overwritten by the fix
upstreamed in WebKit trunk later.
Reviewed-by: Simon Hausmann
(cherry picked from commit dddd3e5fc9658ebbb5f94b343e7c7c0cd27eb7f2)
(cherry picked from commit 4c3539dfbc65d5decdd842d4181f9aa3d38d213c)
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp index 5ccce0e..b313afb 100644 --- a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp @@ -145,7 +145,7 @@ HDC WINAPI PluginView::hookedBeginPaint(HWND hWnd, PAINTSTRUCT* lpPaint) "push %3\n" "call *%4\n" : "=a" (result) - : "a" (beginPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (*beginPaint) + : "a" (beginPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (beginPaint) : "memory" ); return result; @@ -175,7 +175,7 @@ BOOL WINAPI PluginView::hookedEndPaint(HWND hWnd, const PAINTSTRUCT* lpPaint) "push %3\n" "call *%4\n" : "=a" (result) - : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (*endPaint) + : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (endPaint) ); return result; #elif defined (_M_IX86) |