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

Alexandre Julliard : wing32: Build with msvcrt.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: ea6e4213aac5cb3b1c79d9148050cfbf114fe643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6e4213aac5cb3b1c79d914… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:06:40 2019 +0200 wing32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wing32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wing32/Makefile.in b/dlls/wing32/Makefile.in index 06775e3..d1792b7 100644 --- a/dlls/wing32/Makefile.in +++ b/dlls/wing32/Makefile.in @@ -1,4 +1,6 @@ MODULE = wing32.dll IMPORTS = user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = wing32.c

1 0

Alexandre Julliard : wing: Build with msvcrt.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: fe02d28feb4e51d7f4ba829cb2bfd21789d65dc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe02d28feb4e51d7f4ba829c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:06:31 2019 +0200 wing: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wing.dll16/Makefile.in | 2 +- dlls/wing.dll16/wing.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wing.dll16/Makefile.in b/dlls/wing.dll16/Makefile.in index d9b936e..87d0f23 100644 --- a/dlls/wing.dll16/Makefile.in +++ b/dlls/wing.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = wing.dll16 IMPORTS = gdi32 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = wing.c diff --git a/dlls/wing.dll16/wing.c b/dlls/wing.dll16/wing.c index e1f2c07..98cee56 100644 --- a/dlls/wing.dll16/wing.c +++ b/dlls/wing.dll16/wing.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : wineps16.drv: Build with msvcrt.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 9c955f0ad5869feb39e101f8f157e69e13778e60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c955f0ad5869feb39e101f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:06:03 2019 +0200 wineps16.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps16.drv16/Makefile.in | 2 +- dlls/wineps16.drv16/driver.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wineps16.drv16/Makefile.in b/dlls/wineps16.drv16/Makefile.in index 7d82de7..bf368fa 100644 --- a/dlls/wineps16.drv16/Makefile.in +++ b/dlls/wineps16.drv16/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineps16.drv16 IMPORTS = winspool -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = driver.c diff --git a/dlls/wineps16.drv16/driver.c b/dlls/wineps16.drv16/driver.c index b4d54dd..f230f10 100644 --- a/dlls/wineps16.drv16/driver.c +++ b/dlls/wineps16.drv16/driver.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alistair Leslie-Hughes : include: Complete IMimeHeaderTable/ IMimeEnumHeaderRows interfaces.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 543807a31ceec414130991b32f012d9785626c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=543807a31ceec414130991b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 27 05:15:16 2019 +0000 include: Complete IMimeHeaderTable/IMimeEnumHeaderRows interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 124 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 105 insertions(+), 19 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index cc80c12..b560cae 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -496,12 +496,116 @@ library MIMEOLE } [ + uuid(c558834d-7f86-11d0-8252-00c04fd85ab4), + object + ] + interface IMimeEnumHeaderRows : IUnknown + { + typedef struct tagENUMHEADERROW + { + HHEADERROW hRow; + LPSTR pszHeader; + LPSTR pszData; + ULONG cchData; + DWORD_PTR dwReserved; + } ENUMHEADERROW, *LPENUMHEADERROW; + + HRESULT Next( + [in] ULONG fetch, + [in,out] LPENUMHEADERROW row, + [out] ULONG *fetched); + + HRESULT Skip( + [in] ULONG items); + + HRESULT Reset(void); + + HRESULT Clone( + [out] IMimeEnumHeaderRows **rows); + + HRESULT Count( + [out] ULONG *pcItems); + } + + [ uuid(fd853cd1-7f86-11d0-8252-00c04fd85ab4), object ] interface IMimeHeaderTable : IPersistStream { - /* FIXME: fill this in */ + typedef struct tagFINDHEADER + { + LPCSTR pszHeader; + DWORD dwReserved; + } FINDHEADER, *LPFINDHEADER; + + typedef struct tagHEADERROWINFO + { + DWORD dwRowNumber; + ULONG cboffStart; + ULONG cboffColon; + ULONG cboffEnd; + } HEADERROWINFO, *LPHEADERROWINFO; + + typedef enum tagHEADERTABLEFLAGS + { + HTF_NAMEINDATA = 0x00000001, + HTF_ENUMHANDLESONLY = 0x00000002 + } HEADERTABLEFLAGS; + + HRESULT FindFirstRow( + [in] LPFINDHEADER header, + [out] LPHHEADERROW row); + + HRESULT FindNextRow( + [in] LPFINDHEADER header, + [out] LPHHEADERROW row); + + HRESULT CountRows( + [in] const char *header, + [out] ULONG *rows); + + HRESULT AppendRow( + [in] const char *header, + [in] DWORD flags, + [in] const char *data, + [in] ULONG count, + [out] LPHHEADERROW row); + + HRESULT DeleteRow( + [in] HHEADERROW row); + + HRESULT GetRowData( + [in] HHEADERROW row, + [in] DWORD flags, + [out] char **data, + [out] ULONG *len); + + HRESULT SetRowData( + [in] HHEADERROW row, + [in] DWORD flags, + [in] const char *data, + [in] ULONG len); + + HRESULT GetRowInfo( + [in] HHEADERROW row, + [in,out] LPHEADERROWINFO info); + + HRESULT SetRowNumber( + [in] HHEADERROW row, + [in] DWORD number); + + HRESULT EnumRows( + [in] const char *header, + [in] DWORD flags, + [out] IMimeEnumHeaderRows **rows); + + HRESULT Clone( + [out] IMimeHeaderTable **table); + + HRESULT BindToObject( + [in] REFIID riid, + [out, iid_is(riid)] void *object); } [ @@ -1257,24 +1361,6 @@ cpp_quote("#endif") } [ - uuid(c558834d-7f86-11d0-8252-00c04fd85ab4), - object - ] - interface IMimeEnumHeaderRows : IUnknown - { - typedef struct tagENUMHEADERROW - { - HHEADERROW hRow; - LPSTR pszHeader; - LPSTR pszData; - ULONG cchData; - DWORD_PTR dwReserved; - } ENUMHEADERROW, *LPENUMHEADERROW; - - /* FIXME: fill this in */ - } - - [ uuid(fd853cee-7f86-11d0-8252-00c04fd85ab4), object ]

1 0

Zebediah Figura : hidclass.sys: Detach the HID device before deleting it.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 878a1f5ceacdd2c495522675cf9a74e7ecf0359d URL: https://source.winehq.org/git/wine.git/?a=commit;h=878a1f5ceacdd2c495522675… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 26 22:29:23 2019 -0500 hidclass.sys: Detach the HID device before deleting it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index e961772..9470f7d 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -202,6 +202,7 @@ void HID_DeleteDevice(DEVICE_OBJECT *device) HeapFree(GetProcessHeap(), 0, ext->device_name); RtlFreeUnicodeString(&ext->link_name); + IoDetachDevice(ext->deviceExtension.NextDeviceObject); IoDeleteDevice(device); }

1 0

Zebediah Figura : setupapi: Also start newly installed root PnP services in SetupDiInstallDevice().
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 72f298e3f7eafecbbcb4d93156d8439a406c365d URL: https://source.winehq.org/git/wine.git/?a=commit;h=72f298e3f7eafecbbcb4d931… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 26 22:32:26 2019 -0500 setupapi: Also start newly installed root PnP services in SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 743999d..a684a6c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winsvc.h" #include "setupapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -4694,9 +4695,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR dothwW[] = {'.','H','W',0}; static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; + static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + WCHAR svc_name[LINE_LEN]; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; + SC_HANDLE manager, service; struct device *device; struct driver *driver; void *callback_ctx; @@ -4757,6 +4761,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) strcatW(subsection, dotservicesW); SetupInstallServicesFromInfSectionW(hinf, subsection, 0); + svc_name[0] = 0; if (SetupFindFirstLineW(hinf, subsection, addserviceW, &ctx)) { do @@ -4765,7 +4770,6 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) { - WCHAR svc_name[LINE_LEN]; if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); break; @@ -4786,5 +4790,23 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) RegCloseKey(device_key); RegCloseKey(driver_key); + + if (!strncmpiW(device->instanceId, rootW, strlenW(rootW)) && svc_name[0] + && (manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) + { + if ((service = OpenServiceW(manager, svc_name, SERVICE_START))) + { + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + ERR("Failed to start service %s for device %s, error %u.\n", + debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); + } + CloseServiceHandle(service); + } + else + ERR("Failed to open service %s for device %s.\n", debugstr_w(svc_name), debugstr_w(device->instanceId)); + CloseServiceHandle(manager); + } + return TRUE; }

1 0

