Fixed warnings with gcc option "-Wwrite-strings".
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
diff --git a/dlls/ddraw/helper.c b/dlls/ddraw/helper.c index e20359e..e748ab4 100644 --- a/dlls/ddraw/helper.c +++ b/dlls/ddraw/helper.c
@@ -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;
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7bdcb14..eb1b655 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c
@@ -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);