user32: Build language resource files separately.

Do not include them from an other rc file.
2024-10-31 10:41:12 +00:00 · 2009-07-03 01:38:57 +02:00 · 2009-07-03 01:38:57 +02:00 · 3090323c89
commit 3090323c89
parent e801cae520
33 changed files with 118 additions and 87 deletions
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@ -68,7 +68,37 @@ C_SRCS16 = \
 	user16.c \
 	wnd16.c

-RC_SRCS = resources/user32.rc
+RC_SRCS = \
+	resources/user32_Bg.rc \
+	resources/user32_Ca.rc \
+	resources/user32_Cs.rc \
+	resources/user32_Da.rc \
+	resources/user32_De.rc \
+	resources/user32_En.rc \
+	resources/user32_Eo.rc \
+	resources/user32_Es.rc \
+	resources/user32_Fi.rc \
+	resources/user32_Fr.rc \
+	resources/user32_Hu.rc \
+	resources/user32_It.rc \
+	resources/user32_Ja.rc \
+	resources/user32_Ko.rc \
+	resources/user32_Lt.rc \
+	resources/user32_Nl.rc \
+	resources/user32_No.rc \
+	resources/user32_Pl.rc \
+	resources/user32_Pt.rc \
+	resources/user32_Ro.rc \
+	resources/user32_Ru.rc \
+	resources/user32_Si.rc \
+	resources/user32_Sk.rc \
+	resources/user32_Sv.rc \
+	resources/user32_Tr.rc \
+	resources/user32_Uk.rc \
+	resources/user32_Wa.rc \
+	resources/user32_Zh.rc \
+	resources/user32_bin.rc \
+	resources/version.rc

 SVG_SRCS = resources/oic_winlogo.svg

--- a/dlls/user32/resources.h
+++ b/dlls/user32/resources.h
@ -0,0 +1,28 @@
+/*
+ * Copyright 1999 Bertho Stultiens
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define OEMRESOURCE
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winnls.h>
+#include <dlgs.h>
+
+#define MDI_IDC_LISTBOX         100
+#define IDS_MDI_MOREWINDOWS     13
+#define IDS_ERROR               2
--- a/dlls/user32/resources/user32.rc
+++ b/dlls/user32/resources/user32.rc
@ -1,76 +0,0 @@
-/*
- * Top level resource file for USER
- *
- * Copyright 1999 Bertho Stultiens
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define OEMRESOURCE
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "dlgs.h"
-
-#define MDI_IDC_LISTBOX         100
-#define IDS_MDI_MOREWINDOWS     13
-#define IDS_ERROR               2
-
-/*
- * Everything that does not depend on language,
- * like textless bitmaps etc, go into the
- * neutral language. This will prevent them from
- * being duplicated for each language.
- */
-#include "resources/user32_bin.rc"
-
-/*
- * 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 "resources/user32_Bg.rc"
-#include "resources/user32_Ca.rc"
-#include "resources/user32_Cs.rc"
-#include "resources/user32_Da.rc"
-#include "resources/user32_De.rc"
-#include "resources/user32_En.rc"
-#include "resources/user32_Eo.rc"
-#include "resources/user32_Es.rc"
-#include "resources/user32_Fi.rc"
-#include "resources/user32_Fr.rc"
-#include "resources/user32_Hu.rc"
-#include "resources/user32_It.rc"
-#include "resources/user32_Ko.rc"
-#include "resources/user32_Lt.rc"
-#include "resources/user32_Nl.rc"
-#include "resources/user32_No.rc"
-#include "resources/user32_Pl.rc"
-#include "resources/user32_Pt.rc"
-#include "resources/user32_Ro.rc"
-#include "resources/user32_Ru.rc"
-#include "resources/user32_Si.rc"
-#include "resources/user32_Sk.rc"
-#include "resources/user32_Sv.rc"
-#include "resources/user32_Tr.rc"
-#include "resources/user32_Uk.rc"
-#include "resources/user32_Wa.rc"
-#include "resources/user32_Ja.rc"
-#include "resources/user32_Zh.rc"
-
-#include "resources/version.rc"
--- a/dlls/user32/resources/user32_Bg.rc
+++ b/dlls/user32/resources/user32_Bg.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Ca.rc
+++ b/dlls/user32/resources/user32_Ca.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Cs.rc
+++ b/dlls/user32/resources/user32_Cs.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 /* Czech strings in CP1250 */
--- a/dlls/user32/resources/user32_Da.rc
+++ b/dlls/user32/resources/user32_Da.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_De.rc
+++ b/dlls/user32/resources/user32_De.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_En.rc
+++ b/dlls/user32/resources/user32_En.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Eo.rc
+++ b/dlls/user32/resources/user32_Eo.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Es.rc
+++ b/dlls/user32/resources/user32_Es.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Fi.rc
+++ b/dlls/user32/resources/user32_Fi.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Fr.rc
+++ b/dlls/user32/resources/user32_Fr.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Hu.rc
+++ b/dlls/user32/resources/user32_Hu.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_It.rc
+++ b/dlls/user32/resources/user32_It.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Ja.rc
+++ b/dlls/user32/resources/user32_Ja.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 /* UTF-8 */
 #pragma code_page(65001)

@ -83,5 +85,3 @@ STRINGTABLE DISCARDABLE
    IDS_ERROR "エラー"
    IDS_MDI_MOREWINDOWS "&More Windows..."
 }
-
-#pragma code_page(default)
--- a/dlls/user32/resources/user32_Ko.rc
+++ b/dlls/user32/resources/user32_Ko.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Lt.rc
+++ b/dlls/user32/resources/user32_Lt.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 /* UTF-8 */
 #pragma code_page(65001)

@ -82,5 +84,3 @@ STRINGTABLE DISCARDABLE
    IDS_ERROR "Klaida"
    IDS_MDI_MOREWINDOWS "&Daugiau langų..."
 }
-
-#pragma code_page(default)
--- a/dlls/user32/resources/user32_Nl.rc
+++ b/dlls/user32/resources/user32_Nl.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_No.rc
+++ b/dlls/user32/resources/user32_No.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Pl.rc
+++ b/dlls/user32/resources/user32_Pl.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Pt.rc
+++ b/dlls/user32/resources/user32_Pt.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Ro.rc
+++ b/dlls/user32/resources/user32_Ro.rc
@ -17,6 +17,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 #pragma code_page(65001)
@ -82,5 +84,3 @@ STRINGTABLE DISCARDABLE
    IDS_ERROR "Eroare"
    IDS_MDI_MOREWINDOWS "&Mai multe ferestre..."
 }
-
-#pragma code_page(default)
--- a/dlls/user32/resources/user32_Ru.rc
+++ b/dlls/user32/resources/user32_Ru.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Si.rc
+++ b/dlls/user32/resources/user32_Si.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 #pragma code_page(65001)

 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@ -81,5 +83,3 @@ STRINGTABLE DISCARDABLE
    IDS_ERROR "Napaka"
    IDS_MDI_MOREWINDOWS "&Več oken ..."
 }
-
-#pragma code_page(default)
--- a/dlls/user32/resources/user32_Sk.rc
+++ b/dlls/user32/resources/user32_Sk.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Sv.rc
+++ b/dlls/user32/resources/user32_Sv.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Tr.rc
+++ b/dlls/user32/resources/user32_Tr.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Uk.rc
+++ b/dlls/user32/resources/user32_Uk.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

 SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
--- a/dlls/user32/resources/user32_Wa.rc
+++ b/dlls/user32/resources/user32_Wa.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 LANGUAGE LANG_WALON, SUBLANG_DEFAULT

 /*
--- a/dlls/user32/resources/user32_Zh.rc
+++ b/dlls/user32/resources/user32_Zh.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

@ -147,5 +149,3 @@ STRINGTABLE DISCARDABLE
    IDS_ERROR "错误"
    IDS_MDI_MOREWINDOWS "更多視窗(&M)..."
 }
-
-#pragma code_page(default)
--- a/dlls/user32/resources/user32_bin.rc
+++ b/dlls/user32/resources/user32_bin.rc
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resources.h"

 /****************************************************************/
 /* Bitmaps */
--- a/dlls/user32/resources/version.rc
+++ b/dlls/user32/resources/version.rc
@ -16,6 +16,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include <windef.h>
+
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

 #define WINE_FILEVERSION_STR "1.0"