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
db5344e4
Commit
db5344e4
authored
12 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
dsound: Drop a redundant 'IDirectSound8' from the method names.
parent
bf4481d3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/dsound/dsound.c
+34
-55
34 additions, 55 deletions
dlls/dsound/dsound.c
with
34 additions
and
55 deletions
dlls/dsound/dsound.c
+
34
−
55
View file @
db5344e4
...
...
@@ -62,7 +62,6 @@ struct IDirectSound8_IDirectSound8 {
};
static
HRESULT
IDirectSound8_IDirectSound8_Create
(
LPDIRECTSOUND8
pds
,
LPDIRECTSOUND8
*
ppds
);
static
ULONG
WINAPI
IDirectSound8_IDirectSound8_AddRef
(
LPDIRECTSOUND8
iface
);
typedef
struct
IDirectSoundImpl
{
IUnknown
IUnknown_iface
;
/* Separate refcount, not for COM aggregation */
...
...
@@ -183,7 +182,7 @@ static HRESULT DSOUND_QueryInterface(
return
E_NOINTERFACE
;
}
}
IDirectSound8_
IDirectSound8_AddRef
(
This
->
pDS8
);
IDirectSound8_AddRef
(
This
->
pDS8
);
*
ppobj
=
This
->
pDS8
;
return
S_OK
;
}
...
...
@@ -412,20 +411,17 @@ static HRESULT IDirectSound_IDirectSound_Create(
}
/*******************************************************************************
*
IDirectSound8
_IDirectSound8
*
IDirectSound8
Implementation
*/
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_QueryInterface
(
LPDIRECTSOUND8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
static
HRESULT
WINAPI
IDirectSound8Impl_QueryInterface
(
IDirectSound8
*
iface
,
REFIID
riid
,
void
**
ppobj
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p,%s,%p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppobj
);
return
DSOUND_QueryInterface
(
This
->
pds
,
riid
,
ppobj
);
}
static
ULONG
WINAPI
IDirectSound8_IDirectSound8_AddRef
(
LPDIRECTSOUND8
iface
)
static
ULONG
WINAPI
IDirectSound8Impl_AddRef
(
IDirectSound8
*
iface
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
(
This
->
ref
));
...
...
@@ -433,8 +429,7 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(
return
ref
;
}
static
ULONG
WINAPI
IDirectSound8_IDirectSound8_Release
(
LPDIRECTSOUND8
iface
)
static
ULONG
WINAPI
IDirectSound8Impl_Release
(
IDirectSound8
*
iface
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
(
This
->
ref
));
...
...
@@ -448,104 +443,88 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_Release(
return
ref
;
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_CreateSoundBuffer
(
LPDIRECTSOUND8
iface
,
LPCDSBUFFERDESC
dsbd
,
LPLPDIRECTSOUNDBUFFER
ppdsb
,
LPUNKNOWN
lpunk
)
static
HRESULT
WINAPI
IDirectSound8Impl_CreateSoundBuffer
(
IDirectSound8
*
iface
,
const
DSBUFFERDESC
*
dsbd
,
IDirectSoundBuffer
**
ppdsb
,
IUnknown
*
lpunk
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p,%p,%p,%p)
\n
"
,
This
,
dsbd
,
ppdsb
,
lpunk
);
return
DirectSoundDevice_CreateSoundBuffer
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
dsbd
,
ppdsb
,
lpunk
,
TRUE
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_GetCaps
(
LPDIRECTSOUND8
iface
,
LPDSCAPS
lpDSCaps
)
static
HRESULT
WINAPI
IDirectSound8Impl_GetCaps
(
IDirectSound8
*
iface
,
DSCAPS
*
lpDSCaps
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p,%p)
\n
"
,
This
,
lpDSCaps
);
return
DirectSoundDevice_GetCaps
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
lpDSCaps
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_DuplicateSoundBuffer
(
LPDIRECTSOUND8
iface
,
LPDIRECTSOUNDBUFFER
psb
,
LPLPDIRECTSOUNDBUFFER
ppdsb
)
static
HRESULT
WINAPI
IDirectSound8Impl_DuplicateSoundBuffer
(
IDirectSound8
*
iface
,
IDirectSoundBuffer
*
psb
,
IDirectSoundBuffer
**
ppdsb
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p,%p,%p)
\n
"
,
This
,
psb
,
ppdsb
);
return
DirectSoundDevice_DuplicateSoundBuffer
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
psb
,
ppdsb
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_SetCooperativeLevel
(
LPDIRECTSOUND8
iface
,
HWND
hwnd
,
DWORD
level
)
static
HRESULT
WINAPI
IDirectSound8Impl_SetCooperativeLevel
(
IDirectSound8
*
iface
,
HWND
hwnd
,
DWORD
level
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p,%p,%s)
\n
"
,
This
,
hwnd
,
dumpCooperativeLevel
(
level
));
return
DirectSoundDevice_SetCooperativeLevel
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
hwnd
,
level
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_Compact
(
LPDIRECTSOUND8
iface
)
static
HRESULT
WINAPI
IDirectSound8Impl_Compact
(
IDirectSound8
*
iface
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p)
\n
"
,
This
);
return
DirectSoundDevice_Compact
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_GetSpeakerConfig
(
LPDIRECTSOUND8
iface
,
LPDWORD
lpdwSpeakerConfig
)
static
HRESULT
WINAPI
IDirectSound8Impl_GetSpeakerConfig
(
IDirectSound8
*
iface
,
DWORD
*
lpdwSpeakerConfig
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p, %p)
\n
"
,
This
,
lpdwSpeakerConfig
);
return
DirectSoundDevice_GetSpeakerConfig
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
lpdwSpeakerConfig
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_SetSpeakerConfig
(
LPDIRECTSOUND8
iface
,
DWORD
config
)
static
HRESULT
WINAPI
IDirectSound8Impl_SetSpeakerConfig
(
IDirectSound8
*
iface
,
DWORD
config
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p,0x%08x)
\n
"
,
This
,
config
);
return
DirectSoundDevice_SetSpeakerConfig
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
config
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_Initialize
(
LPDIRECTSOUND8
iface
,
LPCGUID
lpcGuid
)
static
HRESULT
WINAPI
IDirectSound8Impl_Initialize
(
IDirectSound8
*
iface
,
const
GUID
*
lpcGuid
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p, %s)
\n
"
,
This
,
debugstr_guid
(
lpcGuid
));
return
DirectSoundDevice_Initialize
(
&
((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
lpcGuid
);
}
static
HRESULT
WINAPI
IDirectSound8_IDirectSound8_VerifyCertification
(
LPDIRECTSOUND8
iface
,
LPDWORD
pdwCertified
)
static
HRESULT
WINAPI
IDirectSound8Impl_VerifyCertification
(
IDirectSound8
*
iface
,
DWORD
*
pdwCertified
)
{
IDirectSound8_IDirectSound8
*
This
=
(
IDirectSound8_IDirectSound8
*
)
iface
;
TRACE
(
"(%p, %p)
\n
"
,
This
,
pdwCertified
);
return
DirectSoundDevice_VerifyCertification
(((
IDirectSoundImpl
*
)
This
->
pds
)
->
device
,
pdwCertified
);
}
static
const
IDirectSound8Vtbl
DirectSound8_DirectSoun
d8_
V
tbl
=
static
const
IDirectSound8Vtbl
d
s
8_
v
tbl
=
{
IDirectSound8
_IDirectSound8
_QueryInterface
,
IDirectSound8
_IDirectSound8
_AddRef
,
IDirectSound8
_IDirectSound8
_Release
,
IDirectSound8
_IDirectSound8
_CreateSoundBuffer
,
IDirectSound8
_IDirectSound8
_GetCaps
,
IDirectSound8
_IDirectSound8
_DuplicateSoundBuffer
,
IDirectSound8
_IDirectSound8
_SetCooperativeLevel
,
IDirectSound8
_IDirectSound8
_Compact
,
IDirectSound8
_IDirectSound8
_GetSpeakerConfig
,
IDirectSound8
_IDirectSound8
_SetSpeakerConfig
,
IDirectSound8
_IDirectSound8
_Initialize
,
IDirectSound8
_IDirectSound8
_VerifyCertification
IDirectSound8
Impl
_QueryInterface
,
IDirectSound8
Impl
_AddRef
,
IDirectSound8
Impl
_Release
,
IDirectSound8
Impl
_CreateSoundBuffer
,
IDirectSound8
Impl
_GetCaps
,
IDirectSound8
Impl
_DuplicateSoundBuffer
,
IDirectSound8
Impl
_SetCooperativeLevel
,
IDirectSound8
Impl
_Compact
,
IDirectSound8
Impl
_GetSpeakerConfig
,
IDirectSound8
Impl
_SetSpeakerConfig
,
IDirectSound8
Impl
_Initialize
,
IDirectSound8
Impl
_VerifyCertification
};
static
HRESULT
IDirectSound8_IDirectSound8_Create
(
...
...
@@ -573,7 +552,7 @@ static HRESULT IDirectSound8_IDirectSound8_Create(
return
DSERR_OUTOFMEMORY
;
}
pdsds
->
lpVtbl
=
&
DirectSound8_DirectSoun
d8_
V
tbl
;
pdsds
->
lpVtbl
=
&
d
s
8_
v
tbl
;
pdsds
->
ref
=
0
;
pdsds
->
pds
=
pds
;
...
...
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