From 0b16b40148f03318281a8b5ac67a5b4953b25e56 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 3 Jul 2009 01:38:04 +0200 Subject: [PATCH] winmm: Build language resource files separately. Do not include them from an other rc file. --- dlls/winmm/Makefile.in | 21 ++++++++++++++++++++- dlls/winmm/winmm_Cs.rc | 3 +++ dlls/winmm/winmm_Da.rc | 3 +++ dlls/winmm/winmm_De.rc | 3 +++ dlls/winmm/winmm_En.rc | 3 +++ dlls/winmm/winmm_Es.rc | 3 +++ dlls/winmm/winmm_Fr.rc | 3 +++ dlls/winmm/winmm_It.rc | 3 +++ dlls/winmm/winmm_Ja.rc | 5 +++-- dlls/winmm/winmm_Ko.rc | 3 +++ dlls/winmm/winmm_Lt.rc | 5 +++-- dlls/winmm/winmm_Nl.rc | 3 +++ dlls/winmm/winmm_No.rc | 3 +++ dlls/winmm/winmm_Pl.rc | 3 +++ dlls/winmm/winmm_Pt.rc | 3 +++ dlls/winmm/winmm_Ru.rc | 3 +++ dlls/winmm/winmm_Si.rc | 5 +++-- dlls/winmm/winmm_Sk.rc | 3 +++ dlls/winmm/winmm_Tr.rc | 3 +++ dlls/winmm/winmm_res.rc | 24 ------------------------ 20 files changed, 74 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index a8ebc62e32b..64c7b5b4803 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -24,7 +24,26 @@ C_SRCS16 = \ SPEC_SRCS16 = \ mmsystem.spec -RC_SRCS = winmm_res.rc +RC_SRCS = \ + winmm_Cs.rc \ + winmm_Da.rc \ + winmm_De.rc \ + winmm_En.rc \ + winmm_Es.rc \ + winmm_Fr.rc \ + winmm_It.rc \ + winmm_Ja.rc \ + winmm_Ko.rc \ + winmm_Lt.rc \ + winmm_Nl.rc \ + winmm_No.rc \ + winmm_Pl.rc \ + winmm_Pt.rc \ + winmm_Ru.rc \ + winmm_Si.rc \ + winmm_Sk.rc \ + winmm_Tr.rc \ + winmm_res.rc @MAKE_DLL_RULES@ diff --git a/dlls/winmm/winmm_Cs.rc b/dlls/winmm/winmm_Cs.rc index aa4cd639fd0..36604d455fe 100644 --- a/dlls/winmm/winmm_Cs.rc +++ b/dlls/winmm/winmm_Cs.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* Czech strings in CP1250 */ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL diff --git a/dlls/winmm/winmm_Da.rc b/dlls/winmm/winmm_Da.rc index feeb9de7abf..7f55353ea7f 100644 --- a/dlls/winmm/winmm_Da.rc +++ b/dlls/winmm/winmm_Da.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_De.rc b/dlls/winmm/winmm_De.rc index 4b16e17ecf6..1ba3cae6575 100644 --- a/dlls/winmm/winmm_De.rc +++ b/dlls/winmm/winmm_De.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index dd3e56cc45a..1a945d880d0 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_Es.rc b/dlls/winmm/winmm_Es.rc index 5d22f7bf8b0..8713075adf8 100644 --- a/dlls/winmm/winmm_Es.rc +++ b/dlls/winmm/winmm_Es.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Fr.rc b/dlls/winmm/winmm_Fr.rc index de66778a77f..665988ef21f 100644 --- a/dlls/winmm/winmm_Fr.rc +++ b/dlls/winmm/winmm_Fr.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/winmm/winmm_It.rc b/dlls/winmm/winmm_It.rc index 91d5818d906..f4c2fa078f9 100644 --- a/dlls/winmm/winmm_It.rc +++ b/dlls/winmm/winmm_It.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Ja.rc b/dlls/winmm/winmm_Ja.rc index 1805ac866c0..b8f1c53cee5 100644 --- a/dlls/winmm/winmm_Ja.rc +++ b/dlls/winmm/winmm_Ja.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* UTF-8 */ #pragma code_page(65001) @@ -127,5 +130,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "システムに現在のMIDIポートが指定さ MCIERR_SEQ_TIMER, "全てのマルチメディアタイマは他のアプリケーションによって使用されています。タイマを使用しているアプリケーションを一つ終了してからやり直して下さい。" END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Ko.rc b/dlls/winmm/winmm_Ko.rc index 1d5c074baa9..bf7c8a50a4d 100644 --- a/dlls/winmm/winmm_Ko.rc +++ b/dlls/winmm/winmm_Ko.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_Lt.rc b/dlls/winmm/winmm_Lt.rc index 4988036c7f9..6cb9981e1a8 100644 --- a/dlls/winmm/winmm_Lt.rc +++ b/dlls/winmm/winmm_Lt.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* UTF-8 */ #pragma code_page(65001) @@ -129,5 +132,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "Sistemoje nėra nurodytas dabartinis MIDI prie MCIERR_SEQ_TIMER, "Visi įvairialypės terpės laikmačiai yra naudojami kitų programų. Išeikite iš vienos tokios programos ir mėginkite vėl." END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Nl.rc b/dlls/winmm/winmm_Nl.rc index 15f15353976..ef8a7ada3f1 100644 --- a/dlls/winmm/winmm_Nl.rc +++ b/dlls/winmm/winmm_Nl.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_No.rc b/dlls/winmm/winmm_No.rc index e2cbc30a194..511e4b3841d 100644 --- a/dlls/winmm/winmm_No.rc +++ b/dlls/winmm/winmm_No.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL BEGIN diff --git a/dlls/winmm/winmm_Pl.rc b/dlls/winmm/winmm_Pl.rc index c57c48b7d9a..5abf3f55765 100644 --- a/dlls/winmm/winmm_Pl.rc +++ b/dlls/winmm/winmm_Pl.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Pt.rc b/dlls/winmm/winmm_Pt.rc index 2da48d8d890..52adb076eeb 100644 --- a/dlls/winmm/winmm_Pt.rc +++ b/dlls/winmm/winmm_Pt.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN BEGIN diff --git a/dlls/winmm/winmm_Ru.rc b/dlls/winmm/winmm_Ru.rc index 9824cc5a271..3392260c06f 100644 --- a/dlls/winmm/winmm_Ru.rc +++ b/dlls/winmm/winmm_Ru.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Si.rc b/dlls/winmm/winmm_Si.rc index 04e6e1bb0c3..918e7f11ab7 100644 --- a/dlls/winmm/winmm_Si.rc +++ b/dlls/winmm/winmm_Si.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + #pragma code_page(65001) STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -126,5 +129,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "Zahtevana MIDI vrata niso nameščena." MCIERR_SEQ_TIMER, "Vsi većpredstavnostni števci so zasedeni. Zaprite enega od večpredstavnostih programov in poskusite znova." END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index 80030c26cb8..d9345eccbc3 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Tr.rc b/dlls/winmm/winmm_Tr.rc index 36d5693a880..6c8a73ee188 100644 --- a/dlls/winmm/winmm_Tr.rc +++ b/dlls/winmm/winmm_Tr.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index 676c185bf99..808220d8fba 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -23,31 +23,7 @@ */ #include "windef.h" -#include "winbase.h" #include "mmddk.h" -#include "winnls.h" - -/* Add your language specific defines here */ -#include "winmm_Cs.rc" -#include "winmm_Da.rc" -#include "winmm_De.rc" -#include "winmm_En.rc" -#include "winmm_Es.rc" -#include "winmm_Fr.rc" -#include "winmm_It.rc" -#include "winmm_Ko.rc" -#include "winmm_Lt.rc" -#include "winmm_Ja.rc" -#include "winmm_Nl.rc" -#include "winmm_No.rc" -#include "winmm_Pl.rc" -#include "winmm_Pt.rc" -#include "winmm_Ru.rc" -#include "winmm_Si.rc" -#include "winmm_Sk.rc" -#include "winmm_Tr.rc" - -/* do not add NLS specific stuff below that line */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL