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

msi: Reduce filename to the long name in ITERATE_RemoveFiles.

This commit is contained in:
Hans Leidekker 2011-03-07 12:39:53 +01:00 committed by Alexandre Julliard
parent 8e5230740a
commit 3878c451ca
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msi/files.c
View File

@ -915,14 +915,14 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param)
MSIPACKAGE *package = param; MSIPACKAGE *package = param;
MSICOMPONENT *comp; MSICOMPONENT *comp;
MSIRECORD *uirow; MSIRECORD *uirow;
LPCWSTR component, filename, dirprop; LPCWSTR component, dirprop;
UINT install_mode; UINT install_mode;
LPWSTR dir = NULL, path = NULL; LPWSTR dir = NULL, path = NULL, filename = NULL;
DWORD size; DWORD size;
UINT ret = ERROR_SUCCESS; UINT ret = ERROR_SUCCESS;
component = MSI_RecordGetString(row, 2); component = MSI_RecordGetString(row, 2);
filename = MSI_RecordGetString(row, 3); filename = strdupW( MSI_RecordGetString(row, 3) );
dirprop = MSI_RecordGetString(row, 4); dirprop = MSI_RecordGetString(row, 4);
install_mode = MSI_RecordGetInteger(row, 5); install_mode = MSI_RecordGetInteger(row, 5);
@ -950,7 +950,12 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param)
if (!dir) if (!dir)
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;
size = (filename != NULL) ? lstrlenW(filename) : 0; size = 0;
if (filename)
{
reduce_to_longfilename( filename );
size = lstrlenW( filename );
}
size += lstrlenW(dir) + 2; size += lstrlenW(dir) + 2;
path = msi_alloc(size * sizeof(WCHAR)); path = msi_alloc(size * sizeof(WCHAR));
if (!path) if (!path)
@ -981,6 +986,7 @@ done:
ui_actiondata( package, szRemoveFiles, uirow ); ui_actiondata( package, szRemoveFiles, uirow );
msiobj_release( &uirow->hdr ); msiobj_release( &uirow->hdr );
msi_free(filename);
msi_free(path); msi_free(path);
msi_free(dir); msi_free(dir);
return ret; return ret;