hhctrl.ocx: Apparently it is possible to have chm file without #STRINGS in it,…

hhctrl.ocx: Apparently it is possible to have chm file without #STRINGS in it, so we should not stop processing file at it.

hhctrl.ocx: Apparently it is possible to have chm file without #STRINGS in it,…
7a5e3d3c · Tomasz Jezierski · Alexandre Julliard · adc78836 · 7a5e3d3c
Commit 7a5e3d3c authored Apr 14, 2008 by Tomasz Jezierski Committed by Alexandre Julliard Apr 16, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

chm.c dlls/hhctrl.ocx/chm.c +2 -2

No files found.
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
@@ -229,7 +229,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
        info->WinType.cbStruct=sizeof(info->WinType);
        info->WinType.fUniCodeStrings=TRUE;
        info->WinType.pszType=strdupW(defaultwinW);
-        info->WinType.pszToc = strdupW(info->pCHMInfo->defToc);
+        info->WinType.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null);
        info->WinType.pszIndex = strdupW(null);
        info->WinType.fsValidMembers=0;
        info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE;
@@ -391,7 +391,7 @@ CHMInfo *OpenCHM(LPCWSTR szFile)
            &ret->strings_stream);
    if(FAILED(hres)) {
        WARN("Could not open #STRINGS stream: %08x\n", hres);
-        return CloseCHM(ret);
+        /* It's not critical, so we pass */
    }

    if(!ReadChmSystem(ret)) {