Fix crash on Windows on idle/usb notifications

nyalldawson · nyalldawson · commit 4659e692e4e3 · 2018-11-02T08:54:47.000+10:00
Fixes #20312, #20319, #20312, #20307, #20299, #20297, #20280 (maybe others) (cherry picked from commit fd5a1c8)
diff --git a/src/native/win/qgswinnative.cpp b/src/native/win/qgswinnative.cpp
@@ -163,9 +163,18 @@ QgsNative::NotificationResult QgsWinNative::showDesktopNotification( const QStri
   return result;
 }
 
-bool QgsWinNativeEventFilter::nativeEventFilter( const QByteArray &, void *message, long * )
+bool QgsWinNativeEventFilter::nativeEventFilter( const QByteArray &eventType, void *message, long * )
 {
+  static const QByteArray sWindowsGenericMSG{ "windows_generic_MSG" };
+  if ( eventType != sWindowsGenericMSG )
+    return false;
+
   MSG *pWindowsMessage = static_cast<MSG *>( message );
+  if ( pWindowsMessage->message != WM_DEVICECHANGE )
+  {
+    return false;
+  }
+
   unsigned int wParam = pWindowsMessage->wParam;
   if ( wParam == DBT_DEVICEARRIVAL || wParam == DBT_DEVICEREMOVECOMPLETE )
   {

Original file line number	Diff line number	Diff line change
`@@ -163,9 +163,18 @@ QgsNative::NotificationResult QgsWinNative::showDesktopNotification( const QStri`
`163`	`163`	`return result;`
`164`	`164`	`}`
`165`	`165`
`166`		`-bool QgsWinNativeEventFilter::nativeEventFilter( const QByteArray &, void message, long )`
	`166`	`+bool QgsWinNativeEventFilter::nativeEventFilter( const QByteArray &eventType, void message, long )`
`167`	`167`	`{`
	`168`	`+ static const QByteArray sWindowsGenericMSG{ "windows_generic_MSG" };`
	`169`	`+ if ( eventType != sWindowsGenericMSG )`
	`170`	`+ return false;`
	`171`	`+`
`168`	`172`	`MSG pWindowsMessage = static_cast<MSG >( message );`
	`173`	`+ if ( pWindowsMessage->message != WM_DEVICECHANGE )`
	`174`	`+ {`
	`175`	`+ return false;`
	`176`	`+ }`
	`177`	`+`
`169`	`178`	`unsigned int wParam = pWindowsMessage->wParam;`
`170`	`179`	`if ( wParam == DBT_DEVICEARRIVAL \|\| wParam == DBT_DEVICEREMOVECOMPLETE )`
`171`	`180`	`{`