From 525865447e8f27079f36e954a277307c0e2ece4d Mon Sep 17 00:00:00 2001
From: James Hawkins <jhawkins@codeweavers.com>
Date: Tue, 30 Sep 2008 20:55:55 -0500
Subject: [PATCH] msi: Add a stub implementation of MsiDatabaseMerge.

---
 dlls/msi/database.c | 18 ++++++++++++++++++
 dlls/msi/msi.spec   |  4 ++--
 include/msi.h       |  4 ++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index 33343cc1e69..0ffc2339602 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -983,6 +983,24 @@ end:
     return r;
 }
 
+UINT WINAPI MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge,
+                              LPCSTR szTableName)
+{
+    FIXME("(%ld, %ld, %s): stub!\n", hDatabase, hDatabaseMerge,
+          debugstr_a(szTableName));
+
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
+UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge,
+                              LPCWSTR szTableName)
+{
+    FIXME("(%ld, %ld, %s): stub!\n", hDatabase, hDatabaseMerge,
+          debugstr_w(szTableName));
+
+    return ERROR_CALL_NOT_IMPLEMENTED;
+}
+
 MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle )
 {
     MSIDBSTATE ret = MSIDBSTATE_READ;
diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec
index 4ab0bb189fb..37943839c1c 100644
--- a/dlls/msi/msi.spec
+++ b/dlls/msi/msi.spec
@@ -22,8 +22,8 @@
 26 stdcall MsiDatabaseGetPrimaryKeysW(long wstr ptr)
 27 stdcall MsiDatabaseImportA(str str long)
 28 stdcall MsiDatabaseImportW(wstr wstr long)
-29 stub MsiDatabaseMergeA
-30 stub MsiDatabaseMergeW
+29 stdcall MsiDatabaseMergeA(long long str)
+30 stdcall MsiDatabaseMergeW(long long wstr)
 31 stdcall MsiDatabaseOpenViewA(long str ptr)
 32 stdcall MsiDatabaseOpenViewW(long wstr ptr)
 33 stdcall MsiDoActionA(long str)
diff --git a/include/msi.h b/include/msi.h
index c4f5e0da09e..20dca3ad825 100644
--- a/include/msi.h
+++ b/include/msi.h
@@ -599,6 +599,10 @@ UINT WINAPI MsiIsProductElevatedA(LPCSTR, BOOL *);
 UINT WINAPI MsiIsProductElevatedW(LPCWSTR, BOOL *);
 #define     MsiIsProductElevated WINELIB_NAME_AW(MsiIsProductElevated)
 
+UINT WINAPI MsiDatabaseMergeA(MSIHANDLE, MSIHANDLE, LPCSTR);
+UINT WINAPI MsiDatabaseMergeW(MSIHANDLE, MSIHANDLE, LPCWSTR);
+#define     MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge)
+
 /* Non Unicode */
 UINT WINAPI MsiCloseHandle(MSIHANDLE);
 UINT WINAPI MsiCloseAllHandles(void);