From 6f76fa4edb19305edd375f12903ef481dbf14363 Mon Sep 17 00:00:00 2001
From: Francis Beaudet <francis@macadamian.com>
Date: Sat, 23 Oct 1999 14:03:41 +0000
Subject: [PATCH] Make sure that the drop effect of a DnD operation is set to
 DROPEFFECT_NONE if the user cancelled the operation.

---
 dlls/ole32/ole2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index b332317e6e8..8481b1aff4a 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -1997,9 +1997,12 @@ static void OLEDD_TrackStateChange(
 	/*
 	 * If the source told us that we should cancel, fool the drop 
 	 * target by telling it that the mouse left it's window.
+	 * Also set the drop effect to "NONE" in case the application 
+	 * ignores the result of DoDragDrop.
 	 */
         case DRAGDROP_S_CANCEL:
 	  IDropTarget_DragLeave(trackerInfo->curDragTarget);
+	  *trackerInfo->pdwEffect = DROPEFFECT_NONE;
 	  break;
       }
     }