system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

dmime: Get rid of the IDirectMusicGraphImpl typedef.

Browse source
This commit is contained in:
Rémi Bernon 2023-09-04 22:37:56 +02:00 committed by Alexandre Julliard
parent fec9d2c22e
commit 5d97483f22
3 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/dmime/audiopath.c
View file

@ -158,11 +158,11 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud
{
if (IsEqualIID (iidInterface, &IID_IDirectMusicGraph)) {
if (NULL == This->pToolGraph) {
IDirectMusicGraphImpl* pGraph;
IDirectMusicGraph* pGraph;
hr = create_dmgraph(&IID_IDirectMusicGraph, (void**)&pGraph);
if (FAILED(hr))
return hr;
This->pToolGraph = (IDirectMusicGraph*) pGraph;
This->pToolGraph = pGraph;
}
*ppObject = This->pToolGraph;
IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) *ppObject);
@ -191,14 +191,14 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud
IDirectMusicGraph* pPerfoGraph = NULL;
IDirectMusicPerformance8_GetGraph(This->pPerf, &pPerfoGraph);
if (NULL == pPerfoGraph) {
IDirectMusicGraphImpl* pGraph = NULL;
IDirectMusicGraph* pGraph = NULL;
hr = create_dmgraph(&IID_IDirectMusicGraph, (void**)&pGraph);
if (FAILED(hr))
return hr;
IDirectMusicPerformance8_SetGraph(This->pPerf, (IDirectMusicGraph*) pGraph);
IDirectMusicPerformance8_SetGraph(This->pPerf, pGraph);
/* we need release as SetGraph do an AddRef */
IDirectMusicGraph_Release((LPDIRECTMUSICGRAPH) pGraph);
pPerfoGraph = (LPDIRECTMUSICGRAPH) pGraph;
IDirectMusicGraph_Release(pGraph);
pPerfoGraph = pGraph;
}
*ppObject = pPerfoGraph;
return S_OK;

1
dlls/dmime/dmime_private.h
View file

@ -45,7 +45,6 @@
/*****************************************************************************
* Interfaces
*/
typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl;
typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl;
/*****************************************************************************

37
dlls/dmime/graph.c
View file

@ -28,27 +28,28 @@ struct tool_entry
IDirectMusicTool *tool;
};
struct IDirectMusicGraphImpl {
IDirectMusicGraph IDirectMusicGraph_iface;
struct dmobject dmobj;
LONG ref;
struct graph
{
IDirectMusicGraph IDirectMusicGraph_iface;
struct dmobject dmobj;
LONG ref;
struct list tools;
struct list tools;
};
static inline IDirectMusicGraphImpl *impl_from_IDirectMusicGraph(IDirectMusicGraph *iface)
static inline struct graph *impl_from_IDirectMusicGraph(IDirectMusicGraph *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicGraphImpl, IDirectMusicGraph_iface);
return CONTAINING_RECORD(iface, struct graph, IDirectMusicGraph_iface);
}
static inline IDirectMusicGraphImpl *impl_from_IPersistStream(IPersistStream *iface)
static inline struct graph *impl_from_IPersistStream(IPersistStream *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicGraphImpl, dmobj.IPersistStream_iface);
return CONTAINING_RECORD(iface, struct graph, dmobj.IPersistStream_iface);
}
static HRESULT WINAPI graph_QueryInterface(IDirectMusicGraph *iface, REFIID riid, void **ret_iface)
{
IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface);
struct graph *This = impl_from_IDirectMusicGraph(iface);
TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ret_iface);
@ -76,7 +77,7 @@ static HRESULT WINAPI graph_QueryInterface(IDirectMusicGraph *iface, REFIID riid
static ULONG WINAPI graph_AddRef(IDirectMusicGraph *iface)
{
IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface);
struct graph *This = impl_from_IDirectMusicGraph(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p): %ld\n", This, ref);
@ -86,7 +87,7 @@ static ULONG WINAPI graph_AddRef(IDirectMusicGraph *iface)
static ULONG WINAPI graph_Release(IDirectMusicGraph *iface)
{
IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface);
struct graph *This = impl_from_IDirectMusicGraph(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p): %ld\n", This, ref);
@ -110,7 +111,7 @@ static ULONG WINAPI graph_Release(IDirectMusicGraph *iface)
static HRESULT WINAPI graph_StampPMsg(IDirectMusicGraph *iface, DMUS_PMSG *msg)
{
IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface);
struct graph *This = impl_from_IDirectMusicGraph(iface);
FIXME("(%p, %p): stub\n", This, msg);
return S_OK;
}
@ -118,7 +119,7 @@ static HRESULT WINAPI graph_StampPMsg(IDirectMusicGraph *iface, DMUS_PMSG *msg)
static HRESULT WINAPI graph_InsertTool(IDirectMusicGraph *iface, IDirectMusicTool *tool,
DWORD *channels, DWORD channel_count, LONG index)
{
IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface);
struct graph *This = impl_from_IDirectMusicGraph(iface);
struct tool_entry *entry, *next;
TRACE("(%p, %p, %p, %ld, %li)\n", This, tool, channels, channel_count, index);
@ -142,7 +143,7 @@ static HRESULT WINAPI graph_InsertTool(IDirectMusicGraph *iface, IDirectMusicToo
static HRESULT WINAPI graph_GetTool(IDirectMusicGraph *iface, DWORD index, IDirectMusicTool **ret_tool)
{
IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface);
struct graph *This = impl_from_IDirectMusicGraph(iface);
struct tool_entry *entry;
TRACE("(%p, %ld, %p)\n", This, index, ret_tool);
@ -164,7 +165,7 @@ static HRESULT WINAPI graph_GetTool(IDirectMusicGraph *iface, DWORD index, IDire
static HRESULT WINAPI graph_RemoveTool(IDirectMusicGraph *iface, IDirectMusicTool *tool)
{
IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface);
struct graph *This = impl_from_IDirectMusicGraph(iface);
struct tool_entry *entry;
TRACE("(%p, %p)\n", This, tool);
@ -240,7 +241,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = {
static HRESULT WINAPI graph_IPersistStream_Load(IPersistStream *iface, IStream *stream)
{
IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface);
struct graph *This = impl_from_IPersistStream(iface);
FIXME("(%p, %p): Loading not implemented yet\n", This, stream);
@ -262,7 +263,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
/* for ClassFactory */
HRESULT create_dmgraph(REFIID riid, void **ret_iface)
{
IDirectMusicGraphImpl* obj;
struct graph *obj;
HRESULT hr;
*ret_iface = NULL;