June 2011 - Wine-commits - list.winehq.org

André Hentschel : Wine 1.3.22 freigegeben
by Jeremy Newman 13 Jun '11

13 Jun '11

Module: website Branch: master Commit: 7ba611594bb8509eba5cb342988035c6c8690acd URL: http://source.winehq.org/git/website.git/?a=commit;h=7ba611594bb8509eba5cb3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 10 20:25:23 2011 +0200 Wine 1.3.22 freigegeben nearly impossible to translate stubless --- news/de/2011061001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011061001.xml b/news/de/2011061001.xml new file mode 100644 index 0000000..d36cd54 --- /dev/null +++ b/news/de/2011061001.xml @@ -0,0 +1,17 @@ +<news> +<date>10. Juni 2011</date> +<title>Wine 1.3.22 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für indische Textgestaltung.</li> + <li>Erzeugen von stubless Code im IDL Compiler.</li> + <li>Unterstützung für X-Dateien in D3DX.</li> + <li>4- und 24-Bit Bitmap Formate in der DIB Engine.</li> + <li>Listview Performance Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.22.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.22
by Jeremy Newman 13 Jun '11

13 Jun '11

Module: website Branch: master Commit: a9f809bd646950ad8b39576ec2b4ff832421c353 URL: http://source.winehq.org/git/website.git/?a=commit;h=a9f809bd646950ad8b3957… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 10 22:24:00 2011 +0200 French translation for release 1.3.22 --- news/fr/2011061001.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011061001.xml b/news/fr/2011061001.xml new file mode 100644 index 0000000..cede776 --- /dev/null +++ b/news/fr/2011061001.xml @@ -0,0 +1,20 @@ +<news> +<date>10 juin 2011</date> +<title>Sortie de Wine 1.3.22</title> +<body> + La version de développement 1.3.22 de Wine est disponible. + <a href="{$root}/announce/1.3.22">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du façonnage de texte brahmique.</li> + <li>Génération de code sans stub dans le compilateur IDL.</li> + <li>Prise en charge des fichiers X dans D3DX.</li> + <li>Formats bitmap 4 et 24 bits dans le moteur DIB.</li> + <li>Amélioration des performances des éléments Listview.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.22.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.22
by Jeremy Newman 13 Jun '11

13 Jun '11

Module: website Branch: master Commit: 266e0a4ff3be5c0f5ccbf61302d622442d6f6abe URL: http://source.winehq.org/git/website.git/?a=commit;h=266e0a4ff3be5c0f5ccbf6… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 11 21:21:42 2011 +0200 Polish translation for release 1.3.22 --- news/pl/2011061001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011061001.xml b/news/pl/2011061001.xml new file mode 100644 index 0000000..5aa33d0 --- /dev/null +++ b/news/pl/2011061001.xml @@ -0,0 +1,17 @@ +<news> +<date>Czerwiec 10, 2011</date> +<title>Wydano Wine 1.3.22</title> +<body> + Wydanie rozwojowe Wine 1.3.22 jest już dostępne. + <a href="{$root}/announce/1.3.22">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla kształtowania Indyjskiego tekstu.</li> + <li>Generowanie bezzalążkowego kodu w kompilatorze IDL.</li> + <li>Wsparcie dla plików X w D3DX.</li> + <li>4- i 24-bitowe formaty bitmap w silniku DIB.</li> + <li>Ulepszenia wydajności Listview.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.22.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

Alexandre Julliard : Wine release 1.3.22
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: website Branch: master Commit: 1059bc27f1a8695c62ce42c1d21aa46de3cb1af6 URL: http://source.winehq.org/git/website.git/?a=commit;h=1059bc27f1a8695c62ce42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 20:16:12 2011 +0200 Wine release 1.3.22 --- news/en/2011061001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011061001.xml b/news/en/2011061001.xml new file mode 100644 index 0000000..29b99c0 --- /dev/null +++ b/news/en/2011061001.xml @@ -0,0 +1,17 @@ +<news> +<date>June 10, 2011</date> +<title>Wine 1.3.22 Released</title> +<body> + The Wine development release 1.3.22 is now available. + <a href="{$root}/announce/1.3.22">What's new</a> in this release: +<ul> + <li>Support for Indic text shaping.</li> + <li>Generation of stubless code in the IDL compiler.</li> + <li>Support for X files in D3DX.</li> + <li>4- and 24-bit bitmap formats in the DIB engine.</li> + <li>Listview performance improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.22.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 24e7b5fb8b3c956407f748b027f7ca8e0822f863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e7b5fb8b3c956407f748b02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 20:08:11 2011 +0200 Release 1.3.22. --- ANNOUNCE | 1116 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 499 insertions(+), 637 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24e7b5fb8b3c956407f74…

1 0

Tag wine-1.3.22 : Alexandre Julliard : Release 1.3.22
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: refs/tags/wine-1.3.22 Tag: c2a9fd413e3d85f8f1263c97082ecf878ad3fdef URL: http://source.winehq.org/git/wine.git/?a=tag;h=c2a9fd413e3d85f8f1263c97082e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 20:08:12 2011 +0200 Release 1.3.22

1 0

