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

Paul Vriens : comdlg32: Fixed size of Dutch control.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 8ce06b14848905c3a32925938dacf8495e4917a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce06b14848905c3a32925938… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 13:41:20 2009 +0200 comdlg32: Fixed size of Dutch control. --- dlls/comdlg32/cdlg_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 8c2c5dd..340c2db 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -240,7 +240,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Bestands&typen:",IDC_FILETYPESTATIC,5,128,48,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Openen met als kenmerk &Alleen-lezen",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + CONTROL "Openen met als kenmerk &Alleen-lezen",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,140,10 DEFPUSHBUTTON "&Openen", IDOK,222,110,50,14 PUSHBUTTON "Annuleren", IDCANCEL,222,128,50,14

1 0

Alexander Nicolaysen Sørnes : reg: Update Norwegian Bokmål translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 815a66d787277d48c96edfb395566a39ec48e4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815a66d787277d48c96edfb39… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Sat Jul 4 00:36:58 2009 +0200 reg: Update Norwegian Bokmål translation. --- programs/reg/No.rc | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/reg/No.rc b/programs/reg/No.rc index 5ad032d..cc43c39 100644 --- a/programs/reg/No.rc +++ b/programs/reg/No.rc @@ -1,8 +1,8 @@ /* * REG.EXE - Wine-compatible reg program. - * Norwegian (Bokm�l) language support + * Norwegian (Bokmål) language support * - * Copyright 2008 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2008-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,12 +21,19 @@ #include "reg.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { - STRING_USAGE, "Programmer kj�res som f�lger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" - STRING_ADD_USAGE, "REG ADD n�kkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE n�kkelnavn [/v verdi | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY n�kkelnavn [/v verdi | /ve] [/s]\n" + STRING_USAGE, "Programmer kjøres som følger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" + STRING_ADD_USAGE, "REG ADD nøkkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nøkkelnavn [/v verdi | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n" + STRING_SUCCESS, "Operasjonen ble utført\n" + STRING_INVALID_KEY, "Feil: Ugyldig nøkkelnavn\n" + STRING_INVALID_CMDLINE, "Feil: Ugyldige parametere på kommandolinjen\n" + STRING_NO_REMOTE, "Feil: Kan ikke legge til nøkler på ekstern maskin\n" + STRING_CANNOT_FIND, "Feil: Systemet klarte ikke finne den angitte registernøkkelen eller -verdien\n" }

1 0

Aurimas Fišeras : crypt32: Add "Disallowed" to CryptFindLocalizedName.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 958899393d19a69bcba9e5c4fcaf2ddd805f974d URL: http://source.winehq.org/git/wine.git/?a=commit;h=958899393d19a69bcba9e5c4f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 13:52:35 2009 +0300 crypt32: Add "Disallowed" to CryptFindLocalizedName. --- dlls/crypt32/crypt32_En.rc | 1 + dlls/crypt32/cryptres.h | 1 + dlls/crypt32/oid.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 4670029..92d26c5 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -174,6 +174,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities" IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Trusted Publishers" + IDS_LOCALIZEDNAME_DISALLOWED "Disallowed" } STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index f9845be..0bbffcc 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -167,6 +167,7 @@ #define IDS_LOCALIZEDNAME_CA 1143 #define IDS_LOCALIZEDNAME_ADDRESSBOOK 1144 #define IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER 1145 +#define IDS_LOCALIZEDNAME_DISALLOWED 1146 #define IDS_KEY_ID 1200 #define IDS_CERT_ISSUER 1201 diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index f0ea8ea..ddc6efc 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -82,7 +82,8 @@ static const WCHAR MY[] = {'M','Y',0}; static const WCHAR CA[] = {'C','A',0}; static const WCHAR ADDRESSBOOK[] = {'A','D','D','R','E','S','S','B','O','O','K',0}; static const WCHAR TRUSTEDPUBLISHER[] = {'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r',0}; -static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK,TRUSTEDPUBLISHER}; +static const WCHAR DISALLOWED[] = {'D','i','s','a','l','l','o','w','e','d',0}; +static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK,TRUSTEDPUBLISHER,DISALLOWED}; static WCHAR LocalizedNames[sizeof(LocalizedKeys)/sizeof(LocalizedKeys[0])][256]; static void free_function_sets(void)

1 0

Aurimas Fišeras : Various spelling fixes for Lithuanian translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4e1af57b5f5efa0421bdc11cc272890fe2f06eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1af57b5f5efa0421bdc11cc… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 16:00:24 2009 +0300 Various spelling fixes for Lithuanian translation. --- dlls/comdlg32/cdlg_Lt.rc | 2 +- dlls/shdoclc/Lt.rc | 2 +- dlls/winspool.drv/Lt.rc | 2 +- programs/oleview/Lt.rc | 10 +++++----- programs/regedit/Lt.rc | 4 ++-- programs/winecfg/Lt.rc | 4 ++-- programs/wineconsole/wineconsole_Lt.rc | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/cdlg_Lt.rc b/dlls/comdlg32/cdlg_Lt.rc index 53463bc..c4bbf98 100644 --- a/dlls/comdlg32/cdlg_Lt.rc +++ b/dlls/comdlg32/cdlg_Lt.rc @@ -411,7 +411,7 @@ STRINGTABLE DISCARDABLE PD32_DRIVER_UNKNOWN "Nežinoma spausdintuvo tvarkyklė." PD32_NO_DEVICES "Prieš atlikdami su spausdintuvu susijusius veiksmus, \ tokius kaip puslapio nuostatų keitimas ar dokumento spausdinimas, turite įdiegti spausdintuvą. \ -Prašome įdeigti spausdintuvą ir pakartoti." +Prašome įdiegti spausdintuvą ir pakartoti." PD32_DEFAULT_PRINTER "Pagrindinis spausdintuvas; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Eilėje yra %d dokumentų" diff --git a/dlls/shdoclc/Lt.rc b/dlls/shdoclc/Lt.rc index 331e0a9..e6c812d 100644 --- a/dlls/shdoclc/Lt.rc +++ b/dlls/shdoclc/Lt.rc @@ -71,7 +71,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Rod&yti paveikslą", IDM_SHOWPICTURE MENUITEM "Įrašyti pa&veikslą kaip...", IDM_SAVEPICTURE - MENUITEM "Išsiųsti pev&eikslą el. paštu...", IDM_MP_EMAILPICTURE + MENUITEM "Išsiųsti pav&eikslą el. paštu...", IDM_MP_EMAILPICTURE MENUITEM "S&pausdinti paveikslą...", IDM_MP_PRINTPICTURE MENUITEM "Ei&ti į paveikslų aplanką", IDM_MP_MYPICS MENUITEM "Parinkti užsk&landos piešiniu", IDM_SETWALLPAPER diff --git a/dlls/winspool.drv/Lt.rc b/dlls/winspool.drv/Lt.rc index 46761e8..1c5b1e8 100644 --- a/dlls/winspool.drv/Lt.rc +++ b/dlls/winspool.drv/Lt.rc @@ -39,6 +39,6 @@ END STRINGTABLE DISCARDABLE { IDS_CAPTION "Lokalus prievadas" - IDS_FILE_EXISTS "Išvesties failas jau egzistouja. Norėdami failą keisti spauskite Gerai." + IDS_FILE_EXISTS "Išvesties failas jau egzistuoja. Norėdami failą keisti spauskite Gerai." IDS_CANNOT_OPEN "Nepavyko sukurti išvesties failo." } diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc index a5d131c..df8dee0 100644 --- a/programs/oleview/Lt.rc +++ b/programs/oleview/Lt.rc @@ -1,5 +1,5 @@ /* - * OLE žiuryklė + * OLE žiūryklė * Lithuanian Language Support * * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> @@ -72,7 +72,7 @@ IDM_MENU MENU } POPUP "&Žinynas" { - MENUITEM "&Apie OLE žiurykę", IDM_ABOUT + MENUITEM "&Apie OLE žiūrykę", IDM_ABOUT } } @@ -94,10 +94,10 @@ IDM_TYPELIB MENU STRINGTABLE { - IDS_APPNAME "OLE žiuryklė" - IDS_APPTITLE "OLE žiuryklė" + IDS_APPNAME "OLE žiūryklė" + IDS_APPTITLE "OLE žiūryklė" IDS_READY "Parengta" - IDS_ABOUT "OLE žiuryklė - OLE/COM objektų žiūryklė" + IDS_ABOUT "OLE žiūryklė - OLE/COM objektų žiūryklė" IDS_ABOUTVER "versija 1.0" IDS_TYPELIBTITLE "ITypeLib žiūryklė" IDS_OPEN "Atverti" diff --git a/programs/regedit/Lt.rc b/programs/regedit/Lt.rc index 21109fa..79a577d 100644 --- a/programs/regedit/Lt.rc +++ b/programs/regedit/Lt.rc @@ -258,7 +258,7 @@ BEGIN ID_EDIT_MODIFY "Modifikuoja reikšmės duomenis" ID_EDIT_NEW_KEY "Prideda naują raktą" ID_EDIT_NEW_STRINGVALUE "Prideda naują eilutės reikšmę" - ID_EDIT_NEW_BINARYVALUE "Prideda naują dvejeteinę reikšmę" + ID_EDIT_NEW_BINARYVALUE "Prideda naują dvejetainę reikšmę" ID_EDIT_NEW_DWORDVALUE "Prideda naują dvigubojo žodžio reikšmę" ID_EDIT_NEW_MULTI_STRINGVALUE "Prideda naują kelių eilučių reikšmę" ID_REGISTRY_IMPORTREGISTRYFILE "Importuoja tekstinį failą į registrą" @@ -277,7 +277,7 @@ BEGIN ID_REGISTRY_EXIT "Išeina iš registro tvarkytuvės" ID_FAVORITES_ADDTOFAVORITES "Prideda pasirinktą raktą į adresyną" ID_FAVORITES_REMOVEFAVORITE "Pašalina nurodytus raktus iš adresyno" - ID_VIEW_STATUSBAR "Parodo arba paslėpia būsenos juostą" + ID_VIEW_STATUSBAR "Parodo arba paslepia būsenos juostą" ID_VIEW_SPLIT "Pakeičia polangių skirtuko poziciją tarp polangių" ID_VIEW_REFRESH "Atnaujina langą" ID_EDIT_DELETE "Šalina atranką" diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index 296390b..e31c2cb 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -111,7 +111,7 @@ END IDD_LOADORDER DIALOG DISCARDABLE 80, 90, 110, 92 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Override" +CAPTION "Redaguoti nustelbimą" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Įkėlimo tvarka ",IDC_STATIC,8,4,94,66 @@ -243,7 +243,7 @@ BEGIN IDS_DEFAULT_SETTINGS "Numatytosios nuostatos" IDS_EXECUTABLE_FILTER "Wine programos (*.exe,*.exe.so)\0*.exe;*.exe.so\0" IDS_USE_GLOBAL_SETTINGS "Naudoti globalias nuostatas" - IDS_SELECT_EXECUTABLE "Pasirikite vykdomąjį failą" + IDS_SELECT_EXECUTABLE "Pasirinkite vykdomąjį failą" END STRINGTABLE DISCARDABLE diff --git a/programs/wineconsole/wineconsole_Lt.rc b/programs/wineconsole/wineconsole_Lt.rc index 2e05466..311bb1f 100644 --- a/programs/wineconsole/wineconsole_Lt.rc +++ b/programs/wineconsole/wineconsole_Lt.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_EDIT, "&Taisa" -IDS_DEFAULT, "Nustatyti &numatytasias" +IDS_DEFAULT, "Nustatyti &numatytąsias" IDS_PROPERTIES, "&Savybės" IDS_MARK, "&Žymėti" IDS_COPY, "&Kopijuoti"

1 0

Paul Vriens : gdi32/tests: Mark an intermittent failure as broken() on Win9x/ME.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 31d82c5fdc2b68c10db96f8d1712a93a6fa55037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d82c5fdc2b68c10db96f8d1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jul 4 16:27:02 2009 +0200 gdi32/tests: Mark an intermittent failure as broken() on Win9x/ME. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a0e767d..660a145 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -780,7 +780,9 @@ static void test_dibsections(void) BitBlt(hdcmem2, 0, 0, 16,16, hdcmem, 0, 0, SRCCOPY); ok(bits32[0] == 0xff00, "lower left pixel is %08x\n", bits32[0]); - ok(bits32[17] == 0xff00ff, "bottom but one, left pixel is %08x\n", bits32[17]); + ok(bits32[17] == 0xff00ff || + broken(bits32[17] == 0x00ff00), /* Intermittent on Win9x/ME */ + "bottom but one, left pixel is %08x\n", bits32[17]); SelectObject(hdcmem2, oldbm2); test_dib_info(hdib2, bits32, &pbmi->bmiHeader);

