[PATCH] comdlg32/tests: Accept win8 failure-code

Detlef Riekenberg wine.dev at web.de
Wed Dec 12 23:02:21 CST 2012


winetestbot crash sometimes in comdlg32:itemdlg on win7 or win2008,
but that is independant from this win8 fix.

http://test.winehq.org/data/tests/comdlg32:itemdlg.html


--
By by ... Detlef
---
 dlls/comdlg32/tests/itemdlg.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c
index ce05ed8..7bffcbd 100644
--- a/dlls/comdlg32/tests/itemdlg.c
+++ b/dlls/comdlg32/tests/itemdlg.c
@@ -278,13 +278,16 @@ static BOOL test_instantiation(void)
         IShellBrowser *psb;
 
         hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IExplorerBrowser, (void**)&peb);
-        ok(hr == E_FAIL, "got 0x%08x.\n", hr);
+        /* win8: E_NOTIMPL */
+        ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr);
         if(SUCCEEDED(hr)) IExplorerBrowser_Release(peb);
         hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&psb);
-        ok(hr == E_FAIL, "got 0x%08x.\n", hr);
+        /* win8: E_NOTIMPL */
+        ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr);
         if(SUCCEEDED(hr)) IShellBrowser_Release(psb);
         hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk);
-        ok(hr == E_FAIL, "got 0x%08x.\n", hr);
+        /* win8: E_NOTIMPL */
+        ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr);
         if(SUCCEEDED(hr)) IUnknown_Release(punk);
         hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk);
         ok(hr == S_OK, "got 0x%08x.\n", hr);
-- 
1.7.5.4




More information about the wine-patches mailing list