comdlg32: Build language resource files separately.

Do not include them from an other rc file.
2009-07-03 01:38:23 +02:00 · 2009-07-03 01:38:23 +02:00 · a15c263237
parent 08ac4a4c22
commit a15c263237
33 changed files with 123 additions and 86 deletions
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@ -26,7 +26,38 @@ C_SRCS16 = \

 SPEC_SRCS16 = commdlg.spec

-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	cdlg_Bg.rc \
+	cdlg_Ca.rc \
+	cdlg_Cs.rc \
+	cdlg_Da.rc \
+	cdlg_De.rc \
+	cdlg_El.rc \
+	cdlg_En.rc \
+	cdlg_Eo.rc \
+	cdlg_Es.rc \
+	cdlg_Fi.rc \
+	cdlg_Fr.rc \
+	cdlg_Hu.rc \
+	cdlg_It.rc \
+	cdlg_Ja.rc \
+	cdlg_Ko.rc \
+	cdlg_Lt.rc \
+	cdlg_Nl.rc \
+	cdlg_No.rc \
+	cdlg_Pl.rc \
+	cdlg_Pt.rc \
+	cdlg_Ro.rc \
+	cdlg_Ru.rc \
+	cdlg_Si.rc \
+	cdlg_Sk.rc \
+	cdlg_Sv.rc \
+	cdlg_Th.rc \
+	cdlg_Tr.rc \
+	cdlg_Uk.rc \
+	cdlg_Wa.rc \
+	cdlg_Zh.rc \
+	cdlg_xx.rc

@MAKE_DLL_RULES@

--- a/dlls/comdlg32/cdlg_Bg.rc
+++ b/dlls/comdlg32/cdlg_Bg.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * Òóê èçðè÷íî ïèøåøå äà íå ïèïàì íåùî, àìà àç ãî ïèïíàõ.
 * Àêî èìà ïðîáëåìè íÿêîé äà ãè îïðàâè. 
--- a/dlls/comdlg32/cdlg_Ca.rc
+++ b/dlls/comdlg32/cdlg_Ca.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Cs.rc
+++ b/dlls/comdlg32/cdlg_Cs.rc
@ -18,6 +18,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Da.rc
+++ b/dlls/comdlg32/cdlg_Da.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_De.rc
+++ b/dlls/comdlg32/cdlg_De.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_El.rc
+++ b/dlls/comdlg32/cdlg_El.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_En.rc
+++ b/dlls/comdlg32/cdlg_En.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Eo.rc
+++ b/dlls/comdlg32/cdlg_Eo.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Es.rc
+++ b/dlls/comdlg32/cdlg_Es.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Fi.rc
+++ b/dlls/comdlg32/cdlg_Fi.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Fr.rc
+++ b/dlls/comdlg32/cdlg_Fr.rc
@ -20,6 +20,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Hu.rc
+++ b/dlls/comdlg32/cdlg_Hu.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_It.rc
+++ b/dlls/comdlg32/cdlg_It.rc
@ -18,6 +18,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Ja.rc
+++ b/dlls/comdlg32/cdlg_Ja.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
@ -483,5 +486,3 @@ STRINGTABLE DISCARDABLE
    IDS_SAVE_AS     "名前を付けて保存"
    IDS_OPEN_FILE   "ファイルを開く"
 }
-
-#pragma code_page(default)
--- a/dlls/comdlg32/cdlg_Ko.rc
+++ b/dlls/comdlg32/cdlg_Ko.rc
@ -18,6 +18,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Lt.rc
+++ b/dlls/comdlg32/cdlg_Lt.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
@ -481,4 +484,3 @@ STRINGTABLE DISCARDABLE
    IDS_SAVE_AS     "Išsaugoti kaip"
    IDS_OPEN_FILE   "Atverti failą"
 }
-#pragma code_page(default)
--- a/dlls/comdlg32/cdlg_Nl.rc
+++ b/dlls/comdlg32/cdlg_Nl.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_No.rc
+++ b/dlls/comdlg32/cdlg_No.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Pl.rc
+++ b/dlls/comdlg32/cdlg_Pl.rc
@ -18,6 +18,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Pt.rc
+++ b/dlls/comdlg32/cdlg_Pt.rc
@ -18,6 +18,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Ro.rc
+++ b/dlls/comdlg32/cdlg_Ro.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
@ -476,5 +479,3 @@ STRINGTABLE DISCARDABLE
    IDS_SAVE_AS     "Salvează ca"
    IDS_OPEN_FILE   "Deschide fișier"
 }
-
-#pragma code_page(default)
--- a/dlls/comdlg32/cdlg_Ru.rc
+++ b/dlls/comdlg32/cdlg_Ru.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Si.rc
+++ b/dlls/comdlg32/cdlg_Si.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
@ -481,5 +484,3 @@ STRINGTABLE DISCARDABLE
    IDS_SAVE_AS     "Shrani kot"
    IDS_OPEN_FILE   "Odpri datoteko"
 }
-
-#pragma code_page(default)
--- a/dlls/comdlg32/cdlg_Sk.rc
+++ b/dlls/comdlg32/cdlg_Sk.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Sv.rc
+++ b/dlls/comdlg32/cdlg_Sv.rc
@ -17,6 +17,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Th.rc
+++ b/dlls/comdlg32/cdlg_Th.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Tr.rc
+++ b/dlls/comdlg32/cdlg_Tr.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Uk.rc
+++ b/dlls/comdlg32/cdlg_Uk.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Wa.rc
+++ b/dlls/comdlg32/cdlg_Wa.rc
@ -16,6 +16,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
--- a/dlls/comdlg32/cdlg_Zh.rc
+++ b/dlls/comdlg32/cdlg_Zh.rc
@ -20,6 +20,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "cdlg.h"
+#include "filedlgbrowser.h"
+
 /*
 * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
 */
@ -709,5 +712,3 @@ STRINGTABLE DISCARDABLE
    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "找不到列印服務器; "
    PD32_PRINTER_STATUS_POWER_SAVE        "省電狀態; "
 }
-
-#pragma code_page(default)
--- a/dlls/comdlg32/cdlg_xx.rc
+++ b/dlls/comdlg32/cdlg_xx.rc
@ -19,9 +19,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "windef.h"
-#include "winbase.h"
-#include "winver.h"
+#include "cdlg.h"

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

--- a/dlls/comdlg32/rsrc.rc
+++ b/dlls/comdlg32/rsrc.rc
@ -1,73 +0,0 @@
-/*
- * Top level resource file for Common Dialogs
- *
- * 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
- */
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "cdlg.h"
-#include "winspool.h"
-#include "filedlgbrowser.h"
-
-/*
- * 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 "cdlg_xx.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 "cdlg_Bg.rc"
-#include "cdlg_Ca.rc"
-#include "cdlg_Cs.rc"
-#include "cdlg_Da.rc"
-#include "cdlg_De.rc"
-#include "cdlg_El.rc"
-#include "cdlg_En.rc"
-#include "cdlg_Eo.rc"
-#include "cdlg_Es.rc"
-#include "cdlg_Fi.rc"
-#include "cdlg_Fr.rc"
-#include "cdlg_Hu.rc"
-#include "cdlg_It.rc"
-#include "cdlg_Ja.rc"
-#include "cdlg_Ko.rc"
-#include "cdlg_Lt.rc"
-#include "cdlg_Nl.rc"
-#include "cdlg_No.rc"
-#include "cdlg_Pl.rc"
-#include "cdlg_Pt.rc"
-#include "cdlg_Ro.rc"
-#include "cdlg_Ru.rc"
-#include "cdlg_Si.rc"
-#include "cdlg_Sk.rc"
-#include "cdlg_Sv.rc"
-#include "cdlg_Th.rc"
-#include "cdlg_Tr.rc"
-#include "cdlg_Uk.rc"
-#include "cdlg_Wa.rc"
-#include "cdlg_Zh.rc"