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

Paul Gofman : netio.sys: Implement wsk_{send|receive}().
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: defd4d5380d70715729143e966749294c7fb56c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=defd4d5380d70715729143e9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 19 13:13:15 2020 +0300 netio.sys: Implement wsk_{send|receive}(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 79891ccc14..c9203f37ad 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -467,18 +467,100 @@ static NTSTATUS WINAPI wsk_get_remote_address(WSK_SOCKET *socket, SOCKADDR *remo return STATUS_NOT_IMPLEMENTED; } +static void WINAPI send_receive_callback(TP_CALLBACK_INSTANCE *instance, void *socket_, TP_WAIT *wait, + TP_WAIT_RESULT wait_result) +{ + struct wsk_socket_internal *socket = socket_; + struct wsk_pending_io *io; + DWORD length, flags; + + TRACE("instance %p, socket %p, wait %p, wait_result %#x.\n", instance, socket, wait, wait_result); + + lock_socket(socket); + io = find_pending_io(socket, wait); + + if (WSAGetOverlappedResult(socket->s, &io->ovr, &length, FALSE, &flags)) + dispatch_pending_io(io, STATUS_SUCCESS, length); + else + dispatch_pending_io(io, io->ovr.Internal, 0); + + unlock_socket(socket); +} + +static NTSTATUS WINAPI do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flags, IRP *irp, BOOL is_send) +{ + struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); + struct wsk_pending_io *io; + DWORD wsa_flags; + WSABUF wsa_buf; + DWORD length; + int error; + + TRACE("socket %p, buffer %p, flags %#x, irp %p, is_send %#x.\n", + socket, wsk_buf, flags, irp, is_send); + + if (!irp) + return STATUS_INVALID_PARAMETER; + + if (!wsk_buf->Mdl && wsk_buf->Length) + return STATUS_INVALID_PARAMETER; + + if (wsk_buf->Mdl && wsk_buf->Mdl->Next) + { + FIXME("Chained MDLs are not supported.\n"); + irp->IoStatus.Information = 0; + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + return STATUS_PENDING; + } + + if (flags) + FIXME("flags %#x not implemented.\n", flags); + + lock_socket(s); + if (!(io = allocate_pending_io(s, send_receive_callback, irp))) + { + irp->IoStatus.Information = 0; + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + unlock_socket(s); + return STATUS_PENDING; + } + + wsa_buf.len = wsk_buf->Length; + wsa_buf.buf = wsk_buf->Mdl ? (CHAR *)wsk_buf->Mdl->StartVa + + wsk_buf->Mdl->ByteOffset + wsk_buf->Offset : NULL; + + wsa_flags = 0; + + if (!(is_send ? WSASend(s->s, &wsa_buf, 1, &length, wsa_flags, &io->ovr, NULL) + : WSARecv(s->s, &wsa_buf, 1, &length, &wsa_flags, &io->ovr, NULL))) + { + dispatch_pending_io(io, STATUS_SUCCESS, length); + } + else if ((error = WSAGetLastError()) == WSA_IO_PENDING) + { + SetThreadpoolWait(io->tp_wait, io->ovr.hEvent, NULL); + } + else + { + dispatch_pending_io(io, sock_error_to_ntstatus(error), 0); + } + unlock_socket(s); + + return STATUS_PENDING; +} + static NTSTATUS WINAPI wsk_send(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) { - FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + TRACE("socket %p, buffer %p, flags %#x, irp %p.\n", socket, buffer, flags, irp); - return STATUS_NOT_IMPLEMENTED; + return do_send_receive(socket, buffer, flags, irp, TRUE); } static NTSTATUS WINAPI wsk_receive(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) { - FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + TRACE("socket %p, buffer %p, flags %#x, irp %p.\n", socket, buffer, flags, irp); - return STATUS_NOT_IMPLEMENTED; + return do_send_receive(socket, buffer, flags, irp, FALSE); } static NTSTATUS WINAPI wsk_disconnect(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp)

1 0

Paul Gofman : ntoskrnl/tests: Add test for WSK send and receive.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: 717c5ff0a17005b42740904dd218f8665e213e3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=717c5ff0a17005b42740904d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 19 13:13:16 2020 +0300 ntoskrnl/tests: Add test for WSK send and receive. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver4.c | 51 ++++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 +++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index fd495a26e4..fedd5f25c2 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -167,15 +167,22 @@ struct socket_context { }; +#define TEST_BUFFER_LENGTH 256 + static void test_wsk_listen_socket(void) { + static const char test_receive_string[] = "Client test string 1."; const WSK_PROVIDER_LISTEN_DISPATCH *tcp_dispatch, *udp_dispatch; + static const char test_send_string[] = "Server test string 1."; static const WSK_CLIENT_LISTEN_DISPATCH client_listen_dispatch; const WSK_PROVIDER_CONNECTION_DISPATCH *accept_dispatch; WSK_SOCKET *tcp_socket, *udp_socket, *accept_socket; struct socket_context context; + WSK_BUF wsk_buf1, wsk_buf2; + void *buffer1, *buffer2; struct sockaddr_in addr; LARGE_INTEGER timeout; + MDL *mdl1, *mdl2; NTSTATUS status; KEVENT event; IRP *irp; @@ -183,6 +190,19 @@ static void test_wsk_listen_socket(void) irp = IoAllocateIrp(1, FALSE); KeInitializeEvent(&event, SynchronizationEvent, FALSE); + buffer1 = ExAllocatePool(NonPagedPool, TEST_BUFFER_LENGTH); + mdl1 = IoAllocateMdl(buffer1, TEST_BUFFER_LENGTH, FALSE, FALSE, NULL); + MmBuildMdlForNonPagedPool(mdl1); + buffer2 = ExAllocatePool(NonPagedPool, TEST_BUFFER_LENGTH); + mdl2 = IoAllocateMdl(buffer2, TEST_BUFFER_LENGTH, FALSE, FALSE, NULL); + MmBuildMdlForNonPagedPool(mdl2); + + wsk_buf1.Mdl = mdl1; + wsk_buf1.Offset = 0; + wsk_buf1.Length = TEST_BUFFER_LENGTH; + wsk_buf2 = wsk_buf1; + wsk_buf2.Mdl = mdl2; + status = provider_npi.Dispatch->WskSocket(NULL, AF_INET, SOCK_STREAM, IPPROTO_TCP, WSK_FLAG_LISTEN_SOCKET, &context, &client_listen_dispatch, NULL, NULL, NULL, NULL); ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); @@ -283,6 +303,32 @@ static void test_wsk_listen_socket(void) accept_socket = (WSK_SOCKET *)wsk_irp->IoStatus.Information; accept_dispatch = accept_socket->Dispatch; + IoReuseIrp(irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(irp, irp_completion_routine, &event, TRUE, TRUE, TRUE); + status = accept_dispatch->WskReceive(accept_socket, &wsk_buf2, 0, irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + strcpy(buffer1, test_send_string); + /* Setting Length in WSK_BUF greater than MDL allocation size BSODs Windows. + * wsk_buf1.Length = TEST_BUFFER_LENGTH * 2; */ + status = accept_dispatch->WskSend(accept_socket, &wsk_buf1, 0, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, &timeout); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(wsk_irp->IoStatus.Information == TEST_BUFFER_LENGTH, "Got unexpected status %#x.\n", + wsk_irp->IoStatus.Status); + + status = KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, &timeout); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", irp->IoStatus.Status); + ok(irp->IoStatus.Information == sizeof(test_receive_string), "Got unexpected Information %#lx.\n", + irp->IoStatus.Information); + ok(!strcmp(buffer2, test_receive_string), "Received unexpected data.\n"); + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); status = accept_dispatch->Basic.WskCloseSocket(accept_socket, wsk_irp); @@ -317,6 +363,11 @@ static void test_wsk_listen_socket(void) ok(irp->IoStatus.Status == STATUS_CANCELLED, "Got unexpected status %#x.\n", irp->IoStatus.Status); ok(!irp->IoStatus.Information, "Got unexpected Information %#lx.\n", irp->IoStatus.Information); IoFreeIrp(irp); + + IoFreeMdl(mdl1); + IoFreeMdl(mdl2); + ExFreePool(buffer1); + ExFreePool(buffer2); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 4cdcda7d3e..c53f97e9d1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -516,8 +516,10 @@ static void test_driver3(void) static DWORD WINAPI wsk_test_thread(void *parameter) { + static const char test_send_string[] = "Client test string 1."; static const WORD version = MAKEWORD(2, 2); struct sockaddr_in addr; + char buffer[256]; int ret, err; WSADATA data; SOCKET s; @@ -541,6 +543,13 @@ static DWORD WINAPI wsk_test_thread(void *parameter) } ok(!ret, "Error connecting, WSAGetLastError() %u.\n", WSAGetLastError()); + ret = send(s, test_send_string, sizeof(test_send_string), 0); + ok(ret == sizeof(test_send_string), "Got unexpected ret %d.\n", ret); + + ret = recv(s, buffer, sizeof(buffer), 0); + ok(ret == sizeof(buffer), "Got unexpected ret %d.\n", ret); + ok(!strcmp(buffer, "Server test string 1."), "Received unexpected data.\n"); + closesocket(s); return TRUE; }

1 0

Nikolay Sivov : mf: Set clipping window attribute for EVR activator.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: 0c8babdbcca1f74ea54b9466b7d5fe3899880cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8babdbcca1f74ea54b9466… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 19 16:36:27 2020 +0300 mf: Set clipping window attribute for EVR activator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 8 +++++++- dlls/mf/tests/mf.c | 11 ++++++++++- include/mfidl.idl | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 15c9e5e3c9..3546caa691 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1291,12 +1291,18 @@ static const struct activate_funcs evr_activate_funcs = HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) { + HRESULT hr; + TRACE("%p, %p.\n", hwnd, activate); if (!activate) return E_POINTER; - return create_activation_object(hwnd, &evr_activate_funcs, activate); + hr = create_activation_object(hwnd, &evr_activate_funcs, activate); + if (SUCCEEDED(hr)) + IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd); + + return hr; } struct simple_type_handler diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c79ae69f91..d252bab9b3 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3228,7 +3228,8 @@ static void test_evr(void) { IMFMediaSink *sink, *sink2; IMFActivate *activate; - DWORD flags; + DWORD flags, count; + UINT64 value; HRESULT hr; hr = CoInitialize(NULL); @@ -3240,6 +3241,14 @@ static void test_evr(void) hr = MFCreateVideoRendererActivate(NULL, &activate); ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + hr = IMFActivate_GetCount(activate, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + hr = IMFActivate_GetUINT64(activate, &MF_ACTIVATE_VIDEO_WINDOW, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(!value, "Unexpected value.\n"); + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); todo_wine ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); diff --git a/include/mfidl.idl b/include/mfidl.idl index 89b1bdd05b..2955d0d2f3 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1151,4 +1151,6 @@ cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, 0xb10aaec3, 0xef cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, 0x6ba644ff, 0x27c5, 0x4d02, 0x98, 0x87, 0xc2, 0x86, 0x19, 0xfd, 0xb9, 0x1b);") cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, 0xa9770471, 0x92ec, 0x4df4, 0x94, 0xfe, 0x81, 0xc3, 0x6f, 0x0c, 0x3a, 0x7a);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_VIDEO_WINDOW, 0x9a2dbbdd, 0xf57e, 0x4162, 0x82, 0xb9, 0x68, 0x31, 0x37, 0x76, 0x82, 0xd3);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Nikolay Sivov : mfplat: Add EVR activator attributes to tracing.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: 9d9975c3b2840bf945e7e6dde9315583d493a6a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9975c3b2840bf945e7e6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 19 16:36:28 2020 +0300 mfplat: Add EVR activator attributes to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 7 +++++++ include/mfidl.idl | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ea6a0659c5..6cd409d63b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1646,12 +1646,18 @@ const char *debugstr_attr(const GUID *guid) X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11), X(MF_MT_USER_DATA), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID), X(MF_MT_MIN_MASTERING_LUMINANCE), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID), X(MF_EVENT_STREAM_METADATA_SYSTEMID), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE), X(MF_MT_AUDIO_CHANNEL_MASK), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS), X(MF_MT_MINIMUM_DISPLAY_APERTURE), X(MFSampleExtension_Token), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), @@ -1806,6 +1812,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MEDIA_ENGINE_COREWINDOW), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_MT_MPEG4_TRACK_TYPE), + X(MF_ACTIVATE_VIDEO_WINDOW), X(MF_MT_PAN_SCAN_APERTURE), X(MF_TOPOLOGY_RESOLUTION_STATUS), X(MF_MT_ORIGINAL_4CC), diff --git a/include/mfidl.idl b/include/mfidl.idl index 2955d0d2f3..912e62ca35 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1027,6 +1027,16 @@ interface IMFAudioPolicy : IUnknown HRESULT GetIconPath([out] LPWSTR *path); } +enum +{ + MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001, +}; + +enum +{ + MF_ACTIVATE_CUSTOM_PRESENTER_ALLOWFAIL = 0x00000001, +}; + cpp_quote("#ifdef __cplusplus") cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)") cpp_quote("{") @@ -1152,5 +1162,11 @@ cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, 0x6ba644ff, 0x cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, 0xa9770471, 0x92ec, 0x4df4, 0x94, 0xfe, 0x81, 0xc3, 0x6f, 0x0c, 0x3a, 0x7a);") cpp_quote("EXTERN_GUID(MF_ACTIVATE_VIDEO_WINDOW, 0x9a2dbbdd, 0xf57e, 0x4162, 0x82, 0xb9, 0x68, 0x31, 0x37, 0x76, 0x82, 0xd3);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, 0xba491360, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, 0xba491361, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, 0xba491362, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, 0xba491364, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Nikolay Sivov : evr/tests: Add some tests for surface samples.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: 1b95c1b5117f94b024a1b538b65f65a707d22f3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b95c1b5117f94b024a1b538… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 19 16:36:29 2020 +0300 evr/tests: Add some tests for surface samples. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- dlls/evr/mixer.c | 7 +++ dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 142 +++++++++++++++++++++++++++++++++++++++++++++ include/evr.idl | 21 +++++++ include/mfidl.idl | 13 +++++ 6 files changed, 185 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index ea87f16da1..214f2b81d8 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -19,7 +19,7 @@ @ stub MFCreateVideoPresenter2 @ stub MFCreateVideoPresenter @ stub MFCreateVideoSampleAllocator -@ stub MFCreateVideoSampleFromSurface +@ stdcall MFCreateVideoSampleFromSurface(ptr ptr) @ stub MFGetPlaneSize @ stub MFGetStrideForBitmapInfoHeader @ stub MFGetUncompressedVideoFormat diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b651a56bff..eaea037b69 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -685,3 +685,10 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) return S_OK; } + +HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample) +{ + FIXME("%p, %p.\n", surface, sample); + + return E_NOTIMPL; +} diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 529c535450..8253c4d7fb 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = mfuuid strmiids uuid dxguid ole32 oleaut32 evr +IMPORTS = mfuuid strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 9cf5d41919..9365856d1e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -29,6 +29,36 @@ static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device = NULL; + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + + return device; +} + static IBaseFilter *create_evr(void) { IBaseFilter *filter = NULL; @@ -485,6 +515,117 @@ static void test_default_mixer(void) IMFTransform_Release(transform); } +static void test_surface_sample(void) +{ + IDirect3DSurface9 *backbuffer = NULL; + IMFMediaBuffer *buffer, *buffer2; + IDirect3DSwapChain9 *swapchain; + IDirect3DDevice9 *device; + DWORD count, length; + IMFSample *sample; + LONGLONG duration; + IDirect3D9 *d3d; + IUnknown *unk; + HWND window; + HRESULT hr; + BYTE *data; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr); + + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer (%08x)\n", hr); + ok(backbuffer != NULL, "The back buffer is NULL\n"); + + IDirect3DSwapChain9_Release(swapchain); + + hr = MFCreateVideoSampleFromSurface((IUnknown *)backbuffer, &sample); +todo_wine + ok(hr == S_OK, "Failed to create surface sample, hr %#x.\n", hr); + if (FAILED(hr)) goto done; + + hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFSample_GetCount(sample, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(!count, "Unexpected attribute count.\n"); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count.\n"); + + hr = IMFSample_GetTotalLength(sample, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(!length, "Unexpected length %u.\n", length); + + hr = IMFSample_GetSampleDuration(sample, &duration); + ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetSampleTime(sample, &duration); + ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(!length, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 2, "Unexpected attribute count.\n"); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_CopyToBuffer(sample, buffer); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_RemoveAllBuffers(sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(!count, "Unexpected attribute count.\n"); + + IMFMediaBuffer_Release(buffer); + + IMFSample_Release(sample); + +done: + if (backbuffer) + IDirect3DSurface9_Release(backbuffer); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(evr) { CoInitialize(NULL); @@ -495,6 +636,7 @@ START_TEST(evr) test_find_pin(); test_pin_info(); test_default_mixer(); + test_surface_sample(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 83603b92cc..43afca1201 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -198,4 +198,25 @@ interface IMFVideoMixerControl2 : IMFVideoMixerControl ); } +[ + object, + uuid(56c294d0-753e-4260-8d61-a3d8820b1d54), + local +] +interface IMFDesiredSample : IUnknown +{ + HRESULT GetDesiredSampleTimeAndDuration( + [out] LONGLONG *sample_time, + [out] LONGLONG *sample_duration + ); + + void SetDesiredSampleTimeAndDuration( + [in] LONGLONG sample_time, + [in] LONGLONG sample_duration + ); + + void Clear(); +} + cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") +cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);") diff --git a/include/mfidl.idl b/include/mfidl.idl index 912e62ca35..35419756b5 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -934,6 +934,19 @@ interface IMFQualityAdviseLimits : IUnknown HRESULT GetMinimumQualityLevel([out] MF_QUALITY_LEVEL *level); } +[ + object, + uuid(245bf8e9-0755-40f7-88a5-ae0f18d55e17), + local +] +interface IMFTrackedSample : IUnknown +{ + HRESULT SetAllocator( + [in] IMFAsyncCallback *sample_allocator, + [in, unique] IUnknown *state + ); +} + typedef struct _MFT_REGISTRATION_INFO { CLSID clsid;

1 0

Gijs Vermeulen : amstream: Get rid of the IDirectDrawStreamSampleImpl typedef.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: b12ac596fdb6cadff2d77ff34a234bf73be3dfb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b12ac596fdb6cadff2d77ff3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 19 16:10:28 2020 +0200 amstream: Get rid of the IDirectDrawStreamSampleImpl typedef. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 73 +++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 1c924e40a2..e2f24c3b4c 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -952,21 +952,22 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) return S_OK; } -typedef struct { +struct ddraw_sample +{ IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; IMediaStream *parent; IDirectDrawSurface *surface; RECT rect; -} IDirectDrawStreamSampleImpl; +}; -static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) +static inline struct ddraw_sample *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) { - return CONTAINING_RECORD(iface, IDirectDrawStreamSampleImpl, IDirectDrawStreamSample_iface); + return CONTAINING_RECORD(iface, struct ddraw_sample, IDirectDrawStreamSample_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStreamSample *iface, +static HRESULT WINAPI ddraw_sample_QueryInterface(IDirectDrawStreamSample *iface, REFIID riid, void **ret_iface) { TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); @@ -986,43 +987,43 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_QueryInterface(IDirectDrawStre return E_NOINTERFACE; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_AddRef(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_AddRef(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedIncrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } -static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample *iface) +static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); + ULONG ref = InterlockedDecrement(&sample->ref); TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) { - if (This->surface) - IDirectDrawSurface_Release(This->surface); - IMediaStream_Release(This->parent); - HeapFree(GetProcessHeap(), 0, This); + if (sample->surface) + IDirectDrawSurface_Release(sample->surface); + IMediaStream_Release(sample->parent); + HeapFree(GetProcessHeap(), 0, sample); } return ref; } /*** IStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) +static HRESULT WINAPI ddraw_sample_GetMediaStream(IDirectDrawStreamSample *iface, IMediaStream **media_stream) { FIXME("(%p)->(%p): stub\n", iface, media_stream); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_GetSampleTimes(IDirectDrawStreamSample *iface, STREAM_TIME *start_time, STREAM_TIME *end_time, STREAM_TIME *current_time) { FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); @@ -1030,7 +1031,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, +static HRESULT WINAPI ddraw_sample_SetSampleTimes(IDirectDrawStreamSample *iface, const STREAM_TIME *start_time, const STREAM_TIME *end_time) { FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); @@ -1038,7 +1039,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetSampleTimes(IDirectDrawStre return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, +static HRESULT WINAPI ddraw_sample_Update(IDirectDrawStreamSample *iface, DWORD flags, HANDLE event, PAPCFUNC func_APC, DWORD APC_data) { FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); @@ -1046,7 +1047,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) +static HRESULT WINAPI ddraw_sample_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds) { FIXME("(%p)->(%x,%u): stub\n", iface, flags, milliseconds); @@ -1054,27 +1055,27 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawSt } /*** IDirectDrawStreamSample methods ***/ -static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, +static HRESULT WINAPI ddraw_sample_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, RECT *rect) { - IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); + struct ddraw_sample *sample = impl_from_IDirectDrawStreamSample(iface); TRACE("(%p)->(%p,%p)\n", iface, ddraw_surface, rect); if (ddraw_surface) { - *ddraw_surface = This->surface; + *ddraw_surface = sample->surface; if (*ddraw_surface) IDirectDrawSurface_AddRef(*ddraw_surface); } if (rect) - *rect = This->rect; + *rect = sample->rect; return S_OK; } -static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) +static HRESULT WINAPI ddraw_sample_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) { FIXME("(%p)->(%p): stub\n", iface, rect); @@ -1084,24 +1085,24 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSampl static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = { /*** IUnknown methods ***/ - IDirectDrawStreamSampleImpl_QueryInterface, - IDirectDrawStreamSampleImpl_AddRef, - IDirectDrawStreamSampleImpl_Release, + ddraw_sample_QueryInterface, + ddraw_sample_AddRef, + ddraw_sample_Release, /*** IStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetMediaStream, - IDirectDrawStreamSampleImpl_GetSampleTimes, - IDirectDrawStreamSampleImpl_SetSampleTimes, - IDirectDrawStreamSampleImpl_Update, - IDirectDrawStreamSampleImpl_CompletionStatus, + ddraw_sample_GetMediaStream, + ddraw_sample_GetSampleTimes, + ddraw_sample_SetSampleTimes, + ddraw_sample_Update, + ddraw_sample_CompletionStatus, /*** IDirectDrawStreamSample methods ***/ - IDirectDrawStreamSampleImpl_GetSurface, - IDirectDrawStreamSampleImpl_SetRect + ddraw_sample_GetSurface, + ddraw_sample_SetRect }; static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { - IDirectDrawStreamSampleImpl *object; + struct ddraw_sample *object; HRESULT hr; TRACE("(%p)\n", ddraw_stream_sample);

1 0

Gijs Vermeulen : amstream/tests: Add IDirectDrawStreamSample::GetMediaStream() tests.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: b80907047662004f5f370d1a244adfceb22be39b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b80907047662004f5f370d1a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 19 16:10:29 2020 +0200 amstream/tests: Add IDirectDrawStreamSample::GetMediaStream() tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e1f6a15ad3..72ef7912aa 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2006,44 +2006,44 @@ static void test_media_types(void) static void test_IDirectDrawStreamSample(void) { + IDirectDrawMediaStream *ddraw_stream = NULL; + IDirectDrawStreamSample *sample = NULL; + IDirectDrawSurface *surface, *surface2; + IMediaStream *stream2, *stream = NULL; DDSURFACEDESC desc = { sizeof(desc) }; - IAMMultiMediaStream *pams; - HRESULT hr; - IMediaStream *pvidstream = NULL; - IDirectDrawMediaStream *pddstream = NULL; - IDirectDrawStreamSample *pddsample = NULL; + IAMMultiMediaStream *mmstream; IDirectDrawSurface7 *surface7; - IDirectDrawSurface *surface, *surface2; IDirectDraw *ddraw, *ddraw2; IDirectDraw7 *ddraw7; + HRESULT hr; RECT rect; - if (!(pams = create_ammultimediastream())) + if (!(mmstream = create_ammultimediastream())) return; if (!create_directdraw()) { - IAMMultiMediaStream_Release(pams); + IAMMultiMediaStream_Release(mmstream); return; } - hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); + hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); if (FAILED(hr)) goto error; - hr = IMediaStream_QueryInterface(pvidstream, &IID_IDirectDrawMediaStream, (LPVOID*)&pddstream); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); ok(hr == S_OK, "got 0x%08x\n", hr); if (FAILED(hr)) goto error; - hr = IDirectDrawMediaStream_GetDirectDraw(pddstream, &ddraw); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDirectDrawMediaStream_GetDirectDraw(pddstream, &ddraw2); + hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); @@ -2055,14 +2055,26 @@ static void test_IDirectDrawStreamSample(void) IDirectDraw_Release(ddraw2); IDirectDraw_Release(ddraw); - hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "got 0x%08x\n", hr); surface = NULL; - hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(surface != NULL, "got %p\n", surface); + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + + hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); + if (hr == S_OK) IMediaStream_Release(stream2); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); ok(hr == S_OK, "got 0x%08x\n", hr); IDirectDrawSurface7_Release(surface7); @@ -2074,39 +2086,39 @@ static void test_IDirectDrawStreamSample(void) ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "format flags %08x\n", desc.ddpfPixelFormat.dwFlags); ok(desc.ddpfPixelFormat.dwRGBBitCount, "dwRGBBitCount %d\n", desc.ddpfPixelFormat.dwRGBBitCount); IDirectDrawSurface_Release(surface); - IDirectDrawStreamSample_Release(pddsample); + IDirectDrawStreamSample_Release(sample); hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void **)&surface); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(surface, 1); - hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, NULL, 0, &pddsample); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(surface, 2); surface2 = NULL; SetRectEmpty(&rect); - hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface2, &rect); + hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(surface == surface2, "got %p\n", surface2); ok(rect.right > 0 && rect.bottom > 0, "got %d, %d\n", rect.right, rect.bottom); EXPECT_REF(surface, 3); IDirectDrawSurface_Release(surface2); - hr = IDirectDrawStreamSample_GetSurface(pddsample, NULL, NULL); + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - IDirectDrawStreamSample_Release(pddsample); + IDirectDrawStreamSample_Release(sample); IDirectDrawSurface_Release(surface); error: - if (pddstream) - IDirectDrawMediaStream_Release(pddstream); - if (pvidstream) - IMediaStream_Release(pvidstream); + if (ddraw_stream) + IDirectDrawMediaStream_Release(ddraw_stream); + if (stream) + IMediaStream_Release(stream); release_directdraw(); - IAMMultiMediaStream_Release(pams); + IAMMultiMediaStream_Release(mmstream); } static IUnknown *create_audio_data(void)

