James Hawkins : msi: Forward MsiDatabaseMergeA to MsiDatabaseMergeW.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4749ee266236cc410f5f99fc9b7742161075ea83
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4749ee266236cc410f5f99fc9b...

Author: James Hawkins <jhawkins(a)codeweavers.com>
Date:   Tue Sep 30 20:56:27 2008 -0500

msi: Forward MsiDatabaseMergeA to MsiDatabaseMergeW.

---

 dlls/msi/database.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index 0ffc233..cf6e5eb 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -986,10 +986,17 @@ end:
 UINT WINAPI MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge,
                               LPCSTR szTableName)
 {
-    FIXME("(%ld, %ld, %s): stub!\n", hDatabase, hDatabaseMerge,
+    UINT r;
+    LPWSTR table;
+
+    TRACE("(%ld, %ld, %s)\n", hDatabase, hDatabaseMerge,
           debugstr_a(szTableName));
 
-    return ERROR_CALL_NOT_IMPLEMENTED;
+    table = strdupAtoW(szTableName);
+    r = MsiDatabaseMergeW(hDatabase, hDatabaseMerge, table);
+
+    msi_free(table);
+    return r;
 }
 
 UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge,