mf: Make freeing function optional for object activator.

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

mf: Make freeing function optional for object activator.
3a973ca8 · Nikolay Sivov · Alexandre Julliard · 4cd2ca96 · 3a973ca8 · 3a973ca8
Commit 3a973ca8 authored Jul 07, 2020 by Nikolay Sivov Committed by Alexandre Julliard Jul 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 15 deletions

evr.c dlls/mf/evr.c +2 -7

main.c dlls/mf/main.c +2 -1

sar.c dlls/mf/sar.c +2 -7

No files found.
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -258,15 +258,10 @@ static void evr_shutdown_object(void *user_context, IUnknown *obj)
    }
 }

-static void evr_free_private(void *user_context)
-{
-}
-
 static const struct activate_funcs evr_activate_funcs =
 {
-    evr_create_object,
-    evr_shutdown_object,
-    evr_free_private,
+    .create_object = evr_create_object,
+    .shutdown_object = evr_shutdown_object,
 };

 /***********************************************************************

--- a/dlls/mf/main.c
+++ b/dlls/mf/main.c
@@ -91,7 +91,8 @@ static ULONG WINAPI activate_object_Release(IMFActivate *iface)

    if (!refcount)
    {
-        activate->funcs->free_private(activate->context);
+        if (activate->funcs->free_private)
+            activate->funcs->free_private(activate->context);
        if (activate->object)
            IUnknown_Release(activate->object);
        IMFAttributes_Release(activate->attributes);

--- a/dlls/mf/sar.c
+++ b/dlls/mf/sar.c
@@ -1891,15 +1891,10 @@ static void sar_shutdown_object(void *user_context, IUnknown *obj)
    }
 }

-static void sar_free_private(void *user_context)
-{
-}
-
 static const struct activate_funcs sar_activate_funcs =
 {
-    sar_create_object,
-    sar_shutdown_object,
-    sar_free_private,
+    .create_object = sar_create_object,
+    .shutdown_object = sar_shutdown_object,
 };

 /***********************************************************************