From 32a182c25104e6e49fc965a168957acff52a2b53 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Mon, 29 Mar 2010 14:44:00 +0100
Subject: Fixed bitfield-related crash on Symbian WINSCW

When running on WINSCW, the nativePaintMode variable was becoming
corrupted.  The point at which this corruption occurs is unclear,
but it can be reproduced as follows:

1. Launch qmediaplayer
2. In the Phonon::MMF::DsaVideoOutput constructor, the
   nativePaintMode flag is set to QWExtra::ZeroFill
3. Open a video clip
4. During start of playback, QSymbianControl::Draw is called on the
   native control corresponding to the DsaVideoOutput object.  This
   checks the value of nativePaintMode; it does not match any of
   the valid NativePaintMode values, so an assertion fails.

This crash does not occur on target, suggesting that the cause may
be an error in the WINSCW compiler.  Although the C++ standard allows
bitfields to have boolean, integral or enumeration type, the latter
is not permitted by C99.

Neither increasing the number of bits allocated to nativePaintMode,
nor changing it position in the list of platform-specific bitfields
has any effect.

After making nativePaintMode into a normal field rather than a
bitfield, the crash no longer happens.  Note that, since bitfields
must be kept together, nativePaintMode is moved to the end of the
structure.
---
 src/gui/kernel/qwidget_p.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 1bbc057..555647c 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -233,6 +233,15 @@ struct QWExtra {
     uint activated : 1; // RWindowBase::Activated has been called
 
     /**
+     * If this bit is set, each native widget receives the signals from the
+     * Symbian control immediately before and immediately after draw ops are
+     * sent to the window server for this control:
+     *      void beginNativePaintEvent(const QRect &paintRect);
+     *      void endNativePaintEvent(const QRect &paintRect);
+     */
+    uint receiveNativePaintEvents : 1;
+
+    /**
      * Defines the behaviour of QSymbianControl::Draw.
      */
     enum NativePaintMode {
@@ -257,16 +266,7 @@ struct QWExtra {
         Default = Blit
     };
 
-    NativePaintMode nativePaintMode : 2;
-
-    /**
-     * If this bit is set, each native widget receives the signals from the
-     * Symbian control immediately before and immediately after draw ops are
-     * sent to the window server for this control:
-     *      void beginNativePaintEvent(const QRect &paintRect);
-     *      void endNativePaintEvent(const QRect &paintRect);
-     */
-    uint receiveNativePaintEvents : 1;
+    NativePaintMode nativePaintMode;
 
 #endif
 };
-- 
cgit v0.12


From 0c5524e73848b95276f13c384d2c711188936deb Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Mon, 29 Mar 2010 14:55:24 +0100
Subject: Fixed crash in Phonon MMF backend during application shutdown

During application shutdown, DsaVideoPlayer::handleVideoWindowChanged
is called.  At this point, the application's main window has been closed
and therefore QApplication::activeWindow() returns 0.  This leads to a
crash.

This patch ensures that a null return value from
QApplication::activeWindow(), and the resulting zero value of
DsaVideoPlayer::m_window, are handled gracefully.

Reviewed-by: Frans Englich
---
 src/3rdparty/phonon/mmf/videoplayer_dsa.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp b/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp
index 21cdb16..732d2d9 100644
--- a/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp
+++ b/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp
@@ -162,7 +162,10 @@ void MMF::DsaVideoPlayer::prepareCompleted()
 void MMF::DsaVideoPlayer::handleVideoWindowChanged()
 {
     if (!m_window) {
-        m_window = QApplication::activeWindow()->effectiveWinId()->DrawableWindow();
+        if (QWidget *window = QApplication::activeWindow())
+            m_window = window->effectiveWinId()->DrawableWindow();
+        else
+            m_window = 0;
         m_videoScreenRect = TRect();
     }
 
@@ -213,6 +216,9 @@ void MMF::DsaVideoPlayer::handleParametersChanged(VideoParameters parameters)
     TRACE_CONTEXT(DsaVideoPlayer::handleParametersChanged, EVideoInternal);
     TRACE_ENTRY_0();
 
+    if (!m_window)
+        return;
+
 #ifndef QT_NO_DEBUG
     getDsaRegion(m_wsSession, *m_window);
 #endif
-- 
cgit v0.12