msacm32: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Thu Jul 2 18:38:29 CDT 2009
Do not include them from an other rc file.
---
dlls/msacm32/Makefile.in | 23 ++++++++++++++++++++++-
dlls/msacm32/msacm.rc | 46 ----------------------------------------------
dlls/msacm32/msacm_Cs.rc | 2 ++
dlls/msacm32/msacm_Da.rc | 2 ++
dlls/msacm32/msacm_De.rc | 2 ++
dlls/msacm32/msacm_En.rc | 2 ++
dlls/msacm32/msacm_Es.rc | 2 ++
dlls/msacm32/msacm_Fr.rc | 2 ++
dlls/msacm32/msacm_Hu.rc | 2 ++
dlls/msacm32/msacm_It.rc | 2 ++
dlls/msacm32/msacm_Ja.rc | 4 ++--
dlls/msacm32/msacm_Ko.rc | 2 ++
dlls/msacm32/msacm_Lt.rc | 4 ++--
dlls/msacm32/msacm_Nl.rc | 2 ++
dlls/msacm32/msacm_No.rc | 2 ++
dlls/msacm32/msacm_Pl.rc | 3 +++
dlls/msacm32/msacm_Pt.rc | 2 ++
dlls/msacm32/msacm_Ro.rc | 4 ++--
dlls/msacm32/msacm_Ru.rc | 2 ++
dlls/msacm32/msacm_Si.rc | 4 ++--
dlls/msacm32/msacm_Sv.rc | 2 ++
dlls/msacm32/msacm_Tr.rc | 2 ++
dlls/msacm32/msacm_Zh.rc | 4 ++--
dlls/msacm32/wineacm.h | 3 +++
24 files changed, 68 insertions(+), 57 deletions(-)
delete mode 100644 dlls/msacm32/msacm.rc
diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in
index 48a1d2b..78dfef8 100644
--- a/dlls/msacm32/Makefile.in
+++ b/dlls/msacm32/Makefile.in
@@ -15,7 +15,28 @@ C_SRCS = \
pcmconverter.c \
stream.c
-RC_SRCS = msacm.rc
+RC_SRCS = \
+ msacm_Cs.rc \
+ msacm_Da.rc \
+ msacm_De.rc \
+ msacm_En.rc \
+ msacm_Es.rc \
+ msacm_Fr.rc \
+ msacm_Hu.rc \
+ msacm_It.rc \
+ msacm_Ja.rc \
+ msacm_Ko.rc \
+ msacm_Lt.rc \
+ msacm_Nl.rc \
+ msacm_No.rc \
+ msacm_Pl.rc \
+ msacm_Pt.rc \
+ msacm_Ro.rc \
+ msacm_Ru.rc \
+ msacm_Si.rc \
+ msacm_Sv.rc \
+ msacm_Tr.rc \
+ msacm_Zh.rc
@MAKE_DLL_RULES@
diff --git a/dlls/msacm32/msacm.rc b/dlls/msacm32/msacm.rc
deleted file mode 100644
index ffc1485..0000000
--- a/dlls/msacm32/msacm.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Top level resource file for MS ACM
- *
- * Copyright 2000 Eric Pouech
- *
- * 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 "wineacm.h"
-
-#include "msacm_Cs.rc"
-#include "msacm_Da.rc"
-#include "msacm_De.rc"
-#include "msacm_En.rc"
-#include "msacm_Es.rc"
-#include "msacm_Fr.rc"
-#include "msacm_Hu.rc"
-#include "msacm_It.rc"
-#include "msacm_Ja.rc"
-#include "msacm_Ko.rc"
-#include "msacm_Lt.rc"
-#include "msacm_Nl.rc"
-#include "msacm_No.rc"
-#include "msacm_Pl.rc"
-#include "msacm_Pt.rc"
-#include "msacm_Ro.rc"
-#include "msacm_Ru.rc"
-#include "msacm_Si.rc"
-#include "msacm_Sv.rc"
-#include "msacm_Tr.rc"
-#include "msacm_Zh.rc"
diff --git a/dlls/msacm32/msacm_Cs.rc b/dlls/msacm32/msacm_Cs.rc
index 169e760..d7b278e 100644
--- a/dlls/msacm32/msacm_Cs.rc
+++ b/dlls/msacm32/msacm_Cs.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
diff --git a/dlls/msacm32/msacm_Da.rc b/dlls/msacm32/msacm_Da.rc
index 25ca1db..67f31c8 100644
--- a/dlls/msacm32/msacm_Da.rc
+++ b/dlls/msacm32/msacm_Da.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_De.rc b/dlls/msacm32/msacm_De.rc
index 8d60c36..cd4353a 100644
--- a/dlls/msacm32/msacm_De.rc
+++ b/dlls/msacm32/msacm_De.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_En.rc b/dlls/msacm32/msacm_En.rc
index e7c7ec2..620dfcf 100644
--- a/dlls/msacm32/msacm_En.rc
+++ b/dlls/msacm32/msacm_En.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Es.rc b/dlls/msacm32/msacm_Es.rc
index 8d16b62..3e6f441 100644
--- a/dlls/msacm32/msacm_Es.rc
+++ b/dlls/msacm32/msacm_Es.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Fr.rc b/dlls/msacm32/msacm_Fr.rc
index c170d2f..5960fff 100644
--- a/dlls/msacm32/msacm_Fr.rc
+++ b/dlls/msacm32/msacm_Fr.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Hu.rc b/dlls/msacm32/msacm_Hu.rc
index 3bc440e..52f3258 100644
--- a/dlls/msacm32/msacm_Hu.rc
+++ b/dlls/msacm32/msacm_Hu.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_It.rc b/dlls/msacm32/msacm_It.rc
index 1ce6b42..07db54b 100644
--- a/dlls/msacm32/msacm_It.rc
+++ b/dlls/msacm32/msacm_It.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Ja.rc b/dlls/msacm32/msacm_Ja.rc
index e9a63f9..5a27330 100644
--- a/dlls/msacm32/msacm_Ja.rc
+++ b/dlls/msacm32/msacm_Ja.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -57,5 +59,3 @@ BEGIN
PUSHBUTTON "ヘルプ(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
END
-
-#pragma code_page(default)
diff --git a/dlls/msacm32/msacm_Ko.rc b/dlls/msacm32/msacm_Ko.rc
index 1123e1f..fd017cc 100644
--- a/dlls/msacm32/msacm_Ko.rc
+++ b/dlls/msacm32/msacm_Ko.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Lt.rc b/dlls/msacm32/msacm_Lt.rc
index 8decd59..a94710c 100644
--- a/dlls/msacm32/msacm_Lt.rc
+++ b/dlls/msacm32/msacm_Lt.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -57,5 +59,3 @@ BEGIN
PUSHBUTTON "&Žinynas", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
END
-
-#pragma code_page(default)
diff --git a/dlls/msacm32/msacm_Nl.rc b/dlls/msacm32/msacm_Nl.rc
index fd7fb79..1fb0b05 100644
--- a/dlls/msacm32/msacm_Nl.rc
+++ b/dlls/msacm32/msacm_Nl.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_No.rc b/dlls/msacm32/msacm_No.rc
index e099f09..1bef434 100644
--- a/dlls/msacm32/msacm_No.rc
+++ b/dlls/msacm32/msacm_No.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Pl.rc b/dlls/msacm32/msacm_Pl.rc
index 940b004..8b58078 100644
--- a/dlls/msacm32/msacm_Pl.rc
+++ b/dlls/msacm32/msacm_Pl.rc
@@ -18,6 +18,9 @@
* 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 "wineacm.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 235, 100
diff --git a/dlls/msacm32/msacm_Pt.rc b/dlls/msacm32/msacm_Pt.rc
index 17cbca2..d73951c 100644
--- a/dlls/msacm32/msacm_Pt.rc
+++ b/dlls/msacm32/msacm_Pt.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Ro.rc b/dlls/msacm32/msacm_Ro.rc
index d1cc0bb..412d504 100644
--- a/dlls/msacm32/msacm_Ro.rc
+++ b/dlls/msacm32/msacm_Ro.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
@@ -50,5 +52,3 @@ BEGIN
PUSHBUTTON "&Ajutor", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
END
-
-#pragma code_page(default)
diff --git a/dlls/msacm32/msacm_Ru.rc b/dlls/msacm32/msacm_Ru.rc
index d634139..ea2a889 100644
--- a/dlls/msacm32/msacm_Ru.rc
+++ b/dlls/msacm32/msacm_Ru.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Si.rc b/dlls/msacm32/msacm_Si.rc
index 2513f76..3834a33 100644
--- a/dlls/msacm32/msacm_Si.rc
+++ b/dlls/msacm32/msacm_Si.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -56,5 +58,3 @@ BEGIN
PUSHBUTTON "&PomoÄ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
END
-
-#pragma code_page(default)
diff --git a/dlls/msacm32/msacm_Sv.rc b/dlls/msacm32/msacm_Sv.rc
index 747e608..939e879 100644
--- a/dlls/msacm32/msacm_Sv.rc
+++ b/dlls/msacm32/msacm_Sv.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Tr.rc b/dlls/msacm32/msacm_Tr.rc
index 0ececa4..6c15ffb 100644
--- a/dlls/msacm32/msacm_Tr.rc
+++ b/dlls/msacm32/msacm_Tr.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100
diff --git a/dlls/msacm32/msacm_Zh.rc b/dlls/msacm32/msacm_Zh.rc
index 2bc138b..1b8949e 100644
--- a/dlls/msacm32/msacm_Zh.rc
+++ b/dlls/msacm32/msacm_Zh.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wineacm.h"
+
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
@@ -94,5 +96,3 @@ BEGIN
PUSHBUTTON "幫助(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14
END
-
-#pragma code_page(default)
diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h
index b566e61..bf0c6ed 100644
--- a/dlls/msacm32/wineacm.h
+++ b/dlls/msacm32/wineacm.h
@@ -20,6 +20,9 @@
#ifndef __WINE_WINEACM_H
#define __WINE_WINEACM_H
+#include <windef.h>
+#include <winuser.h>
+
/***********************************************************************
* Wine specific - Win32
*/
--
1.6.3.3
More information about the wine-patches
mailing list