avifil32: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Thu Jul 2 05:33:41 CDT 2009
Do not include them from an other rc file.
---
dlls/avifil32/Makefile.in | 22 ++++++++++++++++++++++
dlls/avifil32/avifile_Cs.rc | 2 ++
dlls/avifil32/avifile_Da.rc | 2 ++
dlls/avifil32/avifile_De.rc | 2 ++
dlls/avifil32/avifile_En.rc | 2 ++
dlls/avifil32/avifile_Es.rc | 2 ++
dlls/avifil32/avifile_Fr.rc | 2 ++
dlls/avifil32/avifile_Hu.rc | 2 ++
dlls/avifil32/avifile_It.rc | 2 ++
dlls/avifil32/avifile_Ja.rc | 4 ++--
dlls/avifil32/avifile_Ko.rc | 2 ++
dlls/avifil32/avifile_Lt.rc | 4 ++--
dlls/avifil32/avifile_Nl.rc | 2 ++
dlls/avifil32/avifile_No.rc | 2 ++
dlls/avifil32/avifile_Pl.rc | 2 ++
dlls/avifil32/avifile_Pt.rc | 2 ++
dlls/avifil32/avifile_Ro.rc | 4 ++--
dlls/avifil32/avifile_Ru.rc | 2 ++
dlls/avifil32/avifile_Si.rc | 4 ++--
dlls/avifil32/avifile_Sv.rc | 2 ++
dlls/avifil32/avifile_Tr.rc | 2 ++
dlls/avifil32/avifile_Uk.rc | 1 +
dlls/avifil32/avifile_Zh.rc | 4 ++--
dlls/avifil32/avifile_private.h | 3 +++
dlls/avifil32/rsrc.rc | 33 ---------------------------------
25 files changed, 68 insertions(+), 43 deletions(-)
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index d645d88..849bf18 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -20,6 +20,28 @@ C_SRCS = \
wavfile.c
RC_SRCS = \
+ avifile_Cs.rc \
+ avifile_Da.rc \
+ avifile_De.rc \
+ avifile_En.rc \
+ avifile_Es.rc \
+ avifile_Fr.rc \
+ avifile_Hu.rc \
+ avifile_It.rc \
+ avifile_Ja.rc \
+ avifile_Ko.rc \
+ avifile_Lt.rc \
+ avifile_Nl.rc \
+ avifile_No.rc \
+ avifile_Pl.rc \
+ avifile_Pt.rc \
+ avifile_Ro.rc \
+ avifile_Ru.rc \
+ avifile_Si.rc \
+ avifile_Sv.rc \
+ avifile_Tr.rc \
+ avifile_Uk.rc \
+ avifile_Zh.rc \
rsrc.rc
@MAKE_DLL_RULES@
diff --git a/dlls/avifil32/avifile_Cs.rc b/dlls/avifil32/avifile_Cs.rc
index 86dac3f..180ac73 100644
--- a/dlls/avifil32/avifile_Cs.rc
+++ b/dlls/avifil32/avifile_Cs.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
diff --git a/dlls/avifil32/avifile_Da.rc b/dlls/avifil32/avifile_Da.rc
index 669e918..22f4576 100644
--- a/dlls/avifil32/avifile_Da.rc
+++ b/dlls/avifil32/avifile_Da.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_De.rc b/dlls/avifil32/avifile_De.rc
index 9e3e5f2..18c2fdf 100644
--- a/dlls/avifil32/avifile_De.rc
+++ b/dlls/avifil32/avifile_De.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_En.rc b/dlls/avifil32/avifile_En.rc
index 0947cbd..71c5d3e 100644
--- a/dlls/avifil32/avifile_En.rc
+++ b/dlls/avifil32/avifile_En.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Es.rc b/dlls/avifil32/avifile_Es.rc
index 45d7003..ddeee99 100644
--- a/dlls/avifil32/avifile_Es.rc
+++ b/dlls/avifil32/avifile_Es.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Fr.rc b/dlls/avifil32/avifile_Fr.rc
index 6a38721..a04f0b4 100644
--- a/dlls/avifil32/avifile_Fr.rc
+++ b/dlls/avifil32/avifile_Fr.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Hu.rc b/dlls/avifil32/avifile_Hu.rc
index e9bdce9..6c3e9c2 100644
--- a/dlls/avifil32/avifile_Hu.rc
+++ b/dlls/avifil32/avifile_Hu.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_It.rc b/dlls/avifil32/avifile_It.rc
index 6f06ec5..314d34d 100644
--- a/dlls/avifil32/avifile_It.rc
+++ b/dlls/avifil32/avifile_It.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Ja.rc b/dlls/avifil32/avifile_Ja.rc
index ab5bdfe..847a1fd 100644
--- a/dlls/avifil32/avifile_Ja.rc
+++ b/dlls/avifil32/avifile_Ja.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE
IDS_AVIFILETYPE "Wine AVI-default-filehandler"
IDS_UNCOMPRESSED "未圧縮"
}
-
-#pragma code_page(default)
diff --git a/dlls/avifil32/avifile_Ko.rc b/dlls/avifil32/avifile_Ko.rc
index 46c4821..622880c 100644
--- a/dlls/avifil32/avifile_Ko.rc
+++ b/dlls/avifil32/avifile_Ko.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Lt.rc b/dlls/avifil32/avifile_Lt.rc
index 51ee84d..e4795b5 100644
--- a/dlls/avifil32/avifile_Lt.rc
+++ b/dlls/avifil32/avifile_Lt.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE
IDS_AVIFILETYPE "Wine numatyta-AVI-doroklÄ—"
IDS_UNCOMPRESSED "neglaudintas"
}
-
-#pragma code_page(default)
diff --git a/dlls/avifil32/avifile_Nl.rc b/dlls/avifil32/avifile_Nl.rc
index b120572..b2546a0 100644
--- a/dlls/avifil32/avifile_Nl.rc
+++ b/dlls/avifil32/avifile_Nl.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_No.rc b/dlls/avifil32/avifile_No.rc
index 8483ab2..8419851 100644
--- a/dlls/avifil32/avifile_No.rc
+++ b/dlls/avifil32/avifile_No.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Pl.rc b/dlls/avifil32/avifile_Pl.rc
index 49abdb0..f5e8eda 100644
--- a/dlls/avifil32/avifile_Pl.rc
+++ b/dlls/avifil32/avifile_Pl.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Pt.rc b/dlls/avifil32/avifile_Pt.rc
index 37bb941..ce3d032 100644
--- a/dlls/avifil32/avifile_Pt.rc
+++ b/dlls/avifil32/avifile_Pt.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Ro.rc b/dlls/avifil32/avifile_Ro.rc
index d46e3ea..6e63780 100644
--- a/dlls/avifil32/avifile_Ro.rc
+++ b/dlls/avifil32/avifile_Ro.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -53,5 +55,3 @@ STRINGTABLE DISCARDABLE
IDS_AVIFILETYPE "Tratare implicită Wine pentru AVI"
IDS_UNCOMPRESSED "necomprimat"
}
-
-#pragma code_page(default)
diff --git a/dlls/avifil32/avifile_Ru.rc b/dlls/avifil32/avifile_Ru.rc
index fa8206d..512bf46 100644
--- a/dlls/avifil32/avifile_Ru.rc
+++ b/dlls/avifil32/avifile_Ru.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Si.rc b/dlls/avifil32/avifile_Si.rc
index 579be48..0840321 100644
--- a/dlls/avifil32/avifile_Si.rc
+++ b/dlls/avifil32/avifile_Si.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE
IDS_AVIFILETYPE "Wine privzeti-upravljalec-AVI-datotek"
IDS_UNCOMPRESSED "nestisnjeno"
}
-
-#pragma code_page(default)
diff --git a/dlls/avifil32/avifile_Sv.rc b/dlls/avifil32/avifile_Sv.rc
index f65e4d2..126bca6 100644
--- a/dlls/avifil32/avifile_Sv.rc
+++ b/dlls/avifil32/avifile_Sv.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Tr.rc b/dlls/avifil32/avifile_Tr.rc
index 451802f..c5dbf6e 100644
--- a/dlls/avifil32/avifile_Tr.rc
+++ b/dlls/avifil32/avifile_Tr.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82
diff --git a/dlls/avifil32/avifile_Uk.rc b/dlls/avifil32/avifile_Uk.rc
index d380c8a..9934ab4 100644
--- a/dlls/avifil32/avifile_Uk.rc
+++ b/dlls/avifil32/avifile_Uk.rc
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
diff --git a/dlls/avifil32/avifile_Zh.rc b/dlls/avifil32/avifile_Zh.rc
index 0075ed8..5d962e7 100644
--- a/dlls/avifil32/avifile_Zh.rc
+++ b/dlls/avifil32/avifile_Zh.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "avifile_private.h"
+
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
@@ -86,5 +88,3 @@ STRINGTABLE DISCARDABLE
IDS_AVIFILETYPE "Wine AVI-默èªè™•ç†å™¨"
IDS_UNCOMPRESSED "未壓縮"
}
-
-#pragma code_page(default)
diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h
index db31bd4..0cff6ad 100644
--- a/dlls/avifil32/avifile_private.h
+++ b/dlls/avifil32/avifile_private.h
@@ -19,6 +19,9 @@
#ifndef __AVIFILE_PRIVATE_H
#define __AVIFILE_PRIVATE_H
+#include <windef.h>
+#include <winuser.h>
+
#ifndef MAX_AVISTREAMS
#define MAX_AVISTREAMS 8
#endif
diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc
index e4363a7..6a17262 100644
--- a/dlls/avifil32/rsrc.rc
+++ b/dlls/avifil32/rsrc.rc
@@ -18,14 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winver.h"
#include "avifile_private.h"
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
#define WINE_OLESELFREGISTER
#define WINE_FILEDESCRIPTION_STR "Wine AVI file support library"
#define WINE_FILENAME_STR "avifil32.dll"
@@ -33,30 +27,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#define WINE_FILEVERSION_STR "4.03.1998"
#include "wine/wine_common_ver.rc"
-
-/*
- * Everything specific to any language goes
- * in one of the specific files.
- */
-#include "avifile_Cs.rc"
-#include "avifile_Da.rc"
-#include "avifile_De.rc"
-#include "avifile_En.rc"
-#include "avifile_Es.rc"
-#include "avifile_Fr.rc"
-#include "avifile_Hu.rc"
-#include "avifile_It.rc"
-#include "avifile_Ja.rc"
-#include "avifile_Ko.rc"
-#include "avifile_Lt.rc"
-#include "avifile_Nl.rc"
-#include "avifile_No.rc"
-#include "avifile_Pl.rc"
-#include "avifile_Pt.rc"
-#include "avifile_Ro.rc"
-#include "avifile_Ru.rc"
-#include "avifile_Si.rc"
-#include "avifile_Sv.rc"
-#include "avifile_Tr.rc"
-#include "avifile_Uk.rc"
-#include "avifile_Zh.rc"
--
1.6.3.3
More information about the wine-patches
mailing list