Rebase against 84b3218ed6ad5975f537481edf2f61fb26bedb8b.

This commit is contained in:
Sebastian Lackner
2016-08-08 21:43:18 +02:00
parent 1b0da6367b
commit 929a758ef4
6 changed files with 43 additions and 94 deletions

View File

@@ -1,4 +1,4 @@
From 65d3fe2e1b64341598f8e427f2e331e430617aac Mon Sep 17 00:00:00 2001
From 6a34fd5dad4f8cd722eb07f8e253525544705d0c Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Thu, 17 Sep 2015 17:56:15 -0600
Subject: msi: Add support for exporting the _SummaryInformation table.
@@ -54,7 +54,7 @@ index e28cf1c..13eac2a 100644
if (r == ERROR_SUCCESS)
{
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index d457a54..71b620c 100644
index 8e7b592..3aac2af 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -954,6 +954,7 @@ extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECL
@@ -62,11 +62,11 @@ index d457a54..71b620c 100644
extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN;
extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN;
+extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) DECLSPEC_HIDDEN;
extern enum platform parse_platform( const WCHAR *str ) DECLSPEC_HIDDEN;
extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN;
/* undocumented functions */
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index 451fd16..c929fa5 100644
index 451fd16b..c929fa5 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -23,6 +23,7 @@
@@ -196,5 +196,5 @@ index 451fd16..c929fa5 100644
{
MSISUMMARYINFO *si;
--
2.5.1
2.9.0