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

Michael Stefaniuc : xcopy: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: dbf44bfb6eab3bba4ae1ce8adf38f5a3227e988f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf44bfb6eab3bba4ae1ce8ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:32:13 2009 +0200 xcopy: Build language resource files separately. Do not include them from an other rc file. --- programs/xcopy/Da.rc | 1 + programs/xcopy/De.rc | 1 + programs/xcopy/En.rc | 1 + programs/xcopy/Fr.rc | 5 +++-- programs/xcopy/Ko.rc | 1 + programs/xcopy/Lt.rc | 4 ++-- programs/xcopy/Makefile.in | 14 +++++++++++++- programs/xcopy/Nl.rc | 1 + programs/xcopy/No.rc | 1 + programs/xcopy/Pl.rc | 1 + programs/xcopy/Pt.rc | 1 + programs/xcopy/Ru.rc | 1 + programs/xcopy/Si.rc | 4 ++-- programs/xcopy/rsrc.rc | 36 ------------------------------------ programs/xcopy/xcopy.h | 2 ++ 15 files changed, 31 insertions(+), 43 deletions(-) diff --git a/programs/xcopy/Da.rc b/programs/xcopy/Da.rc index 239b3a7..6a15a44 100644 --- a/programs/xcopy/Da.rc +++ b/programs/xcopy/Da.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/programs/xcopy/De.rc b/programs/xcopy/De.rc index 1af6418..6192c52 100644 --- a/programs/xcopy/De.rc +++ b/programs/xcopy/De.rc @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/xcopy/En.rc b/programs/xcopy/En.rc index 33324ac..83ef291 100644 --- a/programs/xcopy/En.rc +++ b/programs/xcopy/En.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/xcopy/Fr.rc b/programs/xcopy/Fr.rc index 7fe8f69..b28dffe 100644 --- a/programs/xcopy/Fr.rc +++ b/programs/xcopy/Fr.rc @@ -18,6 +18,9 @@ * 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 "xcopy.h" + #pragma code_page(65001) @@ -78,5 +81,3 @@ Où :\n\ \t\tque le fichier source\n\n" } - -#pragma code_page(default) diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc index a3a89f9..6a5071c 100644 --- a/programs/xcopy/Ko.rc +++ b/programs/xcopy/Ko.rc @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/xcopy/Lt.rc b/programs/xcopy/Lt.rc index 6d538d9..182a39a 100644 --- a/programs/xcopy/Lt.rc +++ b/programs/xcopy/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" + /* UTF-8 */ #pragma code_page(65001) @@ -79,5 +81,3 @@ Kur:\n\ \t\tsenesnis už šaltinio failą\n\n" } - -#pragma code_page(default) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 7e9b26e..b46a97f 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -12,7 +12,19 @@ MODCFLAGS = @BUILTINFLAG@ C_SRCS = \ xcopy.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc @MAKE_PROG_RULES@ diff --git a/programs/xcopy/Nl.rc b/programs/xcopy/Nl.rc index f994cdd..b9db305 100644 --- a/programs/xcopy/Nl.rc +++ b/programs/xcopy/Nl.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/xcopy/No.rc b/programs/xcopy/No.rc index ddcccf7..a3c223f 100644 --- a/programs/xcopy/No.rc +++ b/programs/xcopy/No.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/xcopy/Pl.rc b/programs/xcopy/Pl.rc index 3d094a9..8b224ec 100644 --- a/programs/xcopy/Pl.rc +++ b/programs/xcopy/Pl.rc @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/programs/xcopy/Pt.rc b/programs/xcopy/Pt.rc index 47e9609..d8254d5 100644 --- a/programs/xcopy/Pt.rc +++ b/programs/xcopy/Pt.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/programs/xcopy/Ru.rc b/programs/xcopy/Ru.rc index 1d86ff4..3983457 100644 --- a/programs/xcopy/Ru.rc +++ b/programs/xcopy/Ru.rc @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/xcopy/Si.rc b/programs/xcopy/Si.rc index 092282c..1013837 100644 --- a/programs/xcopy/Si.rc +++ b/programs/xcopy/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "xcopy.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -78,5 +80,3 @@ Where:\n\ \t\tod izvora\n\n" } - -#pragma code_page(default) diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc deleted file mode 100644 index 7161a79..0000000 --- a/programs/xcopy/rsrc.rc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2007 Jason Edmeades - * - * 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 "xcopy.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.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" diff --git a/programs/xcopy/xcopy.h b/programs/xcopy/xcopy.h index ee4bd91..1c93395 100644 --- a/programs/xcopy/xcopy.h +++ b/programs/xcopy/xcopy.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + /* Local #defines */ #define RC_OK 0 #define RC_NOFILES 1

1 0

