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
Releases
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
Felix Münchhalfen
wine
Commits
c24ca67f
Commit
c24ca67f
authored
20 years ago
by
Ge van Geldorp
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Match PSDK definitions for LPCWAVEFORMATEX.
parent
77928370
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/winmm/winemm.h
+1
-1
1 addition, 1 deletion
dlls/winmm/winemm.h
dlls/winmm/winmm.c
+7
-7
7 additions, 7 deletions
dlls/winmm/winmm.c
include/dsound.h
+0
-5
0 additions, 5 deletions
include/dsound.h
include/mmsystem.h
+4
-3
4 additions, 3 deletions
include/mmsystem.h
with
12 additions
and
16 deletions
dlls/winmm/winemm.h
+
1
−
1
View file @
c24ca67f
...
...
@@ -267,7 +267,7 @@ MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID,
DWORD
cMidi
,
DWORD_PTR
dwCallback
,
DWORD_PTR
dwInstance
,
DWORD
fdwOpen
,
BOOL
bFrom32
);
UINT
WAVE_Open
(
HANDLE
*
lphndl
,
UINT
uDeviceID
,
UINT
uType
,
const
LPWAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
LP
C
WAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
DWORD_PTR
dwInstance
,
DWORD
dwFlags
,
BOOL
bFrom32
);
HMMIO
MMIO_Open
(
LPSTR
szFileName
,
MMIOINFO
*
refmminfo
,
...
...
This diff is collapsed.
Click to expand it.
dlls/winmm/winmm.c
+
7
−
7
View file @
c24ca67f
...
...
@@ -671,7 +671,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd,
/**************************************************************************
* mixerMessage [WINMM.@]
*/
UINT
WINAPI
mixerMessage
(
HMIXER
hmix
,
UINT
uMsg
,
DWORD_PTR
dwParam1
,
DWORD_PTR
dwParam2
)
DWORD
WINAPI
mixerMessage
(
HMIXER
hmix
,
UINT
uMsg
,
DWORD_PTR
dwParam1
,
DWORD_PTR
dwParam2
)
{
LPWINE_MLD
wmld
;
...
...
@@ -2491,7 +2491,7 @@ MMRESULT WINAPI midiStreamStop(HMIDISTRM hMidiStrm)
}
UINT
WAVE_Open
(
HANDLE
*
lphndl
,
UINT
uDeviceID
,
UINT
uType
,
const
LPWAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
LP
C
WAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
DWORD_PTR
dwInstance
,
DWORD
dwFlags
,
BOOL
bFrom32
)
{
HANDLE
handle
;
...
...
@@ -2528,7 +2528,7 @@ UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType,
}
wod
.
hWave
=
handle
;
wod
.
lpFormat
=
lpFormat
;
/* should the struct be copied iso pointer? */
wod
.
lpFormat
=
(
LPWAVEFORMATEX
)
lpFormat
;
/* should the struct be copied iso pointer? */
wod
.
dwCallback
=
dwCallback
;
wod
.
dwInstance
=
dwInstance
;
wod
.
dnDevNode
=
0L
;
...
...
@@ -2674,8 +2674,8 @@ UINT WINAPI waveOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
* waveOutOpen [WINMM.@]
* All the args/structs have the same layout as the win16 equivalents
*/
UIN
T
WINAPI
waveOutOpen
(
LPHWAVEOUT
lphWaveOut
,
UINT
uDeviceID
,
const
LPWAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
MMRESUL
T
WINAPI
waveOutOpen
(
LPHWAVEOUT
lphWaveOut
,
UINT
uDeviceID
,
LP
C
WAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
DWORD_PTR
dwInstance
,
DWORD
dwFlags
)
{
return
WAVE_Open
((
HANDLE
*
)
lphWaveOut
,
uDeviceID
,
MMDRV_WAVEOUT
,
lpFormat
,
...
...
@@ -3060,8 +3060,8 @@ UINT WINAPI waveInGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
/**************************************************************************
* waveInOpen [WINMM.@]
*/
UIN
T
WINAPI
waveInOpen
(
HWAVEIN
*
lphWaveIn
,
UINT
uDeviceID
,
const
LPWAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
MMRESUL
T
WINAPI
waveInOpen
(
HWAVEIN
*
lphWaveIn
,
UINT
uDeviceID
,
LP
C
WAVEFORMATEX
lpFormat
,
DWORD_PTR
dwCallback
,
DWORD_PTR
dwInstance
,
DWORD
dwFlags
)
{
return
WAVE_Open
((
HANDLE
*
)
lphWaveIn
,
uDeviceID
,
MMDRV_WAVEIN
,
lpFormat
,
...
...
This diff is collapsed.
Click to expand it.
include/dsound.h
+
0
−
5
View file @
c24ca67f
...
...
@@ -389,11 +389,6 @@ typedef const DSCBCAPS *LPCDSCBCAPS;
typedef
const
GUID
*
LPCGUID
;
#endif
#ifndef _LPCWAVEFORMATEX_DEFINED
#define _LPCWAVEFORMATEX_DEFINED
typedef
const
WAVEFORMATEX
*
LPCWAVEFORMATEX
;
#endif
typedef
LPVOID
*
LPLPVOID
;
typedef
BOOL
(
CALLBACK
*
LPDSENUMCALLBACKW
)(
LPGUID
,
LPCWSTR
,
LPCWSTR
,
LPVOID
);
...
...
This diff is collapsed.
Click to expand it.
include/mmsystem.h
+
4
−
3
View file @
c24ca67f
...
...
@@ -485,6 +485,7 @@ typedef struct tWAVEFORMATEX {
WORD
cbSize
;
}
WAVEFORMATEX
,
*
LPWAVEFORMATEX
,
*
NPWAVEFORMATEX
,
*
PWAVEFORMATEX
;
#endif
typedef
const
WAVEFORMATEX
*
LPCWAVEFORMATEX
;
UINT
WINAPI
waveOutGetNumDevs
(
void
);
UINT
WINAPI
waveOutGetDevCapsA
(
UINT_PTR
,
LPWAVEOUTCAPSA
,
UINT
);
...
...
@@ -495,7 +496,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT,DWORD);
UINT
WINAPI
waveOutGetErrorTextA
(
UINT
,
LPSTR
,
UINT
);
UINT
WINAPI
waveOutGetErrorTextW
(
UINT
,
LPWSTR
,
UINT
);
#define waveOutGetErrorText WINELIB_NAME_AW(waveOutGetErrorText)
UINT
WINAPI
waveOutOpen
(
HWAVEOUT
*
,
UINT
,
const
LPWAVEFORMATEX
,
DWORD_PTR
,
DWORD_PTR
,
DWORD
);
MMRESULT
WINAPI
waveOutOpen
(
HWAVEOUT
*
,
UINT
,
LP
C
WAVEFORMATEX
,
DWORD_PTR
,
DWORD_PTR
,
DWORD
);
UINT
WINAPI
waveOutClose
(
HWAVEOUT
);
UINT
WINAPI
waveOutPrepareHeader
(
HWAVEOUT
,
WAVEHDR
*
,
UINT
);
UINT
WINAPI
waveOutUnprepareHeader
(
HWAVEOUT
,
WAVEHDR
*
,
UINT
);
...
...
@@ -518,7 +519,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT);
UINT
WINAPI
waveInGetErrorTextA
(
UINT
,
LPSTR
,
UINT
);
UINT
WINAPI
waveInGetErrorTextW
(
UINT
,
LPWSTR
,
UINT
);
#define waveInGetErrorText WINELIB_NAME_AW(waveInGetErrorText)
UINT
WINAPI
waveInOpen
(
HWAVEIN
*
,
UINT
,
const
LPWAVEFORMATEX
,
DWORD_PTR
,
DWORD_PTR
,
DWORD
);
MMRESULT
WINAPI
waveInOpen
(
HWAVEIN
*
,
UINT
,
LP
C
WAVEFORMATEX
,
DWORD_PTR
,
DWORD_PTR
,
DWORD
);
UINT
WINAPI
waveInClose
(
HWAVEIN
);
UINT
WINAPI
waveInPrepareHeader
(
HWAVEIN
,
WAVEHDR
*
,
UINT
);
UINT
WINAPI
waveInUnprepareHeader
(
HWAVEIN
,
WAVEHDR
*
,
UINT
);
...
...
@@ -1485,7 +1486,7 @@ typedef struct {
UINT
WINAPI
mixerGetNumDevs
(
void
);
UINT
WINAPI
mixerOpen
(
LPHMIXER
,
UINT
,
DWORD_PTR
,
DWORD_PTR
,
DWORD
);
UINT
WINAPI
mixerClose
(
HMIXER
);
UINT
WINAPI
mixerMessage
(
HMIXER
,
UINT
,
DWORD_PTR
,
DWORD_PTR
);
DWORD
WINAPI
mixerMessage
(
HMIXER
,
UINT
,
DWORD_PTR
,
DWORD_PTR
);
UINT
WINAPI
mixerGetDevCapsA
(
UINT_PTR
,
LPMIXERCAPSA
,
UINT
);
UINT
WINAPI
mixerGetDevCapsW
(
UINT_PTR
,
LPMIXERCAPSW
,
UINT
);
#define mixerGetDevCaps WINELIB_NAME_AW(mixerGetDevCaps)
...
...
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