diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-14 10:43:18 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-21 11:37:16 (GMT) |
| commit | c99872b59f30c160aa5f561b2a59e0631c826121 (patch) | |
| tree | ee062f126ed9595d29bbe95051058b15423dc338 /src | |
| parent | 350c60358810db14989cbee2252d47a13d4fe68f (diff) | |
| download | Qt-c99872b59f30c160aa5f561b2a59e0631c826121.zip Qt-c99872b59f30c160aa5f561b2a59e0631c826121.tar.gz Qt-c99872b59f30c160aa5f561b2a59e0631c826121.tar.bz2 | |
Fix signature of the waveInProc/waveOutProc callbacks.
Parameters are DWORD_PTR instead of DWORD, which did not matter
on 32bit but caused MinGW64-compiler warnings and potential
crashes on 64bit.
Change-Id: I840ae3ea7ea532746f73f20b3233cae842931d45
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
(cherry picked from qtmultimedia/699a5d75aab2de7e2c341be8533446597bee355e)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp index 80f2a3c..887b814 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.cpp +++ b/src/multimedia/audio/qaudioinput_win32_p.cpp @@ -80,7 +80,7 @@ QAudioInputPrivate::~QAudioInputPrivate() } void QT_WIN_CALLBACK QAudioInputPrivate::waveInProc( HWAVEIN hWaveIn, UINT uMsg, - DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ) + DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 ) { Q_UNUSED(dwParam1) Q_UNUSED(dwParam2) diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index c1c9b50..a51d85e 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -125,7 +125,7 @@ private: QMutex mutex; static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg, - DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); + DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 ); WAVEHDR* allocateBlocks(int size, int count); void freeBlocks(WAVEHDR* blockArray); diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index c14eb93..59e7ee8 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -131,7 +131,7 @@ QAudioOutputPrivate::~QAudioOutputPrivate() } void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg, - DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ) + DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 ) { Q_UNUSED(dwParam1) Q_UNUSED(dwParam2) diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h index 15361d0..376cbe7 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.h +++ b/src/multimedia/audio/qaudiooutput_win32_p.h @@ -118,7 +118,7 @@ private: bool pullMode; int intervalTime; static void QT_WIN_CALLBACK waveOutProc( HWAVEOUT hWaveOut, UINT uMsg, - DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); + DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 ); QMutex mutex; |