Michael Stefaniuc : localui: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 80f4a9b72a2478495e01bf9b2d80e75d8503427f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f4a9b72a2478495e01bf9b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:47 2009 +0200 localui: Build language resource files separately. Do not include them from an other rc file. --- dlls/localui/Makefile.in | 18 +++++++++++++++++- dlls/localui/localui.h | 2 ++ dlls/localui/localui.rc | 21 --------------------- dlls/localui/ui_Da.rc | 2 ++ dlls/localui/ui_De.rc | 2 ++ dlls/localui/ui_En.rc | 2 ++ dlls/localui/ui_Fr.rc | 5 +++-- dlls/localui/ui_Ko.rc | 2 ++ dlls/localui/ui_Lt.rc | 4 ++-- dlls/localui/ui_Nl.rc | 2 ++ dlls/localui/ui_No.rc | 2 ++ dlls/localui/ui_Pl.rc | 2 ++ dlls/localui/ui_Pt.rc | 2 ++ dlls/localui/ui_Ro.rc | 4 ++-- dlls/localui/ui_Ru.rc | 2 ++ dlls/localui/ui_Si.rc | 4 ++-- dlls/localui/ui_Sv.rc | 2 ++ dlls/localui/ui_Zh.rc | 4 ++-- 18 files changed, 50 insertions(+), 32 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index 6a43906..75090a1 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -8,7 +8,23 @@ IMPORTS = winspool user32 kernel32 C_SRCS = \ localui.c -RC_SRCS = localui.rc +RC_SRCS = \ + localui.rc \ + ui_Da.rc \ + ui_De.rc \ + ui_En.rc \ + ui_Fr.rc \ + ui_Ko.rc \ + ui_Lt.rc \ + ui_Nl.rc \ + ui_No.rc \ + ui_Pl.rc \ + ui_Pt.rc \ + ui_Ro.rc \ + ui_Ru.rc \ + ui_Si.rc \ + ui_Sv.rc \ + ui_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/localui/localui.h b/dlls/localui/localui.h index aa244bd..25424da 100644 --- a/dlls/localui/localui.h +++ b/dlls/localui/localui.h @@ -21,6 +21,8 @@ #ifndef __WINE_LOCALUI__ #define __WINE_LOCALUI__ +#include <windef.h> +#include <winuser.h> /* ## Resource-ID ## */ #define ADDPORT_DIALOG 100 diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 9963acb..cdf7bb4 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -19,10 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" #include "localui.h" #define WINE_FILENAME_STR "localui.dll" @@ -36,20 +32,3 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" #include "wine/wine_common_ver.rc" - - -#include "ui_Da.rc" -#include "ui_De.rc" -#include "ui_En.rc" -#include "ui_Fr.rc" -#include "ui_Ko.rc" -#include "ui_Lt.rc" -#include "ui_Nl.rc" -#include "ui_No.rc" -#include "ui_Pl.rc" -#include "ui_Pt.rc" -#include "ui_Ro.rc" -#include "ui_Ru.rc" -#include "ui_Si.rc" -#include "ui_Sv.rc" -#include "ui_Zh.rc" diff --git a/dlls/localui/ui_Da.rc b/dlls/localui/ui_Da.rc index 9729926..861ba8f 100644 --- a/dlls/localui/ui_Da.rc +++ b/dlls/localui/ui_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_De.rc b/dlls/localui/ui_De.rc index 2fe35fc..5f65a80 100644 --- a/dlls/localui/ui_De.rc +++ b/dlls/localui/ui_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_En.rc b/dlls/localui/ui_En.rc index c2de626..5a21868 100644 --- a/dlls/localui/ui_En.rc +++ b/dlls/localui/ui_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Fr.rc b/dlls/localui/ui_Fr.rc index 261fa0b..70e4baf 100644 --- a/dlls/localui/ui_Fr.rc +++ b/dlls/localui/ui_Fr.rc @@ -17,6 +17,9 @@ * 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 "localui.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -53,5 +56,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Le port %s existe déjà" IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Ko.rc b/dlls/localui/ui_Ko.rc index 9a38030..d86b7ef 100644 --- a/dlls/localui/ui_Ko.rc +++ b/dlls/localui/ui_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Lt.rc b/dlls/localui/ui_Lt.rc index 660cea4..87997d0 100644 --- a/dlls/localui/ui_Lt.rc +++ b/dlls/localui/ui_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + /* UTF-8 */ #pragma code_page(65001) @@ -55,5 +57,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Prievadas %s jau egzistuoja" IDS_NOTHINGTOCONFIG "Šis prievadas neturi parinkčių konfigūravimui" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Nl.rc b/dlls/localui/ui_Nl.rc index 59c58ff..21d7cc8 100644 --- a/dlls/localui/ui_Nl.rc +++ b/dlls/localui/ui_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_No.rc b/dlls/localui/ui_No.rc index 3a46bc8..8ed9e00 100644 --- a/dlls/localui/ui_No.rc +++ b/dlls/localui/ui_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Pl.rc b/dlls/localui/ui_Pl.rc index 74a5015..822763d 100644 --- a/dlls/localui/ui_Pl.rc +++ b/dlls/localui/ui_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Pt.rc b/dlls/localui/ui_Pt.rc index 7bad521..7f16848 100644 --- a/dlls/localui/ui_Pt.rc +++ b/dlls/localui/ui_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Ro.rc b/dlls/localui/ui_Ro.rc index 43edfe6..a1b1c77 100644 --- a/dlls/localui/ui_Ro.rc +++ b/dlls/localui/ui_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -53,5 +55,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Portul %s existsă deja" IDS_NOTHINGTOCONFIG "Acest port nu are opțiuni de configurat" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Ru.rc b/dlls/localui/ui_Ru.rc index 96e78f1..3402f37 100644 --- a/dlls/localui/ui_Ru.rc +++ b/dlls/localui/ui_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Si.rc b/dlls/localui/ui_Si.rc index 961a2e0..6810c7c 100644 --- a/dlls/localui/ui_Si.rc +++ b/dlls/localui/ui_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -54,5 +56,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "Vrata z imenom %s že obstajajo" IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve" } - -#pragma code_page(default) diff --git a/dlls/localui/ui_Sv.rc b/dlls/localui/ui_Sv.rc index 3cd22fd..e137079 100644 --- a/dlls/localui/ui_Sv.rc +++ b/dlls/localui/ui_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 diff --git a/dlls/localui/ui_Zh.rc b/dlls/localui/ui_Zh.rc index 197ac1d..f43dde9 100644 --- a/dlls/localui/ui_Zh.rc +++ b/dlls/localui/ui_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "localui.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -90,5 +92,3 @@ STRINGTABLE DISCARDABLE IDS_PORTEXISTS "端口 %s 已經存在" IDS_NOTHINGTOCONFIG "這個端口沒有可設定選項" } - -#pragma code_page(default)

1 0

Michael Stefaniuc : cmd: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

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

