wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Jonathan Ernst : reg: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 686119d89c50db8b4a1c4913dc13a67ef1146f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686119d89c50db8b4a1c4913d… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:24 2009 +0200 reg: Updated French translation. --- programs/reg/Fr.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc index 448f3da..671ebf6 100644 --- a/programs/reg/Fr.rc +++ b/programs/reg/Fr.rc @@ -3,6 +3,7 @@ * French language support * * Copyright 2008 Francois Gouget + * Copyright 2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,4 +28,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD nom_de_cl� [/v nom_de_valeur | /ve] [/t type] [/s s�parateur] [/d donn�e] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nom_de_cl� [/v nom_de_valeur | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nom_de_cl� [/v nom_de_valeur | /ve] [/s]\n" + STRING_SUCCESS, "L'op�ration s'est termin�e avec succ�s\n" + STRING_INVALID_KEY, "Erreur�: Nom de cl� non valable\n" + STRING_INVALID_CMDLINE, "Erreur�: Param�tre de ligne de commande non valable\n" + STRING_NO_REMOTE, "Erreur�: Impossible d'ajouter des cl�s � une machine distante\n" + STRING_CANNOT_FIND, "Erreur�: Le syst�me n'a pas �t� en mesure de trouver la cl� ou la valeur de registre sp�cifi�e\n" }

1 0

Jonathan Ernst : wordpad: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 367816c0ffa50d326212eefec64be1f5f3c23f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=367816c0ffa50d326212eefec… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:39 2009 +0200 wordpad: Updated French translation. --- programs/wordpad/Fr.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 459dd0e..72f7c70 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 by Jonathan Ernst + * Copyright 2006-2009 by Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -240,4 +240,5 @@ BEGIN STRING_OPEN_FAILED, "Impossible d'ouvrir le fichier." STRING_OPEN_ACCESS_DENIED, "Vous ne disposez pas des acc�s n�cessaires � l'ouverture du fichier." STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas impl�ment�e" + STRING_MAX_TAB_STOPS, "Impossible d'ajouter plus de 32 taquets de tabulation." END

1 0

Jonathan Ernst : setupapi: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: c37255dc9251580125e86ca7f08211686c8ac0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37255dc9251580125e86ca7f… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:05 2009 +0200 setupapi: Updated French translation. --- dlls/setupapi/Fr.rc | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/Fr.rc b/dlls/setupapi/Fr.rc index 54e45d9..5405425 100644 --- a/dlls/setupapi/Fr.rc +++ b/dlls/setupapi/Fr.rc @@ -3,6 +3,7 @@ * * Copyright 2001 Andreas Mohr * Copyright 2003 Vincent B�ron + * Copyright 2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,15 +22,37 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Le fichier ��%s�� sur %s est requis" + IDS_UNKNOWN "Inconnu" + IDS_COPYFROM "Copier les fichiers depuis�:" + IDS_INFO "Saisissez le chemin du fichier, puis cliquez sur OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copie de fichiers..." FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "Annuler", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Source:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Source�:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination�:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Fichiers requis" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Veuillez ins�rer le disque d'installation du fabriquant et\nassurez vous que le lecteur correct est s�lectionn� ci-dessous", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copier les fichiers du fabriquan depuis�:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Parcourir...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Jonathan Ernst : regedit: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 0f82a1550dc0ddbd464834eac70fa4dacd78aded URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f82a1550dc0ddbd464834eac… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:32 2009 +0200 regedit: Updated French translation. --- programs/regedit/Fr.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Fr.rc b/programs/regedit/Fr.rc index cc8b671..9e197cf 100644 --- a/programs/regedit/Fr.rc +++ b/programs/regedit/Fr.rc @@ -3,7 +3,7 @@ * * Copyright 2002 Robert Dickenson * Copyright 2003 Vincent B�ron - * Copyright 2005-2007 Jonathan Ernst + * Copyright 2005-2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -283,6 +283,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Copie le nom de la cl� s�lectionn�e vers le presse-papier" ID_EDIT_FIND "Recherche du texte dans une cl�, une valeur ou des donn�es" ID_EDIT_FINDNEXT "Recherche l'occurence suivante du texte de la derni�re recherche" + ID_EDIT_EXPORT "Exporte la branche du registre s�lectionn�e dans un fichier texte" END STRINGTABLE DISCARDABLE

1 0

Jonathan Ernst : notepad: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: db8a14ca748e30885b7893c8cbbc4b250b37b0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8a14ca748e30885b7893c8c… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:18 2009 +0200 notepad: Updated French translation. --- programs/notepad/Fr.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index ee6d7e2..506fd52 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -4,6 +4,7 @@ * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> * Translation by Laurent Buffler <laurent(a)bluewin.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copytight 2009 Jonathan Ernst <jonathan(a)ernstfamily.ch> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -53,6 +54,7 @@ POPUP " POPUP "&Rechercher" { MENUITEM "&Rechercher...\tCtrl+F", CMD_SEARCH MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT + MENUITEM "&Remplacer...\tCtrl+H", CMD_REPLACE } POPUP "Aid&e" { MENUITEM "&Sommaire", CMD_HELP_CONTENTS

1 0

Jonathan Ernst : mshtml: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 7bf836a17c433683d7ec7b13eee54fee4c881d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf836a17c433683d7ec7b13e… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:07:47 2009 +0200 mshtml: Updated French translation. --- dlls/mshtml/Fr.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 2542670..507d0c2 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -2,7 +2,7 @@ * MsHTML resources * French Language Support * - * Copyright 2005-2007 Jonathan Ernst + * Copyright 2005-2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -56,3 +56,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Jonathan Ernst : crypt32: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: d2d2f1e42567f866d18709c787e4b1d3a9ba0f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d2f1e42567f866d18709c78… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:06:26 2009 +0200 crypt32: Updated French translation. --- dlls/crypt32/crypt32_Fr.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc index 08a1898..35ade1e 100644 --- a/dlls/crypt32/crypt32_Fr.rc +++ b/dlls/crypt32/crypt32_Fr.rc @@ -1,7 +1,7 @@ /* * crypt32 dll French resources * - * Copyright 2006-2008 Jonathan Ernst + * Copyright 2006-2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -171,6 +171,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Personnel" IDS_LOCALIZEDNAME_CA "Autorit�s interm�diaires" IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "�diteurs de confiance" } STRINGTABLE DISCARDABLE

1 0

Paul Vriens : msi/tests: Make sure we only create one logfile.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 9b6cf226077244631fc987373ea99744c6f0a51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6cf226077244631fc987373… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 8 21:01:15 2009 +0200 msi/tests: Make sure we only create one logfile. --- dlls/msi/tests/install.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a554e34..de63ba2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5688,7 +5688,7 @@ static void test_propcase(void) START_TEST(install) { DWORD len; - char temp_path[MAX_PATH], prev_path[MAX_PATH]; + char temp_path[MAX_PATH], prev_path[MAX_PATH], log_file[MAX_PATH]; STATEMGRSTATUS status; BOOL ret = FALSE; @@ -5718,9 +5718,13 @@ START_TEST(install) } /* Create only one log file and don't append. We have to pass something - * for the log mode for this to work. + * for the log mode for this to work. The logfile needs to have an absolute + * path otherwise we still end up with some extra logfiles as some tests + * change the current directory. */ - MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, "msitest.log", 0); + lstrcpyA(log_file, temp_path); + lstrcatA(log_file, "\\msitest.log"); + MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0); test_MsiInstallProduct(); test_MsiSetComponentState(); @@ -5761,7 +5765,7 @@ START_TEST(install) test_adminimage(); test_propcase(); - DeleteFileA("msitest.log"); + DeleteFileA(log_file); if (pSRSetRestorePointA && ret) {

1 0

Austin English : winex11: Return correct length for GetKeyNameText.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 99069ab61f6b2f2a0b1745f73f80503d0631e3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99069ab61f6b2f2a0b1745f73… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 8 11:52:48 2009 -0500 winex11: Return correct length for GetKeyNameText. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 05b3b53..8a6dd37 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2352,7 +2352,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) { MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); lpBuffer[nSize - 1] = 0; - return 1; + return nSize; } }

