[PATCH 3/6] mfplat/tests: Link to MFHeap* functions directly.

Nikolay Sivov nsivov at codeweavers.com
Mon Mar 30 06:21:26 CDT 2020


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/mfplat/tests/mfplat.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 185bacdebe..78d73b7580 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -76,8 +76,6 @@ static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *s
 static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager);
 static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver);
 static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream);
-static void*   (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type);
-static void    (WINAPI *pMFHeapFree)(void *p);
 static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key);
 static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue);
 static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key);
@@ -678,8 +676,6 @@ static void init_functions(void)
     X(MFCreateTransformActivate);
     X(MFGetPlaneSize);
     X(MFGetStrideForBitmapInfoHeader);
-    X(MFHeapAlloc);
-    X(MFHeapFree);
     X(MFPutWaitingWorkItem);
     X(MFRegisterLocalByteStreamHandler);
     X(MFRegisterLocalSchemeHandler);
@@ -2483,16 +2479,10 @@ static void test_MFHeapAlloc(void)
 {
     void *res;
 
-    if (!pMFHeapAlloc)
-    {
-        win_skip("MFHeapAlloc() is not available.\n");
-        return;
-    }
-
-    res = pMFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore);
+    res = MFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore);
     ok(res != NULL, "MFHeapAlloc failed.\n");
 
-    pMFHeapFree(res);
+    MFHeapFree(res);
 }
 
 static void test_scheduled_items(void)
-- 
2.25.1




More information about the wine-devel mailing list