[hhctrl.ocx] Make sure pszCaption and pszFile are never 0

[Charles Davis]

On Jun 26, 2010, at 2:32 PM, Jaroslav Šmíd wrote:

> ---
> dlls/hhctrl.ocx/chm.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c
> index 4c85bd9..f0452fa 100644
> --- a/dlls/hhctrl.ocx/chm.c
> +++ b/dlls/hhctrl.ocx/chm.c
> @@ -238,11 +238,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
>         info->WinType.pszIndex = strdupW(null);
>         info->WinType.fsValidMembers=0;
>         info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE;
> -        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle);
> +        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle ?
> info->pCHMInfo->defTitle : null);
>         info->WinType.dwStyles=WS_POPUP;
>         info->WinType.dwExStyles=0;
>         info->WinType.nShowState=SW_SHOW;
> -        info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic);
> +        info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic ?
> info->pCHMInfo->defTopic : null);
>         info->WinType.curNavType=HHWIN_NAVTYPE_TOC;
>         return TRUE;
>     }
Your mailer mangled the patch, such that long lines are broken into two lines. THAT is what we mean by "your patch got wrapped". We can't apply your patch in this state, so you'll have to send it again after configuring your mail client not to wrap long lines.

Chip