msi: Correctly parse double quotes in the token value.
Dmitry Timoshkov
dmitry at baikal.ru
Wed Sep 23 03:07:18 CDT 2015
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 at baikal.ru>
---
dlls/msi/action.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 93e85c3..b57c39d 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -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 ' ':
@@ -329,7 +329,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine,
ptr2 = strchrW( ptr, '=' );
if (!ptr2) return ERROR_INVALID_COMMAND_LINE;
-
+
len = ptr2 - ptr;
if (!len) return ERROR_INVALID_COMMAND_LINE;
--
2.4.8
More information about the wine-patches
mailing list