Re: msi: MsiMergeDatabaseA/W stub

[James Hawkins]

On Thu, Feb 21, 2008 at 2:26 PM, Johan Dahlin  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.

msi: MsiMergeDatabaseA/W stub

[Johan Dahlin]

James Hawkins wrote:
> On Thu, Feb 21, 2008 at 2:26 PM, Johan Dahlin  wrote:

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

It appears that the coding style is different from different dlls, is there 
a general agreement how to configure emacs (or any other editors) properly
so it picks up the right coding style for each sub-part of wine?

Johan

msi: MsiMergeDatabaseA/W stub

[James Hawkins]

On Fri, Feb 22, 2008 at 12:32 PM, Johan Dahlin  wrote:
> James Hawkins wrote:
> > On Thu, Feb 21, 2008 at 2:26 PM, Johan Dahlin  wrote:
>
> [..]
> > Please use the same style as the rest of the file (4 space
> > indentation).  The A version should be before the W version.
>
> It appears that the coding style is different from different dlls, is there
>  a general agreement how to configure emacs (or any other editors) properly
>  so it picks up the right coding style for each sub-part of wine?

There are minor variations everywhere, but most of the code uses 4
space indentations.