Skip to content

W
wine-winehq
Commit 5b7bd760 authored by Jaroslav Šmíd's avatar Jaroslav Šmíd Committed by Alexandre Julliard
Browse files
Options

hhctrl.ocx: Make sure pszCaption and pszFile are never 0.

parent 3ced7b8f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/hhctrl.ocx/chm.c
View file @ 5b7bd760
...@@ -238,11 +238,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) ...@@ -238,11 +238,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
info->WinType.pszIndex = strdupW(null); info->WinType.pszIndex = strdupW(null);
info->WinType.fsValidMembers=0; info->WinType.fsValidMembers=0;
info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; 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.dwStyles=WS_POPUP;
info->WinType.dwExStyles=0; info->WinType.dwExStyles=0;
info->WinType.nShowState=SW_SHOW; 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; info->WinType.curNavType=HHWIN_NAVTYPE_TOC;
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment