Paul Vriens : ole32/tests: Fix two failures on NT4.
Alexandre Julliard
julliard at winehq.org
Thu Oct 9 07:43:08 CDT 2008
Module: wine
Branch: master
Commit: 6d15749d142940bb509a235f762a078da16bfadf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d15749d142940bb509a235f762a078da16bfadf
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Wed Oct 8 20:37:57 2008 +0200
ole32/tests: Fix two failures on NT4.
---
dlls/ole32/tests/dragdrop.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c
index ad10a58..b759981 100644
--- a/dlls/ole32/tests/dragdrop.c
+++ b/dlls/ole32/tests/dragdrop.c
@@ -137,7 +137,9 @@ START_TEST(dragdrop)
NULL, NULL, NULL);
hr = RegisterDragDrop(hwnd, &DropTarget);
- ok(hr == E_OUTOFMEMORY, "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr);
+ ok(hr == E_OUTOFMEMORY ||
+ broken(hr == CO_E_NOTINITIALIZED), /* NT4 */
+ "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr);
OleInitialize(NULL);
@@ -164,7 +166,9 @@ START_TEST(dragdrop)
hr = RevokeDragDrop(hwnd);
ok_ole_success(hr, "RevokeDragDrop");
- ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called);
+ ok(droptarget_release_called == 1 ||
+ broken(droptarget_release_called == 0), /* NT4 */
+ "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called);
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