June 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : msctf: Add ITextStoreACPServices::CreateRange().
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: 759ecd6e593280b7dd0b84b4ab367be6f217888b URL: https://source.winehq.org/git/wine.git/?a=commit;h=759ecd6e593280b7dd0b84b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 17:08:51 2021 +0300 msctf: Add ITextStoreACPServices::CreateRange(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 4 ++-- dlls/msctf/tests/inputprocessor.c | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 9eb61efa411..e901cbcbee4 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -1022,9 +1022,9 @@ static HRESULT WINAPI TextStoreACPServices_CreateRange(ITextStoreACPServices *if { Context *This = impl_from_ITextStoreACPServices(iface); - FIXME("stub: %p %d %d %p\n", This, start, end, range); + TRACE("%p, %d, %d, %p.\n", This, start, end, range); - return S_OK; + return Range_Constructor(&This->ITfContext_iface, start, end, (ITfRange **)range); } static const ITextStoreACPServicesVtbl TextStoreACPServicesVtbl = diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 24362e9ef0a..67d1db1dbfb 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -249,13 +249,11 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, range = NULL; hr = ITextStoreACPServices_CreateRange(services, 0, 1, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (range) - { - hr = ITfRangeACP_GetContext(range, &context); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ITfContext_Release(context); - ITfRangeACP_Release(range); - } + + hr = ITfRangeACP_GetContext(range, &context); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ITfContext_Release(context); + ITfRangeACP_Release(range); ITextStoreACPServices_Release(services);

1 0

Nikolay Sivov : msctf: Maintain context reference in ranges.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: fa4c386e06fcaceb7538e2f438f32085a37b9297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa4c386e06fcaceb7538e2f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 17:08:48 2021 +0300 msctf: Maintain context reference in ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/range.c | 19 +++++++++++++------ dlls/msctf/tests/inputprocessor.c | 26 +++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index c4eee2501fb..85922791bad 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -42,7 +42,7 @@ typedef struct tagRange { LONG refCount; ITextStoreACP *pITextStoreACP; - ITfContext *pITfContext; + ITfContext *context; DWORD lockType; TfGravity gravityStart, gravityEnd; @@ -58,6 +58,7 @@ static inline Range *impl_from_ITfRange(ITfRange *iface) static void Range_Destructor(Range *This) { TRACE("destroying %p\n", This); + ITfContext_Release(This->context); HeapFree(GetProcessHeap(),0,This); } @@ -282,13 +283,18 @@ static HRESULT WINAPI Range_Clone(ITfRange *iface, ITfRange **ppClone) return E_NOTIMPL; } -static HRESULT WINAPI Range_GetContext(ITfRange *iface, ITfContext **ppContext) +static HRESULT WINAPI Range_GetContext(ITfRange *iface, ITfContext **context) { Range *This = impl_from_ITfRange(iface); - TRACE("(%p)\n",This); - if (!ppContext) + + TRACE("(%p, %p)\n", This, context); + + if (!context) return E_INVALIDARG; - *ppContext = This->pITfContext; + + *context = This->context; + ITfContext_AddRef(*context); + return S_OK; } @@ -334,7 +340,8 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l This->ITfRange_iface.lpVtbl = &Range_RangeVtbl; This->refCount = 1; - This->pITfContext = context; + This->context = context; + ITfContext_AddRef(This->context); This->pITextStoreACP = textstore; This->lockType = lockType; This->anchorStart = anchorStart; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 55a6ab6c34c..fd03059e545 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -228,6 +228,8 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { ITextStoreACPServices *services; + ITfRangeACP *range; + ITfContext *context; HRESULT hr; if (winetest_debug > 1) trace("ITextStoreACP::AdviseSink(iid %s, mask %#x)\n", @@ -243,6 +245,18 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, hr = ITextStoreACPSink_QueryInterface(ACPSink, &IID_ITextStoreACPServices, (void**)&services); ok(hr == S_OK, "got 0x%08x\n", hr); + + range = NULL; + hr = ITextStoreACPServices_CreateRange(services, 0, 1, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (range) + { + hr = ITfRangeACP_GetContext(range, &context); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ITfContext_Release(context); + ITfRangeACP_Release(range); + } + ITextStoreACPServices_Release(services); return S_OK; @@ -2084,10 +2098,11 @@ static void test_InsertAtSelection(TfEditCookie ec, ITfContext *cxt) static HRESULT WINAPI EditSession_DoEditSession(ITfEditSession *iface, TfEditCookie ec) { - ITfContext *cxt; + ITfContext *cxt, *context2; ITfDocumentMgr *dm; ITfRange *range; TF_SELECTION selection; + IUnknown *unk; ULONG fetched; HRESULT hr; @@ -2109,6 +2124,15 @@ TfEditCookie ec) ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); ok(range != NULL,"Range set to NULL\n"); + hr = ITfRange_GetContext(range, &context2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(context2 == cxt, "Unexpected context pointer.\n"); + ITfContext_Release(context2); + + hr = ITfRange_QueryInterface(range, &IID_ITfRangeACP, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ITfRange_Release(range); hr = ITfContext_GetEnd(cxt,ec,NULL);

1 0

Nikolay Sivov : mfmediaengine: Enable source type enumeration.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: 86cbfafe9280e3f264d74d7d91b0929a1f82a1a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86cbfafe9280e3f264d74d7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 13:34:44 2021 +0300 mfmediaengine: Enable source type enumeration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 510b1c5885f..e4263febe5e 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1161,6 +1161,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFTopologyNode_Release(video_src); } + IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE); + if (SUCCEEDED(hr)) hr = IMFMediaSession_SetTopology(engine->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); }

1 0

Nikolay Sivov : msctf/range: Update to ITfRangeACP.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: 2952219e835730923747c2a6949eb9779299876a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2952219e835730923747c2a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 17:08:50 2021 +0300 msctf/range: Update to ITfRangeACP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/range.c | 190 +++++++++++++++++++------------------- dlls/msctf/tests/inputprocessor.c | 2 +- 2 files changed, 96 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2952219e835730923747…

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_FIONBIO.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: bd2e5ff9399982ab7d57612a71107055b64097a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2e5ff9399982ab7d57612a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 10:30:15 2021 -0500 server: Introduce IOCTL_AFD_WINE_FIONBIO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 4 ++-- server/sock.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 8199e0e2dbe..5074c1f20dd 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -95,8 +95,8 @@ struct afd_poll_params #define IOCTL_AFD_WINE_RECVMSG CTL_CODE(FILE_DEVICE_NETWORK, 205, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SENDMSG CTL_CODE(FILE_DEVICE_NETWORK, 206, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_TRANSMIT CTL_CODE(FILE_DEVICE_NETWORK, 207, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 208, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index e521818dc4b..45390127acc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1892,6 +1892,27 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_PENDING ); return 1; + case IOCTL_AFD_WINE_FIONBIO: + if (get_req_data_size() < sizeof(int)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + if (*(int *)get_req_data()) + { + sock->state |= FD_WINE_NONBLOCKING; + } + else + { + if (sock->mask) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + sock->state &= ~FD_WINE_NONBLOCKING; + } + return 1; + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Piotr Caban : msvcrt: Use __scalbn helper in ldexp implementation.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: 85da8da3d381b85e696e8df681bdf2a934d93cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=85da8da3d381b85e696e8df6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 2 17:53:29 2021 +0200 msvcrt: Use __scalbn helper in ldexp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 +--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0bace98cd7d..3318f128159 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3472,14 +3472,12 @@ int * CDECL __fpecode(void) */ double CDECL ldexp(double num, int exp) { - double z = unix_funcs->ldexp(num,exp); + double z = __scalbn(num, exp); if (isfinite(num) && !isfinite(z)) return math_error(_OVERFLOW, "ldexp", num, exp, z); if (num && isfinite(num) && !z) return math_error(_UNDERFLOW, "ldexp", num, exp, z); - if (z == 0 && signbit(z)) - z = 0.0; /* Convert -0 -> +0 */ return z; } diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index d92203c1ab7..9afa0f41557 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -138,14 +138,6 @@ static float CDECL unix_hypotf(float x, float y) return hypotf( x, y ); } -/********************************************************************* - * ldexp - */ -static double CDECL unix_ldexp(double num, int exp) -{ - return ldexp( num, exp ); -} - /********************************************************************* * lgamma */ @@ -306,7 +298,6 @@ static const struct unix_funcs funcs = unix_frexpf, unix_hypot, unix_hypotf, - unix_ldexp, unix_lgamma, unix_lgammaf, unix_log, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a01ce285106..2faebbac82f 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -33,7 +33,6 @@ struct unix_funcs float (CDECL *frexpf)(float x, int *exp); double (CDECL *hypot)(double x, double y); float (CDECL *hypotf)(float x, float y); - double (CDECL *ldexp)(double x, int exp); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); double (CDECL *log)(double x);

1 0

Esme Povirk : mscoree: Update Wine Mono to 6.2.0.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: 605a9120775e9599fa340008af91c3be0edbc776 URL: https://source.winehq.org/git/wine.git/?a=commit;h=605a9120775e9599fa340008… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 2 11:00:18 2021 -0500 mscoree: Update Wine Mono to 6.2.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e3004c972f1..28c30197ebb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.1.1" +#define MONO_VERSION "6.2.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b" +#define MONO_SHA "cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index e396d855e71..910cc40ccb0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.1.1" +#define WINE_MONO_VERSION "6.2.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_FIONBIO.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: a70c5172c6bb0e61ad24c202a9bf4e88b8c868b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a70c5172c6bb0e61ad24c202… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 10:30:16 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_FIONBIO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 89 +++++++++++++----------------------------------- dlls/ws2_32/tests/sock.c | 17 ++++----- 2 files changed, 30 insertions(+), 76 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c1f415444df..0fc13344ee2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -798,35 +798,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static void _enable_event( HANDLE s, unsigned int event, - unsigned int sstate, unsigned int cstate ) -{ - SERVER_START_REQ( enable_socket_event ) - { - req->handle = wine_server_obj_handle( s ); - req->mask = event; - req->sstate = sstate; - req->cstate = cstate; - wine_server_call( req ); - } - SERVER_END_REQ; -} - -static unsigned int _get_sock_mask(SOCKET s) -{ - unsigned int ret; - SERVER_START_REQ( get_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->service = FALSE; - req->c_event = 0; - wine_server_call( req ); - ret = reply->mask; - } - SERVER_END_REQ; - return ret; -} - static void _get_sock_errors(SOCKET s, int *events) { SERVER_START_REQ( get_socket_event ) @@ -3371,23 +3342,20 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID switch (code) { case WS_FIONBIO: - if (in_size != sizeof(WS_u_long) || IS_INTRESOURCE(in_buff)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - TRACE("-> FIONBIO (%x)\n", *(WS_u_long*)in_buff); - if (_get_sock_mask(s)) + { + DWORD ret; + + if (IS_INTRESOURCE( in_buff )) { - /* AsyncSelect()'ed sockets are always nonblocking */ - if (!*(WS_u_long *)in_buff) status = WSAEINVAL; - break; + SetLastError( WSAEFAULT ); + return -1; } - if (*(WS_u_long *)in_buff) - _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); - else - _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); - break; + + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_FIONBIO, in_buff, in_size, + out_buff, out_size, ret_size, overlapped, completion ); + SetLastError( ret ); + return ret ? -1 : 0; + } case WS_FIONREAD: { @@ -3684,34 +3652,23 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case 0x667e: /* Netscape tries hard to use bogus ioctl 0x667e */ SetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; + case WS_SIO_ADDRESS_LIST_CHANGE: - code = IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE; - status = WSAEOPNOTSUPP; - break; + { + DWORD ret; + + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE, in_buff, in_size, + out_buff, out_size, ret_size, overlapped, completion ); + SetLastError( ret ); + return ret ? -1 : 0; + } + default: + FIXME( "unimplemented ioctl %s\n", debugstr_wsaioctl( code ) ); status = WSAEOPNOTSUPP; break; } - if (status == WSAEOPNOTSUPP) - { - status = server_ioctl_sock(s, code, in_buff, in_size, out_buff, out_size, &total, - overlapped, completion); - if (status != WSAEOPNOTSUPP) - { - if (status == 0 || status == WSA_IO_PENDING || status == WSAEWOULDBLOCK) - TRACE("-> %s request\n", debugstr_wsaioctl(code)); - else - ERR("-> %s request failed with status 0x%x\n", debugstr_wsaioctl(code), status); - - /* overlapped and completion operations will be handled by the server */ - completion = NULL; - overlapped = NULL; - } - else - FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); - } - if (completion) { FIXME( "completion routine %p not supported\n", completion ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bf8d028611f..fe7f155a8d8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3931,11 +3931,11 @@ static void test_fionbio(void) WSASetLastError(0xdeadbeef); ret = WSAIoctl(s, FIONBIO, &one, sizeof(one), NULL, 0, &size, NULL, NULL); ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(!size, "got size %u\n", size); ret = WSAIoctl(s, FIONBIO, &one, sizeof(one) + 1, NULL, 0, &size, NULL, NULL); - todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!ret, "got error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; @@ -3984,14 +3984,11 @@ static void test_fionbio(void) ok(!size, "got size %u\n", size); ret = SleepEx(0, TRUE); - todo_wine ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); - if (ret == WAIT_IO_COMPLETION) - { - ok(apc_count == 1, "APC was called %u times\n", apc_count); - ok(!apc_error, "got APC error %u\n", apc_error); - ok(!apc_size, "got APC size %u\n", apc_size); - ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); - } + ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(!apc_error, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); closesocket(s); }

1 0

Zebediah Figura : server: Remove the no longer used enable_socket_event request.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: 810a9da9352ba83f3ed446590c248683286c9eed URL: https://source.winehq.org/git/wine.git/?a=commit;h=810a9da9352ba83f3ed44659… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 10:30:17 2021 -0500 server: Remove the no longer used enable_socket_event request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 20 +------------------- server/protocol.def | 8 -------- server/request.h | 7 ------- server/sock.c | 24 ------------------------ server/trace.c | 11 ----------- 5 files changed, 1 insertion(+), 69 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 83b6bdb3e22..fe1f5394a72 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1780,21 +1780,6 @@ struct get_socket_info_reply }; - -struct enable_socket_event_request -{ - struct request_header __header; - obj_handle_t handle; - unsigned int mask; - unsigned int sstate; - unsigned int cstate; - char __pad_28[4]; -}; -struct enable_socket_event_reply -{ - struct reply_header __header; -}; - struct set_socket_deferred_request { struct request_header __header; @@ -5521,7 +5506,6 @@ enum request REQ_set_socket_event, REQ_get_socket_event, REQ_get_socket_info, - REQ_enable_socket_event, REQ_set_socket_deferred, REQ_recv_socket, REQ_poll_socket, @@ -5805,7 +5789,6 @@ union generic_request struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; struct get_socket_info_request get_socket_info_request; - struct enable_socket_event_request enable_socket_event_request; struct set_socket_deferred_request set_socket_deferred_request; struct recv_socket_request recv_socket_request; struct poll_socket_request poll_socket_request; @@ -6087,7 +6070,6 @@ union generic_reply struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; struct get_socket_info_reply get_socket_info_reply; - struct enable_socket_event_reply enable_socket_event_reply; struct set_socket_deferred_reply set_socket_deferred_reply; struct recv_socket_reply recv_socket_reply; struct poll_socket_reply poll_socket_reply; @@ -6312,7 +6294,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 710 +#define SERVER_PROTOCOL_VERSION 711 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 8a68c9a5eb7..30624a7cbaf 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1456,14 +1456,6 @@ enum server_fd_type @END -/* Re-enable pending socket events */ -(a)REQ(enable_socket_event) - obj_handle_t handle; /* handle to the socket */ - unsigned int mask; /* events to re-enable */ - unsigned int sstate; /* status bits to set */ - unsigned int cstate; /* status bits to clear */ -(a)END - @REQ(set_socket_deferred) obj_handle_t handle; /* handle to the socket */ obj_handle_t deferred; /* handle to the socket for which accept() is deferred */ diff --git a/server/request.h b/server/request.h index ddf356c3e3f..a8d74f01f96 100644 --- a/server/request.h +++ b/server/request.h @@ -175,7 +175,6 @@ DECL_HANDLER(unlock_file); DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); -DECL_HANDLER(enable_socket_event); DECL_HANDLER(set_socket_deferred); DECL_HANDLER(recv_socket); DECL_HANDLER(poll_socket); @@ -458,7 +457,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, - (req_handler)req_enable_socket_event, (req_handler)req_set_socket_deferred, (req_handler)req_recv_socket, (req_handler)req_poll_socket, @@ -1062,11 +1060,6 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, family) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, type) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, protocol) == 16 ); C_ASSERT( sizeof(struct get_socket_info_reply) == 24 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, mask) == 16 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, sstate) == 20 ); -C_ASSERT( FIELD_OFFSET(struct enable_socket_event_request, cstate) == 24 ); -C_ASSERT( sizeof(struct enable_socket_event_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, deferred) == 16 ); C_ASSERT( sizeof(struct set_socket_deferred_request) == 24 ); diff --git a/server/sock.c b/server/sock.c index 45390127acc..700d4c0761a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2378,30 +2378,6 @@ DECL_HANDLER(get_socket_event) release_object( &sock->obj ); } -/* re-enable pending socket events */ -DECL_HANDLER(enable_socket_event) -{ - struct sock *sock; - - if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle, - FILE_WRITE_ATTRIBUTES, &sock_ops))) - return; - - if (get_unix_fd( sock->fd ) == -1) return; - - /* for event-based notification, windows erases stale events */ - sock->pending_events &= ~req->mask; - - sock->reported_events &= ~req->mask; - sock->state |= req->sstate; - sock->state &= ~req->cstate; - if (sock->type != WS_SOCK_STREAM) sock->state &= ~STREAM_FLAG_MASK; - - sock_reselect( sock ); - - release_object( &sock->obj ); -} - DECL_HANDLER(set_socket_deferred) { struct sock *sock, *acceptsock; diff --git a/server/trace.c b/server/trace.c index 8bfc9e56cc5..1c51bffe1aa 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2109,14 +2109,6 @@ static void dump_get_socket_info_reply( const struct get_socket_info_reply *req fprintf( stderr, ", protocol=%d", req->protocol ); } -static void dump_enable_socket_event_request( const struct enable_socket_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", mask=%08x", req->mask ); - fprintf( stderr, ", sstate=%08x", req->sstate ); - fprintf( stderr, ", cstate=%08x", req->cstate ); -} - static void dump_set_socket_deferred_request( const struct set_socket_deferred_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4610,7 +4602,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, - (dump_func)dump_enable_socket_event_request, (dump_func)dump_set_socket_deferred_request, (dump_func)dump_recv_socket_request, (dump_func)dump_poll_socket_request, @@ -4891,7 +4882,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, NULL, - NULL, (dump_func)dump_recv_socket_reply, (dump_func)dump_poll_socket_reply, (dump_func)dump_send_socket_reply, @@ -5170,7 +5160,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_socket_event", "get_socket_event", "get_socket_info", - "enable_socket_event", "set_socket_deferred", "recv_socket", "poll_socket",

1 0

Zebediah Figura : ntdll: Introduce IOCTL_WINE_AFD_COMPLETE_ASYNC.
by Alexandre Julliard June 2, 2021

June 2, 2021

Module: wine Branch: master Commit: be8bd6f498dadbafe068c1fbb02adcbadf0b1b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8bd6f498dadbafe068c1fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 2 10:30:18 2021 -0500 ntdll: Introduce IOCTL_WINE_AFD_COMPLETE_ASYNC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- dlls/ntdll/unix/socket.c | 21 +++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + include/wine/afd.h | 1 + 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a2d0a4b1483..21f5d10f3f8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5099,7 +5099,7 @@ static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, return status; } -static void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) +void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) { SERVER_START_REQ( add_fd_completion ) { diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index db65752a031..cfc5780b082 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1116,6 +1116,17 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, return status; } +static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ) +{ + io->Status = status; + io->Information = information; + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, (ULONG_PTR)io, 0 ); + if (apc_user) add_completion( handle, (ULONG_PTR)apc_user, status, information, FALSE ); +} + + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1249,6 +1260,16 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_COMPLETE_ASYNC: + { + if (in_size != sizeof(NTSTATUS)) + return STATUS_BUFFER_TOO_SMALL; + + status = *(NTSTATUS *)in_buffer; + complete_async( handle, event, apc, apc_user, io, status, 0 ); + break; + } + case IOCTL_AFD_POLL: status = sock_poll( handle, event, apc, apc_user, io, in_buffer, in_size, out_buffer, out_size ); break; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 4ddcbbee971..39ab7912490 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -279,6 +279,7 @@ extern NTSTATUS open_unix_file( HANDLE *handle, const char *unix_name, ACCESS_MA ULONG options, void *ea_buffer, ULONG ea_length ) DECLSPEC_HIDDEN; extern void init_files(void) DECLSPEC_HIDDEN; extern void init_cpu_info(void) DECLSPEC_HIDDEN; +extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN; extern void dbg_init(void) DECLSPEC_HIDDEN; diff --git a/include/wine/afd.h b/include/wine/afd.h index 5074c1f20dd..77801b1fbe3 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -97,6 +97,7 @@ struct afd_poll_params #define IOCTL_AFD_WINE_TRANSMIT CTL_CODE(FILE_DEVICE_NETWORK, 207, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 208, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_COMPLETE_ASYNC CTL_CODE(FILE_DEVICE_NETWORK, 210, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0