Michael Stefaniuc : appwiz.cpl: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: aca9acf18f4b6096f00e384fbb80398b7d5c1473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca9acf18f4b6096f00e384fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:11 2009 +0200 appwiz.cpl: Build language resource files separately. Do not include them from an other rc file. --- dlls/appwiz.cpl/De.rc | 4 ++-- dlls/appwiz.cpl/En.rc | 2 ++ dlls/appwiz.cpl/Fr.rc | 2 ++ dlls/appwiz.cpl/Ja.rc | 4 ++-- dlls/appwiz.cpl/Ko.rc | 2 ++ dlls/appwiz.cpl/Lt.rc | 4 ++-- dlls/appwiz.cpl/Makefile.in | 16 +++++++++++++++- dlls/appwiz.cpl/Nl.rc | 2 ++ dlls/appwiz.cpl/No.rc | 2 ++ dlls/appwiz.cpl/Pt.rc | 2 ++ dlls/appwiz.cpl/Ro.rc | 4 ++-- dlls/appwiz.cpl/Ru.rc | 2 ++ dlls/appwiz.cpl/Si.rc | 4 ++-- dlls/appwiz.cpl/Zh.rc | 4 ++-- dlls/appwiz.cpl/appwiz.rc | 20 -------------------- dlls/appwiz.cpl/res.h | 4 ++++ 16 files changed, 45 insertions(+), 33 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index 47263f3..65be3f7 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -78,5 +80,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index da34c3b..1eb2373 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index f13797e..0c860b3 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc index 0dd3fdd..a0e536c 100644 --- a/dlls/appwiz.cpl/Ja.rc +++ b/dlls/appwiz.cpl/Ja.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + /* UTF-8 */ #pragma code_page(65001) @@ -78,5 +80,3 @@ FONT 9, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index ae41726..138158b 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -20,6 +20,8 @@ * */ +#include "res.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc index a738828..6ce9038 100644 --- a/dlls/appwiz.cpl/Lt.rc +++ b/dlls/appwiz.cpl/Lt.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + /* UTF-8 */ #pragma code_page(65001) @@ -79,5 +81,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 8fc65f1..daf75d8 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -8,7 +8,21 @@ IMPORTS = kernel32 comctl32 advapi32 shell32 user32 comdlg32 C_SRCS = \ appwiz.c -RC_SRCS = appwiz.rc +RC_SRCS = \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Zh.rc \ + appwiz.rc @MAKE_DLL_RULES@ diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 69e0491..49bf832 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 2b15cbb..68fd133 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc index 31c7d8a..5f772da 100644 --- a/dlls/appwiz.cpl/Pt.rc +++ b/dlls/appwiz.cpl/Pt.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/appwiz.cpl/Ro.rc b/dlls/appwiz.cpl/Ro.rc index 0594cac..6dcc5c4 100644 --- a/dlls/appwiz.cpl/Ro.rc +++ b/dlls/appwiz.cpl/Ro.rc @@ -20,6 +20,8 @@ * */ +#include "res.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -79,5 +81,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index 49322e4..9160c22 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index 5b61861..26235b6 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -78,5 +80,3 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/Zh.rc b/dlls/appwiz.cpl/Zh.rc index 53071f7..d944474 100644 --- a/dlls/appwiz.cpl/Zh.rc +++ b/dlls/appwiz.cpl/Zh.rc @@ -19,6 +19,8 @@ * */ +#include "res.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -135,5 +137,3 @@ FONT 9, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } - -#pragma code_page(default) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index dd8918e..152ea4c 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -18,28 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h> #include "res.h" -#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 "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - /* @makedep: appwiz.ico */ ICO_MAIN ICON "appwiz.ico" diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index 5efcee2..1d605d7 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -19,6 +19,10 @@ * */ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + /* Dialogs */ #define IDD_MAIN 1

1 0

Michael Stefaniuc : winecfg: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 807d75a94e378d053e9b64ea3dcbf68351067cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807d75a94e378d053e9b64ea3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:26 2009 +0200 winecfg: Build language resource files separately. Do not include them from an other rc file. --- programs/winecfg/Bg.rc | 2 ++ programs/winecfg/Cs.rc | 3 +++ programs/winecfg/Da.rc | 2 ++ programs/winecfg/De.rc | 2 ++ programs/winecfg/En.rc | 2 ++ programs/winecfg/Es.rc | 2 ++ programs/winecfg/Fi.rc | 2 ++ programs/winecfg/Fr.rc | 2 ++ programs/winecfg/Hu.rc | 2 ++ programs/winecfg/It.rc | 2 ++ programs/winecfg/Ja.rc | 4 ++-- programs/winecfg/Ko.rc | 2 ++ programs/winecfg/Lt.rc | 4 ++-- programs/winecfg/Makefile.in | 26 +++++++++++++++++++++++++- programs/winecfg/Nl.rc | 2 ++ programs/winecfg/No.rc | 2 ++ programs/winecfg/Pl.rc | 2 ++ programs/winecfg/Pt.rc | 2 ++ programs/winecfg/Ro.rc | 4 ++-- programs/winecfg/Ru.rc | 2 ++ programs/winecfg/Si.rc | 4 ++-- programs/winecfg/Sv.rc | 2 ++ programs/winecfg/Tr.rc | 2 ++ programs/winecfg/Zh.rc | 4 ++-- programs/winecfg/resource.h | 4 ++++ programs/winecfg/winecfg.rc | 33 --------------------------------- 26 files changed, 76 insertions(+), 44 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index ca9b054..9ddaf2c 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index d9488e5..6f5804b 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -24,6 +24,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include "resource.h" + /* Czech strings in CP1250 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index 58b68c4..b1df6f6 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index ee49d31..045e709 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 7389ff8..88a6269 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -22,6 +22,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 690b5e1..e22ada4 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 087320a..211669e 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -21,6 +21,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 90d4fff..628e752 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index ce36e6a..e97c7a4 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 9a259b7..2ee50cb 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index db82eed..eeb0987 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -22,6 +22,8 @@ * */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -327,5 +329,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" IDC_SYSPARAMS_MENUBAR "メニューバー" END - -#pragma code_page(default) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 4ee5e5f..151375f 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -23,6 +23,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index c253181..297b411 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -325,5 +327,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Meniu paryškinimas" IDC_SYSPARAMS_MENUBAR "Meniu juosta" END - -#pragma code_page(default) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 823084f..787615b 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -18,7 +18,31 @@ C_SRCS = \ winecfg.c \ x11drvdlg.c -RC_SRCS = winecfg.rc +RC_SRCS = \ + Bg.rc \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + winecfg.rc @MAKE_PROG_RULES@ diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index af35977..66bd464 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -22,6 +22,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index bf4611a..2825675 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 73ca62c..f7fb619 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -23,6 +23,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index d96f1b6..a3b0219 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -21,6 +21,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index e9fd94c..fb8a20b 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -324,5 +326,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Evidențiere meniu" IDC_SYSPARAMS_MENUBAR "Bară de meniu" END - -#pragma code_page(default) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index e51042d..9656c48 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -21,6 +21,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index 016d982..1a8d488 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -324,5 +326,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Meni: osvetljen" IDC_SYSPARAMS_MENUBAR "Meni: vrstica" END - -#pragma code_page(default) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 12713b0..5770899 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 8dff20f..dbe1f2f 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 7f6f36a..349d106 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -21,6 +21,8 @@ * */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -594,5 +596,3 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "非當前標題欄" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "非當前標題欄文字" END - -#pragma code_page(default) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index a18fe76..88c9e64 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -23,6 +23,10 @@ * */ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDC_STATIC -1 #define IDS_TAB_APPLICATIONS 2 #define IDS_TAB_DLLS 3 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 6fdc232..7f8fe80 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,41 +20,8 @@ * */ -#include "config.h" /* Needed for the PACKAGE_STRING definition */ -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "winuser.h" -#include "commctrl.h" #include "resource.h" -#include "Bg.rc" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "Hu.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 "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - /* @makedep: idb_wine.bmp */ IDB_WINE BITMAP idb_wine.bmp

