[PATCH 0/2] MR6410: msiexec: Don't remove quotes from properties passed on the command line.

[Hans Leidekker (＠hans)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57024

[PATCH 1/2] msiexec: Don't remove quotes from properties passed on the command line.

[Hans Leidekker]

From: Hans Leidekker

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57024
---
 programs/msiexec/msiexec.c | 43 +++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index b2135e67479..d625b7a9b51 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -494,6 +494,7 @@ static int chomp( const WCHAR *in, WCHAR *out )
             case '"':
                 state = CS_QUOTE;
                 count++;
+                ignore = FALSE;
                 break;
             default:
                 count++;
@@ -507,6 +508,7 @@ static int chomp( const WCHAR *in, WCHAR *out )
             {
             case '"':
                 state = CS_QUOTE;
+                ignore = FALSE;
                 break;
             case ' ':
                 state = CS_WHITESPACE;
@@ -527,6 +529,7 @@ static int chomp( const WCHAR *in, WCHAR *out )
             {
             case '"':
                 state = CS_TOKEN;
+                ignore = FALSE;
                 break;
             default:
                 ignore = FALSE;
@@ -628,6 +631,23 @@ static WCHAR *get_path_with_extension(const WCHAR *package_name)
     return path;
 }

+static WCHAR *remove_quotes( const WCHAR *filename )
+{
+    const WCHAR *ptr = filename;
+    int len = wcslen( filename );
+    WCHAR *ret;
+
+    if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL;
+    if (*ptr == '"')
+    {
+        ptr++;
+        len--;
+    }
+    wcscpy( ret, ptr );
+    if (len && ret[len - 1] == '"') ret[len - 1] = 0;
+    return ret;
+}
+
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
    int i;
@@ -666,7 +686,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
    DWORD ReturnCode;
    int argc;
    LPWSTR *argvW = NULL;
-	WCHAR *path;
+	WCHAR *path, *package_unquoted;

InitCommonControls();

@@ -1075,15 +1095,17 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
    if(FunctionInstallAdmin && FunctionPatch)
    	FunctionInstall = FALSE;

+    if (!(package_unquoted = remove_quotes( PackageName))) return ERROR_OUTOFMEMORY;
+
    ReturnCode = 1;
    if(FunctionInstall)
    {
-		if(IsProductCode(PackageName))
-			ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties);
+		if(IsProductCode(package_unquoted))
+			ReturnCode = MsiConfigureProductExW(package_unquoted, 0, INSTALLSTATE_DEFAULT, Properties);
    	else
    	{
-			if ((ReturnCode = MsiInstallProductW(PackageName, Properties)) == ERROR_FILE_NOT_FOUND
-					&& (path = get_path_with_extension(PackageName)))
+			if ((ReturnCode = MsiInstallProductW(package_unquoted, Properties)) == ERROR_FILE_NOT_FOUND
+					&& (path = get_path_with_extension(package_unquoted)))
    		{
    			ReturnCode = MsiInstallProductW(path, Properties);
    			free(path);
@@ -1092,12 +1114,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
    }
    else if(FunctionRepair)
    {
-		if(IsProductCode(PackageName))
+		if(IsProductCode(package_unquoted))
    		WINE_FIXME("Product code treatment not implemented yet\n");
    	else
    	{
-			if ((ReturnCode = MsiReinstallProductW(PackageName, RepairMode)) == ERROR_FILE_NOT_FOUND
-					&& (path = get_path_with_extension(PackageName)))
+			if ((ReturnCode = MsiReinstallProductW(package_unquoted, RepairMode)) == ERROR_FILE_NOT_FOUND
+					&& (path = get_path_with_extension(package_unquoted)))
    		{
    			ReturnCode = MsiReinstallProductW(path, RepairMode);
    			free(path);
@@ -1107,11 +1129,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
    else if(FunctionAdvertise)
    {
    	LPWSTR Transforms = build_transforms( property_list );
-		ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR) AdvertiseMode, Transforms, Language);
+		ReturnCode = MsiAdvertiseProductW(package_unquoted, (LPWSTR) AdvertiseMode, Transforms, Language);
    }
    else if(FunctionPatch)
    {
-		ReturnCode = MsiApplyPatchW(PatchFileName, PackageName, InstallType, Properties);
+		ReturnCode = MsiApplyPatchW(PatchFileName, package_unquoted, InstallType, Properties);
    }
    else if(FunctionDllRegisterServer)
    {
@@ -1140,5 +1162,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
    else
    	ShowUsage(1);

+    free( package_unquoted );
    return ReturnCode;
 }

[PATCH 2/2] msi/tests: Test escaped double quote on the command line.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/msi/tests/msi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index 5c036f31305..c98293507e2 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -13418,6 +13418,10 @@ static void test_command_line_parsing(void)
     r = MsiInstallProductA(msifile, cmd);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

+    cmd = "P="one""two"";
+    r = MsiInstallProductA(msifile, cmd);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
+
     DeleteFileA(msifile);
     delete_test_files();
 }