April 2008 - Wine-commits - list.winehq.org

ByeongSik Jeon : imm32: ImmGetVirtualKey return orignal virtual key value.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: fab832df68e27884ba0245205065a58a4b15ebff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab832df68e27884ba0245205… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri Apr 25 11:37:27 2008 +0900 imm32: ImmGetVirtualKey return orignal virtual key value. --- dlls/imm32/imm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 33f39cc..5cdd721 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1385,7 +1385,12 @@ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) UINT WINAPI ImmGetVirtualKey(HWND hWnd) { OSVERSIONINFOA version; - FIXME("(%p): stub\n", hWnd); + InputContextData *data = (InputContextData *)ImmGetContext( hWnd ); + TRACE("%p\n", hWnd); + + if ( data ) + return data->lastVK; + GetVersionExA( &version ); switch(version.dwPlatformId) {

1 0

ByeongSik Jeon : imm32: Fix a typo.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 86b0d5ecc93a19d8fdaaed77f4e7c6b4ca2e8984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b0d5ecc93a19d8fdaaed77f… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri Apr 25 11:37:32 2008 +0900 imm32: Fix a typo. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5cdd721..1f20e42 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1843,7 +1843,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { data->IMC.fOpen = fOpen; ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS); - ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + ImmInternalSendIMENotify(data, IMN_SETOPENSTATUS, 0); } return TRUE;

1 0

Alexandre Julliard : winecfg: Add a couple of Unicode helper functions.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: ad5876734d69c8ac57e2d6ec01ec4074b47b1635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5876734d69c8ac57e2d6ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 14:36:25 2008 +0200 winecfg: Add a couple of Unicode helper functions. --- programs/winecfg/winecfg.c | 33 +++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.h | 3 ++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index b21599d..3fdc796 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -461,6 +461,11 @@ void set_reg_key_dword(HKEY root, const char *path, const char *name, DWORD valu HeapFree(GetProcessHeap(), 0, wname); } +void set_reg_keyW(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR *value) +{ + set_reg_key_ex(root, path, name, value, REG_SZ); +} + void set_reg_key_dwordW(HKEY root, const WCHAR *path, const WCHAR *name, DWORD value) { set_reg_key_ex(root, path, name, &value, REG_DWORD); @@ -684,6 +689,34 @@ char *keypath(const char *section) return result; } +WCHAR *keypathW(const WCHAR *section) +{ + static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; + static WCHAR *result = NULL; + + HeapFree(GetProcessHeap(), 0, result); + + if (current_app) + { + DWORD len = sizeof(appdefaultsW) + (lstrlenW(current_app) + lstrlenW(section) + 1) * sizeof(WCHAR); + result = HeapAlloc(GetProcessHeap(), 0, len ); + lstrcpyW( result, appdefaultsW ); + lstrcatW( result, current_app ); + if (section[0]) + { + len = lstrlenW(result); + result[len++] = '\\'; + lstrcpyW( result + len, section ); + } + } + else + { + result = strdupW(section); + } + + return result; +} + void PRINTERROR(void) { LPSTR msg; diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index b0e2d39..7b0006a 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -71,7 +71,8 @@ WCHAR* load_string (UINT id); no explicit free is needed of the string returned by this function */ -char *keypath(const char *section); +char *keypath(const char *section); +WCHAR *keypathW(const WCHAR *section); int initialize(HINSTANCE hInstance); extern HKEY config_key;

1 0

Rob Shearman : widl: Add support for string literals and wide-string literals in expressions.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 33c891e6943497f88aa7ebab9cb21a5e4203c837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c891e6943497f88aa7ebab9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:59:21 2008 +0100 widl: Add support for string literals and wide-string literals in expressions. --- tools/widl/expr.c | 18 ++++++++++++++++ tools/widl/parser.l | 15 +++++++++--- tools/widl/parser.y | 53 +++++++++++++++++++++++++--------------------- tools/widl/widltypes.h | 8 +++--- tools/widl/write_msft.c | 48 +++++++++++++++++++----------------------- 5 files changed, 84 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c891e6943497f88aa7e…

1 0

Rob Shearman : widl: Add support for declaring multiple fields of a structure in one statement.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 957dd4b160d5943a0a9f096b841d6a4aa5ba0684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957dd4b160d5943a0a9f096b8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:59:00 2008 +0100 widl: Add support for declaring multiple fields of a structure in one statement. --- tools/widl/parser.y | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1732eae..36f5789 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -91,9 +91,11 @@ static attr_t *make_attrp(enum attr_type type, void *val); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static array_dims_t *append_array(array_dims_t *list, expr_t *expr); static void set_type(var_t *v, type_t *type, const declarator_t *decl, int top); +static var_list_t *set_var_types(attr_list_t *attrs, type_t *type, declarator_list_t *decls); static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); static ifref_t *make_ifref(type_t *iface); static var_list_t *append_var(var_list_t *list, var_t *var); +static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static var_t *make_var(char *name); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); static declarator_t *make_declarator(var_t *var); @@ -287,8 +289,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <type> type %type <ifref> coclass_int %type <ifref_list> coclass_ints -%type <var> arg field ne_union_field union_field s_field case enum constdef externdef -%type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props +%type <var> arg ne_union_field union_field s_field case enum constdef externdef +%type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident t_ident ident %type <declarator> declarator func_declarator direct_declarator %type <declarator_list> declarator_list @@ -702,11 +704,16 @@ externdef: tEXTERN tCONST type ident { $$ = $4; ; fields: { $$ = NULL; } - | fields field { $$ = append_var( $1, $2 ); } + | fields field { $$ = append_var_list($1, $2); } ; -field: s_field ';' { $$ = $1; } - | m_attributes uniondef ';' { $$ = make_var(NULL); $$->type = $2; $$->attrs = $1; } +field: m_attributes type declarator_list ';' { const char *first = LIST_ENTRY(list_head($3), declarator_t, entry)->var->name; + check_field_attrs(first, $1); + $$ = set_var_types($1, $2, $3); } + | m_attributes uniondef ';' { var_t *v = make_var(NULL); + v->type = $2; v->attrs = $1; + $$ = append_var(NULL, v); + } ; ne_union_field: @@ -1413,6 +1420,23 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, } } +static var_list_t *set_var_types(attr_list_t *attrs, type_t *type, declarator_list_t *decls) +{ + declarator_t *decl, *next; + var_list_t *var_list = NULL; + + LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) + { + var_t *var = decl->var; + + var->attrs = attrs; + set_type(var, type, decl, 0); + var_list = append_var(var_list, var); + free(decl); + } + return var_list; +} + static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface) { if (!iface) return list; @@ -1445,6 +1469,18 @@ static var_list_t *append_var(var_list_t *list, var_t *var) return list; } +static var_list_t *append_var_list(var_list_t *list, var_list_t *vars) +{ + if (!vars) return list; + if (!list) + { + list = xmalloc( sizeof(*list) ); + list_init( list ); + } + list_move_tail( list, vars ); + return list; +} + static var_t *make_var(char *name) { var_t *v = xmalloc(sizeof(var_t));

1 0

Rob Shearman : widl: Create a statement object for import statements.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 66fa9a714e95633deb7ef06ebda27fdea6b8f536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fa9a714e95633deb7ef06eb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:59:40 2008 +0100 widl: Create a statement object for import statements. Move the writing of include directives into the generated header into header.c. --- tools/widl/header.c | 12 ++++++++++++ tools/widl/header.h | 1 + tools/widl/parser.l | 11 +---------- tools/widl/parser.y | 36 ++++++++++++++++++++++++++++-------- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 0d7e0b2..ae70454 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1039,3 +1039,15 @@ void write_coclass_forward(type_t *cocl) fprintf(header, "typedef struct %s %s;\n", cocl->name, cocl->name); fprintf(header, "#endif /* defined __%s_FWD_DEFINED__ */\n\n", cocl->name ); } + +void write_import(const char *fname) +{ + char *hname, *p; + + hname = dup_basename(fname, ".idl"); + p = hname + strlen(hname) - 2; + if (p <= hname || strcmp( p, ".h" )) strcat(hname, ".h"); + + fprintf(header, "#include <%s>\n", hname); + free(hname); +} diff --git a/tools/widl/header.h b/tools/widl/header.h index c663c70..c2cecd5 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -49,6 +49,7 @@ extern int need_proxy_file(const statement_list_t *stmts); extern const var_t *is_callas(const attr_list_t *list); extern void write_args(FILE *h, const var_list_t *arg, const char *name, int obj, int do_indent); extern void write_array(FILE *h, array_dims_t *v, int field); +extern void write_import(const char *fname); extern void write_forward(type_t *iface); extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d40c9d0..1e8460b 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -411,20 +411,11 @@ struct imports { int do_import(char *fname) { FILE *f; - char *hname, *path, *p; + char *path; struct imports *import; int ptr = import_stack_ptr; int ret; - if (!parse_only && do_header) { - hname = dup_basename(fname, ".idl"); - p = hname + strlen(hname) - 2; - if (p <= hname || strcmp( p, ".h" )) strcat(hname, ".h"); - - fprintf(header, "#include <%s>\n", hname); - free(hname); - } - import = first_import; while (import && strcmp(import->name, fname)) import = import->next; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 43c4af2..d57d286 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -78,6 +78,12 @@ struct typenode { struct list entry; }; +struct _import_t +{ + char *name; + int import_performed; +}; + typelist_t incomplete_types = LIST_INIT(incomplete_types); static void add_incomplete(type_t *t); @@ -150,6 +156,7 @@ static statement_t *make_statement_library(typelib_t *typelib); static statement_t *make_statement_cppquote(const char *str); static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); +static statement_t *make_statement_import(const char *str); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); #define tsENUM 1 @@ -180,7 +187,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s unsigned int num; double dbl; interface_info_t ifinfo; - typelib_t *typelib; + typelib_t *typelib; + struct _import_t *import; } %token <str> aIDENTIFIER @@ -298,9 +306,9 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <func_list> int_statements dispint_meths %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version -%type <str> libraryhdr callconv cppquote importlib +%type <str> libraryhdr callconv cppquote importlib import %type <uuid> uuid_string -%type <num> import_start +%type <import> import_start %type <typelib> library_start librarydef %type <statement> statement typedef %type <stmt_list> gbl_statements imp_statements @@ -387,7 +395,7 @@ statement: constdef ';' { $$ = make_statement_init_decl($1); | externdef ';' { $$ = make_statement_extern($1); if (!parse_only && do_header) write_externdef($1); } - | import { $$ = NULL; } + | import { $$ = make_statement_import($1); } | structdef ';' { $$ = make_statement_type_decl($1); if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); @@ -406,13 +414,18 @@ statement: constdef ';' { $$ = make_statement_init_decl($1); cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; if (!parse_only && do_header) fprintf(header, "%s\n", $3); } ; import_start: tIMPORT aSTRING ';' { assert(yychar == YYEMPTY); - $$ = do_import($2); - if (!$$) yychar = aEOF; + $$ = xmalloc(sizeof(struct _import_t)); + $$->name = $2; + $$->import_performed = do_import($2); + if (!$$->import_performed) yychar = aEOF; } ; -import: import_start imp_statements aEOF - { if ($1) pop_import(); } +import: import_start imp_statements aEOF { $$ = $1->name; + if ($1->import_performed) pop_import(); + free($1); + if (!parse_only && do_header) write_import($$); + } ; importlib: tIMPORTLIB '(' aSTRING ')' @@ -2607,6 +2620,13 @@ static statement_t *make_statement_importlib(const char *str) return stmt; } +static statement_t *make_statement_import(const char *str) +{ + statement_t *stmt = make_statement(STMT_IMPORT); + stmt->u.str = str; + return stmt; +} + static statement_t *make_statement_module(type_t *type) { statement_t *stmt = make_statement(STMT_MODULE);

1 0

Rob Shearman : widl: Move the func_declarator rule entirely into direct_declarator.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 242a8a02f565dc3c568ceaa921949b4fd662f01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=242a8a02f565dc3c568ceaa92… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 11:00:20 2008 +0100 widl: Move the func_declarator rule entirely into direct_declarator. --- tools/widl/parser.y | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d57d286..8e0ff86 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -300,7 +300,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <var> arg ne_union_field union_field s_field case enum constdef externdef %type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident t_ident ident -%type <declarator> declarator func_declarator direct_declarator +%type <declarator> declarator direct_declarator %type <declarator_list> declarator_list %type <func> funcdef %type <func_list> int_statements dispint_meths @@ -970,18 +970,12 @@ declarator: | direct_declarator ; -func_declarator: direct_declarator '(' m_args ')' - { $$ = $1; - $$->type = append_ptrchain_type($$->type, make_func_type($3)); - } - ; - direct_declarator: ident { $$ = make_declarator($1); } | '(' declarator ')' { $$ = $2; } | direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } - | func_declarator { $$ = $1; - $$->func_type = $$->type; + | direct_declarator '(' m_args ')' { $$ = $1; + $$->func_type = append_ptrchain_type($$->type, make_func_type($3)); $$->type = NULL; } ;

1 0

Alexandre Julliard : winex11: Don't force tool windows to unmanaged mode.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 1f99d80c06994aeb8b2fa959c477a77c79184980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f99d80c06994aeb8b2fa959c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 25 14:26:52 2008 +0200 winex11: Don't force tool windows to unmanaged mode. The detection algorithm should be good enough for that case now. --- dlls/winex11.drv/window.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3658c71..0f84ae2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -101,13 +101,8 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec if (hwnd == GetActiveWindow()) return TRUE; /* windows with caption are managed */ if ((style & WS_CAPTION) == WS_CAPTION) return TRUE; - /* tool windows are not managed */ - ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); - if (ex_style & WS_EX_TOOLWINDOW) return FALSE; /* windows with thick frame are managed */ if (style & WS_THICKFRAME) return TRUE; - /* application windows are managed */ - if (ex_style & WS_EX_APPWINDOW) return TRUE; if (style & WS_POPUP) { /* popup with sysmenu == caption are managed */ @@ -117,6 +112,9 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec window_rect->top <= 0 && window_rect->bottom >= screen_height) return TRUE; } + /* application windows are managed */ + ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); + if (ex_style & WS_EX_APPWINDOW) return TRUE; /* default: not managed */ return FALSE; }

1 0

ByeongSik Jeon : imm32: Reconstruct the ImmProcessKey, ImmTranslateMessage for the VK_PROCESSKEY.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 7e341002d228237bd00b4c7feabdbaa3d3389f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e341002d228237bd00b4c7fe… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri Apr 25 11:37:07 2008 +0900 imm32: Reconstruct the ImmProcessKey, ImmTranslateMessage for the VK_PROCESSKEY. --- dlls/imm32/imm.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 04b0d77..33f39cc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2239,7 +2239,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) UINT uVirtKey; static const int list_count = 10; - TRACE("%p %x '%c' %x\n",hwnd, msg, chr, (UINT)lKeyData); + TRACE("%p %x %x %x\n",hwnd, msg, chr, (UINT)lKeyData); if (imc) data = (InputContextData*)imc; @@ -2259,6 +2259,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) { if (!is_himc_ime_unicode(data)) ToAscii(data->lastVK, scancode, state, &chr, 0); + else + ToUnicodeEx(data->lastVK, scancode, state, &chr, 1, 0, GetKeyboardLayout(0)); uVirtKey = MAKELONG(data->lastVK,chr); } else @@ -2279,6 +2281,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) HeapFree(GetProcessHeap(),0,list); + data->lastVK = VK_PROCESSKEY; + return (msg_count > 0); } @@ -2303,17 +2307,12 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD return FALSE; GetKeyboardState(state); - data->lastVK = vKey; - if (data->immKbd->pImeProcessKey(imc, vKey, lKeyData, state)) { - WCHAR key; - UINT scancode; - - scancode = lKeyData >> 0x10 & 0xff; - ToUnicodeEx(vKey, scancode, state, &key, 1, 0, hKL); - return ImmTranslateMessage(hwnd, WM_KEYDOWN, key, lKeyData ); + data->lastVK = vKey; + return TRUE; } + data->lastVK = VK_PROCESSKEY; return FALSE; }

1 0

Rob Shearman : widl: Make the rules for parsing fields in structures, encapsulated unions and non-encapsulated unions more strict.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 14dd441c5b6f2a4303ae128883469f4f09dbc32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14dd441c5b6f2a4303ae12888… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Apr 25 10:58:40 2008 +0100 widl: Make the rules for parsing fields in structures, encapsulated unions and non-encapsulated unions more strict. Move the rules in fields that handle empty union cases into separate union rules so that they can't erroneously be accepted for structures or other types of unions. --- tools/widl/parser.y | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 461483c..1732eae 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -287,8 +287,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <type> type %type <ifref> coclass_int %type <ifref_list> coclass_ints -%type <var> arg field s_field case enum constdef externdef -%type <var_list> m_args no_args args fields cases enums enum_list dispint_props +%type <var> arg field ne_union_field union_field s_field case enum constdef externdef +%type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props %type <var> m_ident t_ident ident %type <declarator> declarator func_declarator direct_declarator %type <declarator_list> declarator_list @@ -576,11 +576,11 @@ cases: { $$ = NULL; } | cases case { $$ = append_var( $1, $2 ); } ; -case: tCASE expr_const ':' field { attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, $2 )); +case: tCASE expr_const ':' union_field { attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, $2 )); $$ = $4; if (!$$) $$ = make_var(NULL); $$->attrs = append_attr( $$->attrs, a ); } - | tDEFAULT ':' field { attr_t *a = make_attr(ATTR_DEFAULT); + | tDEFAULT ':' union_field { attr_t *a = make_attr(ATTR_DEFAULT); $$ = $3; if (!$$) $$ = make_var(NULL); $$->attrs = append_attr( $$->attrs, a ); } @@ -707,10 +707,20 @@ fields: { $$ = NULL; } field: s_field ';' { $$ = $1; } | m_attributes uniondef ';' { $$ = make_var(NULL); $$->type = $2; $$->attrs = $1; } + ; + +ne_union_field: + s_field ';' { $$ = $1; } | attributes ';' { $$ = make_var(NULL); $$->attrs = $1; } - | ';' { $$ = NULL; } + +ne_union_fields: { $$ = NULL; } + | ne_union_fields ne_union_field { $$ = append_var( $1, $2 ); } ; +union_field: + s_field ';' { $$ = $1; } + | ';' { $$ = NULL; } + s_field: m_attributes type declarator { $$ = $3->var; $$->attrs = check_field_attrs($$->name, $1); set_type($$, $2, $3, FALSE); @@ -990,7 +1000,8 @@ typedef: tTYPEDEF m_attributes type declarator_list } ; -uniondef: tUNION t_ident '{' fields '}' { $$ = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, $2, tsUNION); +uniondef: tUNION t_ident '{' ne_union_fields '}' + { $$ = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, $2, tsUNION); $$->kind = TKIND_UNION; $$->fields_or_args = $4; $$->defined = TRUE;

1 0