hhctrl.ocx: Centralize merging HH_WINTYPE data.

49493645 · Erich Hoover · Alexandre Julliard · 4b67e6c7 · 49493645 · 49493645
Commit 49493645 authored Jul 25, 2012 by Erich Hoover Committed by Alexandre Julliard Aug 16, 2012
Expand all Show whitespace changes
Inline Side-by-side

Showing with 127 additions and 47 deletions

chm.c dlls/hhctrl.ocx/chm.c +126 -47

hhctrl.h dlls/hhctrl.ocx/hhctrl.h +1 -0

No files found.
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
--- a/dlls/hhctrl.ocx/hhctrl.h
+++ b/dlls/hhctrl.ocx/hhctrl.h
@@ -198,6 +198,7 @@ HHInfo *CreateHelpViewer(LPCWSTR,HWND) DECLSPEC_HIDDEN;
 void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN;
 BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN;
 BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN;
+void MergeChmProperties(HH_WINTYPEW*,HHInfo*) DECLSPEC_HIDDEN;

 void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN;
 void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN;