Stefan Dösinger : wined3d: Extend out anti-spam database a bit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b1e1df5117a9f60884bfea3e28d53dc37f117ec8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b1e1df5117a9f60884bfea3e28...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Sun Feb 10 16:43:24 2008 +0100

wined3d: Extend out anti-spam database a bit.

---

 dlls/wined3d/glsl_shader.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 0290e46..b15d9b2 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -62,7 +62,10 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) {
     const char *spam[] = {
         "Vertex shader was successfully compiled to run on hardware.\n",    /* fglrx        */
         "Fragment shader was successfully compiled to run on hardware.\n",  /* fglrx        */
-        "Fragment shader(s) linked, vertex shader(s) linked."               /* fglrx, no \n */
+        "Fragment shader(s) linked, vertex shader(s) linked.",              /* fglrx, no \n */
+        "Vertex shader(s) linked, no fragment shader(s) defined.",          /* fglrx, no \n */
+        "Fragment shader was successfully compiled to run on hardware.\nWARNING: 0:1: extension 'GL_ARB_draw_buffers' is not supported",
+        "Fragment shader(s) linked, no vertex shader(s) defined."           /* fglrx, no \n */
     };
 
     GL_EXTCALL(glGetObjectParameterivARB(obj,
@@ -73,7 +76,10 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) {
      * that if there are errors. */
     if (infologLength > 1)
     {
-        infoLog = HeapAlloc(GetProcessHeap(), 0, infologLength);
+        /* Fglrx doesn't terminate the string properly, but it tells us the proper length.
+         * So use HEAP_ZERO_MEMORY to avoid uninitialized bytes
+         */
+        infoLog = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, infologLength);
         GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog));
         is_spam = FALSE;