msvfw32: Build language resource files separately.

Do not include them from an other rc file.

dlls/msvfw32/Makefile.in

@@ -11,7 +11,24 @@ C_SRCS = \
 	msvideo_main.c \
 	drawdib.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	msvfw32_Da.rc \
+	msvfw32_De.rc \
+	msvfw32_En.rc \
+	msvfw32_Es.rc \
+	msvfw32_Fr.rc \
+	msvfw32_Hu.rc \
+	msvfw32_Ko.rc \
+	msvfw32_Lt.rc \
+	msvfw32_Nl.rc \
+	msvfw32_No.rc \
+	msvfw32_Pl.rc \
+	msvfw32_Pt.rc \
+	msvfw32_Ru.rc \
+	msvfw32_Si.rc \
+	msvfw32_Sv.rc \
+	msvfw32_Tr.rc \
+	msvfw32_Zh.rc
 
 @MAKE_DLL_RULES@
 

dlls/msvfw32/msvfw32_Da.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_De.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_En.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Es.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Fr.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Hu.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Ko.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Lt.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -52,5 +54,3 @@ STRINGTABLE DISCARDABLE
 {
     IDS_FULLFRAMES "Pilni kadrai (neglaudinti)"
 }
-
-#pragma code_page(default)

dlls/msvfw32/msvfw32_Nl.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_No.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Pl.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 207, 95

dlls/msvfw32/msvfw32_Pt.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Ru.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Si.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE
 {
     IDS_FULLFRAMES "Polne slike (nestisnjeno)"
 }
-
-#pragma code_page(default)

dlls/msvfw32/msvfw32_Sv.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Tr.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE  36, 24, 187, 95

dlls/msvfw32/msvfw32_Zh.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msvideo_private.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE
 {
     IDS_FULLFRAMES "全幀(未壓縮)"
 }
-
-#pragma code_page(default)

dlls/msvfw32/msvideo_private.h

@@ -19,6 +19,9 @@
 #ifndef __WINE_MSVIDEO_PRIVATE_H
 #define __WINE_MSVIDEO_PRIVATE_H
 
+#include <windef.h>
+#include <winuser.h>
+
 #define ICM_CHOOSE_COMPRESSOR 1
 #define IDC_COMP_LIST 880
 #define IDS_FULLFRAMES 901

dlls/msvfw32/rsrc.rc

@@ -1,39 +0,0 @@
-/*
- * Copyright 2005 Dmitry Timoshkov
- *
- * 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 "winuser.h"
-#include "msvideo_private.h"
-
-#include "msvfw32_Da.rc"
-#include "msvfw32_De.rc"
-#include "msvfw32_En.rc"
-#include "msvfw32_Es.rc"
-#include "msvfw32_Fr.rc"
-#include "msvfw32_Hu.rc"
-#include "msvfw32_Ko.rc"
-#include "msvfw32_Lt.rc"
-#include "msvfw32_Nl.rc"
-#include "msvfw32_No.rc"
-#include "msvfw32_Pl.rc"
-#include "msvfw32_Pt.rc"
-#include "msvfw32_Ru.rc"
-#include "msvfw32_Si.rc"
-#include "msvfw32_Sv.rc"
-#include "msvfw32_Tr.rc"
-#include "msvfw32_Zh.rc"