gcc 4.0 warning fixes.
This commit is contained in:
parent
e0097da1de
commit
82434be6a9
|
@ -63,7 +63,7 @@ void ExitMP3(struct mpstr *mp)
|
|||
}
|
||||
}
|
||||
|
||||
static struct buf *addbuf(struct mpstr *mp,char *buf,int size)
|
||||
static struct buf *addbuf(struct mpstr *mp,const unsigned char *buf,int size)
|
||||
{
|
||||
struct buf *nbuf;
|
||||
|
||||
|
@ -151,7 +151,7 @@ static void read_head(struct mpstr *mp)
|
|||
mp->header = head;
|
||||
}
|
||||
|
||||
int decodeMP3(struct mpstr *mp,char *in,int isize,char *out,
|
||||
int decodeMP3(struct mpstr *mp,const unsigned char *in,int isize,unsigned char *out,
|
||||
int osize,int *done)
|
||||
{
|
||||
int len;
|
||||
|
|
|
@ -150,7 +150,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi,
|
|||
int size, ret;
|
||||
DWORD dpos = 0;
|
||||
|
||||
ret = decodeMP3(&amd->mp, (unsigned char*)src, *nsrc, dst, *ndst, &size);
|
||||
ret = decodeMP3(&amd->mp, src, *nsrc, dst, *ndst, &size);
|
||||
if (ret != MP3_OK)
|
||||
{
|
||||
*ndst = *nsrc = 0;
|
||||
|
|
|
@ -60,8 +60,8 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
BOOL InitMP3(struct mpstr *mp);
|
||||
int decodeMP3(struct mpstr *mp,char *inmemory,int inmemsize,
|
||||
char *outmemory,int outmemsize,int *done);
|
||||
int decodeMP3(struct mpstr *mp,const unsigned char *inmemory,int inmemsize,
|
||||
unsigned char *outmemory,int outmemsize,int *done);
|
||||
void ExitMP3(struct mpstr *mp);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
|||
typedef struct
|
||||
{
|
||||
const IStreamVtbl *lpVtbl;
|
||||
ULONG ref;
|
||||
LONG ref;
|
||||
HANDLE hFile;
|
||||
DWORD dwMode;
|
||||
LPOLESTR lpszPath;
|
||||
|
|
|
@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
|||
typedef struct
|
||||
{
|
||||
const IStreamVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
HKEY hKey;
|
||||
LPBYTE pbBuffer;
|
||||
DWORD dwLength;
|
||||
|
|
|
@ -84,9 +84,9 @@ static HKEY create_test_entries(void)
|
|||
|
||||
if (hKey)
|
||||
{
|
||||
ok(!RegSetValueExA(hKey,"Test1",0,REG_EXPAND_SZ, sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n");
|
||||
ok(!RegSetValueExA(hKey,"Test2",0,REG_SZ, sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n");
|
||||
ok(!RegSetValueExA(hKey,"Test3",0,REG_EXPAND_SZ, sTestpath2, strlen(sTestpath2)+1), "RegSetValueExA failed\n");
|
||||
ok(!RegSetValueExA(hKey,"Test1",0,REG_EXPAND_SZ, (LPBYTE) sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n");
|
||||
ok(!RegSetValueExA(hKey,"Test2",0,REG_SZ, (LPBYTE) sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n");
|
||||
ok(!RegSetValueExA(hKey,"Test3",0,REG_EXPAND_SZ, (LPBYTE) sTestpath2, strlen(sTestpath2)+1), "RegSetValueExA failed\n");
|
||||
}
|
||||
|
||||
sExpLen1 = ExpandEnvironmentStringsA(sTestpath1, sExpTestpath1, sizeof(sExpTestpath1));
|
||||
|
|
|
@ -928,7 +928,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
|
|||
return MIDIERR_NODEVICE;
|
||||
}
|
||||
|
||||
lpData = lpMidiHdr->lpData;
|
||||
lpData = (LPBYTE) lpMidiHdr->lpData;
|
||||
|
||||
if (lpData == NULL)
|
||||
return MIDIERR_UNPREPARED;
|
||||
|
|
|
@ -77,7 +77,7 @@ struct IDsDriverPropertySetImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverPropertySetVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
IDsDriverBufferImpl* buffer;
|
||||
};
|
||||
|
@ -86,7 +86,7 @@ struct IDsDriverNotifyImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverNotifyVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
/* IDsDriverNotifyImpl fields */
|
||||
LPDSBPOSITIONNOTIFY notifies;
|
||||
|
@ -99,7 +99,7 @@ struct IDsDriverImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
/* IDsDriverImpl fields */
|
||||
UINT wDevID;
|
||||
|
@ -113,7 +113,7 @@ struct IDsDriverBufferImpl
|
|||
{
|
||||
/* IUnknown fields */
|
||||
const IDsDriverBufferVtbl *lpVtbl;
|
||||
DWORD ref;
|
||||
LONG ref;
|
||||
|
||||
/* IDsDriverBufferImpl fields */
|
||||
IDsDriverImpl* drv;
|
||||
|
|
|
@ -527,7 +527,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
|
|||
|
||||
EnterCriticalSection(&crit_sect);
|
||||
if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) {
|
||||
LPBYTE lpData = lpMidiHdr->lpData;
|
||||
LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData;
|
||||
|
||||
lpData[lpMidiHdr->dwBytesRecorded++] = value;
|
||||
if (lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) {
|
||||
|
@ -1512,7 +1512,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
|
|||
return MIDIERR_NODEVICE;
|
||||
}
|
||||
|
||||
lpData = lpMidiHdr->lpData;
|
||||
lpData = (LPBYTE) lpMidiHdr->lpData;
|
||||
|
||||
if (lpData == NULL)
|
||||
return MIDIERR_UNPREPARED;
|
||||
|
|
Loading…
Reference in New Issue