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

scrrun: Add IFileSystem3::GetFileName implementation.

This commit is contained in:
Piotr Caban 2013-07-23 18:50:57 +02:00 committed by Alexandre Julliard
parent d51a35c565
commit fab963cdcc
2 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/scrrun/filesystem.c
View File

@ -780,9 +780,36 @@ static HRESULT WINAPI filesys_GetParentFolderName(IFileSystem3 *iface, BSTR Path
static HRESULT WINAPI filesys_GetFileName(IFileSystem3 *iface, BSTR Path,
BSTR *pbstrResult)
{
FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult);
int i, end;
return E_NOTIMPL;
TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult);
if(!pbstrResult)
return E_POINTER;
if(!Path) {
*pbstrResult = NULL;
return S_OK;
}
for(end=strlenW(Path)-1; end>=0; end--)
if(Path[end]!='/' && Path[end]!='\\')
break;
for(i=end; i>=0; i--)
if(Path[i]=='/' || Path[i]=='\\')
break;
i++;
if(i>end || (i==0 && end==1 && Path[1]==':')) {
*pbstrResult = NULL;
return S_OK;
}
*pbstrResult = SysAllocStringLen(Path+i, end-i+1);
if(!*pbstrResult)
return E_OUTOFMEMORY;
return S_OK;
}
static HRESULT WINAPI filesys_GetBaseName(IFileSystem3 *iface, BSTR Path,

44
dlls/scrrun/tests/filesystem.c
View File

@ -302,6 +302,49 @@ static void test_GetParentFolderName(void)
}
}
static void test_GetFileName(void)
{
static const WCHAR path1[] = {'a',0};
static const WCHAR path2[] = {'a','/','a','.','b',0};
static const WCHAR path3[] = {'a','\\',0};
static const WCHAR path4[] = {'c',':',0};
static const WCHAR path5[] = {'/','\\',0};
static const WCHAR result2[] = {'a','.','b',0};
static const WCHAR result3[] = {'a',0};
static const struct {
const WCHAR *path;
const WCHAR *result;
} tests[] = {
{NULL, NULL},
{path1, path1},
{path2, result2},
{path3, result3},
{path4, NULL},
{path5, NULL}
};
BSTR path, result;
HRESULT hr;
int i;
hr = IFileSystem3_GetFileName(fs3, NULL, NULL);
ok(hr == E_POINTER, "GetFileName returned %x, expected E_POINTER\n", hr);
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {
result = (BSTR)0xdeadbeef;
path = tests[i].path ? SysAllocString(tests[i].path) : NULL;
hr = IFileSystem3_GetFileName(fs3, path, &result);
ok(hr == S_OK, "%d) GetFileName returned %x, expected S_OK\n", i, hr);
if(!tests[i].result)
ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result));
else
ok(!lstrcmpW(result, tests[i].result), "%d) result = %s\n", i, wine_dbgstr_w(result));
SysFreeString(path);
SysFreeString(result);
}
}
START_TEST(filesystem)
{
HRESULT hr;
@ -320,6 +363,7 @@ START_TEST(filesystem)
test_textstream();
test_GetFileVersion();
test_GetParentFolderName();
test_GetFileName();
IFileSystem3_Release(fs3);