winspool.drv: Build language resource files separately.

Michael Stefaniuc mstefani at redhat.de
Thu Jul 2 18:38:43 CDT 2009


Do not include them from an other rc file.
---
 dlls/winspool.drv/Bg.rc       |    2 ++
 dlls/winspool.drv/Da.rc       |    2 ++
 dlls/winspool.drv/De.rc       |    2 ++
 dlls/winspool.drv/En.rc       |    2 ++
 dlls/winspool.drv/Eo.rc       |    2 ++
 dlls/winspool.drv/Es.rc       |    2 ++
 dlls/winspool.drv/Fi.rc       |    2 ++
 dlls/winspool.drv/Fr.rc       |    2 ++
 dlls/winspool.drv/It.rc       |    2 ++
 dlls/winspool.drv/Ko.rc       |    2 ++
 dlls/winspool.drv/Lt.rc       |    4 ++--
 dlls/winspool.drv/Makefile.in |   23 ++++++++++++++++++++++-
 dlls/winspool.drv/Nl.rc       |    2 ++
 dlls/winspool.drv/No.rc       |    2 ++
 dlls/winspool.drv/Pl.rc       |    2 ++
 dlls/winspool.drv/Pt.rc       |    2 ++
 dlls/winspool.drv/Ru.rc       |    2 ++
 dlls/winspool.drv/Si.rc       |    4 ++--
 dlls/winspool.drv/Sv.rc       |    2 ++
 dlls/winspool.drv/Tr.rc       |    2 ++
 dlls/winspool.drv/Zh.rc       |    4 ++--
 dlls/winspool.drv/winspool.rc |   25 -------------------------
 dlls/winspool.drv/wspool.h    |    3 +++
 23 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/dlls/winspool.drv/Bg.rc b/dlls/winspool.drv/Bg.rc
index fb70b48..eeeb2fc 100644
--- a/dlls/winspool.drv/Bg.rc
+++ b/dlls/winspool.drv/Bg.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Da.rc b/dlls/winspool.drv/Da.rc
index 2183cb7..adf4ff4 100644
--- a/dlls/winspool.drv/Da.rc
+++ b/dlls/winspool.drv/Da.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/De.rc b/dlls/winspool.drv/De.rc
index 0bdb1de..b207af4 100644
--- a/dlls/winspool.drv/De.rc
+++ b/dlls/winspool.drv/De.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/En.rc b/dlls/winspool.drv/En.rc
index 93d8de5..d6359d1 100644
--- a/dlls/winspool.drv/En.rc
+++ b/dlls/winspool.drv/En.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Eo.rc b/dlls/winspool.drv/Eo.rc
index 45a2908..8b321cc 100644
--- a/dlls/winspool.drv/Eo.rc
+++ b/dlls/winspool.drv/Eo.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Es.rc b/dlls/winspool.drv/Es.rc
index 95f38cb..acb8d1b 100644
--- a/dlls/winspool.drv/Es.rc
+++ b/dlls/winspool.drv/Es.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Fi.rc b/dlls/winspool.drv/Fi.rc
index 2704765..f4076fc 100644
--- a/dlls/winspool.drv/Fi.rc
+++ b/dlls/winspool.drv/Fi.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Fr.rc b/dlls/winspool.drv/Fr.rc
index 964bb40..12bf359 100644
--- a/dlls/winspool.drv/Fr.rc
+++ b/dlls/winspool.drv/Fr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/It.rc b/dlls/winspool.drv/It.rc
index 6965c3e..aff05a4 100644
--- a/dlls/winspool.drv/It.rc
+++ b/dlls/winspool.drv/It.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Ko.rc b/dlls/winspool.drv/Ko.rc
index 8cb7162..8c5a9c4 100644
--- a/dlls/winspool.drv/Ko.rc
+++ b/dlls/winspool.drv/Ko.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Lt.rc b/dlls/winspool.drv/Lt.rc
index 0f6b4ea..46761e8 100644
--- a/dlls/winspool.drv/Lt.rc
+++ b/dlls/winspool.drv/Lt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -40,5 +42,3 @@ STRINGTABLE DISCARDABLE
     IDS_FILE_EXISTS "IÅ¡vesties failas jau egzistouja.  NorÄ—dami failÄ
 keisti spauskite Gerai."
     IDS_CANNOT_OPEN "Nepavyko sukurti išvesties failo."
 }
-
-#pragma code_page(default)
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 7e670db..d0b6410 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -12,7 +12,28 @@ C_SRCS = \
 	info.c \
 	wspool.c
 
-RC_SRCS = winspool.rc
+RC_SRCS = \
+	Bg.rc \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Eo.rc \
+	Es.rc \
+	Fi.rc \
+	Fr.rc \
+	It.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc \
+	winspool.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/winspool.drv/Nl.rc b/dlls/winspool.drv/Nl.rc
index a6a165c..a785ff3 100644
--- a/dlls/winspool.drv/Nl.rc
+++ b/dlls/winspool.drv/Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/No.rc b/dlls/winspool.drv/No.rc
index ae22674..5248252 100644
--- a/dlls/winspool.drv/No.rc
+++ b/dlls/winspool.drv/No.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Pl.rc b/dlls/winspool.drv/Pl.rc
index 0dfee64..966fd12 100644
--- a/dlls/winspool.drv/Pl.rc
+++ b/dlls/winspool.drv/Pl.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Pt.rc b/dlls/winspool.drv/Pt.rc
index f00dc0c..02b883a 100644
--- a/dlls/winspool.drv/Pt.rc
+++ b/dlls/winspool.drv/Pt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Ru.rc b/dlls/winspool.drv/Ru.rc
index 6b0639c..0a8481f 100644
--- a/dlls/winspool.drv/Ru.rc
+++ b/dlls/winspool.drv/Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Si.rc b/dlls/winspool.drv/Si.rc
index 2efa67d..350047a 100644
--- a/dlls/winspool.drv/Si.rc
+++ b/dlls/winspool.drv/Si.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -39,5 +41,3 @@ STRINGTABLE DISCARDABLE
     IDS_FILE_EXISTS "Izhodna datoteka že obstaja. Za prepis kliknite gumb V redu."
     IDS_CANNOT_OPEN "Izhodne datoteke ni mogoče ustvariti."
 }
-
-#pragma code_page(default)
diff --git a/dlls/winspool.drv/Sv.rc b/dlls/winspool.drv/Sv.rc
index 2bd3987..6052eed 100644
--- a/dlls/winspool.drv/Sv.rc
+++ b/dlls/winspool.drv/Sv.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Tr.rc b/dlls/winspool.drv/Tr.rc
index b6d885a..4a1b8ab 100644
--- a/dlls/winspool.drv/Tr.rc
+++ b/dlls/winspool.drv/Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
diff --git a/dlls/winspool.drv/Zh.rc b/dlls/winspool.drv/Zh.rc
index 4a265b3..08010c2 100644
--- a/dlls/winspool.drv/Zh.rc
+++ b/dlls/winspool.drv/Zh.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wspool.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -60,5 +62,3 @@ STRINGTABLE DISCARDABLE
     IDS_FILE_EXISTS "輸出檔案已存在, 按'確定'覆蓋。"
     IDS_CANNOT_OPEN "不能開啟輸出檔案."
 }
-
-#pragma code_page(default)
diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc
index f831618..019f5ea 100644
--- a/dlls/winspool.drv/winspool.rc
+++ b/dlls/winspool.drv/winspool.rc
@@ -18,11 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
 #include "wspool.h"
-#include "winver.h"
 
 #define WINE_FILENAME_STR "winspool.drv"
 #define WINE_FILEDESCRIPTION_STR "Wine core printer driver"
@@ -38,24 +34,3 @@
 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
 
 #include "wine/wine_common_ver.rc"
-
-#include "Bg.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Eo.rc"
-#include "Es.rc"
-#include "Fi.rc"
-#include "Fr.rc"
-#include "It.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"
diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h
index 5b831dc..bb7922b 100644
--- a/dlls/winspool.drv/wspool.h
+++ b/dlls/winspool.drv/wspool.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
+
 extern HINSTANCE WINSPOOL_hInstance;
 
 extern PRINTPROVIDOR * backend;
-- 
1.6.3.3



More information about the wine-patches mailing list