July 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : shell32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: ee8c98c05cadf8d8fabb77e40ba3dabf1f69feb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8c98c05cadf8d8fabb77e40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:19 2009 +0200 shell32: Build language resource files separately. Do not include them from an other rc file. --- dlls/shell32/Makefile.in | 32 +++++++++++++++++++++++++++++- dlls/shell32/shell32_Bg.rc | 2 + dlls/shell32/shell32_Ca.rc | 2 + dlls/shell32/shell32_Cs.rc | 2 + dlls/shell32/shell32_Da.rc | 2 + dlls/shell32/shell32_De.rc | 2 + dlls/shell32/shell32_En.rc | 2 + dlls/shell32/shell32_Eo.rc | 2 + dlls/shell32/shell32_Es.rc | 2 + dlls/shell32/shell32_Fi.rc | 2 + dlls/shell32/shell32_Fr.rc | 4 +- dlls/shell32/shell32_Hu.rc | 2 + dlls/shell32/shell32_It.rc | 2 + dlls/shell32/shell32_Ja.rc | 4 +- dlls/shell32/shell32_Ko.rc | 2 + dlls/shell32/shell32_Lt.rc | 4 +- dlls/shell32/shell32_Nl.rc | 2 + dlls/shell32/shell32_No.rc | 2 + dlls/shell32/shell32_Pl.rc | 2 + dlls/shell32/shell32_Pt.rc | 2 + dlls/shell32/shell32_Ro.rc | 4 +- dlls/shell32/shell32_Ru.rc | 2 + dlls/shell32/shell32_Si.rc | 5 +-- dlls/shell32/shell32_Sk.rc | 2 + dlls/shell32/shell32_Sv.rc | 2 + dlls/shell32/shell32_Tr.rc | 2 + dlls/shell32/shell32_Uk.rc | 2 + dlls/shell32/shell32_Wa.rc | 2 + dlls/shell32/shell32_Zh.rc | 4 +- dlls/shell32/shres.rc | 46 -------------------------------------------- dlls/shell32/shresdef.h | 7 ++++++ 31 files changed, 94 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee8c98c05cadf8d8fabb7…

1 0

Tobias Jakobi : wined3d: Add ps_arb_max_local_constants.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 2d532a1597f3fc2830a3c627ea6451f4680919c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d532a1597f3fc2830a3c627e… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:45 2009 +0200 wined3d: Add ps_arb_max_local_constants. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 523528f..4d16957 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -719,6 +719,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->ps_glsl_constantsF = 0; gl_info->vs_arb_constantsF = 0; gl_info->ps_arb_constantsF = 0; + gl_info->ps_arb_max_local_constants = 0; /* Retrieve opengl defaults */ glGetIntegerv(GL_MAX_CLIP_PLANES, &gl_max); @@ -931,6 +932,9 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->ps_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d\n", gl_info->ps_arb_constantsF); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &gl_max)); + gl_info->ps_arb_max_local_constants = gl_max; + TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM local float constants: %d\n", gl_info->ps_arb_max_local_constants); GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); gl_info->ps_arb_max_temps = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native temporaries: %d\n", gl_info->ps_arb_max_temps); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index da35319..0c5cae5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3988,6 +3988,7 @@ typedef struct _WineD3D_GL_Info { unsigned vs_arb_max_instructions; unsigned vs_arb_max_temps; unsigned ps_arb_constantsF; + unsigned ps_arb_max_local_constants; unsigned ps_arb_max_instructions; unsigned ps_arb_max_temps; unsigned vs_glsl_constantsF;

1 0

