[PATCH 5/5] wined3d: Add quotes around traced strings in IWineD3DImpl_FillGLCaps().
Henri Verbeet
hverbeet at codeweavers.com
Thu Aug 13 03:03:08 CDT 2009
---
dlls/wined3d/directx.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 22a05cf..25ae492 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -968,7 +968,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
ENTER_GL();
gl_string = (const char *)glGetString(GL_RENDERER);
- TRACE_(d3d_caps)("GL_RENDERER: %s.\n", gl_string);
+ TRACE_(d3d_caps)("GL_RENDERER: \"%s\".\n", gl_string);
if (!gl_string)
{
ERR_(d3d_caps)("Received a NULL GL_RENDERER.\n");
@@ -985,7 +985,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
memcpy(gl_renderer, gl_string, len);
gl_string = (const char *)glGetString(GL_VENDOR);
- TRACE_(d3d_caps)("GL_VENDOR: %s.\n", gl_string);
+ TRACE_(d3d_caps)("GL_VENDOR: \"%s\".\n", gl_string);
if (!gl_string)
{
ERR_(d3d_caps)("Received a NULL GL_VENDOR.\n");
@@ -1015,14 +1015,14 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
}
else
{
- FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Setting VENDOR_WINE.\n", gl_string);
+ FIXME_(d3d_caps)("Received unrecognized GL_VENDOR \"%s\". Setting VENDOR_WINE.\n", gl_string);
gl_info->gl_vendor = VENDOR_WINE;
}
- TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x)\n", debugstr_a(gl_string), gl_info->gl_vendor);
+ TRACE_(d3d_caps)("found GL_VENDOR \"%s\" -> (0x%04x)\n", debugstr_a(gl_string), gl_info->gl_vendor);
/* Parse the GL_VERSION field into major and minor information */
gl_string = (const char *)glGetString(GL_VERSION);
- TRACE_(d3d_caps)("GL_VERSION: %s.\n", gl_string);
+ TRACE_(d3d_caps)("GL_VERSION: \"%s\".\n", gl_string);
if (!gl_string)
{
ERR_(d3d_caps)("Received a NULL GL_VERSION.\n");
@@ -1037,7 +1037,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
major = atoi(gl_string_cursor);
if (major <= 0) ERR_(d3d_caps)("Invalid opengl major version: %d.\n", major);
while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') ++gl_string_cursor;
- if (*gl_string_cursor++ != '.') ERR_(d3d_caps)("Invalid opengl version string: %s.\n", debugstr_a(gl_string));
+ if (*gl_string_cursor++ != '.') ERR_(d3d_caps)("Invalid opengl version string: \"%s\".\n", debugstr_a(gl_string));
minor = atoi(gl_string_cursor);
TRACE_(d3d_caps)("Found OpenGL version: %d.%d.\n", major, minor);
@@ -1050,14 +1050,14 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
gl_string_cursor = strstr(gl_string, "NVIDIA");
if (!gl_string_cursor)
{
- ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string));
+ ERR_(d3d_caps)("Invalid nVidia version string: \"%s\".\n", debugstr_a(gl_string));
break;
}
gl_string_cursor = strstr(gl_string_cursor, " ");
if (!gl_string_cursor)
{
- ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string));
+ ERR_(d3d_caps)("Invalid nVidia version string: \"%s\".\n", debugstr_a(gl_string));
break;
}
@@ -1065,7 +1065,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
if (!*gl_string_cursor)
{
- ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string));
+ ERR_(d3d_caps)("Invalid nVidia version string: \"%s\".\n", debugstr_a(gl_string));
break;
}
@@ -1074,7 +1074,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
if (*gl_string_cursor++ != '.')
{
- ERR_(d3d_caps)("Invalid nVidia version string: %s.\n", debugstr_a(gl_string));
+ ERR_(d3d_caps)("Invalid nVidia version string: \"%s\".\n", debugstr_a(gl_string));
break;
}
@@ -1102,7 +1102,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
if (!gl_string_cursor)
{
- WARN_(d3d_caps)("malformed GL_VERSION (%s).\n", debugstr_a(gl_string));
+ WARN_(d3d_caps)("malformed GL_VERSION \"%s\".\n", debugstr_a(gl_string));
}
else
{
@@ -1124,7 +1124,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
if (*gl_string_cursor++ != '.')
{
- ERR_(d3d_caps)("Invalid MacOS-Intel version string: %s.\n", debugstr_a(gl_string));
+ ERR_(d3d_caps)("Invalid MacOS-Intel version string: \"%s\".\n", debugstr_a(gl_string));
break;
}
@@ -1150,7 +1150,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
tmp[cursor] = 0;
major = atoi(tmp);
- if (*gl_string_cursor != '.') WARN_(d3d_caps)("malformed GL_VERSION (%s).\n", debugstr_a(gl_string));
+ if (*gl_string_cursor != '.') WARN_(d3d_caps)("malformed GL_VERSION \"%s\".\n", debugstr_a(gl_string));
++gl_string_cursor;
cursor = 0;
@@ -1171,7 +1171,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info)
}
gl_info->driver_version = MAKEDWORD_VERSION(major, minor);
- TRACE_(d3d_caps)("found driver version (%s)->%i.%i->(0x%08x).\n",
+ TRACE_(d3d_caps)("found driver version \"%s\" -> %i.%i->(0x%08x).\n",
debugstr_a(gl_string), major, minor, gl_info->driver_version);
/* Current Windows drivers have versions like 6.14.... (some older have an earlier version). */
gl_info->driver_version_hipart = MAKEDWORD_VERSION(6, 14);
--
1.6.0.6
More information about the wine-patches
mailing list