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

Francois Gouget : windowscodecs: Make the QueryInterface() functions static .
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 97df1e12e6d128a916ba733b4fc3ebf521c920f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97df1e12e6d128a916ba733b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:22:52 2009 +0200 windowscodecs: Make the QueryInterface() functions static. --- dlls/windowscodecs/bmpdecode.c | 4 ++-- dlls/windowscodecs/imgfactory.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index afe4881..e2378ba 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -66,7 +66,7 @@ typedef struct { BITMAPV5HEADER bih; } BmpFrameDecode; -HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, +static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { BmpFrameDecode *This = (BmpFrameDecode*)iface; @@ -274,7 +274,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) return S_OK; } -HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, +static HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { BmpDecoder *This = (BmpDecoder*)iface; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index f422a8a..5856661 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -39,7 +39,7 @@ typedef struct { LONG ref; } ImagingFactory; -HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory *iface, REFIID iid, +static HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory *iface, REFIID iid, void **ppv) { ImagingFactory *This = (ImagingFactory*)iface;

1 0

Francois Gouget : advapi32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: d475279149a0140c716fd6c0b29fd482fab72158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d475279149a0140c716fd6c0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:23:04 2009 +0200 advapi32/tests: Add a trailing '\n' to ok() calls. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index de794de..4479ddf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3199,10 +3199,10 @@ static void test_GetSidSubAuthority(void) ok(*pGetSidSubAuthorityCount(psid) == 4,"GetSidSubAuthorityCount gave %d expected 4\n",*pGetSidSubAuthorityCount(psid)); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); SetLastError(0xbebecaca); - ok(*pGetSidSubAuthority(psid,0) == 21,"GetSidSubAuthority gave %d expected 21",*pGetSidSubAuthority(psid,0)); + ok(*pGetSidSubAuthority(psid,0) == 21,"GetSidSubAuthority gave %d expected 21\n",*pGetSidSubAuthority(psid,0)); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); SetLastError(0xbebecaca); - ok(*pGetSidSubAuthority(psid,1) == 93476,"GetSidSubAuthority gave %d expected 93476",*pGetSidSubAuthority(psid,1)); + ok(*pGetSidSubAuthority(psid,1) == 93476,"GetSidSubAuthority gave %d expected 93476\n",*pGetSidSubAuthority(psid,1)); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); SetLastError(0xbebecaca); todo_wine ok(*pGetSidSubAuthority(psid,4) == 0,"GetSidSubAuthority gave %d,expected 0\n",*pGetSidSubAuthority(psid,4));

1 0

Francois Gouget : makedep: Add support for multiple object file extensions.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 73b0f6517700cc846507fe3986c4e96ffe7df6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b0f6517700cc846507fe398… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:25:05 2009 +0200 makedep: Add support for multiple object file extensions. --- tools/makedep.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4194073..e2ca5ad 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -53,6 +53,14 @@ typedef struct _INCL_FILE static struct list sources = LIST_INIT(sources); static struct list includes = LIST_INIT(includes); +typedef struct _OBJECT_EXTENSION +{ + struct list entry; + const char *extension; +} OBJECT_EXTENSION; + +static struct list object_extensions = LIST_INIT(object_extensions); + typedef struct _INCL_PATH { struct list entry; @@ -218,6 +226,18 @@ static char *get_line( FILE *file ) } /******************************************************************* + * add_object_extension + * + * Add an extension for object files. + */ +static void add_object_extension( const char *ext ) +{ + OBJECT_EXTENSION *object_extension = xmalloc( sizeof(*object_extension) ); + list_add_tail( &object_extensions, &object_extension->entry ); + object_extension->extension = ext; +} + +/******************************************************************* * add_include_path * * Add a directory to the include path. @@ -857,7 +877,10 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) } else { - *column += fprintf( file, "%s.o: %s", obj, pFile->filename ); + OBJECT_EXTENSION *ext; + LIST_FOR_EACH_ENTRY( ext, &object_extensions, OBJECT_EXTENSION, entry ) + *column += fprintf( file, "%s.%s ", obj, ext->extension ); + *column += fprintf( file, ": %s", pFile->filename ); } } free( obj ); @@ -973,6 +996,9 @@ static void parse_option( const char *opt ) if (opt[2]) Separator = opt + 2; else Separator = NULL; break; + case 'x': + if (opt[2]) add_object_extension( opt + 2 ); + break; default: fprintf( stderr, "Unknown option '%s'\n", opt ); fprintf( stderr, Usage, ProgramName ); @@ -1008,6 +1034,10 @@ int main( int argc, char *argv[] ) if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + /* set the default extension list for object files */ + if (list_empty( &object_extensions )) + add_object_extension( "o" ); + /* get rid of absolute paths that don't point into the source dir */ LIST_FOR_EACH_ENTRY_SAFE( path, next, &paths, INCL_PATH, entry ) {

1 0

Francois Gouget : crosstest: Fix the crosstest dependencies.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 7bb43a359f6ce06fcbb311cd7de3fcff64653357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb43a359f6ce06fcbb311cd7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:25:19 2009 +0200 crosstest: Fix the crosstest dependencies. --- Make.rules.in | 2 +- dlls/Maketest.rules.in | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c01a2b7..7f72099 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -229,7 +229,7 @@ $(SUBDIRS:%=%/__depend__): dummy @cd `dirname $@` && $(MAKE) depend depend: $(SUBDIRS:%=%/__depend__) dummy - $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS) + $(MAKEDEP) $(MAKEDEPFLAGS) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS) .PHONY: depend $(SUBDIRS:%=%/__depend__) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index b112c45..aff002c 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -24,6 +24,7 @@ EXTRA_OBJS = testlist.o CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe CROSSCC = @CROSSCC@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) +MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@

