From aca9acf18f4b6096f00e384fbb80398b7d5c1473 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 2 Jul 2009 00:33:11 +0200 Subject: [PATCH] appwiz.cpl: Build language resource files separately. Do not include them from an other rc file. --- dlls/appwiz.cpl/De.rc | 4 ++-- dlls/appwiz.cpl/En.rc | 2 ++ dlls/appwiz.cpl/Fr.rc | 2 ++ dlls/appwiz.cpl/Ja.rc | 4 ++-- dlls/appwiz.cpl/Ko.rc | 2 ++ dlls/appwiz.cpl/Lt.rc | 4 ++-- dlls/appwiz.cpl/Makefile.in | 16 +++++++++++++++- dlls/appwiz.cpl/Nl.rc | 2 ++ dlls/appwiz.cpl/No.rc | 2 ++ dlls/appwiz.cpl/Pt.rc | 2 ++ dlls/appwiz.cpl/Ro.rc | 4 ++-- dlls/appwiz.cpl/Ru.rc | 2 ++ dlls/appwiz.cpl/Si.rc | 4 ++-- dlls/appwiz.cpl/Zh.rc | 4 ++-- dlls/appwiz.cpl/appwiz.rc | 20 -------------------- dlls/appwiz.cpl/res.h | 4 ++++ 16 files changed, 45 insertions(+), 33 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index 47263f3b06b..65be3f745a6 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -78,5 +80,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index da34c3b66ff..1eb237353b2 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index f13797e25af..0c860b3f3fc 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc index 0dd3fdd21f6..a0e536c64bd 100644 --- a/dlls/appwiz.cpl/Ja.rc +++ b/dlls/appwiz.cpl/Ja.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + /* UTF-8 */ #pragma code_page(65001) @@ -78,5 +80,3 @@ FONT 9, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index ae417269e1f..138158bf973 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -20,6 +20,8 @@ * */ +#include "res.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc index a738828b398..6ce9038d77d 100644 --- a/dlls/appwiz.cpl/Lt.rc +++ b/dlls/appwiz.cpl/Lt.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + /* UTF-8 */ #pragma code_page(65001) @@ -79,5 +81,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 8fc65f11f5d..daf75d8ee0a 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -8,7 +8,21 @@ IMPORTS = kernel32 comctl32 advapi32 shell32 user32 comdlg32 C_SRCS = \ appwiz.c -RC_SRCS = appwiz.rc +RC_SRCS = \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Zh.rc \ + appwiz.rc @MAKE_DLL_RULES@ diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 69e049130ea..49bf8325760 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 2b15cbbbcb0..68fd1331461 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc index 31c7d8aef30..5f772da6596 100644 --- a/dlls/appwiz.cpl/Pt.rc +++ b/dlls/appwiz.cpl/Pt.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/appwiz.cpl/Ro.rc b/dlls/appwiz.cpl/Ro.rc index 0594cacd8fe..6dcc5c432f6 100644 --- a/dlls/appwiz.cpl/Ro.rc +++ b/dlls/appwiz.cpl/Ro.rc @@ -20,6 +20,8 @@ * */ +#include "res.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -79,5 +81,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index 49322e4e106..9160c226c78 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index 5b61861c365..26235b6d90a 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -78,5 +80,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Zh.rc b/dlls/appwiz.cpl/Zh.rc index 53071f795f9..d9444743ccb 100644 --- a/dlls/appwiz.cpl/Zh.rc +++ b/dlls/appwiz.cpl/Zh.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -135,5 +137,3 @@ FONT 9, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index dd8918e0509..152ea4c5a06 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -18,28 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include -#include -#include -#include #include "res.h" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - /* @makedep: appwiz.ico */ ICO_MAIN ICON "appwiz.ico" diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index 5efcee2feab..1d605d79469 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -19,6 +19,10 @@ * */ +#include +#include +#include + /* Dialogs */ #define IDD_MAIN 1