ole32: Fix return value for DefaultHandler_GetMiscStatus

Nikolay Sivov bunglehead at gmail.com
Wed Jan 7 03:02:05 CST 2009


Changelog:
    - use OleRegGetMiscStatus return value instead of always exit with S_OK

>From 7901b51d82effb70011831ed69bc2393e4ebe5f4 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Wed, 7 Jan 2009 11:58:29 +0300
Subject:  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);
-- 
1.5.6.5






More information about the wine-patches mailing list