From 2d7f00c8d38777266dcf585c047c05fa7a7e0fb7 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 3 Nov 2015 18:08:08 +0800 Subject: [PATCH] Revert "msi: Correctly parse double quotes in the token value.". This reverts commit 42caac841e1755570ba25c2ce95948fc28f31372. Signed-off-by: Dmitry Timoshkov Signed-off-by: Hans Leidekker Signed-off-by: Alexandre Julliard --- dlls/msi/action.c | 2 +- dlls/msi/tests/install.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f2e8e7113f6..df73652376c 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 df6fe9cba65..6b86cd28501 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: