commit 03486498534b66c8bc7b4491e3c9b33ef17c2f7a
author Daniel Marmier <d.marmier@bluewin.ch> Mon Oct 06 21:03:32 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Oct 06 21:03:32 2003 +0000
tree fc7bfcbe04a3a127818be439e200fb627a619aed
parent 3ce7ed5c158bbe8ec000c024e020b2f8c4c81fd3

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

dlls/ddraw/d3ddevice/mesa.c

diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 9942700..6510d51 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -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;
     }
-    
-    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;
+
+    {
+	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;
+    }
 
     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