March 2013 - Wine-commits - list.winehq.org

Jactry Zeng : Simplified Chinese translation for release 1.5.25
by Jeremy Newman 04 Mar '13

04 Mar '13

Module: website Branch: master Commit: b8b771f97a0b1450087ff00f7c0bf1c398683422 URL: http://source.winehq.org/git/website.git/?a=commit;h=b8b771f97a0b1450087ff0… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Mar 3 17:54:49 2013 +0800 Simplified Chinese translation for release 1.5.25 --- news/zh-cn/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013030101.xml b/news/zh-cn/2013030101.xml new file mode 100644 index 0000000..aa814f8 --- /dev/null +++ b/news/zh-cn/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>三月 1, 2013</date> +<title>Wine 1.5.25 发布</title> +<body> + Wine 开发版 1.5.25 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.25">更新</a>： +<ul> + <li>Mac 后端驱动对光标的正确支持。</li> + <li>RichEdit 对从右往左文本支持的修复。</li> + <li>Wingdings 字体实现的初始版本。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.25
by Jeremy Newman 04 Mar '13

04 Mar '13

Module: website Branch: master Commit: 1b0b1a577a137eb3e770dac8ebab986edb5ab2dd URL: http://source.winehq.org/git/website.git/?a=commit;h=1b0b1a577a137eb3e770da… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 1 23:20:50 2013 +0100 French translation for release 1.5.25 --- news/fr/2013030101.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013030101.xml b/news/fr/2013030101.xml new file mode 100644 index 0000000..fa9f2b3 --- /dev/null +++ b/news/fr/2013030101.xml @@ -0,0 +1,14 @@ +<news> +<date>1er mars 2013</date> +<title>Sortie de Wine 1.5.25</title> +<body> + La version de développement 1.5.25 de Wine est disponible. + <a href="{$root}/announce/1.5.25">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge correcte du curseur dans le pilote Mac.</li> + <li>Correctifs pour la prise en charge du texte écrit de droite à gauche dans RichEdit.</li> + <li>Version initiale d'une police Wingdings.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.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

André Hentschel : Wine 1.5.25 freigegeben
by Jeremy Newman 04 Mar '13

04 Mar '13

Module: website Branch: master Commit: b94f771ab046f16ac8604f063ad8861c1dae1ec7 URL: http://source.winehq.org/git/website.git/?a=commit;h=b94f771ab046f16ac8604f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 2 14:07:21 2013 +0100 Wine 1.5.25 freigegeben --- news/de/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013030101.xml b/news/de/2013030101.xml new file mode 100644 index 0000000..c670390 --- /dev/null +++ b/news/de/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. März 2013</date> +<title>Wine 1.5.25 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.25 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.25">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Richtige Cursor Unterstützung im Mac Treiber.</li> + <li>Fehlerbehebungen für die Unterstützung bidirektionaler Schrift in RichEdit.</li> + <li>Anfängliche Version einer Wingdings Schrift.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.25
by Jeremy Newman 04 Mar '13

04 Mar '13

Module: website Branch: master Commit: a81716c434d0cc784d2041cff31cdcad5ccd5dc0 URL: http://source.winehq.org/git/website.git/?a=commit;h=a81716c434d0cc784d2041… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Mar 2 15:54:47 2013 +0100 Polish translation for release 1.5.25 --- news/pl/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2013030101.xml b/news/pl/2013030101.xml new file mode 100644 index 0000000..3d6aaa2 --- /dev/null +++ b/news/pl/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>Marzec 1, 2013</date> +<title>Wydano Wine 1.5.25</title> +<body> + Wydanie rozwojowe Wine 1.5.25 jest już dostępne. + <a href="{$root}/announce/1.5.25">Co nowego</a> w tym wydaniu: +<ul> + <li>Właściwe wsparcie dla kursora w sterowniku Mac.</li> + <li>Poprawki we wsparciu od-prawej-do-lewej w RichEdit.</li> + <li>Początkowa wersja czcionki Wingdings.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.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.5.25
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: website Branch: master Commit: e54216454ad3e9ba64b85170a3637b5bd624930d URL: http://source.winehq.org/git/website.git/?a=commit;h=e54216454ad3e9ba64b851… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 21:50:05 2013 +0100 Wine release 1.5.25 --- news/en/2013030101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013030101.xml b/news/en/2013030101.xml new file mode 100644 index 0000000..e5387bb --- /dev/null +++ b/news/en/2013030101.xml @@ -0,0 +1,15 @@ +<news> +<date>March 1, 2013</date> +<title>Wine 1.5.25 Released</title> +<body> + The Wine development release 1.5.25 is now available. + <a href="{$root}/announce/1.5.25">What's new</a> in this release: +<ul> + <li>Proper cursor support in the Mac driver.</li> + <li>Fixes for right-to-left support in RichEdit.</li> + <li>Initial version of a Wingdings font.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.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.5.25.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: ac9ca974e364cd0dcfa006bed8acfd896144a6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9ca974e364cd0dcfa006bed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 21:40:05 2013 +0100 Release 1.5.25. --- ANNOUNCE | 655 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 341 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9ca974e364cd0dcfa00…

