[janitor] dlls/winmm/mci* -Wwrite-strings cleanup

Daniel Marmier d.marmier at bluewin.ch
Tue Oct 7 14:20:51 CDT 2003


Fixed warnings with gcc option "-Wwrite-strings".

-------------- next part --------------
Index: dlls/winmm/mcianim/mcianim.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mcianim/mcianim.c,v
retrieving revision 1.17
diff -u -r1.17 mcianim.c
--- dlls/winmm/mcianim/mcianim.c	5 Sep 2003 23:08:27 -0000	1.17
+++ dlls/winmm/mcianim/mcianim.c	7 Oct 2003 19:04:26 -0000
@@ -346,7 +346,7 @@
 static DWORD MCIANIM_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
 {
     WINE_MCIANIM*	wma = MCIANIM_mciGetOpenDrv(wDevID);
-    LPSTR		str = 0;
+    LPCSTR		str = 0;
     DWORD		ret = 0;
 
     TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
Index: dlls/winmm/mciavi/info.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciavi/info.c,v
retrieving revision 1.5
diff -u -r1.5 info.c
--- dlls/winmm/mciavi/info.c	18 Oct 2002 23:48:57 -0000	1.5
+++ dlls/winmm/mciavi/info.c	7 Oct 2003 19:04:28 -0000
@@ -145,7 +145,7 @@
  */
 DWORD	MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSA lpParms)
 {
-    LPSTR		str = 0;
+    LPCSTR		str = 0;
     WINE_MCIAVI*	wma = MCIAVI_mciGetOpenDev(wDevID);
     DWORD		ret = 0;
 
@@ -281,7 +281,7 @@
 	FIXME("%s\n", buffer);
     }
     if (dwFlags & MCI_DGV_SET_FILEFORMAT) {
-	LPSTR	str = "save";
+	LPCSTR	str = "save";
 	if (dwFlags & MCI_DGV_SET_STILL)
 	    str = "capture";
 
Index: dlls/winmm/mcicda/mcicda.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mcicda/mcicda.c,v
retrieving revision 1.28
diff -u -r1.28 mcicda.c
--- dlls/winmm/mcicda/mcicda.c	5 Sep 2003 23:08:27 -0000	1.28
+++ dlls/winmm/mcicda/mcicda.c	7 Oct 2003 19:04:34 -0000
@@ -463,7 +463,7 @@
  */
 static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
 {
-    LPSTR		str = NULL;
+    LPCSTR		str = NULL;
     WINE_MCICDAUDIO*	wmcda = MCICDA_GetOpenDrv(wDevID);
     DWORD		ret = 0;
     char		buffer[16];
Index: dlls/winmm/mciseq/mcimidi.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciseq/mcimidi.c,v
retrieving revision 1.21
diff -u -r1.21 mcimidi.c
--- dlls/winmm/mciseq/mcimidi.c	5 Sep 2003 23:08:27 -0000	1.21
+++ dlls/winmm/mciseq/mcimidi.c	7 Oct 2003 19:04:42 -0000
@@ -1042,7 +1042,7 @@
 		if (TRACE_ON(mcimidi)) {
 		    char	buf[1024];
 		    WORD	len = mmt->wEventLength - HIWORD(mmt->dwEventData);
-		    static	char*	info[8] = {"", "Text", "Copyright", "Seq/Trk name",
+		    static const char*	info[8] = {"", "Text", "Copyright", "Seq/Trk name",
 						   "Instrument", "Lyric", "Marker", "Cue-point"};
 		    WORD	idx = HIBYTE(LOWORD(mmt->dwEventData));
 


More information about the wine-patches mailing list