1 0

Michael Stefaniuc : wineboot: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: f0c3514537df6123bdb4662d047227b5bc83c46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c3514537df6123bdb4662d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:39 2009 +0200 wineboot: Build language resource files separately. Do not include them from an other rc file. --- programs/wineboot/Makefile.in | 19 ++++++++++++++- programs/wineboot/resource.h | 3 ++ programs/wineboot/wineboot.rc | 46 -------------------------------------- programs/wineboot/wineboot_Da.rc | 2 + programs/wineboot/wineboot_De.rc | 2 + programs/wineboot/wineboot_En.rc | 2 + programs/wineboot/wineboot_Es.rc | 5 ++- programs/wineboot/wineboot_Fr.rc | 5 ++- programs/wineboot/wineboot_Ja.rc | 4 +- programs/wineboot/wineboot_Ko.rc | 2 + programs/wineboot/wineboot_Lt.rc | 4 +- programs/wineboot/wineboot_Nl.rc | 2 + programs/wineboot/wineboot_No.rc | 2 + programs/wineboot/wineboot_Pl.rc | 2 + programs/wineboot/wineboot_Pt.rc | 2 + programs/wineboot/wineboot_Ro.rc | 4 +- programs/wineboot/wineboot_Ru.rc | 2 + programs/wineboot/wineboot_Si.rc | 4 +- programs/wineboot/wineboot_Sv.rc | 2 + programs/wineboot/wineboot_Zh.rc | 4 +- 20 files changed, 57 insertions(+), 61 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 63c6fd8..2109457 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -12,7 +12,24 @@ C_SRCS = \ shutdown.c \ wineboot.c -RC_SRCS = wineboot.rc +RC_SRCS = \ + wineboot_Da.rc \ + wineboot_De.rc \ + wineboot_En.rc \ + wineboot_Es.rc \ + wineboot_Fr.rc \ + wineboot_Ja.rc \ + wineboot_Ko.rc \ + wineboot_Lt.rc \ + wineboot_Nl.rc \ + wineboot_No.rc \ + wineboot_Pl.rc \ + wineboot_Pt.rc \ + wineboot_Ro.rc \ + wineboot_Ru.rc \ + wineboot_Si.rc \ + wineboot_Sv.rc \ + wineboot_Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/wineboot/resource.h b/programs/wineboot/resource.h index 3838922..a59454a 100644 --- a/programs/wineboot/resource.h +++ b/programs/wineboot/resource.h @@ -16,5 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winuser.h" + #define IDC_STATIC -1 #define IDD_ENDTASK 100 diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc deleted file mode 100644 index 3ca5d01..0000000 --- a/programs/wineboot/wineboot.rc +++ /dev/null @@ -1,46 +0,0 @@ -/* - * WineBoot resources - * - * Copyright (C) 2007 Robert Shearman for CodeWeavers - * - * 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 "wingdi.h" -#include "winnls.h" -#include "winuser.h" -#include "commctrl.h" -#include "resource.h" - -#include "wineboot_Da.rc" -#include "wineboot_De.rc" -#include "wineboot_En.rc" -#include "wineboot_Es.rc" -#include "wineboot_Fr.rc" -#include "wineboot_Ja.rc" -#include "wineboot_Ko.rc" -#include "wineboot_Lt.rc" -#include "wineboot_Nl.rc" -#include "wineboot_No.rc" -#include "wineboot_Pl.rc" -#include "wineboot_Pt.rc" -#include "wineboot_Ro.rc" -#include "wineboot_Ru.rc" -#include "wineboot_Si.rc" -#include "wineboot_Sv.rc" -#include "wineboot_Zh.rc" diff --git a/programs/wineboot/wineboot_Da.rc b/programs/wineboot/wineboot_Da.rc index 5e52915..b2730a4 100644 --- a/programs/wineboot/wineboot_Da.rc +++ b/programs/wineboot/wineboot_Da.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_De.rc b/programs/wineboot/wineboot_De.rc index 8582dbf..bc44ac8 100644 --- a/programs/wineboot/wineboot_De.rc +++ b/programs/wineboot/wineboot_De.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_En.rc b/programs/wineboot/wineboot_En.rc index 8e06aec..4070b72 100644 --- a/programs/wineboot/wineboot_En.rc +++ b/programs/wineboot/wineboot_En.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_Es.rc b/programs/wineboot/wineboot_Es.rc index 229eaba..359cdd2 100644 --- a/programs/wineboot/wineboot_Es.rc +++ b/programs/wineboot/wineboot_Es.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -34,5 +37,3 @@ BEGIN LTEXT "Si termina el programa puede perder los datos no grabados.", IDC_STATIC,7,28,172,15 END - -#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Fr.rc b/programs/wineboot/wineboot_Fr.rc index b24c5d1..6229e90 100644 --- a/programs/wineboot/wineboot_Fr.rc +++ b/programs/wineboot/wineboot_Fr.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -34,5 +37,3 @@ BEGIN LTEXT "Si vous arrêtez le programme, vous pouvez perdre toutes les données non enregistrées.", IDC_STATIC,7,28,172,15 END - -#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Ja.rc b/programs/wineboot/wineboot_Ja.rc index 90f252a..cee0bd2 100644 --- a/programs/wineboot/wineboot_Ja.rc +++ b/programs/wineboot/wineboot_Ja.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -36,5 +38,3 @@ BEGIN LTEXT "プロセスを終了させると、保存していないデータは全て失われます。", IDC_STATIC,7,28,262,15 END - -#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Ko.rc b/programs/wineboot/wineboot_Ko.rc index a84d6ac..28bcd4b 100644 --- a/programs/wineboot/wineboot_Ko.rc +++ b/programs/wineboot/wineboot_Ko.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/wineboot/wineboot_Lt.rc b/programs/wineboot/wineboot_Lt.rc index 4edf2bc..7db56e9 100644 --- a/programs/wineboot/wineboot_Lt.rc +++ b/programs/wineboot/wineboot_Lt.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -36,5 +38,3 @@ BEGIN LTEXT "Jei nutrauksite procesą, tai galite prarasti visus neišsaugotus duomenis.", IDC_STATIC,7,28,172,17 END - -#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Nl.rc b/programs/wineboot/wineboot_Nl.rc index 86fc337..c22a5c5 100644 --- a/programs/wineboot/wineboot_Nl.rc +++ b/programs/wineboot/wineboot_Nl.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_No.rc b/programs/wineboot/wineboot_No.rc index b8ce1f5..d821945 100644 --- a/programs/wineboot/wineboot_No.rc +++ b/programs/wineboot/wineboot_No.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_Pl.rc b/programs/wineboot/wineboot_Pl.rc index c2460fd..3172d36 100644 --- a/programs/wineboot/wineboot_Pl.rc +++ b/programs/wineboot/wineboot_Pl.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_Pt.rc b/programs/wineboot/wineboot_Pt.rc index ae5561d..a0338ca 100644 --- a/programs/wineboot/wineboot_Pt.rc +++ b/programs/wineboot/wineboot_Pt.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_Ro.rc b/programs/wineboot/wineboot_Ro.rc index 5639882..61f670f 100644 --- a/programs/wineboot/wineboot_Ro.rc +++ b/programs/wineboot/wineboot_Ro.rc @@ -20,6 +20,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -36,5 +38,3 @@ BEGIN LTEXT "Prin terminarea acestui proces se pot pierde datele nesalvate.", IDC_STATIC,7,28,172,15 END - -#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Ru.rc b/programs/wineboot/wineboot_Ru.rc index cb1a9d3..b1ab0ca 100644 --- a/programs/wineboot/wineboot_Ru.rc +++ b/programs/wineboot/wineboot_Ru.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_Si.rc b/programs/wineboot/wineboot_Si.rc index 1cbc097..366f170 100644 --- a/programs/wineboot/wineboot_Si.rc +++ b/programs/wineboot/wineboot_Si.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -35,5 +37,3 @@ BEGIN LTEXT "Če se odločite za končanje programa, lahko izgubite neshranjene podatke.", IDC_STATIC,7,28,172,15 END - -#pragma code_page(default) diff --git a/programs/wineboot/wineboot_Sv.rc b/programs/wineboot/wineboot_Sv.rc index 6877735..046432b 100644 --- a/programs/wineboot/wineboot_Sv.rc +++ b/programs/wineboot/wineboot_Sv.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 diff --git a/programs/wineboot/wineboot_Zh.rc b/programs/wineboot/wineboot_Zh.rc index 75c56d3..d85f9d4 100644 --- a/programs/wineboot/wineboot_Zh.rc +++ b/programs/wineboot/wineboot_Zh.rc @@ -19,6 +19,8 @@ * */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,3 @@ BEGIN LTEXT "如果你中斷進程，有可能丟失沒有儲存的數據.", IDC_STATIC,7,28,172,15 END - -#pragma code_page(default)