1 0

Gijs Vermeulen : amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw().
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: 1e81d551903d548d42d04d5076181741309d23c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e81d551903d548d42d04d50… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 19 16:10:30 2020 +0200 amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index e2f24c3b4c..c471a66200 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -377,6 +377,9 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi TRACE("(%p)->(%p)\n", iface, ddraw); + if (!ddraw) + return E_POINTER; + *ddraw = NULL; if (!This->ddraw) {

1 0

Anton Baskanov : amstream: Implement IAudioStreamSample::GetSampleTimes.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: 0736217336e8b84e27996c44474e49ba828cea13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0736217336e8b84e27996c44… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Jun 20 00:18:51 2020 +0700 amstream: Implement IAudioStreamSample::GetSampleTimes. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 33 +++++++- dlls/amstream/tests/amstream.c | 181 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0736217336e8b84e2799…

1 0

Anton Baskanov : amstream: Implement AMAudioStream::NewSegment.
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: master Commit: b9712f2f37f6648108c608e3e33046a697ef36b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9712f2f37f6648108c608e3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Jun 20 00:18:52 2020 +0700 amstream: Implement AMAudioStream::NewSegment. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 18 +++++-- dlls/amstream/tests/amstream.c | 119 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 129 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4c6c326d84..a19cb4ea96 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -56,6 +56,7 @@ struct audio_stream AM_MEDIA_TYPE mt; WAVEFORMATEX format; FILTER_STATE state; + REFERENCE_TIME segment_start; BOOL eos; BOOL flushing; struct list receive_queue; @@ -1158,9 +1159,18 @@ static HRESULT WINAPI audio_sink_EndFlush(IPin *iface) static HRESULT WINAPI audio_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - FIXME("iface %p, start %s, stop %s, rate %0.16e, stub!\n", - iface, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); - return E_NOTIMPL; + struct audio_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p, start %s, stop %s, rate %0.16e\n", + stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); + + EnterCriticalSection(&stream->cs); + + stream->segment_start = start; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static const IPinVtbl audio_sink_vtbl = @@ -1291,7 +1301,7 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * receive->length = IMediaSample_GetActualDataLength(sample); receive->pointer = pointer; receive->sample = sample; - receive->start_time = start_time; + receive->start_time = start_time + stream->segment_start; IMediaSample_AddRef(receive->sample); list_add_tail(&stream->receive_queue, &receive->entry); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c7510f30c4..eb9b852ba4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3440,10 +3440,6 @@ static void test_audiostream_begin_flush_end_flush(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void CALLBACK apc_func(ULONG_PTR param) -{ -} - static IMediaSample *audiostream_allocate_sample(struct testfilter *source, const BYTE *input_data, DWORD input_length) { IMediaSample *sample; @@ -3464,6 +3460,120 @@ static IMediaSample *audiostream_allocate_sample(struct testfilter *source, cons return sample; } +static void test_audiostream_new_segment(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const BYTE test_data[8] = { 0 }; + IAudioStreamSample *stream_sample; + IAudioMediaStream *audio_stream; + IMemInputPin *mem_input_pin; + IMediaSample *media_sample; + struct testfilter source; + IAudioData *audio_data; + STREAM_TIME start_time; + STREAM_TIME end_time; + IGraphBuilder *graph; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IMemInputPin, (void **)&mem_input_pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &stream_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioData_SetBuffer(audio_data, 5, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_NewSegment(pin, 11111111, 22222222, 1.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + media_sample = audiostream_allocate_sample(&source, test_data, 5); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 23459057, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IPin_NewSegment(pin, 11111111, 22222222, 2.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + media_sample = audiostream_allocate_sample(&source, test_data, 5); + start_time = 12345678; + end_time = 23456789; + hr = IMediaSample_SetTime(media_sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(mem_input_pin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(media_sample); + + hr = IAudioStreamSample_Update(stream_sample, 0, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0xdeadbeefdeadbeef; + end_time = 0xdeadbeefdeadbeef; + hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time)); + ok(end_time == 23459057, "Got end time %s.\n", wine_dbgstr_longlong(end_time)); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IAudioStreamSample_Release(stream_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAudioData_Release(audio_data); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IMemInputPin_Release(mem_input_pin); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void CALLBACK apc_func(ULONG_PTR param) +{ +} + static IPin *audiostream_pin; static IMemInputPin *audiostream_mem_input_pin; static IMediaSample *audiostream_media_sample; @@ -4699,6 +4809,7 @@ START_TEST(amstream) test_audiostream_receive(); test_audiostream_initialize(); test_audiostream_begin_flush_end_flush(); + test_audiostream_new_segment(); test_audiostreamsample_update(); test_audiostreamsample_completion_status();

1 0