Changeset 561 for trunk/src/activeqt/container/qaxwidget.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/activeqt/container/qaxwidget.cpp (modified) (29 diffs)

trunk/src/activeqt/container/qaxwidget.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -38 +39 @@
 ****************************************************************************/
 
-#ifndef UNICODE
-#define UNICODE
-#endif
-
-
 #include "qaxwidget.h"
 
@@ -124 +120 @@
 
     int qt_metacall(QMetaObject::Call, int isignal, void **argv);
+    void* qt_metacast(const char *clname);
+
     inline QAxClientSite *clientSite() const
     {
@@ -384 +382 @@
 
 private:
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     struct OleMenuItem {
         OleMenuItem(HMENU hm = 0, int ID = 0, QMenu *menu = 0)
@@ -409 +407 @@
 
     DWORD m_dwOleObject;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     HWND m_menuOwner;
 #endif
@@ -418 +416 @@
     QAxWidget *widget;
     QAxHostWidget *host;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     QPointer<QMenuBar> menuBar;
     QMap<QAction*,OleMenuItem> menuItemMap;
@@ -468 +466 @@
 #error "Fix QAbstractEventDispatcher::setEventFilter"
 #endif
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 static int filter_ref = 0;
 #else
-static const char *qaxatom = "QAxContainer4_Atom";
+static const wchar_t *qaxatom = L"QAxContainer4_Atom";
 #endif
 
@@ -484 +482 @@
         QAxHostWidget *host = 0;
         while (!host && hwnd) {
-            host = qobject_cast<QAxHostWidget*>(QWidget::find(hwnd));
+            QWidget *widget = QWidget::find(hwnd);
+            if (widget && widget->inherits("QAxHostWidget"))
+                host = qobject_cast<QAxHostWidget*>(widget);
             hwnd = ::GetParent(hwnd);
         }
@@ -533 +533 @@
 
 QAxClientSite::QAxClientSite(QAxWidget *c)
-: ref(1), widget(c), host(0), eventTranslated(true)
+: eventTranslated(true), ref(1), widget(c), host(0)
 {
     aggregatedObject = widget->createAggregate();
@@ -552 +552 @@
 
     m_dwOleObject = 0;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     m_menuOwner = 0;
     menuBar = 0;
@@ -715 +715 @@
         HRESULT result = m_spOleObject->GetUserType(USERCLASSTYPE_SHORT, &userType);
         if (result == S_OK) {
-            widget->setWindowTitle(QString::fromUtf16((const ushort *)userType));
+            widget->setWindowTitle(QString::fromWCharArray(userType));
             CoTaskMemFree(userType);
         }
@@ -982 +982 @@
 HRESULT WINAPI QAxClientSite::TranslateAccelerator(LPMSG lpMsg, DWORD /*grfModifiers*/)
 {
-    eventTranslated = false;
     if (lpMsg->message == WM_KEYDOWN && !lpMsg->wParam)
         return S_OK;
-    QT_WA_INLINE(
-        SendMessage(host->winId(), lpMsg->message, lpMsg->wParam, lpMsg->lParam),
-        SendMessageA(host->winId(), lpMsg->message, lpMsg->wParam, lpMsg->lParam)
-    );
+
+    bool ActiveQtDetected = false;
+    bool fromInProcServer = false;
+#ifdef GWLP_USERDATA
+    LONG_PTR serverType = GetWindowLongPtr(lpMsg->hwnd, GWLP_USERDATA);
+#else
+    LONG serverType = GetWindowLong(lpMsg->hwnd, GWL_USERDATA);
+#endif
+    if (serverType == QAX_INPROC_SERVER) {
+        ActiveQtDetected = true;
+        fromInProcServer = true;
+    } else if (serverType == QAX_OUTPROC_SERVER) {
+        ActiveQtDetected = true;
+        fromInProcServer = false;
+    }
+
+    eventTranslated = false;
+    if (!ActiveQtDetected || !fromInProcServer) {
+        // if the request is coming from an out-of-proc server or a non ActiveQt server,
+        // we send the message to the host window. This will make sure this key event
+        // comes to Qt for processing.
+        SendMessage(host->winId(), lpMsg->message, lpMsg->wParam, lpMsg->lParam);
+        if (ActiveQtDetected && !fromInProcServer) {
+            // ActiveQt based servers will need further processing of the event
+            // (eg. <SPACE> key for a checkbox), so we return false.
+            return S_FALSE;
+        }
+    }
+    // ActiveQt based in-processes-servers will handle the event properly, so
+    // we dont need to send this key event to the host.
     return S_OK;
 }
@@ -1133 +1158 @@
 
 //**** IOleInPlaceFrame
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPWIDTHS /*lpMenuWidths*/)
 {
@@ -1174 +1199 @@
 }
 
-static int menuItemEntry(HMENU menu, int index, MENUITEMINFOA item, QString &text, QPixmap &/*icon*/)
+static int menuItemEntry(HMENU menu, int index, MENUITEMINFO item, QString &text, QPixmap &/*icon*/)
 {
     if (item.fType == MFT_STRING && item.cch) {
-        char *titlebuf = new char[item.cch+1];
+        wchar_t *titlebuf = new wchar_t[item.cch + 1];
         item.dwTypeData = titlebuf;
         item.cch++;
-        ::GetMenuItemInfoA(menu, index, true, &item);
-        text = QString::fromLocal8Bit(titlebuf);
-        delete []titlebuf;
+        ::GetMenuItemInfo(menu, index, true, &item);
+        text = QString::fromWCharArray(titlebuf);
+        delete [] titlebuf;
         return MFT_STRING;
     }
@@ -1192 +1217 @@
         QPixmap pixmap(1,1);
         QSize sz(MAP_LOGHIM_TO_PIX(bmsize.cx, pixmap.logicalDpiX()),
-            MAP_LOGHIM_TO_PIX(bmsize.cy, pixmap.logicalDpiY()));
+                 MAP_LOGHIM_TO_PIX(bmsize.cy, pixmap.logicalDpiY()));
 
         pixmap.resize(bmsize.cx, bmsize.cy);
@@ -1216 +1241 @@
         popup = new QMenu(parent);
     for (int i = 0; i < count; ++i) {
-        MENUITEMINFOA item;
-        memset(&item, 0, sizeof(MENUITEMINFOA));
-        item.cbSize = sizeof(MENUITEMINFOA);
+        MENUITEMINFO item;
+        memset(&item, 0, sizeof(MENUITEMINFO));
+        item.cbSize = sizeof(MENUITEMINFO);
         item.fMask = MIIM_ID | MIIM_TYPE | MIIM_SUBMENU;
-        ::GetMenuItemInfoA(subMenu, i, true, &item);
+        ::GetMenuItemInfo(subMenu, i, true, &item);
 
         QAction *action = 0;
@@ -1296 +1321 @@
         int count = GetMenuItemCount(hmenuShared);
         for (int i = 0; i < count; ++i) {
-            MENUITEMINFOA item;
-            memset(&item, 0, sizeof(MENUITEMINFOA));
-            item.cbSize = sizeof(MENUITEMINFOA);
+            MENUITEMINFO item;
+            memset(&item, 0, sizeof(MENUITEMINFO));
+            item.cbSize = sizeof(MENUITEMINFO);
             item.fMask = MIIM_ID | MIIM_TYPE | MIIM_SUBMENU;
-            ::GetMenuItemInfoA(hmenuShared, i, true, &item);
+            ::GetMenuItemInfo(hmenuShared, i, true, &item);
 
             QAction *action = 0;
@@ -1380 +1405 @@
     OleMenuItem oleItem = menuItemMap.value(action);
     if (oleItem.hMenu)
-        ::PostMessageA(m_menuOwner, WM_COMMAND, oleItem.id, 0);
+        ::PostMessage(m_menuOwner, WM_COMMAND, oleItem.id, 0);
     return -1;
 #endif
@@ -1405 +1430 @@
 HRESULT WINAPI QAxClientSite::SetStatusText(LPCOLESTR pszStatusText)
 {
-    QStatusTipEvent tip(QString::fromUtf16((const ushort *)(BSTR)pszStatusText));
+    QStatusTipEvent tip(QString::fromWCharArray(pszStatusText));
     QApplication::sendEvent(widget, &tip);
     return S_OK;
@@ -1414 +1439 @@
 HRESULT WINAPI QAxClientSite::EnableModeless(BOOL fEnable)
 {
+#if !defined(Q_OS_WINCE)
+    LockWindowUpdate(host->window()->winId());
+#endif
     EnableWindow(host->window()->winId(), fEnable);
 
@@ -1424 +1452 @@
     }
     qt_win_ignoreNextMouseReleaseEvent = false;
-
+#if !defined(Q_OS_WINCE)
+    LockWindowUpdate(0);
+#endif
     return S_OK;
 }
@@ -1512 +1542 @@
 {
     AX_DEBUG(QAxClientSite::SetActiveObject);
-
-    if (pszObjName && widget)
-        widget->setWindowTitle(QString::fromUtf16((const ushort *)(BSTR)pszObjName));
+    
+    Q_UNUSED(pszObjName);
+    // we are ignoring the name of the object, as suggested by MSDN documentation 
+    // for IOleInPlaceUIWindow::SetActiveObject().
 
     if (m_spInPlaceActiveObject) {
@@ -1624 +1655 @@
         return axhost->qt_metacall(call, isignal, argv);
     return -1;
+}
+
+void* QAxHostWidget::qt_metacast(const char *clname)
+{
+    if (!clname) return 0;
+    if (!qstrcmp(clname,"QAxHostWidget"))
+        return static_cast<void*>(const_cast< QAxHostWidget*>(this));
+    return QWidget::qt_metacast(clname);
 }
 
@@ -1953 +1992 @@
 
 #if !defined(Q_OS_WINCE)
-    ATOM filter_ref = FindAtomA(qaxatom);
+    ATOM filter_ref = FindAtom(qaxatom);
 #endif
     if (!filter_ref)
         previous_filter = QAbstractEventDispatcher::instance()->setEventFilter(axc_FilterProc);
 #if !defined(Q_OS_WINCE)
-    AddAtomA(qaxatom);
+    AddAtom(qaxatom);
 #else
     ++filter_ref;
@@ -1993 +2032 @@
     if (!control().isEmpty()) {
 #if !defined(Q_OS_WINCE)
-        ATOM filter_ref = FindAtomA(qaxatom);
+        ATOM filter_ref = FindAtom(qaxatom);
         if (filter_ref)
             DeleteAtom(filter_ref);
-        filter_ref = FindAtomA(qaxatom);
+        filter_ref = FindAtom(qaxatom);
         if (!filter_ref) {
 #else
@@ -2043 +2082 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxWidget::metaObject() const
@@ -2051 +2090 @@
 
 /*!
-    \reimp
+    \internal
 */
 const QMetaObject *QAxWidget::parentMetaObject() const
@@ -2069 +2108 @@
 
 /*!
-    \reimp
+    \internal
 */
 const char *QAxWidget::className() const
@@ -2077 +2116 @@
 
 /*!
-    \reimp
+    \internal
 */
 int QAxWidget::qt_metacall(QMetaObject::Call call, int id, void **v)