diff --git a/dlls/hhctrl.ocx/Cs.rc b/dlls/hhctrl.ocx/Cs.rc index ec564d830d1..b9147627278 100644 --- a/dlls/hhctrl.ocx/Cs.rc +++ b/dlls/hhctrl.ocx/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/dlls/hhctrl.ocx/Da.rc b/dlls/hhctrl.ocx/Da.rc index e425ef0e567..1832d71c334 100644 --- a/dlls/hhctrl.ocx/Da.rc +++ b/dlls/hhctrl.ocx/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/De.rc b/dlls/hhctrl.ocx/De.rc index ef6e6997bd5..72549021f82 100644 --- a/dlls/hhctrl.ocx/De.rc +++ b/dlls/hhctrl.ocx/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/El.rc b/dlls/hhctrl.ocx/El.rc index dd81eb68da2..4fa79a2dcd8 100644 --- a/dlls/hhctrl.ocx/El.rc +++ b/dlls/hhctrl.ocx/El.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/En.rc b/dlls/hhctrl.ocx/En.rc index 83917f6e3d6..95ccd51813f 100644 --- a/dlls/hhctrl.ocx/En.rc +++ b/dlls/hhctrl.ocx/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Fi.rc b/dlls/hhctrl.ocx/Fi.rc index 975ce1f49aa..825422e57d6 100644 --- a/dlls/hhctrl.ocx/Fi.rc +++ b/dlls/hhctrl.ocx/Fi.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Fr.rc b/dlls/hhctrl.ocx/Fr.rc index 0e5dd4f9591..206479eb7af 100644 --- a/dlls/hhctrl.ocx/Fr.rc +++ b/dlls/hhctrl.ocx/Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Hu.rc b/dlls/hhctrl.ocx/Hu.rc index 225c04a82d7..0cab8cdae81 100644 --- a/dlls/hhctrl.ocx/Hu.rc +++ b/dlls/hhctrl.ocx/Hu.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Ko.rc b/dlls/hhctrl.ocx/Ko.rc index 169eb70e472..37831dfcb7c 100644 --- a/dlls/hhctrl.ocx/Ko.rc +++ b/dlls/hhctrl.ocx/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Lt.rc b/dlls/hhctrl.ocx/Lt.rc index fed6b40e400..8c813ba1ef1 100644 --- a/dlls/hhctrl.ocx/Lt.rc +++ b/dlls/hhctrl.ocx/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -59,5 +61,3 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 229bd2abaf8..60f2c507ba2 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -13,7 +13,27 @@ C_SRCS = \ regsvr.c \ webbrowser.c -RC_SRCS = hhctrl.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + El.rc \ + En.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/hhctrl.ocx/Nl.rc b/dlls/hhctrl.ocx/Nl.rc index 929ac39f6da..99c12faf10d 100644 --- a/dlls/hhctrl.ocx/Nl.rc +++ b/dlls/hhctrl.ocx/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/No.rc b/dlls/hhctrl.ocx/No.rc index 5ff634d02df..a76ad3147a7 100644 --- a/dlls/hhctrl.ocx/No.rc +++ b/dlls/hhctrl.ocx/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Pl.rc b/dlls/hhctrl.ocx/Pl.rc index 40d3089af84..f3ce6f2c76c 100644 --- a/dlls/hhctrl.ocx/Pl.rc +++ b/dlls/hhctrl.ocx/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Pt.rc b/dlls/hhctrl.ocx/Pt.rc index d196ff499b9..13476ce843f 100644 --- a/dlls/hhctrl.ocx/Pt.rc +++ b/dlls/hhctrl.ocx/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Ru.rc b/dlls/hhctrl.ocx/Ru.rc index a530f80b637..9d16db16ea9 100644 --- a/dlls/hhctrl.ocx/Ru.rc +++ b/dlls/hhctrl.ocx/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Si.rc b/dlls/hhctrl.ocx/Si.rc index c8ea447f5ed..bc8ca1d3705 100644 --- a/dlls/hhctrl.ocx/Si.rc +++ b/dlls/hhctrl.ocx/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -58,5 +60,3 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/Sv.rc b/dlls/hhctrl.ocx/Sv.rc index cb3e4e26a5d..b92c63c2bbd 100644 --- a/dlls/hhctrl.ocx/Sv.rc +++ b/dlls/hhctrl.ocx/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Tr.rc b/dlls/hhctrl.ocx/Tr.rc index 748899908f7..f1011b1dc48 100644 --- a/dlls/hhctrl.ocx/Tr.rc +++ b/dlls/hhctrl.ocx/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Zh.rc b/dlls/hhctrl.ocx/Zh.rc index a7ccab0da74..d6295a96d20 100644 --- a/dlls/hhctrl.ocx/Zh.rc +++ b/dlls/hhctrl.ocx/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -96,5 +98,3 @@ BEGIN IDTB_TOC_NEXT "後一項" IDTB_TOC_PREV "前一項" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc deleted file mode 100644 index 8618819ed12..00000000000 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ /dev/null @@ -1,50 +0,0 @@ -/* - * HTML Help resources - * - * Copyright 2005 James Hawkins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "htmlhelp.h" -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "version.rc" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "El.rc" -#include "En.rc" -#include "Fr.rc" -#include "Fi.rc" -#include "Hu.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 02df94641e9..a08fdd96eb8 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include +#include +#include + #define IDS_CONTENTS 1 #define IDS_INDEX 2 #define IDS_SEARCH 3