msi: Forward MsiDatabaseMergeA to MsiDatabaseMergeW.

4749ee26 · James Hawkins · Alexandre Julliard · 52586544 · 4749ee26
Commit 4749ee26 authored Sep 30, 2008 by James Hawkins Committed by Alexandre Julliard Oct 01, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

database.c dlls/msi/database.c +9 -2

No files found.
--- 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,