Nicolas Le Cam : shell32/tests: Fix PropertyBag test on Win2k.
Alexandre Julliard
julliard at winehq.org
Thu Apr 9 11:13:50 CDT 2009
Module: wine
Branch: master
Commit: 1d3edf6377cf346eed758bdfe1c6a81f5dadde5e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3edf6377cf346eed758bdfe1c6a81f5dadde5e
Author: Nicolas Le Cam <niko.lecam at gmail.com>
Date: Tue Apr 7 19:16:46 2009 +0200
shell32/tests: Fix PropertyBag test on Win2k.
---
dlls/shell32/tests/shlfolder.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index cbbad01..a45a386 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -1106,7 +1106,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC
'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 };
if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) {
- ok(V_VT(pVar) == VT_I4, "Wrong variant type for 'TargetSpecialFolder' property!\n");
+ ok(V_VT(pVar) == VT_I4 ||
+ broken(V_VT(pVar) == VT_BSTR), /* Win2k */
+ "Wrong variant type for 'TargetSpecialFolder' property!\n");
return E_INVALIDARG;
}
@@ -1120,7 +1122,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC
WCHAR wszPath[MAX_PATH];
BOOL result;
- ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'Target' property!\n");
+ ok(V_VT(pVar) == VT_BSTR ||
+ broken(V_VT(pVar) == VT_EMPTY), /* Win2k */
+ "Wrong variant type for 'Target' property!\n");
if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG;
result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE);
More information about the wine-cvs
mailing list