Module: wine Branch: master Commit: 11c1d7a0e7ff8d4713c8177dce4ba54781e69ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c1d7a0e7ff8d4713c8177dce... Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 7 11:58:29 2009 +0300 ole32: Fix return value for DefaultHandler_GetMiscStatus. --- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/tests/ole2.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5c6f9b2..2384cec 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -909,7 +909,7 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus( if (FAILED(hres)) *pdwStatus = 0; - return S_OK; + return hres; } /************************************************************************ diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 99b8acb..9d0644e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1384,7 +1384,6 @@ static void test_default_handler(void) hr); hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "IOleObject_GetMiscStatus should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); hr = IOleObject_GetUserClassID(pObject, &clsid);