[janitor] dlls/ddraw -Wwrite-strings cleanup

[Daniel Marmier]

-------------- next part --------------
Index: dlls/ddraw/helper.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/helper.c,v
retrieving revision 1.29
diff -u -r1.29 helper.c
--- dlls/ddraw/helper.c	15 Sep 2003 20:00:03 -0000	1.29
+++ dlls/ddraw/helper.c	4 Oct 2003 08:22:59 -0000
@@ -270,7 +270,7 @@
 	);
     }
     if (pf->dwFlags & DDPF_RGB) {
-	char *cmd;
+	const char *cmd;
 	DPRINTF(", RGB bits: %ld, ", pf->u1.dwRGBBitCount);
 	switch (pf->u1.dwRGBBitCount) {
 	case 4: cmd = "%1lx"; break;
Index: dlls/ddraw/main.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/main.c,v
retrieving revision 1.37
diff -u -r1.37 main.c
--- dlls/ddraw/main.c	5 Sep 2003 23:08:41 -0000	1.37
+++ dlls/ddraw/main.c	4 Oct 2003 08:23:02 -0000
@@ -85,7 +85,7 @@
 
 static BOOL DDRAW_bind_to_opengl( void )
 {
-    char *glname = SONAME_LIBGL;
+    const char *glname = SONAME_LIBGL;
     BOOL ret_value;
 
     gl_handle = wine_dlopen(glname, RTLD_NOW, NULL, 0);
Index: dlls/ddraw/d3ddevice/mesa.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3ddevice/mesa.c,v
retrieving revision 1.140
diff -u -r1.140 mesa.c
--- dlls/ddraw/d3ddevice/mesa.c	30 Sep 2003 00:29:11 -0000	1.140
+++ dlls/ddraw/d3ddevice/mesa.c	4 Oct 2003 08:23:26 -0000
@@ -393,20 +393,24 @@
 
     if (version > 1) {
         /* It seems that enumerating the reference IID on Direct3D 1 games (AvP / Motoracer2) breaks them */
+	char interface_name[] = "WINE Reference Direct3DX using OpenGL";
         TRACE(" enumerating OpenGL D3DDevice interface using reference IID (IID %s).\n", debugstr_guid(&IID_IDirect3DRefDevice));
 	d1 = dref;
 	d2 = dref;
-	ret_value = cb((LPIID) &IID_IDirect3DRefDevice, "WINE Reference Direct3DX using OpenGL", device_name, &d1, &d2, context);
+	ret_value = cb((LPIID) &IID_IDirect3DRefDevice, interface_name, device_name, &d1, &d2, context);
+	if (ret_value != D3DENUMRET_OK)
+	    return ret_value;
+    }
+
+    {
+	char interface_name[] = "WINE Direct3DX using OpenGL";
+	TRACE(" enumerating OpenGL D3DDevice interface (IID %s).\n", debugstr_guid(&IID_D3DDEVICE_OpenGL));
+	d1 = dref;
+	d2 = dref;
+	ret_value = cb((LPIID) &IID_D3DDEVICE_OpenGL, interface_name, device_name, &d1, &d2, context);
 	if (ret_value != D3DENUMRET_OK)
 	    return ret_value;
     }
-    
-    TRACE(" enumerating OpenGL D3DDevice interface (IID %s).\n", debugstr_guid(&IID_D3DDEVICE_OpenGL));
-    d1 = dref;
-    d2 = dref;
-    ret_value = cb((LPIID) &IID_D3DDEVICE_OpenGL, "WINE Direct3DX using OpenGL", device_name, &d1, &d2, context);
-    if (ret_value != D3DENUMRET_OK)
-        return ret_value;
 
     return D3DENUMRET_OK;
 }
@@ -414,12 +418,14 @@
 HRESULT d3ddevice_enumerate7(LPD3DENUMDEVICESCALLBACK7 cb, LPVOID context)
 {
     D3DDEVICEDESC7 ddesc;
+    char interface_name[] = "WINE Direct3D7 using OpenGL";
+    char device_name[] = "Wine D3D7 device";
 
     fill_opengl_caps_7(&ddesc);
     
     TRACE(" enumerating OpenGL D3DDevice7 interface.\n");
     
-    return cb("WINE Direct3D7 using OpenGL", "Wine D3D7 device", &ddesc, context);
+    return cb(interface_name, device_name, &ddesc, context);
 }
 
 ULONG WINAPI