From 3ea0c073f8c9c6c0c477f05c9801fae4e6301042 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@mandrakesoft.com>
Date: Wed, 21 Mar 2001 20:31:26 +0000
Subject: [PATCH] Warning fixes.

---
 dlls/ddraw/d3dtexture.c    | 4 +++-
 dlls/winmm/mcicda/mcicda.c | 3 ++-
 include/netspi.h           | 2 +-
 server/main.c              | 3 ++-
 server/trace.c             | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index c4b52aef661..35bb75fa004 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/dlls/ddraw/d3dtexture.c
@@ -360,8 +360,10 @@ HRESULT WINAPI IDirect3DTexture2Impl_Load(
   DDSURFACEDESC	*src_d, *dst_d;
   static void (*ptr_ColorTableEXT) (GLenum target, GLenum internalformat,
 				    GLsizei width, GLenum format, GLenum type, const GLvoid *table) = NULL;
+#if 0
   static BOOL color_table_queried = FALSE;
-  
+#endif
+
   TRACE("(%p)->(%p)\n", This, ilpD3DTexture2);
   TRACE("Copied surface %p to surface %p\n", ilpD3DTexture2->surface, This->surface);
 
diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c
index c01e26535c9..9267ff8c7dc 100644
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -706,7 +706,8 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
 	at = lpParms->dwTo;
 	break;
     default:
-	TRACE("Seeking to ??=%lu\n", dwFlags);
+	TRACE("Unknown seek action %08lX\n",
+	      (dwFlags & ~(MCI_NOTIFY|MCI_WAIT)));
 	return MCIERR_UNSUPPORTED_FUNCTION;
     }
     if (CDROM_Audio_Seek(&wmcda->wcda, at, -1) == -1) {
diff --git a/include/netspi.h b/include/netspi.h
index 320713ecf5d..73c13d94fe3 100644
--- a/include/netspi.h
+++ b/include/netspi.h
@@ -131,5 +131,5 @@ DWORD  WINAPI NPSNotifyRegisterA(enum NOTIFYTYPE,NOTIFYCALLBACK);
 LPVOID WINAPI NPSNotifyGetContextA(NOTIFYCALLBACK);
 #define       NPSNotifyGetContext WINELIB_NAME_AW(NPSNotifyGetContext)
 
-#endif _NETSPI_H_
+#endif /* _NETSPI_H_ */
 
diff --git a/server/main.c b/server/main.c
index 2a4aade9cda..02b62445489 100644
--- a/server/main.c
+++ b/server/main.c
@@ -113,5 +113,6 @@ int main( int argc, char *argv[] )
     close_atom_table();
     dump_objects();  /* dump any remaining objects */
 #endif
-    exit(0);
+
+    return 0;
 }
diff --git a/server/trace.c b/server/trace.c
index 2b9d77b61bd..30f5b8509c4 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1902,7 +1902,7 @@ void trace_request( struct thread *thread, const union generic_request *request
         req_dumpers[req]( request );
         fprintf( stderr, " )\n" );
     }
-    else fprintf( stderr, "%08x: %d(???)\n", (unsigned int)thread, req );
+    else fprintf( stderr, "%08x: %d(?)\n", (unsigned int)thread, req );
 }
 
 void trace_reply( struct thread *thread, const union generic_request *request )
-- 
2.11.4.GIT