Rebase against cbaab82d086e36dacaa22c6adf80f9114bb820fb.

This commit is contained in:
Sebastian Lackner
2015-10-30 17:58:45 +01:00
parent f8627a6f02
commit 7e1bf8aca0
10 changed files with 15 additions and 350 deletions

View File

@@ -1,4 +1,4 @@
From 8a68964092d39388b5e4147796b8b88affd960e1 Mon Sep 17 00:00:00 2001
From 7128a10cb4d1febc06bac49191c36fc1561141b0 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: msidb: Add stub tool for manipulating MSI databases.
@@ -6,18 +6,17 @@ Subject: msidb: Add stub tool for manipulating MSI databases.
Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
---
configure.ac | 1 +
programs/msidb/Makefile.in | 6 ++
programs/msidb/Makefile.in | 8 +++
programs/msidb/main.c | 153 +++++++++++++++++++++++++++++++++++++++++++++
tools/make_makefiles | 1 +
4 files changed, 161 insertions(+)
3 files changed, 162 insertions(+)
create mode 100644 programs/msidb/Makefile.in
create mode 100644 programs/msidb/main.c
diff --git a/configure.ac b/configure.ac
index bfcf319..b75fe09 100644
index bb879b0..06a0d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3523,6 +3523,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install,po])
@@ -3514,6 +3514,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install,po])
WINE_CONFIG_PROGRAM(lodctr,,[install])
WINE_CONFIG_PROGRAM(mofcomp,,[install])
WINE_CONFIG_PROGRAM(mshta,,[install])
@@ -27,16 +26,18 @@ index bfcf319..b75fe09 100644
WINE_CONFIG_PROGRAM(netsh,,[install])
diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
new file mode 100644
index 0000000..e83de8c
index 0000000..dae699c
--- /dev/null
+++ b/programs/msidb/Makefile.in
@@ -0,0 +1,6 @@
@@ -0,0 +1,8 @@
+MODULE = msidb.exe
+APPMODE = -mconsole -municode
+IMPORTS = msi
+
+C_SRCS = \
+ main.c
+
+INSTALL_LIB = msidb.exe msidb
diff --git a/programs/msidb/main.c b/programs/msidb/main.c
new file mode 100644
index 0000000..43cc519
@@ -196,18 +197,6 @@ index 0000000..43cc519
+ close_database( &state );
+ return 0;
+}
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 266f33a..90234f9 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -24,6 +24,7 @@ use strict;
# Programs that we want to install in the bin directory too
my %bin_install =
(
+ "msidb" => 1,
"msiexec" => 1,
"notepad" => 1,
"regedit" => 1,
--
2.6.1