Francois Gouget : winmm: Fix the mmTask*() prototypes.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Aug 30 13:50:24 CDT 2007
Module: wine
Branch: master
Commit: 7e8a9e3dfb9e58329162bec319694694e267f598
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8a9e3dfb9e58329162bec319694694e267f598
Author: Francois Gouget <fgouget at free.fr>
Date: Thu Aug 30 16:16:14 2007 +0200
winmm: Fix the mmTask*() prototypes.
---
dlls/winmm/winmm.c | 14 +++++++-------
include/mmddk.h | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 4be129a..6ead107 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -2817,7 +2817,7 @@ static DWORD WINAPI mmTaskRun(void* pmt)
/******************************************************************
* mmTaskCreate (WINMM.@)
*/
-MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD client)
+UINT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD_PTR client)
{
HANDLE hThread;
HANDLE hEvent = 0;
@@ -2846,7 +2846,7 @@ MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD client)
/******************************************************************
* mmTaskBlock (WINMM.@)
*/
-void WINAPI mmTaskBlock(HANDLE tid)
+VOID WINAPI mmTaskBlock(DWORD tid)
{
MSG msg;
@@ -2860,20 +2860,20 @@ void WINAPI mmTaskBlock(HANDLE tid)
/******************************************************************
* mmTaskSignal (WINMM.@)
*/
-BOOL WINAPI mmTaskSignal(HANDLE tid)
+BOOL WINAPI mmTaskSignal(DWORD tid)
{
- return PostThreadMessageW((DWORD)tid, WM_USER, 0, 0);
+ return PostThreadMessageW(tid, WM_USER, 0, 0);
}
/******************************************************************
* mmTaskYield (WINMM.@)
*/
-void WINAPI mmTaskYield(void) {}
+VOID WINAPI mmTaskYield(VOID) {}
/******************************************************************
* mmGetCurrentTask (WINMM.@)
*/
-HANDLE WINAPI mmGetCurrentTask(void)
+DWORD WINAPI mmGetCurrentTask(VOID)
{
- return (HANDLE)GetCurrentThreadId();
+ return GetCurrentThreadId();
}
diff --git a/include/mmddk.h b/include/mmddk.h
index 092a5f7..57d3e4b 100644
--- a/include/mmddk.h
+++ b/include/mmddk.h
@@ -453,15 +453,15 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable);
BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev,
DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
-typedef void (*LPTASKCALLBACK)(DWORD dwInst);
+typedef VOID (*LPTASKCALLBACK)(DWORD dwInst);
#define TASKERR_NOTASKSUPPORT 1
#define TASKERR_OUTOFMEMORY 2
-MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD);
-void WINAPI mmTaskBlock(HANDLE);
-BOOL WINAPI mmTaskSignal(HANDLE);
-void WINAPI mmTaskYield(void);
-HANDLE WINAPI mmGetCurrentTask(void);
+UINT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD_PTR);
+VOID WINAPI mmTaskBlock(DWORD);
+BOOL WINAPI mmTaskSignal(DWORD);
+VOID WINAPI mmTaskYield(VOID);
+DWORD WINAPI mmGetCurrentTask(VOID);
#ifdef __WINESRC__
#define WAVE_DIRECTSOUND 0x0080
More information about the wine-cvs
mailing list