Dmitry Timoshkov : Revert "msi: Correctly parse double quotes in the token value.".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2d7f00c8d38777266dcf585c047c05fa7a7e0fb7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2d7f00c8d38777266dcf585c04...

Author: Dmitry Timoshkov 
Date:   Tue Nov  3 18:08:08 2015 +0800

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 f2e8e71..df73652 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: