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

cabinet: Split the cabinet path for FDICopy.

This commit is contained in:
Mike McCormack 2006-08-07 13:39:06 +09:00 committed by Alexandre Julliard
parent 9d9ae2e5b7
commit 968a445725
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/cabinet/cabinet_main.c
View File

@ -303,7 +303,7 @@ HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR szCabName)
HRESULT res = S_OK; HRESULT res = S_OK;
HFDI hfdi; HFDI hfdi;
ERF erf; ERF erf;
static CHAR empty[] = ""; char *str, *path, *name;
TRACE("(%p, %s)\n", dest, szCabName); TRACE("(%p, %s)\n", dest, szCabName);
@ -323,10 +323,32 @@ HRESULT WINAPI Extract(EXTRACTdest *dest, LPCSTR szCabName)
if (GetFileAttributesA(dest->directory) == INVALID_FILE_ATTRIBUTES) if (GetFileAttributesA(dest->directory) == INVALID_FILE_ATTRIBUTES)
return S_OK; return S_OK;
if (!FDICopy(hfdi, (LPSTR)szCabName, empty, 0, /* split the cabinet name into path + name */
str = HeapAlloc(GetProcessHeap(), 0, lstrlenA(szCabName)+1);
if (!str)
{
res = E_OUTOFMEMORY;
goto end;
}
lstrcpyA(str, szCabName);
path = str;
name = strrchr(path, '\\');
if (name)
*name++ = 0;
else
{
name = path;
path = NULL;
}
if (!FDICopy(hfdi, name, path, 0,
fdi_notify_extract, NULL, dest)) fdi_notify_extract, NULL, dest))
res = E_FAIL; res = E_FAIL;
HeapFree(GetProcessHeap(), 0, str);
end:
FDIDestroy(hfdi); FDIDestroy(hfdi);
return res; return res;