wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Łukasz Wojniłowicz : Put out a call for translators in Polish.
by Jeremy Newman 26 Jun '13

26 Jun '13

Module: website Branch: master Commit: d7008d5795f1b614f21f6f26b7c7be8586610142 URL: http://source.winehq.org/git/website.git/?a=commit;h=d7008d5795f1b614f21f6f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Jun 25 21:06:35 2013 +0200 Put out a call for translators in Polish. --- news/pl/2013061601.xml | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/news/pl/2013061601.xml b/news/pl/2013061601.xml new file mode 100644 index 0000000..264978a --- /dev/null +++ b/news/pl/2013061601.xml @@ -0,0 +1,11 @@ +<news> +<date>Czerwiec 16, 2013</date> +<title>Potrzebni tłumacze!</title> +<body> +Teraz, gdy Wine jest zamrożone w przygotowaniu do wydania 1.6, nie ma lepszego +czasu na odświeżenie <a href="http://fgouget.free.fr/wine-po/">20</a> tłumaczeń i dodaniu +nowych. +Od tłumaczenia jesteś oddalony tylko o jeden plik PO. Tak więc sprawdź +<a href="http://wiki.winehq.org/Translating">jak zacząć</a> i pomóż dostarczać +Wine populacjom, do których nie trafiało wcześniej! +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.6-rc3
by Jeremy Newman 26 Jun '13

26 Jun '13

Module: website Branch: master Commit: 225e6698ced483ee5f128825481c5c64a37a6bbc URL: http://source.winehq.org/git/website.git/?a=commit;h=225e6698ced483ee5f1288… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Jun 25 21:06:34 2013 +0200 Polish translation for release 1.6-rc3 --- news/pl/2013062101.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2013062101.xml b/news/pl/2013062101.xml new file mode 100644 index 0000000..ae3b14f --- /dev/null +++ b/news/pl/2013062101.xml @@ -0,0 +1,12 @@ +<news> +<date>Czerwiec 21, 2013</date> +<title>Wydano Wine 1.6-rc3</title> +<body> + Wydanie rozwojowe Wine 1.6-rc3 jest już dostępne. + <a href="{$root}/announce/1.6-rc3">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : tools: Update winemaker manpage French translation.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 9c4936717aba2a7e36970f11d8e064447724aef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4936717aba2a7e36970f11d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 23 10:09:24 2013 +0200 tools: Update winemaker manpage French translation. --- tools/winemaker.fr.man.in | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/winemaker.fr.man.in b/tools/winemaker.fr.man.in index 61616ba..6a1ce72 100644 --- a/tools/winemaker.fr.man.in +++ b/tools/winemaker.fr.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "mai 2010" "@PACKAGE_STRING@" "Manuel des développeurs de Wine" +.TH WINEMAKER 1 "jan 2012" "@PACKAGE_STRING@" "Manuel des développeurs de Wine" .SH NOM winemaker \- générer une infrastructure de construction pour la compilation de programmes Windows sur UNIX .SH SYNOPSIS @@ -17,7 +17,7 @@ winemaker \- générer une infrastructure de construction pour la compilation de ] .br [ -.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " +.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " "| " "--lib " ] .br [ @@ -48,7 +48,7 @@ processus de conversion de vos sources Windows en programmes Winelib. -\ renommer vos fichiers sources et répertoires en minuscules s'ils ont été convertis en majuscules durant le transfert. .PP --\ convertir les fins de ligne DOS en fins de lignes UNIX (CRLF vers LF). +-\ convertir les fins de ligne DOS en fins de ligne UNIX (CRLF vers LF). .PP -\ balayer les directives d'inclusion et les références aux fichiers de ressources pour y remplacer les backslashs par des slashs. @@ -61,7 +61,7 @@ avec la casse correcte si nécessaire. .PP .RB "-\ " winemaker recherchera également d'autres problèmes plus exotiques comme l'emploi -de «\ #pragma pack\ », l'utilisation de «\ afxres.h\ » dans des projets +de « #pragma pack », l'utilisation de « afxres.h » dans des projets non MFC, etc. Quand il trouve de tels points nébuleux, il émettra des avertissements. .PP @@ -104,12 +104,12 @@ Renommer tous les fichiers et répertoires en minuscules. .B --lower-uppercase Ne renommer que les fichiers et répertoires qui ont un nom composé uniquement de majuscules. -Ainsi, «\ HELLO.C\ » serait renommé, mais pas «\ World.c\ ». +Ainsi, « HELLO.C » serait renommé, mais pas « World.c ». .TP .B --lower-none Ne pas renommer de fichiers et répertoires en minuscules. Notez que cela n'empêche pas le renommage d'un fichier si son extension ne peut être traitée -telle quelle, comme par exemple «\ .Cxx\ ». Comportement par défaut. +telle quelle, comme par exemple « .Cxx ». Comportement par défaut. .TP .B "--lower-include " Convertir en minuscules les noms de fichiers associés à des directives @@ -132,10 +132,14 @@ Présumer une application en mode console quand une cible exécutable ou une cib type inconnu est rencontrée. .TP .B --dll -Présumer une bibliothèque quand une cible d'un type inconnu est rencontrée (c.-à-d. -si +Présumer une DLL quand une cible d'un type inconnu est rencontrée (c.-à-d. si .B winemaker -ne peut déterminer s'il s'agit d'un exécutable ou d'une bibliothèque). +ne peut déterminer s'il s'agit d'un exécutable, d'une DLL ou d'une bibliothèque statique). +.TP +.B --lib +Présumer une bibliothèque statique quand une cible d'un type inconnu est rencontrée (c.-à-d. si +.B winemaker +ne peut déterminer s'il s'agit d'un exécutable, d'une DLL ou d'une bibliothèque statique). .TP .B --mfc Spécifier que les cibles utilisent les MFC. Dans ce cas, @@ -147,7 +151,7 @@ et lie la cible avec la bibliothèque MFC. Spécifier que les cibles n'utilisent pas les MFC. Cette option empêche l'utilisation des bibliothèques MFC même si .B winemaker -rencontre des fichiers «\ stdafx.cpp\ » ou «\ stdafx.h\ » qui activeraient +rencontre des fichiers « stdafx.cpp » ou « stdafx.h » qui activeraient les MFC automatiquement en temps normal si ni --nomfc ni --mfc n'était spécifiée. .TP @@ -189,7 +193,7 @@ demandera de confirmer la liste de cibles pour chaque répertoire, et ensuite de fournir des options spécifiques de répertoire et/ou de cible. .TP .BR --single-target " nom" -Spécifier qu'il n'y a qu'une seule cible, appelée «\ nom\ ». +Spécifier qu'il n'y a qu'une seule cible, appelée « nom ». .TP .B --generated-files Générer le Makefile. Comportement par défaut. @@ -213,7 +217,7 @@ Recherche des fichiers sources dans le répertoire courant et ses sous-répertoires. Quand un fichier ou répertoire a un nom composé uniquement de majuscules, le renomme en minuscules. Ensuite, adapte tous ces fichiers sources pour une compilation avec Winelib, et génère des -Makefiles. «\ -DSTRICT\ » spécifie que la macro STRICT doit +Makefiles. « -DSTRICT » spécifie que la macro STRICT doit être définie lors de la compilation des sources. Finalement, un Makefile est créé. .PP

