Skip to content

W
wine-winehq
Commit c0dfdbcf authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard
Browse files
Options

wrc: Don't crash when parsing COMBOBOX element without style.

Signed-off-by: 's avatarFabian Maurer <dark.shadow4@web.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a9ac425a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
tools/wrc/parser.y
View file @ c0dfdbcf
...@@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control ...@@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control
defaultstyle |= LBS_NOTIFY | WS_BORDER; defaultstyle |= LBS_NOTIFY | WS_BORDER;
break; break;
case CT_COMBOBOX: case CT_COMBOBOX:
if (!(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) if (!ctrl->gotstyle || !(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST)))
defaultstyle |= CBS_SIMPLE; defaultstyle |= CBS_SIMPLE;
break; break;
case CT_STATIC: case CT_STATIC:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment