wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Frédéric Delanoy : French translation for release 2.0
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 04621239572e8db9744fa9b51ee212f3a3319eae URL: http://source.winehq.org/git/website.git/?a=commit;h=04621239572e8db9744fa9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 18:56:46 2017 +0200 French translation for release 2.0 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017012401.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2017012401.xml b/news/fr/2017012401.xml new file mode 100644 index 0000000..536020a --- /dev/null +++ b/news/fr/2017012401.xml @@ -0,0 +1,11 @@ +<news> +<date>24 janvier 2017</date> +<title>Sortie de Wine 2.0</title> +<body> +L'équipe de Wine est fière d'annoncer la disponibilité de la version stable 2.0 de Wine. +Cette version représente plus d'un an d'efforts de développement et environ 6600 changements individuels. Les points forts principaux sont la prise en charge de Microsoft Office 2013 et la prise en charge du mode 64 bits sous macOS. +Elle comprend également quantité d'améliorations dans tous les domaines, ainsi que la prise en charge de nombreuses nouvelles applications et jeux. Voyez les <a href="{$root}/announce/2.0">notes de version</a> pour un résumé des changements principaux. +C'est la première version réalisée sur base du nouveau programme de livraisons annuelles. Cela +implique que certaines fonctionnalités en cours de développement mais qui n'ont pas pu être terminées à temps ont été reportées au cycle de développement suivant. Ceci inclut en particulier le flux de commandes Direct3D, la prise en charge complète du HID, le pilote graphique Android et les tubes en mode message. +Le <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.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

Frédéric Delanoy : French translation for release 2.0-rc1
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: a6c1168692e0a51b831345238fad9c819e251ebc URL: http://source.winehq.org/git/website.git/?a=commit;h=a6c1168692e0a51b831345… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 18:56:45 2017 +0200 French translation for release 2.0-rc1 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016120901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/fr/2016120901.xml b/news/fr/2016120901.xml new file mode 100644 index 0000000..8a0ca59 --- /dev/null +++ b/news/fr/2016120901.xml @@ -0,0 +1,17 @@ +<news> +<date>9 décembre 2016</date> +<title>Sortie de Wine 2.0-rc1</title> +<body> +La version de développement 2.0-rc1 de Wine est disponible. +<a href="{$root}/announce/2.0-rc1">Nouveautés</a> de cette version : + C'est la première version candidate du prochain Wine 2.0. Elle marque le début de la période de +gel du code. Merci de tester adéquatement cette version afin que la version 2.0 soit la meilleure possible. +<ul> + <li>Mise à jour corrective du moteur Mono.</li> + <li>Prise en charge de la résolution de noms IDN.</li> + <li>Nombreuses opérations Shader Model 5 supplémentaires.</li> + <li>Toujours plus de correctifs dans les tests de régression.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc1.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

Frédéric Delanoy : French translation for release 1.9.24
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 950a9a44e04cb88b9a050cec980da79dafdd4023 URL: http://source.winehq.org/git/website.git/?a=commit;h=950a9a44e04cb88b9a050c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 18:56:44 2017 +0200 French translation for release 1.9.24 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016112501.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2016112501.xml b/news/fr/2016112501.xml new file mode 100644 index 0000000..5a3f2f3 --- /dev/null +++ b/news/fr/2016112501.xml @@ -0,0 +1,14 @@ +<news> +<date>25 novembre 2016</date> +<title>Sortie de Wine 1.9.24</title> +<body> +La version de développement 1.9.24 de Wine est disponible. +<a href="{$root}/announce/1.9.24">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des vues d'accès non ordonnés dans Direct3D.</li> + <li>Nombreux correctifs dans les tests de régression.</li> + <li>Quelques améliorations supplémentaires dans la prise en charge du HID.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.24.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

Frédéric Delanoy : French translation for release 1.9.23
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 62556f90517d3e7e9a2f99d4c9ac2e799901edf1 URL: http://source.winehq.org/git/website.git/?a=commit;h=62556f90517d3e7e9a2f99… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 18:56:43 2017 +0200 French translation for release 1.9.23 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016111101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016111101.xml b/news/fr/2016111101.xml new file mode 100644 index 0000000..6ca8863 --- /dev/null +++ b/news/fr/2016111101.xml @@ -0,0 +1,15 @@ +<news> +<date>11 novembre 2016</date> +<title>Sortie de Wine 1.9.23</title> +<body> +La version de développement 1.9.23 de Wine est disponible. +<a href="{$root}/announce/1.9.23">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du bus HID sous macOS.</li> + <li>Prise en charge des polices de couleur dans Direct2D.</li> + <li>Formats de couleurs supplémentaires dans Direct3D.</li> + <li>Correctifs de désinstallation dans MSI.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.23.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

Frédéric Delanoy : French translation for release 1.9.22
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 57afce7bed96875b05fdb947e9716012de7f8f39 URL: http://source.winehq.org/git/website.git/?a=commit;h=57afce7bed96875b05fdb9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 18:56:42 2017 +0200 French translation for release 1.9.22 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016102801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016102801.xml b/news/fr/2016102801.xml new file mode 100644 index 0000000..050c960 --- /dev/null +++ b/news/fr/2016102801.xml @@ -0,0 +1,15 @@ +<news> +<date>28 octobre 2016</date> +<title>Sortie de Wine 1.9.22</title> +<body> +La version de développement 1.9.22 de Wine est disponible. +<a href="{$root}/announce/1.9.22">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du presse-papiers macOS adaptée à la nouvelle conception.</li> + <li>Implémentation initiale du rendu d'images matricielles dans Direct2D.</li> + <li>Poursuite de l'implémentation de WebServices.</li> + <li>Quelques étapes supplémentaires en vue de la prise en charge du HID.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.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

Frédéric Delanoy : French translation for releases 1.8.{6, 7}
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 8a928d455747c77859de04d3f0d87509e4e4074a URL: http://source.winehq.org/git/website.git/?a=commit;h=8a928d455747c77859de04… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 18:56:47 2017 +0200 French translation for releases 1.8.{6,7} Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016121901.xml | 13 +++++++++++++ news/fr/2017022801.xml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/news/fr/2016121901.xml b/news/fr/2016121901.xml new file mode 100644 index 0000000..18e5be9 --- /dev/null +++ b/news/fr/2016121901.xml @@ -0,0 +1,13 @@ +<news> +<date>19 décembre 2016</date> +<title>Sortie de Wine 1.8.6</title> +<body> + La version de maintenance 1.8.6 de Wine est disponible. + <a href="{$root}/announce/1.8.6">Nouveautés</a> de cette version : +<ul> + <li>Correction d'une régression introduite dans la version 1.8.5 (#41627)</li> + <li>Quelques cartes supplémentaires ajoutées dans la table de description de GPU.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.6.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> diff --git a/news/fr/2017022801.xml b/news/fr/2017022801.xml new file mode 100644 index 0000000..844b880 --- /dev/null +++ b/news/fr/2017022801.xml @@ -0,0 +1,13 @@ +<news> +<date>28 février 2017</date> +<title>Sortie de Wine 1.8.7</title> +<body> + La version de maintenance 1.8.7 de Wine est disponible. + <a href="{$root}/announce/1.8.7">Nouveautés</a> de cette version : +<ul> + <li>Quelques cartes supplémentaires ajoutées dans la table de description de GPU.</li> + <li>Mises à jour de la traduction turque.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.7.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

Jacek Caban : ws2_32: Use register_async for WS2_async_send.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 35ca862025fa14065d4ebed761783de225cb6690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ca862025fa14065d4ebed76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 13:38:17 2017 +0200 ws2_32: Use register_async for WS2_async_send. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2a957ce..22ff479 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3592,19 +3592,8 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->iovec[0].iov_base = sendBuf; wsa->iovec[0].iov_len = sendBufLen; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_WRITE; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_send ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.event = wine_server_obj_handle( ov->hEvent ); - req->async.cvalue = cvalue; - status = wine_server_call( req ); - } - SERVER_END_REQ; - + status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, WS2_async_send, wsa, ov->hEvent, + NULL, (void *)cvalue, iosb ); if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); /* If the connect already failed */ @@ -5609,18 +5598,12 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->u.Status = STATUS_PENDING; iosb->Information = n == -1 ? 0 : n; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_WRITE; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_send ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.event = wine_server_obj_handle( lpCompletionRoutine ? 0 : lpOverlapped->hEvent ); - req->async.cvalue = cvalue; - err = wine_server_call( req ); - } - SERVER_END_REQ; + if (wsa->completion_func) + err = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, WS2_async_send, wsa, NULL, + ws2_async_apc, wsa, iosb ); + else + err = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, WS2_async_send, wsa, lpOverlapped->hEvent, + NULL, (void *)cvalue, iosb ); /* Enable the event only after starting the async. The server will deliver it as soon as the async is done. */

1 0

Jacek Caban : ws2_32: Use register_async for WS2_async_recv.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 57e93b72bb620306731ad44f5a2c9f88d913dd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e93b72bb620306731ad44f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 13:38:03 2017 +0200 ws2_32: Use register_async for WS2_async_recv. This changes behaviour in case when winsock attempts to use both completion routine and completion value. Tests from previous patch show that it should fail anyway. It will be possible to properly return error once APCs are passed to server in register_async request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 702d281..2a957ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7792,18 +7792,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->u.Status = STATUS_PENDING; iosb->Information = 0; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_recv ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.event = wine_server_obj_handle( lpCompletionRoutine ? 0 : lpOverlapped->hEvent ); - req->async.cvalue = cvalue; - err = wine_server_call( req ); - } - SERVER_END_REQ; + if (wsa->completion_func) + err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, NULL, + ws2_async_apc, wsa, iosb ); + else + err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, lpOverlapped->hEvent, + NULL, (void *)cvalue, iosb ); if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); SetLastError(NtStatusToWSAError( err ));

1 0

Jacek Caban : ws2_32/tests: Added WSARecv tests using completion function.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: b9f6f3896a128cca1f396713216bdce03e79cc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f6f3896a128cca1f3967132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 14:03:17 2017 +0200 ws2_32/tests: Added WSARecv tests using completion function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c77f43b..023eb42 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6656,6 +6656,13 @@ static DWORD WINAPI recv_thread(LPVOID arg) return 0; } +static int completion_called; + +static void WINAPI io_completion(DWORD error, DWORD transferred, WSAOVERLAPPED *overlapped, DWORD flags) +{ + completion_called++; +} + static void test_WSARecv(void) { SOCKET src, dest, server = INVALID_SOCKET; @@ -6668,7 +6675,7 @@ static void test_WSARecv(void) int iret, len; DWORD dwret; BOOL bret; - HANDLE thread; + HANDLE thread, event = NULL, io_port; tcp_socketpair(&src, &dest); if (src == INVALID_SOCKET || dest == INVALID_SOCKET) @@ -6732,9 +6739,9 @@ static void test_WSARecv(void) ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs[0].len = sizeof(buf); - ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + ov.hEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); - if (!ov.hEvent) + if (!event) goto end; ling.l_onoff = 1; @@ -6795,6 +6802,34 @@ static void test_WSARecv(void) WaitForSingleObject(thread, 3000); CloseHandle(thread); + memset(&ov, 0, sizeof(ov)); + ov.hEvent = event; + ResetEvent(event); + iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); + ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); + send(src, "test message", sizeof("test message"), 0); + + completion_called = 0; + dwret = SleepEx(1000, TRUE); + ok(dwret == WAIT_IO_COMPLETION, "got %u\n", dwret); + ok(completion_called == 1, "completion not called\n"); + + dwret = WaitForSingleObject(event, 1); + ok(dwret == WAIT_TIMEOUT, "got %u\n", dwret); + + io_port = CreateIoCompletionPort( (HANDLE)dest, NULL, 0, 0 ); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + /* Using completion function on socket associated with completion port is not allowed. */ + memset(&ov, 0, sizeof(ov)); + completion_called = 0; + iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); + todo_wine + ok(iret == SOCKET_ERROR && GetLastError() == WSAEINVAL, "WSARecv failed - %d error %d\n", iret, GetLastError()); + ok(!completion_called, "completion called\n"); + + CloseHandle(io_port); + end: if (server != INVALID_SOCKET) closesocket(server); @@ -6802,8 +6837,8 @@ end: closesocket(dest); if (src != INVALID_SOCKET) closesocket(src); - if (ov.hEvent) - WSACloseEvent(ov.hEvent); + if (event) + WSACloseEvent(event); } #define POLL_CLEAR() ix = 0

1 0

Jacek Caban : ws2_32: Added register_async helper.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: da4688ff4fb77a694cc4e21251fa8e57c07185b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da4688ff4fb77a694cc4e2125… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 13:37:01 2017 +0200 ws2_32: Added register_async helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 77 ++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d13fbf4..702d281 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -560,6 +560,29 @@ static struct ws2_async_io *alloc_async_io( DWORD size ) return HeapAlloc( GetProcessHeap(), 0, size ); } +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ); + +static NTSTATUS register_async( int type, HANDLE handle, async_callback_t callback, void *arg, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) +{ + NTSTATUS status; + + SERVER_START_REQ( register_async ) + { + req->type = type; + req->async.handle = wine_server_obj_handle( handle ); + req->async.callback = wine_server_client_ptr( callback ); + req->async.iosb = wine_server_client_ptr( io ); + req->async.arg = wine_server_client_ptr( arg ); + req->async.event = wine_server_obj_handle( event ); + req->async.cvalue = wine_server_client_ptr( apc ? 0 : apc_context ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + + return status; +} + /****************************************************************/ /* ----------------------------------- internal data */ @@ -2500,17 +2523,8 @@ static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, if (!wsa->read) goto finish; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->async.handle = wine_server_obj_handle( wsa->accept_socket ); - req->async.event = wine_server_obj_handle( wsa->user_overlapped->hEvent ); - req->async.callback = wine_server_client_ptr( WS2_async_accept_recv ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - status = wine_server_call( req ); - } - SERVER_END_REQ; + status = register_async( ASYNC_TYPE_READ, wsa->accept_socket, WS2_async_accept_recv, wsa, + wsa->user_overlapped->hEvent, NULL, NULL, iosb); if (status != STATUS_PENDING) goto finish; @@ -2709,18 +2723,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) wsa->hSocket = SOCKET2HANDLE(s); wsa->type = type; - SERVER_START_REQ( register_async ) - { - req->type = type; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_shutdown ); - req->async.iosb = wine_server_client_ptr( &wsa->iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.cvalue = 0; - status = wine_server_call( req ); - } - SERVER_END_REQ; - + status = register_async( type, wsa->hSocket, WS2_async_shutdown, wsa, 0, NULL, NULL, &wsa->iosb ); if (status != STATUS_PENDING) { HeapFree( GetProcessHeap(), 0, wsa ); @@ -2869,18 +2872,8 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW wsa->read->iovec[0].iov_len = wsa->data_len; } - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->async.handle = wine_server_obj_handle( SOCKET2HANDLE(listener) ); - req->async.event = wine_server_obj_handle( overlapped->hEvent ); - req->async.callback = wine_server_client_ptr( WS2_async_accept ); - req->async.iosb = wine_server_client_ptr( overlapped ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.cvalue = wsa->cvalue; - status = wine_server_call( req ); - } - SERVER_END_REQ; + status = register_async( ASYNC_TYPE_READ, SOCKET2HANDLE(listener), WS2_async_accept, wsa, + overlapped->hEvent, NULL, (void *)wsa->cvalue, (IO_STATUS_BLOCK *)overlapped ); if(status != STATUS_PENDING) { @@ -3143,18 +3136,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD wsa->offset.u.HighPart = overlapped->u.s.OffsetHigh; iosb->u.Status = STATUS_PENDING; iosb->Information = 0; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_WRITE; - req->async.handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->async.event = wine_server_obj_handle( overlapped->hEvent ); - req->async.callback = wine_server_client_ptr( WS2_async_transmitfile ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - status = wine_server_call( req ); - } - SERVER_END_REQ; - + status = register_async( ASYNC_TYPE_WRITE, SOCKET2HANDLE(s), WS2_async_transmitfile, wsa, + overlapped->hEvent, NULL, NULL, iosb ); if(status != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WSASetLastError( NtStatusToWSAError(status) );

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
76
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 April 2017