Re: Bill Medland : msi: Use a default dialog font if nothing is specified.

[Bill Medland]

On December 20, 2005 02:56 am, Alexandre Julliard wrote:
> Module: wine
> Branch: refs/heads/master
> Commit: e0d4df6bb7c009c8cbfa579c22c8d9406025f65c
> URL:   
> http://source.winehq.org/git/?p=wine.git;a=commit;h=e0d4df6bb7
> c009c8cbfa579c22c8d9406025f65c
>
> Author: Bill Medland 
> Date:   Tue Dec 20 11:59:23 2005 +0100
>
> msi: Use a default dialog font if nothing is specified.
>
> dlls/msi/dialog.c |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
> index 87e14e8..c4f9d2c 100644
> --- a/dlls/msi/dialog.c
> +++ b/dlls/msi/dialog.c
> @@ -1618,6 +1618,8 @@ static LRESULT msi_dialog_oncreate( HWND
>  {
>      static const WCHAR df[] = {
>          'D','e','f','a','u','l','t','U','I','F','o','n','t',0
> }; +    static const WCHAR dfv[] = {
> -
>    'M','S',' ','S','h','e','l','l',' ','D','l','g',0 };
> msi_dialog *dialog = (msi_dialog*) cs->lpCreateParams;
>    MSIRECORD *rec = NULL;
>    LPWSTR title = NULL;
>
> @@ -1644,6 +1646,11 @@ static LRESULT msi_dialog_oncreate(
> HWND dialog->attributes = MSI_RecordGetInteger( rec, 6 );
>  dialog->default_font = msi_dup_property( dialog->package,
>
> df ); +    if (!dialog->default_font)
> - {
> -
>    dialog->default_font = strdupW(dfv);

Thanks for tidying and submitting this, Alexandre.  Just asking; 
we are confident that strdupW is symmetric with msi_free, aren't 
we?  That was why I had the three-line "msi_strdupW"
> -
>    if (!dialog->default_font) return -1;
> -
>
> }
>
> title = msi_get_deformatted_field( dialog->package, rec,
>
> 7 ); SetWindowTextW( hwnd, title );