James Hawkins : msi: Convert command line property names to uppercase.
Alexandre Julliard
julliard at winehq.org
Mon Oct 27 08:03:37 CDT 2008
Module: wine
Branch: master
Commit: 2ffa433f80955565a35d91f0d9e6e95ffe4c3925
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffa433f80955565a35d91f0d9e6e95ffe4c3925
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Mon Oct 27 01:26:12 2008 -0500
msi: Convert command line property names to uppercase.
---
dlls/msi/action.c | 1 +
dlls/msi/tests/install.c | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 93d8ee9..37a7de3 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -323,6 +323,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine )
prop = msi_alloc((len+1)*sizeof(WCHAR));
memcpy(prop,ptr,len*sizeof(WCHAR));
prop[len]=0;
+ struprW(prop);
ptr2++;
len = 0;
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 9773529..ee10f36 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -1189,6 +1189,18 @@ static const msi_table ai_tables[] =
ADD_TABLE(property)
};
+static const msi_table pc_tables[] =
+{
+ ADD_TABLE(ca51_component),
+ ADD_TABLE(directory),
+ ADD_TABLE(rof_feature),
+ ADD_TABLE(ci2_feature_comp),
+ ADD_TABLE(ci2_file),
+ ADD_TABLE(install_exec_seq),
+ ADD_TABLE(rof_media),
+ ADD_TABLE(property)
+};
+
/* cabinet definitions */
/* make the max size large so there is only one cab file */
@@ -5559,6 +5571,27 @@ static void test_adminimage(void)
RemoveDirectoryA("msitest");
}
+static void test_propcase(void)
+{
+ UINT r;
+
+ CreateDirectoryA("msitest", NULL);
+ create_file("msitest\\augustus", 500);
+
+ create_database(msifile, pc_tables, sizeof(pc_tables) / sizeof(msi_table));
+
+ MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
+
+ r = MsiInstallProductA(msifile, "MyProp=42");
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
+ ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
+ ok(delete_pf("msitest", FALSE), "File not installed\n");
+
+ DeleteFile(msifile);
+ DeleteFile("msitest\\augustus");
+ RemoveDirectory("msitest");
+}
+
START_TEST(install)
{
DWORD len;
@@ -5631,6 +5664,7 @@ START_TEST(install)
test_missingcomponent();
test_sourcedirprop();
test_adminimage();
+ test_propcase();
DeleteFileA("msitest.log");
More information about the wine-cvs
mailing list