1 0

Frédéric Delanoy : shell32: Updated French translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: f4a625b3b3b859510dabcdecd831fd8d66496da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a625b3b3b859510dabcdecd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 15:37:50 2009 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index e4fc4bb..e1b95e6 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -98,13 +98,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Fichier" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "&Quitter", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Affichage" BEGIN MENUITEM "&Grandes icônes", FCIDM_SHVIEW_BIGICON MENUITEM "&Petites icônes", FCIDM_SHVIEW_SMALLICON @@ -112,9 +112,9 @@ BEGIN MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "Ai&de" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "À &propos du panneau de configuration...", IDM_CPANEL_ABOUT END END @@ -239,7 +239,7 @@ STRINGTABLE IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé « %1 ».\n\n"\ "Si des fichiers dans le dossier de destination ont le même nom que ceux dans le dossier\n"\ - "sélectionné, ils seront remplacés. Voulez-vous quand même déplacer ou copier\n"\ + "sélectionné, ils seront écrasés. Voulez-vous quand même déplacer ou copier\n"\ "le dossier ?" /* message box strings */ @@ -259,8 +259,8 @@ STRINGTABLE IDS_PERSONAL "Mes documents" IDS_FAVORITES "Favoris" IDS_STARTUP "Menu Démarrer\\Programmes\\Démarrage" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_RECENT "Documents récents" + IDS_SENDTO "Envoyer vers" IDS_STARTMENU "Menu Démarrer" IDS_MYMUSIC "Ma musique" IDS_MYVIDEO "Mes vidéos" @@ -285,11 +285,11 @@ STRINGTABLE IDS_NEWFOLDER "Nouveau dossier" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" + IDS_CPANEL_TITLE "Panneau de configuration de Wine" + IDS_CPANEL_NAME "Nom" IDS_CPANEL_DESCRIPTION "Description" - IDS_SHLEXEC_NOASSOC "Il n'y a aucun programme Windows configuré pour ouvrir ce type de fichier." + IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier." } STRINGTABLE

1 0

Aurimas Fišeras : winefile: Add Lithuanian translation .
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 73285f5c59c04b1d93f67c5ef0937aa1ad09dff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73285f5c59c04b1d93f67c5ef… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 29 19:15:44 2009 +0300 winefile: Add Lithuanian translation. --- programs/winefile/Lt.rc | 263 +++++++++++++++++++++++++++++++++++++++++++++ programs/winefile/rsrc.rc | 1 + 2 files changed, 264 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73285f5c59c04b1d93f67…

1 0

