Skip to content

W
wine-winehq
Commit 23439a0a authored by Carlo Bramini's avatar Carlo Bramini Committed by Alexandre Julliard
Browse files
Options

winmm: Fix wrong return type for midiInOpen and midiOutOpen.

Signed-off-by: 's avatarCarlo Bramini <carlo_bramini@users.sourceforge.net> Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f9ef81b3
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/winmm/winmm.c
View file @ 23439a0a
...@@ -413,12 +413,12 @@ static LPWINE_MIDI MIDI_OutAlloc(HMIDIOUT* lphMidiOut, DWORD_PTR* lpdwCallback, ...@@ -413,12 +413,12 @@ static LPWINE_MIDI MIDI_OutAlloc(HMIDIOUT* lphMidiOut, DWORD_PTR* lpdwCallback,
/************************************************************************** /**************************************************************************
* midiOutOpen [WINMM.@] * midiOutOpen [WINMM.@]
*/ */
UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID,
DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags)
{ {
HMIDIOUT hMidiOut; HMIDIOUT hMidiOut;
LPWINE_MIDI lpwm; LPWINE_MIDI lpwm;
UINT dwRet; MMRESULT dwRet;
TRACE("(%p, %d, %08lX, %08lX, %08X);\n", TRACE("(%p, %d, %08lX, %08lX, %08X);\n",
lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags);
...@@ -699,12 +699,12 @@ UINT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSi ...@@ -699,12 +699,12 @@ UINT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSi
/************************************************************************** /**************************************************************************
* midiInOpen [WINMM.@] * midiInOpen [WINMM.@]
*/ */
UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID,
DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags)
{ {
HANDLE hMidiIn; HANDLE hMidiIn;
LPWINE_MIDI lpwm; LPWINE_MIDI lpwm;
DWORD dwRet; MMRESULT dwRet;
TRACE("(%p, %d, %08lX, %08lX, %08X);\n", TRACE("(%p, %d, %08lX, %08lX, %08X);\n",
lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags);
......
include/mmsystem.h
View file @ 23439a0a
...@@ -778,7 +778,7 @@ UINT WINAPI midiOutSetVolume(HMIDIOUT,DWORD); ...@@ -778,7 +778,7 @@ UINT WINAPI midiOutSetVolume(HMIDIOUT,DWORD);
UINT WINAPI midiOutGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiOutGetErrorTextA(UINT,LPSTR,UINT);
UINT WINAPI midiOutGetErrorTextW(UINT,LPWSTR,UINT); UINT WINAPI midiOutGetErrorTextW(UINT,LPWSTR,UINT);
#define midiOutGetErrorText WINELIB_NAME_AW(midiOutGetErrorText) #define midiOutGetErrorText WINELIB_NAME_AW(midiOutGetErrorText)
UINT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD);
UINT WINAPI midiOutClose(HMIDIOUT); UINT WINAPI midiOutClose(HMIDIOUT);
UINT WINAPI midiOutPrepareHeader(HMIDIOUT,MIDIHDR*,UINT); UINT WINAPI midiOutPrepareHeader(HMIDIOUT,MIDIHDR*,UINT);
UINT WINAPI midiOutUnprepareHeader(HMIDIOUT,MIDIHDR*,UINT); UINT WINAPI midiOutUnprepareHeader(HMIDIOUT,MIDIHDR*,UINT);
...@@ -797,7 +797,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); ...@@ -797,7 +797,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT);
UINT WINAPI midiInGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiInGetErrorTextA(UINT,LPSTR,UINT);
UINT WINAPI midiInGetErrorTextW(UINT,LPWSTR,UINT); UINT WINAPI midiInGetErrorTextW(UINT,LPWSTR,UINT);
#define midiInGetErrorText WINELIB_NAME_AW(midiInGetErrorText) #define midiInGetErrorText WINELIB_NAME_AW(midiInGetErrorText)
UINT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD);
UINT WINAPI midiInClose(HMIDIIN); UINT WINAPI midiInClose(HMIDIIN);
UINT WINAPI midiInPrepareHeader(HMIDIIN,MIDIHDR*,UINT); UINT WINAPI midiInPrepareHeader(HMIDIIN,MIDIHDR*,UINT);
UINT WINAPI midiInUnprepareHeader(HMIDIIN,MIDIHDR*,UINT); UINT WINAPI midiInUnprepareHeader(HMIDIIN,MIDIHDR*,UINT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment