Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/tests/vmr9.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 57e92ad7141..dfa9dae73e5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2979,14 +2979,14 @@ static void test_renderless_formats(void) .pbFormat = (BYTE *)&vih, }; ALLOCATOR_PROPERTIES req_props = {5, 32 * 16 * 4, 1, 0}, ret_props; - IBaseFilter *filter = create_vmr9(VMR9Mode_Renderless); - IFilterGraph2 *graph = create_graph(); IVMRSurfaceAllocatorNotify9 *notify; RECT rect = {0, 0, 640, 480}; struct testfilter source; IDirect3DDevice9 *device; IMemAllocator *allocator; + IFilterGraph2 *graph; IMemInputPin *input; + IBaseFilter *filter; unsigned int i; HWND window; HRESULT hr; @@ -3020,13 +3020,17 @@ static void test_renderless_formats(void) {&MEDIASUBTYPE_YV12, MAKEFOURCC('Y','V','1','2'), VMR9AllocFlag_OffscreenSurface}, };
- IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)¬ify); - AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); if (!(device = create_device(window))) - goto out; + { + DestroyWindow(window); + return; + } + + filter = create_vmr9(VMR9Mode_Renderless); + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)¬ify);
hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) @@ -3042,6 +3046,7 @@ static void test_renderless_formats(void) allocator_notify = notify;
testfilter_init(&source); + graph = create_graph(); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); IBaseFilter_FindPin(filter, L"VMR Input0", &pin);
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/tests/filtermapper.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 41b933275d6..b9123ce5253 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -668,11 +668,8 @@ static void test_aggregation(void) static void test_dmo(void) { DMO_PARTIAL_MEDIATYPE mt = {MEDIATYPE_Audio, MEDIASUBTYPE_PCM}; - IEnumRegFilters *enumerator1; IEnumMoniker *enumerator; IFilterMapper3 *mapper; - IFilterMapper *mapper1; - REGFILTER *regfilter; IMoniker *moniker; WCHAR *name; HRESULT hr; @@ -688,8 +685,6 @@ static void test_dmo(void) ok(hr == S_OK, "Got hr %#x.\n", hr);
mapper = create_mapper(); - IFilterMapper3_QueryInterface(mapper, &IID_IFilterMapper, (void **)&mapper1); - ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IFilterMapper3_EnumMatchingFilters(mapper, &enumerator, 0, FALSE, 0, FALSE, 0, NULL, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); @@ -710,20 +705,8 @@ static void test_dmo(void) IEnumMoniker_Release(enumerator); ok(found, "DMO should be enumerated.\n");
- /* DMOs lack a CLSID property and are therefore not enumerated by IFilterMapper. */ - - hr = IFilterMapper_EnumMatchingFilters(mapper1, &enumerator1, 0, FALSE, - GUID_NULL, GUID_NULL, FALSE, FALSE, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - while (IEnumRegFilters_Next(enumerator1, 1, ®filter, NULL) == S_OK) - { - ok(!IsEqualGUID(®filter->Clsid, &testclsid), "DMO should not be enumerated.\n"); - ok(wcscmp(regfilter->Name, L"dmo test"), "DMO should not be enumerated.\n"); - } - IEnumRegFilters_Release(enumerator1); + /* DMOs are enumerated by IFilterMapper in Windows 7 and higher. */
- IFilterMapper_Release(mapper1); ref = IFilterMapper3_Release(mapper); ok(!ref, "Got outstanding refcount %d.\n", ref);
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/tests/systemclock.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 08faa1ef733..b85a801f0ef 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -259,18 +259,15 @@ static void test_advise(void) hr = IReferenceClock_AdvisePeriodic(clock, -500 * 10000, 1000 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
- hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); + hr = IReferenceClock_AdvisePeriodic(clock, current, 100 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!WaitForSingleObject(semaphore, 20), "Semaphore should be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 50), "Semaphore should be signaled.\n"); for (i = 0; i < 5; ++i) - { - ok(WaitForSingleObject(semaphore, 460) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); - ok(!WaitForSingleObject(semaphore, 60), "Semaphore should be signaled.\n"); - } + ok(!WaitForSingleObject(semaphore, 500), "Semaphore should be signaled.\n");
hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(semaphore, 520) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + ok(WaitForSingleObject(semaphore, 200) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n");
CloseHandle(event); CloseHandle(semaphore);
-
Zebediah Figura