Apparently it is possible to have chm file without #STRINGS in it, so we should not stop processing file at it. Fixes bug #12498

Tomasz Jezierski - Tefnet developers at tefnet.pl
Mon Apr 14 16:07:59 CDT 2008


---
 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 ece05f0..f02866f 100644
--- 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)) {
-- 
1.5.3.7


--=-+m3QJ4EHQ8LAKNgtVR/z--




More information about the wine-patches mailing list