Jacek Caban : wininet: Don' t pass handle to INTERNET_REQUEST_COMPLETE unless the request is opened via InternetPoenUrl .
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 8e37ed551a15146980e7092820d9c5f526237897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e37ed551a15146980e709282… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:16 2011 +0200 wininet: Don't pass handle to INTERNET_REQUEST_COMPLETE unless the request is opened via InternetPoenUrl. --- dlls/wininet/http.c | 17 +++++++++++------ dlls/wininet/tests/http.c | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 21c4125..520d17c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2660,7 +2660,7 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) } if(res == ERROR_SUCCESS) - send_request_complete(req, (DWORD_PTR)req->hdr.hInternet, avail); + send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); else send_request_complete(req, 0, res); } @@ -4805,10 +4805,15 @@ lend: if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - if (res == ERROR_SUCCESS && request->contentLength && request->bytesWritten == request->bytesToWrite) - HTTP_ReceiveRequestData(request, TRUE); - else - send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); + if (res == ERROR_SUCCESS) { + if(request->contentLength && request->bytesWritten == request->bytesToWrite) + HTTP_ReceiveRequestData(request, TRUE); + else + send_request_complete(request, + request->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)request->hdr.hInternet : 1, 0); + }else { + send_request_complete(request, 0, res); + } } TRACE("<--\n"); @@ -4902,7 +4907,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ if (res == ERROR_SUCCESS && request->contentLength) HTTP_ReceiveRequestData(request, TRUE); else - send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); + send_request_complete(request, res == ERROR_SUCCESS, res); return res; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5db7f64..13ac6f5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -287,6 +287,7 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT), "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n", dwStatusInformationLength); + ok(iar->dwResult == 1 || iar->dwResult == 0, "iar->dwResult = %ld\n", iar->dwResult); trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength);

1 0

Jacek Caban : wininet: Set content_length when we reach end of data in netconn_read.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: cfdc539972f8e0a69b8f2cfc13a089e6488a3897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfdc539972f8e0a69b8f2cfc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:27 2011 +0200 wininet: Set content_length when we reach end of data in netconn_read. --- dlls/wininet/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 520d17c..f8386b8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2346,6 +2346,8 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(size && req->netconn) { if(NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len) != ERROR_SUCCESS) len = 0; + if(!len) + netconn_stream->content_length = netconn_stream->content_read; } netconn_stream->content_read += *read = len;

1 0

Jacek Caban : wininet: Added dwError of INTERNET_STATUS_REQUEST_COMPLETE notifications tests.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: a664fa8041d46372de20660dd9877f00b0d91f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a664fa8041d46372de20660dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:37 2011 +0200 wininet: Added dwError of INTERNET_STATUS_REQUEST_COMPLETE notifications tests. --- dlls/wininet/tests/http.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 13ac6f5..2110dec 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -103,6 +103,7 @@ static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], static const char *status_string[MAX_INTERNET_STATUS]; static HANDLE hCompleteEvent, conn_close_event; +static DWORD req_error; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 @@ -291,6 +292,7 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength); + req_error = iar->dwError; SetEvent(hCompleteEvent); break; } @@ -448,8 +450,10 @@ static void InternetReadFile_test(int flags, const test_data_t *test) "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); - if (flags & INTERNET_FLAG_ASYNC) + if (flags & INTERNET_FLAG_ASYNC) { WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + } HeapFree(GetProcessHeap(), 0, post_data); if(test->flags & TESTF_ALLOW_COOKIE) { @@ -550,6 +554,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error, "req_error = 0\n"); continue; }else { ok(0, "InternetQueryDataAvailable failed: %u\n", GetLastError()); @@ -788,8 +793,10 @@ static void InternetReadFileExA_test(int flags) "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); - if (!rc && (GetLastError() == ERROR_IO_PENDING)) + if (!rc && (GetLastError() == ERROR_IO_PENDING)) { WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + } if (first_connection_to_test_url) { @@ -880,6 +887,7 @@ static void InternetReadFileExA_test(int flags) WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); } else { @@ -2166,6 +2174,7 @@ static void test_no_content(int port) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -2223,6 +2232,7 @@ static void test_conn_close(int port) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -2252,6 +2262,7 @@ static void test_conn_close(int port) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);

1 0

Jacek Caban : wininet: A small netconn_secure_verify code clean up.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: adf08d586d9bcb8b785c9342aec4ca34862e2199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf08d586d9bcb8b785c9342a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:48 2011 +0200 wininet: A small netconn_secure_verify code clean up. --- dlls/wininet/netconnection.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4334d7f..6c67f28 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -333,12 +333,8 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) cert = (X509 *)psk_value(chain, i); if ((context = X509_to_cert_context(cert))) { - if (i == 0) - ret = CertAddCertificateContextToStore(store, context, - CERT_STORE_ADD_ALWAYS, &endCert); - else - ret = CertAddCertificateContextToStore(store, context, - CERT_STORE_ADD_ALWAYS, NULL); + ret = CertAddCertificateContextToStore(store, context, + CERT_STORE_ADD_ALWAYS, i ? NULL : &endCert); CertFreeCertificateContext(context); } }

1 0