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

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

July 2, 2009

Module: wine Branch: master Commit: 6f4b74de5b5153cb6bd59fe253b1f83b65da5e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4b74de5b5153cb6bd59fe25… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:27:58 2009 +0200 sane.ds: Build language resource files separately. Do not include them from an other rc file. --- dlls/sane.ds/Makefile.in | 18 +++++++++++++++++- dlls/sane.ds/resource.h | 4 ++++ dlls/sane.ds/rsrc.rc | 44 -------------------------------------------- dlls/sane.ds/sane_Da.rc | 2 ++ dlls/sane.ds/sane_De.rc | 2 ++ dlls/sane.ds/sane_En.rc | 2 ++ dlls/sane.ds/sane_Es.rc | 5 +++-- dlls/sane.ds/sane_Fi.rc | 2 ++ dlls/sane.ds/sane_Fr.rc | 2 ++ dlls/sane.ds/sane_Ko.rc | 2 ++ dlls/sane.ds/sane_Lt.rc | 4 ++-- dlls/sane.ds/sane_Nl.rc | 2 ++ dlls/sane.ds/sane_No.rc | 2 ++ dlls/sane.ds/sane_Pl.rc | 2 ++ dlls/sane.ds/sane_Pt.rc | 2 ++ dlls/sane.ds/sane_Ro.rc | 4 ++-- dlls/sane.ds/sane_Ru.rc | 2 ++ dlls/sane.ds/sane_Si.rc | 4 ++-- dlls/sane.ds/sane_Sv.rc | 2 ++ dlls/sane.ds/sane_Zh.rc | 4 ++-- 20 files changed, 56 insertions(+), 55 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index d136594..e394939 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -15,7 +15,23 @@ C_SRCS = \ ui.c RC_SRCS = \ - rsrc.rc + sane_Da.rc \ + sane_De.rc \ + sane_En.rc \ + sane_Es.rc \ + sane_Fi.rc \ + sane_Fr.rc \ + sane_Ko.rc \ + sane_Lt.rc \ + sane_Nl.rc \ + sane_No.rc \ + sane_Pl.rc \ + sane_Pt.rc \ + sane_Ro.rc \ + sane_Ru.rc \ + sane_Si.rc \ + sane_Sv.rc \ + sane_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/sane.ds/resource.h b/dlls/sane.ds/resource.h index abc2044..2454fbd 100644 --- a/dlls/sane.ds/resource.h +++ b/dlls/sane.ds/resource.h @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #define IDD_DIALOG1 0x400 #define IDC_STATIC 0x401 diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc deleted file mode 100644 index ac80eb9..0000000 --- a/dlls/sane.ds/rsrc.rc +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Top level resource file for Twain - * - * Copyright 2006 CodeWeavers, Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" - -#include "resource.h" - -#include "sane_Da.rc" -#include "sane_De.rc" -#include "sane_En.rc" -#include "sane_Es.rc" -#include "sane_Fi.rc" -#include "sane_Fr.rc" -#include "sane_Ko.rc" -#include "sane_Lt.rc" -#include "sane_Nl.rc" -#include "sane_No.rc" -#include "sane_Pl.rc" -#include "sane_Pt.rc" -#include "sane_Ro.rc" -#include "sane_Ru.rc" -#include "sane_Si.rc" -#include "sane_Sv.rc" -#include "sane_Zh.rc" diff --git a/dlls/sane.ds/sane_Da.rc b/dlls/sane.ds/sane_Da.rc index 5a93ff1..98d89da 100644 --- a/dlls/sane.ds/sane_Da.rc +++ b/dlls/sane.ds/sane_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_De.rc b/dlls/sane.ds/sane_De.rc index 172098e..a1be1e4 100644 --- a/dlls/sane.ds/sane_De.rc +++ b/dlls/sane.ds/sane_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 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_En.rc b/dlls/sane.ds/sane_En.rc index 3b58a0a..d0d56b8 100644 --- a/dlls/sane.ds/sane_En.rc +++ b/dlls/sane.ds/sane_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc index 0f0b4cb..c65ebf9 100644 --- a/dlls/sane.ds/sane_Es.rc +++ b/dlls/sane.ds/sane_Es.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 "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -39,5 +42,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Fi.rc b/dlls/sane.ds/sane_Fi.rc index 85a664b..329eb06 100644 --- a/dlls/sane.ds/sane_Fi.rc +++ b/dlls/sane.ds/sane_Fi.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index b54153c..49b0747 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Ko.rc b/dlls/sane.ds/sane_Ko.rc index 980897a..4a145b2 100644 --- a/dlls/sane.ds/sane_Ko.rc +++ b/dlls/sane.ds/sane_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 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Lt.rc b/dlls/sane.ds/sane_Lt.rc index c96eceb..0afe173 100644 --- a/dlls/sane.ds/sane_Lt.rc +++ b/dlls/sane.ds/sane_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) @@ -41,5 +43,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index 66559ab..ded7061 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_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 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_No.rc b/dlls/sane.ds/sane_No.rc index 4d89f06..1392788 100644 --- a/dlls/sane.ds/sane_No.rc +++ b/dlls/sane.ds/sane_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 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc index 43a7e8b..344d0c7 100644 --- a/dlls/sane.ds/sane_Pl.rc +++ b/dlls/sane.ds/sane_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Pt.rc b/dlls/sane.ds/sane_Pt.rc index 4f4ffea..9b0ff41 100644 --- a/dlls/sane.ds/sane_Pt.rc +++ b/dlls/sane.ds/sane_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Ro.rc b/dlls/sane.ds/sane_Ro.rc index 7199a61..dc02708 100644 --- a/dlls/sane.ds/sane_Ro.rc +++ b/dlls/sane.ds/sane_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -39,5 +41,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Ru.rc b/dlls/sane.ds/sane_Ru.rc index 58ee473..eefe277 100644 --- a/dlls/sane.ds/sane_Ru.rc +++ b/dlls/sane.ds/sane_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 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Si.rc b/dlls/sane.ds/sane_Si.rc index ad6b875..04e7c67 100644 --- a/dlls/sane.ds/sane_Si.rc +++ b/dlls/sane.ds/sane_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 @@ -40,5 +42,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default) diff --git a/dlls/sane.ds/sane_Sv.rc b/dlls/sane.ds/sane_Sv.rc index 90aab55..dee4f45 100644 --- a/dlls/sane.ds/sane_Sv.rc +++ b/dlls/sane.ds/sane_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 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Zh.rc b/dlls/sane.ds/sane_Zh.rc index 955b6e1..2487a6a 100644 --- a/dlls/sane.ds/sane_Zh.rc +++ b/dlls/sane.ds/sane_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) @@ -62,5 +64,3 @@ STRINGTABLE DISCARDABLE 5 "%" 6 "ns" } - -#pragma code_page(default)

1 0

Vincent Povirk : include: Define some WIC pixel format GUIDs.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 5574f0138e54940b12b5dce20dcc2acd1a736643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5574f0138e54940b12b5dce20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 12:40:07 2009 -0500 include: Define some WIC pixel format GUIDs. --- include/wincodec.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 84aafcb..e72bb36 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -54,6 +54,18 @@ typedef enum WICBitmapDecoderCapabilities { typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; +cpp_quote("DEFINE_GUID(GUID_WICPixelFormatDontCare, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x00);") +cpp_quote("#define GUID_WICPixelFormatUndefined GUID_WICPixelFormatDontCare") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat1bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x01);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat2bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x02);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x03);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x04);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") + typedef struct WICRect { INT X; INT Y;

1 0

Hans Leidekker : winebrowser: Support file URLs with a query or an anchor.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: dff300c04b9a5dff487f304fcf2f72b6eeb01bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff300c04b9a5dff487f304fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 2 11:16:33 2009 +0200 winebrowser: Support file URLs with a query or an anchor. --- programs/winebrowser/main.c | 48 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 10 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index d551c20..b959d38 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -66,6 +66,15 @@ static char *strdup_unixcp( const WCHAR *str ) return ret; } +static WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) + strcpyW( dst, src ); + return dst; +} + /* try to launch a unix app from a comma separated string of app names */ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) { @@ -329,7 +338,7 @@ int wmain(int argc, WCHAR *argv[]) static const WCHAR mailtoW[] = {'m','a','i','l','t','o',':',0}; static const WCHAR fileW[] = {'f','i','l','e',':',0}; - WCHAR *url = argv[1]; + WCHAR *p, *filenameW = NULL, *fileurlW = NULL, *url = argv[1]; wine_get_unix_file_name_t wine_get_unix_file_name_ptr; int ret = 1; @@ -347,7 +356,6 @@ int wmain(int argc, WCHAR *argv[]) /* handle an RFC1738 file URL */ if (!strncmpiW( url, fileW, 5 )) { - WCHAR *p; DWORD len = strlenW( url ) + 1; if (UrlUnescapeW( url, NULL, &len, URL_UNESCAPE_INPLACE ) != S_OK) @@ -390,20 +398,38 @@ int wmain(int argc, WCHAR *argv[]) else { char *unixpath; - if ((unixpath = wine_get_unix_file_name_ptr( url ))) + WCHAR c = 0; + + if (!(filenameW = strdupW( url ))) goto done; + if ((p = strchrW( filenameW, '?' )) || (p = strchrW( filenameW, '#' ))) + { + c = *p; + *p = 0; + } + + if ((unixpath = wine_get_unix_file_name_ptr( filenameW ))) { struct stat dummy; if (stat( unixpath, &dummy ) >= 0) { - int len; - WCHAR *unixpathW; + static const WCHAR schemeW[] = {'f','i','l','e',':','/','/',0}; + int len, len_scheme; + + len = len_scheme = strlenW( schemeW ); + len += MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, NULL, 0 ); + if (p) + { + *p = c; + len += strlenW( p ); + } + + if (!(fileurlW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto done; - len = MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, NULL, 0 ); - if ((unixpathW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, unixpathW, len ); + strcpyW( fileurlW, schemeW ); + MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, fileurlW + len_scheme, len - len_scheme ); + if (p) strcatW( fileurlW, p ); - ret = open_http_url( unixpathW ); - HeapFree( GetProcessHeap(), 0, unixpathW ); + ret = open_http_url( fileurlW ); goto done; } } @@ -417,5 +443,7 @@ int wmain(int argc, WCHAR *argv[]) done: HeapFree(GetProcessHeap(), 0, ddeString); + HeapFree( GetProcessHeap(), 0, filenameW ); + HeapFree( GetProcessHeap(), 0, fileurlW ); return ret; }

1 0

Michael Stefaniuc : oleaut32: Fix a small error in a comment.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: eddc78e4803ccd65fbf9ca41e08f8639be5298b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc78e4803ccd65fbf9ca41e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:36:55 2009 +0200 oleaut32: Fix a small error in a comment. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 37965f8..7a5f325 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -588,7 +588,7 @@ void WINAPI VariantInit(VARIANTARG* pVarg) * * RETURNS * Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY. - * Failure: DISP_E_BADVARTYPE, if the variant is a not a valid variant type. + * Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type. */ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) {

1 0

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

July 2, 2009

Module: wine Branch: master Commit: 2322254c836febd6902ff2ae640d439c70565ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2322254c836febd6902ff2ae6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 16:03:37 2009 -0500 windowscodecs: Implement QueryCapability for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 19 +++++++++++++++++-- dlls/windowscodecs/tests/bmpformat.c | 10 +++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index a6b7577..b81987c 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -329,9 +329,14 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) { HRESULT hr; ULONG bytestoread, bytesread; + LARGE_INTEGER seek; if (This->initialized) return WINCODEC_ERR_WRONGSTATE; + seek.QuadPart = 0; + hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + hr = IStream_Read(stream, &This->bfh, sizeof(BITMAPFILEHEADER), &bytesread); if (FAILED(hr)) return hr; if (bytesread != sizeof(BITMAPFILEHEADER) || @@ -483,8 +488,18 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, DWORD *pdwCapability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + BmpDecoder *This = (BmpDecoder*)iface; + + hr = BmpDecoder_ReadHeaders(This, pIStream); + if (FAILED(hr)) return hr; + + if (This->read_data_func == BmpFrameDecode_ReadUnsupported) + *pdwCapability = 0; + else + *pdwCapability = WICBitmapDecoderCapabilityCanDecodeAllImages; + + return S_OK; } static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index c266dda..fb6f491 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -157,7 +157,7 @@ static void test_decode_24bpp(void) /* cannot querycapability after initialize */ hr = IWICBitmapDecoder_QueryCapability(decoder, bmpstream, &capability); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder2); @@ -165,17 +165,17 @@ static void test_decode_24bpp(void) if (SUCCEEDED(hr)) { hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); - todo_wine ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); - todo_wine ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), + ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); + ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); /* cannot initialize after querycapability */ hr = IWICBitmapDecoder_Initialize(decoder2, bmpstream, WICDecodeMetadataCacheOnLoad); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); /* cannot querycapability twice */ hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); } IStream_Release(bmpstream);

1 0

Paul Vriens : urlmon/tests: Don't check for out of memory (Coverity).
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 024725515ecd3d55fd546649b55eed09e5371d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024725515ecd3d55fd546649b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 2 10:13:51 2009 +0200 urlmon/tests: Don't check for out of memory (Coverity). --- dlls/urlmon/tests/misc.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6436cd7..674092a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1191,26 +1191,19 @@ static void test_user_agent(void) ok(size > 0, "size=%d, expected non-zero\n", size); str2 = HeapAlloc(GetProcessHeap(), 0, (size+20)*sizeof(CHAR)); - if (!str2) - { - skip("skipping rest of ObtainUserAgent tests, out of memory\n"); - } - else - { - saved = size; - hres = ObtainUserAgentString(0, str2, &size); - ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); - ok(size == saved, "size=%d, expected %d\n", size, saved); - ok(strlen(expected) <= strlen(str2) && - !memcmp(expected, str2, strlen(expected)*sizeof(CHAR)), - "user agent was \"%s\", expected to start with \"%s\"\n", - str2, expected); - - size = saved+10; - hres = ObtainUserAgentString(0, str2, &size); - ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); - ok(size == saved, "size=%d, expected %d\n", size, saved); - } + saved = size; + hres = ObtainUserAgentString(0, str2, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == saved, "size=%d, expected %d\n", size, saved); + ok(strlen(expected) <= strlen(str2) && + !memcmp(expected, str2, strlen(expected)*sizeof(CHAR)), + "user agent was \"%s\", expected to start with \"%s\"\n", + str2, expected); + + size = saved+10; + hres = ObtainUserAgentString(0, str2, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == saved, "size=%d, expected %d\n", size, saved); size = 0; hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 0, &size, 0);

1 0

Vincent Povirk : windowscodecs: Simplify the BMP GetSize code and fix for top-down dibs.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 07538b79cbec7c398de9707eea4ef21a376cd90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07538b79cbec7c398de9707ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 15:53:47 2009 -0500 windowscodecs: Simplify the BMP GetSize code and fix for top-down dibs. --- dlls/windowscodecs/bmpdecode.c | 36 ++++++++++++------------------------ 1 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 46b2527..8391a1b 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -118,36 +118,24 @@ static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface) return ref; } -static HRESULT BmpHeader_GetSize(BITMAPV5HEADER *bih, UINT *puiWidth, UINT *puiHeight) -{ - switch (bih->bV5Size) - { - case sizeof(BITMAPCOREHEADER): - { - BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)bih; - *puiWidth = bch->bcWidth; - *puiHeight = bch->bcHeight; - return S_OK; - } - case sizeof(BITMAPCOREHEADER2): - case sizeof(BITMAPINFOHEADER): - case sizeof(BITMAPV4HEADER): - case sizeof(BITMAPV5HEADER): - *puiWidth = bih->bV5Width; - *puiHeight = bih->bV5Height; - return S_OK; - default: - return E_FAIL; - } -} - static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { BmpFrameDecode *This = (BmpFrameDecode*)iface; TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return BmpHeader_GetSize(&This->bih, puiWidth, puiHeight); + if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih; + *puiWidth = bch->bcWidth; + *puiHeight = bch->bcHeight; + } + else + { + *puiWidth = This->bih.bV5Width; + *puiHeight = abs(This->bih.bV5Height); + } + return S_OK; } static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface,

1 0

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

July 2, 2009

Module: wine Branch: master Commit: 5b7de464ca1d93ce92201bc6c0484ba6550fe073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7de464ca1d93ce92201bc6c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 1 15:48:56 2009 -0500 windowscodecs: Implement CopyPixels for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 97 +++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 53 +++++++++++++++++ dlls/windowscodecs/tests/bmpformat.c | 42 ++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 4 + 4 files changed, 193 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b7de464ca1d93ce92201…

1 0

Michael Stefaniuc : notepad: Fix the Finnish translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 55b1a1977e55e81db77ae1fe2c35dd659e522cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b1a1977e55e81db77ae1fe2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:36:41 2009 +0200 notepad: Fix the Finnish translation. --- programs/notepad/Fi.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc index bd4b204..914a03f 100644 --- a/programs/notepad/Fi.rc +++ b/programs/notepad/Fi.rc @@ -52,6 +52,7 @@ POPUP "&Muokkaa" { POPUP "&Etsi" { MENUITEM "Etsi...", CMD_SEARCH MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT + MENUITEM "&Korvaa...\tCtrl+H", CMD_REPLACE } POPUP "&Apua" { MENUITEM "&Sis�lt�", CMD_HELP_CONTENTS

1 0

Aurimas Fišeras : winmm: Add Lithuanian translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: f404fd787f730b02867ee549e3cdd7922981db50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f404fd787f730b02867ee549e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jul 1 19:28:21 2009 +0300 winmm: Add Lithuanian translation. --- dlls/winmm/winmm_Lt.rc | 133 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/winmm_res.rc | 1 + 2 files changed, 134 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f404fd787f730b02867ee…

1 0

Michael Stefaniuc : hhctrl.ocx: Fix a memory leak on an error path (Smatch) .
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: d6eb5eb7c6f828474da2436023f422725016b119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6eb5eb7c6f828474da243602… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:32:31 2009 +0200 hhctrl.ocx: Fix a memory leak on an error path (Smatch). --- dlls/hhctrl.ocx/chm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index c3a7499..b7df8e7 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -370,8 +370,10 @@ CHMInfo *OpenCHM(LPCWSTR szFile) if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) return NULL; - if (!(ret->szFile = strdupW(szFile))) + if (!(ret->szFile = strdupW(szFile))) { + heap_free(ret); return NULL; + } hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ;

1 0

Frédéric Delanoy : comdlg32: Improve French translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: a9f3bd06fde361de3682446df1e9933cc2103894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f3bd06fde361de3682446df… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 1 19:05:18 2009 +0200 comdlg32: Improve French translation. --- dlls/comdlg32/cdlg_Fr.rc | 110 +++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9f3bd06fde361de36824…

1 0

Hans Leidekker : mlang: Add a test for IMultiLanguage2_IsCodePageInstallable.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 48efa30050df799f299c4c8369306e17c15a95db URL: http://source.winehq.org/git/wine.git/?a=commit;h=48efa30050df799f299c4c836… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 1 16:30:26 2009 +0200 mlang: Add a test for IMultiLanguage2_IsCodePageInstallable. --- dlls/mlang/tests/mlang.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index bd4fd6c..7a1290d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1957,6 +1957,23 @@ static void test_GetFontUnicodeRanges(IMLangFontLink2 *font_link) DeleteDC(hdc); } +static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) +{ + UINT i; + HRESULT hr; + + for (i = 0; i < 0xffff; i++) + { + hr = IMultiLanguage2_IsCodePageInstallable(ml2, i); + + /* it would be better to use IMultiLanguage2_ValidateCodePageEx here but that brings + * up an installation dialog on some platforms, even when specifying CPIOD_PEEK. + */ + if (IsValidCodePage(i)) + ok(hr == S_OK, "code page %u is valid but not installable 0x%08x\n", i, hr); + } +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -2016,6 +2033,7 @@ START_TEST(mlang) test_multibyte_to_unicode_translations(iML2); test_IMultiLanguage2_ConvertStringFromUnicode(iML2); + test_IsCodePageInstallable(iML2); IMultiLanguage2_Release(iML2);

1 0

Aurimas Fišeras : oleview: Add Lithuanian translation.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: 88aff8da884df48d2d7feda21e9a9f43964bad27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88aff8da884df48d2d7feda21… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jun 30 23:53:55 2009 +0300 oleview: Add Lithuanian translation. --- programs/oleview/Lt.rc | 218 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 219 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc new file mode 100644 index 0000000..ab887c2 --- /dev/null +++ b/programs/oleview/Lt.rc @@ -0,0 +1,218 @@ +/* + * OLE žiuryklė + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDM_MENU MENU +{ + POPUP "&Failas" + { + MENUITEM "Susieti su &failu...", IDM_BIND + MENUITEM "&Peržiūrėti TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Sistemos konfigūracija...", IDM_SYSCONF + MENUITEM "Paleisti &registro tvarkytuvę", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "Iš&eiti", IDM_EXIT + } + POPUP "&Objektas" + { + POPUP "&CoCreateInstance žymos bitai" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Peržiūrėti &tipų informaciją", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Sukurti &egzempliorių", IDM_CREATEINST, GRAYED + MENUITEM "Sukurti egzempliorių &kompiuteryje...", IDM_CREATEINSTON, GRAYED + MENUITEM "&Naikinti egzempliorių", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Kopijuoti C&LSID į iškarpinę", IDM_COPYCLSID, GRAYED + MENUITEM "Kopijuoti &HTML objekto gairę į iškarpinę", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Peržiūrėti...", IDM_VIEW, GRAYED + } + POPUP "&Rodinys" + { + MENUITEM "&Eksperto režimas", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Paslėptų komponentų kategorijos", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Įrankių juosta", IDM_TOOLBAR,CHECKED + MENUITEM "&Būsenos juosta", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Atnaujinti\tF5", IDM_REFRESH + } + POPUP "&Žinynas" + { + MENUITEM "&Apie OLE žiurykę", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&Failas" + { + MENUITEM "Išsaugoti &kaip...", IDM_SAVEAS + MENUITEM "&Užverti", IDM_CLOSE + } + POPUP "&Rodinys" + { + MENUITEM "&Grupuoti pagal rūšį", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&Įrankių juosta", IDM_TOOLBAR + MENUITEM "&Būsenos juosta", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OLE žiuryklė" + IDS_APPTITLE "OLE žiuryklė" + IDS_READY "Parengta" + IDS_ABOUT "OLE žiuryklė - OLE/COM objektų žiūryklė" + IDS_ABOUTVER "versija 1.0" + IDS_TYPELIBTITLE "ITypeLib žiūryklė" + IDS_OPEN "Atverti" + IDS_OPEN_TYPELIB_FILTER "TypeLib failai (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Visi failai (*.*)\0*.*\0\0" + + IDM_BIND, "Susieti su failu per failo vardą" + IDM_TYPELIB, "Atverti TypeLib failą ir peržiūrėti jo turinį" + IDM_SYSCONF, "Keisti paskirstytojo COM kompiuterio nustatymus" + IDM_REGEDIT, "Paleisti Wine registro tvarkytuvę" + IDM_EXIT, "Išeiti iš programos. Paragina išsaugoti pakeitimus" + IDM_CREATEINST, "Sukurti pažymėto objekto egzempliorių" + IDM_CREATEINSTON, "Sukurti pažymėto objekto egzempliorių nurodytame kompiuteryje" + IDM_RELEASEINST, "Naikinti pažymėto objekto egzempliorių" + IDM_COPYCLSID, "Kopijuoti pažymėto elemento GUID į iškarpinę" + IDM_VIEW, "Rodyti žiūryklę pasirinktam elementui" + IDM_FLAG_INSERV, "Naudoti CLSCTX_INPROC_SERVER iškviečiant CoGetClassObject" + IDM_FLAG_INHANDL, "Naudoti CLSCTX_INPROC_HANDLER iškviečiant CoGetClassObject" + IDM_FLAG_LOCSERV, "Naudoti CLSCTX_LOCAL_SERVER iškviečiant CoGetClassObject" + IDM_FLAG_REMSERV, "Naudoti CLSCTX_REMOTE_SERVER iškviečiant CoGetClassObject" + IDM_EXPERT, "Perjungti tarp eksperto ir naujoko rodymo režimų" + IDM_HIDDEN, "Perjungti komponentų kategorijų, kurios turėjo būti nematomos, rodymą" + IDM_TOOLBAR, "Rodyti ar slėpti įrankių juostą" + IDM_STATUSBAR, "Rodyti ar slėpti būsenos juostą" + IDM_REFRESH, "Atnaujinti visus sąrašus" + IDM_ABOUT, "Parodo programos informaciją, versijos numerį ir autoriaus teises" + + IDM_SAVEAS, "Išsaugoti kaip .IDL ar .H failą" + IDM_CLOSE, "Užverti langą" + IDM_GROUP, "Grupuoti tipų informaciją pagal rūšį" + + IDS_TREE_OC, "Objektų klasės" + IDS_TREE_GBCC, "Sugrupuotos pagal komponento kategoriją" + IDS_TREE_O1O, "OLE 1.0 objektai" + IDS_TREE_CLO, "COM bibliotekos objektai" + IDS_TREE_AO, "Visi objektai" + IDS_TREE_AID, "Programų identifikatoriai" + IDS_TREE_TL, "Tipų bibliotekos" + IDS_TL_VER, "ver." + IDS_TREE_I, "Sąsajos" + + IDS_TAB_REG, "Registras" + IDS_TAB_IMPL, "Realizacija" + IDS_TAB_ACTIV, "Aktyvinimas" + + IDS_CGCOFAIL, "CoGetClassObject nepavyko." + IDS_ERROR_UNKN, "Nežinoma klaida" + IDS_TRUE, "Tiesa" + IDS_FALSE, "Netiesa" + IDS_BYTES, "baitai" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) nepavyko ($%x)" + IDS_INHERITINTERFACES, "Paveldėtos sąsajos" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Jungtis prie kito kompiuterio" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Kompiuterio vardas:", -1, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&Gerai", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Sistemos konfigūracija" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Sistemos nuostatos", -1, 5, 6, 160, 8 + CHECKBOX "Įjungti &paskirstytąjį COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Įjungti &nuotolinį prisijungimą (tik Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Šios nuostatos keičia tik registro reikšmes.\nTai neturi jokios įtakos Wine našumui.", -1, 5, 50, 160, 40 + DEFPUSHBUTTON "&Gerai", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Numatytosios sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Sąsaja", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Peržiūrėti tipų informaciją", IDC_VIEWTYPEINFO, 6, 31, 90, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klasės vardas:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream sąsajos žiūryklė" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klasės vardas:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Užverti", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty()", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax()", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} + +#pragma code_page(default) diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 3f36889..14122b7 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -29,6 +29,7 @@ #include "Fr.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Hans Leidekker : mlang: Implement IMultiLanguage2_IsCodePageInstallable.
by Alexandre Julliard July 2, 2009

July 2, 2009

Module: wine Branch: master Commit: c2eee9f5fcff0307f5453e176f9a71b941aae4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2eee9f5fcff0307f5453e176… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 1 16:30:00 2009 +0200 mlang: Implement IMultiLanguage2_IsCodePageInstallable. --- dlls/mlang/mlang.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 180e1ad..c28e695 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3125,8 +3125,10 @@ static HRESULT WINAPI fnIMultiLanguage2_IsCodePageInstallable( IMultiLanguage3* iface, UINT uiCodePage) { - FIXME("%u\n", uiCodePage); - return E_NOTIMPL; + TRACE("%u\n", uiCodePage); + + /* FIXME: the installable set is usually larger than the set of valid codepages */ + return IMultiLanguage2_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); } static HRESULT WINAPI fnIMultiLanguage2_SetMimeDBSource(

1 0

Alexandre Julliard : preloader: Reserve addresses only up to 0x68000000, that should be enough for ole32.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 4d35f3f2704fe2cda261af0e2d112bfde32fc60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d35f3f2704fe2cda261af0e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 16:02:55 2009 +0200 preloader: Reserve addresses only up to 0x68000000, that should be enough for ole32. --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e7ac0c1..087d04b 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -110,7 +110,7 @@ static struct wine_preload_info preload_info[] = { { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x6fef0000 }, /* low memory area */ + { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Aric Stewart : notepad: Update Japanese resource.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 1c09598c283f5e6fccebdf9efe7e9f3ea1626373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c09598c283f5e6fccebdf9ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 1 08:30:14 2009 -0500 notepad: Update Japanese resource. --- programs/notepad/Ja.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 5513932..1ad4062 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -56,6 +56,7 @@ POPUP "編集(&E)" { POPUP "検索(&S)" { MENUITEM "検索(&S)...\tCtrl+F", CMD_SEARCH MENUITEM "次を検索(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "置き換える(&R)...\tCtrl+H", CMD_REPLACE } POPUP "ヘルプ(&H)" { MENUITEM "目次(&C)", CMD_HELP_CONTENTS

1 0

Aric Stewart : wordpad: Update Japanese resource.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: f30387197ca28fe7eba2e5bc0f1e1308e6393018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30387197ca28fe7eba2e5bc0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 1 08:25:18 2009 -0500 wordpad: Update Japanese resource. --- programs/wordpad/Ja.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index 09e48aa..3049d8b 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -242,6 +242,8 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "ファイルに保存する権限がありません。" STRING_OPEN_FAILED, "ファイルを開けません。" STRING_OPEN_ACCESS_DENIED, "ファイルを開く権限がありません。" + STRING_PRINTING_NOT_IMPLEMENTED, "プリントが実装されていません。" + STRING_MAX_TAB_STOPS, "32以上なタブを追加できません。" END #pragma code_page(default)

1 0

Nikolay Sivov : comctl32/listview: Improve hittesting a bit.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 84f14a37164f5dd7e8ed7cb65321ac5aa7f9206d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f14a37164f5dd7e8ed7cb65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 1 00:40:03 2009 +0400 comctl32/listview: Improve hittesting a bit. --- dlls/comctl32/listview.c | 72 +++++++++++++++++++++------------------ dlls/comctl32/tests/listview.c | 18 +++++++++- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7099227..d7a5f97 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6798,55 +6798,42 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->iItem = -1; if (subitem) lpht->iSubItem = 0; - if (infoPtr->rcList.left > lpht->pt.x) - lpht->flags |= LVHT_TOLEFT; - else if (infoPtr->rcList.right < lpht->pt.x) - lpht->flags |= LVHT_TORIGHT; + LISTVIEW_GetOrigin(infoPtr, &Origin); + + /* set whole list relation flags */ + if (subitem && infoPtr->uView == LV_VIEW_DETAILS) + { + /* LVM_SUBITEMHITTEST checks left bound of possible client area */ + if (infoPtr->rcList.left > lpht->pt.x && Origin.x < lpht->pt.x) + lpht->flags |= LVHT_TOLEFT; + } + else + { + if (infoPtr->rcList.left > lpht->pt.x) + lpht->flags |= LVHT_TOLEFT; + else if (infoPtr->rcList.right < lpht->pt.x) + lpht->flags |= LVHT_TORIGHT; + } if (infoPtr->rcList.top > lpht->pt.y) lpht->flags |= LVHT_ABOVE; else if (infoPtr->rcList.bottom < lpht->pt.y) lpht->flags |= LVHT_BELOW; - TRACE("lpht->flags=0x%x\n", lpht->flags); - if (lpht->flags) return -1; - - lpht->flags |= LVHT_NOWHERE; - - LISTVIEW_GetOrigin(infoPtr, &Origin); - - /* first deal with the large items */ - rcSearch.left = lpht->pt.x; - rcSearch.top = lpht->pt.y; - rcSearch.right = rcSearch.left + 1; - rcSearch.bottom = rcSearch.top + 1; - - iterator_frameditems(&i, infoPtr, &rcSearch); - iterator_next(&i); /* go to first item in the sequence */ - iItem = i.nItem; - iterator_destroy(&i); - - TRACE("lpht->iItem=%d\n", iItem); - if (iItem == -1) return -1; - + /* even if item is invalid try to find subitem */ if (infoPtr->uView == LV_VIEW_DETAILS && subitem) { - RECT bounds, *pRect; + RECT *pRect; INT j; - /* for top/bottom only */ - bounds.left = LVIR_BOUNDS; - LISTVIEW_GetItemRect(infoPtr, iItem, &bounds); opt.x = lpht->pt.x - Origin.x; - opt.y = lpht->pt.y; + lpht->iSubItem = -1; for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) { pRect = &LISTVIEW_GetColumnInfo(infoPtr, j)->rcHeader; - bounds.left = pRect->left; - bounds.right = pRect->right; - if (PtInRect(&bounds, opt)) + if ((opt.x >= pRect->left) && (opt.x < pRect->right)) { lpht->iSubItem = j; break; @@ -6855,6 +6842,25 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, TRACE("lpht->iSubItem=%d\n", lpht->iSubItem); } + TRACE("lpht->flags=0x%x\n", lpht->flags); + if (lpht->flags) return -1; + + lpht->flags |= LVHT_NOWHERE; + + /* first deal with the large items */ + rcSearch.left = lpht->pt.x; + rcSearch.top = lpht->pt.y; + rcSearch.right = rcSearch.left + 1; + rcSearch.bottom = rcSearch.top + 1; + + iterator_frameditems(&i, infoPtr, &rcSearch); + iterator_next(&i); /* go to first item in the sequence */ + iItem = i.nItem; + iterator_destroy(&i); + + TRACE("lpht->iItem=%d\n", iItem); + if (iItem == -1) return -1; + lvItem.mask = LVIF_STATE | LVIF_TEXT; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; lvItem.stateMask = LVIS_STATEIMAGEMASK; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 38155b1..d11d9de 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2684,7 +2684,16 @@ static void test_hittest(void) x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* outside possible client rectangle (to right) */ + x = pos.x + 500; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); + /* subitem returned with -1 item too */ + x = pos.x + 150; + y = -10; + test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE); x = pos.x + 150; /* outside column */ @@ -2701,7 +2710,12 @@ static void test_hittest(void) x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* outside possible client rectangle (to right) */ + x = pos.x + 500; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n");

1 0

Damjan Jovanovic : winemenubuilder: Distinguish menu icons from association icons.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: fe8d913358633b4c1b44b335f517b4a5995392df URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8d913358633b4c1b44b335f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 30 21:04:32 2009 +0200 winemenubuilder: Distinguish menu icons from association icons. --- programs/winemenubuilder/winemenubuilder.c | 55 ++++++++++++++++------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 200cd0f..d9d7852 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -739,7 +739,7 @@ static BOOL create_directories(char *directory) } /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ -static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) +static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) { unsigned short crc; char *iconsdir = NULL, *ico_path = NULL, *ico_name, *xpm_path = NULL; @@ -785,18 +785,35 @@ static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) crc=crc16(ico_path); /* Try to treat the source file as an exe */ - xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); - sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); + if (destFilename) + xpm_path=HeapAlloc(GetProcessHeap(),0,strlen(iconsdir)+1+strlen(destFilename)+1+3); + else + xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); + if (xpm_path == NULL) + { + WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); + return NULL; + } + if (destFilename) + sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); if (ExtractFromEXEDLL( path, index, xpm_path )) goto end; /* Must be something else, ignore the index in that case */ - sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); + if (destFilename) + sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); if (ExtractFromICO( path, xpm_path)) goto end; if (!bWait) { - sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); + if (destFilename) + sprintf(xpm_path,"%s/%s.xpm",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); if (create_default_icon( xpm_path, ico_path )) goto end; } @@ -1907,17 +1924,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } iconW = assoc_query(ASSOCSTR_DEFAULTICON, extensionW, NULL); - if (iconW) - { - WCHAR *comma = strrchrW(iconW, ','); - int index = 0; - if (comma) - { - *comma = 0; - index = atoiW(comma + 1); - } - iconA = extract_icon(iconW, index, FALSE); - } contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL); @@ -1936,18 +1942,19 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package /* Gnome seems to ignore the <icon> tag in MIME packages, * and the default name is more intuitive anyway. */ - if (iconA) + if (iconW) { char *flattened_mime = slashes_to_minuses(mimeTypeA); if (flattened_mime) { - char *dstIconPath = heap_printf("%s/icons/%s%s", xdg_data_dir, - flattened_mime, strrchr(iconA, '.')); - if (dstIconPath) + int index = 0; + WCHAR *comma = strrchrW(iconW, ','); + if (comma) { - rename(iconA, dstIconPath); - HeapFree(GetProcessHeap(), 0, dstIconPath); + *comma = 0; + index = atoiW(comma + 1); } + iconA = extract_icon(iconW, index, flattened_mime, FALSE); HeapFree(GetProcessHeap(), 0, flattened_mime); } } @@ -2098,9 +2105,9 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) /* extract the icon */ if( szIconPath[0] ) - icon_name = extract_icon( szIconPath , iIconId, bWait ); + icon_name = extract_icon( szIconPath , iIconId, NULL, bWait ); else - icon_name = extract_icon( szPath, iIconId, bWait ); + icon_name = extract_icon( szPath, iIconId, NULL, bWait ); /* fail - try once again after parent process exit */ if( !icon_name )

