ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32/tests: Fix some Win9x failures.

Browse Source
This commit is contained in:
Andrew Eikum 2010-08-03 08:50:47 -05:00 committed by Alexandre Julliard
parent 5a30f4143b
commit 61b670a392
1 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/shell32/tests/shlfolder.c
View File

@ -69,6 +69,13 @@ static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_
static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*);
static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**);
static int strcmp_wa(LPCWSTR strw, const char *stra)
{
CHAR buf[512];
WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
return lstrcmpA(stra, buf);
}
static void init_function_pointers(void) static void init_function_pointers(void)
{ {
HMODULE hmod; HMODULE hmod;
@ -2233,13 +2240,16 @@ static void test_SHGetNameFromIDList(void)
} }
IShellFolder_Release(psf); IShellFolder_Release(psf);
if(pSHGetPathFromIDListW){
hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI);
ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); ok(hrSI == S_OK, "Got 0x%08x\n", hrSI);
res = SHGetPathFromIDListW(pidl, buf); res = pSHGetPathFromIDListW(pidl, buf);
ok(res == TRUE, "Got %d\n", res); ok(res == TRUE, "Got %d\n", res);
if(SUCCEEDED(hrSI) && res) if(SUCCEEDED(hrSI) && res)
ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); ok(!lstrcmpW(nameSI, buf), "Strings differ.\n");
if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI);
}else
win_skip("pSHGetPathFromIDListW not available\n");
hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string);
todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres);
@ -2289,13 +2299,16 @@ static void test_SHGetNameFromIDList(void)
} }
IShellFolder_Release(psf); IShellFolder_Release(psf);
if(pSHGetPathFromIDListW){
hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI);
ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI);
res = SHGetPathFromIDListW(pidl, buf); res = pSHGetPathFromIDListW(pidl, buf);
ok(res == FALSE, "Got %d\n", res); ok(res == FALSE, "Got %d\n", res);
if(SUCCEEDED(hrSI) && res) if(SUCCEEDED(hrSI) && res)
ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); ok(!lstrcmpW(nameSI, buf), "Strings differ.\n");
if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI);
}else
win_skip("pSHGetPathFromIDListW not available\n");
hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string);
todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */, todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */,
@ -3347,7 +3360,7 @@ static void test_GetUIObject(void)
CreateFilesFolders(); CreateFilesFolders();
hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0);
ok(hr == S_OK, "Got 0x%08x\n", hr); ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
IShellFolder *psf; IShellFolder *psf;
@ -3462,10 +3475,17 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path)
return; return;
} }
ok_(__FILE__,l)(filename.uType == STRRET_WSTR, "Got unexpected string type: %d\n", filename.uType); ok_(__FILE__,l)(filename.uType == STRRET_WSTR || filename.uType == STRRET_CSTR,
"Got unexpected string type: %d\n", filename.uType);
if(filename.uType == STRRET_WSTR){
ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0, ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0,
"didn't get expected path (%s), instead: %s\n", "didn't get expected path (%s), instead: %s\n",
wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr)); wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr));
}else if(filename.uType == STRRET_CSTR){
ok_(__FILE__,l)(strcmp_wa(path, filename.cStr) == 0,
"didn't get expected path (%s), instead: %s\n",
wine_dbgstr_w(path), filename.cStr);
}
IShellFolder_Release(parent); IShellFolder_Release(parent);
}else }else