From d66c0921086f454be4343f32108bc8f94294981e Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 3 Jul 2009 01:38:15 +0200 Subject: [PATCH] wininet: Build language resource files separately. Do not include them from an other rc file. --- dlls/wininet/Makefile.in | 28 ++++++++++++++-- dlls/wininet/resource.h | 3 ++ dlls/wininet/rsrc.rc | 67 -------------------------------------- dlls/wininet/wininet_Bg.rc | 2 ++ dlls/wininet/wininet_Cs.rc | 2 ++ dlls/wininet/wininet_Da.rc | 2 ++ dlls/wininet/wininet_De.rc | 2 ++ dlls/wininet/wininet_En.rc | 2 ++ dlls/wininet/wininet_Eo.rc | 2 ++ dlls/wininet/wininet_Es.rc | 2 ++ dlls/wininet/wininet_Fi.rc | 2 ++ dlls/wininet/wininet_Fr.rc | 2 ++ dlls/wininet/wininet_Hu.rc | 2 ++ dlls/wininet/wininet_It.rc | 2 ++ dlls/wininet/wininet_Ja.rc | 4 +-- dlls/wininet/wininet_Ko.rc | 2 ++ dlls/wininet/wininet_Lt.rc | 4 +-- dlls/wininet/wininet_Nl.rc | 2 ++ dlls/wininet/wininet_No.rc | 2 ++ dlls/wininet/wininet_Pl.rc | 2 ++ dlls/wininet/wininet_Pt.rc | 2 ++ dlls/wininet/wininet_Ro.rc | 4 +-- dlls/wininet/wininet_Ru.rc | 2 ++ dlls/wininet/wininet_Si.rc | 4 +-- dlls/wininet/wininet_Sv.rc | 2 ++ dlls/wininet/wininet_Tr.rc | 2 ++ dlls/wininet/wininet_Uk.rc | 2 ++ dlls/wininet/wininet_Zh.rc | 4 +-- 28 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 dlls/wininet/rsrc.rc diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index c7cc1e0a8c1..9872b754c5b 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -22,8 +22,32 @@ C_SRCS = \ wininet_main.c RC_SRCS = \ - rsrc.rc \ - version.rc + version.rc \ + wininet_Bg.rc \ + wininet_Cs.rc \ + wininet_Da.rc \ + wininet_De.rc \ + wininet_En.rc \ + wininet_Eo.rc \ + wininet_Es.rc \ + wininet_Fi.rc \ + wininet_Fr.rc \ + wininet_Hu.rc \ + wininet_It.rc \ + wininet_Ja.rc \ + wininet_Ko.rc \ + wininet_Lt.rc \ + wininet_Nl.rc \ + wininet_No.rc \ + wininet_Pl.rc \ + wininet_Pt.rc \ + wininet_Ro.rc \ + wininet_Ru.rc \ + wininet_Si.rc \ + wininet_Sv.rc \ + wininet_Tr.rc \ + wininet_Uk.rc \ + wininet_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/wininet/resource.h b/dlls/wininet/resource.h index 8a6e4d152e2..6cabaa0e35a 100644 --- a/dlls/wininet/resource.h +++ b/dlls/wininet/resource.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include + #define IDD_PROXYDLG 0x400 #define IDC_PROXY 0x401 diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc deleted file mode 100644 index fdf3692829f..00000000000 --- a/dlls/wininet/rsrc.rc +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Top level resource file for Wininet - * - * Copyright 2003 Mike McCormack for CodeWeavers - * - * 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 "winuser.h" -#include "winnls.h" - -#include "resource.h" - -/* - * Everything that does not depend on language, - * like textless bitmaps etc, go into the - * neutral language. This will prevent them from - * being duplicated for each language. - */ -/* #include "wininet_xx.rc" */ - -/* - * Everything specific to any language goes - * in one of the specific files. - * Note that you can and may override resources - * which also have a neutral version. This is to - * get localized bitmaps for example. - */ -#include "wininet_Bg.rc" -#include "wininet_Cs.rc" -#include "wininet_Da.rc" -#include "wininet_De.rc" -#include "wininet_En.rc" -#include "wininet_Eo.rc" -#include "wininet_Es.rc" -#include "wininet_Fi.rc" -#include "wininet_Fr.rc" -#include "wininet_Hu.rc" -#include "wininet_It.rc" -#include "wininet_Ja.rc" -#include "wininet_Ko.rc" -#include "wininet_Lt.rc" -#include "wininet_Nl.rc" -#include "wininet_No.rc" -#include "wininet_Pl.rc" -#include "wininet_Pt.rc" -#include "wininet_Ro.rc" -#include "wininet_Ru.rc" -#include "wininet_Si.rc" -#include "wininet_Sv.rc" -#include "wininet_Uk.rc" -#include "wininet_Tr.rc" -#include "wininet_Zh.rc" diff --git a/dlls/wininet/wininet_Bg.rc b/dlls/wininet/wininet_Bg.rc index 52d797ed751..b25356e074e 100644 --- a/dlls/wininet/wininet_Bg.rc +++ b/dlls/wininet/wininet_Bg.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Cs.rc b/dlls/wininet/wininet_Cs.rc index 9ca75397c4f..443c0175190 100644 --- a/dlls/wininet/wininet_Cs.rc +++ b/dlls/wininet/wininet_Cs.rc @@ -19,6 +19,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/wininet/wininet_Da.rc b/dlls/wininet/wininet_Da.rc index 515dcabd8b3..6b37857ed54 100644 --- a/dlls/wininet/wininet_Da.rc +++ b/dlls/wininet/wininet_Da.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_De.rc b/dlls/wininet/wininet_De.rc index 9fb6be58c8d..9b168b406a7 100644 --- a/dlls/wininet/wininet_De.rc +++ b/dlls/wininet/wininet_De.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_En.rc b/dlls/wininet/wininet_En.rc index 66837dabc8e..b0450af63ba 100644 --- a/dlls/wininet/wininet_En.rc +++ b/dlls/wininet/wininet_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Eo.rc b/dlls/wininet/wininet_Eo.rc index a145e263621..3fa19f37897 100644 --- a/dlls/wininet/wininet_Eo.rc +++ b/dlls/wininet/wininet_Eo.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Es.rc b/dlls/wininet/wininet_Es.rc index bbf08aeb2f6..c9ce2cebbe2 100644 --- a/dlls/wininet/wininet_Es.rc +++ b/dlls/wininet/wininet_Es.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Fi.rc b/dlls/wininet/wininet_Fi.rc index 176a00337ce..df5ca723044 100644 --- a/dlls/wininet/wininet_Fi.rc +++ b/dlls/wininet/wininet_Fi.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Fr.rc b/dlls/wininet/wininet_Fr.rc index 0435b8eb711..9458b1efda6 100644 --- a/dlls/wininet/wininet_Fr.rc +++ b/dlls/wininet/wininet_Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Hu.rc b/dlls/wininet/wininet_Hu.rc index c9704f9080b..b19e03dc007 100644 --- a/dlls/wininet/wininet_Hu.rc +++ b/dlls/wininet/wininet_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_It.rc b/dlls/wininet/wininet_It.rc index 45045460c33..911b8a9428e 100644 --- a/dlls/wininet/wininet_It.rc +++ b/dlls/wininet/wininet_It.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Ja.rc b/dlls/wininet/wininet_Ja.rc index 615d7be1c86..e179b849254 100644 --- a/dlls/wininet/wininet_Ja.rc +++ b/dlls/wininet/wininet_Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -45,5 +47,3 @@ STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN 接続" } - -#pragma code_page(default) diff --git a/dlls/wininet/wininet_Ko.rc b/dlls/wininet/wininet_Ko.rc index 26ed4a2fad2..5c2595a9b37 100644 --- a/dlls/wininet/wininet_Ko.rc +++ b/dlls/wininet/wininet_Ko.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Lt.rc b/dlls/wininet/wininet_Lt.rc index bf5dbf2f212..6cb176c296e 100644 --- a/dlls/wininet/wininet_Lt.rc +++ b/dlls/wininet/wininet_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -45,5 +47,3 @@ STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Vietinio tinklo ryšys" } - -#pragma code_page(default) diff --git a/dlls/wininet/wininet_Nl.rc b/dlls/wininet/wininet_Nl.rc index 16c80ccaad8..017bce3f34b 100644 --- a/dlls/wininet/wininet_Nl.rc +++ b/dlls/wininet/wininet_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_No.rc b/dlls/wininet/wininet_No.rc index fb885e9030d..5ba61f5e80c 100644 --- a/dlls/wininet/wininet_No.rc +++ b/dlls/wininet/wininet_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Pl.rc b/dlls/wininet/wininet_Pl.rc index 7ddb399a584..0c76d5335aa 100644 --- a/dlls/wininet/wininet_Pl.rc +++ b/dlls/wininet/wininet_Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Pt.rc b/dlls/wininet/wininet_Pt.rc index 57dd625a740..a968ab48c16 100644 --- a/dlls/wininet/wininet_Pt.rc +++ b/dlls/wininet/wininet_Pt.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Ro.rc b/dlls/wininet/wininet_Ro.rc index 367bbb5955a..2bc607a1921 100644 --- a/dlls/wininet/wininet_Ro.rc +++ b/dlls/wininet/wininet_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -45,5 +47,3 @@ STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Conexiune LAN" } - -#pragma code_page(default) diff --git a/dlls/wininet/wininet_Ru.rc b/dlls/wininet/wininet_Ru.rc index d75985ba1b7..dd8bc85fc59 100644 --- a/dlls/wininet/wininet_Ru.rc +++ b/dlls/wininet/wininet_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Si.rc b/dlls/wininet/wininet_Si.rc index 93ac9e1f33b..b5bf2914328 100644 --- a/dlls/wininet/wininet_Si.rc +++ b/dlls/wininet/wininet_Si.rc @@ -16,6 +16,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 @@ -44,5 +46,3 @@ STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN povezava" } - -#pragma code_page(default) diff --git a/dlls/wininet/wininet_Sv.rc b/dlls/wininet/wininet_Sv.rc index 6d71f2ef842..8d3291ec750 100644 --- a/dlls/wininet/wininet_Sv.rc +++ b/dlls/wininet/wininet_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Tr.rc b/dlls/wininet/wininet_Tr.rc index dd796777236..8d26cf21694 100644 --- a/dlls/wininet/wininet_Tr.rc +++ b/dlls/wininet/wininet_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Uk.rc b/dlls/wininet/wininet_Uk.rc index be58bb621f2..94a9611888b 100644 --- a/dlls/wininet/wininet_Uk.rc +++ b/dlls/wininet/wininet_Uk.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/dlls/wininet/wininet_Zh.rc b/dlls/wininet/wininet_Zh.rc index 4406bd87c1a..e2e36ded277 100644 --- a/dlls/wininet/wininet_Zh.rc +++ b/dlls/wininet/wininet_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) @@ -74,5 +76,3 @@ STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "局域網連接" } - -#pragma code_page(default)