[1/2] Revert "msi: Correctly parse double quotes in the token value."
Dmitry Timoshkov
dmitry at baikal.ru
Tue Nov 3 04:08:08 CST 2015
This reverts commit 42caac841e1755570ba25c2ce95948fc28f31372.
This patch caused a regression reported in the bug 39544.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
dlls/msi/action.c | 4 ++--
dlls/msi/tests/install.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index f2e8e71..16c633b 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 && p[1] != '\"') count--;
+ if (in_quotes) count--;
else count++;
break;
case ' ':
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index df6fe9c..6b86cd2 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -4718,7 +4718,9 @@ 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:
--
2.6.2
More information about the wine-patches
mailing list