From 3a72a52ce886c5a1bfa1e87b1a9b759e85a5c3d4 Mon Sep 17 00:00:00 2001 From: Thamatip Chitpong Date: Tue, 21 Jun 2022 19:48:54 +0700 Subject: [PATCH] [HHCTRL.OCX] Don't break WineSync. Addendum to 65d7fb1. (#4554) Also minor code formatting for HH_LoadString. --- dll/win32/hhctrl.ocx/chm.c | 6 ++++++ dll/win32/hhctrl.ocx/help.c | 25 +++++++++++++++++++++++++ dll/win32/hhctrl.ocx/hhctrl.h | 2 ++ dll/win32/hhctrl.ocx/hhctrl.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Cs.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Da.rc | 3 ++- dll/win32/hhctrl.ocx/lang/De.rc | 3 ++- dll/win32/hhctrl.ocx/lang/El.rc | 3 ++- dll/win32/hhctrl.ocx/lang/En.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Es.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Fi.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Fr.rc | 3 ++- dll/win32/hhctrl.ocx/lang/He.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Hu.rc | 3 ++- dll/win32/hhctrl.ocx/lang/It.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ja.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ko.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Lt.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Nl.rc | 3 ++- dll/win32/hhctrl.ocx/lang/No.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Pl.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Pt.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ro.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ru.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Si.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Sq.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Sv.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Tr.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Uk.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Zh.rc | 3 ++- dll/win32/hhctrl.ocx/resource.h | 3 ++- 31 files changed, 89 insertions(+), 28 deletions(-) diff --git a/dll/win32/hhctrl.ocx/chm.c b/dll/win32/hhctrl.ocx/chm.c index 6336026b378..14ad60a8977 100644 --- a/dll/win32/hhctrl.ocx/chm.c +++ b/dll/win32/hhctrl.ocx/chm.c @@ -21,7 +21,9 @@ #include "hhctrl.h" #include "stream.h" +#ifdef __REACTOS__ #include "resource.h" +#endif #include "winreg.h" #include "shlwapi.h" @@ -460,7 +462,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) /* merge the new data with any pre-existing HH_WINTYPE structure */ MergeChmProperties(&wintype, info, FALSE); if (!info->WinType.pszCaption) +#ifdef __REACTOS__ info->WinType.pszCaption = info->stringsW.pszCaption = (info->pCHMInfo->defTitle ? strdupW(info->pCHMInfo->defTitle) : HH_LoadString(IDS_DEFTITLE)); +#else + info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : empty); +#endif if (!info->WinType.pszFile) info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : empty); if (!info->WinType.pszToc) diff --git a/dll/win32/hhctrl.ocx/help.c b/dll/win32/hhctrl.ocx/help.c index de9dc086726..9696f0b846a 100644 --- a/dll/win32/hhctrl.ocx/help.c +++ b/dll/win32/hhctrl.ocx/help.c @@ -171,6 +171,7 @@ static inline BOOL navigation_visible(HHInfo *info) } /* Loads a string from the resource file */ +#ifdef __REACTOS__ LPWSTR HH_LoadString(DWORD dwID) { LPWSTR string = NULL; @@ -179,12 +180,28 @@ LPWSTR HH_LoadString(DWORD dwID) iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); + string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ + memcpy(string, stringresource, iSize * sizeof(WCHAR)); + string[iSize] = UNICODE_NULL; + + return string; +} +#else +static LPWSTR HH_LoadString(DWORD dwID) +{ + LPWSTR string = NULL; + LPCWSTR stringresource; + int iSize; + + iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); + string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ memcpy(string, stringresource, iSize*sizeof(WCHAR)); string[iSize] = 0; return string; } +#endif static HRESULT navigate_url(HHInfo *info, LPCWSTR surl) { @@ -1620,12 +1637,20 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) wcex.cbClsExtra = 0; wcex.cbWndExtra = sizeof(LONG_PTR); wcex.hInstance = hhctrl_hinstance; +#ifdef __REACTOS__ wcex.hIcon = LoadIconW(hhctrl_hinstance, MAKEINTRESOURCEW(IDI_HHICON)); +#else + wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); +#endif wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_MENU + 1); wcex.lpszMenuName = NULL; wcex.lpszClassName = windowClassW; +#ifdef __REACTOS__ wcex.hIconSm = NULL; +#else + wcex.hIconSm = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); +#endif RegisterClassExW(&wcex); diff --git a/dll/win32/hhctrl.ocx/hhctrl.h b/dll/win32/hhctrl.ocx/hhctrl.h index f302815b45d..9b8190d510a 100644 --- a/dll/win32/hhctrl.ocx/hhctrl.h +++ b/dll/win32/hhctrl.ocx/hhctrl.h @@ -229,7 +229,9 @@ 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; +#ifdef __REACTOS__ LPWSTR HH_LoadString(DWORD dwID) DECLSPEC_HIDDEN; +#endif BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN; diff --git a/dll/win32/hhctrl.ocx/hhctrl.rc b/dll/win32/hhctrl.ocx/hhctrl.rc index f743a47239e..1a5e9ec16f6 100644 --- a/dll/win32/hhctrl.ocx/hhctrl.rc +++ b/dll/win32/hhctrl.ocx/hhctrl.rc @@ -114,9 +114,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +#ifdef __REACTOS__ /* help viewer window icon */ IDI_HHICON ICON "res/hh.ico" - +#endif /* @makedep: hhtoolbar.bmp */ IDB_HHTOOLBAR BITMAP "res/hhtoolbar.bmp" diff --git a/dll/win32/hhctrl.ocx/lang/Cs.rc b/dll/win32/hhctrl.ocx/lang/Cs.rc index ab0e3a0ad87..8495e41e184 100644 --- a/dll/win32/hhctrl.ocx/lang/Cs.rc +++ b/dll/win32/hhctrl.ocx/lang/Cs.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Obsah" IDS_INDEX "I&ndex" IDS_SEARCH "&Hledat" diff --git a/dll/win32/hhctrl.ocx/lang/Da.rc b/dll/win32/hhctrl.ocx/lang/Da.rc index a9a18b62117..807682267a6 100644 --- a/dll/win32/hhctrl.ocx/lang/Da.rc +++ b/dll/win32/hhctrl.ocx/lang/Da.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Indhold" IDS_INDEX "I&ndeks" IDS_SEARCH "&Søg" diff --git a/dll/win32/hhctrl.ocx/lang/De.rc b/dll/win32/hhctrl.ocx/lang/De.rc index a5e73a8c487..a88450e4bba 100644 --- a/dll/win32/hhctrl.ocx/lang/De.rc +++ b/dll/win32/hhctrl.ocx/lang/De.rc @@ -25,8 +25,9 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Inhalt" IDS_INDEX "I&ndex" IDS_SEARCH "&Suche" diff --git a/dll/win32/hhctrl.ocx/lang/El.rc b/dll/win32/hhctrl.ocx/lang/El.rc index ea2dba6a954..559fcbfc593 100644 --- a/dll/win32/hhctrl.ocx/lang/El.rc +++ b/dll/win32/hhctrl.ocx/lang/El.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Περιεχόμενα" IDS_INDEX "I&ndex" IDS_SEARCH "&Αναζήτηση" diff --git a/dll/win32/hhctrl.ocx/lang/En.rc b/dll/win32/hhctrl.ocx/lang/En.rc index 9be92a1ea3f..790dd4416b7 100644 --- a/dll/win32/hhctrl.ocx/lang/En.rc +++ b/dll/win32/hhctrl.ocx/lang/En.rc @@ -24,8 +24,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Contents" IDS_INDEX "I&ndex" IDS_SEARCH "&Search" diff --git a/dll/win32/hhctrl.ocx/lang/Es.rc b/dll/win32/hhctrl.ocx/lang/Es.rc index d0f52c2ba2c..879dae1e778 100644 --- a/dll/win32/hhctrl.ocx/lang/Es.rc +++ b/dll/win32/hhctrl.ocx/lang/Es.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Contenido" IDS_INDEX "Í&ndice" IDS_SEARCH "&Buscar" diff --git a/dll/win32/hhctrl.ocx/lang/Fi.rc b/dll/win32/hhctrl.ocx/lang/Fi.rc index 01627043d66..72240632ae2 100644 --- a/dll/win32/hhctrl.ocx/lang/Fi.rc +++ b/dll/win32/hhctrl.ocx/lang/Fi.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Sisällys" IDS_INDEX "&Hakemisto" IDS_SEARCH "&Etsi" diff --git a/dll/win32/hhctrl.ocx/lang/Fr.rc b/dll/win32/hhctrl.ocx/lang/Fr.rc index a564492455b..8fb8de93d10 100644 --- a/dll/win32/hhctrl.ocx/lang/Fr.rc +++ b/dll/win32/hhctrl.ocx/lang/Fr.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "Aide HTML" - +#endif IDS_CONTENTS "Somm&aire" IDS_INDEX "I&ndex" IDS_SEARCH "&Recherche" diff --git a/dll/win32/hhctrl.ocx/lang/He.rc b/dll/win32/hhctrl.ocx/lang/He.rc index f5a3c16a581..dc7a4bf9b95 100644 --- a/dll/win32/hhctrl.ocx/lang/He.rc +++ b/dll/win32/hhctrl.ocx/lang/He.rc @@ -25,8 +25,9 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "תוכ&ן" IDS_INDEX "&אינקס" IDS_SEARCH "&חפש" diff --git a/dll/win32/hhctrl.ocx/lang/Hu.rc b/dll/win32/hhctrl.ocx/lang/Hu.rc index cbb837489f3..0200ef96d06 100644 --- a/dll/win32/hhctrl.ocx/lang/Hu.rc +++ b/dll/win32/hhctrl.ocx/lang/Hu.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Tartalom" IDS_INDEX "I&ndex" IDS_SEARCH "&Keresés" diff --git a/dll/win32/hhctrl.ocx/lang/It.rc b/dll/win32/hhctrl.ocx/lang/It.rc index a9522943bef..5a934a5cca2 100644 --- a/dll/win32/hhctrl.ocx/lang/It.rc +++ b/dll/win32/hhctrl.ocx/lang/It.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Contenuti" IDS_INDEX "&Indice" IDS_SEARCH "&Ricerca" diff --git a/dll/win32/hhctrl.ocx/lang/Ja.rc b/dll/win32/hhctrl.ocx/lang/Ja.rc index 9cb0943b319..a359e8bed0c 100644 --- a/dll/win32/hhctrl.ocx/lang/Ja.rc +++ b/dll/win32/hhctrl.ocx/lang/Ja.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "目次(&C)" IDS_INDEX "索引(&N)" IDS_SEARCH "検索(&S)" diff --git a/dll/win32/hhctrl.ocx/lang/Ko.rc b/dll/win32/hhctrl.ocx/lang/Ko.rc index cdf568f5674..f158d1cc9b0 100644 --- a/dll/win32/hhctrl.ocx/lang/Ko.rc +++ b/dll/win32/hhctrl.ocx/lang/Ko.rc @@ -24,8 +24,9 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "목록(&C)" IDS_INDEX "인덱스(&N)" IDS_SEARCH "찾기(&S)" diff --git a/dll/win32/hhctrl.ocx/lang/Lt.rc b/dll/win32/hhctrl.ocx/lang/Lt.rc index b672bf3994a..c01d293968a 100644 --- a/dll/win32/hhctrl.ocx/lang/Lt.rc +++ b/dll/win32/hhctrl.ocx/lang/Lt.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Turinys" IDS_INDEX "&Rodyklė" IDS_SEARCH "&Paieška" diff --git a/dll/win32/hhctrl.ocx/lang/Nl.rc b/dll/win32/hhctrl.ocx/lang/Nl.rc index a0b78cf7dac..fb42f683b1d 100644 --- a/dll/win32/hhctrl.ocx/lang/Nl.rc +++ b/dll/win32/hhctrl.ocx/lang/Nl.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Inhoud" IDS_INDEX "I&ndex" IDS_SEARCH "&Zoeken" diff --git a/dll/win32/hhctrl.ocx/lang/No.rc b/dll/win32/hhctrl.ocx/lang/No.rc index f645af26faf..67e3385916b 100644 --- a/dll/win32/hhctrl.ocx/lang/No.rc +++ b/dll/win32/hhctrl.ocx/lang/No.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Innhold" IDS_INDEX "I&ndeks" IDS_SEARCH "&Søk" diff --git a/dll/win32/hhctrl.ocx/lang/Pl.rc b/dll/win32/hhctrl.ocx/lang/Pl.rc index dc2dc2f7d37..f3498fb9fb8 100644 --- a/dll/win32/hhctrl.ocx/lang/Pl.rc +++ b/dll/win32/hhctrl.ocx/lang/Pl.rc @@ -24,8 +24,9 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Spis treści" IDS_INDEX "&Indeks" IDS_SEARCH "&Wyszukaj" diff --git a/dll/win32/hhctrl.ocx/lang/Pt.rc b/dll/win32/hhctrl.ocx/lang/Pt.rc index c0ef9c87186..95550299352 100644 --- a/dll/win32/hhctrl.ocx/lang/Pt.rc +++ b/dll/win32/hhctrl.ocx/lang/Pt.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Conteúdos" IDS_INDEX "&Índice" IDS_SEARCH "&Pesquisar" diff --git a/dll/win32/hhctrl.ocx/lang/Ro.rc b/dll/win32/hhctrl.ocx/lang/Ro.rc index e106ffeaf94..97555fc898a 100644 --- a/dll/win32/hhctrl.ocx/lang/Ro.rc +++ b/dll/win32/hhctrl.ocx/lang/Ro.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "C&uprins" IDS_INDEX "In&dex" IDS_SEARCH "&Caută" diff --git a/dll/win32/hhctrl.ocx/lang/Ru.rc b/dll/win32/hhctrl.ocx/lang/Ru.rc index 8e8e51413d2..62cef188c06 100644 --- a/dll/win32/hhctrl.ocx/lang/Ru.rc +++ b/dll/win32/hhctrl.ocx/lang/Ru.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Содержание" IDS_INDEX "&Оглавление" IDS_SEARCH "&Поиск" diff --git a/dll/win32/hhctrl.ocx/lang/Si.rc b/dll/win32/hhctrl.ocx/lang/Si.rc index 3961f17ca97..9c62b7b77fc 100644 --- a/dll/win32/hhctrl.ocx/lang/Si.rc +++ b/dll/win32/hhctrl.ocx/lang/Si.rc @@ -25,8 +25,9 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Vsebina" IDS_INDEX "I&ndeks" IDS_SEARCH "&Iskanje" diff --git a/dll/win32/hhctrl.ocx/lang/Sq.rc b/dll/win32/hhctrl.ocx/lang/Sq.rc index 5fca78c68ec..68cab4c2103 100644 --- a/dll/win32/hhctrl.ocx/lang/Sq.rc +++ b/dll/win32/hhctrl.ocx/lang/Sq.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "Përmbajtja" IDS_INDEX "I&ndex" IDS_SEARCH "Kerko" diff --git a/dll/win32/hhctrl.ocx/lang/Sv.rc b/dll/win32/hhctrl.ocx/lang/Sv.rc index ccf488aeea9..19072bd110d 100644 --- a/dll/win32/hhctrl.ocx/lang/Sv.rc +++ b/dll/win32/hhctrl.ocx/lang/Sv.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Innehåll" IDS_INDEX "I&ndex" IDS_SEARCH "&Sök" diff --git a/dll/win32/hhctrl.ocx/lang/Tr.rc b/dll/win32/hhctrl.ocx/lang/Tr.rc index c1b4e3e1bb1..05775e0b075 100644 --- a/dll/win32/hhctrl.ocx/lang/Tr.rc +++ b/dll/win32/hhctrl.ocx/lang/Tr.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&İçindekiler" IDS_INDEX "&Dizin" IDS_SEARCH "&Ara" diff --git a/dll/win32/hhctrl.ocx/lang/Uk.rc b/dll/win32/hhctrl.ocx/lang/Uk.rc index 017786967c8..6bd8fe2650a 100644 --- a/dll/win32/hhctrl.ocx/lang/Uk.rc +++ b/dll/win32/hhctrl.ocx/lang/Uk.rc @@ -28,8 +28,9 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Зміст" IDS_INDEX "&Вказівник" IDS_SEARCH "&Пошук" diff --git a/dll/win32/hhctrl.ocx/lang/Zh.rc b/dll/win32/hhctrl.ocx/lang/Zh.rc index 39036f99e09..d45021a8c94 100644 --- a/dll/win32/hhctrl.ocx/lang/Zh.rc +++ b/dll/win32/hhctrl.ocx/lang/Zh.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "内容(&C)" IDS_INDEX "索引(&N)" IDS_SEARCH "搜索(&S)" diff --git a/dll/win32/hhctrl.ocx/resource.h b/dll/win32/hhctrl.ocx/resource.h index a47f3a4c2c5..02c5b490bbf 100644 --- a/dll/win32/hhctrl.ocx/resource.h +++ b/dll/win32/hhctrl.ocx/resource.h @@ -25,9 +25,10 @@ #include #include +#ifdef __REACTOS__ #define IDI_HHICON 100 - #define IDS_DEFTITLE 0 +#endif #define IDS_CONTENTS 1 #define IDS_INDEX 2 #define IDS_SEARCH 3 -- 2.17.1