Fixed a few compilation warnings
This commit is contained in:
parent
650ba4df23
commit
334a42f521
|
@ -481,8 +481,8 @@ DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiFo
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define COPY(x,y) (##x##->##y = ##x##16->##y);
|
#define COPY(x,y) (x->y = x##16->y);
|
||||||
#define COPYPTR(x,y) (##x##->##y = PTR_SEG_TO_LIN(##x##16->##y));
|
#define COPYPTR(x,y) (x->y = PTR_SEG_TO_LIN(x##16->y));
|
||||||
|
|
||||||
LPVOID MSVIDEO_MapICDEX16To32(LPDWORD lParam) {
|
LPVOID MSVIDEO_MapICDEX16To32(LPDWORD lParam) {
|
||||||
LPVOID ret;
|
LPVOID ret;
|
||||||
|
@ -705,7 +705,7 @@ LPVOID MSVIDEO_MapMsg16To32(UINT msg, LPDWORD lParam1, LPDWORD lParam2) {
|
||||||
void MSVIDEO_UnmapMsg16To32(UINT msg, LPVOID data16, LPDWORD lParam1, LPDWORD lParam2) {
|
void MSVIDEO_UnmapMsg16To32(UINT msg, LPVOID data16, LPDWORD lParam1, LPDWORD lParam2) {
|
||||||
TRACE("Unmapping %d\n",msg);
|
TRACE("Unmapping %d\n",msg);
|
||||||
|
|
||||||
#define UNCOPY(x,y) (##x##16->##y = ##x##->##y);
|
#define UNCOPY(x,y) (x##16->y = x->y);
|
||||||
|
|
||||||
switch (msg) {
|
switch (msg) {
|
||||||
case ICM_GETINFO:
|
case ICM_GETINFO:
|
||||||
|
|
|
@ -23,4 +23,4 @@ void CHARLIST_FreeList(CHARLIST* pCharList);
|
||||||
int CHARLIST_CountChar(CHARLIST* pCharList, char myChar);
|
int CHARLIST_CountChar(CHARLIST* pCharList, char myChar);
|
||||||
int CHARLIST_toBuffer(CHARLIST* pCharList, char* pBuffer, int nBufferSize);
|
int CHARLIST_toBuffer(CHARLIST* pCharList, char* pBuffer, int nBufferSize);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -509,10 +509,10 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
|
||||||
/* store new cmd, just in case */
|
/* store new cmd, just in case */
|
||||||
MidiInDev[wDevID].incPrev = MidiInDev[wDevID].incoming[0];
|
MidiInDev[wDevID].incPrev = MidiInDev[wDevID].incoming[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef IS_CMD(_x)
|
#undef IS_CMD
|
||||||
#undef IS_SYS_CMD(_x)
|
#undef IS_SYS_CMD
|
||||||
|
|
||||||
switch (MidiInDev[wDevID].incoming[0] & 0xF0) {
|
switch (MidiInDev[wDevID].incoming[0] & 0xF0) {
|
||||||
case MIDI_NOTEOFF:
|
case MIDI_NOTEOFF:
|
||||||
case MIDI_NOTEON:
|
case MIDI_NOTEON:
|
||||||
|
|
|
@ -217,7 +217,7 @@ void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) {
|
||||||
SNOOP16_FUN *fun = NULL;
|
SNOOP16_FUN *fun = NULL;
|
||||||
SNOOP16_RETURNENTRIES **rets = &firstrets;
|
SNOOP16_RETURNENTRIES **rets = &firstrets;
|
||||||
SNOOP16_RETURNENTRY *ret;
|
SNOOP16_RETURNENTRY *ret;
|
||||||
int i,max;
|
int i=0, max;
|
||||||
|
|
||||||
while (dll) {
|
while (dll) {
|
||||||
if (xcs == dll->funhandle) {
|
if (xcs == dll->funhandle) {
|
||||||
|
|
|
@ -172,7 +172,7 @@ void THUNK_InitCallout(void)
|
||||||
if ( hModule )
|
if ( hModule )
|
||||||
{
|
{
|
||||||
#define GETADDR( name ) \
|
#define GETADDR( name ) \
|
||||||
*(FARPROC *)&Callout.##name = GetProcAddress( hModule, #name )
|
*(FARPROC *)&Callout.name = GetProcAddress( hModule, #name )
|
||||||
|
|
||||||
GETADDR( PeekMessageA );
|
GETADDR( PeekMessageA );
|
||||||
GETADDR( GetMessageA );
|
GETADDR( GetMessageA );
|
||||||
|
@ -193,8 +193,8 @@ void THUNK_InitCallout(void)
|
||||||
if ( pModule )
|
if ( pModule )
|
||||||
{
|
{
|
||||||
#define GETADDR( var, name, thk ) \
|
#define GETADDR( var, name, thk ) \
|
||||||
*(FARPROC *)&Callout.##var = THUNK_GetCalloutThunk( pModule, name, \
|
*(FARPROC *)&Callout.var = THUNK_GetCalloutThunk( pModule, name, \
|
||||||
(RELAY)THUNK_CallTo16_##thk )
|
(RELAY)THUNK_CallTo16_##thk )
|
||||||
|
|
||||||
GETADDR( PostAppMessage16, "PostAppMessage", word_wwwl );
|
GETADDR( PostAppMessage16, "PostAppMessage", word_wwwl );
|
||||||
GETADDR( FinalUserInit16, "FinalUserInit", word_ );
|
GETADDR( FinalUserInit16, "FinalUserInit", word_ );
|
||||||
|
|
|
@ -956,7 +956,7 @@ static BOOL TASK_GetCodeSegment( FARPROC16 proc, NE_MODULE **ppModule,
|
||||||
{
|
{
|
||||||
NE_MODULE *pModule = NULL;
|
NE_MODULE *pModule = NULL;
|
||||||
SEGTABLEENTRY *pSeg = NULL;
|
SEGTABLEENTRY *pSeg = NULL;
|
||||||
int segNr;
|
int segNr=0;
|
||||||
|
|
||||||
/* Try pair of module handle / segment number */
|
/* Try pair of module handle / segment number */
|
||||||
pModule = (NE_MODULE *) GlobalLock16( HIWORD( proc ) );
|
pModule = (NE_MODULE *) GlobalLock16( HIWORD( proc ) );
|
||||||
|
|
|
@ -264,7 +264,7 @@ void WINAPI SNOOP_DoEntry( CONTEXT86 *context )
|
||||||
SNOOP_FUN *fun = NULL;
|
SNOOP_FUN *fun = NULL;
|
||||||
SNOOP_RETURNENTRIES **rets = &firstrets;
|
SNOOP_RETURNENTRIES **rets = &firstrets;
|
||||||
SNOOP_RETURNENTRY *ret;
|
SNOOP_RETURNENTRY *ret;
|
||||||
int i,max;
|
int i=0, max;
|
||||||
|
|
||||||
while (dll) {
|
while (dll) {
|
||||||
if ( ((char*)entry>=(char*)dll->funs) &&
|
if ( ((char*)entry>=(char*)dll->funs) &&
|
||||||
|
|
Loading…
Reference in New Issue