Michael Stefaniuc : reg: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: dd2d38355b74928dc320cecb8baacec661ae467c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2d38355b74928dc320cecb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:29:26 2009 +0200 reg: Build language resource files separately. Do not include them from an other rc file. --- programs/reg/Da.rc | 2 ++ programs/reg/De.rc | 4 ++-- programs/reg/En.rc | 2 ++ programs/reg/Fr.rc | 2 ++ programs/reg/Ja.rc | 4 ++-- programs/reg/Ko.rc | 2 ++ programs/reg/Lt.rc | 4 ++-- programs/reg/Makefile.in | 15 ++++++++++++++- programs/reg/Nl.rc | 2 ++ programs/reg/No.rc | 2 ++ programs/reg/Pl.rc | 2 ++ programs/reg/Pt.rc | 2 ++ programs/reg/Ru.rc | 2 ++ programs/reg/Si.rc | 4 ++-- programs/reg/reg.h | 2 ++ programs/reg/rsrc.rc | 37 ------------------------------------- 16 files changed, 42 insertions(+), 46 deletions(-) diff --git a/programs/reg/Da.rc b/programs/reg/Da.rc index c385d0a..353b94d 100644 --- a/programs/reg/Da.rc +++ b/programs/reg/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/De.rc b/programs/reg/De.rc index 9768c60..0940640 100644 --- a/programs/reg/De.rc +++ b/programs/reg/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -36,5 +38,3 @@ STRINGTABLE STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum remote Rechner hinzufügen\n" STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n" } - -#pragma code_page(default) diff --git a/programs/reg/En.rc b/programs/reg/En.rc index e713416..10cfa2b 100644 --- a/programs/reg/En.rc +++ b/programs/reg/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc index 671ebf6..cb5de82 100644 --- a/programs/reg/Fr.rc +++ b/programs/reg/Fr.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/reg/Ja.rc b/programs/reg/Ja.rc index 9163132..a2c1434 100644 --- a/programs/reg/Ja.rc +++ b/programs/reg/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + /* UTF-8 */ #pragma code_page(65001) @@ -31,5 +33,3 @@ STRINGTABLE STRING_DELETE_USAGE, "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY キー名 [/v 値名 | /ve] [/s]\n" } - -#pragma code_page(default) diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc index e9ebbee..46efd91 100644 --- a/programs/reg/Ko.rc +++ b/programs/reg/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Lt.rc b/programs/reg/Lt.rc index d0e0fe3..98aea18 100644 --- a/programs/reg/Lt.rc +++ b/programs/reg/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + /* UTF-8 */ #pragma code_page(65001) @@ -36,5 +38,3 @@ STRINGTABLE STRING_NO_REMOTE, "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n" STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" } - -#pragma code_page(default) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 6fb05f1..de4d2c8 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -10,7 +10,20 @@ DELAYIMPORTS = user32 C_SRCS = reg.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc @MAKE_PROG_RULES@ diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc index c6a89f1..c34e395 100644 --- a/programs/reg/Nl.rc +++ b/programs/reg/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/reg/No.rc b/programs/reg/No.rc index 5b9a33d..5ad032d 100644 --- a/programs/reg/No.rc +++ b/programs/reg/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/programs/reg/Pl.rc b/programs/reg/Pl.rc index 51ae0e1..01c4244 100644 --- a/programs/reg/Pl.rc +++ b/programs/reg/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Pt.rc b/programs/reg/Pt.rc index 2918883..6294408 100644 --- a/programs/reg/Pt.rc +++ b/programs/reg/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc index 0d895a3..8e07c4c 100644 --- a/programs/reg/Ru.rc +++ b/programs/reg/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/reg/Si.rc b/programs/reg/Si.rc index 84a339a..6f3e01c 100644 --- a/programs/reg/Si.rc +++ b/programs/reg/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "reg.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -35,5 +37,3 @@ STRINGTABLE STRING_NO_REMOTE, "Napaka: Na morem dodati ključa na oddaljen računalnik\n" STRING_CANNOT_FIND, "Napaka: Sistem ni našel zahtevanega ključa ali vrednosti\n" } - -#pragma code_page(default) diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 6d4ae47..2221647 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + /* Translation IDs. */ #define STRING_USAGE 101 #define STRING_ADD_USAGE 102 diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc deleted file mode 100644 index aa70a4b..0000000 --- a/programs/reg/rsrc.rc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2008 Andrew Riedi - * - * 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 "reg.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc"

1 0

Michael Stefaniuc : localspl: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: c3067a74d55dc14925e16e6b1c818846c590caa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3067a74d55dc14925e16e6b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:39 2009 +0200 localspl: Build language resource files separately. Do not include them from an other rc file. --- dlls/localspl/Makefile.in | 18 +++++++++++++++++- dlls/localspl/localspl.rc | 19 ------------------- dlls/localspl/localspl_private.h | 1 + dlls/localspl/spl_Da.rc | 4 +++- dlls/localspl/spl_De.rc | 2 ++ dlls/localspl/spl_En.rc | 2 ++ dlls/localspl/spl_Fr.rc | 2 ++ dlls/localspl/spl_Ko.rc | 2 ++ dlls/localspl/spl_Lt.rc | 4 ++-- dlls/localspl/spl_Nl.rc | 2 ++ dlls/localspl/spl_No.rc | 2 ++ dlls/localspl/spl_Pl.rc | 2 ++ dlls/localspl/spl_Pt.rc | 2 ++ dlls/localspl/spl_Ro.rc | 2 ++ dlls/localspl/spl_Ru.rc | 2 ++ dlls/localspl/spl_Si.rc | 4 ++-- dlls/localspl/spl_Sv.rc | 2 ++ dlls/localspl/spl_Zh.rc | 4 ++-- 18 files changed, 49 insertions(+), 27 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 4850363..9fa087d 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -10,7 +10,23 @@ C_SRCS = \ localspl_main.c \ provider.c -RC_SRCS = localspl.rc +RC_SRCS = \ + localspl.rc \ + spl_Da.rc \ + spl_De.rc \ + spl_En.rc \ + spl_Fr.rc \ + spl_Ko.rc \ + spl_Lt.rc \ + spl_Nl.rc \ + spl_No.rc \ + spl_Pl.rc \ + spl_Pt.rc \ + spl_Ro.rc \ + spl_Ru.rc \ + spl_Si.rc \ + spl_Sv.rc \ + spl_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 8d0563f..9757afd 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winver.h" #include "localspl_private.h" #define WINE_FILENAME_STR "localspl.dll" @@ -35,19 +32,3 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" #include "wine/wine_common_ver.rc" - -#include "spl_En.rc" -#include "spl_Da.rc" -#include "spl_De.rc" -#include "spl_Fr.rc" -#include "spl_Ko.rc" -#include "spl_Lt.rc" -#include "spl_Nl.rc" -#include "spl_No.rc" -#include "spl_Pl.rc" -#include "spl_Pt.rc" -#include "spl_Ro.rc" -#include "spl_Ru.rc" -#include "spl_Si.rc" -#include "spl_Sv.rc" -#include "spl_Zh.rc" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 5174a1a..952c1f6 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -21,6 +21,7 @@ #ifndef __WINE_LOCALSPL_PRIVATE__ #define __WINE_LOCALSPL_PRIVATE__ +#include <windef.h> /* ## DLL-wide Globals ## */ extern HINSTANCE LOCALSPL_hInstance; diff --git a/dlls/localspl/spl_Da.rc b/dlls/localspl/spl_Da.rc index a149cab..cf1f318 100644 --- a/dlls/localspl/spl_Da.rc +++ b/dlls/localspl/spl_Da.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +#include "localspl_private.h" + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc index 4c95e2b..4e6616e 100644 --- a/dlls/localspl/spl_De.rc +++ b/dlls/localspl/spl_De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_En.rc b/dlls/localspl/spl_En.rc index c9d12f4..d189c26 100644 --- a/dlls/localspl/spl_En.rc +++ b/dlls/localspl/spl_En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Fr.rc b/dlls/localspl/spl_Fr.rc index 9526972..0e93dc8 100644 --- a/dlls/localspl/spl_Fr.rc +++ b/dlls/localspl/spl_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc index fe2d572..86db867 100644 --- a/dlls/localspl/spl_Ko.rc +++ b/dlls/localspl/spl_Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Lt.rc b/dlls/localspl/spl_Lt.rc index 321ab06..4c72767 100644 --- a/dlls/localspl/spl_Lt.rc +++ b/dlls/localspl/spl_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -28,5 +30,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "Vietinis prievadas" IDS_LOCALMONITOR "Vietinis monitorius" } - -#pragma code_page(default) diff --git a/dlls/localspl/spl_Nl.rc b/dlls/localspl/spl_Nl.rc index b9d4c5c..bd02446 100644 --- a/dlls/localspl/spl_Nl.rc +++ b/dlls/localspl/spl_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_No.rc b/dlls/localspl/spl_No.rc index 5efa563..b81a7b7 100644 --- a/dlls/localspl/spl_No.rc +++ b/dlls/localspl/spl_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Pl.rc b/dlls/localspl/spl_Pl.rc index a080208..cdbb422 100644 --- a/dlls/localspl/spl_Pl.rc +++ b/dlls/localspl/spl_Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Pt.rc b/dlls/localspl/spl_Pt.rc index 8ec66c5..79506c3 100644 --- a/dlls/localspl/spl_Pt.rc +++ b/dlls/localspl/spl_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ro.rc b/dlls/localspl/spl_Ro.rc index 4432195..499d75b 100644 --- a/dlls/localspl/spl_Ro.rc +++ b/dlls/localspl/spl_Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ru.rc b/dlls/localspl/spl_Ru.rc index 1ee1e2f..fb51446 100644 --- a/dlls/localspl/spl_Ru.rc +++ b/dlls/localspl/spl_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Si.rc b/dlls/localspl/spl_Si.rc index 66ca2c4..11928ab 100644 --- a/dlls/localspl/spl_Si.rc +++ b/dlls/localspl/spl_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "Lokalna vrata" IDS_LOCALMONITOR "Lokalen monitor" } - -#pragma code_page(default) diff --git a/dlls/localspl/spl_Sv.rc b/dlls/localspl/spl_Sv.rc index fca0d6b..2831da6 100644 --- a/dlls/localspl/spl_Sv.rc +++ b/dlls/localspl/spl_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Zh.rc b/dlls/localspl/spl_Zh.rc index c5db382..108cb50 100644 --- a/dlls/localspl/spl_Zh.rc +++ b/dlls/localspl/spl_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localspl_private.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -36,5 +38,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "本地端口" IDS_LOCALMONITOR "本地監視器" } - -#pragma code_page(default)

