9 files changed, 18 insertions, 0 deletions

diff --git a/inputmethods/dasher/QtDasherImpl.cc b/inputmethods/dasher/QtDasherImpl.cc
index 55c21b1..9513802 100644
--- a/inputmethods/dasher/QtDasherImpl.cc
+++ b/inputmethods/dasher/QtDasherImpl.cc
@@ -66,16 +66,18 @@ void QtDasherImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT QtDasherImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp
index 8050ce1..9e9fed9 100644
--- a/inputmethods/dvorak/dvorakimpl.cpp
+++ b/inputmethods/dvorak/dvorakimpl.cpp
@@ -112,16 +112,18 @@ void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/handwriting/handwritingimpl.cpp b/inputmethods/handwriting/handwritingimpl.cpp
index c39e1aa..22e2058 100644
--- a/inputmethods/handwriting/handwritingimpl.cpp
+++ b/inputmethods/handwriting/handwritingimpl.cpp
@@ -95,16 +95,18 @@ void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT HandwritingImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index 34c227f..e75dd5f 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -79,16 +79,18 @@ void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp
index 3c77fe6..701d35f 100644
--- a/inputmethods/keyboard/keyboardimpl.cpp
+++ b/inputmethods/keyboard/keyboardimpl.cpp
@@ -110,16 +110,18 @@ void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp
index 976d816..54fe36e 100644
--- a/inputmethods/kjumpx/keyboardimpl.cpp
+++ b/inputmethods/kjumpx/keyboardimpl.cpp
@@ -79,16 +79,18 @@ void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/multikey/keyboardimpl.cpp b/inputmethods/multikey/keyboardimpl.cpp
index 4cfbcd5..b7908d9 100644
--- a/inputmethods/multikey/keyboardimpl.cpp
+++ b/inputmethods/multikey/keyboardimpl.cpp
@@ -89,16 +89,18 @@ void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp
index a4e8f02..8f449cd 100644
--- a/inputmethods/pickboard/pickboardimpl.cpp
+++ b/inputmethods/pickboard/pickboardimpl.cpp
@@ -82,16 +82,18 @@ void PickboardImpl::onKeyPress( QObject *receiver, const char *slot )
 #ifndef QT_NO_COMPONENT
 QRESULT PickboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.cpp b/inputmethods/unikeyboard/unikeyboardimpl.cpp
index fe601e0..e7fc00e 100644
--- a/inputmethods/unikeyboard/unikeyboardimpl.cpp
+++ b/inputmethods/unikeyboard/unikeyboardimpl.cpp
@@ -86,16 +86,18 @@ void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 
 QRESULT UniKeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {