PATCH: fix more warnings
Jeff Garzik
jgarzik at mandrakesoft.com
Wed Mar 21 05:01:50 CST 2001
Changes:
* dlls/ddraw/d3dtexture.c: color_table_queried is inside an #if
0...#endif block. Fixes unused-var warning.
* dlls/winmm/mcicda/mcicda.c: Newer gcc compilers warn about trigraphs
("??"...) in the code. This change removes a spurious trigraph, and
also makes the warning message better at the same time.
* include/netspi.h: do not put anything after a #endif
* server/main.c: exit(3) by returning from main. Solves "control
reaches end of function whose return value is not void" warning.
* server/trace.c: Remove trigraph, by removing extra question marks.
--
Jeff Garzik | May you have warm words on a cold evening,
Building 1024 | a full mooon on a dark night,
MandrakeSoft | and a smooth road all the way to your door.
-------------- next part --------------
Index: dlls/ddraw/d3dtexture.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3dtexture.c,v
retrieving revision 1.8
diff -u -r1.8 d3dtexture.c
--- dlls/ddraw/d3dtexture.c 2001/01/04 22:59:48 1.8
+++ dlls/ddraw/d3dtexture.c 2001/03/21 10:48:29
@@ -360,8 +360,10 @@
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);
Index: dlls/winmm/mcicda/mcicda.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mcicda/mcicda.c,v
retrieving revision 1.16
diff -u -r1.16 mcicda.c
--- dlls/winmm/mcicda/mcicda.c 2001/01/26 20:43:44 1.16
+++ dlls/winmm/mcicda/mcicda.c 2001/03/21 10:48:30
@@ -706,7 +706,8 @@
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) {
Index: include/netspi.h
===================================================================
RCS file: /home/wine/wine/include/netspi.h,v
retrieving revision 1.3
diff -u -r1.3 netspi.h
--- include/netspi.h 2000/06/11 20:07:59 1.3
+++ include/netspi.h 2001/03/21 10:48:31
@@ -131,5 +131,5 @@
LPVOID WINAPI NPSNotifyGetContextA(NOTIFYCALLBACK);
#define NPSNotifyGetContext WINELIB_NAME_AW(NPSNotifyGetContext)
-#endif _NETSPI_H_
+#endif /* _NETSPI_H_ */
Index: server/main.c
===================================================================
RCS file: /home/wine/wine/server/main.c,v
retrieving revision 1.20
diff -u -r1.20 main.c
--- server/main.c 2001/01/11 22:28:35 1.20
+++ server/main.c 2001/03/21 10:48:31
@@ -113,5 +113,6 @@
close_atom_table();
dump_objects(); /* dump any remaining objects */
#endif
- exit(0);
+
+ return 0;
}
Index: server/trace.c
===================================================================
RCS file: /home/wine/wine/server/trace.c,v
retrieving revision 1.89
diff -u -r1.89 trace.c
--- server/trace.c 2001/03/08 01:16:42 1.89
+++ server/trace.c 2001/03/21 10:48:32
@@ -1902,7 +1902,7 @@
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 )
More information about the wine-patches
mailing list