system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 18:49:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi: Use the TargetPath of a file if the file doesn't exist in MsiFormatRecord.

Browse source
This commit is contained in:
James Hawkins 2006-09-05 20:28:15 -07:00 committed by Alexandre Julliard
parent a248cc8f62
commit ff6fe41df7
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/msi/format.c
View file

@ -165,8 +165,8 @@ static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz,
{
ERR("Unable to get ShortPath size (%s)\n",
debugstr_w( file->TargetPath) );
value = NULL;
*sz = 0;
value = strdupW( file->TargetPath );
*sz = (lstrlenW(value)) * sizeof(WCHAR);
}
}
}

14
dlls/msi/tests/format.c
View file

@ -1804,11 +1804,8 @@ static void test_formatrecord_tables(void)
MsiRecordSetString( hrec, 1, "[!temporal_file]" );
r = MsiFormatRecord( hpkg, hrec, buf, &size );
ok( r == ERROR_SUCCESS, "format record failed: %d\n", r);
todo_wine
{
ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ),
"Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf);
}
ok( !lstrcmp( buf, "1: C:\\I am a really long directory\\temporal.txt " ),
"Expected '1: C:\\I am a really long directory\\temporal.txt ', got %s\n", buf);
/* custom action 51, files don't exist */
r = MsiDoAction( hpkg, "MyCustom" );
@ -1817,11 +1814,8 @@ static void test_formatrecord_tables(void)
size = MAX_PATH;
r = MsiGetProperty( hpkg, "prop", buf, &size );
ok( r == ERROR_SUCCESS, "get property failed: %d\n", r);
todo_wine
{
ok( !lstrcmp( buf, "C:\\I am a really long directory\\temporal.txt" ),
"Expected 'C:\\I am a really long directory\\temporal.txt', got %s\n", buf);
}
ok( !lstrcmp( buf, "C:\\I am a really long directory\\temporal.txt" ),
"Expected 'C:\\I am a really long directory\\temporal.txt', got %s\n", buf);
CreateDirectory( "C:\\I am a really long directory", NULL );
create_test_file( "C:\\I am a really long directory\\temporal.txt" );