Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-19 18:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[advpack]

Browse source 
update advpack to wine 1.1.36

svn path=/trunk/; revision=45119
This commit is contained in:
Christoph von Wittich 2010-01-17 08:29:56 +00:00
parent 3afb71110b
commit b7cfbffd76
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/dll/win32/advpack/files.c
View file

@ -279,13 +279,13 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir, LPCWSTR lpszSou
if (lpszDestFile) if (lpszDestFile)
{ {
dwLen = lstrlenW(lpszDestFile); dwLen = lstrlenW(lpszDestFile);
szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR));
lstrcpyW(szDestFilename, lpszDestFile); lstrcpyW(szDestFilename, lpszDestFile);
} }
else else
{ {
dwLen = lstrlenW(lpszSourceFile); dwLen = lstrlenW(lpszSourceFile);
szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR));
lstrcpyW(szDestFilename, lpszSourceFile); lstrcpyW(szDestFilename, lpszSourceFile);
} }
@ -648,6 +648,18 @@ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileLis
return dwNumFound; return dwNumFound;
} }
static void free_file_list(SESSION* session)
{
struct FILELIST *next, *curr = session->FileList;
while (curr)
{
next = curr->next;
free_file_node(curr);
curr = next;
}
}
/*********************************************************************** /***********************************************************************
* ExtractFilesA (ADVPACK.@) * ExtractFilesA (ADVPACK.@)
* *
@ -728,20 +740,8 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags,
session.Operation |= EXTRACT_EXTRACTFILES; session.Operation |= EXTRACT_EXTRACTFILES;
res = pExtract(&session, CabName); res = pExtract(&session, CabName);
if (session.FileList)
{
struct FILELIST *curr = session.FileList;
struct FILELIST *next;
while (curr)
{
next = curr->next;
free_file_node(curr);
curr = next;
}
}
done: done:
free_file_list(&session);
FreeLibrary(hCabinet); FreeLibrary(hCabinet);
HeapFree(GetProcessHeap(), 0, szConvertedList); HeapFree(GetProcessHeap(), 0, szConvertedList);