Fix uninitialized variable warnings emitted by gcc 4.0.
This commit is contained in:
parent
f480b6ba6c
commit
177b237863
|
@ -424,6 +424,11 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result )
|
||||||
|
|
||||||
/* Get the font name */
|
/* Get the font name */
|
||||||
|
|
||||||
|
result->pointSize = 0;
|
||||||
|
result->faceName = NULL;
|
||||||
|
result->weight = FW_DONTCARE;
|
||||||
|
result->italic = FALSE;
|
||||||
|
|
||||||
if (result->style & DS_SETFONT)
|
if (result->style & DS_SETFONT)
|
||||||
{
|
{
|
||||||
result->pointSize = GET_WORD(p);
|
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->weight = GET_WORD(p); p++;
|
||||||
result->italic = LOBYTE(GET_WORD(p)); p++;
|
result->italic = LOBYTE(GET_WORD(p)); p++;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
result->weight = FW_DONTCARE;
|
|
||||||
result->italic = FALSE;
|
|
||||||
}
|
|
||||||
result->faceName = (LPCWSTR)p;
|
result->faceName = (LPCWSTR)p;
|
||||||
p += strlenW( result->faceName ) + 1;
|
p += strlenW( result->faceName ) + 1;
|
||||||
TRACE(" FONT %d, %s, %d, %s\n",
|
TRACE(" FONT %d, %s, %d, %s\n",
|
||||||
|
|
|
@ -260,6 +260,9 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result )
|
||||||
|
|
||||||
/* Get the font name */
|
/* Get the font name */
|
||||||
|
|
||||||
|
result->pointSize = 0;
|
||||||
|
result->faceName = NULL;
|
||||||
|
|
||||||
if (result->style & DS_SETFONT)
|
if (result->style & DS_SETFONT)
|
||||||
{
|
{
|
||||||
result->pointSize = GET_WORD(p);
|
result->pointSize = GET_WORD(p);
|
||||||
|
|
Loading…
Reference in New Issue