Zebediah Figura : qcap/tests: Add some more tests for AVI mux media types.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 10fa32a39e513497dd3ad60dcecc2362b9c9a064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10fa32a39e513497dd3ad60d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 26 21:58:08 2019 -0500 qcap/tests: Add some more tests for AVI mux media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avimux.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/qcap.c | 31 ------------ 2 files changed, 123 insertions(+), 31 deletions(-) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index ea617b4..8218d0e 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -434,6 +434,128 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_avi_mux(); + AM_MEDIA_TYPE mt = {}, *pmt; + VIDEOINFOHEADER vih = {}; + IEnumMediaTypes *enummt; + WAVEFORMATEX wfx = {}; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_Avi), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(!pmt->cbFormat, "Got format size %u.\n", pmt->cbFormat); + ok(!pmt->pbFormat, "Got format block %u.\n", pmt->cbFormat); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Stream; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_RGB8; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_Avi; + + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, sink0_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Audio; + mt.formattype = FORMAT_WaveFormatEx; + mt.cbFormat = sizeof(wfx); + mt.pbFormat = (BYTE *)&wfx; + wfx.nBlockAlign = 1; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_RGB8; + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Interleaved; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Video; + mt.formattype = FORMAT_VideoInfo; + mt.cbFormat = sizeof(vih); + mt.pbFormat = (BYTE *)&vih; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Audio; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Interleaved; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_seeking(void) { IBaseFilter *filter = create_avi_mux(); @@ -577,6 +699,7 @@ START_TEST(avimux) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_seeking(); CoUninitialize(); diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index df26b54..45fd98b 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1365,11 +1365,9 @@ static void test_AviMux(char *arg) VIDEOINFO videoinfo; IPin *avimux_in, *avimux_out, *pin; AM_MEDIA_TYPE source_media_type; - AM_MEDIA_TYPE *media_type; PIN_DIRECTION dir; IBaseFilter *avimux; IEnumPins *ep; - IEnumMediaTypes *emt; IMemInputPin *memin; ALLOCATOR_PROPERTIES props; IMemAllocator *memalloc; @@ -1405,35 +1403,6 @@ static void test_AviMux(char *arg) ok(dir == PINDIR_INPUT, "dir = %d\n", dir); IEnumPins_Release(ep); - hr = IPin_EnumMediaTypes(avimux_out, &emt); - ok(hr == S_OK, "EnumMediaTypes returned %x\n", hr); - hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); - ok(hr == S_OK, "Next returned %x\n", hr); - ok(IsEqualIID(&media_type->majortype, &MEDIATYPE_Stream), "majortype = %s\n", - wine_dbgstr_guid(&media_type->majortype)); - ok(IsEqualIID(&media_type->subtype, &MEDIASUBTYPE_Avi), "subtype = %s\n", - wine_dbgstr_guid(&media_type->subtype)); - ok(media_type->bFixedSizeSamples, "bFixedSizeSamples = %x\n", media_type->bFixedSizeSamples); - ok(!media_type->bTemporalCompression, "bTemporalCompression = %x\n", media_type->bTemporalCompression); - ok(media_type->lSampleSize == 1, "lSampleSize = %d\n", media_type->lSampleSize); - ok(IsEqualIID(&media_type->formattype, &GUID_NULL), "formattype = %s\n", - wine_dbgstr_guid(&media_type->formattype)); - ok(!media_type->pUnk, "pUnk = %p\n", media_type->pUnk); - ok(!media_type->cbFormat, "cbFormat = %d\n", media_type->cbFormat); - ok(!media_type->pbFormat, "pbFormat = %p\n", media_type->pbFormat); - CoTaskMemFree(media_type); - hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); - ok(hr == S_FALSE, "Next returned %x\n", hr); - IEnumMediaTypes_Release(emt); - - hr = IPin_EnumMediaTypes(avimux_in, &emt); - ok(hr == S_OK, "EnumMediaTypes returned %x\n", hr); - hr = IEnumMediaTypes_Reset(emt); - ok(hr == S_OK, "Reset returned %x\n", hr); - hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); - ok(hr == S_FALSE, "Next returned %x\n", hr); - IEnumMediaTypes_Release(emt); - hr = IPin_ReceiveConnection(avimux_in, &source_filter.IPin_iface, NULL); ok(hr == E_POINTER, "ReceiveConnection returned %x\n", hr);

1 0

Zebediah Figura : qcap/tests: Add some tests for AVI mux pin interfaces.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: bd44602af6b26f72ed6cbe16363492eb99467183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd44602af6b26f72ed6cbe16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 26 21:58:07 2019 -0500 qcap/tests: Add some tests for AVI mux pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avimux.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index e5ec947..ea617b4 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -62,6 +62,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_avi_mux(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IConfigAviMux, TRUE); @@ -85,6 +86,34 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, source_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, sink0_id, &pin); + + check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IPropertyBag, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); }

1 0

Zebediah Figura : qcap/tests: Add some tests for querying AVI mux pin information.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 9a2ba5983c4a5d2f44ed9033def2e7fc4c221a39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a2ba5983c4a5d2f44ed9033… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 26 21:58:06 2019 -0500 qcap/tests: Add some tests for querying AVI mux pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avimux.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index f303783..e5ec947 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -335,6 +335,76 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_avi_mux(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, source_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, sink0_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink0_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink0_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_seeking(void) { IBaseFilter *filter = create_avi_mux(); @@ -477,6 +547,7 @@ START_TEST(avimux) test_aggregation(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_seeking(); CoUninitialize();

1 0

Zebediah Figura : qcap/tests: Add some tests for IBaseFilter::FindPin() on the AVI mux filter.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: fad0db52c29026e813a4eff4c8c25eb4dfc4fda1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fad0db52c29026e813a4eff4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 26 21:58:05 2019 -0500 qcap/tests: Add some tests for IBaseFilter::FindPin() on the AVI mux filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avimux.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index e51c6af..f303783 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -23,6 +23,9 @@ #include "vfw.h" #include "wine/test.h" +static const WCHAR source_id[] = {'A','V','I',' ','O','u','t',0}; +static const WCHAR sink0_id[] = {'I','n','p','u','t',' ','0','1',0}; + static const GUID testguid = {0xfacade}; static IBaseFilter *create_avi_mux(void) @@ -300,6 +303,38 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + IBaseFilter *filter = create_avi_mux(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins didn't match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IBaseFilter_FindPin(filter, sink0_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins didn't match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_seeking(void) { IBaseFilter *filter = create_avi_mux(); @@ -441,6 +476,7 @@ START_TEST(avimux) test_interfaces(); test_aggregation(); test_enum_pins(); + test_find_pin(); test_seeking(); CoUninitialize();

1 0