Zebediah Figura : msi/tests: Add tests for custom action return values.
Alexandre Julliard
julliard at winehq.org
Mon Feb 19 13:52:01 CST 2018
Module: wine
Branch: master
Commit: 6dcb3dabd4d540b65d68193d7037db748bcf7c4a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dcb3dabd4d540b65d68193d7037db748bcf7c4a
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Feb 14 20:54:54 2018 -0600
msi/tests: Add tests for custom action return values.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/tests/Makefile.in | 6 ++-
dlls/msi/tests/custom.c | 38 +++++++++++++++++
dlls/msi/tests/custom.spec | 1 +
dlls/msi/tests/install.c | 100 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 144 insertions(+), 1 deletion(-)
diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in
index 66f8abb..70080ea 100644
--- a/dlls/msi/tests/Makefile.in
+++ b/dlls/msi/tests/Makefile.in
@@ -1,9 +1,13 @@
TESTDLL = msi.dll
IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version
-C_SRCS = \
+custom_IMPORTS = msi
+
+SOURCES = \
action.c \
automation.c \
+ custom.c \
+ custom.spec \
db.c \
format.c \
install.c \
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
new file mode 100644
index 0000000..d68d082
--- /dev/null
+++ b/dlls/msi/tests/custom.c
@@ -0,0 +1,38 @@
+/*
+ * DLL for testing type 1 custom actions
+ *
+ * Copyright 2017 Zebediah Figura
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <msi.h>
+#include <msiquery.h>
+
+UINT WINAPI test_retval(MSIHANDLE hinst)
+{
+ char prop[10];
+ DWORD len = sizeof(prop);
+ UINT retval;
+
+ MsiGetPropertyA(hinst, "TEST_RETVAL", prop, &len);
+ sscanf(prop, "%u", &retval);
+ return retval;
+}
diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec
new file mode 100644
index 0000000..2a01b3d
--- /dev/null
+++ b/dlls/msi/tests/custom.spec
@@ -0,0 +1 @@
+@ stdcall test_retval(long)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index acbf162..9ba4f07 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -70,6 +70,8 @@ static CHAR COMMON_FILES_DIR[MAX_PATH];
static CHAR APP_DATA_DIR[MAX_PATH];
static CHAR WINDOWS_DIR[MAX_PATH];
+static const char *customdll;
+
/* msi database data */
static const CHAR component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n"
@@ -690,6 +692,16 @@ static const CHAR wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAtt
"Component\tComponent\n"
"augustus\t\tMSITESTDIR\t0\t\taugustus\n";
+static const CHAR ca1_install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
+ "s72\tS255\tI2\n"
+ "InstallExecuteSequence\tAction\n"
+ "testretval\t\t710\n";
+
+static const CHAR ca1_custom_action_dat[] = "Action\tType\tSource\tTarget\n"
+ "s72\ti2\tS64\tS0\n"
+ "CustomAction\tAction\n"
+ "testretval\t1\tcustom.dll\ttest_retval\n";
+
static const CHAR ca51_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n"
"s72\tS38\ts72\ti2\tS255\tS72\n"
"Component\tComponent\n"
@@ -1683,6 +1695,13 @@ static const msi_table sf_tables[] =
ADD_TABLE(property),
};
+static const msi_table ca1_tables[] =
+{
+ ADD_TABLE(property),
+ ADD_TABLE(ca1_install_exec_seq),
+ ADD_TABLE(ca1_custom_action),
+};
+
static const msi_table ca51_tables[] =
{
ADD_TABLE(ca51_component),
@@ -2589,6 +2608,29 @@ static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access )
return RegDeleteKeyA( key, subkey );
}
+static char *load_resource(const char *name)
+{
+ static char path[MAX_PATH];
+ DWORD written;
+ HANDLE file;
+ HRSRC res;
+ void *ptr;
+
+ GetTempFileNameA(".", name, 0, path);
+
+ file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
+ ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError());
+
+ res = FindResourceA(NULL, name, "TESTDLL");
+ ok( res != 0, "couldn't find resource\n" );
+ ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res ));
+ WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL );
+ ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" );
+ CloseHandle( file );
+
+ return path;
+}
+
static void test_MsiInstallProduct(void)
{
UINT r;
@@ -4014,6 +4056,59 @@ error:
DeleteFileA("augustus");
}
+static void add_custom_dll(void)
+{
+ MSIHANDLE hdb = 0, record;
+ UINT res;
+
+ res = MsiOpenDatabaseW(msifileW, MSIDBOPEN_TRANSACT, &hdb);
+ ok(res == ERROR_SUCCESS, "failed to open db: %u\n", res);
+
+ res = run_query(hdb, 0, "CREATE TABLE `Binary` (`Name` CHAR(72) NOT NULL, `Data` OBJECT NOT NULL PRIMARY KEY `Name`)");
+ ok(res == ERROR_SUCCESS, "failed to create Binary table: %u\n", res);
+
+ record = MsiCreateRecord(1);
+ res = MsiRecordSetStreamA(record, 1, customdll);
+ ok(res == ERROR_SUCCESS, "failed to add %s to stream: %u\n", customdll, res);
+
+ res = run_query(hdb, record, "INSERT INTO `Binary` (`Name`, `Data`) VALUES ('custom.dll', ?)");
+ ok(res == ERROR_SUCCESS, "failed to insert into Binary table: %u\n", res);
+
+ res = MsiDatabaseCommit(hdb);
+ ok(res == ERROR_SUCCESS, "failed to commit database: %u\n", res);
+
+ MsiCloseHandle(record);
+ MsiCloseHandle(hdb);
+}
+
+static void test_customaction1(void)
+{
+ UINT r;
+
+ create_database(msifile, ca1_tables, sizeof(ca1_tables) / sizeof(msi_table));
+ add_custom_dll();
+
+ MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
+
+ r = MsiInstallProductA(msifile, "TEST_RETVAL=0");
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
+
+ r = MsiInstallProductA(msifile, "TEST_RETVAL=1626"); /* ERROR_FUNCTION_NOT_CALLED*/
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
+
+ r = MsiInstallProductA(msifile, "TEST_RETVAL=1602");
+ ok(r == ERROR_INSTALL_USEREXIT, "Expected ERROR_INSTALL_USEREXIT, got %u\n", r);
+
+ r = MsiInstallProductA(msifile, "TEST_RETVAL=259"); /* ERROR_NO_MORE_ITEMS */
+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
+
+ /* any other error maps to ERROR_INSTALL_FAILURE */
+ r = MsiInstallProductA(msifile, "TEST_RETVAL=1");
+ ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
+
+ DeleteFileA(msifile);
+}
+
static void test_customaction51(void)
{
UINT r;
@@ -5987,6 +6082,8 @@ START_TEST(install)
lstrcatA(log_file, "\\msitest.log");
MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0);
+ customdll = load_resource("custom.dll");
+
if (pSRSetRestorePointA) /* test has side-effects on win2k3 that cause failures in following tests */
test_MsiInstallProduct();
test_MsiSetComponentState();
@@ -6006,6 +6103,7 @@ START_TEST(install)
test_adminprops();
test_missingcab();
test_sourcefolder();
+ test_customaction1();
test_customaction51();
test_installstate();
test_sourcepath();
@@ -6031,6 +6129,8 @@ START_TEST(install)
test_feature_tree();
test_deferred_action();
+ DeleteFileA(customdll);
+
DeleteFileA(log_file);
if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret)
More information about the wine-cvs
mailing list