From 69411faf4da4a891c4ff4edbfb193ae7dc11ed3b Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 30 Jun 2009 01:15:38 +0200 Subject: [PATCH] browseui: Build language resource files separately. Instead of including them from an other rc file. --- dlls/browseui/Makefile.in | 19 ++++++++++++++++++- dlls/browseui/resids.h | 4 ++++ dlls/browseui/rsrc.rc | 42 ------------------------------------------ dlls/browseui/rsrc_De.rc | 1 + dlls/browseui/rsrc_En.rc | 1 + dlls/browseui/rsrc_Es.rc | 1 + dlls/browseui/rsrc_Fr.rc | 1 + dlls/browseui/rsrc_Ja.rc | 4 ++-- dlls/browseui/rsrc_Ko.rc | 1 + dlls/browseui/rsrc_Lt.rc | 4 ++-- dlls/browseui/rsrc_Nl.rc | 1 + dlls/browseui/rsrc_No.rc | 1 + dlls/browseui/rsrc_Pl.rc | 1 + dlls/browseui/rsrc_Pt.rc | 1 + dlls/browseui/rsrc_Ro.rc | 3 +-- dlls/browseui/rsrc_Ru.rc | 1 + dlls/browseui/rsrc_Si.rc | 4 ++-- dlls/browseui/rsrc_Sv.rc | 1 + dlls/browseui/rsrc_Zh.rc | 3 +-- 19 files changed, 41 insertions(+), 53 deletions(-) delete mode 100644 dlls/browseui/rsrc.rc diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 845e66a5e72..777a2179d4f 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -14,7 +14,24 @@ C_SRCS = \ progressdlg.c \ regsvr.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + rsrc_De.rc \ + rsrc_En.rc \ + rsrc_Es.rc \ + rsrc_Fr.rc \ + rsrc_Ja.rc \ + rsrc_Ko.rc \ + rsrc_Lt.rc \ + rsrc_Nl.rc \ + rsrc_No.rc \ + rsrc_Pl.rc \ + rsrc_Pt.rc \ + rsrc_Ro.rc \ + rsrc_Ru.rc \ + rsrc_Si.rc \ + rsrc_Sv.rc \ + rsrc_Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/browseui/resids.h b/dlls/browseui/resids.h index a5b53371580..cd44a8ebd98 100644 --- a/dlls/browseui/resids.h +++ b/dlls/browseui/resids.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_CANCELLING 16 #define IDC_ANIMATION 100 diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc deleted file mode 100644 index e593c389785..00000000000 --- a/dlls/browseui/rsrc.rc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2007 Mikolaj Zalewski - * - * 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 "commctrl.h" - -#include "resids.h" - -#include "version.rc" - -#include "rsrc_De.rc" -#include "rsrc_En.rc" -#include "rsrc_Es.rc" -#include "rsrc_Fr.rc" -#include "rsrc_Ja.rc" -#include "rsrc_Ko.rc" -#include "rsrc_Lt.rc" -#include "rsrc_Nl.rc" -#include "rsrc_No.rc" -#include "rsrc_Pl.rc" -#include "rsrc_Pt.rc" -#include "rsrc_Ro.rc" -#include "rsrc_Ru.rc" -#include "rsrc_Si.rc" -#include "rsrc_Sv.rc" -#include "rsrc_Zh.rc" diff --git a/dlls/browseui/rsrc_De.rc b/dlls/browseui/rsrc_De.rc index c5c237fe7cb..b32400cef69 100644 --- a/dlls/browseui/rsrc_De.rc +++ b/dlls/browseui/rsrc_De.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_En.rc b/dlls/browseui/rsrc_En.rc index 1749d1cb6ff..c6f597e26cf 100644 --- a/dlls/browseui/rsrc_En.rc +++ b/dlls/browseui/rsrc_En.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Es.rc b/dlls/browseui/rsrc_Es.rc index d1478a837b8..0fe5d14bb12 100644 --- a/dlls/browseui/rsrc_Es.rc +++ b/dlls/browseui/rsrc_Es.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Fr.rc b/dlls/browseui/rsrc_Fr.rc index 85bca2fd6f1..5db8abc3b39 100644 --- a/dlls/browseui/rsrc_Fr.rc +++ b/dlls/browseui/rsrc_Fr.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Ja.rc b/dlls/browseui/rsrc_Ja.rc index ee784147374..9274c195eeb 100644 --- a/dlls/browseui/rsrc_Ja.rc +++ b/dlls/browseui/rsrc_Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" + /* UTF-8 */ #pragma code_page(65001) @@ -38,5 +40,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "キャンセル(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Ko.rc b/dlls/browseui/rsrc_Ko.rc index e3d0d6d79e7..c6d4a68fb6c 100644 --- a/dlls/browseui/rsrc_Ko.rc +++ b/dlls/browseui/rsrc_Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Lt.rc b/dlls/browseui/rsrc_Lt.rc index 8814534bcdc..fabad168e70 100644 --- a/dlls/browseui/rsrc_Lt.rc +++ b/dlls/browseui/rsrc_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" + /* UTF-8 */ #pragma code_page(65001) @@ -38,5 +40,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Atsisakyti", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Nl.rc b/dlls/browseui/rsrc_Nl.rc index 06ee906818b..c15f63128dd 100644 --- a/dlls/browseui/rsrc_Nl.rc +++ b/dlls/browseui/rsrc_Nl.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_No.rc b/dlls/browseui/rsrc_No.rc index 88798cc9151..dc980765782 100644 --- a/dlls/browseui/rsrc_No.rc +++ b/dlls/browseui/rsrc_No.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/dlls/browseui/rsrc_Pl.rc b/dlls/browseui/rsrc_Pl.rc index 1f638904e1b..1677c03bd66 100644 --- a/dlls/browseui/rsrc_Pl.rc +++ b/dlls/browseui/rsrc_Pl.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Pt.rc b/dlls/browseui/rsrc_Pt.rc index a1f446cc10b..fe07405a062 100644 --- a/dlls/browseui/rsrc_Pt.rc +++ b/dlls/browseui/rsrc_Pt.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Ro.rc b/dlls/browseui/rsrc_Ro.rc index faf3afa1144..5da07e7582b 100644 --- a/dlls/browseui/rsrc_Ro.rc +++ b/dlls/browseui/rsrc_Ro.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -39,5 +40,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Renunță", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Ru.rc b/dlls/browseui/rsrc_Ru.rc index bab8e449287..40e26f940ae 100644 --- a/dlls/browseui/rsrc_Ru.rc +++ b/dlls/browseui/rsrc_Ru.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Si.rc b/dlls/browseui/rsrc_Si.rc index e4541f79f48..a4ca2ec0b9a 100644 --- a/dlls/browseui/rsrc_Si.rc +++ b/dlls/browseui/rsrc_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -37,5 +39,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Prekliči", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Sv.rc b/dlls/browseui/rsrc_Sv.rc index 795f73728ae..544d62ba6c8 100644 --- a/dlls/browseui/rsrc_Sv.rc +++ b/dlls/browseui/rsrc_Sv.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Zh.rc b/dlls/browseui/rsrc_Zh.rc index 92a3e07b6d7..52c067256c0 100644 --- a/dlls/browseui/rsrc_Zh.rc +++ b/dlls/browseui/rsrc_Zh.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -61,5 +62,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "取消(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) -- 2.11.4.GIT