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

shell32: Implement ParseName().

This commit is contained in:
Nikolay Sivov 2015-05-10 20:00:55 +03:00 committed by Alexandre Julliard
parent ed700d16f7
commit e013a7e584
2 changed files with 98 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/shell32/shelldispatch.c
View File

@ -460,6 +460,8 @@ static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi)
FolderItemImpl *This;
HRESULT ret;
TRACE("%s\n", debugstr_variant(dir));
*ppfi = NULL;
This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemImpl));
@ -637,13 +639,39 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid)
return E_NOTIMPL;
}
static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR bName,
FolderItem **ppid)
static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item)
{
FIXME("(%p,%s,%p)\n", iface, debugstr_w(bName), ppid);
FolderItem *self;
BSTR str;
WCHAR pathW[MAX_PATH];
VARIANT v;
HRESULT hr;
*ppid = NULL;
return E_NOTIMPL;
TRACE("(%p,%s,%p)\n", iface, debugstr_w(name), item);
*item = NULL;
if (!name || !name[0])
return S_FALSE;
hr = Folder3_get_Self(iface, &self);
if (FAILED(hr))
return hr;
hr = FolderItem_get_Path(self, &str);
FolderItem_Release(self);
PathCombineW(pathW, str, name);
SysFreeString(str);
if (!PathFileExistsW(pathW))
return S_FALSE;
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = SysAllocString(pathW);
hr = FolderItem_Constructor(&v, item);
VariantClear(&v);
return hr;
}
static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR bName,

65
dlls/shell32/tests/shelldispatch.c
View File

@ -679,6 +679,70 @@ todo_wine
IShellWindows_Release(shellwindows);
}
static void test_ParseName(void)
{
static const WCHAR cadabraW[] = {'c','a','d','a','b','r','a',0};
WCHAR pathW[MAX_PATH];
IShellDispatch *sd;
FolderItem *item;
Folder *folder;
HRESULT hr;
VARIANT v;
BSTR str;
hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER,
&IID_IShellDispatch, (void**)&sd);
ok(hr == S_OK, "got 0x%08x\n", hr);
GetTempPathW(sizeof(pathW)/sizeof(pathW[0]), pathW);
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = SysAllocString(pathW);
hr = IShellDispatch_NameSpace(sd, v, &folder);
ok(hr == S_OK, "got 0x%08x\n", hr);
VariantClear(&v);
item = (void*)0xdeadbeef;
hr = Folder_ParseName(folder, NULL, &item);
ok(hr == S_FALSE, "got 0x%08x\n", hr);
ok(item == NULL, "got %p\n", item);
/* empty name */
str = SysAllocStringLen(NULL, 0);
item = (void*)0xdeadbeef;
hr = Folder_ParseName(folder, str, &item);
ok(hr == S_FALSE, "got 0x%08x\n", hr);
ok(item == NULL, "got %p\n", item);
SysFreeString(str);
/* path doesn't exist */
str = SysAllocString(cadabraW);
item = (void*)0xdeadbeef;
hr = Folder_ParseName(folder, str, &item);
ok(hr == S_FALSE, "got 0x%08x\n", hr);
ok(item == NULL, "got %p\n", item);
SysFreeString(str);
lstrcatW(pathW, cadabraW);
CreateDirectoryW(pathW, NULL);
str = SysAllocString(cadabraW);
item = NULL;
hr = Folder_ParseName(folder, str, &item);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(item != NULL, "got %p\n", item);
SysFreeString(str);
hr = FolderItem_get_Path(item, &str);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(str[0] != 0, "path %s\n", wine_dbgstr_w(str));
SysFreeString(str);
RemoveDirectoryW(pathW);
FolderItem_Release(item);
Folder_Release(folder);
IShellDispatch_Release(sd);
}
START_TEST(shelldispatch)
{
HRESULT r;
@ -693,6 +757,7 @@ START_TEST(shelldispatch)
test_service();
test_ShellFolderViewDual();
test_ShellWindows();
test_ParseName();
CoUninitialize();
}