ddraw: Write-strings warnings fix

Andrew Talbot Andrew.Talbot at talbotville.com
Wed Aug 16 13:30:26 CDT 2006


Changelog:
    ddraw: Write-strings warnings fix.

diff -urN a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c
--- a/dlls/ddraw/direct3d.c	2006-08-09 17:22:37.000000000 +0100
+++ b/dlls/ddraw/direct3d.c	2006-08-16 19:13:44.000000000 +0100
@@ -290,6 +290,7 @@
     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 @@
 
     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 @@
     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-patches mailing list