Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
0028eb55
Commit
0028eb55
authored
May 31, 2007
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Jun 01, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mciwave: Fix compilation warnings in 64-bit mode.
parent
0067279c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
mciwave.c
dlls/mciwave/mciwave.c
+12
-12
No files found.
dlls/mciwave/mciwave.c
View file @
0028eb55
...
@@ -65,8 +65,8 @@ typedef struct {
...
@@ -65,8 +65,8 @@ typedef struct {
struct
SCA
{
struct
SCA
{
UINT
wDevID
;
UINT
wDevID
;
UINT
wMsg
;
UINT
wMsg
;
DWORD
dwParam1
;
DWORD
_PTR
dwParam1
;
DWORD
dwParam2
;
DWORD
_PTR
dwParam2
;
};
};
/**************************************************************************
/**************************************************************************
...
@@ -77,10 +77,10 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg)
...
@@ -77,10 +77,10 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg)
struct
SCA
*
sca
=
(
struct
SCA
*
)
arg
;
struct
SCA
*
sca
=
(
struct
SCA
*
)
arg
;
DWORD
ret
;
DWORD
ret
;
TRACE
(
"In thread before async command (%08x,%u,%08
x,%08
x)
\n
"
,
TRACE
(
"In thread before async command (%08x,%u,%08
lx,%08l
x)
\n
"
,
sca
->
wDevID
,
sca
->
wMsg
,
sca
->
dwParam1
,
sca
->
dwParam2
);
sca
->
wDevID
,
sca
->
wMsg
,
sca
->
dwParam1
,
sca
->
dwParam2
);
ret
=
mciSendCommandA
(
sca
->
wDevID
,
sca
->
wMsg
,
sca
->
dwParam1
|
MCI_WAIT
,
sca
->
dwParam2
);
ret
=
mciSendCommandA
(
sca
->
wDevID
,
sca
->
wMsg
,
sca
->
dwParam1
|
MCI_WAIT
,
sca
->
dwParam2
);
TRACE
(
"In thread after async command (%08x,%u,%08
x,%08
x)
\n
"
,
TRACE
(
"In thread after async command (%08x,%u,%08
lx,%08l
x)
\n
"
,
sca
->
wDevID
,
sca
->
wMsg
,
sca
->
dwParam1
,
sca
->
dwParam2
);
sca
->
wDevID
,
sca
->
wMsg
,
sca
->
dwParam1
,
sca
->
dwParam2
);
HeapFree
(
GetProcessHeap
(),
0
,
sca
);
HeapFree
(
GetProcessHeap
(),
0
,
sca
);
ExitThread
(
ret
);
ExitThread
(
ret
);
...
@@ -92,8 +92,8 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg)
...
@@ -92,8 +92,8 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg)
/**************************************************************************
/**************************************************************************
* MCI_SendCommandAsync [internal]
* MCI_SendCommandAsync [internal]
*/
*/
static
DWORD
MCI_SendCommandAsync
(
UINT
wDevID
,
UINT
wMsg
,
DWORD
dwParam1
,
static
DWORD
MCI_SendCommandAsync
(
UINT
wDevID
,
UINT
wMsg
,
DWORD
_PTR
dwParam1
,
DWORD
dwParam2
,
UINT
size
)
DWORD
_PTR
dwParam2
,
UINT
size
)
{
{
HANDLE
handle
;
HANDLE
handle
;
struct
SCA
*
sca
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
struct
SCA
)
+
size
);
struct
SCA
*
sca
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
struct
SCA
)
+
size
);
...
@@ -106,7 +106,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1,
...
@@ -106,7 +106,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1,
sca
->
dwParam1
=
dwParam1
;
sca
->
dwParam1
=
dwParam1
;
if
(
size
&&
dwParam2
)
{
if
(
size
&&
dwParam2
)
{
sca
->
dwParam2
=
(
DWORD
)
sca
+
sizeof
(
struct
SCA
);
sca
->
dwParam2
=
(
DWORD
_PTR
)
sca
+
sizeof
(
struct
SCA
);
/* copy structure passed by program in dwParam2 to be sure
/* copy structure passed by program in dwParam2 to be sure
* we can still use it whatever the program does
* we can still use it whatever the program does
*/
*/
...
@@ -145,7 +145,7 @@ static LRESULT WAVE_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp)
...
@@ -145,7 +145,7 @@ static LRESULT WAVE_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp)
return
0
;
return
0
;
wmw
->
wDevID
=
modp
->
wDeviceID
;
wmw
->
wDevID
=
modp
->
wDeviceID
;
mciSetDriverData
(
wmw
->
wDevID
,
(
DWORD
)
wmw
);
mciSetDriverData
(
wmw
->
wDevID
,
(
DWORD
_PTR
)
wmw
);
modp
->
wCustomCommandTable
=
MCI_NO_COMMAND_TABLE
;
modp
->
wCustomCommandTable
=
MCI_NO_COMMAND_TABLE
;
modp
->
wType
=
MCI_DEVTYPE_WAVEFORM_AUDIO
;
modp
->
wType
=
MCI_DEVTYPE_WAVEFORM_AUDIO
;
...
@@ -736,7 +736,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp
...
@@ -736,7 +736,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp
if
(
!
(
dwFlags
&
MCI_WAIT
))
{
if
(
!
(
dwFlags
&
MCI_WAIT
))
{
return
MCI_SendCommandAsync
(
wmw
->
openParms
.
wDeviceID
,
MCI_PLAY
,
dwFlags
,
return
MCI_SendCommandAsync
(
wmw
->
openParms
.
wDeviceID
,
MCI_PLAY
,
dwFlags
,
(
DWORD
)
lpParms
,
sizeof
(
MCI_PLAY_PARMS
));
(
DWORD
_PTR
)
lpParms
,
sizeof
(
MCI_PLAY_PARMS
));
}
}
end
=
0xFFFFFFFF
;
end
=
0xFFFFFFFF
;
...
@@ -795,7 +795,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp
...
@@ -795,7 +795,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp
*/
*/
/* FIXME: how to choose between several output channels ? here mapper is forced */
/* FIXME: how to choose between several output channels ? here mapper is forced */
dwRet
=
waveOutOpen
((
HWAVEOUT
*
)
&
wmw
->
hWave
,
WAVE_MAPPER
,
wmw
->
lpWaveFormat
,
dwRet
=
waveOutOpen
((
HWAVEOUT
*
)
&
wmw
->
hWave
,
WAVE_MAPPER
,
wmw
->
lpWaveFormat
,
(
DWORD
)
WAVE_mciPlayCallback
,
(
DWORD
)
wmw
,
CALLBACK_FUNCTION
);
(
DWORD
_PTR
)
WAVE_mciPlayCallback
,
(
DWORD_PTR
)
wmw
,
CALLBACK_FUNCTION
);
if
(
dwRet
!=
0
)
{
if
(
dwRet
!=
0
)
{
TRACE
(
"Can't open low level audio device %d
\n
"
,
dwRet
);
TRACE
(
"Can't open low level audio device %d
\n
"
,
dwRet
);
...
@@ -978,7 +978,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM
...
@@ -978,7 +978,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM
if
(
!
(
dwFlags
&
MCI_WAIT
))
{
if
(
!
(
dwFlags
&
MCI_WAIT
))
{
return
MCI_SendCommandAsync
(
wmw
->
openParms
.
wDeviceID
,
MCI_RECORD
,
dwFlags
,
return
MCI_SendCommandAsync
(
wmw
->
openParms
.
wDeviceID
,
MCI_RECORD
,
dwFlags
,
(
DWORD
)
lpParms
,
sizeof
(
MCI_RECORD_PARMS
));
(
DWORD
_PTR
)
lpParms
,
sizeof
(
MCI_RECORD_PARMS
));
}
}
/* FIXME: we only re-create the RIFF structure from an existing file (if any)
/* FIXME: we only re-create the RIFF structure from an existing file (if any)
...
@@ -1028,7 +1028,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM
...
@@ -1028,7 +1028,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM
*/
*/
/* FIXME: how to choose between several output channels ? here mapper is forced */
/* FIXME: how to choose between several output channels ? here mapper is forced */
dwRet
=
waveInOpen
((
HWAVEIN
*
)
&
wmw
->
hWave
,
WAVE_MAPPER
,
wmw
->
lpWaveFormat
,
dwRet
=
waveInOpen
((
HWAVEIN
*
)
&
wmw
->
hWave
,
WAVE_MAPPER
,
wmw
->
lpWaveFormat
,
(
DWORD
)
WAVE_mciRecordCallback
,
(
DWORD
)
wmw
,
CALLBACK_FUNCTION
);
(
DWORD
_PTR
)
WAVE_mciRecordCallback
,
(
DWORD_PTR
)
wmw
,
CALLBACK_FUNCTION
);
if
(
dwRet
!=
MMSYSERR_NOERROR
)
{
if
(
dwRet
!=
MMSYSERR_NOERROR
)
{
TRACE
(
"Can't open low level audio device %d
\n
"
,
dwRet
);
TRACE
(
"Can't open low level audio device %d
\n
"
,
dwRet
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment