msacm32: Reference count local drivers.

One local driver can be assigned to multiple driver ids. When releasing the driver id, check if the reference count of a local driver is one before actually releasing the local driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46520Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msacm32: Reference count local drivers.
bbdf6d5e · Zhiyi Zhang · Alexandre Julliard · 699eb8cd · bbdf6d5e · bbdf6d5e
Commit bbdf6d5e authored Jan 26, 2019 by Zhiyi Zhang Committed by Alexandre Julliard Jan 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

internal.c dlls/msacm32/internal.c +11 -1

wineacm.h dlls/msacm32/wineacm.h +1 -0

No files found.
--- a/dlls/msacm32/internal.c
+++ b/dlls/msacm32/internal.c
@@ -737,12 +737,17 @@ static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver;
 static PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv)
 {
    PWINE_ACMLOCALDRIVER pNextACMLocalDriver;
+    LONG ref;

    if (paldrv->pACMInstList) {
        ERR("local driver instances still present after closing all drivers - memory leak\n");
        return NULL;
    }

+    ref = InterlockedDecrement(&paldrv->ref);
+    if (ref)
+        return paldrv;
+
    if (paldrv == MSACM_pFirstACMLocalDriver)
        MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv;
    if (paldrv == MSACM_pLastACMLocalDriver)
@@ -883,7 +888,11 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri
    /* look up previous instance of local driver module */
    for (paldrv = MSACM_pFirstACMLocalDriver; paldrv; paldrv = paldrv->pNextACMLocalDrv)
    {
-        if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) return paldrv;
+        if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc)
+        {
+            InterlockedIncrement(&paldrv->ref);
+            return paldrv;
+        }
    }

    paldrv = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER));
@@ -892,6 +901,7 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri
    paldrv->hModule = hModule;
    paldrv->lpDrvProc = lpDriverProc;
    paldrv->pACMInstList = NULL;
+    paldrv->ref = 1;

    paldrv->pNextACMLocalDrv = NULL;
    paldrv->pPrevACMLocalDrv = MSACM_pLastACMLocalDriver;

--- a/dlls/msacm32/wineacm.h
+++ b/dlls/msacm32/wineacm.h
@@ -52,6 +52,7 @@ typedef struct _WINE_ACMLOCALDRIVER
    PWINE_ACMLOCALDRIVERINST pACMInstList;
    PWINE_ACMLOCALDRIVER pNextACMLocalDrv;
    PWINE_ACMLOCALDRIVER pPrevACMLocalDrv;
+    LONG                ref;
 } WINE_ACMLOCALDRIVER;

 typedef struct _WINE_ACMLOCALDRIVERINST