wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Nikolay Sivov : evr/presenter: Keep video window handle.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 77e04e221a609cb4b45625ccbc743d322a14189e URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e04e221a609cb4b45625cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:11 2020 +0300 evr/presenter: Keep video window handle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 19 +++++++++++++++---- dlls/evr/tests/evr.c | 7 ++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8b5a7dd46a..a8e9a50792 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -58,6 +58,7 @@ struct video_presenter IDirect3DDeviceManager9 *device_manager; UINT reset_token; + HWND video_window; unsigned int state; CRITICAL_SECTION cs; }; @@ -497,16 +498,26 @@ static HRESULT WINAPI video_presenter_control_GetAspectRatioMode(IMFVideoDisplay static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayControl *iface, HWND window) { - FIXME("%p, %p.\n", iface, window); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, window); + + EnterCriticalSection(&presenter->cs); + presenter->video_window = window; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayControl *iface, HWND *window) { - FIXME("%p, %p.\n", iface, window); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, window); + + *window = presenter->video_window; + + return S_OK; } static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayControl *iface) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 9665e2683d..d77703b6c1 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1056,20 +1056,17 @@ static void test_default_presenter(void) hwnd2 = hwnd; hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2); -} + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hwnd2 = NULL; hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); -} + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Expose IMFVideoDisplayControl as a service.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 69e777c804e9803bef3e151fc20a363f699692ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e777c804e9803bef3e151f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:10 2020 +0300 evr/presenter: Expose IMFVideoDisplayControl as a service. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 11 +++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 04653ff67a..8b5a7dd46a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -618,6 +618,17 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface if (IsEqualGUID(&MR_VIDEO_ACCELERATION_SERVICE, service)) return IDirect3DDeviceManager9_QueryInterface(presenter->device_manager, riid, obj); + if (IsEqualGUID(&MR_VIDEO_RENDER_SERVICE, service)) + { + if (IsEqualIID(riid, &IID_IMFVideoDisplayControl)) + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); + else + { + FIXME("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOTIMPL; + } + } + FIXME("Unimplemented service %s.\n", debugstr_guid(service)); return E_NOTIMPL; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c2e1759555..9665e2683d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1015,10 +1015,8 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IMFVideoDisplayControl_Release(display_control); + IMFVideoDisplayControl_Release(display_control); hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Create d3d device on presenter creation.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 164c3b7f2ba5e98a3096ef9de37fc7cede9e7e68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=164c3b7f2ba5e98a3096ef9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:09 2020 +0300 evr/presenter: Create d3d device on presenter creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 2 +- dlls/evr/presenter.c | 47 +++++++++++++++++++++++++++++++++++++++----- dlls/evr/tests/evr.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 92 insertions(+), 12 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 6d936d65b7..02cdb9b820 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,6 +1,6 @@ MODULE = evr.dll IMPORTLIB = evr -IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 dxva2 +IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 DELAYIMPORTS = mfplat EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index b60de4b82a..04653ff67a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -643,11 +643,47 @@ HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFII return CoCreateInstance(&CLSID_MFVideoPresenter9, owner, CLSCTX_INPROC_SERVER, riid, obj); } +static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) +{ + D3DPRESENT_PARAMETERS present_params = { 0 }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + + present_params.BackBufferCount = 1; + present_params.SwapEffect = D3DSWAPEFFECT_COPY; + present_params.hDeviceWindow = GetDesktopWindow(); + present_params.Windowed = TRUE; + present_params.Flags = D3DPRESENTFLAG_VIDEO; + present_params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, GetDesktopWindow(), + 0, &present_params, &device); + + IDirect3D9_Release(d3d); + + if (FAILED(hr)) + { + WARN("Failed to create d3d device, hr %#x.\n", hr); + return hr; + } + + hr = IDirect3DDeviceManager9_ResetDevice(presenter->device_manager, device, presenter->reset_token); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + WARN("Failed to set new device for the manager, hr %#x.\n", hr); + + return hr; +} + HRESULT evr_presenter_create(IUnknown *outer, void **out) { struct video_presenter *object; HRESULT hr; + *out = NULL; + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -663,12 +699,13 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) - { IUnknown_Release(&object->IUnknown_inner); - return hr; - } - *out = &object->IUnknown_inner; + if (FAILED(hr = video_presenter_init_d3d(object))) + IUnknown_Release(&object->IUnknown_inner); - return S_OK; + if (SUCCEEDED(hr)) + *out = &object->IUnknown_inner; + + return hr; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 0dff691b59..c2e1759555 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -39,7 +39,7 @@ static HWND create_window(void) AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); - return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + return CreateWindowA("static", "evr_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } @@ -967,12 +967,16 @@ done: static void test_default_presenter(void) { D3DDEVICE_CREATION_PARAMETERS device_params = { 0 }; + D3DPRESENT_PARAMETERS present_params = { 0 }; + IMFVideoDisplayControl *display_control; + IDirect3DSwapChain9 *swapchain; IMFVideoPresenter *presenter; IMFRateSupport *rate_support; IDirect3DDevice9 *d3d_device; IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; IMFGetService *gs; + HWND hwnd, hwnd2; HANDLE handle; IUnknown *unk; float rate; @@ -1010,33 +1014,70 @@ static void test_default_presenter(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFVideoDisplayControl_Release(display_control); + hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_OpenDeviceHandle(dm, &handle); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(dm, handle, &d3d_device, FALSE); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ hr = IDirect3DDevice9_GetCreationParameters(d3d_device, &device_params); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(device_params.hFocusWindow == GetDesktopWindow(), "Unexpected window %p.\n", device_params.hFocusWindow); + hr = IDirect3DDevice9_GetSwapChain(d3d_device, 0, &swapchain); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_params); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); + ok(present_params.Windowed, "Unexpected windowed mode.\n"); + ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); + ok(present_params.Flags == D3DPRESENTFLAG_VIDEO, "Unexpected flags.\n"); + ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); + IDirect3DDevice9_Release(d3d_device); hr = IDirect3DDeviceManager9_UnlockDevice(dm, handle, FALSE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + hwnd = create_window(); + ok(!!hwnd, "Failed to create a test window.\n"); + + hwnd2 = hwnd; + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2); +} + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hwnd2 = NULL; + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); } + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirect3DDeviceManager9_Release(dm); + IMFVideoDisplayControl_Release(display_control); IMFGetService_Release(gs); /* Rate support. */ @@ -1066,6 +1107,8 @@ if (SUCCEEDED(hr)) IMFRateSupport_Release(rate_support); IMFVideoPresenter_Release(presenter); + + DestroyWindow(hwnd); } static void test_MFCreateVideoMixerAndPresenter(void)

1 0

Zebediah Figura : server: Remove the no longer used accept_into_socket request.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: e3ea5278357698e75b6cd51627c30e84e16845ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ea5278357698e75b6cd516… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:14:02 2020 -0500 server: Remove the no longer used accept_into_socket 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 | 19 +------------------ server/protocol.def | 7 ------- server/request.h | 5 ----- server/sock.c | 23 ----------------------- server/trace.c | 9 --------- 5 files changed, 1 insertion(+), 62 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8c7ab39146..751ca59ad6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1695,20 +1695,6 @@ struct unlock_file_reply -struct accept_into_socket_request -{ - struct request_header __header; - obj_handle_t lhandle; - obj_handle_t ahandle; - char __pad_20[4]; -}; -struct accept_into_socket_reply -{ - struct reply_header __header; -}; - - - struct set_socket_event_request { struct request_header __header; @@ -5481,7 +5467,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_accept_into_socket, REQ_set_socket_event, REQ_get_socket_event, REQ_get_socket_info, @@ -5768,7 +5753,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct accept_into_socket_request accept_into_socket_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; @@ -6053,7 +6037,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct accept_into_socket_reply accept_into_socket_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; @@ -6283,7 +6266,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 648 +#define SERVER_PROTOCOL_VERSION 649 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6534092f2c..16c0b93674 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1383,13 +1383,6 @@ enum server_fd_type @END -/* Accept into an initialized socket */ -@REQ(accept_into_socket) - obj_handle_t lhandle; /* handle to the listening socket */ - obj_handle_t ahandle; /* handle to the accepting socket */ -@END - - /* Set socket event parameters */ @REQ(set_socket_event) obj_handle_t handle; /* handle to the socket */ diff --git a/server/request.h b/server/request.h index c02b616d75..fc60aa1e8c 100644 --- a/server/request.h +++ b/server/request.h @@ -173,7 +173,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(accept_into_socket); DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); @@ -459,7 +458,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_accept_into_socket, (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, @@ -1052,9 +1050,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, lhandle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, ahandle) == 16 ); -C_ASSERT( sizeof(struct accept_into_socket_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, event) == 20 ); diff --git a/server/sock.c b/server/sock.c index 360bf756f9..4f97fe7208 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1446,29 +1446,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); } -/* accept a socket into an initialized socket */ -DECL_HANDLER(accept_into_socket) -{ - struct sock *sock, *acceptsock; - const int all_attributes = FILE_READ_ATTRIBUTES|FILE_WRITE_ATTRIBUTES|FILE_READ_DATA; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, - all_attributes, &sock_ops))) - return; - - if (!(acceptsock = (struct sock *)get_handle_obj( current->process, req->ahandle, - all_attributes, &sock_ops))) - { - release_object( sock ); - return; - } - - if (accept_into_socket( sock, acceptsock )) - acceptsock->wparam = req->ahandle; /* wparam for message is the socket handle */ - release_object( acceptsock ); - release_object( sock ); -} - /* set socket event parameters */ DECL_HANDLER(set_socket_event) { diff --git a/server/trace.c b/server/trace.c index 5f8981cddf..17dd415b95 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1948,12 +1948,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_accept_into_socket_request( const struct accept_into_socket_request *req ) -{ - fprintf( stderr, " lhandle=%04x", req->lhandle ); - fprintf( stderr, ", ahandle=%04x", req->ahandle ); -} - static void dump_set_socket_event_request( const struct set_socket_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4467,7 +4461,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_accept_into_socket_request, (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, @@ -4751,7 +4744,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_lock_file_reply, NULL, NULL, - NULL, (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, NULL, @@ -5033,7 +5025,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "accept_into_socket", "set_socket_event", "get_socket_event", "get_socket_info",

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_ACCEPT_INTO.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 2600ccf27f9dfb6eadbb21c92b75618ccbd26e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2600ccf27f9dfb6eadbb21c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:14:01 2020 -0500 ws2_32: Use IOCTL_AFD_ACCEPT_INTO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 031688b2d9..2eb1e1a730 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2517,13 +2517,11 @@ static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st if (status == STATUS_ALERTED) { - SERVER_START_REQ( accept_into_socket ) - { - req->lhandle = wine_server_obj_handle( wsa->listen_socket ); - req->ahandle = wine_server_obj_handle( wsa->accept_socket ); - status = wine_server_call( req ); - } - SERVER_END_REQ; + obj_handle_t accept_handle = wine_server_obj_handle( wsa->accept_socket ); + IO_STATUS_BLOCK io; + + status = NtDeviceIoControlFile( wsa->listen_socket, NULL, NULL, NULL, &io, IOCTL_AFD_ACCEPT_INTO, + &accept_handle, sizeof(accept_handle), NULL, 0 ); if (NtStatusToWSAError( status ) == WSAEWOULDBLOCK) return STATUS_PENDING;

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_ACCEPT_INTO.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: ea038894a6aa4b034e151e4f2af42da36710e180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea038894a6aa4b034e151e4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:14:00 2020 -0500 server: Introduce IOCTL_AFD_ACCEPT_INTO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 9ca03039f8..5a994084e1 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -25,6 +25,7 @@ #define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_AFD_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) diff --git a/server/sock.c b/server/sock.c index 26a2c4fa66..360bf756f9 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1108,6 +1108,27 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_ACCEPT_INTO: + { + static const int access = FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | FILE_READ_DATA; + struct sock *acceptsock; + obj_handle_t handle; + + if (get_req_data_size() != sizeof(handle)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + handle = *(obj_handle_t *)get_req_data(); + + if (!(acceptsock = (struct sock *)get_handle_obj( current->process, handle, access, &sock_ops ))) + return 0; + if (accept_into_socket( sock, acceptsock )) + acceptsock->wparam = handle; + release_object( acceptsock ); + return 0; + } + case IOCTL_AFD_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) {

1 0

Zebediah Figura : server: Remove the no longer used accept_socket request.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: cb1594cf4ff9eef0a5b5d80dc7c47da9e27a5821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb1594cf4ff9eef0a5b5d80d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:13:59 2020 -0500 server: Remove the no longer used accept_socket 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 | 21 +-------------------- server/protocol.def | 10 ---------- server/request.h | 8 -------- server/sock.c | 18 ------------------ server/trace.c | 15 --------------- 5 files changed, 1 insertion(+), 71 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ea62e73f63..8c7ab39146 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1695,22 +1695,6 @@ struct unlock_file_reply -struct accept_socket_request -{ - struct request_header __header; - obj_handle_t lhandle; - unsigned int access; - unsigned int attributes; -}; -struct accept_socket_reply -{ - struct reply_header __header; - obj_handle_t handle; - char __pad_12[4]; -}; - - - struct accept_into_socket_request { struct request_header __header; @@ -5497,7 +5481,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_accept_socket, REQ_accept_into_socket, REQ_set_socket_event, REQ_get_socket_event, @@ -5785,7 +5768,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct accept_socket_request accept_socket_request; struct accept_into_socket_request accept_into_socket_request; struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; @@ -6071,7 +6053,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct accept_socket_reply accept_socket_reply; struct accept_into_socket_reply accept_into_socket_reply; struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; @@ -6302,7 +6283,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 647 +#define SERVER_PROTOCOL_VERSION 648 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index f538c6dcf5..6534092f2c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1383,16 +1383,6 @@ enum server_fd_type @END -/* Accept a socket */ -@REQ(accept_socket) - obj_handle_t lhandle; /* handle to the listening socket */ - unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ -@REPLY - obj_handle_t handle; /* handle to the new socket */ -@END - - /* Accept into an initialized socket */ @REQ(accept_into_socket) obj_handle_t lhandle; /* handle to the listening socket */ diff --git a/server/request.h b/server/request.h index bc6f29f211..c02b616d75 100644 --- a/server/request.h +++ b/server/request.h @@ -173,7 +173,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(accept_socket); DECL_HANDLER(accept_into_socket); DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); @@ -460,7 +459,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_accept_socket, (req_handler)req_accept_into_socket, (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, @@ -1054,12 +1052,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_request, lhandle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_request, attributes) == 20 ); -C_ASSERT( sizeof(struct accept_socket_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_reply, handle) == 8 ); -C_ASSERT( sizeof(struct accept_socket_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, lhandle) == 12 ); C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, ahandle) == 16 ); C_ASSERT( sizeof(struct accept_into_socket_request) == 24 ); diff --git a/server/sock.c b/server/sock.c index f66fe09117..26a2c4fa66 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1425,24 +1425,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); } -/* accept a socket */ -DECL_HANDLER(accept_socket) -{ - struct sock *sock, *acceptsock; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, FILE_READ_DATA, &sock_ops ))) - return; - - reply->handle = 0; - if ((acceptsock = accept_socket( sock )) != NULL) - { - reply->handle = alloc_handle( current->process, &acceptsock->obj, req->access, req->attributes ); - acceptsock->wparam = reply->handle; /* wparam for message is the socket handle */ - release_object( acceptsock ); - } - release_object( sock ); -} - /* accept a socket into an initialized socket */ DECL_HANDLER(accept_into_socket) { diff --git a/server/trace.c b/server/trace.c index ffe9d6e19c..5f8981cddf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1948,18 +1948,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_accept_socket_request( const struct accept_socket_request *req ) -{ - fprintf( stderr, " lhandle=%04x", req->lhandle ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); -} - -static void dump_accept_socket_reply( const struct accept_socket_reply *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - static void dump_accept_into_socket_request( const struct accept_into_socket_request *req ) { fprintf( stderr, " lhandle=%04x", req->lhandle ); @@ -4479,7 +4467,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_accept_socket_request, (dump_func)dump_accept_into_socket_request, (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, @@ -4763,7 +4750,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - (dump_func)dump_accept_socket_reply, NULL, NULL, (dump_func)dump_get_socket_event_reply, @@ -5047,7 +5033,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "accept_socket", "accept_into_socket", "set_socket_event", "get_socket_event",

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_ACCEPT.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: c46ab05e55860a6c2ea774495c9da8adff3eea00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46ab05e55860a6c2ea77449… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:13:58 2020 -0500 ws2_32: Use IOCTL_AFD_ACCEPT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bc61b56667..031688b2d9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2771,9 +2771,11 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) { DWORD err; - SOCKET as; int fd; BOOL is_blocking; + IO_STATUS_BLOCK io; + NTSTATUS status; + obj_handle_t accept_handle; TRACE("socket %04lx\n", s ); err = sock_is_blocking(s, &is_blocking); @@ -2782,18 +2784,12 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) for (;;) { - /* try accepting first (if there is a deferred connection) */ - SERVER_START_REQ( accept_socket ) - { - req->lhandle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->attributes = OBJ_INHERIT; - err = NtStatusToWSAError( wine_server_call( req )); - as = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); - } - SERVER_END_REQ; - if (!err) + status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_ACCEPT, + NULL, 0, &accept_handle, sizeof(accept_handle) ); + if (!status) { + SOCKET as = HANDLE2SOCKET(wine_server_ptr_handle( accept_handle )); + if (!socket_list_add(as)) { CloseHandle(SOCKET2HANDLE(as)); @@ -2807,6 +2803,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) TRACE("\taccepted %04lx\n", as); return as; } + err = NtStatusToWSAError( status ); if (!is_blocking) break; if (err != WSAEWOULDBLOCK) break; fd = get_sock_fd( s, FILE_READ_DATA, NULL );

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_ACCEPT.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 5474c035e7dca04b0c9c2abba9d208c18e839b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5474c035e7dca04b0c9c2abb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:13:57 2020 -0500 server: Introduce IOCTL_AFD_ACCEPT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 50 +++++++++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 24e6c31f22..9ca03039f8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,7 @@ #include <winioctl.h> #define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) diff --git a/server/sock.c b/server/sock.c index f165e86b12..f66fe09117 100644 --- a/server/sock.c +++ b/server/sock.c @@ -851,16 +851,11 @@ static int accept_new_fd( struct sock *sock ) } /* accept a socket (creates a new fd) */ -static struct sock *accept_socket( obj_handle_t handle ) +static struct sock *accept_socket( struct sock *sock ) { struct sock *acceptsock; - struct sock *sock; int acceptfd; - sock = (struct sock *)get_handle_obj( current->process, handle, FILE_READ_DATA, &sock_ops ); - if (!sock) - return NULL; - if (get_unix_fd( sock->fd ) == -1) return NULL; if ( sock->deferred ) @@ -870,15 +865,10 @@ static struct sock *accept_socket( obj_handle_t handle ) } else { - if ((acceptfd = accept_new_fd( sock )) == -1) - { - release_object( sock ); - return NULL; - } + if ((acceptfd = accept_new_fd( sock )) == -1) return NULL; if (!(acceptsock = create_socket())) { close( acceptfd ); - release_object( sock ); return NULL; } @@ -899,7 +889,6 @@ static struct sock *accept_socket( obj_handle_t handle ) get_fd_options( sock->fd ) ))) { release_object( acceptsock ); - release_object( sock ); return NULL; } } @@ -907,7 +896,6 @@ static struct sock *accept_socket( obj_handle_t handle ) sock->pmask &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; sock_reselect( sock ); - release_object( sock ); return acceptsock; } @@ -1100,6 +1088,26 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_ACCEPT: + { + struct sock *acceptsock; + obj_handle_t handle; + + if (get_reply_max_size() != sizeof(handle)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (!(acceptsock = accept_socket( sock ))) return 0; + handle = alloc_handle( current->process, &acceptsock->obj, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); + acceptsock->wparam = handle; + release_object( acceptsock ); + set_reply_data( &handle, sizeof(handle) ); + return 0; + } + case IOCTL_AFD_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { @@ -1420,15 +1428,19 @@ struct object *create_socket_device( struct object *root, const struct unicode_s /* accept a socket */ DECL_HANDLER(accept_socket) { - struct sock *sock; + struct sock *sock, *acceptsock; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, FILE_READ_DATA, &sock_ops ))) + return; reply->handle = 0; - if ((sock = accept_socket( req->lhandle )) != NULL) + if ((acceptsock = accept_socket( sock )) != NULL) { - reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes ); - sock->wparam = reply->handle; /* wparam for message is the socket handle */ - release_object( &sock->obj ); + reply->handle = alloc_handle( current->process, &acceptsock->obj, req->access, req->attributes ); + acceptsock->wparam = reply->handle; /* wparam for message is the socket handle */ + release_object( acceptsock ); } + release_object( sock ); } /* accept a socket into an initialized socket */

1 0

Andrew Eikum : mmdevapi: Stub implement IAudioClient3.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 6314a75006d1cfb86c1fb3da71be037fe646437c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6314a75006d1cfb86c1fb3da… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 15:23:05 2020 -0500 mmdevapi: Stub implement IAudioClient3. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 3 +- dlls/mmdevapi/tests/render.c | 17 +++++ dlls/winealsa.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/wineandroid.drv/mmdevdrv.c | 157 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/wineoss.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/winepulse.drv/mmdevdrv.c | 153 +++++++++++++++++++++++-------------- 7 files changed, 499 insertions(+), 296 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6314a75006d1cfb86c1f…

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
80
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 October 2020