Nikolay Sivov : mfplat/tests: Link to MFHeap* functions directly.

Alexandre Julliard julliard at winehq.org
Mon Mar 30 16:24:26 CDT 2020


Module: wine
Branch: master
Commit: b2885d14d6ffa26247e45ba42355a23c9f3a97fe
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b2885d14d6ffa26247e45ba42355a23c9f3a97fe

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Mar 30 14:21:26 2020 +0300

mfplat/tests: Link to MFHeap* functions directly.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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)




More information about the wine-cvs mailing list