1 0

Huw Davies : gdi32/tests: Dump the correct metafile if the test fails.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: d79943446f23b22fd6e3c3f9139e7c1567fc80bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79943446f23b22fd6e3c3f91… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 12:03:04 2009 +0100 gdi32/tests: Dump the correct metafile if the test fails. --- dlls/gdi32/tests/metafile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4cc7ca4..2b695d8 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1457,8 +1457,8 @@ static void test_CopyMetaFile(void) if (compare_mf_disk_bits(mf_name, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) { - dump_mf_bits(hMetafile, "mf_Blank"); - EnumMetaFile(0, hMetafile, mf_enum_proc, 0); + dump_mf_bits(hmf_copy, "mf_Blank"); + EnumMetaFile(0, hmf_copy, mf_enum_proc, 0); } ret = DeleteMetaFile(hmf_copy);

1 0

Hans Leidekker : hhctrl.ocx: Remove some dead code.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 28f91290003675f2962f837b5009c65cf2cca9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f91290003675f2962f837b5… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:54:07 2009 +0200 hhctrl.ocx: Remove some dead code. This condition is inside the switch block for HH_DISPLAY_SEARCH, so it can never evaluate to true. --- dlls/hhctrl.ocx/hhctrl.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 5e707b9..10e04bc 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -119,11 +119,6 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat filename = chm_file; index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } - else - { - if (command!=HH_DISPLAY_SEARCH) /* FIXME - use HH_FTS_QUERYW structure in data */ - index = (const WCHAR*)data; - } info = CreateHelpViewer(filename); if(!info)

1 0

