Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
9ab1cfb5
Commit
9ab1cfb5
authored
10 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
dmloader: COM cleanup for IDirectMusicContainer.
parent
8a15ea11
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/dmloader/container.c
+80
-59
80 additions, 59 deletions
dlls/dmloader/container.c
dlls/dmloader/dmloader_private.h
+0
-21
0 additions, 21 deletions
dlls/dmloader/dmloader_private.h
with
80 additions
and
80 deletions
dlls/dmloader/container.c
+
80
−
59
View file @
9ab1cfb5
...
...
@@ -27,14 +27,24 @@ WINE_DECLARE_DEBUG_CHANNEL(dmdump);
#define DMUS_MAX_NAME_SIZE DMUS_MAX_NAME*sizeof(WCHAR)
#define DMUS_MAX_FILENAME_SIZE DMUS_MAX_FILENAME*sizeof(WCHAR)
static
ULONG
WINAPI
IDirectMusicContainerImpl_IDirectMusicContainer_AddRef
(
LPDIRECTMUSICCONTAINER
iface
);
static
ULONG
WINAPI
IDirectMusicContainerImpl_IDirectMusicObject_AddRef
(
LPDIRECTMUSICOBJECT
iface
);
static
ULONG
WINAPI
IDirectMusicContainerImpl_IPersistStream_AddRef
(
LPPERSISTSTREAM
iface
);
/*****************************************************************************
* IDirectMusicContainerImpl implementation
*/
/* IUnknown/IDirectMusicContainer part: */
typedef
struct
IDirectMusicContainerImpl
{
IDirectMusicContainer
IDirectMusicContainer_iface
;
const
IDirectMusicObjectVtbl
*
ObjectVtbl
;
const
IPersistStreamVtbl
*
PersistStreamVtbl
;
LONG
ref
;
IStream
*
pStream
;
DMUS_IO_CONTAINER_HEADER
Header
;
/* header */
struct
list
*
pContainedObjects
;
/* data */
DMUS_OBJECTDESC
Desc
;
}
IDirectMusicContainerImpl
;
static
inline
IDirectMusicContainerImpl
*
impl_from_IDirectMusicContainer
(
IDirectMusicContainer
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IDirectMusicContainerImpl
,
IDirectMusicContainer_iface
);
}
static
HRESULT
destroy_dmcontainer
(
IDirectMusicContainerImpl
*
This
)
{
...
...
@@ -72,52 +82,59 @@ static HRESULT destroy_dmcontainer(IDirectMusicContainerImpl *This)
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicContainerImpl_IDirectMusicContainer_QueryInterface
(
LPDIRECTMUSICCONTAINER
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
ContainerVtbl
,
iface
);
TRACE
(
"(%p, %s, %p)
\n
"
,
This
,
debugstr_dmguid
(
riid
),
ppobj
);
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IDirectMusicContainer
))
{
*
ppobj
=
&
This
->
ContainerVtbl
;
IDirectMusicContainerImpl_IDirectMusicContainer_AddRef
((
LPDIRECTMUSICCONTAINER
)
&
This
->
ContainerVtbl
);
return
S_OK
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IDirectMusicObject
))
{
*
ppobj
=
&
This
->
ObjectVtbl
;
IDirectMusicContainerImpl_IDirectMusicObject_AddRef
((
LPDIRECTMUSICOBJECT
)
&
This
->
ObjectVtbl
);
return
S_OK
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IPersistStream
))
{
*
ppobj
=
&
This
->
PersistStreamVtbl
;
IDirectMusicContainerImpl_IPersistStream_AddRef
((
LPPERSISTSTREAM
)
&
This
->
PersistStreamVtbl
);
return
S_OK
;
}
WARN
(
": not found
\n
"
);
return
E_NOINTERFACE
;
static
HRESULT
WINAPI
IDirectMusicContainerImpl_QueryInterface
(
IDirectMusicContainer
*
iface
,
REFIID
riid
,
void
**
ret_iface
)
{
IDirectMusicContainerImpl
*
This
=
impl_from_IDirectMusicContainer
(
iface
);
TRACE
(
"(%p, %s, %p)
\n
"
,
This
,
debugstr_dmguid
(
riid
),
ret_iface
);
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IDirectMusicContainer
))
*
ret_iface
=
&
This
->
IDirectMusicContainer_iface
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IDirectMusicObject
))
*
ret_iface
=
&
This
->
ObjectVtbl
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IPersistStream
))
*
ret_iface
=
&
This
->
PersistStreamVtbl
;
else
{
WARN
(
"Unknown interface %s
\n
"
,
debugstr_dmguid
(
riid
));
*
ret_iface
=
NULL
;
return
E_NOINTERFACE
;
}
IUnknown_AddRef
((
IUnknown
*
)
*
ret_iface
);
return
S_OK
;
}
static
ULONG
WINAPI
IDirectMusicContainerImpl_IDirectMusicContainer_AddRef
(
LPDIRECTMUSICCONTAINER
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
ContainerVtbl
,
iface
);
TRACE
(
"(%p): AddRef from %d
\n
"
,
This
,
This
->
dwRef
);
return
InterlockedIncrement
(
&
This
->
dwRef
);
static
ULONG
WINAPI
IDirectMusicContainerImpl_AddRef
(
IDirectMusicContainer
*
iface
)
{
IDirectMusicContainerImpl
*
This
=
impl_from_IDirectMusicContainer
(
iface
);
LONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref=%d
\n
"
,
This
,
ref
);
return
ref
;
}
static
ULONG
WINAPI
IDirectMusicContainerImpl_IDirectMusicContainer_Release
(
LPDIRECTMUSICCONTAINER
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
ContainerVtbl
,
iface
);
DWORD
dwRef
=
InterlockedDecrement
(
&
This
->
dwRef
);
TRACE
(
"(%p): ReleaseRef to %d
\n
"
,
This
,
dwRef
);
if
(
dwRef
==
0
)
{
if
(
This
->
pStream
)
destroy_dmcontainer
(
This
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
unlock_module
();
}
return
dwRef
;
static
ULONG
WINAPI
IDirectMusicContainerImpl_Release
(
IDirectMusicContainer
*
iface
)
{
IDirectMusicContainerImpl
*
This
=
impl_from_IDirectMusicContainer
(
iface
);
LONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref=%d
\n
"
,
This
,
ref
);
if
(
!
ref
)
{
if
(
This
->
pStream
)
destroy_dmcontainer
(
This
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
unlock_module
();
}
return
ref
;
}
static
HRESULT
WINAPI
IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject
(
LPDIRECTMUSICCONTAINER
iface
,
REFGUID
rguidClass
,
DWORD
dwIndex
,
LPDMUS_OBJECTDESC
pDesc
,
WCHAR
*
pwszAlias
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
ContainerVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicContainerImpl_EnumObject
(
IDirectMusicContainer
*
iface
,
REFGUID
rguidClass
,
DWORD
dwIndex
,
DMUS_OBJECTDESC
*
pDesc
,
WCHAR
*
pwszAlias
)
{
IDirectMusicContainerImpl
*
This
=
impl_from_IDirectMusicContainer
(
iface
);
struct
list
*
pEntry
;
LPWINE_CONTAINER_ENTRY
pContainedObject
;
DWORD
dwCount
=
0
;
...
...
@@ -155,27 +172,27 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject
return
S_FALSE
;
}
static
const
IDirectMusicContainerVtbl
DirectMusicContainer_Container_V
tbl
=
{
IDirectMusicContainerImpl_
IDirectMusicContainer_
QueryInterface
,
IDirectMusicContainerImpl_
IDirectMusicContainer_
AddRef
,
IDirectMusicContainerImpl_
IDirectMusicContainer_
Release
,
IDirectMusicContainerImpl_
IDirectMusicContainer_
EnumObject
static
const
IDirectMusicContainerVtbl
dmcontainer_v
tbl
=
{
IDirectMusicContainerImpl_QueryInterface
,
IDirectMusicContainerImpl_AddRef
,
IDirectMusicContainerImpl_Release
,
IDirectMusicContainerImpl_EnumObject
};
/* IDirectMusicObject part: */
static
HRESULT
WINAPI
IDirectMusicContainerImpl_IDirectMusicObject_QueryInterface
(
LPDIRECTMUSICOBJECT
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
ObjectVtbl
,
iface
);
return
IDirectMusicContainerImpl_
IDirectMusicContainer_QueryInterface
((
LPDIRECTMUSICCONTAINER
)
&
This
->
Container
Vtbl
,
riid
,
ppobj
);
return
IDirectMusicContainerImpl_
QueryInterface
(
&
This
->
IDirectMusic
Container
_iface
,
riid
,
ppobj
);
}
static
ULONG
WINAPI
IDirectMusicContainerImpl_IDirectMusicObject_AddRef
(
LPDIRECTMUSICOBJECT
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
ObjectVtbl
,
iface
);
return
IDirectMusicContainer
Impl_
IDirectMusicContainer_
AddRef
((
LPDIRECTMUSICCONTAINER
)
&
This
->
ContainerVtbl
);
return
IDirectMusicContainer
_AddRef
(
&
This
->
IDirectMusicContainer_
iface
);
}
static
ULONG
WINAPI
IDirectMusicContainerImpl_IDirectMusicObject_Release
(
LPDIRECTMUSICOBJECT
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
ObjectVtbl
,
iface
);
return
IDirectMusicContainerImpl_IDirectMusicContainer_
Release
((
LPDIRECTMUSICCONTAINER
)
&
This
->
ContainerVtbl
);
return
IDirectMusicContainerImpl_
Release
(
&
This
->
IDirectMusicContainer_
iface
);
}
static
HRESULT
WINAPI
IDirectMusicContainerImpl_IDirectMusicObject_GetDescriptor
(
LPDIRECTMUSICOBJECT
iface
,
LPDMUS_OBJECTDESC
pDesc
)
{
...
...
@@ -439,17 +456,17 @@ static const IDirectMusicObjectVtbl DirectMusicContainer_Object_Vtbl = {
/* IPersistStream part: */
static
HRESULT
WINAPI
IDirectMusicContainerImpl_IPersistStream_QueryInterface
(
LPPERSISTSTREAM
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
PersistStreamVtbl
,
iface
);
return
IDirectMusicContainerImpl_
IDirectMusicContainer_QueryInterface
((
LPDIRECTMUSICCONTAINER
)
&
This
->
Container
Vtbl
,
riid
,
ppobj
);
return
IDirectMusicContainerImpl_
QueryInterface
(
&
This
->
IDirectMusic
Container
_iface
,
riid
,
ppobj
);
}
static
ULONG
WINAPI
IDirectMusicContainerImpl_IPersistStream_AddRef
(
LPPERSISTSTREAM
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
PersistStreamVtbl
,
iface
);
return
IDirectMusicContainer
Impl_
IDirectMusicContainer_
AddRef
((
LPDIRECTMUSICCONTAINER
)
&
This
->
ContainerVtbl
);
return
IDirectMusicContainer
_AddRef
(
&
This
->
IDirectMusicContainer_
iface
);
}
static
ULONG
WINAPI
IDirectMusicContainerImpl_IPersistStream_Release
(
LPPERSISTSTREAM
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicContainerImpl
,
PersistStreamVtbl
,
iface
);
return
IDirectMusicContainerImpl_IDirectMusicContainer_
Release
((
LPDIRECTMUSICCONTAINER
)
&
This
->
ContainerVtbl
);
return
IDirectMusicContainerImpl_
Release
(
&
This
->
IDirectMusicContainer_
iface
);
}
static
HRESULT
WINAPI
IDirectMusicContainerImpl_IPersistStream_GetClassID
(
LPPERSISTSTREAM
iface
,
CLSID
*
pClassID
)
{
...
...
@@ -913,20 +930,24 @@ static const IPersistStreamVtbl DirectMusicContainer_PersistStream_Vtbl = {
HRESULT
WINAPI
create_dmcontainer
(
REFIID
lpcGUID
,
void
**
ppobj
)
{
IDirectMusicContainerImpl
*
obj
;
HRESULT
hr
;
obj
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IDirectMusicContainerImpl
));
if
(
NULL
==
obj
)
{
*
ppobj
=
NULL
;
return
E_OUTOFMEMORY
;
}
obj
->
ContainerVtbl
=
&
DirectMusicContainer_
C
ontainer_
V
tbl
;
obj
->
I
DirectMusicContainer_
iface
.
lpVtbl
=
&
dmc
ontainer_
v
tbl
;
obj
->
ObjectVtbl
=
&
DirectMusicContainer_Object_Vtbl
;
obj
->
PersistStreamVtbl
=
&
DirectMusicContainer_PersistStream_Vtbl
;
obj
->
dwRef
=
0
;
/* will be inited by QueryInterface */
obj
->
ref
=
1
;
obj
->
pContainedObjects
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
struct
list
));
list_init
(
obj
->
pContainedObjects
);
lock_module
();
return
IDirectMusicContainerImpl_IDirectMusicContainer_QueryInterface
((
LPDIRECTMUSICCONTAINER
)
&
obj
->
ContainerVtbl
,
lpcGUID
,
ppobj
);
hr
=
IDirectMusicContainer_QueryInterface
(
&
obj
->
IDirectMusicContainer_iface
,
lpcGUID
,
ppobj
);
IDirectMusicContainer_Release
(
&
obj
->
IDirectMusicContainer_iface
);
return
hr
;
}
This diff is collapsed.
Click to expand it.
dlls/dmloader/dmloader_private.h
+
0
−
21
View file @
9ab1cfb5
...
...
@@ -56,7 +56,6 @@ typedef struct IDirectMusicLoaderCF IDirectMusicLoaderCF;
typedef
struct
IDirectMusicContainerCF
IDirectMusicContainerCF
;
typedef
struct
IDirectMusicLoaderImpl
IDirectMusicLoaderImpl
;
typedef
struct
IDirectMusicContainerImpl
IDirectMusicContainerImpl
;
typedef
struct
IDirectMusicLoaderFileStream
IDirectMusicLoaderFileStream
;
typedef
struct
IDirectMusicLoaderResourceStream
IDirectMusicLoaderResourceStream
;
...
...
@@ -109,26 +108,6 @@ typedef struct _WINE_CONTAINER_ENTRY {
LPDIRECTMUSICOBJECT
pObject
;
/* needed when releasing from loader's cache on container release */
}
WINE_CONTAINER_ENTRY
,
*
LPWINE_CONTAINER_ENTRY
;
/*****************************************************************************
* IDirectMusicContainerImpl implementation structure
*/
struct
IDirectMusicContainerImpl
{
/* VTABLEs */
const
IDirectMusicContainerVtbl
*
ContainerVtbl
;
const
IDirectMusicObjectVtbl
*
ObjectVtbl
;
const
IPersistStreamVtbl
*
PersistStreamVtbl
;
/* reference counter */
LONG
dwRef
;
/* stream */
LPSTREAM
pStream
;
/* header */
DMUS_IO_CONTAINER_HEADER
Header
;
/* data */
struct
list
*
pContainedObjects
;
/* descriptor */
DMUS_OBJECTDESC
Desc
;
};
/*****************************************************************************
* IDirectMusicLoaderFileStream implementation structure
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment