From 334a42f521924c918b01d7fe9150886738d9e670 Mon Sep 17 00:00:00 2001
From: "Dimitrie O. Paun" <dimi@cs.toronto.edu>
Date: Sun, 29 Oct 2000 18:07:04 +0000
Subject: [PATCH] Fixed a few compilation warnings

---
 dlls/msvideo/msvideo_main.c | 6 +++---
 dlls/richedit/charlist.h    | 2 +-
 dlls/winmm/wineoss/midi.c   | 8 ++++----
 if1632/snoop.c              | 2 +-
 if1632/thunk.c              | 6 +++---
 loader/task.c               | 2 +-
 relay32/snoop.c             | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index b0ecf3d7d52..ae0674afa1c 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -481,8 +481,8 @@ DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiFo
 	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 @@ LPVOID MSVIDEO_MapMsg16To32(UINT msg, LPDWORD lParam1, LPDWORD lParam2) {
 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 d6b01625fbc..2855f9ee599 100644
--- a/dlls/richedit/charlist.h
+++ b/dlls/richedit/charlist.h
@@ -23,4 +23,4 @@ void CHARLIST_FreeList(CHARLIST* pCharList);
 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 9362602a56f..ccaf79394fe 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -509,10 +509,10 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
 	/* 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 c701298f0b4..53120ddd19f 100644
--- a/if1632/snoop.c
+++ b/if1632/snoop.c
@@ -217,7 +217,7 @@ void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) {
 	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 0ec066e3165..3aa43ec2adc 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -172,7 +172,7 @@ void THUNK_InitCallout(void)
     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 @@ void THUNK_InitCallout(void)
     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 6b1014c9fc9..4db25a2700f 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -956,7 +956,7 @@ static BOOL TASK_GetCodeSegment( FARPROC16 proc, NE_MODULE **ppModule,
 {
     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 fbbb2d4272d..f24dbcee4da 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -264,7 +264,7 @@ void WINAPI SNOOP_DoEntry( CONTEXT86 *context )
 	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)	&&