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

Jonathan Ernst : notepad: Updated French translation.
by Alexandre Julliard June 9, 2009

June 9, 2009

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 : crypt32: Updated French translation.
by Alexandre Julliard June 9, 2009

June 9, 2009

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

Jonathan Ernst : mshtml: Updated French translation.
by Alexandre Julliard June 9, 2009

June 9, 2009

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 : wordpad: Updated French translation.
by Alexandre Julliard June 9, 2009

June 9, 2009

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 : reg: Updated French translation.
by Alexandre Julliard June 9, 2009

June 9, 2009

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

Vincent Povirk : kernel32/tests: Test waiting on a disconnected client pipe .
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: b210eeb1adf66f6cbfa04e0f6b94b3914b5a523c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b210eeb1adf66f6cbfa04e0f6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 8 16:23:36 2009 -0500 kernel32/tests: Test waiting on a disconnected client pipe. --- dlls/kernel32/tests/pipe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a1080fa..948c704 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -836,6 +836,7 @@ static int test_DisconnectNamedPipe(void) char ibuf[32]; DWORD written; DWORD readden; + DWORD ret; SetLastError(0xdeadbeef); hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, @@ -876,6 +877,8 @@ static int test_DisconnectNamedPipe(void) "ReadFile from disconnected pipe with bytes waiting\n"); ok(!DisconnectNamedPipe(hnp) && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "DisconnectNamedPipe worked twice\n"); + ret = WaitForSingleObject(hFile, 0); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); ok(CloseHandle(hFile), "CloseHandle\n"); }

1 0

Nikolay Sivov : comctl32/listview: Fix item count tests to be dpi aware.
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: f531271d707bd0e5ce922fb68d2b105bf751b725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f531271d707bd0e5ce922fb68… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 8 22:54:56 2009 +0400 comctl32/listview: Fix item count tests to be dpi aware. --- dlls/comctl32/tests/listview.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8e87651..ca72fa5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1570,6 +1570,11 @@ static void test_item_count(void) HWND hwnd; DWORD r; + HDC hdc; + HFONT hOldFont; + TEXTMETRICA tm; + RECT rect; + INT height; LVITEM item0; LVITEM item1; @@ -1581,6 +1586,19 @@ static void test_item_count(void) hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); + /* resize in dpiaware manner to fit all 3 items added */ + hdc = GetDC(0); + hOldFont = SelectObject(hdc, GetStockObject(SYSTEM_FONT)); + GetTextMetricsA(hdc, &tm); + /* 2 extra pixels for bounds and header border */ + height = tm.tmHeight + 2; + SelectObject(hdc, hOldFont); + ReleaseDC(0, hdc); + + GetWindowRect(hwnd, &rect); + /* 3 items + 1 header + 1 to be sure */ + MoveWindow(hwnd, 0, 0, rect.right - rect.left, 5 * height, FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); trace("test item count\n");

1 0

Paul Vriens : msi/tests: Make sure we only create one logfile.
by Alexandre Julliard June 9, 2009

June 9, 2009

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

Alexandre Julliard : user32: Disable assert() for the mingw build since mingw gets confused trying to import MessageBoxA .
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: 031c73af3078b0c7fc45d0aa94c3852097940c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c73af3078b0c7fc45d0aa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 16:45:54 2009 +0200 user32: Disable assert() for the mingw build since mingw gets confused trying to import MessageBoxA. --- dlls/user32/user_private.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f1a6585..1ff6ef4 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -354,4 +354,10 @@ typedef struct extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ) DECLSPEC_HIDDEN; +/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ +#ifdef __MINGW32__ +#undef assert +#define assert(expr) ((void)0) +#endif + #endif /* __WINE_USER_PRIVATE_H */

1 0

Alexandre Julliard : kernel32: Fix handling of %ws format for Unicode.
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: b4a9c99abcfc267af6caa0d0bd802ac27fcca39e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a9c99abcfc267af6caa0d0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 18:13:13 2009 +0200 kernel32: Fix handling of %ws format for Unicode. --- dlls/kernel32/format_msg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index f4baaae..e8f9fbc 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -485,7 +485,10 @@ DWORD WINAPI FormatMessageW( if (fmtstr[strlenW(fmtstr)-1]=='s' && argliststart[0]) { DWORD xarr[3]; + WCHAR *fmt_end = fmtstr + strlenW(fmtstr) - 1; + /* remap %ws to %ls */ + if (fmt_end > fmtstr && (fmt_end[-1] == 'w')) fmt_end[-1] = 'l'; xarr[0]=*(argliststart+0); /* possible invalid pointers */ xarr[1]=*(argliststart+1);

1 0