Aurimas Fišeras : view: Add Lithuanian translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: afa41e91051be85315381f206f70c363f44e9a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa41e91051be85315381f206… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 29 20:24:10 2009 +0300 view: Add Lithuanian translation. --- programs/view/Lt.rc | 75 +++++++++++++++++++++++++++++++++++++++++++++++ programs/view/viewrc.rc | 1 + 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/programs/view/Lt.rc b/programs/view/Lt.rc new file mode 100644 index 0000000..cbce3bb --- /dev/null +++ b/programs/view/Lt.rc @@ -0,0 +1,75 @@ +/* + * View + * 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 + +/* + * + * Menu + * + */ + +VIEW MENU +BEGIN + POPUP "&Failas" + BEGIN + MENUITEM "&Atverti", IDM_OPEN + MENUITEM "Iš&eiti", IDM_EXIT + END + POPUP "&Perkelti" + BEGIN + MENUITEM "&Sutalpinti į langą", IDM_SET_EXT_TO_WIN + MENUITEM SEPARATOR + MENUITEM "&Dešinėn", IDM_LEFT + MENUITEM "&Kairėn", IDM_RIGHT + MENUITEM "&Žemyn", IDM_UP + MENUITEM "&Aukštyn", IDM_DOWN + END +END + + +/* + * + * Accelerator + * + */ + +VIEW ACCELERATORS +BEGIN + "Q", IDM_EXIT, VIRTKEY, CONTROL +END + + +/* + * + * String Table + * + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Įprastinė metafailų žiūryklė" +END + +#pragma code_page(default) diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 7b104fa..6217cf6 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -30,6 +30,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Frédéric Delanoy : cryptui: Add French translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 6628fb474f342ba0bf81c4a821aa09213d85d97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6628fb474f342ba0bf81c4a82… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 19:28:54 2009 +0200 cryptui: Add French translation. --- dlls/cryptui/cryptui.rc | 1 + dlls/cryptui/cryptui_Fr.rc | 466 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6628fb474f342ba0bf81c…

1 0

Frédéric Delanoy : winedbg: Add French translation.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: af8348c5b7fdd8de8b1a7f24469656c9ff31b40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8348c5b7fdd8de8b1a7f244… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 23:53:23 2009 +0200 winedbg: Add French translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Fr.rc | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index 50c5efb..604c54d 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -25,6 +25,7 @@ #include "rsrc_De.rc" #include "rsrc_En.rc" +#include "rsrc_Fr.rc" #include "rsrc_Ko.rc" #include "rsrc_Lt.rc" #include "rsrc_Nl.rc" diff --git a/programs/winedbg/rsrc_Fr.rc b/programs/winedbg/rsrc_Fr.rc new file mode 100644 index 0000000..a483c29 --- /dev/null +++ b/programs/winedbg/rsrc_Fr.rc @@ -0,0 +1,59 @@ +/* + * French Language Support + * + * Copyright 2009 Frédéric Delanoy + * + * 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_FRENCH, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Déboguer", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Erreur du programme" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Le programme %s a rencontré un problème sérieux et doit \ + être fermé. Nous somme désolés pour le désagrément subi.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Cela peut être causé par une erreur dans le programme ou un défaut dans Wine. \ + Vous pouvez consulter http://appdb.winehq.org pour obtenir des instructions sur \ + l'exécution de cette application.\n\n\ + Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, \ + vous pouvez le rapporter sur http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Fermer", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Plantage du programme Wine" + IDS_INVALID_PARAMS "Erreurs internes - paramètres invalides reçus" + IDS_UNIDENTIFIED "(non identifié)" +END + +#pragma code_page(default) +

1 0

Stefan Leichter : oleaut32: Add two tests of function VarDateFromStr for German date format.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 3ca49a10d81f7b680c4a3243f62ba75f499772f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca49a10d81f7b680c4a3243f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jun 29 22:28:33 2009 +0200 oleaut32: Add two tests of function VarDateFromStr for German date format. --- dlls/oleaut32/tests/vartype.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7600946..3e5730b 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3434,6 +3434,11 @@ static void test_VarDateFromStr(void) DFS("1/2/1970"); EXPECT_DBL(25570.0); DFS("1-2-1970"); EXPECT_DBL(25570.0); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ + + /* test a none english data string */ + DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; + lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); + DFS("02.01.1970 00:00:00"); todo_wine EXPECT_DBL(25570.0); } static void test_VarDateCopy(void)

1 0