[janitor] dlls/dsound -Wwrite-strings cleanup

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


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

-------------- next part --------------
Index: dlls/dsound/dsound_main.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/dsound_main.c,v
retrieving revision 1.93
diff -u -r1.93 dsound_main.c
--- dlls/dsound/dsound_main.c	1 Oct 2003 03:05:25 -0000	1.93
+++ dlls/dsound/dsound_main.c	7 Oct 2003 19:00:25 -0000
@@ -439,8 +439,8 @@
 
 static void _dump_DSBCAPS(DWORD xmask) {
 	struct {
-		DWORD	mask;
-		char	*name;
+		DWORD		mask;
+		const char	*name;
 	} flags[] = {
 #define FE(x) { x, #x },
 		FE(DSBCAPS_PRIMARYBUFFER)
Index: dlls/dsound/propset.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/propset.c,v
retrieving revision 1.15
diff -u -r1.15 propset.c
--- dlls/dsound/propset.c	19 Sep 2003 00:10:51 -0000	1.15
+++ dlls/dsound/propset.c	7 Oct 2003 19:00:30 -0000
@@ -771,13 +771,14 @@
 		    if (err == DS_OK) {
 			err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
 			if (err == DS_OK) {
+			    char dataInterface[] = "Interface";
 			    memset(&data, 0, sizeof(data));
 			    data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
 			    data.WaveDeviceId = wod;
 			    data.DeviceId = guid;
 			    data.Description = desc.szDesc;
 			    data.Module = desc.szDrvName;
-			    data.Interface = "Interface";
+			    data.Interface = dataInterface;
 			    TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
 			    (ppd->Callback)(&data, ppd->Context);
 			}
@@ -790,13 +791,14 @@
 		    if (err == DS_OK) {
 			err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
 			if (err == DS_OK) {
+			    char dataInterface[] = "Interface";
 			    memset(&data, 0, sizeof(data));
 			    data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
 			    data.WaveDeviceId = wid;
 			    data.DeviceId = guid;
 			    data.Description = desc.szDesc;
 			    data.Module = desc.szDrvName;
-			    data.Interface = "Interface";
+			    data.Interface = dataInterface;
 			    TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
 			    (ppd->Callback)(&data, ppd->Context);
 			}


More information about the wine-patches mailing list