system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 09:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xactengine3_7: Remove entry after FAudio Destroyed call.

Browse source 
FACTWaveBank_Destroy will invoke the callback which we
attempt to lookup the wavebank.

The callback must have a pointer, help states it isn't valid but still
points to the wavebank that was destroyed.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
This commit is contained in:
Alistair Leslie-Hughes 2022-07-22 12:34:27 +10:00 committed by Alexandre Julliard
parent 3d25202eaf
commit 5f6425f0ef
2 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/xactengine3_7/tests/xact3.c
View file

@ -172,9 +172,11 @@ static void WINAPI notification_cb(const XACT_NOTIFICATION *notification)
data->received = TRUE;
ok(notification->type == data->type,
"Unexpected notification type %u\n", notification->type);
todo_wine_if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED)
ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n",
if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED)
{
ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n",
notification->waveBank.pWaveBank, data->wave_bank);
}
ok(thread_id == data->thread_id, "Unexpected thread id %#lx instead of %#lx\n", thread_id, data->thread_id);
}

78
dlls/xactengine3_7/xact_dll.c
View file

@ -60,20 +60,6 @@ struct wrapper_lookup
void *xact;
};
static int wrapper_lookup_compare(const void *key, const struct wine_rb_entry *entry)
{
struct wrapper_lookup *lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry);
return (key > lookup->fact) - (key < lookup->fact);
}
static void wrapper_lookup_destroy(struct wine_rb_entry *entry, void *context)
{
struct wrapper_lookup *lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry);
HeapFree(GetProcessHeap(), 0, lookup);
}
typedef struct _XACT3EngineImpl {
IXACT3Engine IXACT3Engine_iface;
@ -89,6 +75,45 @@ typedef struct _XACT3EngineImpl {
CRITICAL_SECTION wb_wrapper_lookup_cs;
} XACT3EngineImpl;
static int wrapper_lookup_compare(const void *key, const struct wine_rb_entry *entry)
{
struct wrapper_lookup *lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry);
return (key > lookup->fact) - (key < lookup->fact);
}
static void wrapper_lookup_destroy(struct wine_rb_entry *entry, void *context)
{
struct wrapper_lookup *lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry);
HeapFree(GetProcessHeap(), 0, lookup);
}
static void wrapper_remove_entry(XACT3EngineImpl *engine, void *key)
{
struct wrapper_lookup *lookup;
struct wine_rb_entry *entry;
EnterCriticalSection(&engine->wb_wrapper_lookup_cs);
entry = wine_rb_get(&engine->wb_wrapper_lookup, key);
if (!entry)
{
LeaveCriticalSection(&engine->wb_wrapper_lookup_cs);
WARN("cannot find key in wrapper lookup\n");
}
else
{
wine_rb_remove(&engine->wb_wrapper_lookup, entry);
LeaveCriticalSection(&engine->wb_wrapper_lookup_cs);
lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry);
HeapFree(GetProcessHeap(), 0, lookup);
}
}
typedef struct _XACT3CueImpl {
IXACT3Cue IXACT3Cue_iface;
FACTCue *fact_cue;
@ -591,33 +616,14 @@ static inline XACT3WaveBankImpl *impl_from_IXACT3WaveBank(IXACT3WaveBank *iface)
static HRESULT WINAPI IXACT3WaveBankImpl_Destroy(IXACT3WaveBank *iface)
{
XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface);
struct wrapper_lookup *lookup;
struct wine_rb_entry *entry;
HRESULT hr;
TRACE("(%p)\n", This);
EnterCriticalSection(&This->engine->wb_wrapper_lookup_cs);
entry = wine_rb_get(&This->engine->wb_wrapper_lookup, This->fact_wavebank);
if (!entry)
{
LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs);
WARN("cannot find wave bank in wrapper lookup\n");
}
else
{
wine_rb_remove(&This->engine->wb_wrapper_lookup, entry);
LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs);
lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry);
HeapFree(GetProcessHeap(), 0, lookup);
}
hr = FACTWaveBank_Destroy(This->fact_wavebank);
wrapper_remove_entry(This->engine, This->fact_wavebank);
HeapFree(GetProcessHeap(), 0, This);
return hr;
}