diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 5d41598b179..0f2be7fc609 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -30,7 +30,32 @@ C_SRCS = \ variant.c \ vartype.c -RC_SRCS = oleaut32.rc +RC_SRCS = \ + oleaut32_Bg.rc \ + oleaut32_Cz.rc \ + oleaut32_Da.rc \ + oleaut32_De.rc \ + oleaut32_El.rc \ + oleaut32_En.rc \ + oleaut32_Eo.rc \ + oleaut32_Es.rc \ + oleaut32_Fr.rc \ + oleaut32_Hu.rc \ + oleaut32_It.rc \ + oleaut32_Ko.rc \ + oleaut32_Lt.rc \ + oleaut32_Nl.rc \ + oleaut32_No.rc \ + oleaut32_Pl.rc \ + oleaut32_Pt.rc \ + oleaut32_Ro.rc \ + oleaut32_Ru.rc \ + oleaut32_Si.rc \ + oleaut32_Sv.rc \ + oleaut32_Th.rc \ + oleaut32_Tr.rc \ + oleaut32_Zh.rc \ + version.rc IDL_P_SRCS = \ oleaut32_oaidl.idl \ diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc deleted file mode 100644 index 156a8f96f19..00000000000 --- a/dlls/oleaut32/oleaut32.rc +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Top level resource file for oleaut32 - * - * Copyright 2003 Jon Griffiths - * - * 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 "resource.h" - -#include "version.rc" - -#include "oleaut32_Bg.rc" -#include "oleaut32_Da.rc" -#include "oleaut32_De.rc" -#include "oleaut32_El.rc" -#include "oleaut32_En.rc" -#include "oleaut32_Eo.rc" -#include "oleaut32_Es.rc" -#include "oleaut32_Cz.rc" -#include "oleaut32_Fr.rc" -#include "oleaut32_Hu.rc" -#include "oleaut32_It.rc" -#include "oleaut32_Ko.rc" -#include "oleaut32_Lt.rc" -#include "oleaut32_Nl.rc" -#include "oleaut32_No.rc" -#include "oleaut32_Pl.rc" -#include "oleaut32_Pt.rc" -#include "oleaut32_Ro.rc" -#include "oleaut32_Ru.rc" -#include "oleaut32_Si.rc" -#include "oleaut32_Sv.rc" -#include "oleaut32_Th.rc" -#include "oleaut32_Tr.rc" -#include "oleaut32_Zh.rc" - -/* - * FIXME: - * Finnish, Greek, Hebrew, Japanese, Korean, - * Turkish (at least) are localised in XP Home. - * I expect Chinese etc are localised in Asian Editions also. - */ diff --git a/dlls/oleaut32/oleaut32_Bg.rc b/dlls/oleaut32/oleaut32_Bg.rc index 7e930f41020..7f0180b2b09 100644 --- a/dlls/oleaut32/oleaut32_Bg.rc +++ b/dlls/oleaut32/oleaut32_Bg.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Cz.rc b/dlls/oleaut32/oleaut32_Cz.rc index 7075b43cc0e..48be0b70a82 100644 --- a/dlls/oleaut32/oleaut32_Cz.rc +++ b/dlls/oleaut32/oleaut32_Cz.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Da.rc b/dlls/oleaut32/oleaut32_Da.rc index 6f1dcbcad91..e28922fa1bf 100644 --- a/dlls/oleaut32/oleaut32_Da.rc +++ b/dlls/oleaut32/oleaut32_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_De.rc b/dlls/oleaut32/oleaut32_De.rc index 9fb786cfca0..e0ae38b9190 100644 --- a/dlls/oleaut32/oleaut32_De.rc +++ b/dlls/oleaut32/oleaut32_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_El.rc b/dlls/oleaut32/oleaut32_El.rc index 145c1a12959..a0337950262 100644 --- a/dlls/oleaut32/oleaut32_El.rc +++ b/dlls/oleaut32/oleaut32_El.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_En.rc b/dlls/oleaut32/oleaut32_En.rc index e56eb11d6e3..6a98642e7ca 100644 --- a/dlls/oleaut32/oleaut32_En.rc +++ b/dlls/oleaut32/oleaut32_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Eo.rc b/dlls/oleaut32/oleaut32_Eo.rc index c00e2fd4f44..ae67139109e 100644 --- a/dlls/oleaut32/oleaut32_Eo.rc +++ b/dlls/oleaut32/oleaut32_Eo.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Es.rc b/dlls/oleaut32/oleaut32_Es.rc index 5cc25ca49d5..5c187db364f 100644 --- a/dlls/oleaut32/oleaut32_Es.rc +++ b/dlls/oleaut32/oleaut32_Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Fr.rc b/dlls/oleaut32/oleaut32_Fr.rc index 40e392ee162..d6136ef8cda 100644 --- a/dlls/oleaut32/oleaut32_Fr.rc +++ b/dlls/oleaut32/oleaut32_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Hu.rc b/dlls/oleaut32/oleaut32_Hu.rc index 35283c8314a..ec3b9827e3f 100644 --- a/dlls/oleaut32/oleaut32_Hu.rc +++ b/dlls/oleaut32/oleaut32_Hu.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_It.rc b/dlls/oleaut32/oleaut32_It.rc index 0dee161a217..69fa31a34a7 100644 --- a/dlls/oleaut32/oleaut32_It.rc +++ b/dlls/oleaut32/oleaut32_It.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Ko.rc b/dlls/oleaut32/oleaut32_Ko.rc index 0134c7a54b9..541380543a5 100644 --- a/dlls/oleaut32/oleaut32_Ko.rc +++ b/dlls/oleaut32/oleaut32_Ko.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Lt.rc b/dlls/oleaut32/oleaut32_Lt.rc index 202a5d39dec..c568d93cb78 100644 --- a/dlls/oleaut32/oleaut32_Lt.rc +++ b/dlls/oleaut32/oleaut32_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -32,5 +34,3 @@ STRINGTABLE DISCARDABLE IDS_ON "Įjungta" IDS_OFF "Išjungta" } - -#pragma code_page(default) diff --git a/dlls/oleaut32/oleaut32_Nl.rc b/dlls/oleaut32/oleaut32_Nl.rc index 6affb2d638c..e2ae3dea380 100644 --- a/dlls/oleaut32/oleaut32_Nl.rc +++ b/dlls/oleaut32/oleaut32_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_No.rc b/dlls/oleaut32/oleaut32_No.rc index 7ca883c350d..1f99f7bbe56 100644 --- a/dlls/oleaut32/oleaut32_No.rc +++ b/dlls/oleaut32/oleaut32_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Pl.rc b/dlls/oleaut32/oleaut32_Pl.rc index 8c250cbbb9f..7d34796fd0b 100644 --- a/dlls/oleaut32/oleaut32_Pl.rc +++ b/dlls/oleaut32/oleaut32_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Pt.rc b/dlls/oleaut32/oleaut32_Pt.rc index 1cbd389209a..de008bbd0f9 100644 --- a/dlls/oleaut32/oleaut32_Pt.rc +++ b/dlls/oleaut32/oleaut32_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Ro.rc b/dlls/oleaut32/oleaut32_Ro.rc index 52421a8cca2..3a37a69ddef 100644 --- a/dlls/oleaut32/oleaut32_Ro.rc +++ b/dlls/oleaut32/oleaut32_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -30,5 +32,3 @@ STRINGTABLE DISCARDABLE IDS_ON "Activat" IDS_OFF "Dezactivat" } - -#pragma code_page(default) diff --git a/dlls/oleaut32/oleaut32_Ru.rc b/dlls/oleaut32/oleaut32_Ru.rc index 194ca9e1a8e..7555c3aa25a 100644 --- a/dlls/oleaut32/oleaut32_Ru.rc +++ b/dlls/oleaut32/oleaut32_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Si.rc b/dlls/oleaut32/oleaut32_Si.rc index 365d877045c..32a80adefb6 100644 --- a/dlls/oleaut32/oleaut32_Si.rc +++ b/dlls/oleaut32/oleaut32_Si.rc @@ -18,6 +18,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 @@ -31,5 +33,3 @@ STRINGTABLE DISCARDABLE IDS_ON "Vključeno" IDS_OFF "Izključeno" } - -#pragma code_page(default) diff --git a/dlls/oleaut32/oleaut32_Sv.rc b/dlls/oleaut32/oleaut32_Sv.rc index 387b25eb0c4..4362a068bab 100644 --- a/dlls/oleaut32/oleaut32_Sv.rc +++ b/dlls/oleaut32/oleaut32_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Th.rc b/dlls/oleaut32/oleaut32_Th.rc index 22f01f74ee3..8fcf212a969 100644 --- a/dlls/oleaut32/oleaut32_Th.rc +++ b/dlls/oleaut32/oleaut32_Th.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_THAI, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Tr.rc b/dlls/oleaut32/oleaut32_Tr.rc index cc2f3e6f878..08d841a92a4 100644 --- a/dlls/oleaut32/oleaut32_Tr.rc +++ b/dlls/oleaut32/oleaut32_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_Zh.rc b/dlls/oleaut32/oleaut32_Zh.rc index 320c40ff5dd..bbb9e06433e 100644 --- a/dlls/oleaut32/oleaut32_Zh.rc +++ b/dlls/oleaut32/oleaut32_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) @@ -44,5 +46,3 @@ STRINGTABLE DISCARDABLE IDS_ON "開" IDS_OFF "關" } - -#pragma code_page(default) diff --git a/dlls/oleaut32/resource.h b/dlls/oleaut32/resource.h index 5c72c7e0acb..550170afc61 100644 --- a/dlls/oleaut32/resource.h +++ b/dlls/oleaut32/resource.h @@ -20,6 +20,8 @@ #ifndef WINE_OLEAUT32_RESOURCE_H #define WINE_OLEAUT32_RESOURCE_H +#include + /* Localised boolean text */ #define IDS_TRUE 100 #define IDS_FALSE 101