diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 425486e..e74db8f 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1119,3 +1119,22 @@ HRESULT create_msi_remote_database( IUnknown *pOuter, LPVOID *ppObj ) return S_OK; } + +UINT WINAPI MsiDatabaseMergeW( MSIHANDLE hDatabase, + MSIHANDLE hDatabaseMerge, + LPCWSTR szTableName ) +{ + FIXME("(%ld %ld %s): stub!\n", hDatabase, hDatabaseMerge, + debugstr_w(szTableName)); + return ERROR_SUCCESS; +} + +UINT WINAPI MsiDatabaseMergeA( MSIHANDLE hDatabase, + MSIHANDLE hDatabaseMerge, + LPCSTR szTableName ) +{ + FIXME("(%ld %ld %s): stub!\n", hDatabase, hDatabaseMerge, + szTableName); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 2294eff..aec3923 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)