[PATCH resend 2/5] msi/tests: Add a test DLL for custom actions.

Zebediah Figura z.figura12 at gmail.com
Wed Feb 14 20:54:53 CST 2018


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 configure                             |  1 +
 configure.ac                          |  1 +
 dlls/msi/tests/Makefile.in            |  3 +++
 dlls/msi/tests/custom.dll/Makefile.in |  4 ++++
 dlls/msi/tests/custom.dll/custom.spec |  0
 dlls/msi/tests/custom.dll/main.c      | 26 ++++++++++++++++++++++++++
 6 files changed, 35 insertions(+)
 create mode 100644 dlls/msi/tests/custom.dll/Makefile.in
 create mode 100644 dlls/msi/tests/custom.dll/custom.spec
 create mode 100644 dlls/msi/tests/custom.dll/main.c

diff --git a/configure b/configure
index 8ad89bd..483b1a3 100755
--- a/configure
+++ b/configure
@@ -18719,6 +18719,7 @@ wine_fn_config_dll mshtml enable_mshtml clean,implib
 wine_fn_config_test dlls/mshtml/tests mshtml_test clean
 wine_fn_config_dll msi enable_msi clean,implib
 wine_fn_config_test dlls/msi/tests msi_test
+wine_fn_config_resource dlls/msi/tests/custom.dll custom.dll
 wine_fn_config_dll msident enable_msident clean
 wine_fn_config_dll msimg32 enable_msimg32 implib
 wine_fn_config_dll msimsg enable_msimsg
diff --git a/configure.ac b/configure.ac
index 22620ec..dd19098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3316,6 +3316,7 @@ WINE_CONFIG_DLL(mshtml,,[clean,implib])
 WINE_CONFIG_TEST(dlls/mshtml/tests,[clean])
 WINE_CONFIG_DLL(msi,,[clean,implib])
 WINE_CONFIG_TEST(dlls/msi/tests)
+WINE_CONFIG_RESOURCE(dlls/msi/tests/custom.dll)
 WINE_CONFIG_DLL(msident,,[clean])
 WINE_CONFIG_DLL(msimg32,,[implib])
 WINE_CONFIG_DLL(msimsg)
diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in
index 66f8abb..fd3d9bd 100644
--- a/dlls/msi/tests/Makefile.in
+++ b/dlls/msi/tests/Makefile.in
@@ -13,3 +13,6 @@ C_SRCS = \
 	record.c \
 	source.c \
 	suminfo.c
+
+RC_DLLS = \
+	custom.dll
diff --git a/dlls/msi/tests/custom.dll/Makefile.in b/dlls/msi/tests/custom.dll/Makefile.in
new file mode 100644
index 0000000..a711e4b
--- /dev/null
+++ b/dlls/msi/tests/custom.dll/Makefile.in
@@ -0,0 +1,4 @@
+RESOURCE  = custom.dll
+
+C_SRCS = \
+	main.c
diff --git a/dlls/msi/tests/custom.dll/custom.spec b/dlls/msi/tests/custom.dll/custom.spec
new file mode 100644
index 0000000..e69de29
diff --git a/dlls/msi/tests/custom.dll/main.c b/dlls/msi/tests/custom.dll/main.c
new file mode 100644
index 0000000..838b8ae
--- /dev/null
+++ b/dlls/msi/tests/custom.dll/main.c
@@ -0,0 +1,26 @@
+/*
+ * 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 <windef.h>
+
+BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
+{
+    return TRUE;
+}
-- 
2.7.4




More information about the wine-devel mailing list