1 0

Michael Stefaniuc : taskmgr: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: c02f249888f4eb3743d416302ac5fdac00ba02cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02f249888f4eb3743d416302… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:20 2009 +0200 taskmgr: Build language resource files separately. Do not include them from an other rc file. --- programs/taskmgr/Da.rc | 2 ++ programs/taskmgr/De.rc | 2 ++ programs/taskmgr/En.rc | 2 ++ programs/taskmgr/Fr.rc | 2 ++ programs/taskmgr/Ja.rc | 4 ++-- programs/taskmgr/Ko.rc | 2 ++ programs/taskmgr/Lt.rc | 4 ++-- programs/taskmgr/Makefile.in | 19 ++++++++++++++++++- programs/taskmgr/Nl.rc | 2 ++ programs/taskmgr/No.rc | 2 ++ programs/taskmgr/Pl.rc | 2 ++ programs/taskmgr/Pt.rc | 2 ++ programs/taskmgr/Ru.rc | 2 ++ programs/taskmgr/Si.rc | 4 ++-- programs/taskmgr/Sv.rc | 2 ++ programs/taskmgr/Tr.rc | 2 ++ programs/taskmgr/Zh.rc | 4 ++-- programs/taskmgr/resource.h | 5 +++++ programs/taskmgr/taskmgr.rc | 23 ----------------------- 19 files changed, 55 insertions(+), 32 deletions(-) diff --git a/programs/taskmgr/Da.rc b/programs/taskmgr/Da.rc index fb9bab0..fa59e93 100644 --- a/programs/taskmgr/Da.rc +++ b/programs/taskmgr/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index 8b96bc2..e1d3b19 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index ce2bdf5..45aa925 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index 617a2bc..0c435cb 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index e45d577..43334f2 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -488,5 +490,3 @@ BEGIN "プロセスの優先クラスを通常以下に設定します。" ID_PROCESS_PAGE_SETPRIORITY_LOW "プロセスの優先クラスを低に設定します。" END - -#pragma code_page(default) diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index 390371b..45e0911 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index c58647a..17cde26 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -560,5 +562,3 @@ BEGIN IDS_DEBUG_CHANNEL_WARN "Warn (įspėjimas)" IDS_DEBUG_CHANNEL_TRACE "Trace (pėdsakas)" END - -#pragma code_page(default) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 153a598..2f2b40a 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -29,7 +29,24 @@ C_SRCS = \ taskmgr.c \ trayicon.c -RC_SRCS = taskmgr.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + taskmgr.rc @MAKE_PROG_RULES@ diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index 5d1860b..468769f 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc index f25eadc..19b6472 100644 --- a/programs/taskmgr/No.rc +++ b/programs/taskmgr/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* diff --git a/programs/taskmgr/Pl.rc b/programs/taskmgr/Pl.rc index 1453709..9a38b49 100644 --- a/programs/taskmgr/Pl.rc +++ b/programs/taskmgr/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc index 42ece36..a7926e5 100644 --- a/programs/taskmgr/Pt.rc +++ b/programs/taskmgr/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index e9d657b..d709513 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 670189b..4cfe73f 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -19,6 +19,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 @@ -486,5 +488,3 @@ BEGIN "Dodeli proces v PODPOVPREČNI prioritetni razred" ID_PROCESS_PAGE_SETPRIORITY_LOW "Dodeli proces v NIZEK prioritetni razred" END - -#pragma code_page(default) diff --git a/programs/taskmgr/Sv.rc b/programs/taskmgr/Sv.rc index 4e17787..a77eb61 100644 --- a/programs/taskmgr/Sv.rc +++ b/programs/taskmgr/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* diff --git a/programs/taskmgr/Tr.rc b/programs/taskmgr/Tr.rc index ac22a61..1149bb3 100644 --- a/programs/taskmgr/Tr.rc +++ b/programs/taskmgr/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* diff --git a/programs/taskmgr/Zh.rc b/programs/taskmgr/Zh.rc index cd7c061..969a404 100644 --- a/programs/taskmgr/Zh.rc +++ b/programs/taskmgr/Zh.rc @@ -19,6 +19,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) @@ -931,5 +933,3 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "將進程設為中等以下優先級" ID_PROCESS_PAGE_SETPRIORITY_LOW "將進程設為低優先級" END - -#pragma code_page(default) diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index 1b98ab0..b735ef4 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -4,6 +4,11 @@ * Used by taskmgr.rc * */ + +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDS_APP_TITLE 103 #define IDC_TASKMGR 109 #define IDS_RUNDLG_CAPTION 110 diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index d027a1e..ad295f2 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -19,31 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> -#include <commctrl.h> - #include "resource.h" -/* Language resources */ - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /*