1 0

Damjan Jovanovic : ws2_32: Add some AcceptEx tests.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 71f7da2d3eca1374a7bc864424ee5ea2b576f2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f7da2d3eca1374a7bc86442… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jul 5 12:39:58 2009 +0200 ws2_32: Add some AcceptEx tests. --- dlls/ws2_32/tests/sock.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 130 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c90f391..1eab132 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2539,6 +2539,134 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); } +static void test_AcceptEx(void) +{ + SOCKET listener = INVALID_SOCKET; + SOCKET acceptor = INVALID_SOCKET; + SOCKET connector = INVALID_SOCKET; + struct sockaddr_in bindAddress; + int socklen; + GUID acceptExGuid = WSAID_ACCEPTEX; + BOOL WINAPI (*pAcceptEx)(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, + DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, + LPOVERLAPPED overlapped); + DWORD bytesReturned; + char buffer[1024]; + OVERLAPPED overlapped; + int iret; + BOOL bret; + DWORD dwret; + + memset(&overlapped, 0, sizeof(overlapped)); + + listener = socket(AF_INET, SOCK_STREAM, 0); + if (listener == INVALID_SOCKET) { + skip("could not create listener socket, error %d\n", WSAGetLastError()); + goto end; + } + + 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; + } + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(listener, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (iret != 0) { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + socklen = sizeof(bindAddress); + iret = getsockname(listener, (struct sockaddr*)&bindAddress, &socklen); + if (iret != 0) { + skip("failed to lookup bind address, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(listener, FALSE)) { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), + &pAcceptEx, sizeof(pAcceptEx), &bytesReturned, NULL, NULL); + if (iret) { + skip("WSAIoctl failed to get AcceptEx with ret %d + errno %d\n", iret, WSAGetLastError()); + goto end; + } + + bret = pAcceptEx(INVALID_SOCKET, 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() == WSAENOTSOCK, "AcceptEx on invalid listening socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, INVALID_SOCKET, 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() == WSAEINVAL, "AcceptEx on invalid accepting socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on NULL buffer " + "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); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = listen(listener, 5); + if (iret != 0) { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (overlapped.hEvent == NULL) { + skip("could not create event object, errno = %d\n", GetLastError()); + goto end; + } + + bret = pAcceptEx(listener, acceptor, buffer, 0, + 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()); + + dwret = WaitForSingleObject(overlapped.hEvent, INFINITE); + 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); + if (listener != INVALID_SOCKET) + closesocket(listener); + if (acceptor != INVALID_SOCKET) + closesocket(acceptor); + if (connector != INVALID_SOCKET) + closesocket(connector); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -2591,5 +2719,7 @@ START_TEST( sock ) test_ipv6only(); test_GetAddrInfoW(); + test_AcceptEx(); + Exit(); }

1 0

Alexander Nicolaysen Sørnes : notepad: Update Norwegian Bokmål translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 18045e5681396d9d4aa94849a48d607aea37582c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18045e5681396d9d4aa94849a… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Sat Jul 4 00:56:19 2009 +0200 notepad: Update Norwegian Bokmål translation. --- programs/notepad/No.rc | 50 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 15 deletions(-) diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc index fe3f19e..512fa2d 100644 --- a/programs/notepad/No.rc +++ b/programs/notepad/No.rc @@ -1,7 +1,7 @@ /* - * Notepad (Norwegian Bokm�l resources) + * Notepad (Norwegian Bokmål resources) * - * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,13 +20,15 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MAIN_MENU MENU { POPUP "&Fil" { MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "&�pne...\tCtrl+O", CMD_OPEN + MENUITEM "&Åpne...\tCtrl+O", CMD_OPEN MENUITEM "&Lagre\tCtrl+S", CMD_SAVE MENUITEM "Lagr&e som...", CMD_SAVE_AS MENUITEM SEPARATOR @@ -50,13 +52,14 @@ POPUP "R&ediger" { MENUITEM "Tekstbrytin&g", CMD_WRAP MENUITEM "Skr&ift...", CMD_FONT } -POPUP "&S�k" { - MENUITEM "&S�k...\tCtrl+F", CMD_SEARCH - MENUITEM "&S�k etter nest&e\tF3", CMD_SEARCH_NEXT +POPUP "&Søk" { + MENUITEM "&Søk...\tCtrl+F", CMD_SEARCH + MENUITEM "Søk etter nest&e\tF3", CMD_SEARCH_NEXT + MENUITEM "E&rstatt...\tCtrl+H", CMD_REPLACE } POPUP "&Hjelp" { MENUITEM "&Innhold", CMD_HELP_CONTENTS - MENUITEM "&S�k...", CMD_HELP_SEARCH + MENUITEM "&Søk...", CMD_HELP_SEARCH MENUITEM "&Hjelp om hjelp", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD @@ -80,7 +83,7 @@ LTEXT "&Venstre:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Topp:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "H�y&re:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "Høy&re:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Bunn:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP @@ -90,6 +93,14 @@ PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Hjelp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tegnkoding:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -105,17 +116,26 @@ STRING_UNTITLED, "(Uten navn)" STRING_ALL_FILES, "Alle filer (*.*)" STRING_TEXT_FILES_TXT, "Tekstfiler (*.txt)" -STRING_TOOLARGE, "Filen �%s� er for stor for Notisblokk.\n \ +STRING_TOOLARGE, "Filen «%s» er for stor for Notisblokk.\n \ Bruk en annen redigerer." STRING_NOTEXT, "Du skrev ikke inn noe tekst. \ -\nSkriv noe og pr�v igjen." -STRING_DOESNOTEXIST, "Filen �%s� finnes ikke.\n\n \ +\nSkriv noe og prøv igjen." +STRING_DOESNOTEXIST, "Filen «%s» finnes ikke.\n\n \ Opprette en ny fil?" -STRING_NOTSAVED, "Filen �%s� er endret.\n\n \ +STRING_NOTSAVED, "Filen «%s» er endret.\n\n \ Lagre endringene?" -STRING_NOTFOUND, "Klarte ikke finne �%s�." -STRING_OUT_OF_MEMORY, "Ikke nok minne for � fullf�re \ -operasjonen.\nLukk et eller flere programmer for � frigj�re\nmer \ +STRING_NOTFOUND, "Klarte ikke finne «%s»." +STRING_OUT_OF_MEMORY, "Ikke nok minne for å fullføre \ +operasjonen.\nLukk et eller flere programmer for å frigjøre\nmer \ minne." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "«%s»\n\ +Denne filen inneholder Unicode-tegn som vil gå tapt hvis \n\ +filen lagres med tegnkodingen %s. \n\ +Trykk Avbryt og velg et av Unicode-valgene fra listen \n\ +hvis du vil beholde tegnene. \n\ +Fortsette?" }

1 0

Paul Vriens : d3d9/tests: Skip a test on failure.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: f96e210ed7089f83601acba5d2e8a242aa1a8195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96e210ed7089f83601acba5d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jul 4 16:56:10 2009 +0200 d3d9/tests: Skip a test on failure. --- dlls/d3d9/tests/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 66f53b9..f56e05e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2336,10 +2336,12 @@ static void test_multi_device(void) hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd1, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device1); - ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); IDirect3D9_Release(d3d9); d3d9 = NULL; - if (FAILED(hr)) goto fail; + if (FAILED(hr)) { + skip("Failed to create a device\n"); + goto fail; + } d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); ok(d3d9 != NULL, "Failed to create a d3d9 object.\n");

1 0

Paul Vriens : ole32/tests: Reset a variable before testing.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: f057d7d63f0b47854c533be0949ad452d7db39d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f057d7d63f0b47854c533be09… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jul 4 17:35:01 2009 +0200 ole32/tests: Reset a variable before testing. --- dlls/ole32/tests/moniker.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5d3f6f5..306a892 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1143,7 +1143,7 @@ static void test_moniker( LPBYTE moniker_data; DWORD moniker_size; DWORD i; - BOOL same = TRUE; + BOOL same; BYTE buffer[128]; IMoniker * moniker_proxy; LPOLESTR display_name; @@ -1183,6 +1183,7 @@ static void test_moniker( testname, sizeof_expected_moniker_comparison_data, moniker_size); /* then do a byte-by-byte comparison */ + same = TRUE; for (i = 0; i < min(moniker_size, sizeof_expected_moniker_comparison_data); i++) { if (expected_moniker_comparison_data[i] != buffer[i]) @@ -1226,6 +1227,7 @@ static void test_moniker( testname, (DWORD)round_global_size(sizeof_expected_moniker_saved_data), moniker_size); /* then do a byte-by-byte comparison */ + same = TRUE; for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_saved_data)); i++) { if (expected_moniker_saved_data[i] != moniker_data[i]) @@ -1272,6 +1274,7 @@ static void test_moniker( testname, (DWORD)round_global_size(sizeof_expected_moniker_marshal_data), moniker_size); /* then do a byte-by-byte comparison */ + same = TRUE; if (expected_moniker_marshal_data) { for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_marshal_data)); i++)

1 0

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

July 6, 2009

Module: wine Branch: master Commit: e2f26883561466e9b7f39f3cca7b3016833ae699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f26883561466e9b7f39f3cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 4 19:32:33 2009 +0200 regedit: Fix French translation & UI display. --- programs/regedit/Fr.rc | 207 ++++++++++++++++++++++++------------------------ 1 files changed, 105 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f26883561466e9b7f39…

1 0