[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    RE: New valgrind warnings in wined3d/arb_program_shader.c
From:       <stefan () codeweavers ! com>
Date:       2008-07-31 19:47:12
Message-ID: 00bb01c8f346$3dc6fb10$b954f130$ () com
[Download RAW message or body]

Dies ist eine mehrteilige Nachricht im MIME-Format.


Does the attached patch fix the warnings?


> -----Original Message-----
> From: daniel.r.kegel@gmail.com [mailto:daniel.r.kegel@gmail.com] On
> Behalf Of Dan Kegel
> Sent: Thursday, July 31, 2008 12:22 PM
> To: wine-devel
> Cc: Stefan Dösinger
> Subject: New valgrind warnings in wined3d/arb_program_shader.c
> 
> Hi Stefan,
> your recent round of changes (circa
> http://www.winehq.org/pipermail/wine-cvs/2008-July/045946.html)
> seems to have triggered a whole bunch of valgrind warnings, e.g.
> 
> http://kegel.com/wine/valgrind/logs/2008-07-31-07.46/vg-d3d9_visual-
> diff.txt
> + Use of uninitialised value of size 4
> +    at  hash_table_get_by_idx (utils.c:1600)
> +    by  hash_table_get (utils.c:1750)
> +    by  find_ffp_shader (utils.c:1961)
> +    by  fragment_prog_arbfp (arb_program_shader.c:2761)
> +    by  ActivateContext (context.c:1169)
> +    by  drawPrimitive (drawprim.c:950)
> +    by  IWineD3DDeviceImpl_DrawIndexedPrimitiveUP (device.c:5350)
> +    by  IDirect3DDevice9Impl_DrawIndexedPrimitiveUP (device.c:1227)
> +    by  lighting_test (visual.c:300)
> +    by  func_visual (visual.c:9234)
> +    by  run_test (test.h:488)
> +    by  main (test.h:537)
> +  Uninitialised value was created by a stack allocation
> +    at  fragment_prog_arbfp (arb_program_shader.c:2745)
> 
> http://kegel.com/wine/valgrind/logs/2008-07-31-07.46/vg-ddraw_visual-
> diff.txt
> + Use of uninitialised value of size 4
> +    at  hash_table_get_by_idx (utils.c:1600)
> +    by  hash_table_get (utils.c:1750)
> +    by  find_ffp_shader (utils.c:1961)
> +    by  fragment_prog_arbfp (arb_program_shader.c:2761)
> +    by  ActivateContext (context.c:1169)
> +    by  drawPrimitive (drawprim.c:950)
> +    by  IWineD3DDeviceImpl_DrawIndexedPrimitiveUP (device.c:5350)
> +    by  IDirect3DDeviceImpl_7_DrawIndexedPrimitive (device.c:3731)
> +    by  IDirect3DDeviceImpl_7_DrawIndexedPrimitive_FPUSetup
> (device.c:3754)
> +    by  lighting_test (visual.c:276)
> +    by  func_visual (visual.c:2649)
> +    by  run_test (test.h:488)
> +    by  main (test.h:537)
> +  Uninitialised value was created by a stack allocation
> +    at  fragment_prog_arbfp (arb_program_shader.c:2745)
> 
> Could you have a look?
> 
> Thanks,
> Dan

["test.diff" (application/octet-stream)]

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index cccc463..efc298f 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1811,6 +1811,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
     DWORD ttff;
     DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2;
 
+    memset(&settings, 0, sizeof(settings));
     for(i = 0; i < GL_LIMITS(texture_stages); i++) {
         IWineD3DBaseTextureImpl *texture;
         if(stateblock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) {




[prev in list] [next in list] [prev in thread] [next in thread]