diff options
| author | nyamatongwe <unknown> | 2004-07-30 22:44:52 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2004-07-30 22:44:52 +0000 |
| commit | 5236880d3ba5fb174886cbede1f4340025b93c2e (patch) | |
| tree | ae9b25b34a326976d2cb5b11e5ed5ad899bdb0f7 | |
| parent | 2ea146908486cce03689b7c2bda7bf71a8eecdc4 (diff) | |
| download | scintilla-mirror-5236880d3ba5fb174886cbede1f4340025b93c2e.tar.gz | |
Removed CF_HDROP from formats provided by Scintilla as it was returned as
an empty item and this caused Mozilla to hang when receiving a drop.
| -rw-r--r-- | win32/ScintillaWin.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 1038f4838..b3afb4d5a 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1467,8 +1467,7 @@ STDMETHODIMP DataObject_QueryGetData(DataObject *pd, FORMATETC *pFE) { } bool formatOK = (pFE->cfFormat == CF_TEXT) || - ((pFE->cfFormat == CF_UNICODETEXT) && pd->sci->IsUnicodeMode()) || - (pFE->cfFormat == CF_HDROP); + ((pFE->cfFormat == CF_UNICODETEXT) && pd->sci->IsUnicodeMode()); if (!formatOK || pFE->ptd != 0 || (pFE->dwAspect & DVASPECT_CONTENT) == 0 || @@ -2014,8 +2013,7 @@ STDMETHODIMP ScintillaWin::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState, /// Implement important part of IDataObject STDMETHODIMP ScintillaWin::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) { bool formatOK = (pFEIn->cfFormat == CF_TEXT) || - ((pFEIn->cfFormat == CF_UNICODETEXT) && IsUnicodeMode()) || - (pFEIn->cfFormat == CF_HDROP); + ((pFEIn->cfFormat == CF_UNICODETEXT) && IsUnicodeMode()); if (!formatOK || pFEIn->ptd != 0 || (pFEIn->dwAspect & DVASPECT_CONTENT) == 0 || @@ -2026,11 +2024,6 @@ STDMETHODIMP ScintillaWin::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) { return DATA_E_FORMATETC; } pSTM->tymed = TYMED_HGLOBAL; - if (pFEIn->cfFormat == CF_HDROP) { - pSTM->hGlobal = 0; - pSTM->pUnkForRelease = 0; - return S_OK; - } //Platform::DebugPrintf("DOB GetData OK %d %x %x\n", lenDrag, pFEIn, pSTM); HGLOBAL hand; |