xactengine3_7: Record context for each notications

This helps the first lockup but starting a game causes another freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49678Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>

xactengine3_7: Record context for each notications
5004b2b4 · Alistair Leslie-Hughes · Vitaly Lipatov · d6721355 · 5004b2b4
Commit 5004b2b4 authored Jul 20, 2022 by Alistair Leslie-Hughes Committed by Vitaly Lipatov Jul 30, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 11 deletions

xact_dll.c dlls/xactengine3_7/xact_dll.c +4 -11

No files found.
--- a/dlls/xactengine3_7/xact_dll.c
+++ b/dlls/xactengine3_7/xact_dll.c
@@ -69,8 +69,7 @@ typedef struct _XACT3EngineImpl {
    XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult;
    XACT_NOTIFICATION_CALLBACK notification_callback;

-    void *wb_prepared_context;
-    void *wb_destroyed_context;
+    void *contexts[17];
    struct wine_rb_tree wb_wrapper_lookup;
    CRITICAL_SECTION wb_wrapper_lookup_cs;
 } XACT3EngineImpl;
@@ -942,6 +941,7 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification)

    xnotification.type = xact_notification_type_from_fact(notification->type);
    xnotification.timeStamp = notification->timeStamp;
+    xnotification.pvContext = engine->contexts[notification->type - 1];

    if (notification->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED
            || notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED)
@@ -959,10 +959,6 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification)
            xnotification.waveBank.pWaveBank = lookup->xact;
        }
        LeaveCriticalSection(&engine->wb_wrapper_lookup_cs);
-        if (notification->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED)
-            xnotification.pvContext = engine->wb_prepared_context;
-        else
-            xnotification.pvContext = engine->wb_destroyed_context;
    }
    else
    {
@@ -1421,12 +1417,8 @@ static HRESULT WINAPI IXACT3EngineImpl_RegisterNotification(IXACT3Engine *iface,

    TRACE("(%p)->(%p)\n", This, pNotificationDesc);

-    if (pNotificationDesc->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED)
-        This->wb_prepared_context = pNotificationDesc->pvContext;
-    else if (pNotificationDesc->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED)
-        This->wb_destroyed_context = pNotificationDesc->pvContext;
-
    unwrap_notificationdesc(&fdesc, pNotificationDesc);
+    This->contexts[pNotificationDesc->type - 1] = pNotificationDesc->pvContext;
    fdesc.pvContext = This;
    return FACTAudioEngine_RegisterNotification(This->fact_engine, &fdesc);
 }
@@ -1440,6 +1432,7 @@ static HRESULT WINAPI IXACT3EngineImpl_UnRegisterNotification(IXACT3Engine *ifac
    TRACE("(%p)->(%p)\n", This, pNotificationDesc);

    unwrap_notificationdesc(&fdesc, pNotificationDesc);
+    This->contexts[pNotificationDesc->type - 1] = pNotificationDesc->pvContext;
    fdesc.pvContext = This;
    return FACTAudioEngine_UnRegisterNotification(This->fact_engine, &fdesc);
 }