Huw Davies : ole32/tests: Win 8 releases the drop target in OleUninitialize().
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Apr 20 08:24:42 CDT 2015
Module: wine
Branch: master
Commit: a38699084b52774f564e1bb69e07ce387f4c8b62
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38699084b52774f564e1bb69e07ce387f4c8b62
Author: Huw Davies <huw at codeweavers.com>
Date: Fri Apr 17 14:37:46 2015 +0100
ole32/tests: Win 8 releases the drop target in OleUninitialize().
---
dlls/ole32/tests/dragdrop.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c
index 8051f58..37a3dfe 100644
--- a/dlls/ole32/tests/dragdrop.c
+++ b/dlls/ole32/tests/dragdrop.c
@@ -447,13 +447,16 @@ static void test_Register_Revoke(void)
ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n");
OleUninitialize();
- ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n");
- hr = RevokeDragDrop(hwnd);
- ok_ole_success(hr, "RevokeDragDrop");
- ok(droptarget_refs == 0 ||
- broken(droptarget_refs == 1), /* NT4 */
- "DropTarget refs should be zero not %d\n", droptarget_refs);
+ /* Win 8 releases the ref in OleUninitialize() */
+ if (droptarget_refs >= 1)
+ {
+ hr = RevokeDragDrop(hwnd);
+ ok_ole_success(hr, "RevokeDragDrop");
+ ok(droptarget_refs == 0 ||
+ broken(droptarget_refs == 1), /* NT4 */
+ "DropTarget refs should be zero not %d\n", droptarget_refs);
+ }
hr = RevokeDragDrop(NULL);
ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);
More information about the wine-cvs
mailing list