Hans Leidekker : hhctrl.ocx: Don't leak the CHM filename.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: abad7f4f76b6e4f094f10123b2b2ab6a4a4c3f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abad7f4f76b6e4f094f10123b… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:53:19 2009 +0200 hhctrl.ocx: Don't leak the CHM filename. --- dlls/hhctrl.ocx/chm.c | 1 + dlls/hhctrl.ocx/hhctrl.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index e8d036b..dbf174d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -423,6 +423,7 @@ CHMInfo *CloseCHM(CHMInfo *chm) heap_free(chm->defTitle); heap_free(chm->defTopic); heap_free(chm->defToc); + heap_free(chm->szFile); heap_free(chm); return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 795bea4..83d39f5 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -69,7 +69,7 @@ typedef struct CHMInfo { IITStorage *pITStorage; IStorage *pStorage; - LPCWSTR szFile; + WCHAR *szFile; IStream *strings_stream; char **strings;

1 0

Huw Davies : gdi32/tests: Add a test for the MFCOMMENT record's size.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 470e8fe2f438b2d91035ffa92d692efb91a8d701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470e8fe2f438b2d91035ffa92… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 12:14:40 2009 +0100 gdi32/tests: Add a test for the MFCOMMENT record's size. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 237f2f4..4cc7ca4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2348,7 +2348,9 @@ static void test_GetWinMetaFileBits(void) if(rec_num == mfcomment_chunks - 1) this_chunk_size = emf_size - rec_num * chunk_size; - ok(rec->rdFunction == META_ESCAPE, "got %04x\n", rec->rdFunction); + ok(rec->rdSize == (this_chunk_size + 44) / 2, "%04x: got %04x expected %04x\n", rec_num, rec->rdSize, (this_chunk_size + 44) / 2); + ok(rec->rdFunction == META_ESCAPE, "%04x: got %04x\n", rec_num, rec->rdFunction); + if(rec->rdSize < (this_chunk_size + 44) / 2) break; ok(rec->rdParm[0] == MFCOMMENT, "got %04x\n", rec->rdParm[0]); ok(rec->rdParm[1] == this_chunk_size + 34, "got %04x %x\n", rec->rdParm[1], emf_size + 34); ok(rec->rdParm[2] == 0x4d57, "got %04x\n", rec->rdParm[2]); /* WMFC */

1 0

Stefan Dösinger : wined3d: Don' t dirtify too many shader constants.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: c82da7d97506b638ded678abb93160e4bd6de2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82da7d97506b638ded678abb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 28 18:33:22 2009 +0200 wined3d: Don't dirtify too many shader constants. If we have start = 4, count = 3, the highest dirty constant is the one with index 6. start + count gives 7, so it already includes the zero-based array correction. Don't add an additional 1. Additionally to the inefficiency of looking at one extra constant, this causes problems if the driver rejects loading 257 constants on the initial load. In this case no constant is loaded if GL_EXT_gpu_program_parameters is used. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 28118c7..66a7634 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -515,7 +515,7 @@ static void shader_arb_update_float_vertex_constants(IWineD3DDevice *iface, UINT * context. On a context switch the old context will be fully dirtified */ memset(This->activeContext->vshader_const_dirty + start, 1, sizeof(*This->activeContext->vshader_const_dirty) * count); - This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start + count + 1); + This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start + count); } static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) @@ -526,7 +526,7 @@ static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT * context. On a context switch the old context will be fully dirtified */ memset(This->activeContext->pshader_const_dirty + start, 1, sizeof(*This->activeContext->pshader_const_dirty) * count); - This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count + 1); + This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count); } static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This)

1 0

Hans Leidekker : hhctrl.ocx: Try the Windows help directory if the specified file does not exist.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: bbfe59bc93738e95208d215800d716e4b3594794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfe59bc93738e95208d21580… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:54:44 2009 +0200 hhctrl.ocx: Try the Windows help directory if the specified file does not exist. --- dlls/hhctrl.ocx/chm.c | 9 +++++---- dlls/hhctrl.ocx/hhctrl.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index dbf174d..c3a7499 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -362,15 +362,16 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) /* Opens the CHM file for reading */ CHMInfo *OpenCHM(LPCWSTR szFile) { - WCHAR file[MAX_PATH] = {0}; HRESULT hres; + CHMInfo *ret; static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; - CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); + if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) + return NULL; - GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); - ret->szFile = strdupW(file); + if (!(ret->szFile = strdupW(szFile))) + return NULL; hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ; diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 10e04bc..8268a21 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -86,11 +86,27 @@ static const char *command_to_string(UINT command) #undef X } +static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen) +{ + static const WCHAR helpW[] = {'\\','h','e','l','p','\\',0}; + + GetFullPathNameW(filename, buflen, fullname, NULL); + if (GetFileAttributesW(fullname) == INVALID_FILE_ATTRIBUTES) + { + GetWindowsDirectoryW(fullname, buflen); + strcatW(fullname, helpW); + strcatW(fullname, filename); + } + return (GetFileAttributesW(fullname) != INVALID_FILE_ATTRIBUTES); +} + /****************************************************************** * HtmlHelpW (HHCTRL.OCX.15) */ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR data) { + WCHAR fullname[MAX_PATH]; + TRACE("(%p, %s, command=%s, data=%lx)\n", caller, debugstr_w( filename ), command_to_string( command ), data); @@ -120,7 +136,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } - info = CreateHelpViewer(filename); + if (!resolve_filename(filename, fullname, MAX_PATH)) + { + WARN("can't find %s\n", debugstr_w(filename)); + return 0; + } + + info = CreateHelpViewer(fullname); if(!info) return NULL; @@ -142,7 +164,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if (!filename) return NULL; - info = CreateHelpViewer(filename); + if (!resolve_filename(filename, fullname, MAX_PATH)) + { + WARN("can't find %s\n", debugstr_w(filename)); + return 0; + } + + info = CreateHelpViewer(fullname); if(!info) return NULL;

1 0