1 0

Michael Stefaniuc : write: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 937d70203ef9e94313940c0bd9a3e4c05b584f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=937d70203ef9e94313940c0bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:32:00 2009 +0200 write: Build language resource files separately. Do not include them from an other rc file. --- programs/write/De.rc | 2 ++ programs/write/En.rc | 2 ++ programs/write/Fr.rc | 5 +++-- programs/write/Ja.rc | 4 ++-- programs/write/Ko.rc | 2 ++ programs/write/Lt.rc | 4 ++-- programs/write/Makefile.in | 16 +++++++++++++++- programs/write/Nl.rc | 2 ++ programs/write/No.rc | 2 ++ programs/write/Pl.rc | 2 ++ programs/write/Pt.rc | 2 ++ programs/write/Ro.rc | 4 ++-- programs/write/Ru.rc | 2 ++ programs/write/Si.rc | 4 ++-- programs/write/Sv.rc | 2 ++ programs/write/resources.h | 2 ++ programs/write/rsrc.rc | 38 -------------------------------------- 17 files changed, 46 insertions(+), 49 deletions(-) diff --git a/programs/write/De.rc b/programs/write/De.rc index c2afa08..a953576 100644 --- a/programs/write/De.rc +++ b/programs/write/De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/write/En.rc b/programs/write/En.rc index 5215db5..7159578 100644 --- a/programs/write/En.rc +++ b/programs/write/En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/write/Fr.rc b/programs/write/Fr.rc index 0258efc..a81dffd 100644 --- a/programs/write/Fr.rc +++ b/programs/write/Fr.rc @@ -17,6 +17,9 @@ * 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 "resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -25,5 +28,3 @@ STRINGTABLE { IDS_FAILED, "Wordpad n'a pas pu être démarré" } - -#pragma code_page(default) diff --git a/programs/write/Ja.rc b/programs/write/Ja.rc index 237a53d..5c9a825 100644 --- a/programs/write/Ja.rc +++ b/programs/write/Ja.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -27,5 +29,3 @@ STRINGTABLE { IDS_FAILED, "Wordpad の起動に失敗しました" } - -#pragma code_page(default) diff --git a/programs/write/Ko.rc b/programs/write/Ko.rc index f78ea13..3e076c2 100644 --- a/programs/write/Ko.rc +++ b/programs/write/Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/write/Lt.rc b/programs/write/Lt.rc index 63182f9..5cef934 100644 --- a/programs/write/Lt.rc +++ b/programs/write/Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -27,5 +29,3 @@ STRINGTABLE { IDS_FAILED, "Nepavyko paleisti Wordpad" } - -#pragma code_page(default) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index eb9e0ca..be459b6 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -9,7 +9,21 @@ IMPORTS = user32 gdi32 kernel32 C_SRCS = write.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc @MAKE_PROG_RULES@ diff --git a/programs/write/Nl.rc b/programs/write/Nl.rc index 5f1611e..6910cde 100644 --- a/programs/write/Nl.rc +++ b/programs/write/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/write/No.rc b/programs/write/No.rc index 9b5a4bd..b20abc3 100644 --- a/programs/write/No.rc +++ b/programs/write/No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/programs/write/Pl.rc b/programs/write/Pl.rc index fc06b89..6a3c8ae 100644 --- a/programs/write/Pl.rc +++ b/programs/write/Pl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/programs/write/Pt.rc b/programs/write/Pt.rc index e2ba2eb..95fad34 100644 --- a/programs/write/Pt.rc +++ b/programs/write/Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/write/Ro.rc b/programs/write/Ro.rc index 8a33118..f6a7b65 100644 --- a/programs/write/Ro.rc +++ b/programs/write/Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -25,5 +27,3 @@ STRINGTABLE { IDS_FAILED, "Execuția Wordpad a eșuat" } - -#pragma code_page(default) diff --git a/programs/write/Ru.rc b/programs/write/Ru.rc index 653d426..5824ad1 100644 --- a/programs/write/Ru.rc +++ b/programs/write/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 diff --git a/programs/write/Si.rc b/programs/write/Si.rc index d7e2226..9d3e5fe 100644 --- a/programs/write/Si.rc +++ b/programs/write/Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT #pragma code_page(65001) @@ -26,5 +28,3 @@ STRINGTABLE { IDS_FAILED, "Zagon programa Wordpad ni uspel" } - -#pragma code_page(default) diff --git a/programs/write/Sv.rc b/programs/write/Sv.rc index dea6521..7cfa2ac 100644 --- a/programs/write/Sv.rc +++ b/programs/write/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resources.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/programs/write/resources.h b/programs/write/resources.h index e99e5b1..73ef91a 100644 --- a/programs/write/resources.h +++ b/programs/write/resources.h @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + #define IDS_FAILED 101 diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc deleted file mode 100644 index be1359d..0000000 --- a/programs/write/rsrc.rc +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2007 Mikolaj Zalewski - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <windef.h> - -#include "resources.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#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 "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc"

1 0

Michael Stefaniuc : regedit: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 13455d31cab025c1ed73f7a6e22915a353433305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13455d31cab025c1ed73f7a6e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:06 2009 +0200 regedit: Build language resource files separately. Do not include them from an other rc file. --- programs/regedit/Bg.rc | 1 + programs/regedit/Cs.rc | 2 ++ programs/regedit/Da.rc | 4 +++- programs/regedit/De.rc | 4 ++-- programs/regedit/En.rc | 2 ++ programs/regedit/Es.rc | 2 ++ programs/regedit/Fr.rc | 2 ++ programs/regedit/Hu.rc | 2 ++ programs/regedit/It.rc | 2 ++ programs/regedit/Ja.rc | 4 ++-- programs/regedit/Ko.rc | 2 ++ programs/regedit/Lt.rc | 4 ++-- programs/regedit/Makefile.in | 24 +++++++++++++++++++++++- programs/regedit/Nl.rc | 2 ++ programs/regedit/No.rc | 2 ++ programs/regedit/Pl.rc | 2 ++ programs/regedit/Pt.rc | 2 ++ programs/regedit/Ru.rc | 2 ++ programs/regedit/Si.rc | 4 ++-- programs/regedit/Sv.rc | 2 ++ programs/regedit/Tr.rc | 2 ++ programs/regedit/Zh.rc | 4 ++-- programs/regedit/resource.h | 3 +++ programs/regedit/rsrc.rc | 27 --------------------------- 24 files changed, 68 insertions(+), 39 deletions(-) diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc index 0ac8e57..3ff32ac 100644 --- a/programs/regedit/Bg.rc +++ b/programs/regedit/Bg.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/programs/regedit/Cs.rc b/programs/regedit/Cs.rc index acfb497..f8741bf 100644 --- a/programs/regedit/Cs.rc +++ b/programs/regedit/Cs.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/regedit/Da.rc b/programs/regedit/Da.rc index fd499d0..d49727d 100644 --- a/programs/regedit/Da.rc +++ b/programs/regedit/Da.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +#include "resource.h" + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* * Menu diff --git a/programs/regedit/De.rc b/programs/regedit/De.rc index b84a1e1..84ed865 100644 --- a/programs/regedit/De.rc +++ b/programs/regedit/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 #pragma code_page(65001) @@ -336,5 +338,3 @@ BEGIN END /*****************************************************************/ - -#pragma code_page(default) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index b5d6f6d..3c152a4 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* English Neutral Resources */ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL diff --git a/programs/regedit/Es.rc b/programs/regedit/Es.rc index bfcd879..c6d3f95 100644 --- a/programs/regedit/Es.rc +++ b/programs/regedit/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* diff --git a/programs/regedit/Fr.rc b/programs/regedit/Fr.rc index 9e197cf..d24d192 100644 --- a/programs/regedit/Fr.rc +++ b/programs/regedit/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/regedit/Hu.rc b/programs/regedit/Hu.rc index 6f2349e..fb893e1 100644 --- a/programs/regedit/Hu.rc +++ b/programs/regedit/Hu.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Hungarian Resources */ LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc index 57588ab..e06aa67 100644 --- a/programs/regedit/It.rc +++ b/programs/regedit/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* diff --git a/programs/regedit/Ja.rc b/programs/regedit/Ja.rc index c52567f..4175acd 100644 --- a/programs/regedit/Ja.rc +++ b/programs/regedit/Ja.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) @@ -329,5 +331,3 @@ BEGIN END /*****************************************************************/ - -#pragma code_page(default) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index 17905d7..c9bbfa1 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Korean resources */ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/regedit/Lt.rc b/programs/regedit/Lt.rc index 83ff5bb..21109fa 100644 --- a/programs/regedit/Lt.rc +++ b/programs/regedit/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) @@ -327,5 +329,3 @@ END BEGIN "resource.h\0" END - -#pragma code_page(default) diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 9f872dc..b0fba49 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -22,7 +22,29 @@ C_SRCS = \ regproc.c \ treeview.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Bg.rc \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + Hu.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 \ + Zh.rc \ + rsrc.rc SVG_SRCS = regedit.svg diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index 43154ed..f02ab65 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/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 diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 6661178..7421a03 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/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 /* diff --git a/programs/regedit/Pl.rc b/programs/regedit/Pl.rc index a77660c..a414438 100644 --- a/programs/regedit/Pl.rc +++ b/programs/regedit/Pl.rc @@ -18,6 +18,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/regedit/Pt.rc b/programs/regedit/Pt.rc index 5dd2438..ae38395 100644 --- a/programs/regedit/Pt.rc +++ b/programs/regedit/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* * Menu */ diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index a80a62a..257b925 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/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 /* diff --git a/programs/regedit/Si.rc b/programs/regedit/Si.rc index ce04db1..8c2c1aa 100644 --- a/programs/regedit/Si.rc +++ b/programs/regedit/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 @@ -329,5 +331,3 @@ BEGIN END /*****************************************************************/ - -#pragma code_page(default) diff --git a/programs/regedit/Sv.rc b/programs/regedit/Sv.rc index dd384d9..3827739 100644 --- a/programs/regedit/Sv.rc +++ b/programs/regedit/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 /* diff --git a/programs/regedit/Tr.rc b/programs/regedit/Tr.rc index 2f1bc04..3065628 100644 --- a/programs/regedit/Tr.rc +++ b/programs/regedit/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 /* diff --git a/programs/regedit/Zh.rc b/programs/regedit/Zh.rc index 931be0e..87561bd 100644 --- a/programs/regedit/Zh.rc +++ b/programs/regedit/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) @@ -638,5 +640,3 @@ BEGIN END /*****************************************************************/ - -#pragma code_page(default) diff --git a/programs/regedit/resource.h b/programs/regedit/resource.h index c3b8456..d167251 100644 --- a/programs/regedit/resource.h +++ b/programs/regedit/resource.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define ID_REGISTRY_MENU 0 #define ID_EDIT_MENU 1 #define ID_VIEW_MENU 2 diff --git a/programs/regedit/rsrc.rc b/programs/regedit/rsrc.rc index 6627a64..71f4080 100644 --- a/programs/regedit/rsrc.rc +++ b/programs/regedit/rsrc.rc @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resource.h" /* define language neutral resources */ @@ -67,27 +64,3 @@ IDI_REGEDIT ICON DISCARDABLE regedit.ico #define WINE_PRODUCTVERSION_STR "5.2" #include "wine/wine_common_ver.rc" - -/* include localised resources */ - -#include "Bg.rc" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "Hu.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" -#include "Zh.rc"

