mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 21:10:15 +00:00
msi: Correctly parse double quotes in the token value.
This fixes an installer that passes to InstallProduct a command line like PROPERTY1="Installing ""Product name"" version 8.0" PROPERTY2=1 PROPERTY3=1 In this case properties PROPERTY2 and PROPERTY3 were not recognized and that led to an installation failure when a custom action didn't see them as set. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
This commit is contained in:
parent
1b3087e79f
commit
42caac841e
|
@ -245,7 +245,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
|
|||
{
|
||||
case '"':
|
||||
state = state_quote;
|
||||
if (in_quotes) count--;
|
||||
if (in_quotes && p[1] != '\"') count--;
|
||||
else count++;
|
||||
break;
|
||||
case ' ':
|
||||
|
|
|
@ -4718,9 +4718,7 @@ static void test_propcase(void)
|
|||
|
||||
r = MsiInstallProductA(msifile, "BLAHBLAH=\"Copyright \"\"My Company\"\" 2015\" MyProp=42");
|
||||
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
|
||||
todo_wine
|
||||
ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
|
||||
todo_wine
|
||||
ok(delete_pf("msitest", FALSE), "Directory not created\n");
|
||||
|
||||
error:
|
||||
|
|
Loading…
Reference in a new issue