1 0

Michael Stefaniuc : start: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 3b3e1a1ed010c16d766ca3e0cd56decf50d3151c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3e1a1ed010c16d766ca3e0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:14 2009 +0200 start: Build language resource files separately. Do not include them from an other rc file. --- programs/start/Cs.rc | 2 ++ programs/start/De.rc | 2 ++ programs/start/En.rc | 2 ++ programs/start/Es.rc | 2 ++ programs/start/Fr.rc | 4 ++-- programs/start/It.rc | 2 ++ programs/start/Ko.rc | 2 ++ programs/start/Lt.rc | 4 ++-- programs/start/Makefile.in | 17 ++++++++++++++++- programs/start/Nl.rc | 2 ++ programs/start/No.rc | 2 ++ programs/start/Pl.rc | 2 ++ programs/start/Pt.rc | 2 ++ programs/start/Ru.rc | 2 ++ programs/start/Si.rc | 4 ++-- programs/start/Tr.rc | 2 ++ programs/start/resources.h | 2 ++ programs/start/rsrc.rc | 39 --------------------------------------- 18 files changed, 48 insertions(+), 46 deletions(-) diff --git a/programs/start/Cs.rc b/programs/start/Cs.rc index 1693f8b..fa00dd0 100644 --- a/programs/start/Cs.rc +++ b/programs/start/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/start/De.rc b/programs/start/De.rc index 4f54a53..ac0cdf5 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/start/En.rc b/programs/start/En.rc index 0429fe9..463b6c2 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/start/Es.rc b/programs/start/Es.rc index ac1c6d7..83881c6 100644 --- a/programs/start/Es.rc +++ b/programs/start/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index a2c8fd7..343398e 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL #pragma code_page(65001) /* UTF-8 */ @@ -69,5 +71,3 @@ STRING_EXECFAIL "Le programme n'a pas pu être lancé, ou il n'y a pas de progra STRING_UNIXFAIL, "Le nom de fichier Unix spécifié n'a pas pu être converti en nom de fichier DOS." } - -#pragma code_page(default) /* Return to default encoding */ diff --git a/programs/start/It.rc b/programs/start/It.rc index 42f59ac..2ba5417 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 871aadc..4435d57 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/programs/start/Lt.rc b/programs/start/Lt.rc index 1717a84..8f0e52b 100644 --- a/programs/start/Lt.rc +++ b/programs/start/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -69,5 +71,3 @@ STRING_EXECFAIL, "Nepavyko paleisti programos arba nėra programos susietos su n STRING_UNIXFAIL "Nepavyko paversti nurodyto Unix failo pavadinimo į DOS failo pavadinimą." } - -#pragma code_page(default) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 976766f..a96fbce 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -9,7 +9,22 @@ IMPORTS = shell32 user32 kernel32 C_SRCS = start.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Tr.rc @MAKE_PROG_RULES@ diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 69012a1..50252fa 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/start/No.rc b/programs/start/No.rc index 15b4dbc..5d2da44 100644 --- a/programs/start/No.rc +++ b/programs/start/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/start/Pl.rc b/programs/start/Pl.rc index 09b9f51..d2df6ea 100644 --- a/programs/start/Pl.rc +++ b/programs/start/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/programs/start/Pt.rc b/programs/start/Pt.rc index 51ff53b..2305509 100644 --- a/programs/start/Pt.rc +++ b/programs/start/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index 97e9854..f30af43 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/start/Si.rc b/programs/start/Si.rc index e10ddf7..0ed1ff9 100644 --- a/programs/start/Si.rc +++ b/programs/start/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -66,5 +68,3 @@ STRING_EXECFAIL "Programa ni mogoče zagnati ali pa z datoteko te vrste ni povez STRING_UNIXFAIL "Navedenega Unix imena datoteke ni mogoče prevesti v DOS ime datoteke." } - -#pragma code_page(default) diff --git a/programs/start/Tr.rc b/programs/start/Tr.rc index de7a69d..fefc94b 100644 --- a/programs/start/Tr.rc +++ b/programs/start/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/start/resources.h b/programs/start/resources.h index f5abd31..fd8641d 100644 --- a/programs/start/resources.h +++ b/programs/start/resources.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + #define STRING_USAGE 101 #define STRING_LICENSE 102 #define STRING_EXECFAIL 103 diff --git a/programs/start/rsrc.rc b/programs/start/rsrc.rc deleted file mode 100644 index abfee94..0000000 --- a/programs/start/rsrc.rc +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2003 Dan Kegel - * - * 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 "resources.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "Cs.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Tr.rc"

