Andrew Talbot : ddraw: Write-strings warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Aug 17 05:04:40 CDT 2006
Module: wine
Branch: master
Commit: 704f8d7848263690a60e828538490a33a114c2b3
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=704f8d7848263690a60e828538490a33a114c2b3
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Wed Aug 16 19:30:26 2006 +0100
ddraw: Write-strings warnings fix.
---
dlls/ddraw/direct3d.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c
index fe56729..ab59340 100644
--- a/dlls/ddraw/direct3d.c
+++ b/dlls/ddraw/direct3d.c
@@ -290,6 +290,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *
ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface);
D3DDEVICEDESC dref, d1, d2;
D3DDEVICEDESC7 newDesc;
+ static CHAR wined3d_description[] = "Wine D3DDevice using WineD3D and OpenGL";
HRESULT hr;
/* Some games (Motoracer 2 demo) have the bad idea to modify the device name string.
@@ -317,10 +318,12 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *
if(This->d3dversion != 1)
{
+ static CHAR reference_description[] = "Reference Direct3D ID";
+
TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This);
d1 = dref;
d2 = dref;
- hr = Callback( (LPIID) &IID_IDirect3DRefDevice, "Reference Direct3D ID", device_name, &d1, &d2, Context);
+ hr = Callback( (LPIID) &IID_IDirect3DRefDevice, reference_description, device_name, &d1, &d2, Context);
if(hr != D3DENUMRET_OK)
{
TRACE("Application cancelled the enumeration\n");
@@ -331,7 +334,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *
TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This);
d1 = dref;
d2 = dref;
- hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, "Wine D3DDevice using WineD3D and OpenGL", device_name, &d1, &d2, Context);
+ hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, wined3d_description, device_name, &d1, &d2, Context);
if(hr != D3DENUMRET_OK)
{
TRACE("Application cancelled the enumeration\n");
More information about the wine-cvs
mailing list