Francois Gouget : winmm: Make MCI_{MessageToString, strdupAtoW}() static and remove MCI_strdupWtoA().
Alexandre Julliard
julliard at winehq.org
Tue Aug 31 11:15:56 CDT 2010
Module: wine
Branch: master
Commit: f8c55fdcd1cd795fe5ec3d7a1274244ca2957da8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c55fdcd1cd795fe5ec3d7a1274244ca2957da8
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Aug 31 11:52:57 2010 +0200
winmm: Make MCI_{MessageToString,strdupAtoW}() static and remove MCI_strdupWtoA().
---
dlls/winmm/mci.c | 16 ++--------------
dlls/winmm/winemm.h | 3 ---
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index f65aee7..d604c98 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -144,7 +144,7 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName)
/**************************************************************************
* MCI_MessageToString [internal]
*/
-const char* MCI_MessageToString(UINT wMsg)
+static const char* MCI_MessageToString(UINT wMsg)
{
#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;
INT len;
@@ -225,18 +225,6 @@ LPWSTR MCI_strdupAtoW( LPCSTR str )
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)
{
if (msg < DRV_RESERVED) return 0;
diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h
index c0551d3..75dc1e4 100644
--- a/dlls/winmm/winemm.h
+++ b/dlls/winmm/winemm.h
@@ -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);
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);
-LPWSTR MCI_strdupAtoW(LPCSTR str);
-LPSTR MCI_strdupWtoA(LPCWSTR str);
const char* WINMM_ErrorToString(MMRESULT error);
More information about the wine-cvs
mailing list