1 0

Michael Stefaniuc : shdoclc: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 8919ba34987ae121c35aeb39e81ae7bfb738424d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8919ba34987ae121c35aeb39e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:07 2009 +0200 shdoclc: Build language resource files separately. Do not include them from an other rc file. --- dlls/shdoclc/Bg.rc | 1 + dlls/shdoclc/Da.rc | 1 + dlls/shdoclc/De.rc | 1 + dlls/shdoclc/En.rc | 1 + dlls/shdoclc/Es.rc | 1 + dlls/shdoclc/Fi.rc | 1 + dlls/shdoclc/Fr.rc | 1 + dlls/shdoclc/Hu.rc | 1 + dlls/shdoclc/Ko.rc | 1 + dlls/shdoclc/Lt.rc | 4 ++-- dlls/shdoclc/Makefile.in | 20 +++++++++++++++++++- dlls/shdoclc/Nl.rc | 1 + dlls/shdoclc/No.rc | 1 + dlls/shdoclc/Pt.rc | 1 + dlls/shdoclc/Ru.rc | 1 + dlls/shdoclc/Si.rc | 3 +-- dlls/shdoclc/Sv.rc | 1 + dlls/shdoclc/Tr.rc | 1 + dlls/shdoclc/Zh.rc | 3 +-- dlls/shdoclc/rsrc.rc | 42 ------------------------------------------ dlls/shdoclc/shdoclc.h | 3 +++ 21 files changed, 41 insertions(+), 49 deletions(-) diff --git a/dlls/shdoclc/Bg.rc b/dlls/shdoclc/Bg.rc index 814ac7c..0cec8ec 100644 --- a/dlls/shdoclc/Bg.rc +++ b/dlls/shdoclc/Bg.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Da.rc b/dlls/shdoclc/Da.rc index 5f22bc8..8a25db9 100644 --- a/dlls/shdoclc/Da.rc +++ b/dlls/shdoclc/Da.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/De.rc b/dlls/shdoclc/De.rc index c202773..f2fd672 100644 --- a/dlls/shdoclc/De.rc +++ b/dlls/shdoclc/De.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/En.rc b/dlls/shdoclc/En.rc index d237c51..b3823c2 100644 --- a/dlls/shdoclc/En.rc +++ b/dlls/shdoclc/En.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Es.rc b/dlls/shdoclc/Es.rc index 8be9757..fd2e3c7 100644 --- a/dlls/shdoclc/Es.rc +++ b/dlls/shdoclc/Es.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Fi.rc b/dlls/shdoclc/Fi.rc index 81233d3..ae5e0c2 100644 --- a/dlls/shdoclc/Fi.rc +++ b/dlls/shdoclc/Fi.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Fr.rc b/dlls/shdoclc/Fr.rc index 75aefc7..216babb 100644 --- a/dlls/shdoclc/Fr.rc +++ b/dlls/shdoclc/Fr.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Hu.rc b/dlls/shdoclc/Hu.rc index 9ed68ca..2fdc4c2 100644 --- a/dlls/shdoclc/Hu.rc +++ b/dlls/shdoclc/Hu.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc index d038994..6bf28d1 100644 --- a/dlls/shdoclc/Ko.rc +++ b/dlls/shdoclc/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Lt.rc b/dlls/shdoclc/Lt.rc index b3a0641..331e0a9 100644 --- a/dlls/shdoclc/Lt.rc +++ b/dlls/shdoclc/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" + /* UTF-8 */ #pragma code_page(65001) @@ -247,5 +249,3 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Slinkti dešinėn", IDM_SCROLL_RIGHT } } - -#pragma code_page(default) diff --git a/dlls/shdoclc/Makefile.in b/dlls/shdoclc/Makefile.in index 4045ecf..d053a9d 100644 --- a/dlls/shdoclc/Makefile.in +++ b/dlls/shdoclc/Makefile.in @@ -5,7 +5,25 @@ VPATH = @srcdir@ MODULE = shdoclc.dll IMPORTS = kernel32 -RC_SRCS = rsrc.rc +RC_SRCS = \ + Bg.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/shdoclc/Nl.rc b/dlls/shdoclc/Nl.rc index 3f76475..c10e803 100644 --- a/dlls/shdoclc/Nl.rc +++ b/dlls/shdoclc/Nl.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/No.rc b/dlls/shdoclc/No.rc index 6c38a1f..65f554a 100644 --- a/dlls/shdoclc/No.rc +++ b/dlls/shdoclc/No.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/dlls/shdoclc/Pt.rc b/dlls/shdoclc/Pt.rc index 393037f..64379f4 100644 --- a/dlls/shdoclc/Pt.rc +++ b/dlls/shdoclc/Pt.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Ru.rc b/dlls/shdoclc/Ru.rc index f20c2f4..11db872 100644 --- a/dlls/shdoclc/Ru.rc +++ b/dlls/shdoclc/Ru.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Si.rc b/dlls/shdoclc/Si.rc index ccc7900..c95dc01 100644 --- a/dlls/shdoclc/Si.rc +++ b/dlls/shdoclc/Si.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -247,5 +248,3 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Drsenje desno", IDM_SCROLL_RIGHT } } - -#pragma code_page(default) diff --git a/dlls/shdoclc/Sv.rc b/dlls/shdoclc/Sv.rc index 9b20705..277745d 100644 --- a/dlls/shdoclc/Sv.rc +++ b/dlls/shdoclc/Sv.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/dlls/shdoclc/Tr.rc b/dlls/shdoclc/Tr.rc index 8bd4ed0..ea238e1 100644 --- a/dlls/shdoclc/Tr.rc +++ b/dlls/shdoclc/Tr.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/dlls/shdoclc/Zh.rc b/dlls/shdoclc/Zh.rc index f3570e8..c597676 100644 --- a/dlls/shdoclc/Zh.rc +++ b/dlls/shdoclc/Zh.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shdoclc.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -479,5 +480,3 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "向右滾動", IDM_SCROLL_RIGHT } } - -#pragma code_page(default) diff --git a/dlls/shdoclc/rsrc.rc b/dlls/shdoclc/rsrc.rc deleted file mode 100644 index 641c4c9..0000000 --- a/dlls/shdoclc/rsrc.rc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2005 Jacek Caban - * - * 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 "mshtmcid.h" - -#include "shdoclc.h" - -#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 "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" diff --git a/dlls/shdoclc/shdoclc.h b/dlls/shdoclc/shdoclc.h index 2bc7626..b5492d6 100644 --- a/dlls/shdoclc/shdoclc.h +++ b/dlls/shdoclc/shdoclc.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <mshtmcid.h> + #define IDS_MESSAGE_BOX_TITLE 2213 #define IDS_PRINT_HEADER_TEMPLATE 8403

1 0

Michael Stefaniuc : cmdlgtst: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 465cf35522ebf7f08433a419ffb7b05b8bd5382d URL: http://source.winehq.org/git/wine.git/?a=commit;h=465cf35522ebf7f08433a419f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:45 2009 +0200 cmdlgtst: Build language resource files separately. Do not include them from an other rc file. --- programs/cmdlgtst/Cs.rc | 2 ++ programs/cmdlgtst/Da.rc | 2 ++ programs/cmdlgtst/De.rc | 2 ++ programs/cmdlgtst/En.rc | 2 ++ programs/cmdlgtst/Es.rc | 2 ++ programs/cmdlgtst/Fr.rc | 2 ++ programs/cmdlgtst/It.rc | 2 ++ programs/cmdlgtst/Ja.rc | 4 ++-- programs/cmdlgtst/Ko.rc | 2 ++ programs/cmdlgtst/Lt.rc | 4 ++-- programs/cmdlgtst/Makefile.in | 21 ++++++++++++++++++++- programs/cmdlgtst/Nl.rc | 2 ++ programs/cmdlgtst/No.rc | 2 ++ programs/cmdlgtst/Pl.rc | 2 ++ programs/cmdlgtst/Pt.rc | 2 ++ programs/cmdlgtst/Ru.rc | 2 ++ programs/cmdlgtst/Si.rc | 4 ++-- programs/cmdlgtst/Sv.rc | 2 ++ programs/cmdlgtst/Tr.rc | 2 ++ programs/cmdlgtst/cmdlgr.rc | 25 ------------------------- programs/cmdlgtst/cmdlgtst.h | 4 ++++ 21 files changed, 60 insertions(+), 32 deletions(-) diff --git a/programs/cmdlgtst/Cs.rc b/programs/cmdlgtst/Cs.rc index d6bb383..6e8ed2f 100644 --- a/programs/cmdlgtst/Cs.rc +++ b/programs/cmdlgtst/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/cmdlgtst/Da.rc b/programs/cmdlgtst/Da.rc index 99bd0fe..9d73888 100644 --- a/programs/cmdlgtst/Da.rc +++ b/programs/cmdlgtst/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/De.rc b/programs/cmdlgtst/De.rc index f8e7d0e..e22f362 100644 --- a/programs/cmdlgtst/De.rc +++ b/programs/cmdlgtst/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/En.rc b/programs/cmdlgtst/En.rc index 5d73c57..839a917 100644 --- a/programs/cmdlgtst/En.rc +++ b/programs/cmdlgtst/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Es.rc b/programs/cmdlgtst/Es.rc index 04ef2bb..94d221c 100644 --- a/programs/cmdlgtst/Es.rc +++ b/programs/cmdlgtst/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index 680d6a8..e782424 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index c5c860c..1bc2e46 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* diff --git a/programs/cmdlgtst/Ja.rc b/programs/cmdlgtst/Ja.rc index fb73bfa..92ccddb 100644 --- a/programs/cmdlgtst/Ja.rc +++ b/programs/cmdlgtst/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + /* UTF-8 */ #pragma code_page(65001) @@ -296,5 +298,3 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "プリンタ(&R)...", psh3, 184, 220, 48, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index 314ba9b..7d099f7 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Lt.rc b/programs/cmdlgtst/Lt.rc index 9c8ad58..a6d7e83 100644 --- a/programs/cmdlgtst/Lt.rc +++ b/programs/cmdlgtst/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + /* UTF-8 */ #pragma code_page(65001) @@ -296,5 +298,3 @@ BEGIN PUSHBUTTON "Atsisakyti", IDCANCEL, 116, 220, 50, 14 PUSHBUTTON "S&pausdintuvas...", psh3, 171, 220, 61, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in index 15409a8..1c6fdce 100644 --- a/programs/cmdlgtst/Makefile.in +++ b/programs/cmdlgtst/Makefile.in @@ -9,7 +9,26 @@ IMPORTS = comdlg32 user32 gdi32 kernel32 C_SRCS = \ cmdlgtst.c -RC_SRCS = cmdlgr.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + cmdlgr.rc @MAKE_PROG_RULES@ diff --git a/programs/cmdlgtst/Nl.rc b/programs/cmdlgtst/Nl.rc index 0b9d135..245794d 100644 --- a/programs/cmdlgtst/Nl.rc +++ b/programs/cmdlgtst/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/No.rc b/programs/cmdlgtst/No.rc index 7d96a2d..d1e7b3b 100644 --- a/programs/cmdlgtst/No.rc +++ b/programs/cmdlgtst/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Pl.rc b/programs/cmdlgtst/Pl.rc index 3123c2c..090e1f4 100644 --- a/programs/cmdlgtst/Pl.rc +++ b/programs/cmdlgtst/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Pt.rc b/programs/cmdlgtst/Pt.rc index 38e783e..4bb06f4 100644 --- a/programs/cmdlgtst/Pt.rc +++ b/programs/cmdlgtst/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Ru.rc b/programs/cmdlgtst/Ru.rc index a438b24..e3d7c2b 100644 --- a/programs/cmdlgtst/Ru.rc +++ b/programs/cmdlgtst/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Si.rc b/programs/cmdlgtst/Si.rc index e080da3..f7c02f3 100644 --- a/programs/cmdlgtst/Si.rc +++ b/programs/cmdlgtst/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -295,5 +297,3 @@ BEGIN PUSHBUTTON "Prekliči", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14 END - -#pragma code_page(default) diff --git a/programs/cmdlgtst/Sv.rc b/programs/cmdlgtst/Sv.rc index 3ec66f2..c5c42dd 100644 --- a/programs/cmdlgtst/Sv.rc +++ b/programs/cmdlgtst/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL CmdlgtstMenu MENU diff --git a/programs/cmdlgtst/Tr.rc b/programs/cmdlgtst/Tr.rc index 94b6d50..c892470 100644 --- a/programs/cmdlgtst/Tr.rc +++ b/programs/cmdlgtst/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cmdlgtst.h" + /* FIXME: to be completed */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc index 3f9eecc..bbeabf7 100644 --- a/programs/cmdlgtst/cmdlgr.rc +++ b/programs/cmdlgtst/cmdlgr.rc @@ -18,32 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> -#include <dlgs.h> - #include "cmdlgtst.h" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" - -LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL - /* @makedep: about.ico */ AboutIcon ICON about.ico diff --git a/programs/cmdlgtst/cmdlgtst.h b/programs/cmdlgtst/cmdlgtst.h index b096eb9..58b2992 100644 --- a/programs/cmdlgtst/cmdlgtst.h +++ b/programs/cmdlgtst/cmdlgtst.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + #define CM_U_COLOR 105 #define CM_U_SAVE 104 #define CM_U_OPEN 107

1 0

Michael Stefaniuc : wordpad: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: eaa31f33d6c837a3cfea24d3b2bfb852640d692f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa31f33d6c837a3cfea24d3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:53 2009 +0200 wordpad: Build language resource files separately. Do not include them from an other rc file. --- programs/wordpad/Da.rc | 2 ++ programs/wordpad/De.rc | 4 ++-- programs/wordpad/En.rc | 2 ++ programs/wordpad/Fr.rc | 2 ++ programs/wordpad/Hu.rc | 2 ++ programs/wordpad/Ja.rc | 4 ++-- programs/wordpad/Ko.rc | 1 + programs/wordpad/Lt.rc | 4 ++-- programs/wordpad/Makefile.in | 20 +++++++++++++++++++- programs/wordpad/Nl.rc | 2 ++ programs/wordpad/No.rc | 2 ++ programs/wordpad/Pl.rc | 2 ++ programs/wordpad/Pt.rc | 2 ++ programs/wordpad/Ru.rc | 2 ++ programs/wordpad/Si.rc | 4 ++-- programs/wordpad/Sv.rc | 4 ++-- programs/wordpad/Tr.rc | 2 ++ programs/wordpad/Zh.rc | 4 ++-- programs/wordpad/rsrc.rc | 21 --------------------- programs/wordpad/wordpad.h | 3 +++ 20 files changed, 55 insertions(+), 34 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index d09e90f..3478946 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index a2fcceb..18181b2 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -244,5 +246,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert" STRING_MAX_TAB_STOPS, "Es können nur maximal 32 Tabstopps definiert werden." END - -#pragma code_page(default) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index dd099e1..3f8070c 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 72f7c70..29c7758 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 94ceda5..74926e1 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index 3049d8b..fc21c5a 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + /* UTF-8 */ #pragma code_page(65001) @@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "プリントが実装されていません。" STRING_MAX_TAB_STOPS, "32以上なタブを追加できません。" END - -#pragma code_page(default) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 7bfaf00..5823585 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/wordpad/Lt.rc b/programs/wordpad/Lt.rc index b95017f..91fbfca 100644 --- a/programs/wordpad/Lt.rc +++ b/programs/wordpad/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + /* UTF-8 */ #pragma code_page(65001) @@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Spausdinimas nerealizuotas" STRING_MAX_TAB_STOPS, "Negalima pridėti daugiau negu 32-jų tabuliavimo pozicijų." END - -#pragma code_page(default) diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 461da31..e7f5b08 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -14,7 +14,25 @@ C_SRCS = \ registry.c \ wordpad.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Hu.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc SVG_SRCS = wordpad.svg diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index c91e028..c9ce64a 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 6261c6f..392b9d6 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 47ff1bd..ab72104 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index b246c70..f8d7df2 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index e437199..6428f7b 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index 5e34958..1b6d37f 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -245,5 +247,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo" STRING_MAX_TAB_STOPS, "Ne morem vstaviti več kot 32 položajev tabulatorja." END - -#pragma code_page(default) diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc index 4bb2ae2..d94e6e3 100644 --- a/programs/wordpad/Sv.rc +++ b/programs/wordpad/Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -244,5 +246,3 @@ BEGIN STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." STRING_MAX_TAB_STOPS, "Kan ej lägga till mer än 32 tabbstopp." END - -#pragma code_page(default) diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 7df9a36..9229037 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 5c11ab7..d8ceec4 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wordpad.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -469,5 +471,3 @@ BEGIN STRING_OPEN_FAILED, "不能開啟檔案." STRING_OPEN_ACCESS_DENIED, "你沒有開啟檔案的權力." END - -#pragma code_page(default) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 1400fa5..ac159da 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "wordpad.h" MAINACCELTABLE ACCELERATORS @@ -63,21 +60,3 @@ IDI_WRI ICON "wri.ico" /* @makedep: txt.ico */ IDI_TXT ICON "txt.ico" - -#include "Da.rc" -#include "De.rc" -#include "En.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 "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index ece183f..6d3e64a 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define MAX_STRING_LEN 255 #define TWIPS_PER_INCH 1440

