ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winmm: Make MCI_{MessageToString,strdupAtoW}() static and remove MCI_strdupWtoA().

This commit is contained in:
Francois Gouget 2010-08-31 11:52:57 +02:00 committed by Alexandre Julliard
parent b520cc1aed
commit f8c55fdcd1
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/winmm/mci.c
View File

@ -144,7 +144,7 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName)
/************************************************************************** /**************************************************************************
* MCI_MessageToString [internal] * MCI_MessageToString [internal]
*/ */
const char* MCI_MessageToString(UINT wMsg) static const char* MCI_MessageToString(UINT wMsg)
{ {
#define CASE(s) case (s): return #s #define CASE(s) case (s): return #s
@ -213,7 +213,7 @@ const char* MCI_MessageToString(UINT wMsg)
} }
} }
LPWSTR MCI_strdupAtoW( LPCSTR str ) static LPWSTR MCI_strdupAtoW( LPCSTR str )
{ {
LPWSTR ret; LPWSTR ret;
INT len; INT len;
@ -225,18 +225,6 @@ LPWSTR MCI_strdupAtoW( LPCSTR str )
return ret; return ret;
} }
LPSTR MCI_strdupWtoA( LPCWSTR str )
{
LPSTR ret;
INT len;
if (!str) return NULL;
len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL );
ret = HeapAlloc( GetProcessHeap(), 0, len );
if (ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL );
return ret;
}
static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2) static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2)
{ {
if (msg < DRV_RESERVED) return 0; if (msg < DRV_RESERVED) return 0;

3
dlls/winmm/winemm.h
View File

@ -145,10 +145,7 @@ LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT ds
DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
const char* MCI_MessageToString(UINT wMsg);
DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
LPWSTR MCI_strdupAtoW(LPCSTR str);
LPSTR MCI_strdupWtoA(LPCWSTR str);
const char* WINMM_ErrorToString(MMRESULT error); const char* WINMM_ErrorToString(MMRESULT error);