1 0

Michael Stefaniuc : msvidc32: Build language resource files separately.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: ece4f64ecfb370a11c532dd02a13b0468a7757b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece4f64ecfb370a11c532dd02… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:27:08 2009 +0200 msvidc32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msvidc32/Makefile.in | 18 +++++++++++++++++- dlls/msvidc32/msvidc32_Da.rc | 2 ++ dlls/msvidc32/msvidc32_De.rc | 2 ++ dlls/msvidc32/msvidc32_En.rc | 2 ++ dlls/msvidc32/msvidc32_Fr.rc | 2 ++ dlls/msvidc32/msvidc32_Hu.rc | 2 ++ dlls/msvidc32/msvidc32_Ko.rc | 2 ++ dlls/msvidc32/msvidc32_Lt.rc | 4 ++-- dlls/msvidc32/msvidc32_Nl.rc | 2 ++ dlls/msvidc32/msvidc32_No.rc | 2 ++ dlls/msvidc32/msvidc32_Pl.rc | 2 ++ dlls/msvidc32/msvidc32_Pt.rc | 2 ++ dlls/msvidc32/msvidc32_Ro.rc | 2 ++ dlls/msvidc32/msvidc32_Ru.rc | 2 ++ dlls/msvidc32/msvidc32_Si.rc | 4 ++-- dlls/msvidc32/msvidc32_Sv.rc | 2 ++ dlls/msvidc32/msvidc32_Tr.rc | 2 ++ dlls/msvidc32/msvidc32_private.h | 2 ++ dlls/msvidc32/rsrc.rc | 37 ------------------------------------- 19 files changed, 51 insertions(+), 42 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 3f9be06..faa0f18 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -8,7 +8,23 @@ IMPORTS = user32 kernel32 C_SRCS = \ msvideo1.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + msvidc32_Da.rc \ + msvidc32_De.rc \ + msvidc32_En.rc \ + msvidc32_Fr.rc \ + msvidc32_Hu.rc \ + msvidc32_Ko.rc \ + msvidc32_Lt.rc \ + msvidc32_Nl.rc \ + msvidc32_No.rc \ + msvidc32_Pl.rc \ + msvidc32_Pt.rc \ + msvidc32_Ro.rc \ + msvidc32_Ru.rc \ + msvidc32_Si.rc \ + msvidc32_Sv.rc \ + msvidc32_Tr.rc @MAKE_DLL_RULES@ diff --git a/dlls/msvidc32/msvidc32_Da.rc b/dlls/msvidc32/msvidc32_Da.rc index 50ae3f6..0b28606 100644 --- a/dlls/msvidc32/msvidc32_Da.rc +++ b/dlls/msvidc32/msvidc32_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_De.rc b/dlls/msvidc32/msvidc32_De.rc index 1d0de70..c31635c 100644 --- a/dlls/msvidc32/msvidc32_De.rc +++ b/dlls/msvidc32/msvidc32_De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_En.rc b/dlls/msvidc32/msvidc32_En.rc index 93c8518..8ac6b59 100644 --- a/dlls/msvidc32/msvidc32_En.rc +++ b/dlls/msvidc32/msvidc32_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Fr.rc b/dlls/msvidc32/msvidc32_Fr.rc index 3592f31..b250deb 100644 --- a/dlls/msvidc32/msvidc32_Fr.rc +++ b/dlls/msvidc32/msvidc32_Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Hu.rc b/dlls/msvidc32/msvidc32_Hu.rc index c031963..2949bae 100644 --- a/dlls/msvidc32/msvidc32_Hu.rc +++ b/dlls/msvidc32/msvidc32_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ko.rc b/dlls/msvidc32/msvidc32_Ko.rc index 11c18c1..e95cc94 100644 --- a/dlls/msvidc32/msvidc32_Ko.rc +++ b/dlls/msvidc32/msvidc32_Ko.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Lt.rc b/dlls/msvidc32/msvidc32_Lt.rc index f83bce3..ee75ead 100644 --- a/dlls/msvidc32/msvidc32_Lt.rc +++ b/dlls/msvidc32/msvidc32_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -26,5 +28,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 vaizdo kodekas" } - -#pragma code_page(default) diff --git a/dlls/msvidc32/msvidc32_Nl.rc b/dlls/msvidc32/msvidc32_Nl.rc index b68d3ef..c11ca47 100644 --- a/dlls/msvidc32/msvidc32_Nl.rc +++ b/dlls/msvidc32/msvidc32_Nl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_No.rc b/dlls/msvidc32/msvidc32_No.rc index 6d27778..fa2a96f 100644 --- a/dlls/msvidc32/msvidc32_No.rc +++ b/dlls/msvidc32/msvidc32_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Pl.rc b/dlls/msvidc32/msvidc32_Pl.rc index af39271..221c41e 100644 --- a/dlls/msvidc32/msvidc32_Pl.rc +++ b/dlls/msvidc32/msvidc32_Pl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Pt.rc b/dlls/msvidc32/msvidc32_Pt.rc index 8dcda92..ee0eed4 100644 --- a/dlls/msvidc32/msvidc32_Pt.rc +++ b/dlls/msvidc32/msvidc32_Pt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ro.rc b/dlls/msvidc32/msvidc32_Ro.rc index fa7584a..62bcef0 100644 --- a/dlls/msvidc32/msvidc32_Ro.rc +++ b/dlls/msvidc32/msvidc32_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ru.rc b/dlls/msvidc32/msvidc32_Ru.rc index 2c84bff..1f1adc5 100644 --- a/dlls/msvidc32/msvidc32_Ru.rc +++ b/dlls/msvidc32/msvidc32_Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Si.rc b/dlls/msvidc32/msvidc32_Si.rc index 060ad08..19d392f 100644 --- a/dlls/msvidc32/msvidc32_Si.rc +++ b/dlls/msvidc32/msvidc32_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -25,5 +27,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 video kodek" } - -#pragma code_page(default) diff --git a/dlls/msvidc32/msvidc32_Sv.rc b/dlls/msvidc32/msvidc32_Sv.rc index 1f4770d..7c9b0bc 100644 --- a/dlls/msvidc32/msvidc32_Sv.rc +++ b/dlls/msvidc32/msvidc32_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Tr.rc b/dlls/msvidc32/msvidc32_Tr.rc index 2353b0c..d4b882b 100644 --- a/dlls/msvidc32/msvidc32_Tr.rc +++ b/dlls/msvidc32/msvidc32_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_private.h b/dlls/msvidc32/msvidc32_private.h index b47c6e6..590600e 100644 --- a/dlls/msvidc32/msvidc32_private.h +++ b/dlls/msvidc32/msvidc32_private.h @@ -19,6 +19,8 @@ #ifndef __MSVIDC32_PRIVATE_H #define __MSVIDC32_PRIVATE_H +#include <windef.h> + #define IDS_NAME 100 #define IDS_DESCRIPTION 101 diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc deleted file mode 100644 index 68c8dbf..0000000 --- a/dlls/msvidc32/rsrc.rc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2005 Dmitry Timoshkov - * - * 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 "msvidc32_private.h" - -#include "msvidc32_Da.rc" -#include "msvidc32_De.rc" -#include "msvidc32_Fr.rc" -#include "msvidc32_En.rc" -#include "msvidc32_Hu.rc" -#include "msvidc32_Ko.rc" -#include "msvidc32_Lt.rc" -#include "msvidc32_Nl.rc" -#include "msvidc32_No.rc" -#include "msvidc32_Pl.rc" -#include "msvidc32_Pt.rc" -#include "msvidc32_Ro.rc" -#include "msvidc32_Ru.rc" -#include "msvidc32_Si.rc" -#include "msvidc32_Sv.rc" -#include "msvidc32_Tr.rc"