1 0

Tag wine-1.5.25 : Alexandre Julliard : Release 1.5.25
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: refs/tags/wine-1.5.25 Tag: 8e9e95f3248270f1eddc2e6e6da061f3d378e5e8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8e9e95f3248270f1eddc2e6e6da0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 21:40:05 2013 +0100 Release 1.5.25

1 0

Jacek Caban : wininet: Renamed useSSL to secure and set it after secure connection is established .
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: c6ee6d6c9e1e200ed5155570dd368d9ca10ac7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ee6d6c9e1e200ed5155570d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:15:53 2013 +0100 wininet: Renamed useSSL to secure and set it after secure connection is established. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 861288d..468fee6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1968,7 +1968,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Flags |= IDSI_FLAG_KEEP_ALIVE; if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; - if (req->netconn->useSSL) + if (req->netconn->secure) info->Flags |= IDSI_FLAG_SECURE; return ERROR_SUCCESS; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6d08db1..582599d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -89,7 +89,7 @@ BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct { - BOOL useSSL; + BOOL secure; int socketFD; void *ssl_s; server_t *server; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4869d60..dc47f2c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -848,6 +848,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) } connection->ssl_s = ssl_s; + connection->secure = TRUE; bits = NETCON_GetCipherStrength(connection); if (bits >= 128) @@ -879,21 +880,20 @@ fail: DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { DWORD res = ERROR_NOT_SUPPORTED; -#ifdef SONAME_LIBSSL + /* can't connect if we are already connected */ - if (connection->ssl_s) - { + if(connection->secure) { ERR("already connected\n"); return ERROR_INTERNET_CANNOT_CONNECT; } - connection->useSSL = TRUE; if(server != connection->server) { server_release(connection->server); server_addref(server); connection->server = server; } +#ifdef SONAME_LIBSSL /* connect with given TLS options */ res = netcon_secure_connect_setup(connection, get_tls_option()); if (res == ERROR_SUCCESS) @@ -926,7 +926,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) { - if (!connection->useSSL) + if(!connection->secure) { *sent = send(connection->socketFD, msg, len, flags); if (*sent == -1) @@ -958,13 +958,13 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, - int *recvd /* out */) +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd) { *recvd = 0; if (!len) return ERROR_SUCCESS; - if (!connection->useSSL) + + if (!connection->secure) { *recvd = recv(connection->socketFD, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; @@ -1000,7 +1000,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { *available = 0; - if (!connection->useSSL) + if(!connection->secure) { #ifdef FIONREAD int unread;

1 0

Jacek Caban : wininet: Renamed socketFD to socket.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: febbb85528a27be1da825537635fa11a5531e7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=febbb85528a27be1da8255376… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:16:17 2013 +0100 wininet: Renamed socketFD to socket. --- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 582599d..2dc1c6c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -89,8 +89,8 @@ BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct { + int socket; BOOL secure; - int socketFD; void *ssl_s; server_t *server; DWORD security_flags; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index dc47f2c..e423830 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -610,39 +610,39 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t int result, flag; assert(server->addr_len); - result = netconn->socketFD = socket(server->addr.ss_family, SOCK_STREAM, 0); + result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { flag = 1; - ioctlsocket(netconn->socketFD, FIONBIO, &flag); - result = connect(netconn->socketFD, (struct sockaddr*)&server->addr, server->addr_len); + ioctlsocket(netconn->socket, FIONBIO, &flag); + result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { if (sock_get_error(errno) == WSAEINPROGRESS) { struct pollfd pfd; int res; - pfd.fd = netconn->socketFD; + pfd.fd = netconn->socket; pfd.events = POLLOUT; res = poll(&pfd, 1, timeout); if (!res) { - closesocket(netconn->socketFD); + closesocket(netconn->socket); return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) { int err; socklen_t len = sizeof(err); - if (!getsockopt(netconn->socketFD, SOL_SOCKET, SO_ERROR, &err, &len) && !err) + if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, &err, &len) && !err) result = 0; } } } if(result == -1) - closesocket(netconn->socketFD); + closesocket(netconn->socket); else { flag = 0; - ioctlsocket(netconn->socketFD, FIONBIO, &flag); + ioctlsocket(netconn->socket, FIONBIO, &flag); } } if(result == -1) @@ -650,7 +650,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t #ifdef TCP_NODELAY flag = 1; - result = setsockopt(netconn->socketFD, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); + result = setsockopt(netconn->socket, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); if(result < 0) WARN("setsockopt(TCP_NODELAY) failed\n"); #endif @@ -681,7 +681,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(!netconn) return ERROR_OUTOFMEMORY; - netconn->socketFD = -1; + netconn->socket = -1; netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; list_init(&netconn->pool_entry); @@ -709,7 +709,7 @@ void free_netconn(netconn_t *netconn) } #endif - closesocket(netconn->socketFD); + closesocket(netconn->socket); heap_free(netconn); } @@ -823,7 +823,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) } pSSL_set_options(ssl_s, tls_option); - if (!pSSL_set_fd(ssl_s, connection->socketFD)) + if (!pSSL_set_fd(ssl_s, connection->socket)) { ERR("SSL_set_fd failed: %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -904,7 +904,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) /* fallback to connect without TLSv1.1/TLSv1.2 */ if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) { - closesocket(connection->socketFD); + closesocket(connection->socket); pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); res = create_netconn_socket(connection->server, connection, 500); if (res != ERROR_SUCCESS) @@ -928,7 +928,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, { if(!connection->secure) { - *sent = send(connection->socketFD, msg, len, flags); + *sent = send(connection->socket, msg, len, flags); if (*sent == -1) return sock_get_error(errno); return ERROR_SUCCESS; @@ -966,7 +966,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int * if (!connection->secure) { - *recvd = recv(connection->socketFD, buf, len, flags); + *recvd = recv(connection->socket, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -1004,7 +1004,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { #ifdef FIONREAD int unread; - int retval = ioctlsocket(connection->socketFD, FIONREAD, &unread); + int retval = ioctlsocket(connection->socket, FIONREAD, &unread); if (!retval) { TRACE("%d bytes of queued, but unread data\n", unread); @@ -1030,7 +1030,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) ssize_t len; BYTE b; - len = recv(netconn->socketFD, &b, 1, MSG_PEEK|MSG_DONTWAIT); + len = recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && errno == EWOULDBLOCK); #elif defined(__MINGW32__) || defined(_MSC_VER) ULONG mode; @@ -1038,13 +1038,13 @@ BOOL NETCON_is_alive(netconn_t *netconn) char b; mode = 1; - if(!ioctlsocket(netconn->socketFD, FIONBIO, &mode)) + if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; - len = recv(netconn->socketFD, &b, 1, MSG_PEEK); + len = recv(netconn->socket, &b, 1, MSG_PEEK); mode = 0; - if(!ioctlsocket(netconn->socketFD, FIONBIO, &mode)) + if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; return len == 1 || (len == -1 && errno == WSAEWOULDBLOCK); @@ -1111,7 +1111,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) tv.tv_sec = value / 1000; tv.tv_usec = (value % 1000) * 1000; } - result = setsockopt(connection->socketFD, SOL_SOCKET, + result = setsockopt(connection->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv)); if (result == -1)

1 0

Jacek Caban : ieframe: Fixed tests on IE10.
by Alexandre Julliard 01 Mar '13

01 Mar '13

Module: wine Branch: master Commit: 5068bdb6748534c2b7ccd7a8763643021cbf762e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5068bdb6748534c2b7ccd7a87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 11:40:07 2013 +0100 ieframe: Fixed tests on IE10. --- dlls/ieframe/tests/webbrowser.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 43f761b..39bc21d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -446,6 +446,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 69: /* TODO */ case 101: /* TODO (IE8) */ case 109: /* TODO (IE9) */ + case 113: /* TODO (IE10) */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -453,6 +454,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 105: /* TODO */ + case 134: /* TODO (IE10) */ + case 136: /* TODO (IE10) */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ @@ -950,6 +953,9 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe CHECK_EXPECT2(Invoke_282); break; + case 290: /* FIXME: IE10 */ + break; + default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); }

1 0