Skip to content

W
wine-winehq
Commit fe7f21b0 authored by Robert Wilhelm's avatar Robert Wilhelm Committed by Alexandre Julliard
Browse files
Options

scrrun: Extract code to new helper function build_path.

Signed-off-by: 's avatarRobert Wilhelm <robert.wilhelm@gmx.net> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c590681e
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 49 deletions
dlls/scrrun/filesystem.c
View file @ fe7f21b0
......@@ -223,6 +223,59 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data)
return SysAllocString(buffW);
}
static HRESULT build_path( BSTR Path, BSTR Name, BSTR *Result)
{
BSTR ret;
if (Path && Name)
{
int path_len = SysStringLen(Path), name_len = SysStringLen(Name);
/* if both parts have backslashes strip one from Path */
if (Path[path_len-1] == '\\' && Name[0] == '\\')
{
path_len -= 1;
ret = SysAllocStringLen(NULL, path_len + name_len);
if (ret)
{
lstrcpyW(ret, Path);
ret[path_len] = 0;
lstrcatW(ret, Name);
}
}
else if (Path[path_len-1] != '\\' && Name[0] != '\\')
{
ret = SysAllocStringLen(NULL, path_len + name_len + 1);
if (ret)
{
lstrcpyW(ret, Path);
if (Path[path_len-1] != ':')
wcscat(ret, L"\\");
lstrcatW(ret, Name);
}
}
else
{
ret = SysAllocStringLen(NULL, path_len + name_len);
if (ret)
{
lstrcpyW(ret, Path);
lstrcatW(ret, Name);
}
}
}
else if (Path || Name)
ret = SysAllocString(Path ? Path : Name);
else
ret = SysAllocStringLen(NULL, 0);
if (!ret) return E_OUTOFMEMORY;
*Result = ret;
return S_OK;
}
static BOOL textstream_check_iomode(struct textstream *This, enum iotype type)
{
if (type == IORead)
......@@ -3034,59 +3087,11 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection *
static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path,
BSTR Name, BSTR *Result)
{
BSTR ret;
TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result);
if (!Result) return E_POINTER;
if (Path && Name)
{
int path_len = SysStringLen(Path), name_len = SysStringLen(Name);
/* if both parts have backslashes strip one from Path */
if (Path[path_len-1] == '\\' && Name[0] == '\\')
{
path_len -= 1;
ret = SysAllocStringLen(NULL, path_len + name_len);
if (ret)
{
lstrcpyW(ret, Path);
ret[path_len] = 0;
lstrcatW(ret, Name);
}
}
else if (Path[path_len-1] != '\\' && Name[0] != '\\')
{
ret = SysAllocStringLen(NULL, path_len + name_len + 1);
if (ret)
{
lstrcpyW(ret, Path);
if (Path[path_len-1] != ':')
wcscat(ret, L"\\");
lstrcatW(ret, Name);
}
}
else
{
ret = SysAllocStringLen(NULL, path_len + name_len);
if (ret)
{
lstrcpyW(ret, Path);
lstrcatW(ret, Name);
}
}
}
else if (Path || Name)
ret = SysAllocString(Path ? Path : Name);
else
ret = SysAllocStringLen(NULL, 0);
if (!ret) return E_OUTOFMEMORY;
*Result = ret;
return S_OK;
return build_path(Path, Name, Result);
}
static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment