From 177b23786391b2cafad926951bb5f313ba75598d Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Thu, 18 Aug 2005 10:51:22 +0000 Subject: [PATCH] Fix uninitialized variable warnings emitted by gcc 4.0. --- dlls/user/dialog.c | 10 +++++----- dlls/user/dialog16.c | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index 7bc90f2c4e..694fefcc75 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -424,6 +424,11 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) /* Get the font name */ + result->pointSize = 0; + result->faceName = NULL; + result->weight = FW_DONTCARE; + result->italic = FALSE; + if (result->style & DS_SETFONT) { result->pointSize = GET_WORD(p); @@ -433,11 +438,6 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) result->weight = GET_WORD(p); p++; result->italic = LOBYTE(GET_WORD(p)); p++; } - else - { - result->weight = FW_DONTCARE; - result->italic = FALSE; - } result->faceName = (LPCWSTR)p; p += strlenW( result->faceName ) + 1; TRACE(" FONT %d, %s, %d, %s\n", diff --git a/dlls/user/dialog16.c b/dlls/user/dialog16.c index bdde9d2d63..5588363ec7 100644 --- a/dlls/user/dialog16.c +++ b/dlls/user/dialog16.c @@ -260,6 +260,9 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result ) /* Get the font name */ + result->pointSize = 0; + result->faceName = NULL; + if (result->style & DS_SETFONT) { result->pointSize = GET_WORD(p); -- 2.32.0.93.g670b81a890