Module: wine Branch: master Commit: aca9acf18f4b6096f00e384fbb80398b7d5c1473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca9acf18f4b6096f00e384fbb...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:33:11 2009 +0200
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 47263f3..65be3f7 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 da34c3b..1eb2373 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 f13797e..0c860b3 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 0dd3fdd..a0e536c 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 ae41726..138158b 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 a738828..6ce9038 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 8fc65f1..daf75d8 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 69e0491..49bf832 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 2b15cbb..68fd133 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 31c7d8a..5f772da 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 0594cac..6dcc5c4 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 49322e4..9160c22 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 5b61861..26235b6 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 53071f7..d944474 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 dd8918e..152ea4c 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 <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h>
#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 5efcee2..1d605d7 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -19,6 +19,10 @@ * */
+#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + /* Dialogs */
#define IDD_MAIN 1