riched20: Fix various garbage assignments (clang)

André Hentschel nerv at dawncrow.de
Sun Jul 17 07:26:06 CDT 2011


---
 dlls/riched20/editor.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 3c409e4..d329d18 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -477,6 +477,7 @@ void ME_RTFParAttrHook(RTF_Info *info)
   PARAFORMAT2 fmt;
   fmt.cbSize = sizeof(fmt);
   fmt.dwMask = 0;
+  fmt.wEffects = 0;
   
   switch(info->rtfMinor)
   {
@@ -521,7 +522,6 @@ void ME_RTFParAttrHook(RTF_Info *info)
       }
     } else { /* v1.0 - v3.0 */
       fmt.dwMask |= PFM_TABLE;
-      fmt.wEffects &= ~PFE_TABLE;
     }
     break;
   case rtfNestLevel:
@@ -589,8 +589,8 @@ void ME_RTFParAttrHook(RTF_Info *info)
       }
       return;
     } else { /* v1.0 - v3.0 */
-      fmt.dwMask |= PFM_TABLE;
-      fmt.wEffects |= PFE_TABLE;
+      fmt.dwMask = PFM_TABLE;
+      fmt.wEffects = PFE_TABLE;
     }
     break;
   }
@@ -1091,7 +1091,7 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm
   LPOLECLIENTSITE     lpClientSite = NULL;
   LPDATAOBJECT        lpDataObject = NULL;
   LPOLECACHE          lpOleCache = NULL;
-  STGMEDIUM           stgm;
+  STGMEDIUM           stgm = {0};
   FORMATETC           fm;
   CLSID               clsid;
   BOOL                ret = FALSE;
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list