From 38bccbc15ef33a40f0c2a182f2a6a0af8b529de3 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 2 Jul 2009 12:33:41 +0200 Subject: [PATCH] avifil32: Build language resource files separately. Do not include them from an other rc file. --- dlls/avifil32/Makefile.in | 22 ++++++++++++++++++++++ dlls/avifil32/avifile_Cs.rc | 2 ++ dlls/avifil32/avifile_Da.rc | 2 ++ dlls/avifil32/avifile_De.rc | 2 ++ dlls/avifil32/avifile_En.rc | 2 ++ dlls/avifil32/avifile_Es.rc | 2 ++ dlls/avifil32/avifile_Fr.rc | 2 ++ dlls/avifil32/avifile_Hu.rc | 2 ++ dlls/avifil32/avifile_It.rc | 2 ++ dlls/avifil32/avifile_Ja.rc | 4 ++-- dlls/avifil32/avifile_Ko.rc | 2 ++ dlls/avifil32/avifile_Lt.rc | 4 ++-- dlls/avifil32/avifile_Nl.rc | 2 ++ dlls/avifil32/avifile_No.rc | 2 ++ dlls/avifil32/avifile_Pl.rc | 2 ++ dlls/avifil32/avifile_Pt.rc | 2 ++ dlls/avifil32/avifile_Ro.rc | 4 ++-- dlls/avifil32/avifile_Ru.rc | 2 ++ dlls/avifil32/avifile_Si.rc | 4 ++-- dlls/avifil32/avifile_Sv.rc | 2 ++ dlls/avifil32/avifile_Tr.rc | 2 ++ dlls/avifil32/avifile_Uk.rc | 1 + dlls/avifil32/avifile_Zh.rc | 4 ++-- dlls/avifil32/avifile_private.h | 3 +++ dlls/avifil32/rsrc.rc | 33 --------------------------------- 25 files changed, 68 insertions(+), 43 deletions(-) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index d645d8823f6..849bf187ab7 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -20,6 +20,28 @@ C_SRCS = \ wavfile.c RC_SRCS = \ + avifile_Cs.rc \ + avifile_Da.rc \ + avifile_De.rc \ + avifile_En.rc \ + avifile_Es.rc \ + avifile_Fr.rc \ + avifile_Hu.rc \ + avifile_It.rc \ + avifile_Ja.rc \ + avifile_Ko.rc \ + avifile_Lt.rc \ + avifile_Nl.rc \ + avifile_No.rc \ + avifile_Pl.rc \ + avifile_Pt.rc \ + avifile_Ro.rc \ + avifile_Ru.rc \ + avifile_Si.rc \ + avifile_Sv.rc \ + avifile_Tr.rc \ + avifile_Uk.rc \ + avifile_Zh.rc \ rsrc.rc @MAKE_DLL_RULES@ diff --git a/dlls/avifil32/avifile_Cs.rc b/dlls/avifil32/avifile_Cs.rc index 86dac3fdf85..180ac73838f 100644 --- a/dlls/avifil32/avifile_Cs.rc +++ b/dlls/avifil32/avifile_Cs.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/dlls/avifil32/avifile_Da.rc b/dlls/avifil32/avifile_Da.rc index 669e9185906..22f4576eb1f 100644 --- a/dlls/avifil32/avifile_Da.rc +++ b/dlls/avifil32/avifile_Da.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_De.rc b/dlls/avifil32/avifile_De.rc index 9e3e5f284d0..18c2fdf111f 100644 --- a/dlls/avifil32/avifile_De.rc +++ b/dlls/avifil32/avifile_De.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_En.rc b/dlls/avifil32/avifile_En.rc index 0947cbd47d0..71c5d3edbd9 100644 --- a/dlls/avifil32/avifile_En.rc +++ b/dlls/avifil32/avifile_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Es.rc b/dlls/avifil32/avifile_Es.rc index 45d7003fb7d..ddeee99f610 100644 --- a/dlls/avifil32/avifile_Es.rc +++ b/dlls/avifil32/avifile_Es.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Fr.rc b/dlls/avifil32/avifile_Fr.rc index 6a38721d58f..a04f0b41e06 100644 --- a/dlls/avifil32/avifile_Fr.rc +++ b/dlls/avifil32/avifile_Fr.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Hu.rc b/dlls/avifil32/avifile_Hu.rc index e9bdce9997a..6c3e9c256ff 100644 --- a/dlls/avifil32/avifile_Hu.rc +++ b/dlls/avifil32/avifile_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_It.rc b/dlls/avifil32/avifile_It.rc index 6f06ec538a8..314d34dc70b 100644 --- a/dlls/avifil32/avifile_It.rc +++ b/dlls/avifil32/avifile_It.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Ja.rc b/dlls/avifil32/avifile_Ja.rc index ab5bdfe6a7f..847a1fd471f 100644 --- a/dlls/avifil32/avifile_Ja.rc +++ b/dlls/avifil32/avifile_Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_AVIFILETYPE "Wine AVI-default-filehandler" IDS_UNCOMPRESSED "未圧縮" } - -#pragma code_page(default) diff --git a/dlls/avifil32/avifile_Ko.rc b/dlls/avifil32/avifile_Ko.rc index 46c482122ed..622880cb01b 100644 --- a/dlls/avifil32/avifile_Ko.rc +++ b/dlls/avifil32/avifile_Ko.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Lt.rc b/dlls/avifil32/avifile_Lt.rc index 51ee84d637f..e4795b5ea03 100644 --- a/dlls/avifil32/avifile_Lt.rc +++ b/dlls/avifil32/avifile_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_AVIFILETYPE "Wine numatyta-AVI-doroklė" IDS_UNCOMPRESSED "neglaudintas" } - -#pragma code_page(default) diff --git a/dlls/avifil32/avifile_Nl.rc b/dlls/avifil32/avifile_Nl.rc index b1205721871..b2546a0aaee 100644 --- a/dlls/avifil32/avifile_Nl.rc +++ b/dlls/avifil32/avifile_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_No.rc b/dlls/avifil32/avifile_No.rc index 8483ab25b14..84198511762 100644 --- a/dlls/avifil32/avifile_No.rc +++ b/dlls/avifil32/avifile_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Pl.rc b/dlls/avifil32/avifile_Pl.rc index 49abdb0c5b8..f5e8edadc50 100644 --- a/dlls/avifil32/avifile_Pl.rc +++ b/dlls/avifil32/avifile_Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Pt.rc b/dlls/avifil32/avifile_Pt.rc index 37bb941673b..ce3d032eb91 100644 --- a/dlls/avifil32/avifile_Pt.rc +++ b/dlls/avifil32/avifile_Pt.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Ro.rc b/dlls/avifil32/avifile_Ro.rc index d46e3eaec9d..6e63780045f 100644 --- a/dlls/avifil32/avifile_Ro.rc +++ b/dlls/avifil32/avifile_Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -53,5 +55,3 @@ STRINGTABLE DISCARDABLE IDS_AVIFILETYPE "Tratare implicită Wine pentru AVI" IDS_UNCOMPRESSED "necomprimat" } - -#pragma code_page(default) diff --git a/dlls/avifil32/avifile_Ru.rc b/dlls/avifil32/avifile_Ru.rc index fa8206d3824..512bf46840b 100644 --- a/dlls/avifil32/avifile_Ru.rc +++ b/dlls/avifil32/avifile_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Si.rc b/dlls/avifil32/avifile_Si.rc index 579be48d02d..0840321eaa1 100644 --- a/dlls/avifil32/avifile_Si.rc +++ b/dlls/avifil32/avifile_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_AVIFILETYPE "Wine privzeti-upravljalec-AVI-datotek" IDS_UNCOMPRESSED "nestisnjeno" } - -#pragma code_page(default) diff --git a/dlls/avifil32/avifile_Sv.rc b/dlls/avifil32/avifile_Sv.rc index f65e4d216cc..126bca6e6a1 100644 --- a/dlls/avifil32/avifile_Sv.rc +++ b/dlls/avifil32/avifile_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Tr.rc b/dlls/avifil32/avifile_Tr.rc index 451802f42bf..c5dbf6e818d 100644 --- a/dlls/avifil32/avifile_Tr.rc +++ b/dlls/avifil32/avifile_Tr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 diff --git a/dlls/avifil32/avifile_Uk.rc b/dlls/avifil32/avifile_Uk.rc index d380c8ad78c..9934ab411fa 100644 --- a/dlls/avifil32/avifile_Uk.rc +++ b/dlls/avifil32/avifile_Uk.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/dlls/avifil32/avifile_Zh.rc b/dlls/avifil32/avifile_Zh.rc index 0075ed8ecfe..5d962e7fdd5 100644 --- a/dlls/avifil32/avifile_Zh.rc +++ b/dlls/avifil32/avifile_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -86,5 +88,3 @@ STRINGTABLE DISCARDABLE IDS_AVIFILETYPE "Wine AVI-默認處理器" IDS_UNCOMPRESSED "未壓縮" } - -#pragma code_page(default) diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index db31bd497cf..0cff6ad56b9 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -19,6 +19,9 @@ #ifndef __AVIFILE_PRIVATE_H #define __AVIFILE_PRIVATE_H +#include +#include + #ifndef MAX_AVISTREAMS #define MAX_AVISTREAMS 8 #endif diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index e4363a7d7cb..6a17262b240 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -18,14 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" #include "avifile_private.h" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine AVI file support library" #define WINE_FILENAME_STR "avifil32.dll" @@ -33,30 +27,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEVERSION_STR "4.03.1998" #include "wine/wine_common_ver.rc" - -/* - * Everything specific to any language goes - * in one of the specific files. - */ -#include "avifile_Cs.rc" -#include "avifile_Da.rc" -#include "avifile_De.rc" -#include "avifile_En.rc" -#include "avifile_Es.rc" -#include "avifile_Fr.rc" -#include "avifile_Hu.rc" -#include "avifile_It.rc" -#include "avifile_Ja.rc" -#include "avifile_Ko.rc" -#include "avifile_Lt.rc" -#include "avifile_Nl.rc" -#include "avifile_No.rc" -#include "avifile_Pl.rc" -#include "avifile_Pt.rc" -#include "avifile_Ro.rc" -#include "avifile_Ru.rc" -#include "avifile_Si.rc" -#include "avifile_Sv.rc" -#include "avifile_Tr.rc" -#include "avifile_Uk.rc" -#include "avifile_Zh.rc"