1 0

Michael Stefaniuc : cmd: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 2753331af06efe7c118bc0db51d9e34e15ef9f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2753331af06efe7c118bc0db5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:36 2009 +0200 cmd: Build language resource files separately. Do not include them from an other rc file. --- programs/cmd/Cs.rc | 2 ++ programs/cmd/Da.rc | 2 ++ programs/cmd/De.rc | 2 ++ programs/cmd/En.rc | 2 ++ programs/cmd/Es.rc | 2 ++ programs/cmd/Fr.rc | 2 ++ programs/cmd/Ja.rc | 4 ++-- programs/cmd/Ko.rc | 2 ++ programs/cmd/Makefile.in | 18 +++++++++++++++++- programs/cmd/Nl.rc | 2 ++ programs/cmd/No.rc | 2 ++ programs/cmd/Pl.rc | 2 ++ programs/cmd/Pt.rc | 2 ++ programs/cmd/Ru.rc | 2 ++ programs/cmd/Si.rc | 4 ++-- programs/cmd/Tr.rc | 2 ++ programs/cmd/wcmd.h | 1 + programs/cmd/wcmdrc.rc | 21 --------------------- 18 files changed, 48 insertions(+), 26 deletions(-) diff --git a/programs/cmd/Cs.rc b/programs/cmd/Cs.rc index 15ece45..7c63445 100644 --- a/programs/cmd/Cs.rc +++ b/programs/cmd/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/cmd/Da.rc b/programs/cmd/Da.rc index 9870f71..4bbe688 100644 --- a/programs/cmd/Da.rc +++ b/programs/cmd/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index ab41d33..e0ad4ee 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 941d58f..0c31dfb 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/cmd/Es.rc b/programs/cmd/Es.rc index f27906a..1253b27 100644 --- a/programs/cmd/Es.rc +++ b/programs/cmd/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index 7551c76..8092bdb 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/cmd/Ja.rc b/programs/cmd/Ja.rc index 20273ec..7f8a95c 100644 --- a/programs/cmd/Ja.rc +++ b/programs/cmd/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + /* UTF-8 */ #pragma code_page(65001) @@ -279,5 +281,3 @@ EXIT\t\tCMDを終了\n\n\ WCMD_MOREPROMPT, "More? " WCMD_LINETOOLONG, "The input line is too long.\n" } - -#pragma code_page(default) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index e2831f5..114fb3b 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index 7767dcd..07dc1ff 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -13,7 +13,23 @@ C_SRCS = \ directory.c \ wcmdmain.c -RC_SRCS = wcmdrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Tr.rc \ + wcmdrc.rc SVG_SRCS = wcmd.svg diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index 6863b00..2e8bf1c 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/cmd/No.rc b/programs/cmd/No.rc index 71a694b..89f020a 100644 --- a/programs/cmd/No.rc +++ b/programs/cmd/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc index 74e852e..5696dc0 100644 --- a/programs/cmd/Pl.rc +++ b/programs/cmd/Pl.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/cmd/Pt.rc b/programs/cmd/Pt.rc index 65e0a6b..be6ce52 100644 --- a/programs/cmd/Pt.rc +++ b/programs/cmd/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index 5bd2a05..3e0b949 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/cmd/Si.rc b/programs/cmd/Si.rc index 9a18741..d58aab0 100644 --- a/programs/cmd/Si.rc +++ b/programs/cmd/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -272,5 +274,3 @@ Uporabite HELP <ukaz> za več informacijo o kateremkoli od zgoraj navedenih ukaz WCMD_MOREPROMPT, "Več? " WCMD_LINETOOLONG, "The input line is too long.\n" } - -#pragma code_page(default) diff --git a/programs/cmd/Tr.rc b/programs/cmd/Tr.rc index 656a583..36fbf70 100644 --- a/programs/cmd/Tr.rc +++ b/programs/cmd/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wcmd.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 4d3bab6..667b3b9 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -21,6 +21,7 @@ #define IDI_ICON1 1 #include <windows.h> +#include <windef.h> #ifndef RC_INVOKED #include <string.h> #include <stdlib.h> diff --git a/programs/cmd/wcmdrc.rc b/programs/cmd/wcmdrc.rc index d6906d3..1eec839 100644 --- a/programs/cmd/wcmdrc.rc +++ b/programs/cmd/wcmdrc.rc @@ -16,28 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "wcmd.h" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Tr.rc" - -LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL - /* @makedep: wcmd.ico */ IDI_ICON1 ICON wcmd.ico

1 0