Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

This commit is contained in:
Alistair Leslie-Hughes
2018-03-06 09:29:38 +11:00
parent e09e1fd366
commit fcca2476bf
42 changed files with 395 additions and 976 deletions

View File

@@ -1,4 +1,4 @@
From ca5272000a739f6b249748b59c50c52ea8704d1e Mon Sep 17 00:00:00 2001
From 1ef6c34bd97f4cb0bb9c2c8a0ac5e8f3f05460c7 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Tue, 15 Sep 2015 17:44:33 -0600
Subject: [PATCH] msidb: Add stub tool for manipulating MSI databases.
@@ -13,17 +13,17 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
create mode 100644 programs/msidb/main.c
diff --git a/configure.ac b/configure.ac
index 7b796ef..7c8d226 100644
index 1f8ad92..9013441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3813,6 +3813,7 @@ WINE_CONFIG_PROGRAM(ipconfig)
WINE_CONFIG_PROGRAM(lodctr)
WINE_CONFIG_PROGRAM(mofcomp)
WINE_CONFIG_PROGRAM(mshta)
+WINE_CONFIG_PROGRAM(msidb)
WINE_CONFIG_PROGRAM(msiexec)
WINE_CONFIG_PROGRAM(msinfo32)
WINE_CONFIG_PROGRAM(net)
@@ -3878,6 +3878,7 @@ WINE_CONFIG_MAKEFILE(programs/ipconfig)
WINE_CONFIG_MAKEFILE(programs/lodctr)
WINE_CONFIG_MAKEFILE(programs/mofcomp)
WINE_CONFIG_MAKEFILE(programs/mshta)
+WINE_CONFIG_MAKEFILE(programs/msidb)
WINE_CONFIG_MAKEFILE(programs/msiexec)
WINE_CONFIG_MAKEFILE(programs/msinfo32)
WINE_CONFIG_MAKEFILE(programs/net)
diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
new file mode 100644
index 0000000..dae699c
@@ -198,5 +198,5 @@ index 0000000..43cc519
+ return 0;
+}
--
2.7.4
1.9.1