msi: MsiMergeDatabaseA/W stub

James Hawkins truiken at gmail.com
Fri Feb 22 11:47:26 CST 2008


On Thu, Feb 21, 2008 at 2:26 PM, Johan Dahlin <jdahlin at async.com.br> wrote:
> Add stubs for MsiMergeDatabaseA/W, used by WiX's msi validation.
>
> 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;
>  +}
>

Please use the same style as the rest of the file (4 space
indentation).  The A version should be before the W version.

-- 
James Hawkins



More information about the wine-devel mailing list