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

Frédéric Delanoy : cryptdlg: Update French translation.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 5f0ca73208ac7241701bbebfef23ed05ef4681bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0ca73208ac7241701bbebfe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 08:36:25 2009 +0200 cryptdlg: Update French translation. --- dlls/cryptdlg/cryptdlg_Fr.rc | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_Fr.rc b/dlls/cryptdlg/cryptdlg_Fr.rc index f71be3a..25d8a64 100644 --- a/dlls/cryptdlg/cryptdlg_Fr.rc +++ b/dlls/cryptdlg/cryptdlg_Fr.rc @@ -1,7 +1,8 @@ /* * cryptdlg dll French resources * - * Copyright 2008 Jonathan Ernst + * Copyright 2008 Jonathan Ernst + * 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 @@ -20,19 +21,22 @@ #include "cryptres.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_CERT_POLICY "Politique de certificat" IDS_POLICY_ID "Identifiant de politique : " - IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" - IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" - IDS_USER_NOTICE "User Notice" - IDS_QUALIFIER "Qualifier" - IDS_NOTICE_REF "Notice Reference" - IDS_ORGANIZATION "Organisation=" - IDS_NOTICE_NUM "Notice Number=" - IDS_NOTICE_TEXT "Notice Text=" + IDS_POLICY_QUALIFIER_INFO "Informations sur le qualificateur de politique" + IDS_POLICY_QUALIFIER_ID "Id de qualificateur de politique =" + IDS_CPS "Énoncé des pratiques de certification (CPS)" + IDS_USER_NOTICE "Avis utilisateur" + IDS_QUALIFIER "Qualificateur" + IDS_NOTICE_REF "Référence à l'avis" + IDS_ORGANIZATION "Organisation =" + IDS_NOTICE_NUM "Numéro de l'avis =" + IDS_NOTICE_TEXT "Texte de l'avis =" }

1 0

Damjan Jovanovic : ws2_32: Test AcceptEx early disconnects and invalid parameters.
by Alexandre Julliard 10 Jul '09

10 Jul '09

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 10 Jul '09

10 Jul '09

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 10 Jul '09

10 Jul '09

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

Nikolay Sivov : comctl32/header: Always update rectangles after HDM_SETORDERARRAY.
by Alexandre Julliard 10 Jul '09

10 Jul '09

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

Daniel Nylander : appwiz.cpl: Add Swedish translation.
by Alexandre Julliard 10 Jul '09

10 Jul '09

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

Paul Vriens : appwiz.cpl: Fix Dutch translations.
by Alexandre Julliard 10 Jul '09

10 Jul '09

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

Rein Klazes : comdlg32: Memorize and restore the size of the file dialog between calls.
by Alexandre Julliard 10 Jul '09

10 Jul '09

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

Henri Verbeet : wined3d: Simplify the GLSL sRGB write code.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 60e0997c79cf9bd97a052377bf28870def7f943b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e0997c79cf9bd97a052377b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:11 2009 +0200 wined3d: Simplify the GLSL sRGB write code. --- dlls/wined3d/glsl_shader.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 82a5fb8..7402a79 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -891,11 +891,12 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s extra_constants_needed++; } - if(ps_args->srgb_correction) { - shader_addline(buffer, "const vec4 srgb_mul_low = vec4(%f, %f, %f, %f);\n", - srgb_mul_low, srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_comparison = vec4(%f, %f, %f, %f);\n", - srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); + if (ps_args->srgb_correction) + { + shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", + srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); + shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", + srgb_cmp); } if(reg_maps->vpos || reg_maps->usesdsy) { if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF)) { @@ -3717,14 +3718,13 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "gl_FragData[0] = R0;\n"); } - if(args->srgb_correction) { - shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", - srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, - srgb_sub_high, srgb_sub_high, srgb_sub_high); - shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * srgb_mul_low.xyz;\n"); - shader_addline(buffer, "gl_FragData[0].x = gl_FragData[0].x < srgb_comparison.x ? tmp1.x : tmp0.x;\n"); - shader_addline(buffer, "gl_FragData[0].y = gl_FragData[0].y < srgb_comparison.y ? tmp1.y : tmp0.y;\n"); - shader_addline(buffer, "gl_FragData[0].z = gl_FragData[0].z < srgb_comparison.z ? tmp1.z : tmp0.z;\n"); + if (args->srgb_correction) + { + shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(srgb_const0.x));\n"); + shader_addline(buffer, "tmp0.xyz = tmp0.xyz * vec3(srgb_const0.y) - vec3(srgb_const0.z);\n"); + shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * vec3(srgb_const0.w);\n"); + shader_addline(buffer, "bvec3 srgb_compare = lessThan(gl_FragData[0].xyz, vec3(srgb_const1.x));\n"); + shader_addline(buffer, "gl_FragData[0].xyz = mix(tmp0.xyz, tmp1.xyz, vec3(srgb_compare));\n"); shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); } /* Pixel shader < 3.0 do not replace the fog stage.

1 0

Alexandre Julliard : ntdll: Add support for the MEM_RESET flag in VirtualAlloc, with tests.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: df6c65623a606d04ba71eb1fceeaa88399255faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6c65623a606d04ba71eb1fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 19:17:49 2009 +0200 ntdll: Add support for the MEM_RESET flag in VirtualAlloc, with tests. --- dlls/kernel32/tests/virtual.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/virtual.c | 7 ++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e665f0f..b7e97db 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -284,6 +284,40 @@ static void test_VirtualAlloc(void) ok(old_prot == PAGE_READONLY, "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.RegionSize == 0x1000, "%lx != 0x1000\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); + ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); + memset( addr1, 0x55, 20 ); + ok( *(DWORD *)addr1 == 0x55555555, "wrong data %x\n", *(DWORD *)addr1 ); + + addr2 = VirtualAlloc( addr1, 0x1000, MEM_RESET, PAGE_NOACCESS ); + ok( addr2 == addr1 || broken( !addr2 && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ + "VirtualAlloc failed err %u\n", GetLastError() ); + ok( *(DWORD *)addr1 == 0x55555555 || *(DWORD *)addr1 == 0, "wrong data %x\n", *(DWORD *)addr1 ); + if (addr2) + { + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.RegionSize == 0x1000, "%lx != 0x1000\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); + ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); + + addr2 = VirtualAlloc( (char *)addr1 + 0x1000, 0x1000, MEM_RESET, PAGE_NOACCESS ); + ok( (char *)addr2 == (char *)addr1 + 0x1000, "VirtualAlloc failed\n" ); + + ok(VirtualQuery(addr2, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.RegionSize == 0xf000, "%lx != 0xf000\n", info.RegionSize); + ok(info.State == MEM_RESERVE, "%x != MEM_RESERVE\n", info.State); + ok(info.Protect == 0, "%x != 0\n", info.Protect); + + addr2 = VirtualAlloc( (char *)addr1 + 0xf000, 0x2000, MEM_RESET, PAGE_NOACCESS ); + ok( !addr2, "VirtualAlloc failed\n" ); + ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() ); + } + /* invalid protection values */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(NULL, 0x1000, MEM_RESERVE, 0); @@ -329,7 +363,7 @@ static void test_MapViewOfFile(void) static const char testfile[] = "testfile.xxx"; const char *name; HANDLE file, mapping, map2; - void *ptr, *ptr2; + void *ptr, *ptr2, *addr; MEMORY_BASIC_INFORMATION info; BOOL ret; @@ -700,6 +734,10 @@ static void test_MapViewOfFile(void) ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); } + addr = VirtualAlloc( ptr, MAPPING_SIZE, MEM_RESET, PAGE_READONLY ); + ok( addr == ptr || broken(!addr && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ + "VirtualAlloc failed with error %u\n", GetLastError() ); + ret = VirtualFree( ptr, 0x10000, MEM_DECOMMIT ); ok( !ret || broken(ret) /* win9x */, "VirtualFree succeeded\n" ); if (!ret) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 32e7d93..04c90f6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1787,7 +1787,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ /* Compute the alloc type flags */ - if (!(type & (MEM_COMMIT | MEM_RESERVE)) || + if (!(type & (MEM_COMMIT | MEM_RESERVE | MEM_RESET)) || (type & ~(MEM_COMMIT | MEM_RESERVE | MEM_TOP_DOWN | MEM_WRITE_WATCH | MEM_RESET))) { WARN("called with wrong alloc type flags (%08x) !\n", type); @@ -1804,6 +1804,11 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ status = map_view( &view, base, size, mask, type & MEM_TOP_DOWN, vprot ); if (status == STATUS_SUCCESS) base = view->base; } + else if (type & MEM_RESET) + { + if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW; + else madvise( base, size, MADV_DONTNEED ); + } else /* commit the pages */ { if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW;

1 0