Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9194c47e
Commit
9194c47e
authored
Feb 23, 2016
by
Huw Davies
Committed by
Alexandre Julliard
Feb 23, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Don't send DragOver if we're about to drop or cancel.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b8fcc4a2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
26 deletions
+21
-26
ole2.c
dlls/ole32/ole2.c
+21
-26
No files found.
dlls/ole32/ole2.c
View file @
9194c47e
...
...
@@ -2297,26 +2297,11 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo)
trackerInfo
->
returnValue
=
IDropSource_QueryContinueDrag
(
trackerInfo
->
dropSource
,
trackerInfo
->
escPressed
,
trackerInfo
->
dwKeyState
);
/*
* If we are hovering over the same target as before, send the
* DragOver notification
*/
if
(
(
trackerInfo
->
curDragTarget
!=
0
)
&&
(
trackerInfo
->
curTargetHWND
==
hwndNewTarget
)
)
{
*
trackerInfo
->
pdwEffect
=
trackerInfo
->
dwOKEffect
;
IDropTarget_DragOver
(
trackerInfo
->
curDragTarget
,
trackerInfo
->
dwKeyState
,
trackerInfo
->
curMousePos
,
trackerInfo
->
pdwEffect
);
*
trackerInfo
->
pdwEffect
&=
trackerInfo
->
dwOKEffect
;
}
else
if
(
trackerInfo
->
curTargetHWND
!=
hwndNewTarget
&&
(
trackerInfo
->
returnValue
==
S_OK
||
trackerInfo
->
returnValue
==
DRAGDROP_S_DROP
))
{
/*
* If we changed window, we have to notify our old target and check for
* the new one.
*/
if
(
trackerInfo
->
curDragTarget
)
{
IDropTarget_DragLeave
(
trackerInfo
->
curDragTarget
);
...
...
@@ -2327,15 +2312,25 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo)
if
(
hwndNewTarget
)
drag_enter
(
trackerInfo
,
hwndNewTarget
);
}
give_feedback
(
trackerInfo
);
give_feedback
(
trackerInfo
);
/*
* All the return valued will stop the operation except the S_OK
* return value.
*/
if
(
trackerInfo
->
returnValue
!=
S_OK
)
}
if
(
trackerInfo
->
returnValue
==
S_OK
)
{
if
(
trackerInfo
->
curDragTarget
)
{
*
trackerInfo
->
pdwEffect
=
trackerInfo
->
dwOKEffect
;
IDropTarget_DragOver
(
trackerInfo
->
curDragTarget
,
trackerInfo
->
dwKeyState
,
trackerInfo
->
curMousePos
,
trackerInfo
->
pdwEffect
);
*
trackerInfo
->
pdwEffect
&=
trackerInfo
->
dwOKEffect
;
}
give_feedback
(
trackerInfo
);
}
else
drag_end
(
trackerInfo
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment