April 2019 - Wine-Commits - list.winehq.org

Detlef Riekenberg : iphlpapi/tests: Remove a test with a wrong assumption.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: f0db9c4b3be1f44289d2f7e26d4fa3548edf6d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db9c4b3be1f44289d2f7e2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 18:25:22 2019 +0200 iphlpapi/tests: Remove a test with a wrong assumption. The order of the interfaces is not fixed and can change, Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1be9f3c..a2be862 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -285,9 +285,6 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); - /* loopback must never be the first when more than one interface is found */ - if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) - ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Detlef Riekenberg : combase/tests: Remove a no longer useful test.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: baac17030cfb9d6aec5549125f117c5ff47c0b86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baac17030cfb9d6aec554912… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 17:43:39 2019 +0200 combase/tests: Remove a no longer useful test. Microsoft changed the behavior from returning NULL into returning a valid pointer. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 7a705da..04d0f3e 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -227,7 +227,6 @@ static void test_string_buffer(void) /* Test creation of an empty buffer */ ok(pWindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); - ok(buf == NULL, "Empty string buffer isn't a null string\n"); ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); ok(str == NULL, "Empty string isn't a null string\n");

1 0

Matteo Bruni : d3dx9/tests: Avoid a test failure on Vista testbot.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ccdb74d81ac4a95aa87414f6459a8b44d451358a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccdb74d81ac4a95aa87414f6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 4 16:54:33 2019 +0200 d3dx9/tests: Avoid a test failure on Vista testbot. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index becd55d..3b7acfc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -414,7 +414,8 @@ static void D3DXMatrixTest(void) ret = D3DXMatrixInverse(&gotmat, &determinant, &mat2); ok(!ret, "Unexpected return value %p.\n", ret); expect_matrix(&expectedmat, &gotmat, 1); - ok(compare_float(determinant, 5.0f, 0), "Unexpected determinant %.8e.\n", determinant); + ok(compare_float(determinant, 5.0f, 0) || broken(!determinant), /* Vista 64 bit testbot */ + "Unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixIsIdentity______________*/ expected = FALSE;

1 0

Vijay Kiran Kamuju : taskmgr: Use StrFormatKBSizeW/ StrFormatByteSizeW to show memory usage.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 17056908acae1d5c7cf5d255ec232210abfe86da URL: https://source.winehq.org/git/wine.git/?a=commit;h=17056908acae1d5c7cf5d255… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 3 15:18:37 2019 +0200 taskmgr: Use StrFormatKBSizeW/StrFormatByteSizeW to show memory usage. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/Makefile.in | 2 +- programs/taskmgr/graph.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 48313e9..6006ac3 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = shell32 comctl32 user32 gdi32 advapi32 +IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32 C_SRCS = \ about.c \ diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 7e978e1..9a8f569 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -26,6 +26,7 @@ #include <windows.h> #include <commctrl.h> +#include <shlwapi.h> #include <winnt.h> #include "taskmgr.h" @@ -239,8 +240,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* Top bars that are "unused", i.e. are dark green, representing free memory */ int i; - static const WCHAR wszFormat[] = {'%','d','K',0}; - /* * Get the client area rectangle */ @@ -257,7 +256,10 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - swprintf(Text, wszFormat, (int)CommitChargeTotal); + if (CommitChargeTotal < 1024) + StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); + else + StrFormatByteSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); /* * Draw the font text onto the graph

1 0

Piotr Caban : wined3d: Don't use strcasecmp.
by Alexandre Julliard April 4, 2019

April 4, 2019

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

Piotr Caban : winspool.drv: Don't use strcasecmp.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 4c106a931934a8fee8e2f0e07d5420efe7e22919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c106a931934a8fee8e2f0e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:48 2019 +0200 winspool.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bfa63f9..763d244 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1194,14 +1194,14 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) e = s; while(isspace(*--e)) *e = '\0'; TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !strcasecmp(prettyname, env_default)) set_default = TRUE; + if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; for(prettyname = s+1; isspace(*prettyname); prettyname++) ; } e = prettyname + strlen(prettyname); while(isspace(*--e)) *e = '\0'; TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !strcasecmp(prettyname, env_default)) set_default = TRUE; + if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; /* prettyname must fit into the dmDeviceName member of DEVMODE struct, * if it is too long, we use it as comment below. */

1 0

Gabriel Ivăncescu : comctl32/tests: Add tests for BCM_SETSPLITINFO and BCM_GETSPLITINFO.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ae4d8e1838753a11666592b6406fabd7789f8a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4d8e1838753a11666592b6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:28 2019 +0300 comctl32/tests: Add tests for BCM_SETSPLITINFO and BCM_GETSPLITINFO. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 211 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae4d8e1838753a116665…

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_GETIDEALSIZE for split buttons.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 9c62f7e42bc4ba0f87d23dd59eb4d6091a6e0059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c62f7e42bc4ba0f87d23dd5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:32 2019 +0300 comctl32/button: Implement BCM_GETIDEALSIZE for split buttons. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1f29fb2..e974f86 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -197,6 +197,7 @@ typedef BOOL (*pfGetIdealSize)(BUTTON_INFO *infoPtr, SIZE *size); static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { PB_GetIdealSize, /* BS_PUSHBUTTON */ @@ -211,9 +212,9 @@ static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { CB_GetIdealSize, /* BS_AUTORADIOBUTTON */ GB_GetIdealSize, /* BS_PUSHBOX */ GB_GetIdealSize, /* BS_OWNERDRAW */ + SB_GetIdealSize, /* BS_SPLITBUTTON */ + SB_GetIdealSize, /* BS_DEFSPLITBUTTON */ /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ - PB_GetIdealSize, /* BS_SPLITBUTTON */ - PB_GetIdealSize, /* BS_DEFSPLITBUTTON */ PB_GetIdealSize, /* BS_COMMANDLINK */ PB_GetIdealSize /* BS_DEFCOMMANDLINK */ }; @@ -1347,6 +1348,25 @@ static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) return TRUE; } +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + LONG extra_width = infoPtr->glyph_size.cx * 2 + GetSystemMetrics(SM_CXEDGE); + SIZE label_size; + + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + size->cx = max(size->cx, extra_width); + } + else + { + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &label_size); + size->cx = label_size.cx + ((size->cx == 0) ? extra_width : 0); + size->cy = label_size.cy; + } + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects *

1 0

Gabriel Ivăncescu : comctl32/button: Implement split buttons.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ee2f71d8f6f00d6252a8a1a37dc2c37806dc7f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2f71d8f6f00d6252a8a1a3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:29 2019 +0300 comctl32/button: Implement split buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20123 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 259 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee2f71d8f6f00d6252a8…

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR9 filter.
by Alexandre Julliard April 4, 2019

April 4, 2019

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