[PATCH 1/2] quartz/tests: Remove the no longer used TestFilterImpl structure.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/quartz/tests/filtergraph.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 4822b65a7a6..b2d5b4e26e8 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -28,19 +28,6 @@

static const GUID testguid = {0xabbccdde};

-typedef struct TestFilterImpl
-{
-    IBaseFilter IBaseFilter_iface;
-
-    LONG refCount;
-    CRITICAL_SECTION csFilter;
-    FILTER_STATE state;
-    FILTER_INFO filterInfo;
-    CLSID clsid;
-    IPin **ppPins;
-    UINT nPins;
-} TestFilterImpl;
-
 static BOOL compare_time(ULONGLONG x, ULONGLONG y, unsigned int max_diff)
 {
     ULONGLONG diff = x > y ? x - y : y - x;

[PATCH 2/2] quartz/tests: Use CRT memory allocators.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/quartz/tests/filtergraph.c   | 11 ++---------
 dlls/quartz/tests/videorenderer.c |  5 ++---
 dlls/quartz/tests/vmr7.c          |  5 ++---
 dlls/quartz/tests/vmr9.c          |  5 ++---
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index b2d5b4e26e8..c663b5d8a99 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -23,7 +23,6 @@
 #define CONST_VTABLE

#include "dshow.h"
-#include "wine/heap.h"
 #include "wine/test.h"

static const GUID testguid = {0xabbccdde};
@@ -1486,14 +1485,8 @@ static HRESULT WINAPI testfilter_JoinFilterGraph(IBaseFilter *iface, IFilterGrap
     if (winetest_debug > 1) trace("%p->JoinFilterGraph(%p, %s)\n", filter, graph, wine_dbgstr_w(name));

filter->graph = graph;
-    heap_free(filter->name);
-    if (name)
-    {
-        filter->name = heap_alloc((wcslen(name) + 1) * sizeof(WCHAR));
-        wcscpy(filter->name, name);
-    }
-    else
-        filter->name = NULL;
+    free(filter->name);
+    filter->name = name ? wcsdup(name) : NULL;
     return S_OK;
 }

diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index ffe370acf43..f4d9660316c 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -20,7 +20,6 @@

#define COBJMACROS
 #include "dshow.h"
-#include "wine/heap.h"
 #include "wine/strmbase.h"
 #include "wine/test.h"

@@ -765,13 +764,13 @@ static DWORD WINAPI frame_thread(void *arg)
     hr = IMemInputPin_Receive(params->sink, params->sample);
     if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr);
     IMediaSample_Release(params->sample);
-    heap_free(params);
+    free(params);
     return hr;
 }

static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color)
 {
-    struct frame_thread_params *params = heap_alloc(sizeof(*params));
+    struct frame_thread_params *params = malloc(sizeof(*params));
     IMemAllocator *allocator;
     REFERENCE_TIME end_time;
     IMediaSample *sample;
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index ba2a98cb69d..212ce213e89 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -23,7 +23,6 @@
 #include "dshow.h"
 #include "d3d9.h"
 #include "vmr9.h"
-#include "wine/heap.h"
 #include "wine/strmbase.h"
 #include "wine/test.h"

@@ -969,13 +968,13 @@ static DWORD WINAPI frame_thread(void *arg)
     hr = IMemInputPin_Receive(params->sink, params->sample);
     if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr);
     IMediaSample_Release(params->sample);
-    heap_free(params);
+    free(params);
     return hr;
 }

static HANDLE send_frame(IMemInputPin *sink)
 {
-    struct frame_thread_params *params = heap_alloc(sizeof(*params));
+    struct frame_thread_params *params = malloc(sizeof(*params));
     REFERENCE_TIME start_time, end_time;
     IMemAllocator *allocator;
     IMediaSample *sample;
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index 8b46e4706a5..44b9a453305 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -28,7 +28,6 @@
 #include "d3d9.h"
 #include "vmr9.h"
 #include "wmcodecdsp.h"
-#include "wine/heap.h"
 #include "wine/strmbase.h"
 #include "wine/test.h"

@@ -976,13 +975,13 @@ static DWORD WINAPI frame_thread(void *arg)
     hr = IMemInputPin_Receive(params->sink, params->sample);
     if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr);
     IMediaSample_Release(params->sample);
-    heap_free(params);
+    free(params);
     return hr;
 }

static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, DWORD color)
 {
-    struct frame_thread_params *params = heap_alloc(sizeof(*params));
+    struct frame_thread_params *params = malloc(sizeof(*params));
     IMemAllocator *allocator;
     REFERENCE_TIME end_time;
     IMediaSample *sample;

[PATCH 2/2] quartz/tests: Use CRT memory allocators.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=90534

Your paranoid android.

=== w8 (32 bit report) ===

quartz:
videorenderer.c:2131: Test failed: Got unexpected status 0.

=== w1064_tsign (64 bit report) ===

quartz:
videorenderer.c:2131: Test failed: Got unexpected status 0.
videorenderer.c:2134: Test failed: Wait timed out.
videorenderer.c:2142: Test failed: Got unexpected status 0x400040.

=== w10pro64 (64 bit report) ===

quartz:
videorenderer.c:999: Test failed: Got hr 0x1.

=== w10pro64_ja (64 bit report) ===

quartz:
videorenderer.c:1096: Test failed: Got hr 0x80004005.

=== w10pro64 (32 bit report) ===

quartz:
vmr9.c:1203: Test failed: Got hr 0x40237.
vmr9.c:1209: Test failed: Got hr 0x1.