ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix DoDragDrop in case of child windows.

This commit is contained in:
Juergen Schmied 2003-01-28 01:06:20 +00:00 committed by Alexandre Julliard
parent 49a013cdd3
commit 34f89b23c6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/ole32/ole2.c
View File

@ -76,7 +76,8 @@ typedef struct tagTrackerWindowInfo
HRESULT returnValue;
BOOL escPressed;
HWND curDragTargetHWND;
HWND curTargetHWND; /* window the mouse is hovering over */
HWND curDragTargetHWND; /* might be a ancestor of curTargetHWND */
IDropTarget* curDragTarget;
} TrackerWindowInfo;
@ -551,6 +552,7 @@ HRESULT WINAPI DoDragDrop (
trackerInfo.trackingDone = FALSE;
trackerInfo.escPressed = FALSE;
trackerInfo.curDragTargetHWND = 0;
trackerInfo.curTargetHWND = 0;
trackerInfo.curDragTarget = 0;
hwndTrackWindow = CreateWindowA(OLEDD_DRAGTRACKERCLASS,
@ -1920,7 +1922,7 @@ static void OLEDD_TrackMouseMove(
* DragOver notification
*/
if ( (trackerInfo->curDragTarget != 0) &&
(trackerInfo->curDragTargetHWND==hwndNewTarget) )
(trackerInfo->curTargetHWND == hwndNewTarget) )
{
POINTL mousePosParam;
@ -1959,6 +1961,8 @@ static void OLEDD_TrackMouseMove(
* Find-out if there is a drag target under the mouse
*/
HWND nexttar = hwndNewTarget;
trackerInfo->curTargetHWND = hwndNewTarget;
do {
newDropTargetNode = OLEDD_FindDropTarget(nexttar);
} while (!newDropTargetNode && (nexttar = GetParent(nexttar)) != 0);
@ -1995,6 +1999,7 @@ static void OLEDD_TrackMouseMove(
* The mouse is not over a window so we don't track anything.
*/
trackerInfo->curDragTargetHWND = 0;
trackerInfo->curTargetHWND = 0;
trackerInfo->curDragTarget = 0;
}
}