Module: wine Branch: master Commit: 62a2196887ac1157be8f7174715de6af5223a245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a2196887ac1157be8f717471...
Author: Michael Stefaniuc mstefani@redhat.de Date: Wed Jul 1 10:16:57 2009 +0200
mshtml: Build language resource files separately.
Do not include them from an other rc file.
---
dlls/mshtml/Bg.rc | 1 + dlls/mshtml/Da.rc | 1 + dlls/mshtml/De.rc | 3 +-- dlls/mshtml/En.rc | 1 + dlls/mshtml/Es.rc | 1 + dlls/mshtml/Fi.rc | 1 + dlls/mshtml/Fr.rc | 1 + dlls/mshtml/Hu.rc | 1 + dlls/mshtml/Ja.rc | 3 ++- dlls/mshtml/Ko.rc | 1 + dlls/mshtml/Lt.rc | 4 ++-- dlls/mshtml/Makefile.in | 24 +++++++++++++++++++++++- dlls/mshtml/Nl.rc | 1 + dlls/mshtml/No.rc | 1 + dlls/mshtml/Pl.rc | 1 + dlls/mshtml/Pt.rc | 1 + dlls/mshtml/Ro.rc | 3 +-- dlls/mshtml/Ru.rc | 1 + dlls/mshtml/Si.rc | 4 ++-- dlls/mshtml/Sv.rc | 1 + dlls/mshtml/Tr.rc | 1 + dlls/mshtml/Zh.rc | 4 ++-- dlls/mshtml/resource.h | 4 ++++ dlls/mshtml/rsrc.rc | 31 ------------------------------- 24 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/dlls/mshtml/Bg.rc b/dlls/mshtml/Bg.rc index 92c86b6..a8fd605 100644 --- a/dlls/mshtml/Bg.rc +++ b/dlls/mshtml/Bg.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Da.rc b/dlls/mshtml/Da.rc index 47579b5..574ea09 100644 --- a/dlls/mshtml/Da.rc +++ b/dlls/mshtml/Da.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 991e84d..e1963ec 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
@@ -69,5 +70,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index 09370de..41ee119 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc index 94af0cf..fb79f87 100644 --- a/dlls/mshtml/Es.rc +++ b/dlls/mshtml/Es.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
diff --git a/dlls/mshtml/Fi.rc b/dlls/mshtml/Fi.rc index d1d389a..564345d 100644 --- a/dlls/mshtml/Fi.rc +++ b/dlls/mshtml/Fi.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 507d0c2..4d45d51 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
diff --git a/dlls/mshtml/Hu.rc b/dlls/mshtml/Hu.rc index 7f3d254..137a100 100644 --- a/dlls/mshtml/Hu.rc +++ b/dlls/mshtml/Hu.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Ja.rc b/dlls/mshtml/Ja.rc index 4e060d7..202bd43 100644 --- a/dlls/mshtml/Ja.rc +++ b/dlls/mshtml/Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -66,4 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "キャンセル", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } -#pragma code_page(default) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index efad007..01456e3 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc index f63b177..26167a9 100644 --- a/dlls/mshtml/Lt.rc +++ b/dlls/mshtml/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -66,5 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Gerai", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Atsisakyti", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 241ec9d..acda821 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -65,7 +65,29 @@ C_SRCS = \ txtrange.c \ view.c
-RC_SRCS = rsrc.rc +RC_SRCS = \ + Bg.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc
IDL_H_SRCS = nsiface.idl
diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index f6f47e1..1aab09c 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index 6060a51..4e24ece 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
diff --git a/dlls/mshtml/Pl.rc b/dlls/mshtml/Pl.rc index a177686..11659ee 100644 --- a/dlls/mshtml/Pl.rc +++ b/dlls/mshtml/Pl.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 0a83ee0..6a471e4 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
diff --git a/dlls/mshtml/Ro.rc b/dlls/mshtml/Ro.rc index 4bb7199..1bac216 100644 --- a/dlls/mshtml/Ro.rc +++ b/dlls/mshtml/Ro.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -65,5 +66,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Renunță", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 9460f24..d6fbc2b 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 9500c18..92721df 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -66,5 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "V redu", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Prekliči", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index b6a1fd0..041ff8b 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
diff --git a/dlls/mshtml/Tr.rc b/dlls/mshtml/Tr.rc index 6d843a1..7e85fc6 100644 --- a/dlls/mshtml/Tr.rc +++ b/dlls/mshtml/Tr.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
diff --git a/dlls/mshtml/Zh.rc b/dlls/mshtml/Zh.rc index 4b258a4..2365120 100644 --- a/dlls/mshtml/Zh.rc +++ b/dlls/mshtml/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001)
@@ -94,5 +96,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "確定", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index f409380..1e92637 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDS_HTMLDISABLED 7500 #define IDS_HTMLDOCUMENT 7501 #define IDS_DOWNLOADING 7502 diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 8be957f..5e669de 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -16,13 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "windef.h" -#include "winuser.h" -#include "commctrl.h" -#include "mshtmcid.h" - -#include "resource.h" - #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine HTML Viewer" #define WINE_FILENAME_STR "mshtml.dll" @@ -33,30 +26,6 @@
#include "wine/wine_common_ver.rc"
-#include "Bg.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - /* @makedep: mshtml.inf */ REGINST REGINST mshtml.inf