Rob Shearman : ole32: RegisterDragDrop should return E_OUTOFMEMORY in the case that COM isn' t intialised, instead of CO_E_NOTINITIALIZED.
Alexandre Julliard
julliard at winehq.org
Tue Oct 9 13:37:41 CDT 2007
Module: wine
Branch: master
Commit: 5e2d890e5d6371263cf9a131c6fea915af562b37
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2d890e5d6371263cf9a131c6fea915af562b37
Author: Rob Shearman <rob at codeweavers.com>
Date: Sun Oct 7 16:52:28 2007 +0200
ole32: RegisterDragDrop should return E_OUTOFMEMORY in the case that COM isn't intialised, instead of CO_E_NOTINITIALIZED.
---
dlls/ole32/ole2.c | 2 +-
dlls/ole32/tests/dragdrop.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index e58385b..e8793fc 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -284,7 +284,7 @@ HRESULT WINAPI RegisterDragDrop(
if (!COM_CurrentApt())
{
ERR("COM not initialized\n");
- return CO_E_NOTINITIALIZED;
+ return E_OUTOFMEMORY;
}
if (!pDropTarget)
diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c
index 48b308c..1561066 100644
--- a/dlls/ole32/tests/dragdrop.c
+++ b/dlls/ole32/tests/dragdrop.c
@@ -113,7 +113,7 @@ START_TEST(dragdrop)
HRESULT hr;
hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget);
- ok(hr == CO_E_NOTINITIALIZED, "RegisterDragDrop without OLE initialized should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
+ ok(hr == E_OUTOFMEMORY, "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr);
OleInitialize(NULL);
More information about the wine-cvs
mailing list