1 0

Alexandre Julliard : server: Avoid a crash when trying to wait on a disconnected pipe client.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 7a344c14af0d47c4479198bdfe4c8f1923ec5ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a344c14af0d47c4479198bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:11:05 2009 +0200 server: Avoid a crash when trying to wait on a disconnected pipe client. --- server/fd.c | 6 ++++++ server/file.h | 1 + server/named_pipe.c | 10 +++++++++- 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/server/fd.c b/server/fd.c index d9688e1..a57001a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1710,6 +1710,12 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } +/* set or clear the fd signaled state */ +int is_fd_signaled( struct fd *fd ) +{ + return fd->signaled; +} + /* handler for close_handle that refuses to close fd-associated handles in other processes */ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { diff --git a/server/file.h b/server/file.h index 1aaa284..aef40f7 100644 --- a/server/file.h +++ b/server/file.h @@ -70,6 +70,7 @@ extern void set_fd_events( struct fd *fd, int events ); extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, int shared, int wait ); extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void set_fd_signaled( struct fd *fd, int signaled ); +extern int is_fd_signaled( struct fd *fd ); extern int default_fd_signaled( struct object *obj, struct thread *thread ); extern unsigned int default_fd_map_access( struct object *obj, unsigned int access ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 539509e..54ce823 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -176,6 +176,7 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); +static int pipe_client_signaled( struct object *obj, struct thread *thread ); static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static void pipe_client_flush( struct fd *fd, struct event **event ); @@ -188,7 +189,7 @@ static const struct object_ops pipe_client_ops = no_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - default_fd_signaled, /* signaled */ + pipe_client_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ pipe_client_get_fd, /* get_fd */ @@ -289,6 +290,13 @@ static void pipe_client_dump( struct object *obj, int verbose ) fprintf( stderr, "Named pipe client server=%p\n", client->server ); } +static int pipe_client_signaled( struct object *obj, struct thread *thread ) +{ + struct pipe_client *client = (struct pipe_client *) obj; + + return client->fd && is_fd_signaled(client->fd); +} + static void named_pipe_destroy( struct object *obj) { struct named_pipe *pipe = (struct named_pipe *) obj;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009