msi: Build language resource files separately.

Do not include them from an other rc file.

dlls/msi/Makefile.in

@@ -59,7 +59,31 @@ BISON_SRCS = \
 	cond.y \
 	sql.y
 
-RC_SRCS = msi.rc
+RC_SRCS = \
+	msi.rc \
+	msi_Bg.rc \
+	msi_Da.rc \
+	msi_De.rc \
+	msi_En.rc \
+	msi_Eo.rc \
+	msi_Es.rc \
+	msi_Fi.rc \
+	msi_Fr.rc \
+	msi_Hu.rc \
+	msi_It.rc \
+	msi_Ko.rc \
+	msi_Lt.rc \
+	msi_Nl.rc \
+	msi_No.rc \
+	msi_Pl.rc \
+	msi_Pt.rc \
+	msi_Ro.rc \
+	msi_Ru.rc \
+	msi_Si.rc \
+	msi_Sv.rc \
+	msi_Tr.rc \
+	msi_Zh.rc \
+	version.rc
 
 @MAKE_DLL_RULES@
 

dlls/msi/msi.rc

@@ -19,38 +19,6 @@
  */
 
 #include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#include "version.rc"
-
-#include "msi_Bg.rc"
-#include "msi_Da.rc"
-#include "msi_De.rc"
-#include "msi_En.rc"
-#include "msi_Eo.rc"
-#include "msi_Es.rc"
-#include "msi_Fi.rc"
-#include "msi_Fr.rc"
-#include "msi_Hu.rc"
-#include "msi_It.rc"
-#include "msi_Ko.rc"
-#include "msi_Lt.rc"
-#include "msi_Nl.rc"
-#include "msi_No.rc"
-#include "msi_Pl.rc"
-#include "msi_Pt.rc"
-#include "msi_Ro.rc"
-#include "msi_Ru.rc"
-#include "msi_Si.rc"
-#include "msi_Sv.rc"
-#include "msi_Tr.rc"
-#include "msi_Zh.rc"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* @makedep: msiserver.tlb */
 1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb

dlls/msi/msi_Bg.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Da.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_De.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE
 	14 "Feature von:"
 	15 "Wählen Sie das Verzeichnis aus, dass %s enthält."
 }
-
-#pragma code_page(default)

dlls/msi/msi_En.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Eo.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Es.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Fi.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Fr.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Hu.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_It.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Ko.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Lt.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -35,5 +37,3 @@ STRINGTABLE DISCARDABLE
 	14 "komponentas iš:"
 	15 "parinkite aplanką, kuris turi %s"
 }
-
-#pragma code_page(default)

dlls/msi/msi_Nl.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_No.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Pl.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Pt.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Ro.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -33,5 +35,3 @@ STRINGTABLE DISCARDABLE
         14 "caracteristică de la:"
         15 "selectați fișierul care conține %s"
 }
-
-#pragma code_page(default)

dlls/msi/msi_Ru.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Si.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE
 	14 "funkcija z:"
 	15 "izberite mapo, ki vsebuje %s"
 }
-
-#pragma code_page(default)

dlls/msi/msi_Sv.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Tr.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/msi/msi_Zh.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE
 	14 "功能來自:"
 	15 "選擇包含 %s 的檔案夾"
 }
-
-#pragma code_page(default)