comctl32: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Wed Jul 1 17:33:18 CDT 2009
Do not include them from an other rc file.
---
dlls/comctl32/Makefile.in | 29 ++++++++++++++++++++++++++++-
dlls/comctl32/comctl_Bg.rc | 2 ++
dlls/comctl32/comctl_Cs.rc | 2 ++
dlls/comctl32/comctl_De.rc | 2 ++
dlls/comctl32/comctl_El.rc | 2 ++
dlls/comctl32/comctl_En.rc | 2 ++
dlls/comctl32/comctl_Eo.rc | 2 ++
dlls/comctl32/comctl_Es.rc | 2 ++
dlls/comctl32/comctl_Fr.rc | 2 ++
dlls/comctl32/comctl_Hu.rc | 2 ++
dlls/comctl32/comctl_It.rc | 2 ++
dlls/comctl32/comctl_Ja.rc | 4 ++--
dlls/comctl32/comctl_Ko.rc | 2 ++
dlls/comctl32/comctl_Lt.rc | 4 ++--
dlls/comctl32/comctl_Nl.rc | 2 ++
dlls/comctl32/comctl_No.rc | 2 ++
dlls/comctl32/comctl_Pl.rc | 2 ++
dlls/comctl32/comctl_Pt.rc | 2 ++
dlls/comctl32/comctl_Ro.rc | 4 ++--
dlls/comctl32/comctl_Ru.rc | 2 ++
dlls/comctl32/comctl_Si.rc | 4 ++--
dlls/comctl32/comctl_Sk.rc | 2 ++
dlls/comctl32/comctl_Sv.rc | 2 ++
dlls/comctl32/comctl_Th.rc | 2 ++
dlls/comctl32/comctl_Tr.rc | 2 ++
dlls/comctl32/comctl_Uk.rc | 2 ++
dlls/comctl32/comctl_Zh.rc | 4 ++--
dlls/comctl32/rsrc.rc | 40 ----------------------------------------
28 files changed, 80 insertions(+), 51 deletions(-)
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index ad96a50..e6715f7 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -46,7 +46,34 @@ C_SRCS = \
treeview.c \
updown.c
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+ comctl_Bg.rc \
+ comctl_Cs.rc \
+ comctl_De.rc \
+ comctl_El.rc \
+ comctl_En.rc \
+ comctl_Eo.rc \
+ comctl_Es.rc \
+ comctl_Fr.rc \
+ comctl_Hu.rc \
+ comctl_It.rc \
+ comctl_Ja.rc \
+ comctl_Ko.rc \
+ comctl_Lt.rc \
+ comctl_Nl.rc \
+ comctl_No.rc \
+ comctl_Pl.rc \
+ comctl_Pt.rc \
+ comctl_Ro.rc \
+ comctl_Ru.rc \
+ comctl_Si.rc \
+ comctl_Sk.rc \
+ comctl_Sv.rc \
+ comctl_Th.rc \
+ comctl_Tr.rc \
+ comctl_Uk.rc \
+ comctl_Zh.rc \
+ rsrc.rc
@MAKE_DLL_RULES@
diff --git a/dlls/comctl32/comctl_Bg.rc b/dlls/comctl32/comctl_Bg.rc
index 94dd870..6c64f9a 100644
--- a/dlls/comctl32/comctl_Bg.rc
+++ b/dlls/comctl32/comctl_Bg.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Cs.rc b/dlls/comctl32/comctl_Cs.rc
index 63cc0bb..e770e33 100644
--- a/dlls/comctl32/comctl_Cs.rc
+++ b/dlls/comctl32/comctl_Cs.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc
index 831e2ee..b2c2abb 100644
--- a/dlls/comctl32/comctl_De.rc
+++ b/dlls/comctl32/comctl_De.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
diff --git a/dlls/comctl32/comctl_El.rc b/dlls/comctl32/comctl_El.rc
index a505620..de08357 100644
--- a/dlls/comctl32/comctl_El.rc
+++ b/dlls/comctl32/comctl_El.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_En.rc b/dlls/comctl32/comctl_En.rc
index 369eecd..d8055e9 100644
--- a/dlls/comctl32/comctl_En.rc
+++ b/dlls/comctl32/comctl_En.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Eo.rc b/dlls/comctl32/comctl_Eo.rc
index bda1817..59fe39e 100644
--- a/dlls/comctl32/comctl_Eo.rc
+++ b/dlls/comctl32/comctl_Eo.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Es.rc b/dlls/comctl32/comctl_Es.rc
index ea2968e..ce46217 100644
--- a/dlls/comctl32/comctl_Es.rc
+++ b/dlls/comctl32/comctl_Es.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Fr.rc b/dlls/comctl32/comctl_Fr.rc
index df56339..daa2713 100644
--- a/dlls/comctl32/comctl_Fr.rc
+++ b/dlls/comctl32/comctl_Fr.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Hu.rc b/dlls/comctl32/comctl_Hu.rc
index 6019777..2ba1160 100644
--- a/dlls/comctl32/comctl_Hu.rc
+++ b/dlls/comctl32/comctl_Hu.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_It.rc b/dlls/comctl32/comctl_It.rc
index 2b2f315..75bd9c1 100644
--- a/dlls/comctl32/comctl_It.rc
+++ b/dlls/comctl32/comctl_It.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Ja.rc b/dlls/comctl32/comctl_Ja.rc
index e3c1272..3262f33 100644
--- a/dlls/comctl32/comctl_Ja.rc
+++ b/dlls/comctl32/comctl_Ja.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE
{
HKY_NONE "None"
}
-
-#pragma code_page(default)
diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc
index 6574b66..daf9917 100644
--- a/dlls/comctl32/comctl_Ko.rc
+++ b/dlls/comctl32/comctl_Ko.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Lt.rc b/dlls/comctl32/comctl_Lt.rc
index bfe0986..f5f3294 100644
--- a/dlls/comctl32/comctl_Lt.rc
+++ b/dlls/comctl32/comctl_Lt.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE
{
HKY_NONE "Joks"
}
-
-#pragma code_page(default)
diff --git a/dlls/comctl32/comctl_Nl.rc b/dlls/comctl32/comctl_Nl.rc
index a277b0f..c89403d 100644
--- a/dlls/comctl32/comctl_Nl.rc
+++ b/dlls/comctl32/comctl_Nl.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_No.rc b/dlls/comctl32/comctl_No.rc
index 77b9ec8..6361f04 100644
--- a/dlls/comctl32/comctl_No.rc
+++ b/dlls/comctl32/comctl_No.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Pl.rc b/dlls/comctl32/comctl_Pl.rc
index 9144134..12f13a6 100644
--- a/dlls/comctl32/comctl_Pl.rc
+++ b/dlls/comctl32/comctl_Pl.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Pt.rc b/dlls/comctl32/comctl_Pt.rc
index 3ab75fd..e96d9b5 100644
--- a/dlls/comctl32/comctl_Pt.rc
+++ b/dlls/comctl32/comctl_Pt.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Ro.rc b/dlls/comctl32/comctl_Ro.rc
index 0581d0d..497f626 100644
--- a/dlls/comctl32/comctl_Ro.rc
+++ b/dlls/comctl32/comctl_Ro.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
@@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE
{
HKY_NONE "Nimic"
}
-
-#pragma code_page(default)
diff --git a/dlls/comctl32/comctl_Ru.rc b/dlls/comctl32/comctl_Ru.rc
index 2bbb513..511559b 100644
--- a/dlls/comctl32/comctl_Ru.rc
+++ b/dlls/comctl32/comctl_Ru.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Si.rc b/dlls/comctl32/comctl_Si.rc
index aa9a7b6..cc1053f 100644
--- a/dlls/comctl32/comctl_Si.rc
+++ b/dlls/comctl32/comctl_Si.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -87,5 +89,3 @@ STRINGTABLE DISCARDABLE
{
HKY_NONE "Brez"
}
-
-#pragma code_page(default)
diff --git a/dlls/comctl32/comctl_Sk.rc b/dlls/comctl32/comctl_Sk.rc
index fb5f65d..c543e37 100644
--- a/dlls/comctl32/comctl_Sk.rc
+++ b/dlls/comctl32/comctl_Sk.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
/* Slovak strings in CP1250 */
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
diff --git a/dlls/comctl32/comctl_Sv.rc b/dlls/comctl32/comctl_Sv.rc
index 2037d79..18bfefc 100644
--- a/dlls/comctl32/comctl_Sv.rc
+++ b/dlls/comctl32/comctl_Sv.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Th.rc b/dlls/comctl32/comctl_Th.rc
index 3195e1b..ff1e1fa 100644
--- a/dlls/comctl32/comctl_Th.rc
+++ b/dlls/comctl32/comctl_Th.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_THAI, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Tr.rc b/dlls/comctl32/comctl_Tr.rc
index c0f6512..cdc89ca 100644
--- a/dlls/comctl32/comctl_Tr.rc
+++ b/dlls/comctl32/comctl_Tr.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Uk.rc b/dlls/comctl32/comctl_Uk.rc
index 95e502d..608697d 100644
--- a/dlls/comctl32/comctl_Uk.rc
+++ b/dlls/comctl32/comctl_Uk.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
diff --git a/dlls/comctl32/comctl_Zh.rc b/dlls/comctl32/comctl_Zh.rc
index b6c5692..8919119 100644
--- a/dlls/comctl32/comctl_Zh.rc
+++ b/dlls/comctl32/comctl_Zh.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "comctl32.h"
+
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
@@ -161,5 +163,3 @@ STRINGTABLE DISCARDABLE
{
HKY_NONE "ç„¡"
}
-
-#pragma code_page(default)
diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc
index 1fac6d9..a8b3e96 100644
--- a/dlls/comctl32/rsrc.rc
+++ b/dlls/comctl32/rsrc.rc
@@ -19,10 +19,6 @@
* 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 "comctl32.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -80,39 +76,3 @@ IDI_TT_WARN_SM ICON LOADONCALL DISCARDABLE idi_tt_warn_sm.ico
/* @makedep: idi_tt_error_sm.ico */
IDI_TT_ERROR_SM ICON LOADONCALL DISCARDABLE idi_tt_error_sm.ico
-
-
-/*
- * 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 "comctl_Bg.rc"
-#include "comctl_Cs.rc"
-#include "comctl_De.rc"
-#include "comctl_El.rc"
-#include "comctl_En.rc"
-#include "comctl_Eo.rc"
-#include "comctl_Es.rc"
-#include "comctl_Fr.rc"
-#include "comctl_Hu.rc"
-#include "comctl_It.rc"
-#include "comctl_Ja.rc"
-#include "comctl_Ko.rc"
-#include "comctl_Lt.rc"
-#include "comctl_Nl.rc"
-#include "comctl_No.rc"
-#include "comctl_Pl.rc"
-#include "comctl_Pt.rc"
-#include "comctl_Ro.rc"
-#include "comctl_Ru.rc"
-#include "comctl_Si.rc"
-#include "comctl_Sk.rc"
-#include "comctl_Sv.rc"
-#include "comctl_Th.rc"
-#include "comctl_Tr.rc"
-#include "comctl_Uk.rc"
-#include "comctl_Zh.rc"
--
1.6.3.3
More information about the wine-patches
mailing list