Changeset 846 for trunk/src/activeqt/control/qaxserverbase.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/activeqt/control/qaxserverbase.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 161 161 void removeMenu(); 162 162 163 static LRESULT CALLBACK ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);163 static LRESULT QT_WIN_CALLBACK ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); 164 164 165 165 // Object registration with OLE … … 765 765 766 766 // callback for DLL server to hook into non-Qt eventloop 767 LRESULT CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam)767 LRESULT QT_WIN_CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam) 768 768 { 769 769 if (qApp && !invokeCount) … … 1351 1351 The semantics of \a wParam and \a lParam depend on the value of \a uMsg. 1352 1352 */ 1353 LRESULT CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)1353 LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) 1354 1354 { 1355 1355 if (uMsg == WM_CREATE) { … … 1537 1537 EnterCriticalSection(&createWindowSection); 1538 1538 QString cn(QLatin1String("QAxControl")); 1539 cn += QString::number(( int)ActiveXProc);1539 cn += QString::number((quintptr)ActiveXProc); 1540 1540 if (!atom) { 1541 1541 WNDCLASS wcTemp; … … 1600 1600 if (flags & MF_POPUP) { 1601 1601 itemId = static_cast<ushort>( 1602 reinterpret_cast< ulong>(createPopup(action->menu()))1602 reinterpret_cast<quintptr>(createPopup(action->menu())) 1603 1603 ); 1604 1604 } else { 1605 itemId = static_cast<ushort>(reinterpret_cast< ulong>(action));1605 itemId = static_cast<ushort>(reinterpret_cast<quintptr>(action)); 1606 1606 actionMap.remove(itemId); 1607 1607 actionMap.insert(itemId, action); … … 1647 1647 if (flags & MF_POPUP) { 1648 1648 itemId = static_cast<ushort>( 1649 reinterpret_cast< ulong>(createPopup(action->menu()))1649 reinterpret_cast<quintptr>(createPopup(action->menu())) 1650 1650 ); 1651 1651 } else { 1652 itemId = static_cast<ushort>(reinterpret_cast< ulong>(action));1652 itemId = static_cast<ushort>(reinterpret_cast<quintptr>(action)); 1653 1653 actionMap.insert(itemId, action); 1654 1654 } … … 2731 2731 ULONG read; 2732 2732 pStm->Read(qtarray.data(), stat.cbSize.LowPart, &read); 2733 } else if (hres == E_NOTIMPL) { 2734 ULONG read = 0; 2735 while (hres != S_FALSE) { 2736 QByteArray arrayRead; 2737 arrayRead.resize(4098); 2738 hres = pStm->Read(arrayRead.data(), arrayRead.size(), &read); 2739 if (hres != S_OK && hres != S_FALSE) { 2740 qtarray.resize(0); 2741 break; 2742 } else if (read == 0) 2743 break; 2744 qtarray.append(arrayRead); 2745 } 2733 2746 } 2734 2747 const QMetaObject *mo = qt.object->metaObject();
Note:
See TracChangeset
for help on using the changeset viewer.