Paul Vriens : shell32/tests: Fix some test failures on Vista and higher.
Alexandre Julliard
julliard at winehq.org
Thu Jun 18 09:11:35 CDT 2009
Module: wine
Branch: master
Commit: 61b89b630838e27a4621703740ba57798a3893ec
URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b89b630838e27a4621703740ba57798a3893ec
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Jun 18 11:03:19 2009 +0200
shell32/tests: Fix some test failures on Vista and higher.
---
dlls/shell32/tests/shlfolder.c | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 255d019..f09afbc 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -81,6 +81,15 @@ static void init_function_pointers(void)
ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr);
}
+static const char *wine_dbgstr_w(LPCWSTR str)
+{
+ static char buf[512];
+ if (!str)
+ return "(null)";
+ WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL);
+ return buf;
+}
+
static void test_ParseDisplayName(void)
{
HRESULT hr;
@@ -1120,6 +1129,10 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC
'A','t','t','r','i','b','u','t','e','s',0 };
static const WCHAR wszResolveLinkFlags[] = {
'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 };
+ static const WCHAR wszTargetKnownFolder[] = {
+ 'T','a','r','g','e','t','K','n','o','w','n','F','o','l','d','e','r',0 };
+ static const WCHAR wszCLSID[] = {
+ 'C','L','S','I','D',0 };
if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) {
ok(V_VT(pVar) == VT_I4 ||
@@ -1159,7 +1172,19 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC
return S_OK;
}
- ok(FALSE, "PropertyBag was asked for unknown property (vt=%d)!\n", V_VT(pVar));
+ if (!lstrcmpW(pszPropName, wszTargetKnownFolder)) {
+ ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'TargetKnownFolder' property!\n");
+ /* TODO */
+ return E_INVALIDARG;
+ }
+
+ if (!lstrcmpW(pszPropName, wszCLSID)) {
+ ok(V_VT(pVar) == VT_EMPTY, "Wrong variant type for 'CLSID' property!\n");
+ /* TODO */
+ return E_INVALIDARG;
+ }
+
+ ok(FALSE, "PropertyBag was asked for unknown property %s (vt=%d)!\n", wine_dbgstr_w(pszPropName), V_VT(pVar));
return E_INVALIDARG;
}
@@ -1626,15 +1651,6 @@ static void testSHGetFolderPathAndSubDirA(void)
RemoveDirectoryA(testpath);
}
-static const char *wine_dbgstr_w(LPCWSTR str)
-{
- static char buf[512];
- if (!str)
- return "(null)";
- WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL);
- return buf;
-}
-
static void test_LocalizedNames(void)
{
static char cCurrDirA[MAX_PATH];
More information about the wine-cvs
mailing list