diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index fe92cf9cf27..98cd7e982ee 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -14,7 +14,31 @@ C_SRCS = \ pwcache.c \ wnet.c -RC_SRCS = mpr.rc +RC_SRCS = \ + mpr_Bg.rc \ + mpr_Cs.rc \ + mpr_Da.rc \ + mpr_De.rc \ + mpr_En.rc \ + mpr_Eo.rc \ + mpr_Es.rc \ + mpr_Fr.rc \ + mpr_Hu.rc \ + mpr_It.rc \ + mpr_Ja.rc \ + mpr_Ko.rc \ + mpr_Lt.rc \ + mpr_Nl.rc \ + mpr_No.rc \ + mpr_Pl.rc \ + mpr_Pt.rc \ + mpr_Ro.rc \ + mpr_Ru.rc \ + mpr_Si.rc \ + mpr_Sv.rc \ + mpr_Tr.rc \ + mpr_Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc deleted file mode 100644 index adc0d722a1f..00000000000 --- a/dlls/mpr/mpr.rc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * MPR dll resources - * - * Copyright (C) 2004 Juan Lang - * - * 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 "winbase.h" -#include "winuser.h" -#include "mprres.h" - -#include "version.rc" - -#include "mpr_Bg.rc" -#include "mpr_Cs.rc" -#include "mpr_Da.rc" -#include "mpr_De.rc" -#include "mpr_En.rc" -#include "mpr_Eo.rc" -#include "mpr_Es.rc" -#include "mpr_Fr.rc" -#include "mpr_Hu.rc" -#include "mpr_It.rc" -#include "mpr_Ja.rc" -#include "mpr_Ko.rc" -#include "mpr_Lt.rc" -#include "mpr_Nl.rc" -#include "mpr_No.rc" -#include "mpr_Pl.rc" -#include "mpr_Pt.rc" -#include "mpr_Ro.rc" -#include "mpr_Ru.rc" -#include "mpr_Si.rc" -#include "mpr_Sv.rc" -#include "mpr_Tr.rc" -#include "mpr_Zh.rc" diff --git a/dlls/mpr/mpr_Bg.rc b/dlls/mpr/mpr_Bg.rc index a37f7961be1..52353d2a066 100644 --- a/dlls/mpr/mpr_Bg.rc +++ b/dlls/mpr/mpr_Bg.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Cs.rc b/dlls/mpr/mpr_Cs.rc index 6085e7160c6..8e32de4747e 100644 --- a/dlls/mpr/mpr_Cs.rc +++ b/dlls/mpr/mpr_Cs.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/dlls/mpr/mpr_Da.rc b/dlls/mpr/mpr_Da.rc index 5b6f99fbd04..52dc635d19a 100644 --- a/dlls/mpr/mpr_Da.rc +++ b/dlls/mpr/mpr_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_De.rc b/dlls/mpr/mpr_De.rc index 41429be5501..662cad5168e 100644 --- a/dlls/mpr/mpr_De.rc +++ b/dlls/mpr/mpr_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_En.rc b/dlls/mpr/mpr_En.rc index c71840423f4..c6fdf727785 100644 --- a/dlls/mpr/mpr_En.rc +++ b/dlls/mpr/mpr_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Eo.rc b/dlls/mpr/mpr_Eo.rc index 0ed9f470d40..2701f759507 100644 --- a/dlls/mpr/mpr_Eo.rc +++ b/dlls/mpr/mpr_Eo.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Es.rc b/dlls/mpr/mpr_Es.rc index d82758cbeae..630a9fe9141 100644 --- a/dlls/mpr/mpr_Es.rc +++ b/dlls/mpr/mpr_Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Fr.rc b/dlls/mpr/mpr_Fr.rc index ba43eefa077..7fbbc95db4f 100644 --- a/dlls/mpr/mpr_Fr.rc +++ b/dlls/mpr/mpr_Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Hu.rc b/dlls/mpr/mpr_Hu.rc index d3561cb3fe6..32c32dd6da6 100644 --- a/dlls/mpr/mpr_Hu.rc +++ b/dlls/mpr/mpr_Hu.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_It.rc b/dlls/mpr/mpr_It.rc index 501644d0978..7067ee37d96 100644 --- a/dlls/mpr/mpr_It.rc +++ b/dlls/mpr/mpr_It.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Ja.rc b/dlls/mpr/mpr_Ja.rc index ad1a45685b3..7cd68f07754 100644 --- a/dlls/mpr/mpr_Ja.rc +++ b/dlls/mpr/mpr_Ja.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + /* UTF-8 */ #pragma code_page(65001) @@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE { IDS_ENTIRENETWORK "ネットワーク全体" } - -#pragma code_page(default) diff --git a/dlls/mpr/mpr_Ko.rc b/dlls/mpr/mpr_Ko.rc index 75688cda4e8..4ebbd8f3575 100644 --- a/dlls/mpr/mpr_Ko.rc +++ b/dlls/mpr/mpr_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Lt.rc b/dlls/mpr/mpr_Lt.rc index aa5dd14a9fa..d086d94c3b7 100644 --- a/dlls/mpr/mpr_Lt.rc +++ b/dlls/mpr/mpr_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + /* UTF-8 */ #pragma code_page(65001) @@ -47,5 +49,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mpr/mpr_Nl.rc b/dlls/mpr/mpr_Nl.rc index 430ac6aa8c8..b1c67819799 100644 --- a/dlls/mpr/mpr_Nl.rc +++ b/dlls/mpr/mpr_Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_No.rc b/dlls/mpr/mpr_No.rc index 32833542db9..150ee509edb 100644 --- a/dlls/mpr/mpr_No.rc +++ b/dlls/mpr/mpr_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Pl.rc b/dlls/mpr/mpr_Pl.rc index a6f2446f3ea..afdd3ba6343 100644 --- a/dlls/mpr/mpr_Pl.rc +++ b/dlls/mpr/mpr_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Pt.rc b/dlls/mpr/mpr_Pt.rc index f79a96dcab8..cb86d52845f 100644 --- a/dlls/mpr/mpr_Pt.rc +++ b/dlls/mpr/mpr_Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Ro.rc b/dlls/mpr/mpr_Ro.rc index ce06328ef80..ab7d137e2b2 100644 --- a/dlls/mpr/mpr_Ro.rc +++ b/dlls/mpr/mpr_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -44,5 +46,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Renunță", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mpr/mpr_Ru.rc b/dlls/mpr/mpr_Ru.rc index d093c0612bb..5995b4910d6 100644 --- a/dlls/mpr/mpr_Ru.rc +++ b/dlls/mpr/mpr_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Si.rc b/dlls/mpr/mpr_Si.rc index 064bf525978..8f4022e402f 100644 --- a/dlls/mpr/mpr_Si.rc +++ b/dlls/mpr/mpr_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -46,5 +48,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Prekliči", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mpr/mpr_Sv.rc b/dlls/mpr/mpr_Sv.rc index ef6a685c44d..86d0db6602a 100644 --- a/dlls/mpr/mpr_Sv.rc +++ b/dlls/mpr/mpr_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Tr.rc b/dlls/mpr/mpr_Tr.rc index b9f3af1fa03..0f48a156a31 100644 --- a/dlls/mpr/mpr_Tr.rc +++ b/dlls/mpr/mpr_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_Zh.rc b/dlls/mpr/mpr_Zh.rc index 47eb629131b..661e6b4afcd 100644 --- a/dlls/mpr/mpr_Zh.rc +++ b/dlls/mpr/mpr_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mprres.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -74,5 +76,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "確定", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mpr/mprres.h b/dlls/mpr/mprres.h index 292b4765260..5c42e565477 100644 --- a/dlls/mpr/mprres.h +++ b/dlls/mpr/mprres.h @@ -18,6 +18,9 @@ #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ +#include +#include + #define IDS_ENTIRENETWORK 1 #define IDD_PROXYDLG 0x400