[HHCTRL.OCX] Add help viewer window icon and default title (#4541)

2024-06-26 07:51:52 +00:00 · 2022-06-20 02:22:28 +07:00 · 2022-06-20 02:22:28 +07:00 · 65d7fb1a82
parent a50d309c48
commit 65d7fb1a82
32 changed files with 64 additions and 4 deletions
--- a/dll/win32/hhctrl.ocx/chm.c
+++ b/dll/win32/hhctrl.ocx/chm.c
@ -21,6 +21,7 @@

 #include "hhctrl.h"
 #include "stream.h"
+#include "resource.h"

 #include "winreg.h"
 #include "shlwapi.h"
@ -459,7 +460,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
    /* merge the new data with any pre-existing HH_WINTYPE structure */
    MergeChmProperties(&wintype, info, FALSE);
    if (!info->WinType.pszCaption)
-        info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : empty);
+        info->WinType.pszCaption = info->stringsW.pszCaption = (info->pCHMInfo->defTitle ? strdupW(info->pCHMInfo->defTitle) : HH_LoadString(IDS_DEFTITLE));
    if (!info->WinType.pszFile)
        info->WinType.pszFile    = info->stringsW.pszFile    = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : empty);
    if (!info->WinType.pszToc)
--- a/dll/win32/hhctrl.ocx/help.c
+++ b/dll/win32/hhctrl.ocx/help.c
@ -171,7 +171,7 @@ static inline BOOL navigation_visible(HHInfo *info)
 }

 /* Loads a string from the resource file */
-static LPWSTR HH_LoadString(DWORD dwID)
+LPWSTR HH_LoadString(DWORD dwID)
 {
    LPWSTR string = NULL;
    LPCWSTR stringresource;
@ -1620,12 +1620,12 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
    wcex.cbClsExtra     = 0;
    wcex.cbWndExtra     = sizeof(LONG_PTR);
    wcex.hInstance      = hhctrl_hinstance;
-    wcex.hIcon          = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION);
+    wcex.hIcon          = LoadIconW(hhctrl_hinstance, MAKEINTRESOURCEW(IDI_HHICON));
    wcex.hCursor        = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW);
    wcex.hbrBackground  = (HBRUSH)(COLOR_MENU + 1);
    wcex.lpszMenuName   = NULL;
    wcex.lpszClassName  = windowClassW;
-    wcex.hIconSm        = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION);
+    wcex.hIconSm        = NULL;

    RegisterClassExW(&wcex);

--- a/dll/win32/hhctrl.ocx/hhctrl.h
+++ b/dll/win32/hhctrl.ocx/hhctrl.h
@ -229,6 +229,7 @@ WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN;
 extern struct list window_list DECLSPEC_HIDDEN;
 HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN;
 void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN;
+LPWSTR HH_LoadString(DWORD dwID) DECLSPEC_HIDDEN;
 BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN;
 BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN;
 void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN;
--- a/dll/win32/hhctrl.ocx/hhctrl.rc
+++ b/dll/win32/hhctrl.ocx/hhctrl.rc
@ -114,6 +114,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

 #include "wine/wine_common_ver.rc"

+/* help viewer window icon */
+IDI_HHICON ICON "res/hh.ico"
+
 /* @makedep: hhtoolbar.bmp */
 IDB_HHTOOLBAR BITMAP "res/hhtoolbar.bmp"

--- a/dll/win32/hhctrl.ocx/lang/Cs.rc
+++ b/dll/win32/hhctrl.ocx/lang/Cs.rc
@ -27,6 +27,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Obsah"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Hledat"
--- a/dll/win32/hhctrl.ocx/lang/Da.rc
+++ b/dll/win32/hhctrl.ocx/lang/Da.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Indhold"
    IDS_INDEX        "I&ndeks"
    IDS_SEARCH       "&Søg"
--- a/dll/win32/hhctrl.ocx/lang/De.rc
+++ b/dll/win32/hhctrl.ocx/lang/De.rc
@ -25,6 +25,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Inhalt"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Suche"
--- a/dll/win32/hhctrl.ocx/lang/El.rc
+++ b/dll/win32/hhctrl.ocx/lang/El.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Περιεχόμενα"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Αναζήτηση"
--- a/dll/win32/hhctrl.ocx/lang/En.rc
+++ b/dll/win32/hhctrl.ocx/lang/En.rc
@ -24,6 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Contents"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Search"
--- a/dll/win32/hhctrl.ocx/lang/Es.rc
+++ b/dll/win32/hhctrl.ocx/lang/Es.rc
@ -26,6 +26,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Contenido"
    IDS_INDEX        "Í&ndice"
    IDS_SEARCH       "&Buscar"
--- a/dll/win32/hhctrl.ocx/lang/Fi.rc
+++ b/dll/win32/hhctrl.ocx/lang/Fi.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Sisällys"
    IDS_INDEX        "&Hakemisto"
    IDS_SEARCH       "&Etsi"
--- a/dll/win32/hhctrl.ocx/lang/Fr.rc
+++ b/dll/win32/hhctrl.ocx/lang/Fr.rc
@ -26,6 +26,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "Aide HTML"
+
    IDS_CONTENTS     "Somm&aire"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Recherche"
--- a/dll/win32/hhctrl.ocx/lang/He.rc
+++ b/dll/win32/hhctrl.ocx/lang/He.rc
@ -25,6 +25,8 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "תוכ&ן"
    IDS_INDEX        "&אינקס"
    IDS_SEARCH       "&חפש"
