[WINED3D 3/5] Applied Phil Costin's adjusted TRACE output corrections and cleanup patch.

[Jason Green]

- Replace Mib with MB (MegaBytes) in device.c
- Fix the capitalization of traces to be more consistent

---

 dlls/wined3d/device.c  |    4 ++--
 dlls/wined3d/directx.c |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

2b54bec86860934f074dc88113542415accc33e4
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 943e38f..a612f99 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1969,11 +1969,11 @@ UINT WINAPI IWineD3DDeviceImpl_GetAvaila
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
     static BOOL showfixmes = TRUE;
     if (showfixmes) {
-        FIXME("(%p) : stub, emulating %dMib for now, returning
%dMib\n", This, (emulated_textureram/(1024*1024)),
+        FIXME("(%p) : stub, emulating %dMB for now, returning
%dMB\n", This, (emulated_textureram/(1024*1024)),
          ((emulated_textureram -
wineD3DGlobalStatistics->glsurfaceram) / (1024*1024)));
          showfixmes = FALSE;
     }
-    TRACE("(%p) :  emulating %dMib for now, returning %dMib\n",
This, (emulated_textureram/(1024*1024)),
+    TRACE("(%p) :  emulating %dMB for now, returning %dMB\n",  This,
(emulated_textureram/(1024*1024)),
          ((emulated_textureram -
wineD3DGlobalStatistics->glsurfaceram) / (1024*1024)));
     /* videomemory is simulated videomemory + AGP memory left */
     return (emulated_textureram - wineD3DGlobalStatistics->glsurfaceram);
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index c4d711e..17cef03 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1680,18 +1680,18 @@ #endif
     if (wined3d_settings.vs_mode == VS_HW &&
wined3d_settings.shader_mode == SHADER_GLSL
         && DeviceType != WINED3DDEVTYPE_REF) {
         *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0);
-        TRACE_(d3d_caps)("Hardware Vertex Shaders versions 2.0+ enabled\n");
+        TRACE_(d3d_caps)("Hardware vertex shader versions 3.0 enabled\n");
     } else if (wined3d_settings.vs_mode == VS_HW &&
wined3d_settings.shader_mode == SHADER_ARB
                && DeviceType != WINED3DDEVTYPE_REF) {
         *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1);
-        TRACE_(d3d_caps)("Hardware Vertex Shader version 1.1 enabled\n");
+        TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled\n");
     } else if (wined3d_settings.vs_mode == VS_SW || DeviceType ==
WINED3DDEVTYPE_REF) {
         /* FIXME: Change the following line (when needed) to reflect
the reported software vertex shader version implemented */
         *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1);
-        TRACE_(d3d_caps)("Software Vertex Shader version 1.1 enabled\n");
+        TRACE_(d3d_caps)("Software vertex shader version 1.1 enabled\n");
     } else {
         *pCaps->VertexShaderVersion  = 0;
-        TRACE_(d3d_caps)("Vertex Shader functionality not available\n");
+        TRACE_(d3d_caps)("Vertex shader functionality not available\n");
     }

     if (This->gl_info.gl_vendor == VENDOR_MESA ||
This->gl_info.gl_vendor == VENDOR_WINE) {
@@ -1705,21 +1705,21 @@ #endif
         *pCaps->PixelShaderVersion = D3DPS_VERSION(3,0);
         /* FIXME: The following line is card dependant. -1.0 to 1.0
is a safe default clamp range for now */
         *pCaps->PixelShader1xMaxValue = 1.0;
-        TRACE_(d3d_caps)("Hardware Pixel Shaders versions 2.0+ enabled\n");
+        TRACE_(d3d_caps)("Hardware pixel shader versions 3.0 enabled\n");
     } else if (wined3d_settings.ps_mode == PS_HW &&
wined3d_settings.shader_mode == SHADER_ARB
                && DeviceType != WINED3DDEVTYPE_REF) {
         *pCaps->PixelShaderVersion    = D3DPS_VERSION(1,4);
         *pCaps->PixelShader1xMaxValue = 1.0;
-        TRACE_(d3d_caps)("Hardware Pixel Shaders version 1.4 enabled\n");
+        TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled\n");
     /* FIXME: Uncomment this when there is support for software Pixel
Shader 1.4 and PS_SW is defined
     } else if (wined3d_settings.ps_mode == PS_SW || DeviceType ==
WINED3DDEVTYPE_REF) {
         *pCaps->PixelShaderVersion    = D3DPS_VERSION(1,4);
         *pCaps->PixelShader1xMaxValue = 1.0;
-        TRACE_(d3d_caps)("Software Pixel Shader version 1.4 enabled\n"); */
+        TRACE_(d3d_caps)("Software pixel shader version 1.4 enabled\n"); */
     } else {
         *pCaps->PixelShaderVersion    = 0;
         *pCaps->PixelShader1xMaxValue = 0.0;
-        TRACE_(d3d_caps)("Pixel Shader functionality not available\n");
+        TRACE_(d3d_caps)("Pixel shader functionality not available\n");
     }

     /* ------------------------------------------------
--
1.3.3