Detlef Riekenberg : shlwapi: Last parameter in SHUnicodeToAnsiCP is an int.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 2e19130976e1b1e169be8cc9c8bc44ed9f43cead URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e19130976e1b1e169be8cc9c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 30 22:32:52 2009 +0200 shlwapi: Last parameter in SHUnicodeToAnsiCP is an int. --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 76 +++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b7ea3aa..fad7d56 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -215,7 +215,7 @@ 215 stdcall -noname SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) -218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr ptr) +218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) 219 stdcall -noname QISearch(long long long long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index da0dee3..755360d 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2477,20 +2477,24 @@ DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen) * CodePage [I] Code page to use for the conversion * lpSrcStr [I] Source Unicode string to convert * lpDstStr [O] Destination for converted Ascii string - * lpiLen [I/O] Input length of lpDstStr/destination for length of lpDstStr + * dstlen [I] Length of buffer at lpDstStr * * RETURNS - * Success: The number of characters that result from the conversion. - * Failure: 0. + * Success: The length in bytes of the result at lpDstStr (including the terminator) + * Failure: When using CP_UTF8, CP_UTF7 or 0xc350 as codePage, 0 is returned and + * the result is not nul-terminated. + * When using a different codepage, the length in bytes of the truncated + * result at lpDstStr (including the terminator) is returned and + * lpDstStr is always nul-terminated. + * */ -INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, - LPINT lpiLen) +DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, int dstlen) { static const WCHAR emptyW[] = { '\0' }; int len , reqLen; LPSTR mem; - if (!lpDstStr || !lpiLen) + if (!lpDstStr || !dstlen) return 0; if (!lpSrcStr) @@ -2509,41 +2513,41 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, case CP_UTF8: { DWORD dwMode = 0; - INT nWideCharCount = len - 1; - - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, - &nWideCharCount, lpDstStr, - lpiLen) == S_OK) - return 0; + INT lenW = len - 1; + INT needed = dstlen - 1; + HRESULT hr; - if (nWideCharCount < len - 1) + /* try the user supplied buffer first */ + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, lpDstStr, &needed); + if (hr == S_OK) { - mem = HeapAlloc(GetProcessHeap(), 0, *lpiLen); - if (!mem) - return 0; + lpDstStr[needed] = '\0'; + return needed + 1; + } - *lpiLen = 0; + /* user buffer too small. exclude termination and copy as much as possible */ + lenW = len; + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, NULL, &needed); + needed++; + mem = HeapAlloc(GetProcessHeap(), 0, needed); + if (!mem) + return 0; - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, - mem, lpiLen) != S_OK) - { - SHTruncateString(mem, *lpiLen); - lstrcpynA(lpDstStr, mem, *lpiLen + 1); - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen + 1; - } - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen; + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, mem, &needed); + if (hr == S_OK) + { + reqLen = SHTruncateString(mem, dstlen); + if (reqLen > 0) memcpy(lpDstStr, mem, reqLen-1); } - lpDstStr[*lpiLen] = '\0'; - return *lpiLen; + HeapFree(GetProcessHeap(), 0, mem); + return 0; } default: break; } - reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, - *lpiLen, NULL, NULL); + /* try the user supplied buffer first */ + reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, dstlen, NULL, NULL); if (!reqLen && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -2556,12 +2560,12 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, reqLen, NULL, NULL); - reqLen = SHTruncateString(mem, *lpiLen); + reqLen = SHTruncateString(mem, dstlen -1); reqLen++; - lstrcpynA(lpDstStr, mem, *lpiLen); - + lstrcpynA(lpDstStr, mem, reqLen); HeapFree(GetProcessHeap(), 0, mem); + lpDstStr[reqLen-1] = '\0'; } } } @@ -2586,9 +2590,7 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, */ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) { - INT myint = iLen; - - return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, &myint); + return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, iLen); } /*************************************************************************

1 0

Paul Chitescu : services.exe: When asked to search by display name skip NULL names.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 8fd619618f37a5e0b08e1063f6f0f5c3945b2664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd619618f37a5e0b08e1063f… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jul 1 15:21:47 2009 +0300 services.exe: When asked to search by display name skip NULL names. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 9bed784..091c693 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -349,7 +349,7 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) { - if (strcmpiW(name, service->config.lpDisplayName) == 0) + if (service->config.lpDisplayName && strcmpiW(name, service->config.lpDisplayName) == 0) return service; }

1 0

Alexandre Julliard : gdiplus: Don' t return garbage from the GdipCreateHBITMAPFromBitmap stub.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 4d31a25f504828954b2f5d96fd69bb534e17231b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d31a25f504828954b2f5d96f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:14:40 2009 +0200 gdiplus: Don't return garbage from the GdipCreateHBITMAPFromBitmap stub. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6df104e..a603adb 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -449,7 +449,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, { FIXME("stub\n"); - hbmReturn = NULL; + if (hbmReturn) *hbmReturn = NULL; return NotImplemented; }

1 0

Alexandre Julliard : kernel32: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 887af612190f3c14d6f8513bf405759b98073e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887af612190f3c14d6f8513bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:13:46 2009 +0200 kernel32: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- dlls/kernel32/process.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 83d1aa5..6fde35b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1304,12 +1304,18 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (!env) env = GetEnvironmentStringsW(); - if (pipe(fd) == -1) +#ifdef HAVE_PIPE2 + if (pipe2( fd, O_CLOEXEC ) == -1) +#endif { - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - return -1; + if (pipe(fd) == -1) + { + SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + return -1; + } + fcntl( fd[0], F_SETFD, FD_CLOEXEC ); + fcntl( fd[1], F_SETFD, FD_CLOEXEC ); } - fcntl( fd[1], F_SETFD, 1 ); /* set close on exec */ if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) {

1 0

Alexandre Julliard : secur32: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: a6b05ea96c2ed3ea18eb82e2c871933f578b9c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b05ea96c2ed3ea18eb82e2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:14:08 2009 +0200 secur32: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- dlls/secur32/dispatcher.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 91f425c..666baea 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #ifdef HAVE_UNISTD_H @@ -57,16 +58,28 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, } TRACE("\n"); - if( pipe(pipe_in) < 0 ) +#ifdef HAVE_PIPE2 + if (pipe2( pipe_in, O_CLOEXEC ) < 0 ) +#endif { - return SEC_E_INTERNAL_ERROR; + if( pipe(pipe_in) < 0 ) return SEC_E_INTERNAL_ERROR; + fcntl( pipe_in[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_in[1], F_SETFD, FD_CLOEXEC ); } - if( pipe(pipe_out) < 0 ) +#ifdef HAVE_PIPE2 + if (pipe2( pipe_out, O_CLOEXEC ) < 0 ) +#endif { - close(pipe_in[0]); - close(pipe_in[1]); - return SEC_E_INTERNAL_ERROR; + if( pipe(pipe_out) < 0 ) + { + close(pipe_in[0]); + close(pipe_in[1]); + return SEC_E_INTERNAL_ERROR; + } + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); } + if (!(helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper)))) { close(pipe_in[0]); @@ -91,9 +104,6 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, if(helper->helper_pid == 0) { /* We're in the child now */ - close(0); - close(1); - dup2(pipe_out[0], 0); close(pipe_out[0]); close(pipe_out[1]); @@ -125,10 +135,8 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, helper->crypt.ntlm2.recv_sign_key = NULL; helper->crypt.ntlm2.recv_seal_key = NULL; helper->pipe_in = pipe_in[0]; - fcntl( pipe_in[0], F_SETFD, 1 ); close(pipe_in[1]); helper->pipe_out = pipe_out[1]; - fcntl( pipe_out[1], F_SETFD, 1 ); close(pipe_out[0]); }

1 0

Nikolay Sivov : comctl32/header: Always release item down state on WM_LBUTTONUP.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 1daf40a8375fb134e8db6fb22bd5e92fe9ce84a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1daf40a8375fb134e8db6fb22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 1 01:33:29 2009 +0400 comctl32/header: Always release item down state on WM_LBUTTONUP. --- dlls/comctl32/header.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 1486a8a..ddc9cb0 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1590,6 +1590,9 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) HEADER_InternalHitTest (infoPtr, &pt, &flags, &nItem); if (infoPtr->bPressed) { + + infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; + if (infoPtr->bDragging) { HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; @@ -1597,8 +1600,7 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) ImageList_DragShowNolock(FALSE); ImageList_EndDrag(); - lpItem->bDown=FALSE; - + if (infoPtr->iHotDivider == -1) iNewOrder = -1; else if (infoPtr->iHotDivider == infoPtr->uNumItem) @@ -1623,14 +1625,14 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) infoPtr->bDragging = FALSE; HEADER_SetHotDivider(infoPtr, FALSE, -1); } - else if (!(infoPtr->dwStyle & HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + else { - infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; hdc = GetDC (infoPtr->hwndSelf); HEADER_RefreshItem (infoPtr, infoPtr->iMoveItem); ReleaseDC (infoPtr->hwndSelf, hdc); - HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); + if (!(infoPtr->dwStyle & HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); } TRACE("Released item %d!\n", infoPtr->iMoveItem);

1 0

Alexandre Julliard : ntdll: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 6f68b774d7c04016a05c2d5829d0934baba02dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f68b774d7c04016a05c2d582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:13:34 2009 +0200 ntdll: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- configure | 2 ++ configure.ac | 1 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 35 ++++++++++++++++++++++++++++------- dlls/ntdll/thread.c | 3 +-- include/config.h.in | 3 +++ 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 51a5440..8ce9434 100755 --- a/configure +++ b/configure @@ -18351,6 +18351,7 @@ CFLAGS="$CFLAGS $BUILTINFLAG" + for ac_func in \ _pclose \ _popen \ @@ -18388,6 +18389,7 @@ for ac_func in \ memmove \ mmap \ pclose \ + pipe2 \ poll \ popen \ prctl \ diff --git a/configure.ac b/configure.ac index 2dafff3..c6843d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1610,6 +1610,7 @@ AC_CHECK_FUNCS(\ memmove \ mmap \ pclose \ + pipe2 \ poll \ popen \ prctl \ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b6a3d88..8da7148 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -85,6 +85,7 @@ extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset extern int server_remove_fd_from_cache( HANDLE handle ); extern int server_get_unix_fd( HANDLE handle, unsigned int access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ); +extern int server_pipe( int fd[2] ); /* security descriptors */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 9e54ada..e90ea72 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -663,6 +663,32 @@ void CDECL wine_server_release_fd( HANDLE handle, int unix_fd ) /*********************************************************************** + * server_pipe + * + * Create a pipe for communicating with the server. + */ +int server_pipe( int fd[2] ) +{ + int ret; +#ifdef HAVE_PIPE2 + static int have_pipe2 = 1; + + if (have_pipe2) + { + if (!(ret = pipe2( fd, O_CLOEXEC ))) return ret; + if (errno == ENOSYS || errno == EINVAL) have_pipe2 = 0; /* don't try again */ + } +#endif + if (!(ret = pipe( fd ))) + { + fcntl( fd[0], F_SETFD, FD_CLOEXEC ); + fcntl( fd[1], F_SETFD, FD_CLOEXEC ); + } + return ret; +} + + +/*********************************************************************** * start_server * * Start a new wine server. @@ -1029,18 +1055,13 @@ size_t server_init_thread( void *entry_point ) sigaction( SIGCHLD, &sig_act, NULL ); /* create the server->client communication pipes */ - if (pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); - if (pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); + if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); + if (server_pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); wine_server_send_fd( reply_pipe[1] ); wine_server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); ntdll_get_thread_data()->reply_fd = reply_pipe[0]; close( reply_pipe[1] ); - /* set close on exec flag */ - fcntl( ntdll_get_thread_data()->reply_fd, F_SETFD, 1 ); - fcntl( ntdll_get_thread_data()->wait_fd[0], F_SETFD, 1 ); - fcntl( ntdll_get_thread_data()->wait_fd[1], F_SETFD, 1 ); - SERVER_START_REQ( init_thread ) { req->unix_pid = getpid(); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0b924b2..0c73ffd 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -488,8 +488,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return result.create_thread.status; } - if (pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; - fcntl( request_pipe[1], F_SETFD, 1 ); /* set close on exec flag */ + if (server_pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; wine_server_send_fd( request_pipe[0] ); SERVER_START_REQ( new_thread ) diff --git a/include/config.h.in b/include/config.h.in index e12aa1a..6ef0892 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -552,6 +552,9 @@ /* Define to 1 if the system has the type `pid_t'. */ #undef HAVE_PID_T +/* Define to 1 if you have the `pipe2' function. */ +#undef HAVE_PIPE2 + /* Define to 1 if you have the <png.h> header file. */ #undef HAVE_PNG_H

1 0

Michael Stefaniuc : winedbg: Include the local resource header last.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 34f771c2070ad9a5bdd5fdfab3d5e76808642049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f771c2070ad9a5bdd5fdfab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:15:12 2009 +0200 winedbg: Include the local resource header last. --- programs/winedbg/crashdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index db25021..4a24dcc 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" #include "debugger.h" #include "wingdi.h" #include "winuser.h" @@ -27,6 +26,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "resource.h" #define MAX_PROGRAM_NAME_LENGTH 80

1 0

Alexandre Julliard : oleaut32: Properly release cache DCs instead of trying to delete them.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 70e4611e733029964fba040c768158b58008069c URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e4611e733029964fba040c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:07:35 2009 +0200 oleaut32: Properly release cache DCs instead of trying to delete them. --- dlls/oleaut32/olepicture.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 4409a15..54baf12 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1232,7 +1232,6 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr if (pixel == (transparent & 0x000000FFU)) monoPointer[j >> 3] |= 1 << (7 - (j & 7)); } } - hdcref = GetDC(0); hTempMask = CreateDIBitmap( hdcref, &bmi->bmiHeader, @@ -1241,7 +1240,6 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr bmi, DIB_RGB_COLORS ); - DeleteDC(hdcref); bmi->bmiHeader.biHeight = -bmi->bmiHeader.biHeight; This->hbmMask = CreateBitmap(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, 1, 1, NULL); @@ -1266,7 +1264,7 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr DeleteObject(hTempMask); } - DeleteDC(hdcref); + ReleaseDC(0, hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); DGifCloseFile(gif); @@ -1369,7 +1367,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x (BITMAPINFO*)&bmi, DIB_RGB_COLORS ); - DeleteDC(hdcref); + ReleaseDC(0, hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); HeapFree(GetProcessHeap(),0,bits); @@ -1398,7 +1396,7 @@ static HRESULT OLEPictureImpl_LoadDIB(OLEPictureImpl *This, BYTE *xbuf, ULONG xr bi, DIB_RGB_COLORS ); - DeleteDC(hdcref); + ReleaseDC(0, hdcref); if (This->desc.u.bmp.hbitmap == 0) return E_FAIL; This->desc.picType = PICTYPE_BITMAP;

1 0