--- a/dll/win32/hhctrl.ocx/lang/Hu.rc
+++ b/dll/win32/hhctrl.ocx/lang/Hu.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Tartalom"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Keresés"
--- a/dll/win32/hhctrl.ocx/lang/It.rc
+++ b/dll/win32/hhctrl.ocx/lang/It.rc
@ -27,6 +27,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Contenuti"
    IDS_INDEX        "&Indice"
    IDS_SEARCH       "&Ricerca"
--- a/dll/win32/hhctrl.ocx/lang/Ja.rc
+++ b/dll/win32/hhctrl.ocx/lang/Ja.rc
@ -27,6 +27,8 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "目次(&C)"
    IDS_INDEX        "索引(&N)"
    IDS_SEARCH       "検索(&S)"
--- a/dll/win32/hhctrl.ocx/lang/Ko.rc
+++ b/dll/win32/hhctrl.ocx/lang/Ko.rc
@ -24,6 +24,8 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "목록(&C)"
    IDS_INDEX        "인덱스(&N)"
    IDS_SEARCH       "찾기(&S)"
--- a/dll/win32/hhctrl.ocx/lang/Lt.rc
+++ b/dll/win32/hhctrl.ocx/lang/Lt.rc
@ -26,6 +26,8 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Turinys"
    IDS_INDEX        "&Rodyklė"
    IDS_SEARCH       "&Paieška"
--- a/dll/win32/hhctrl.ocx/lang/Nl.rc
+++ b/dll/win32/hhctrl.ocx/lang/Nl.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Inhoud"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Zoeken"
--- a/dll/win32/hhctrl.ocx/lang/No.rc
+++ b/dll/win32/hhctrl.ocx/lang/No.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Innhold"
    IDS_INDEX        "I&ndeks"
    IDS_SEARCH       "&Søk"
--- a/dll/win32/hhctrl.ocx/lang/Pl.rc
+++ b/dll/win32/hhctrl.ocx/lang/Pl.rc
@ -24,6 +24,8 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Spis treści"
    IDS_INDEX        "&Indeks"
    IDS_SEARCH       "&Wyszukaj"
--- a/dll/win32/hhctrl.ocx/lang/Pt.rc
+++ b/dll/win32/hhctrl.ocx/lang/Pt.rc
@ -26,6 +26,8 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Conteúdos"
    IDS_INDEX        "&Índice"
    IDS_SEARCH       "&Pesquisar"
--- a/dll/win32/hhctrl.ocx/lang/Ro.rc
+++ b/dll/win32/hhctrl.ocx/lang/Ro.rc
@ -27,6 +27,8 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "C&uprins"
    IDS_INDEX        "In&dex"
    IDS_SEARCH       "&Caută"
--- a/dll/win32/hhctrl.ocx/lang/Ru.rc
+++ b/dll/win32/hhctrl.ocx/lang/Ru.rc
@ -26,6 +26,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Содержание"
    IDS_INDEX        "&Оглавление"
    IDS_SEARCH       "&Поиск"
--- a/dll/win32/hhctrl.ocx/lang/Si.rc
+++ b/dll/win32/hhctrl.ocx/lang/Si.rc
@ -25,6 +25,8 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Vsebina"
    IDS_INDEX        "I&ndeks"
    IDS_SEARCH       "&Iskanje"
--- a/dll/win32/hhctrl.ocx/lang/Sq.rc
+++ b/dll/win32/hhctrl.ocx/lang/Sq.rc
@ -26,6 +26,8 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "Përmbajtja"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "Kerko"
--- a/dll/win32/hhctrl.ocx/lang/Sv.rc
+++ b/dll/win32/hhctrl.ocx/lang/Sv.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Innehåll"
    IDS_INDEX        "I&ndex"
    IDS_SEARCH       "&Sök"
--- a/dll/win32/hhctrl.ocx/lang/Tr.rc
+++ b/dll/win32/hhctrl.ocx/lang/Tr.rc
@ -23,6 +23,8 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&İçindekiler"
    IDS_INDEX        "&Dizin"
    IDS_SEARCH       "&Ara"
--- a/dll/win32/hhctrl.ocx/lang/Uk.rc
+++ b/dll/win32/hhctrl.ocx/lang/Uk.rc
@ -28,6 +28,8 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "&Зміст"
    IDS_INDEX        "&Вказівник"
    IDS_SEARCH       "&Пошук"
--- a/dll/win32/hhctrl.ocx/lang/Zh.rc
+++ b/dll/win32/hhctrl.ocx/lang/Zh.rc
@ -26,6 +26,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

 STRINGTABLE
 BEGIN
+    IDS_DEFTITLE     "HTML Help"
+
    IDS_CONTENTS     "内容(&C)"
    IDS_INDEX        "索引(&N)"
    IDS_SEARCH       "搜索(&S)"
--- a/dll/win32/hhctrl.ocx/res/hh.ico
+++ b/dll/win32/hhctrl.ocx/res/hh.ico
--- a/dll/win32/hhctrl.ocx/resource.h
+++ b/dll/win32/hhctrl.ocx/resource.h
@ -25,6 +25,9 @@
 #include <wingdi.h>
 #include <htmlhelp.h>

+#define IDI_HHICON      100
+
+#define IDS_DEFTITLE    0
 #define IDS_CONTENTS    1
 #define IDS_INDEX       2
 #define IDS_SEARCH      3