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

Damjan Jovanovic : ws2_32: Test AcceptEx early disconnects and invalid parameters.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 26b0fad163dfbb643006e03777a20f6bcca28bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b0fad163dfbb643006e0377… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 9 20:00:10 2009 +0200 ws2_32: Test AcceptEx early disconnects and invalid parameters. --- dlls/ws2_32/tests/sock.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c90111d..acb2638 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2625,6 +2625,22 @@ static void test_AcceptEx(void) broken(WSAGetLastError() == WSAEFAULT)), /* NT4 */ "AcceptEx on NULL buffer returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, NULL); + ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " + "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -2689,13 +2705,48 @@ static void test_AcceptEx(void) iret = send(connector, buffer, 1, 0); ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); - dwret = WaitForSingleObject(overlapped.hEvent, 0); + dwret = WaitForSingleObject(overlapped.hEvent, 1000); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned); + closesocket(connector); + connector = INVALID_SOCKET; + closesocket(acceptor); + acceptor = INVALID_SOCKET; + + /* Disconnect during receive? */ + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + + closesocket(connector); + connector = INVALID_SOCKET; + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); + ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + end: if (overlapped.hEvent) WSACloseEvent(overlapped.hEvent);

1 0

Detlef Riekenberg : urlmon/tests: Windows headers need _WIN32_IE for IInternetZoneManagerEx2.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: b32e6f0fd2e7d33f4a1edfad112c6a48c4eb1a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32e6f0fd2e7d33f4a1edfad1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 9 22:37:15 2009 +0200 urlmon/tests: Windows headers need _WIN32_IE for IInternetZoneManagerEx2. --- dlls/urlmon/tests/sec_mgr.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index a6fb6bb..c7774ec 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -21,6 +21,9 @@ #define CONST_VTABLE #define NONAMELESSUNION +/* needed for IInternetZoneManagerEx2 */ +#define _WIN32_IE 0x0700 + #include <wine/test.h> #include <stdarg.h> #include <stddef.h>

1 0

Nikolay Sivov : comctl32/header: Test item rectangles updating after reordering.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 67d2292b00c6fa743accfd7e80eb720ea082c8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2292b00c6fa743accfd7e8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 9 23:10:25 2009 +0400 comctl32/header: Test item rectangles updating after reordering. --- dlls/comctl32/tests/header.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 6bf0212..3268ccc 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -121,7 +121,6 @@ static const struct message deleteItem_getItemCount_seq[] = { }; static const struct message orderArray_seq[] = { - { HDM_GETITEMCOUNT, sent }, { HDM_SETORDERARRAY, sent|wparam, 2 }, { HDM_GETORDERARRAY, sent|wparam, 2 }, { 0 } @@ -1108,6 +1107,7 @@ static void test_hdm_index_messages(HWND hParent) static char thirdHeaderItem[] = "Type"; static char fourthHeaderItem[] = "Date Modified"; static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem}; + RECT rect; HDITEM hdItem; hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; hdItem.fmt = HDF_LEFT; @@ -1135,17 +1135,17 @@ static void test_hdm_index_messages(HWND hParent) retVal = SendMessage(hChild, HDM_DELETEITEM, 3, (LPARAM) &hdItem); ok(retVal == TRUE, "Deleting item 3 should return TRUE, got %d\n", retVal); - retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal); retVal = SendMessage(hChild, HDM_DELETEITEM, 3, (LPARAM) &hdItem); ok(retVal == FALSE, "Deleting already-deleted item should return FALSE, got %d\n", retVal); - retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal); retVal = SendMessage(hChild, HDM_DELETEITEM, 2, (LPARAM) &hdItem); ok(retVal == TRUE, "Deleting item 2 should return TRUE, got %d\n", retVal); - retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); ok(retVal == 2, "Getting item count should return 2, got %d\n", retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, deleteItem_getItemCount_seq, @@ -1166,9 +1166,19 @@ static void test_hdm_index_messages(HWND hParent) expect(0, strcmpResult); expect(80, hdItem.cxy); + iSize = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); + + /* item should be updated just after accepting new array */ + ShowWindow(hChild, SW_HIDE); + retVal = SendMessage(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray); + expect(TRUE, retVal); + rect.left = 0; + retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect); + expect(TRUE, retVal); + todo_wine ok(rect.left != 0, "Expected updated rectangle\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - iSize = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); retVal = SendMessage(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray); ok(retVal == TRUE, "Setting header items order should return TRUE, got %d\n", retVal);

1 0

Paul Vriens : appwiz.cpl: Fix Dutch translations.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 223c07738f8b50dc13f714e75f9661d421bf7eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=223c07738f8b50dc13f714e75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 10 09:45:54 2009 +0200 appwiz.cpl: Fix Dutch translations. --- dlls/appwiz.cpl/Nl.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 49bf832..f29f97c 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -21,6 +21,8 @@ #include "res.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE @@ -47,9 +49,9 @@ FONT 8, "MS Shell Dlg" CONTROL "&Installeren...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Toevoegen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Wijzigen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Toevoegen/&Verwijderen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "Wijzigen/&Verwijderen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 CONTROL "&Support Informatie...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Daniel Nylander : appwiz.cpl: Add Swedish translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: d07779252f31e487a0bb4b4e2665c4291ed8b24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07779252f31e487a0bb4b4e2… Author: Daniel Nylander <po(a)danielnylander.se> Date: Thu Jul 9 22:43:50 2009 +0200 appwiz.cpl: Add Swedish translation. --- dlls/appwiz.cpl/Makefile.in | 1 + dlls/appwiz.cpl/Sv.rc | 84 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index daf75d8..b7ae32e 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sv.rc \ Zh.rc \ appwiz.rc diff --git a/dlls/appwiz.cpl/Sv.rc b/dlls/appwiz.cpl/Sv.rc new file mode 100644 index 0000000..da8bae2 --- /dev/null +++ b/dlls/appwiz.cpl/Sv.rc @@ -0,0 +1,84 @@ +/* +* Add/Remove Programs Swedish resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2008 Daniel Nylander <po(a)danielnylander.se> +* +* 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 "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CPL_TITLE, "Lägg till/Ta bort program" + IDS_CPL_DESC, "Låter dig installera ny programvara, eller ta bort befintlig programvara från din dator." + IDS_TAB1_TITLE, "Program" + + IDS_UNINSTALL_FAILED, "Kunde inte köra avinstalleraren, '%s'. Vill du ta bort avinstallationsobjektet för detta program från registret?" + IDS_NOT_SPECIFIED, "Inte angivet" + + IDS_COLUMN_NAME, "Namn" + IDS_COLUMN_PUBLISHER, "Utgivare" + IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Installationsprogram\0*instal*.exe;*setup*.exe;*.msi\0Program (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0\0" +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installera/Avinstallera" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Klicka på Installera för att installera ett nytt program från en diskett, cd-skiva eller din hårddisk.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installera...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Följande programvara kan automatiskt tas bort. Markera den från listan och klicka på Lägg till/Ta bort för att ta bort eller ändra dess installerade komponenter.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Lägg till/&Ta bort...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "&Supportinfo...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Supportinformation" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Följande information kan användas för att få teknisk support för %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Utgivare:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Version:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Supportinformation:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telefonsupport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Produktuppdateringar:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Kommentarer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + 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 +}

1 0

Frédéric Delanoy : shell32: Fix French translation & UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 4a4c2fa12ff01366f81d4e4c5101ee843073b246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4c2fa12ff01366f81d4e4c5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 01:36:12 2009 +0200 shell32: Fix French translation & UI display. --- dlls/shell32/shell32_Fr.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 511a373..e63a589 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -87,7 +87,7 @@ BEGIN MENUITEM "E&xplorer", FCIDM_SHVIEW_EXPLORE MENUITEM "&Ouvrir", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ouper", FCIDM_SHVIEW_CUT + MENUITEM "Cou&per", FCIDM_SHVIEW_CUT MENUITEM "&Copier", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "Créer un &lien", FCIDM_SHVIEW_CREATELINK @@ -148,7 +148,7 @@ FONT 8, "MS Shell Dlg" WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Créer un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } @@ -216,7 +216,7 @@ STRINGTABLE IDS_DESKTOP "Bureau" IDS_MYCOMPUTER "Poste de travail" IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Panneau de configuration" /* context menus */ IDS_VIEW_LARGE "&Grandes icônes" @@ -226,19 +226,19 @@ STRINGTABLE IDS_SELECT "Sélectionner" IDS_OPEN "Ouvrir" - IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." - IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" - IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" - IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" - IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?" + IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier : permission refusée." + IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du dossier" + IDS_DELETEITEM_CAPTION "Confirmez la suppression du fichier" + IDS_DELETEFOLDER_CAPTION "Confirmez la suppression du dossier" + IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer « %1 » ?" IDS_DELETEMULTIPLE_TEXT "Êtes-vous sûr de vouloir supprimer ces %1 éléments ?" - IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer le(les) élément(s) séléectionné(s) ?" + IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer le(s) élément(s) sélectionné(s) ?" IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir mettre « %1 » dans la corbeille ?" IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir mettre « %1 » et tout ce qu'il contient dans la corbeille ?" IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir mettre ces %1 éléments dans la corbeille ?" - IDS_CANTTRASH_TEXT "L'élément « %1 » ne peut pas être mis dans la corbeille. Souhaitez-vous le supprimer à la place ?" + IDS_CANTTRASH_TEXT "L'élément « %1 » ne peut être mis dans la corbeille. Souhaitez-vous plutôt le supprimer ?" IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé « %1 ».\n\nVoulez-vous le remplacer ?" - IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" + IDS_OVERWRITEFILE_CAPTION "Confirmez 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 écrasés. Voulez-vous quand même déplacer ou copier\n"\ @@ -248,7 +248,7 @@ STRINGTABLE IDS_RESTART_TITLE "Redémarrer" IDS_RESTART_PROMPT "Voulez-vous simuler le redémarrage de Windows ?" IDS_SHUTDOWN_TITLE "Arrêter" - IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session Wine ?" + IDS_SHUTDOWN_PROMPT "Voulez-vous clôturer la session Wine ?" /* Run File dialog */ IDS_RUNDLG_ERROR "Impossible d'afficher la boîte de dialogue « Exécuter » (erreur interne)" @@ -267,7 +267,7 @@ STRINGTABLE IDS_MYMUSIC "Ma musique" IDS_MYVIDEO "Mes vidéos" IDS_DESKTOPDIRECTORY "Bureau" - IDS_NETHOOD "Voisinage Réseau" + IDS_NETHOOD "Voisinage réseau" IDS_TEMPLATES "Modèles" IDS_APPDATA "Application Data" IDS_PRINTHOOD "Voisinage d'impression" @@ -301,7 +301,7 @@ IDS_LICENSE, "Wine est un logiciel libre ; vous pouvez le redistribuer et/ou \ le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ telle que publiée par la Free Software Foundation ; soit la version 2.1 \ -de la License, soit (à votre gré) toute version ultérieure.\n\n\ +de la Licence, soit (à votre gré) toute version ultérieure.\n\n\ Wine est distribué dans l’espoir qu'il sera utile, mais \ SANS AUCUNE GARANTIE : sans même la garantie implicite de \ COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \

1 0

Frédéric Delanoy : clock: Convert French resources to UTF-8.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 3e41d66449816a18eb21b2a9d264cd222412002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e41d66449816a18eb21b2a9d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 01:03:36 2009 +0200 clock: Convert French resources to UTF-8. --- programs/clock/Fr.rc | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index ce6aa8d..c6c24ba 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -22,13 +22,16 @@ #include "clock_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU { - POPUP "&Propri�t�s" { + POPUP "&Propriétés" { MENUITEM "Ana&logique", IDM_ANALOG - MENUITEM "&Num�rique", IDM_DIGITAL + MENUITEM "&Numérique", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "&Police...", IDM_FONT MENUITEM SEPARATOR @@ -42,7 +45,7 @@ MAIN_MENU MENU POPUP "Inf&o" { MENUITEM "&Licence...", IDM_LICENSE MENUITEM "AUCUNE &GARANTIE...", IDM_NOWARRANTY - MENUITEM "� &propos de l'horloge", IDM_ABOUT + MENUITEM "À &propos de l'horloge", IDM_ABOUT } } @@ -55,23 +58,23 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENCE" IDS_LICENSE, -"Ce programme est un logiciel libre�; vous pouvez le redistribuer et/ou \ -le modifier suivant les termes de la Licence G�n�rale Publique Limit�e GNU \ -telle que publi�e par la Free Software Foundation�; soit la version 2.1 \ -de la License, soit (� votre gr�) toute version ult�rieure.\n\ -Ce programme est distribu� dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE�: sans m�me la garantie implicite de \ -COMMERCIALISABILIT� ou d'AD�QUATION � UN OBJECTIF PARTICULIER. Consultez \ -la Licence G�n�rale Publique Limit�e pour plus de d�tails.\n\ -Vous devriez avoir re�u une copie de la Licence G�n�rale Publique Limit�e \ -GNU avec ce programme�; si ce n'est pas le cas, �crivez � la�: \ +"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou \ +le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ +telle que publiée par la Free Software Foundation ; soit la version 2.1 \ +de la Licence, soit (à votre gré) toute version ultérieure.\n\ +Ce programme est distribué dans l'espoir qu'il sera utile, mais \ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \ +COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ +la Licence Générale Publique Limitée pour plus de détails.\n\ +Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \ +GNU avec ce programme ; si ce n'est pas le cas, écrivez à la : \ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \ MA 02110-1301, USA." IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" IDS_WARRANTY, -"Ce programme est distribu� dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE�: sans m�me la garantie implicite de \ -COMMERCIALISABILIT� ou d'AD�QUATION � UN OBJECTIF PARTICULIER. Consultez \ -la Licence G�n�rale Publique Limit�e pour plus de d�tails." +"Ce programme est distribué dans l'espoir qu'il sera utile, mais \ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \ +COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ +la Licence Générale Publique Limitée pour plus de détails." }

1 0

Rein Klazes : comdlg32: Memorize and restore the size of the file dialog between calls.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 1b41bafa07074c338e19e5e95bbcec0ece9f4129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b41bafa07074c338e19e5e95… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Jul 10 10:07:48 2009 +0200 comdlg32: Memorize and restore the size of the file dialog between calls. Includes some fine tuning to fix a couple of todo's in the tests. --- dlls/comdlg32/filedlg.c | 25 +++++++++++++++++-------- dlls/comdlg32/tests/filedlg.c | 19 ++++++++++--------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index faed51a..041d75c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -172,6 +172,7 @@ typedef struct tagFD32_PRIVATE const char FileOpenDlgInfosStr[] = "FileOpenDlgInfos"; /* windows property description string */ static const char LookInInfosStr[] = "LookInInfos"; /* LOOKIN combo box property */ +static SIZE MemDialogSize = { 0, 0}; /* keep size of the (resizable) dialog */ /*********************************************************************** * Prototypes @@ -1197,13 +1198,14 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if( fodInfos->DlgInfos.hwndCustomDlg) ShowWindow( fodInfos->DlgInfos.hwndCustomDlg, SW_SHOW); - if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + } if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { GetWindowRect( hwnd, &rc); - /* FIXME: should remember sizes of last invocation */ fodInfos->sizedlg.cx = rc.right - rc.left; fodInfos->sizedlg.cy = rc.bottom - rc.top; fodInfos->initial_size.x = fodInfos->sizedlg.cx; @@ -1212,13 +1214,16 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l SetWindowPos( fodInfos->DlgInfos.hwndGrip, NULL, rc.right - gripx, rc.bottom - gripy, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + /* resize the dialog to the previous invocation */ + if( MemDialogSize.cx && MemDialogSize.cy) + SetWindowPos( hwnd, NULL, + 0, 0, MemDialogSize.cx, MemDialogSize.cy, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); } if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) - { - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); - } + return 0; } case WM_SIZE: @@ -1242,9 +1247,13 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l return FILEDLG95_OnWMGetIShellBrowser(hwnd); case WM_DESTROY: - RemovePropA(hwnd, FileOpenDlgInfosStr); - return FALSE; - + { + FileOpenDlgInfos * fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); + if (fodInfos && fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + MemDialogSize = fodInfos->sizedlg; + RemovePropA(hwnd, FileOpenDlgInfosStr); + return FALSE; + } case WM_NOTIFY: { LPNMHDR lpnmh = (LPNMHDR)lParam; diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index e81d054..63375bb 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -273,8 +273,8 @@ static void test_create_view_template(void) /* test cases for resizing of the file dialog */ struct { DWORD flags; - int resize_init; /* change in CDN_INITDONE handler */ - int resize_folderchg; /* change in CDN_FOLDERCHANGE handler */ + int resize_folderchange; /* change in CDN_FOLDERCHANGE handler */ + int resize_selchange; /* change in CDN_SELCHANGE handler */ int resize_timer1; /* change in first WM_TIMER handler */ int resize_check; /* expected change (in second WM_TIMER handler) */ BOOL todo; /* mark that test todo_wine */ @@ -285,10 +285,11 @@ struct { { OFN_ENABLESIZING , 0, 0, 0, 0,FALSE,FALSE}, { OFN_ENABLESIZING , 0, 0,-10, 0,FALSE,FALSE}, { OFN_ENABLESIZING , 0, 0, 10, 10,FALSE, TRUE}, - { OFN_ENABLESIZING , 0,-10, 0, 10, TRUE,FALSE}, /* 5 */ + { OFN_ENABLESIZING , 0,-10, 0, 0,FALSE,FALSE}, /* 5 */ { OFN_ENABLESIZING , 0, 10, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING ,-10, 0, 0, 10, TRUE,FALSE}, + { OFN_ENABLESIZING ,-10, 0, 0, 10,FALSE,FALSE}, { OFN_ENABLESIZING , 10, 0, 0, 10,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 0, 10, 20,FALSE,FALSE}, /* mark the end */ { 0xffffffff } }; @@ -331,14 +332,14 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L } case WM_NOTIFY: { - if(( (LPNMHDR)lParam)->code == CDN_INITDONE){ + if(( (LPNMHDR)lParam)->code == CDN_FOLDERCHANGE){ GetWindowRect( parent, &initrc); - if( (resize = resize_testcases[index].resize_init)){ + if( (resize = resize_testcases[index].resize_folderchange)){ MoveWindow( parent, initrc.left,initrc.top, initrc.right - initrc.left + resize, initrc.bottom - initrc.top + resize, TRUE); } - } else if(( (LPNMHDR)lParam)->code == CDN_FOLDERCHANGE){ - if( (resize = resize_testcases[index].resize_folderchg)){ + } else if(( (LPNMHDR)lParam)->code == CDN_SELCHANGE){ + if( (resize = resize_testcases[index].resize_selchange)){ GetWindowRect( parent, &rc); MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, rc.bottom - rc.top + resize, TRUE); @@ -619,7 +620,7 @@ static void test_ok(void) int i; DWORD ret; - if (!GetTempFileNameA(".", "tmp", 0, tmpfilename)) { + if (!GetTempFileNameA(".", "txt", 0, tmpfilename)) { skip("Failed to create a temporary file name\n"); return; }

1 0

Nikolay Sivov : comctl32/header: Always update rectangles after HDM_SETORDERARRAY.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: a18886e5c21254aca1cb75d8005bbb88c4c3a86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18886e5c21254aca1cb75d80… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 9 23:13:28 2009 +0400 comctl32/header: Always update rectangles after HDM_SETORDERARRAY. --- dlls/comctl32/header.c | 2 +- dlls/comctl32/tests/header.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ddc9cb0..aa68102 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1210,7 +1210,7 @@ HEADER_SetOrderArray(HEADER_INFO *infoPtr, INT size, const INT *order) lpItem = &infoPtr->items[*order++]; lpItem->iOrder=i; } - infoPtr->bRectsValid=0; + HEADER_SetItemBounds(infoPtr); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3268ccc..e357f9d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1175,7 +1175,7 @@ static void test_hdm_index_messages(HWND hParent) rect.left = 0; retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect); expect(TRUE, retVal); - todo_wine ok(rect.left != 0, "Expected updated rectangle\n"); + ok(rect.left != 0, "Expected updated rectangle\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Frédéric Delanoy : reg: Fix French translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 77ec63c55f2993e78ac91a9b6d83b24a2fea80e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ec63c55f2993e78ac91a9b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 00:51:21 2009 +0200 reg: Fix French translation. --- programs/reg/Fr.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc index cb5de82..1560c13 100644 --- a/programs/reg/Fr.rc +++ b/programs/reg/Fr.rc @@ -22,17 +22,20 @@ #include "reg.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { STRING_USAGE, "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n" - 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" + STRING_ADD_USAGE, "REG ADD nom_de_clé [/v nom_de_valeur | /ve] [/t type] [/s séparateur] [/d données] [/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 pu trouver la clé ou la valeur de registre spécifiée\n" }

1 0