Detlef Riekenberg : shell32/tests: Fix a failure on w2k.
Alexandre Julliard
julliard at winehq.org
Tue Jul 3 10:58:24 CDT 2012
Module: wine
Branch: master
Commit: bb684aaba74dfb252138dea4eac4be28983e7517
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb684aaba74dfb252138dea4eac4be28983e7517
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Mon Jul 2 21:22:10 2012 +0200
shell32/tests: Fix a failure on w2k.
---
dlls/shell32/tests/shlfolder.c | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index bee6cb5..f34bb70 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -73,6 +73,18 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT);
static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**);
+static const char *debugstr_guid(REFIID riid)
+{
+ static char buf[50];
+
+ sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+ riid->Data1, riid->Data2, riid->Data3, riid->Data4[0],
+ riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4],
+ riid->Data4[5], riid->Data4[6], riid->Data4[7]);
+
+ return buf;
+}
+
static WCHAR *make_wstr(const char *str)
{
WCHAR *ret;
@@ -566,7 +578,9 @@ if (0)
CLSID id;
hr = IPersist_GetClassID(pp, &id);
ok(hr == S_OK, "Got 0x%08x\n", hr);
- ok(IsEqualIID(&id, &CLSID_ShellDocObjView), "Unexpected classid\n");
+ /* CLSID_ShellFSFolder on some w2k systems */
+ ok(IsEqualIID(&id, &CLSID_ShellDocObjView) || broken(IsEqualIID(&id, &CLSID_ShellFSFolder)),
+ "Unexpected classid %s\n", debugstr_guid(&id));
IPersist_Release(pp);
}
More information about the wine-cvs
mailing list