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
Lorenzo Ferrillo
wine
Commits
44292573
Commit
44292573
authored
14 years ago
by
Maarten Lankhorst
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
dsound: COM cleanup property sets.
parent
dd2c7d0d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/dsound/dsound_private.h
+1
-14
1 addition, 14 deletions
dlls/dsound/dsound_private.h
dlls/dsound/propset.c
+20
-9
20 additions, 9 deletions
dlls/dsound/propset.c
with
21 additions
and
23 deletions
dlls/dsound/dsound_private.h
+
1
−
14
View file @
44292573
...
...
@@ -57,7 +57,6 @@ typedef struct IDirectSoundCaptureNotifyImpl IDirectSoundCaptureNotifyImpl;
typedef
struct
IDirectSound3DListenerImpl
IDirectSound3DListenerImpl
;
typedef
struct
IDirectSound3DBufferImpl
IDirectSound3DBufferImpl
;
typedef
struct
IKsBufferPropertySetImpl
IKsBufferPropertySetImpl
;
typedef
struct
IKsPrivatePropertySetImpl
IKsPrivatePropertySetImpl
;
typedef
struct
PrimaryBufferImpl
PrimaryBufferImpl
;
typedef
struct
SecondaryBufferImpl
SecondaryBufferImpl
;
typedef
struct
DirectSoundDevice
DirectSoundDevice
;
...
...
@@ -329,19 +328,7 @@ HRESULT IKsBufferPropertySetImpl_Create(
HRESULT
IKsBufferPropertySetImpl_Destroy
(
IKsBufferPropertySetImpl
*
piks
);
/*****************************************************************************
* IKsPrivatePropertySet implementation structure
*/
struct
IKsPrivatePropertySetImpl
{
/* IUnknown fields */
const
IKsPropertySetVtbl
*
lpVtbl
;
LONG
ref
;
};
HRESULT
IKsPrivatePropertySetImpl_Create
(
REFIID
riid
,
IKsPrivatePropertySetImpl
**
piks
);
HRESULT
IKsPrivatePropertySetImpl_Create
(
REFIID
riid
,
IKsPropertySet
**
piks
);
/*****************************************************************************
* IDirectSound3DBuffer implementation structure
...
...
This diff is collapsed.
Click to expand it.
dlls/dsound/propset.c
+
20
−
9
View file @
44292573
...
...
@@ -44,6 +44,17 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
dsound
);
typedef
struct
IKsPrivatePropertySetImpl
{
IKsPropertySet
IKsPropertySet_iface
;
LONG
ref
;
}
IKsPrivatePropertySetImpl
;
static
IKsPrivatePropertySetImpl
*
impl_from_IKsPropertySet
(
IKsPropertySet
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IKsPrivatePropertySetImpl
,
IKsPropertySet_iface
);
}
/*******************************************************************************
* IKsPrivatePropertySet
*/
...
...
@@ -54,7 +65,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface(
REFIID
riid
,
LPVOID
*
ppobj
)
{
IKsPrivatePropertySetImpl
*
This
=
(
IKsPrivate
PropertySet
Impl
*
)
iface
;
IKsPrivatePropertySetImpl
*
This
=
impl_from_IKs
PropertySet
(
iface
)
;
TRACE
(
"(%p,%s,%p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppobj
);
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
...
...
@@ -69,7 +80,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface(
static
ULONG
WINAPI
IKsPrivatePropertySetImpl_AddRef
(
LPKSPROPERTYSET
iface
)
{
IKsPrivatePropertySetImpl
*
This
=
(
IKsPrivate
PropertySet
Impl
*
)
iface
;
IKsPrivatePropertySetImpl
*
This
=
impl_from_IKs
PropertySet
(
iface
)
;
ULONG
ref
=
InterlockedIncrement
(
&
(
This
->
ref
));
TRACE
(
"(%p) ref was %d
\n
"
,
This
,
ref
-
1
);
return
ref
;
...
...
@@ -77,7 +88,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface)
static
ULONG
WINAPI
IKsPrivatePropertySetImpl_Release
(
LPKSPROPERTYSET
iface
)
{
IKsPrivatePropertySetImpl
*
This
=
(
IKsPrivate
PropertySet
Impl
*
)
iface
;
IKsPrivatePropertySetImpl
*
This
=
impl_from_IKs
PropertySet
(
iface
)
;
ULONG
ref
=
InterlockedDecrement
(
&
(
This
->
ref
));
TRACE
(
"(%p) ref was %d
\n
"
,
This
,
ref
+
1
);
...
...
@@ -514,7 +525,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
ULONG
cbPropData
,
PULONG
pcbReturned
)
{
IKsPrivatePropertySetImpl
*
This
=
(
IKsPrivate
PropertySet
Impl
*
)
iface
;
IKsPrivatePropertySetImpl
*
This
=
impl_from_IKs
PropertySet
(
iface
)
;
TRACE
(
"(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)
\n
"
,
This
,
debugstr_guid
(
guidPropSet
),
dwPropID
,
pInstanceData
,
cbInstanceData
,
pPropData
,
cbPropData
,
pcbReturned
);
...
...
@@ -561,7 +572,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Set(
LPVOID
pPropData
,
ULONG
cbPropData
)
{
IKsPrivatePropertySetImpl
*
This
=
(
IKsPrivate
PropertySet
Impl
*
)
iface
;
IKsPrivatePropertySetImpl
*
This
=
impl_from_IKs
PropertySet
(
iface
)
;
FIXME
(
"(%p,%s,%d,%p,%d,%p,%d), stub!
\n
"
,
This
,
debugstr_guid
(
guidPropSet
),
dwPropID
,
pInstanceData
,
cbInstanceData
,
pPropData
,
cbPropData
);
return
E_PROP_ID_UNSUPPORTED
;
...
...
@@ -573,7 +584,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport(
ULONG
dwPropID
,
PULONG
pTypeSupport
)
{
IKsPrivatePropertySetImpl
*
This
=
(
IKsPrivate
PropertySet
Impl
*
)
iface
;
IKsPrivatePropertySetImpl
*
This
=
impl_from_IKs
PropertySet
(
iface
)
;
TRACE
(
"(%p,%s,%d,%p)
\n
"
,
This
,
debugstr_guid
(
guidPropSet
),
dwPropID
,
pTypeSupport
);
if
(
IsEqualGUID
(
&
DSPROPSETID_DirectSoundDevice
,
guidPropSet
)
)
{
...
...
@@ -624,7 +635,7 @@ static const IKsPropertySetVtbl ikspvt = {
HRESULT
IKsPrivatePropertySetImpl_Create
(
REFIID
riid
,
IKsPr
ivatePr
opertySet
Impl
**
piks
)
IKsPropertySet
**
piks
)
{
IKsPrivatePropertySetImpl
*
iks
;
TRACE
(
"(%s, %p)
\n
"
,
debugstr_guid
(
riid
),
piks
);
...
...
@@ -637,8 +648,8 @@ HRESULT IKsPrivatePropertySetImpl_Create(
iks
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
*
iks
));
iks
->
ref
=
1
;
iks
->
lpVtbl
=
&
ikspvt
;
iks
->
IKsPropertySet_iface
.
lpVtbl
=
&
ikspvt
;
*
piks
=
iks
;
*
piks
=
&
iks
->
IKsPropertySet_iface
;
return
S_OK
;
}
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