Rebase against eb5339edaca1c09d76b4afa32bdb07c1549e6650.

[api-ms-win-Stub_DLLs]
Removed some stub dlls (accepted upstream).

[wmic-Query_Path]
Removed patch to improve cmd line parser and add support for path command
(accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-10-15 03:50:51 +02:00
parent 70bc9a4e63
commit dd53426bfd
14 changed files with 104 additions and 396 deletions

View File

@@ -1,4 +1,4 @@
From 4dfeafbe2c75253ecca37810fa7351e326e9e310 Mon Sep 17 00:00:00 2001
From 608383e76cb10d836433a2a7355a1e8e790a63e1 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.
@@ -13,16 +13,16 @@ 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 ac75845..71a245d 100644
index c624c9e..1bb859e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3522,6 +3522,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
@@ -3552,6 +3552,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
WINE_CONFIG_PROGRAM(lodctr,,[install])
WINE_CONFIG_PROGRAM(mofcomp,,[install])
WINE_CONFIG_PROGRAM(mshta,,[install])
+WINE_CONFIG_PROGRAM(msidb,,[install,installbin])
WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage])
WINE_CONFIG_PROGRAM(msinfo32,,[install])
WINE_CONFIG_PROGRAM(msinfo32,,[clean,install])
WINE_CONFIG_PROGRAM(net,,[clean,install])
diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
new file mode 100644