Michael Stefaniuc : hhctrl.ocx: Build language resource files separately.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 46e5df5cb291d311c0811e999561a95d0387dc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e5df5cb291d311c0811e999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:17:48 2009 +0200 hhctrl.ocx: Build language resource files separately. Do not include them from an other rc file. --- dlls/hhctrl.ocx/Cs.rc | 2 + dlls/hhctrl.ocx/Da.rc | 2 + dlls/hhctrl.ocx/De.rc | 2 + dlls/hhctrl.ocx/El.rc | 2 + dlls/hhctrl.ocx/En.rc | 2 + dlls/hhctrl.ocx/Fi.rc | 2 + dlls/hhctrl.ocx/Fr.rc | 2 + dlls/hhctrl.ocx/Hu.rc | 2 + dlls/hhctrl.ocx/Ko.rc | 2 + dlls/hhctrl.ocx/Lt.rc | 4 +- dlls/hhctrl.ocx/Makefile.in | 22 ++++++++++++++++++- dlls/hhctrl.ocx/Nl.rc | 2 + dlls/hhctrl.ocx/No.rc | 2 + dlls/hhctrl.ocx/Pl.rc | 2 + dlls/hhctrl.ocx/Pt.rc | 2 + dlls/hhctrl.ocx/Ru.rc | 2 + dlls/hhctrl.ocx/Si.rc | 4 +- dlls/hhctrl.ocx/Sv.rc | 2 + dlls/hhctrl.ocx/Tr.rc | 2 + dlls/hhctrl.ocx/Zh.rc | 4 +- dlls/hhctrl.ocx/hhctrl.rc | 50 ------------------------------------------- dlls/hhctrl.ocx/resource.h | 5 ++++ 22 files changed, 64 insertions(+), 57 deletions(-) diff --git a/dlls/hhctrl.ocx/Cs.rc b/dlls/hhctrl.ocx/Cs.rc index ec564d8..b914762 100644 --- a/dlls/hhctrl.ocx/Cs.rc +++ b/dlls/hhctrl.ocx/Cs.rc @@ -21,6 +21,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/dlls/hhctrl.ocx/Da.rc b/dlls/hhctrl.ocx/Da.rc index e425ef0..1832d71 100644 --- a/dlls/hhctrl.ocx/Da.rc +++ b/dlls/hhctrl.ocx/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 STRINGTABLE diff --git a/dlls/hhctrl.ocx/De.rc b/dlls/hhctrl.ocx/De.rc index ef6e699..7254902 100644 --- a/dlls/hhctrl.ocx/De.rc +++ b/dlls/hhctrl.ocx/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/El.rc b/dlls/hhctrl.ocx/El.rc index dd81eb6..4fa79a2 100644 --- a/dlls/hhctrl.ocx/El.rc +++ b/dlls/hhctrl.ocx/El.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/En.rc b/dlls/hhctrl.ocx/En.rc index 83917f6..95ccd51 100644 --- a/dlls/hhctrl.ocx/En.rc +++ b/dlls/hhctrl.ocx/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 STRINGTABLE diff --git a/dlls/hhctrl.ocx/Fi.rc b/dlls/hhctrl.ocx/Fi.rc index 975ce1f..825422e 100644 --- a/dlls/hhctrl.ocx/Fi.rc +++ b/dlls/hhctrl.ocx/Fi.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Fr.rc b/dlls/hhctrl.ocx/Fr.rc index 0e5dd4f..206479e 100644 --- a/dlls/hhctrl.ocx/Fr.rc +++ b/dlls/hhctrl.ocx/Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Hu.rc b/dlls/hhctrl.ocx/Hu.rc index 225c04a..0cab8cd 100644 --- a/dlls/hhctrl.ocx/Hu.rc +++ b/dlls/hhctrl.ocx/Hu.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Ko.rc b/dlls/hhctrl.ocx/Ko.rc index 169eb70..37831df 100644 --- a/dlls/hhctrl.ocx/Ko.rc +++ b/dlls/hhctrl.ocx/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Lt.rc b/dlls/hhctrl.ocx/Lt.rc index fed6b40..8c813ba 100644 --- a/dlls/hhctrl.ocx/Lt.rc +++ b/dlls/hhctrl.ocx/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) @@ -59,5 +61,3 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 229bd2a..60f2c50 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -13,7 +13,27 @@ C_SRCS = \ regsvr.c \ webbrowser.c -RC_SRCS = hhctrl.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + El.rc \ + En.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/hhctrl.ocx/Nl.rc b/dlls/hhctrl.ocx/Nl.rc index 929ac39..99c12fa 100644 --- a/dlls/hhctrl.ocx/Nl.rc +++ b/dlls/hhctrl.ocx/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/No.rc b/dlls/hhctrl.ocx/No.rc index 5ff634d..a76ad31 100644 --- a/dlls/hhctrl.ocx/No.rc +++ b/dlls/hhctrl.ocx/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 STRINGTABLE diff --git a/dlls/hhctrl.ocx/Pl.rc b/dlls/hhctrl.ocx/Pl.rc index 40d3089..f3ce6f2 100644 --- a/dlls/hhctrl.ocx/Pl.rc +++ b/dlls/hhctrl.ocx/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 STRINGTABLE diff --git a/dlls/hhctrl.ocx/Pt.rc b/dlls/hhctrl.ocx/Pt.rc index d196ff4..13476ce 100644 --- a/dlls/hhctrl.ocx/Pt.rc +++ b/dlls/hhctrl.ocx/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Ru.rc b/dlls/hhctrl.ocx/Ru.rc index a530f80..9d16db1 100644 --- a/dlls/hhctrl.ocx/Ru.rc +++ b/dlls/hhctrl.ocx/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 STRINGTABLE diff --git a/dlls/hhctrl.ocx/Si.rc b/dlls/hhctrl.ocx/Si.rc index c8ea447..bc8ca1d 100644 --- a/dlls/hhctrl.ocx/Si.rc +++ b/dlls/hhctrl.ocx/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 @@ -58,5 +60,3 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/Sv.rc b/dlls/hhctrl.ocx/Sv.rc index cb3e4e2..b92c63c 100644 --- a/dlls/hhctrl.ocx/Sv.rc +++ b/dlls/hhctrl.ocx/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 STRINGTABLE diff --git a/dlls/hhctrl.ocx/Tr.rc b/dlls/hhctrl.ocx/Tr.rc index 7488999..f1011b1 100644 --- a/dlls/hhctrl.ocx/Tr.rc +++ b/dlls/hhctrl.ocx/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 STRINGTABLE diff --git a/dlls/hhctrl.ocx/Zh.rc b/dlls/hhctrl.ocx/Zh.rc index a7ccab0..d6295a9 100644 --- a/dlls/hhctrl.ocx/Zh.rc +++ b/dlls/hhctrl.ocx/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) @@ -96,5 +98,3 @@ BEGIN IDTB_TOC_NEXT "後一項" IDTB_TOC_PREV "前一項" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc deleted file mode 100644 index 8618819..0000000 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ /dev/null @@ -1,50 +0,0 @@ -/* - * HTML Help resources - * - * Copyright 2005 James Hawkins - * - * 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 "htmlhelp.h" -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "version.rc" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "El.rc" -#include "En.rc" -#include "Fr.rc" -#include "Fi.rc" -#include "Hu.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/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 02df946..a08fdd9 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <htmlhelp.h> + #define IDS_CONTENTS 1 #define IDS_INDEX 2 #define IDS_SEARCH 3

1 0

Michael Stefaniuc : winedbg: Build language resource files separately.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 7cf2855cf76bd21ec996339a2982b0d6b9e1506d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf2855cf76bd21ec996339a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:15:45 2009 +0200 winedbg: Build language resource files separately. Do not include them from an other rc file. --- programs/winedbg/Makefile.in | 9 ++++++++- programs/winedbg/resource.h | 2 ++ programs/winedbg/rsrc.rc | 32 -------------------------------- programs/winedbg/rsrc_De.rc | 4 ++-- programs/winedbg/rsrc_En.rc | 2 ++ programs/winedbg/rsrc_Fr.rc | 5 ++--- programs/winedbg/rsrc_Ko.rc | 2 ++ programs/winedbg/rsrc_Lt.rc | 4 ++-- programs/winedbg/rsrc_Nl.rc | 2 ++ programs/winedbg/rsrc_Ru.rc | 2 ++ 10 files changed, 24 insertions(+), 40 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index b4dd150..9147f1b 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -30,7 +30,14 @@ C_SRCS = \ types.c \ winedbg.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + rsrc_De.rc \ + rsrc_En.rc \ + rsrc_Fr.rc \ + rsrc_Ko.rc \ + rsrc_Lt.rc \ + rsrc_Nl.rc \ + rsrc_Ru.rc LEX_SRCS = debug.l BISON_SRCS = dbg.y diff --git a/programs/winedbg/resource.h b/programs/winedbg/resource.h index 49d19ef..11c2cb9 100644 --- a/programs/winedbg/resource.h +++ b/programs/winedbg/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> #define IDD_CRASH_DLG 100 diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc deleted file mode 100644 index 604c54d..0000000 --- a/programs/winedbg/rsrc.rc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Resources (rsrc.rc) - * - * Copyright 2008 Mikolaj Zalewski - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <windef.h> -#include <winuser.h> - -#include "resource.h" - -#include "rsrc_De.rc" -#include "rsrc_En.rc" -#include "rsrc_Fr.rc" -#include "rsrc_Ko.rc" -#include "rsrc_Lt.rc" -#include "rsrc_Nl.rc" -#include "rsrc_Ru.rc" diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc index da04942..360f156 100644 --- a/programs/winedbg/rsrc_De.rc +++ b/programs/winedbg/rsrc_De.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_GERMAN, SUBLANG_NEUTRAL @@ -53,5 +55,3 @@ BEGIN IDS_INVALID_PARAMS "Interne Fehler - ungültige Parameter empfangen" IDS_UNIDENTIFIED "(unbekannt)" END - -#pragma code_page(default) diff --git a/programs/winedbg/rsrc_En.rc b/programs/winedbg/rsrc_En.rc index 3d580c4..0919c73 100644 --- a/programs/winedbg/rsrc_En.rc +++ b/programs/winedbg/rsrc_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU diff --git a/programs/winedbg/rsrc_Fr.rc b/programs/winedbg/rsrc_Fr.rc index a483c29..4fb6d42 100644 --- a/programs/winedbg/rsrc_Fr.rc +++ b/programs/winedbg/rsrc_Fr.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) @@ -54,6 +56,3 @@ BEGIN IDS_INVALID_PARAMS "Erreurs internes - paramètres invalides reçus" IDS_UNIDENTIFIED "(non identifié)" END - -#pragma code_page(default) - diff --git a/programs/winedbg/rsrc_Ko.rc b/programs/winedbg/rsrc_Ko.rc index 457212f..a68deac 100644 --- a/programs/winedbg/rsrc_Ko.rc +++ b/programs/winedbg/rsrc_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 IDM_DEBUG_POPUP MENU diff --git a/programs/winedbg/rsrc_Lt.rc b/programs/winedbg/rsrc_Lt.rc index 7b49d8d..6aa5ca4 100644 --- a/programs/winedbg/rsrc_Lt.rc +++ b/programs/winedbg/rsrc_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) @@ -54,5 +56,3 @@ BEGIN IDS_INVALID_PARAMS "Vidinės klaidos - gauti neteisingi parametrai" IDS_UNIDENTIFIED "(nenustatytas)" END - -#pragma code_page(default) diff --git a/programs/winedbg/rsrc_Nl.rc b/programs/winedbg/rsrc_Nl.rc index 01be67b..e2e23e8 100644 --- a/programs/winedbg/rsrc_Nl.rc +++ b/programs/winedbg/rsrc_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 IDM_DEBUG_POPUP MENU diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc index 7fc05bb..622ff7b 100644 --- a/programs/winedbg/rsrc_Ru.rc +++ b/programs/winedbg/rsrc_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 IDM_DEBUG_POPUP MENU

1 0

Henri Verbeet : wined3d: Use flags for driver quirks.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 40bc47901c9cdc9c17ddf3d24011232df41ee82f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bc47901c9cdc9c17ddf3d24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:19 2009 +0200 wined3d: Use flags for driver quirks. --- dlls/wined3d/arb_program_shader.c | 10 ++++++---- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/vertexshader.c | 8 ++++---- dlls/wined3d/wined3d_gl.h | 5 ++--- dlls/wined3d/wined3d_private.h | 5 +++++ 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e438366..28118c7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -49,9 +49,10 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *g } static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { - if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ - gl_info->arb_vs_offset_limit || /* Have to init texcoords */ - gl_info->set_texcoord_w) { /* Load the immval offset */ + if (!GL_SUPPORT(NV_VERTEX_PROGRAM) /* Need to init colors. */ + || gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT /* Load the immval offset. */ + || gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) /* Have to init texcoords. */ + { return TRUE; } return FALSE; @@ -3751,7 +3752,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); - if((GLINFO_LOCATION).set_texcoord_w && !device->frag_pipe->ffp_proj_control) { + if ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) + { int i; for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eda6854..523528f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -950,7 +950,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->vs_arb_max_instructions = gl_max; TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native instructions: %d\n", gl_info->vs_arb_max_instructions); - gl_info->arb_vs_offset_limit = test_arb_vs_offset_limit(gl_info); + if (test_arb_vs_offset_limit(gl_info)) gl_info->quirks |= WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT; } if (gl_info->supported[ARB_VERTEX_SHADER]) { glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max); @@ -4196,11 +4196,11 @@ static void quirk_texcoord_w(WineD3D_GL_Info *gl_info) { * performance negatively. */ TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); - gl_info->set_texcoord_w = TRUE; + gl_info->quirks |= WINED3D_QUIRK_SET_TEXCOORD_W; } static void quirk_clip_varying(WineD3D_GL_Info *gl_info) { - gl_info->glsl_clip_varying = TRUE; + gl_info->quirks |= WINED3D_QUIRK_GLSL_CLIP_VARYING; } struct driver_quirk diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 501023d..f7b193e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -776,7 +776,7 @@ static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) if(shader_major > 3) return ret; /* 3.0 shaders may need an extra varying for the clip coord on some cards(mostly dx10 ones) */ - if(gl_info->glsl_clip_varying) ret -= 1; + if (gl_info->quirks & WINED3D_QUIRK_GLSL_CLIP_VARYING) ret -= 1; return ret; } @@ -3529,8 +3529,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs * Take care about the texcoord .w fixup though if we're using the fixed function fragment pipeline */ device = (IWineD3DDeviceImpl *) vs->baseShader.device; - if((GLINFO_LOCATION).set_texcoord_w && ps_major == 0 && vs_major > 0 && - !device->frag_pipe->ffp_proj_control) { + if (((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) + && ps_major == 0 && vs_major > 0 && !device->frag_pipe->ffp_proj_control) + { shader_addline(&buffer, "void order_ps_input() {\n"); for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { if(vs->baseShader.reg_maps.texcoord_mask[i] != 0 && @@ -3575,7 +3576,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs { if (semantic_idx < 8) { - if (!(GLINFO_LOCATION).set_texcoord_w || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; + if (!((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) + write_mask |= WINED3DSP_WRITEMASK_3; shader_addline(&buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", semantic_idx, reg_mask, i, reg_mask); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 6c1440d..6348e1c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -280,10 +280,10 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader vshader_set_limits(This); - if(deviceImpl->vs_selected_mode == SHADER_ARB && - (GLINFO_LOCATION).arb_vs_offset_limit && - This->min_rel_offset <= This->max_rel_offset) { - + if (deviceImpl->vs_selected_mode == SHADER_ARB + && ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) + && This->min_rel_offset <= This->max_rel_offset) + { if(This->max_rel_offset - This->min_rel_offset > 127) { FIXME("The difference between the minimum and maximum relative offset is > 127\n"); FIXME("Which this OpenGL implementation does not support. Try using GLSL\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2d3cc3a..da35319 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4000,10 +4000,9 @@ typedef struct _WineD3D_GL_Info { GL_VSVersion vs_nv_version; GL_VSVersion vs_ati_version; - BOOL arb_vs_offset_limit; - BOOL set_texcoord_w; DWORD reserved_glsl_constants; - BOOL glsl_clip_varying; + + DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ffee326..7af5719 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -43,6 +43,11 @@ #include "wine/list.h" #include "wine/rbtree.h" +/* Driver quirks */ +#define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001 +#define WINED3D_QUIRK_SET_TEXCOORD_W 0x00000002 +#define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 + /* Texture format fixups */ enum fixup_channel_source

1 0

Alexandre Julliard : ntdll: Avoid the close-on-exec race with recvmsg() on kernels that support this.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 3269d8c726eb13925fe0d8cd571e8552ae348154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3269d8c726eb13925fe0d8cd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:11:53 2009 +0200 ntdll: Avoid the close-on-exec race with recvmsg() on kernels that support this. --- dlls/ntdll/server.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a7bc493..9e54ada 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -73,6 +73,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); #define SCM_RIGHTS 1 #endif +#ifndef MSG_CMSG_CLOEXEC +#define MSG_CMSG_CLOEXEC 0 +#endif + #define SOCKETNAME "socket" /* name of the socket file */ #define LOCKNAME "lock" /* name of the lock file */ @@ -408,12 +412,12 @@ static int receive_fd( obj_handle_t *handle ) for (;;) { - if ((ret = recvmsg( fd_socket, &msghdr, 0 )) > 0) + if ((ret = recvmsg( fd_socket, &msghdr, MSG_CMSG_CLOEXEC )) > 0) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS fd = cmsg.fd; #endif - if (fd != -1) fcntl( fd, F_SETFD, 1 ); /* set close on exec flag */ + if (fd != -1) fcntl( fd, F_SETFD, FD_CLOEXEC ); /* in case MSG_CMSG_CLOEXEC is not supported */ return fd; } if (!ret) break;

1 0

Michael Stefaniuc : mshtml: Build language resource files separately.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 62a2196887ac1157be8f7174715de6af5223a245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a2196887ac1157be8f71747… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:16:57 2009 +0200 mshtml: Build language resource files separately. Do not include them from an other rc file. --- dlls/mshtml/Bg.rc | 1 + dlls/mshtml/Da.rc | 1 + dlls/mshtml/De.rc | 3 +-- dlls/mshtml/En.rc | 1 + dlls/mshtml/Es.rc | 1 + dlls/mshtml/Fi.rc | 1 + dlls/mshtml/Fr.rc | 1 + dlls/mshtml/Hu.rc | 1 + dlls/mshtml/Ja.rc | 3 ++- dlls/mshtml/Ko.rc | 1 + dlls/mshtml/Lt.rc | 4 ++-- dlls/mshtml/Makefile.in | 24 +++++++++++++++++++++++- dlls/mshtml/Nl.rc | 1 + dlls/mshtml/No.rc | 1 + dlls/mshtml/Pl.rc | 1 + dlls/mshtml/Pt.rc | 1 + dlls/mshtml/Ro.rc | 3 +-- dlls/mshtml/Ru.rc | 1 + dlls/mshtml/Si.rc | 4 ++-- dlls/mshtml/Sv.rc | 1 + dlls/mshtml/Tr.rc | 1 + dlls/mshtml/Zh.rc | 4 ++-- dlls/mshtml/resource.h | 4 ++++ dlls/mshtml/rsrc.rc | 31 ------------------------------- 24 files changed, 52 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/Bg.rc b/dlls/mshtml/Bg.rc index 92c86b6..a8fd605 100644 --- a/dlls/mshtml/Bg.rc +++ b/dlls/mshtml/Bg.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Da.rc b/dlls/mshtml/Da.rc index 47579b5..574ea09 100644 --- a/dlls/mshtml/Da.rc +++ b/dlls/mshtml/Da.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 991e84d..e1963ec 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -69,5 +70,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index 09370de..41ee119 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc index 94af0cf..fb79f87 100644 --- a/dlls/mshtml/Es.rc +++ b/dlls/mshtml/Es.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Fi.rc b/dlls/mshtml/Fi.rc index d1d389a..564345d 100644 --- a/dlls/mshtml/Fi.rc +++ b/dlls/mshtml/Fi.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 507d0c2..4d45d51 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Hu.rc b/dlls/mshtml/Hu.rc index 7f3d254..137a100 100644 --- a/dlls/mshtml/Hu.rc +++ b/dlls/mshtml/Hu.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Ja.rc b/dlls/mshtml/Ja.rc index 4e060d7..202bd43 100644 --- a/dlls/mshtml/Ja.rc +++ b/dlls/mshtml/Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -66,4 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "キャンセル", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } -#pragma code_page(default) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index efad007..01456e3 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc index f63b177..26167a9 100644 --- a/dlls/mshtml/Lt.rc +++ b/dlls/mshtml/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -66,5 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Gerai", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Atsisakyti", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 241ec9d..acda821 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -65,7 +65,29 @@ C_SRCS = \ txtrange.c \ view.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Bg.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.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 \ + rsrc.rc IDL_H_SRCS = nsiface.idl diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index f6f47e1..1aab09c 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index 6060a51..4e24ece 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/dlls/mshtml/Pl.rc b/dlls/mshtml/Pl.rc index a177686..11659ee 100644 --- a/dlls/mshtml/Pl.rc +++ b/dlls/mshtml/Pl.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 0a83ee0..6a471e4 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Ro.rc b/dlls/mshtml/Ro.rc index 4bb7199..1bac216 100644 --- a/dlls/mshtml/Ro.rc +++ b/dlls/mshtml/Ro.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -65,5 +66,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Renunță", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 9460f24..d6fbc2b 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 9500c18..92721df 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -16,6 +16,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 @@ -66,5 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "V redu", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Prekliči", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index b6a1fd0..041ff8b 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Tr.rc b/dlls/mshtml/Tr.rc index 6d843a1..7e85fc6 100644 --- a/dlls/mshtml/Tr.rc +++ b/dlls/mshtml/Tr.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Zh.rc b/dlls/mshtml/Zh.rc index 4b258a4..2365120 100644 --- a/dlls/mshtml/Zh.rc +++ b/dlls/mshtml/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) @@ -94,5 +96,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "確定", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index f409380..1e92637 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDS_HTMLDISABLED 7500 #define IDS_HTMLDOCUMENT 7501 #define IDS_DOWNLOADING 7502 diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 8be957f..5e669de 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -16,13 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winuser.h" -#include "commctrl.h" -#include "mshtmcid.h" - -#include "resource.h" - #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine HTML Viewer" #define WINE_FILENAME_STR "mshtml.dll" @@ -33,30 +26,6 @@ #include "wine/wine_common_ver.rc" -#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 "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: mshtml.inf */ REGINST REGINST mshtml.inf

1 0