1 0

Erich Hoover : ws2_32: Fix interface-bound filter to accept locally generated targeted packets.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 74010aa0e774b8b4e32455e6a42306f714ee66dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=74010aa0e774b8b4e32455e6a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jun 23 20:19:16 2013 -0600 ws2_32: Fix interface-bound filter to accept locally generated targeted packets. --- dlls/ws2_32/socket.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 98bb426..7ad118f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -178,6 +178,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); struct interface_filter { struct sock_filter iface_memaddr; struct sock_filter iface_rule; + struct sock_filter ip_memaddr; + struct sock_filter ip_rule; struct sock_filter return_keep; struct sock_filter return_dump; }; @@ -187,9 +189,17 @@ struct interface_filter { # define FILTER_JUMP_KEEP(here) (u_char)(offsetof(struct interface_filter, return_keep) \ -offsetof(struct interface_filter, here)-sizeof(struct sock_filter)) \ /sizeof(struct sock_filter) +# define FILTER_JUMP_NEXT() (u_char)(0) +# define SKF_NET_DESTIP 16 /* offset in the network header to the destination IP */ static struct interface_filter generic_interface_filter = { + /* This filter rule allows incoming packets on the specified interface, which works for all + * remotely generated packets and for locally generated broadcast packets. */ BPF_STMT(BPF_LD+BPF_W+BPF_ABS, SKF_AD_OFF+SKF_AD_IFINDEX), - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(iface_rule), FILTER_JUMP_DUMP(iface_rule)), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(iface_rule), FILTER_JUMP_NEXT()), + /* This rule allows locally generated packets targeted at the specific IP address of the chosen + * adapter (local packets not destined for the broadcast address do not have IFINDEX set) */ + BPF_STMT(BPF_LD+BPF_W+BPF_ABS, SKF_NET_OFF+SKF_NET_DESTIP), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(ip_rule), FILTER_JUMP_DUMP(ip_rule)), BPF_STMT(BPF_RET+BPF_K, (u_int)-1), /* keep packet */ BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ }; @@ -2191,6 +2201,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) goto cleanup; /* Failed to suggest egress interface */ specific_interface_filter = generic_interface_filter; specific_interface_filter.iface_rule.k = adapter->Index; + specific_interface_filter.ip_rule.k = htonl(adapter_addr); filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); filter_prog.filter = (struct sock_filter *) &specific_interface_filter; if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0)

1 0

Piotr Caban : msvcrt: Added _wcsicmp_l implementation.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: c66d94bfd949b997f7488c6fa3d2e00d2b5f1dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66d94bfd949b997f7488c6fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 25 16:14:23 2013 +0200 msvcrt: Added _wcsicmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8e728c1..9479d5e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1484,7 +1484,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7b43159..b83bfe0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1847,7 +1847,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2344f0f..b8118a9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1162,7 +1162,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e31da91..8467b91 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1138,7 +1138,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index afb12bf..e12d87f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1102,7 +1102,7 @@ @ cdecl _wcserror_s(ptr long long) # stub _wcsftime_l(ptr long wstr ptr ptr) @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp -# stub _wcsicmp_l(wstr wstr ptr) +@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l @ cdecl _wcslwr(wstr) ntdll._wcslwr diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a5795bd..c5b630f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -69,6 +69,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) return ret; } +INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT__locale_t locale) +{ + if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) + return MSVCRT__NLSCMPERROR; + + return strcmpiW(str1, str2); +} + /********************************************************************* * _wcsicmp (MSVCRT.@) */

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 031c4e2d0e1f36b0f91ded0b353d280edfd6d35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c4e2d0e1f36b0f91ded0b3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 25 00:36:51 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 517410a..6ad9576 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1985,7 +1985,7 @@ msgstr "Assinatura de Certificados" #: crypt32.rc:227 msgid "Off-line CRL Signing" -msgstr "Assinatura CRL Off-line" +msgstr "Assinatura CRL Offline" #: crypt32.rc:228 msgid "CRL Signing" @@ -3505,7 +3505,7 @@ msgstr "Argumento ou chamada de procedimento inválida" #: jscript.rc:27 msgid "Subscript out of range" -msgstr "Subscript fora de alcance" +msgstr "Índice fora do intervalo" #: jscript.rc:28 msgid "Object required" @@ -4373,7 +4373,7 @@ msgstr "Chamador não possui o Mutex.\n" #: winerror.mc:946 msgid "Too many posts to semaphore.\n" -msgstr "Demasiados posts ao semáforo.\n" +msgstr "Muitas mensagens ao semáforo.\n" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed.\n" @@ -4381,11 +4381,11 @@ msgstr "Read/WriteProcessMemory parcialmente completo.\n" #: winerror.mc:956 msgid "The oplock wasn't granted.\n" -msgstr "O oplock não foi garantido.\n" +msgstr "O bloqueio não foi garantido.\n" #: winerror.mc:961 msgid "Invalid oplock message received.\n" -msgstr "Mensagem inválida de oplock recebida.\n" +msgstr "Mensagem inválida de bloqueio recebida.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" @@ -4777,7 +4777,7 @@ msgstr "Memória do servidor insuficiente.\n" #: winerror.mc:1451 msgid "Possible deadlock.\n" -msgstr "Possível deadlock.\n" +msgstr "Possível bloqueio.\n" #: winerror.mc:1456 msgid "Incorrect alignment.\n" @@ -9343,7 +9343,7 @@ msgstr "" "\n" " + Define um atributo.\n" " - Limpa um atributo.\n" -" R Atributo de arquivo somente-leitura.\n" +" R Atributo de arquivo somente leitura.\n" " A Atributo de arquivo.\n" " S Atributo de arquivo de sistema.\n" " H Atribute de arquivo oculto.\n" @@ -9764,7 +9764,7 @@ msgstr "" "\"title\" Especifica o título da janela da janela filha.\n" "/d directory Inicia o programa no diretório especificado.\n" "/b Não criar um console novo para o programa.\n" -"/i Inicia o programa com variáveis de ambinete novas.\n" +"/i Inicia o programa com variáveis de ambiente novas.\n" "/min Inicia o programa minimizado.\n" "/max Inicia o programa maximizado.\n" "/low Inicia o programa com prioridade baixa.\n" @@ -10196,7 +10196,7 @@ msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"Número mal-formado - deve ser decimal (12),\n" +"Número malformado - deve ser decimal (12),\n" " hexadecimal (0x34) ou octal (056).\n" #: dxdiag.rc:27 @@ -11534,7 +11534,7 @@ msgstr "Editar Multi-frase" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" -msgstr "Contém comandos para trabalhar com o Registro inteiro" +msgstr "Contém comandos para trabalhar com o registro inteiro" #: regedit.rc:135 msgid "Contains commands for editing values or keys"

1 0

Huw Davies : comdlg32: Don't call the callback if it's not set.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: ec37a87e95945451dde85be3622162db34ab6ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec37a87e95945451dde85be36… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 25 11:48:16 2013 +0100 comdlg32: Don't call the callback if it's not set. --- dlls/comdlg32/printdlg.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 3c3fab3..292f764 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3994,8 +3994,11 @@ static UINT_PTR CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM PRINTDLGW *pd = (PRINTDLGW *)lp; struct callback_data *cb = (struct callback_data *)pd->lCustData; - cb->callback->lpVtbl->SelectionChange(cb->callback); - cb->callback->lpVtbl->InitDone(cb->callback); + if (cb->callback) + { + cb->callback->lpVtbl->SelectionChange(cb->callback); + cb->callback->lpVtbl->InitDone(cb->callback); + } } else {

1 0

Hans Leidekker : winhttp/tests: Add some tests for WinHttpDetectAutoProxyConfigUrl.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: d285629cf4fcf5521a0fb5086ceddc010bfc4e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d285629cf4fcf5521a0fb5086… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:55 2013 +0200 winhttp/tests: Add some tests for WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/tests/winhttp.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2f1df0f..6b946a9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2679,12 +2679,30 @@ if (0) /* crashes on some win2k systems */ ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } - url = NULL; + url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); error = GetLastError(); if (!ret) + { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } + else + { + trace("%s\n", wine_dbgstr_w(url)); + GlobalFree( url ); + } + + url = (WCHAR *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DHCP, &url ); + error = GetLastError(); + if (!ret) + { + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } else { trace("%s\n", wine_dbgstr_w(url));

1 0

Hans Leidekker : dssenh/tests: Fix test failures on 64-bit Vista.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 725797249c0efec82261ecc9ee1bc1c51c6e87f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725797249c0efec82261ecc9e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:39 2013 +0200 dssenh/tests: Fix test failures on 64-bit Vista. --- dlls/dssenh/tests/dssenh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index bf79407..c873787 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1142,6 +1142,7 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Import the public key and convert it into a shared key */ result = CryptImportKey(hProv, pubKeyBuffer2, pubKeyLen2, privKey1, 0, &sessionKey1); ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(!result && GetLastError() == NTE_BAD_DATA) || /* Vista.64 */ broken(!result && GetLastError() == NTE_BAD_TYPE) || /* Win2K-W2K8, Win7.64 */ broken(!result && GetLastError() == NTE_BAD_ALGID) || /* W7SP164 (32 bit dssenh) */ broken(result), /* WinNT4 */

1 0

Hans Leidekker : ws2_32/tests: Avoid races.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 1d8b70fca4224f324f878b286c3178a313e3aef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8b70fca4224f324f878b286… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:10 2013 +0200 ws2_32/tests: Avoid races. --- dlls/ws2_32/tests/sock.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 758fa7e..3e3167a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5468,6 +5468,8 @@ static void test_completion_port(void) ok(iret == SOCKET_ERROR, "WSARecv returned %d\n", iret); ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + Sleep(100); + closesocket(src); src = INVALID_SOCKET; @@ -5523,6 +5525,9 @@ static void test_completion_port(void) closesocket(src); src = INVALID_SOCKET; + + Sleep(100); + num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -5947,6 +5952,8 @@ static void test_completion_port(void) iret = send(connector, buf, 1, 0); ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + Sleep(100); + closesocket(dest); dest = INVALID_SOCKET; @@ -6022,12 +6029,15 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok((GetLastError() == ERROR_NETNAME_DELETED) || (GetLastError() == ERROR_CONNECTION_ABORTED), "Last error was %d\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || + GetLastError() == ERROR_OPERATION_ABORTED || + GetLastError() == ERROR_CONNECTION_ABORTED, "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && ((olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT) - || (olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED)), "Internal status is %lx\n", olp ? olp->Internal : 0); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || + olp->Internal == (ULONG)STATUS_CANCELLED || + olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013