1 0

Vincent Povirk : windowscodecs: Implement GetPixelFormat for BMP decoder.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 02d0462f067d4ade4dcecf98575fc67494a93aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d0462f067d4ade4dcecf985… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 13:18:02 2009 -0500 windowscodecs: Implement GetPixelFormat for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 86 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bmpformat.c | 4 ++ 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index e2378ba..46b2527 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -64,6 +64,8 @@ typedef struct { IStream *stream; BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; + const WICPixelFormatGUID *pixelformat; + int bitsperpixel; } BmpFrameDecode; static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, @@ -151,8 +153,12 @@ static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p): stub\n", iface, pPixelFormat); - return E_NOTIMPL; + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%p)\n", iface, pPixelFormat); + + memcpy(pPixelFormat, This->pixelformat, sizeof(GUID)); + + return S_OK; } static HRESULT BmpHeader_GetResolution(BITMAPV5HEADER *bih, double *pDpiX, double *pDpiY) @@ -241,6 +247,8 @@ typedef struct { BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; BmpFrameDecode *framedecode; + const WICPixelFormatGUID *pixelformat; + int bitsperpixel; } BmpDecoder; static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) @@ -269,6 +277,78 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) if (FAILED(hr)) return hr; if (bytestoread != bytesread) return E_FAIL; + /* decide what kind of bitmap this is and how/if we can read it */ + if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih; + TRACE("BITMAPCOREHEADER with depth=%i\n", bch->bcBitCount); + This->bitsperpixel = bch->bcBitCount; + switch(bch->bcBitCount) + { + case 1: + This->pixelformat = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + This->pixelformat = &GUID_WICPixelFormat2bppIndexed; + break; + case 4: + This->pixelformat = &GUID_WICPixelFormat4bppIndexed; + break; + case 8: + This->pixelformat = &GUID_WICPixelFormat8bppIndexed; + break; + case 24: + This->pixelformat = &GUID_WICPixelFormat24bppBGR; + break; + default: + This->pixelformat = &GUID_WICPixelFormatUndefined; + WARN("unsupported bit depth %i for BITMAPCOREHEADER\n", bch->bcBitCount); + break; + } + } + else /* struct is compatible with BITMAPINFOHEADER */ + { + TRACE("bitmap header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); + switch(This->bih.bV5Compression) + { + case BI_RGB: + This->bitsperpixel = This->bih.bV5BitCount; + switch(This->bih.bV5BitCount) + { + case 1: + This->pixelformat = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + This->pixelformat = &GUID_WICPixelFormat2bppIndexed; + break; + case 4: + This->pixelformat = &GUID_WICPixelFormat4bppIndexed; + break; + case 8: + This->pixelformat = &GUID_WICPixelFormat8bppIndexed; + break; + case 16: + This->pixelformat = &GUID_WICPixelFormat16bppBGR555; + break; + case 24: + This->pixelformat = &GUID_WICPixelFormat24bppBGR; + break; + case 32: + This->pixelformat = &GUID_WICPixelFormat32bppBGR; + break; + default: + This->pixelformat = &GUID_WICPixelFormatUndefined; + FIXME("unsupported bit depth %i for uncompressed RGB\n", This->bih.bV5BitCount); + } + break; + default: + This->bitsperpixel = 0; + This->pixelformat = &GUID_WICPixelFormatUndefined; + FIXME("unsupported bitmap type header=%i compression=%i depth=%i\n", This->bih.bV5Size, This->bih.bV5Compression, This->bih.bV5BitCount); + break; + } + } + This->initialized = TRUE; return S_OK; @@ -423,6 +503,8 @@ static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, IStream_AddRef(This->stream); This->framedecode->bfh = This->bfh; This->framedecode->bih = This->bih; + This->framedecode->pixelformat = This->pixelformat; + This->framedecode->bitsperpixel = This->bitsperpixel; } *ppIBitmapFrame = (IWICBitmapFrameDecode*)This->framedecode; diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 05c34e9..11c5a67 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -102,6 +102,10 @@ static void test_decode_24bpp(void) ok(dpiX == 96.0, "expected dpiX=96.0, got %f\n", dpiX); ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + IWICBitmapFrameDecode_Release(framedecode); }

1 0