Fixed a few compilation warnings
diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index b0ecf3d..ae0674a 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -481,8 +481,8 @@
return ret;
}
-#define COPY(x,y) (##x##->##y = ##x##16->##y);
-#define COPYPTR(x,y) (##x##->##y = PTR_SEG_TO_LIN(##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));
LPVOID MSVIDEO_MapICDEX16To32(LPDWORD lParam) {
LPVOID ret;
@@ -705,7 +705,7 @@
void MSVIDEO_UnmapMsg16To32(UINT msg, LPVOID data16, LPDWORD lParam1, LPDWORD lParam2) {
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) {
case ICM_GETINFO:
diff --git a/dlls/richedit/charlist.h b/dlls/richedit/charlist.h
index d6b0162..2855f9e 100644
--- a/dlls/richedit/charlist.h
+++ b/dlls/richedit/charlist.h
@@ -23,4 +23,4 @@
int CHARLIST_CountChar(CHARLIST* pCharList, char myChar);
int CHARLIST_toBuffer(CHARLIST* pCharList, char* pBuffer, int nBufferSize);
-#endif
\ No newline at end of file
+#endif
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index 9362602..ccaf793 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -509,10 +509,10 @@
/* store new cmd, just in case */
MidiInDev[wDevID].incPrev = MidiInDev[wDevID].incoming[0];
}
-
-#undef IS_CMD(_x)
-#undef IS_SYS_CMD(_x)
-
+
+#undef IS_CMD
+#undef IS_SYS_CMD
+
switch (MidiInDev[wDevID].incoming[0] & 0xF0) {
case MIDI_NOTEOFF:
case MIDI_NOTEON:
diff --git a/if1632/snoop.c b/if1632/snoop.c
index c701298..53120dd 100644
--- a/if1632/snoop.c
+++ b/if1632/snoop.c
@@ -217,7 +217,7 @@
SNOOP16_FUN *fun = NULL;
SNOOP16_RETURNENTRIES **rets = &firstrets;
SNOOP16_RETURNENTRY *ret;
- int i,max;
+ int i=0, max;
while (dll) {
if (xcs == dll->funhandle) {
diff --git a/if1632/thunk.c b/if1632/thunk.c
index 0ec066e..3aa43ec 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -172,7 +172,7 @@
if ( hModule )
{
#define GETADDR( name ) \
- *(FARPROC *)&Callout.##name = GetProcAddress( hModule, #name )
+ *(FARPROC *)&Callout.name = GetProcAddress( hModule, #name )
GETADDR( PeekMessageA );
GETADDR( GetMessageA );
@@ -193,8 +193,8 @@
if ( pModule )
{
#define GETADDR( var, name, thk ) \
- *(FARPROC *)&Callout.##var = THUNK_GetCalloutThunk( pModule, name, \
- (RELAY)THUNK_CallTo16_##thk )
+ *(FARPROC *)&Callout.var = THUNK_GetCalloutThunk( pModule, name, \
+ (RELAY)THUNK_CallTo16_##thk )
GETADDR( PostAppMessage16, "PostAppMessage", word_wwwl );
GETADDR( FinalUserInit16, "FinalUserInit", word_ );
diff --git a/loader/task.c b/loader/task.c
index 6b1014c..4db25a2 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -956,7 +956,7 @@
{
NE_MODULE *pModule = NULL;
SEGTABLEENTRY *pSeg = NULL;
- int segNr;
+ int segNr=0;
/* Try pair of module handle / segment number */
pModule = (NE_MODULE *) GlobalLock16( HIWORD( proc ) );
diff --git a/relay32/snoop.c b/relay32/snoop.c
index fbbb2d4..f24dbce 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -264,7 +264,7 @@
SNOOP_FUN *fun = NULL;
SNOOP_RETURNENTRIES **rets = &firstrets;
SNOOP_RETURNENTRY *ret;
- int i,max;
+ int i=0, max;
while (dll) {
if ( ((char*)entry>=(char*)dll->funs) &&
