wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=459648, crash in DragLeave while hovering over marquee and using ondragenter display none; r=enndeakin

Browse Source
This commit is contained in:
Vladimir Vukicevic 2009-01-02 14:06:40 -08:00
parent f5d0f40a3f
commit 780d7a3c83
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
widget/src/windows/nsNativeDragTarget.cpp
View File

@ -76,7 +76,7 @@ static POINTL gDragLastPoint;
// construction
//-----------------------------------------------------
nsNativeDragTarget::nsNativeDragTarget(nsIWidget * aWnd)
: m_cRef(0), mWindow(aWnd), mCanMove(PR_TRUE),
: m_cRef(0), mWindow(aWnd), mCanMove(PR_TRUE), mTookOwnRef(PR_FALSE),
mDropTargetHelper(nsnull), mDragCancelled(PR_FALSE)
{
mHWnd = (HWND)mWindow->GetNativeData(NS_NATIVE_WINDOW);
@ -98,6 +98,7 @@ nsNativeDragTarget::nsNativeDragTarget(nsIWidget * aWnd)
nsNativeDragTarget::~nsNativeDragTarget()
{
NS_RELEASE(mDragService);
if (mDropTargetHelper) {
mDropTargetHelper->Release();
mDropTargetHelper = nsnull;
@ -282,6 +283,11 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource,
mDropTargetHelper->DragEnter(mHWnd, pIDataSource, &pt, *pdwEffect);
}
// save a ref to this, in case the window is destroyed underneath us
NS_ASSERTION(!mTookOwnRef, "own ref already taken!");
this->AddRef();
mTookOwnRef = PR_TRUE;
// tell the drag service about this drag (it may have come from an
// outside app).
mDragService->StartDragSession();
@ -385,6 +391,13 @@ nsNativeDragTarget::DragLeave()
}
}
// release the ref that was taken in DragEnter
NS_ASSERTION(mTookOwnRef, "want to release own ref, but not taken!");
if (mTookOwnRef) {
this->Release();
mTookOwnRef = PR_FALSE;
}
return S_OK;
}
@ -428,5 +441,13 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData,
// tell the drag service we're done with the session
serv->EndDragSession(PR_TRUE);
// release the ref that was taken in DragEnter
NS_ASSERTION(mTookOwnRef, "want to release own ref, but not taken!");
if (mTookOwnRef) {
this->Release();
mTookOwnRef = PR_FALSE;
}
return S_OK;
}

1
widget/src/windows/nsNativeDragTarget.h
View File

@ -114,6 +114,7 @@ protected:
HWND mHWnd;
PRBool mCanMove;
PRBool mMovePreferred;
PRBool mTookOwnRef;
// Gecko Stuff
nsIWidget * mWindow;