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

Implement the [!file] format to produce the short filename.

This commit is contained in:
Aric Stewart 2005-05-25 17:49:49 +00:00 committed by Alexandre Julliard
parent ef73685e6b
commit 825920a090
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/msi/format.c
View File

@ -101,7 +101,8 @@ static LPWSTR deformat_component(MSIPACKAGE* package, LPCWSTR key, DWORD* sz)
return value; return value;
} }
static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz) static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz,
BOOL shortname)
{ {
LPWSTR value = NULL; LPWSTR value = NULL;
INT index; INT index;
@ -114,8 +115,32 @@ static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz)
index = get_loaded_file(package,key); index = get_loaded_file(package,key);
if (index >=0) if (index >=0)
{ {
value = strdupW(package->files[index].TargetPath); if (!shortname)
*sz = (strlenW(value)) * sizeof(WCHAR); {
value = strdupW(package->files[index].TargetPath);
*sz = (strlenW(value)) * sizeof(WCHAR);
}
else
{
DWORD size = 0;
size = GetShortPathNameW(package->files[index].TargetPath, NULL, 0);
if (size > 0)
{
*sz = (size-1) * sizeof (WCHAR);
size ++;
value = HeapAlloc(GetProcessHeap(),0,size * sizeof(WCHAR));
GetShortPathNameW(package->files[index].TargetPath, value,
size);
}
else
{
ERR("Unable to get ShortPath size (%s)\n",
debugstr_w(package->files[index].TargetPath));
value = NULL;
*sz = 0;
}
}
} }
return value; return value;
@ -378,8 +403,10 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr,
value = deformat_component(package,&key[1],&chunk); value = deformat_component(package,&key[1],&chunk);
break; break;
case '#': case '#':
value = deformat_file(package,&key[1], &chunk, FALSE);
break;
case '!': /* should be short path */ case '!': /* should be short path */
value = deformat_file(package,&key[1], &chunk); value = deformat_file(package,&key[1], &chunk, TRUE);
break; break;
case '\\': case '\\':
value = deformat_escape(&key[1],&chunk); value = deformat_escape(&key[1],&chunk);