wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Paul Gofman : d3d9: Keep previous stream source stride and offset only when setting NULL buffer.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 467199d59385e8bb145190e11a5a6fde906b81c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=467199d59385e8bb145190e1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 3 20:26:06 2019 +0300 d3d9: Keep previous stream source stride and offset only when setting NULL buffer. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 10 +++------- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bad9211..f7f9358 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3558,13 +3558,9 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, iface, stream_idx, buffer, offset, stride); wined3d_mutex_lock(); - if (!stride) - { - unsigned int cur_offset; - - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &cur_offset, &stride); - } + if (!buffer_impl) + wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + &offset, &stride); if (!buffer_impl) wined3d_buffer = NULL; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e7366b1..f5c8972 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3240,7 +3240,8 @@ cleanup: static void test_set_stream_source(void) { - IDirect3DVertexBuffer9 *vb; + IDirect3DVertexBuffer9 *vb, *current_vb; + unsigned int offset, stride; IDirect3DDevice9 *device; IDirect3D9 *d3d9; ULONG refcount; @@ -3273,7 +3274,24 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 3, 32); ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 4, 32); - ok(SUCCEEDED(hr), "Failed to set the stream source, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!current_vb, "Got unexpected vb %p.\n", current_vb); + ok(offset == 4, "Got unexpected offset %u.\n", offset); + ok(stride == 32, "Got unexpected stride %u.\n", stride); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(current_vb == vb, "Got unexpected vb %p.\n", current_vb); + IDirect3DVertexBuffer9_Release(current_vb); + ok(!offset, "Got unexpected offset %u.\n", offset); + ok(!stride, "Got unexpected stride %u.\n", stride); /* Try to set the NULL buffer with an offset and stride 0 */ hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0);

1 0

Piotr Caban : shlwapi: Fix PathIsContentTypeA implementation.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 28f7e4615d9a02b6f556434e51568aab68edc35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f7e4615d9a02b6f556434e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:01:03 2019 +0200 shlwapi: Fix PathIsContentTypeA implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index ad78c5d..1c4af7e 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2027,22 +2027,18 @@ BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2) * a content type is registered, it is compared (case insensitively) to * lpszContentType. Only if this matches does the function succeed. */ -BOOL WINAPI PathIsContentTypeA(LPCSTR lpszPath, LPCSTR lpszContentType) +BOOL WINAPI PathIsContentTypeA(LPCSTR path, LPCSTR content_type) { - LPCSTR szExt; - DWORD dwDummy; - char szBuff[MAX_PATH]; + char buf[MAX_PATH]; + DWORD size = sizeof(buf); + LPCSTR ext; - TRACE("(%s,%s)\n", debugstr_a(lpszPath), debugstr_a(lpszContentType)); + TRACE("(%s,%s)\n", debugstr_a(path), debugstr_a(content_type)); - if (lpszPath && (szExt = PathFindExtensionA(lpszPath)) && *szExt && - !SHGetValueA(HKEY_CLASSES_ROOT, szExt, "Content Type", - REG_NONE, szBuff, &dwDummy) && - !strcasecmp(lpszContentType, szBuff)) - { - return TRUE; - } - return FALSE; + if(!path) return FALSE; + if(!(ext = PathFindExtensionA(path)) || !*ext) return FALSE; + if(SHGetValueA(HKEY_CLASSES_ROOT, ext, "Content Type", NULL, buf, &size)) return FALSE; + return !lstrcmpiA(content_type, buf); } /*************************************************************************

1 0

Piotr Caban : shell32: Don't use strcasecmp.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 232255f3c5c48a2685d317101d0c0d068414a6ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=232255f3c5c48a2685d31710… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 17:04:53 2019 +0200 shell32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e11a918..54fb818 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -511,7 +511,7 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) _ILSimpleGetText(pidltemp1, szData1, MAX_PATH); _ILSimpleGetText(pidltemp2, szData2, MAX_PATH); - if (strcasecmp( szData1, szData2 )) + if (lstrcmpiA( szData1, szData2 )) return FALSE; pidltemp1 = ILGetNext(pidltemp1); @@ -563,7 +563,7 @@ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL b _ILSimpleGetText(pParent, szData1, MAX_PATH); _ILSimpleGetText(pChild, szData2, MAX_PATH); - if (strcasecmp( szData1, szData2 )) + if (lstrcmpiA( szData1, szData2 )) return FALSE; pParent = ILGetNext(pParent); @@ -630,7 +630,7 @@ LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) _ILSimpleGetText(pidltemp1, szData1, MAX_PATH); _ILSimpleGetText(pidltemp2, szData2, MAX_PATH); - if (strcasecmp(szData1,szData2)) + if (lstrcmpiA(szData1,szData2)) break; pidltemp1 = ILGetNext(pidltemp1);

1 0

Piotr Caban : d3dxof: Don't use strncasecmp.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 718b07b34340e0702bc4fd67039ae3420f315e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718b07b34340e0702bc4fd67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:22 2019 +0200 d3dxof: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 6f93bfe..82cb186 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" +#include "winternl.h" #include "d3dxof_private.h" #include "dxfile.h" @@ -405,7 +406,7 @@ static BOOL is_keyword(parse_buffer* buf, const char* keyword) if (!read_bytes(buf, tmp, len)) return FALSE; - if (strncasecmp(tmp, keyword, len)) + if (_strnicmp(tmp, keyword, len)) { rewind_bytes(buf, len); return FALSE; @@ -972,7 +973,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) cur_member->idx_template = 1; while (cur_member->idx_template < buf->pdxf->nb_xtemplates) { - if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) + if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name, -1)) break; cur_member->idx_template++; } @@ -1176,7 +1177,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) { - if (!strcasecmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name)) + if (!_strnicmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name, -1)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[j]; break; @@ -1392,7 +1393,7 @@ BOOL parse_object(parse_buffer * buf) /* To do template lookup */ for (i = 0; i < buf->pdxf->nb_xtemplates; i++) { - if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) + if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[i].name, -1)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[i]; memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16);

1 0

Piotr Caban : wined3d: Don't use strcasecmp.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: dcd3c95dbd3748d5dc246ad7529f18c35252534e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd3c95dbd3748d5dc246ad7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:00:57 2019 +0200 wined3d: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8fae8e2..7ebfd4d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3727,7 +3727,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { if (e[i].stream_idx == stream_idx - && !strcasecmp(e[i].semantic_name, semantic_name) + && !_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx) return &e[i]; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0a0121d..180e2d2 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -240,17 +240,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) { - if (!strcasecmp(buffer, "glsl")) + if (!_strnicmp(buffer, "glsl", -1)) { ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!strcasecmp(buffer, "arb")) + else if (!_strnicmp(buffer, "arb", -1)) { ERR_(winediag)("Using the ARB shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; } - else if (!strcasecmp(buffer, "none")) + else if (!_strnicmp(buffer, "none", -1)) { ERR_(winediag)("Disabling shader backends.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE;

1 0

Nikolay Sivov : mferror: Consistently format error messages.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: a3fa08de6161e294f4161b70d6673b876fd2a215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3fa08de6161e294f4161b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 4 10:53:44 2019 +0300 mferror: Consistently format error messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mferror/mferror.mc | 24 ++++++++++++------------ po/ar.po | 32 ++++++++++++++++++-------------- po/bg.po | 36 ++++++++++++++++++++---------------- po/ca.po | 32 ++++++++++++++++++-------------- po/cs.po | 32 ++++++++++++++++++-------------- po/da.po | 32 ++++++++++++++++++-------------- po/de.po | 32 ++++++++++++++++++-------------- po/el.po | 36 ++++++++++++++++++++---------------- po/en.po | 48 ++++++++++++++++++++++++------------------------ po/en_US.po | 48 ++++++++++++++++++++++++------------------------ po/eo.po | 40 ++++++++++++++++++++++++---------------- po/es.po | 32 ++++++++++++++++++-------------- po/fa.po | 27 ++++++++++++++------------- po/fi.po | 32 ++++++++++++++++++-------------- po/fr.po | 32 ++++++++++++++++++-------------- po/he.po | 33 ++++++++++++++++++--------------- po/hi.po | 24 ++++++++++++------------ po/hr.po | 32 ++++++++++++++++++-------------- po/hu.po | 32 ++++++++++++++++++-------------- po/it.po | 32 ++++++++++++++++++-------------- po/ja.po | 32 ++++++++++++++++++-------------- po/ko.po | 32 ++++++++++++++++++-------------- po/lt.po | 48 ++++++++++++++++++++++++++++++++++++------------ po/ml.po | 28 +++++++++++++++------------- po/nb_NO.po | 32 ++++++++++++++++++-------------- po/nl.po | 32 ++++++++++++++++++-------------- po/or.po | 24 ++++++++++++------------ po/pa.po | 24 ++++++++++++------------ po/pl.po | 32 ++++++++++++++++++-------------- po/pt_BR.po | 32 ++++++++++++++++++-------------- po/pt_PT.po | 32 ++++++++++++++++++-------------- po/rm.po | 30 ++++++++++++++++-------------- po/ro.po | 32 ++++++++++++++++++-------------- po/ru.po | 32 ++++++++++++++++++-------------- po/si.po | 46 ++++++++++++++++++++++++++++++++-------------- po/sk.po | 32 ++++++++++++++++++-------------- po/sl.po | 32 ++++++++++++++++++-------------- po/sr_RS(a)cyrillic.po | 37 +++++++++++++++++++++---------------- po/sr_RS(a)latin.po | 37 +++++++++++++++++++++---------------- po/sv.po | 32 ++++++++++++++++++-------------- po/ta.po | 24 ++++++++++++------------ po/te.po | 24 ++++++++++++------------ po/th.po | 33 ++++++++++++++++++--------------- po/tr.po | 32 ++++++++++++++++++-------------- po/uk.po | 32 ++++++++++++++++++-------------- po/wa.po | 27 ++++++++++++++------------- po/wine.pot | 24 ++++++++++++------------ po/zh_CN.po | 32 ++++++++++++++++++-------------- po/zh_TW.po | 32 ++++++++++++++++++-------------- 49 files changed, 887 insertions(+), 699 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3fa08de6161e294f416…

1 0

Zebediah Figura : quartz/tests: Add tests for querying VMR9 pin information.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 43f549fdcdfadab50425d05d08347f741a1c50c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f549fdcdfadab50425d05d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:52 2019 -0500 quartz/tests: Add tests for querying VMR9 pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 6df3470..f8e6f21 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -450,6 +450,68 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr9(0); + PIN_DIRECTION dir; + ULONG count, ref; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + 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, sink_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, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + sink_id[9] = '1'; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + 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, sink_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, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + } + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -469,6 +531,7 @@ START_TEST(vmr9) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR9 filter.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 57df3a452c26c26ae9312631dbad051d86f6fcfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=57df3a452c26c26ae9312631… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:51 2019 -0500 quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR9 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cbaf081..6df3470 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -386,6 +386,70 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + static const WCHAR inW[] = {'I','n',0}; + + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr9(0); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + IBaseFilter_EnumPins(filter, &enum_pins); + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, inW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_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 did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + IEnumPins_Reset(enum_pins); + + sink_id[9] = '0'; + hr = IBaseFilter_FindPin(filter, sink_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 did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_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 did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '2'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + } + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -404,6 +468,7 @@ START_TEST(vmr9) test_filter_config(); test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR9 filter.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: b6b78db30d65f46e9201f884702349e2f8e5b16b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b78db30d65f46e9201f884… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:50 2019 -0500 quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR9 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 7ecf852..cbaf081 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -42,6 +42,13 @@ static IBaseFilter *create_vmr9(DWORD mode) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_filter_config(void) { IVMRFilterConfig9 *config; @@ -235,6 +242,150 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static HRESULT set_mixing_mode(IBaseFilter *filter) +{ + IVMRFilterConfig9 *config; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + IVMRFilterConfig9_Release(config); + return hr; +} + +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_vmr9(0); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[3]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + 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(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + } + + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -252,6 +403,7 @@ START_TEST(vmr9) test_filter_config(); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for VMR9 filter interfaces.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 8233e1166faa540199ac06ecb77579ff63a961a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8233e1166faa540199ac06ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:49 2019 -0500 quartz/tests: Add tests for VMR9 filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2d642c6..7ecf852 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -24,6 +24,24 @@ #include "vmr9.h" #include "wine/test.h" +static IBaseFilter *create_vmr9(DWORD mode) +{ + IBaseFilter *filter = NULL; + IVMRFilterConfig9 *config; + HRESULT hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (mode) + { + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVMRFilterConfig9_SetRenderingMode(config, mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVMRFilterConfig9_Release(config); + } + return filter; +} + static void test_filter_config(void) { IVMRFilterConfig9 *config; @@ -125,6 +143,98 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_vmr9(0); + ULONG ref; + + check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IQualityControl, TRUE); + todo_wine check_interface(filter, &IID_IQualProp, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + todo_wine check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); + todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); + check_interface(filter, &IID_IVMRFilterConfig9, TRUE); + todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); + check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IDirectDrawVideo, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVMRAspectRatioControl, FALSE); + check_interface(filter, &IID_IVMRDeinterlaceControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRFilterConfig, FALSE); + check_interface(filter, &IID_IVMRMixerBitmap, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr9(VMR9Mode_Windowless); + + check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr9(VMR9Mode_Renderless); + + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -141,6 +251,7 @@ START_TEST(vmr9) IBaseFilter_Release(filter); test_filter_config(); + test_interfaces(); CoUninitialize(); }

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019