Erich E. Hoover : hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0.

Alexandre Julliard julliard at winehq.org
Fri Jan 10 14:44:55 CST 2014


Module: wine
Branch: stable
Commit: 357fcf732d64283661f7ee3643fb7a698bf19f87
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=357fcf732d64283661f7ee3643fb7a698bf19f87

Author: Erich E. Hoover <erich.e.hoover at gmail.com>
Date:   Wed Nov  6 11:59:16 2013 -0700

hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0.

(cherry picked from commit 87b1115db1aeb39d09fa5cdf349b1c0d6fea7d9f)

---

 dlls/hhctrl.ocx/hhctrl.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c
index 3392715..8b42569 100644
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -273,6 +273,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
         url = FindContextAlias(info->pCHMInfo, data);
         if(!url)
         {
+            if(!data) /* there may legitimately be no context alias for id 0 */
+                return info->WinType.hwndHelp;
             ReleaseHelpViewer(info);
             return NULL;
         }




More information about the wine-cvs mailing list