March 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Fix nsparser leak if script_elem_from_nsscript failed.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 541257b0a20440a8f1e6e7376fc8593d08b3f32a URL: https://gitlab.winehq.org/wine/wine/-/commit/541257b0a20440a8f1e6e7376fc859… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Fix nsparser leak if script_elem_from_nsscript failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mutation.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 89bba9cb195..7f2d92b4bcc 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -352,8 +352,11 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa hres = script_elem_from_nsscript(nsscript, &script_elem); nsIDOMHTMLScriptElement_Release(nsscript); - if(FAILED(hres)) + if(FAILED(hres)) { + if(nsparser) + nsIParser_Release(nsparser); return NS_ERROR_FAILURE; + } if(nsparser) { nsIParser_BeginEvaluatingParserInsertedScript(nsparser);

1 0

Gabriel Ivăncescu : mshtml: Fix nsscript leak in bind_event_scripts.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: c6c266a4b90d2c7b87bad1f083ecadffa78dde54 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6c266a4b90d2c7b87bad1f083ecad… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Fix nsscript leak in bind_event_scripts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/script.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 0e2241663dc..0cd79b45405 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1654,6 +1654,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) nsIDOMNode_Release(script_node); hres = script_elem_from_nsscript(nsscript, &script_elem); + nsIDOMHTMLScriptElement_Release(nsscript); if(FAILED(hres)) continue;

1 0

Gabriel Ivăncescu : mshtml: Fix nsevent leak in create_document_event.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 45263e333c8eb8bd79f172c89df91e511494784e URL: https://gitlab.winehq.org/wine/wine/-/commit/45263e333c8eb8bd79f172c89df91e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:57 2023 +0200 mshtml: Fix nsevent leak in create_document_event. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index bcde9f38bba..bccdfb81121 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3253,6 +3253,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven } event = alloc_event(nsevent, doc->document_mode, event_info[event_id].type, event_id); + nsIDOMEvent_Release(nsevent); if(!event) return E_OUTOFMEMORY;

1 0

Gabriel Ivăncescu : mshtml: Fix nsuri leak if create_channelbsc failed.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: fb0b55c52056e9dc6358857b13f534b2579b64ab URL: https://gitlab.winehq.org/wine/wine/-/commit/fb0b55c52056e9dc6358857b13f534… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Fix nsuri leak if create_channelbsc failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/persist.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 78e8f609187..b1ec172f912 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -378,20 +378,22 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind hres = create_doc_uri(uri, &nsuri); if(!nav_uri) IUri_Release(uri); - if(SUCCEEDED(hres)) { - if(async_bsc) - bscallback = async_bsc; - else - hres = create_channelbsc(mon, NULL, NULL, 0, TRUE, &bscallback); + if(FAILED(hres)) { + CoTaskMemFree(url); + return hres; } + if(async_bsc) + bscallback = async_bsc; + else + hres = create_channelbsc(mon, NULL, NULL, 0, TRUE, &bscallback); + if(SUCCEEDED(hres)) { if(window->base.inner_window->doc) remove_target_tasks(window->base.inner_window->task_magic); abort_window_bindings(window->base.inner_window); hres = load_nsuri(window, nsuri, NULL, bscallback, LOAD_FLAGS_BYPASS_CACHE); - nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) { hres = create_pending_window(window, bscallback); TRACE("pending window for %p %p %p\n", window, bscallback, window->pending_window); @@ -399,6 +401,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind if(bscallback != async_bsc) IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); } + nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(FAILED(hres)) { CoTaskMemFree(url);

1 0

Gabriel Ivăncescu : mshtml: Share reference with the node for Gecko DOM Documents.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 05f6885f6231bb2aa0799528b9aa86d20818ff51 URL: https://gitlab.winehq.org/wine/wine/-/commit/05f6885f6231bb2aa0799528b9aa86… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Share reference with the node for Gecko DOM Documents. This simplifies the code and CC graph, like it's done for e.g. elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f3a370848da..1669b4c518b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5860,26 +5860,15 @@ static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HT return E_NOTIMPL; } -static void HTMLDocumentNode_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - - if(This->dom_document) - note_cc_edge((nsISupports*)This->dom_document, "This->dom_document", cb); -} - static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); if(This->dom_document) { - nsIDOMDocument *dom_document = This->dom_document; - release_document_mutation(This); detach_document_node(This); This->dom_document = NULL; This->html_document = NULL; - nsIDOMDocument_Release(dom_document); This->window = NULL; } } @@ -5902,7 +5891,7 @@ static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { NULL, NULL, NULL, - HTMLDocumentNode_traverse, + NULL, HTMLDocumentNode_unlink }; @@ -6272,10 +6261,11 @@ HRESULT create_document_node(nsIDOMDocument *nsdoc, GeckoBrowser *browser, HTMLI if(!doc_obj->window || (window && is_main_content_window(window->base.outer_window))) doc->cp_container.forward_container = &doc_obj->cp_container; - if(NS_SUCCEEDED(nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&doc->html_document))) + /* Share reference with HTMLDOMNode */ + if(NS_SUCCEEDED(nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&doc->html_document))) { doc->dom_document = (nsIDOMDocument*)doc->html_document; - else { - nsIDOMDocument_AddRef(nsdoc); + nsIDOMHTMLDocument_Release(doc->html_document); + }else { doc->dom_document = nsdoc; doc->html_document = NULL; }

1 0

Rémi Bernon : widl: Lex calling convention variations toghether.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: f869c8e7a3667e9a5b8246e1f0bc93c08d02a1be URL: https://gitlab.winehq.org/wine/wine/-/commit/f869c8e7a3667e9a5b8246e1f0bc93… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Lex calling convention variations toghether. --- tools/widl/parser.l | 15 ++++----------- tools/widl/parser.y | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 77162126a8e..9fc6a10c501 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -356,22 +356,17 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; FALSE { return tFALSE; } NULL { return tNULL; } TRUE { return tTRUE; } - __cdecl { return tCDECL; } - __fastcall { return tFASTCALL; } + _?_?cdecl { return token_str( tCDECL, "__cdecl", yylval ); } + _?_?pascal { return token_str( tPASCAL, "__pascal", yylval ); } + _?_?stdcall { return token_str( tSTDCALL, "__stdcall", yylval ); } + __?fastcall { return token_str( tFASTCALL, "__fastcall", yylval ); } __int32 { return tINT32; } __int3264 { return tINT3264; } __int64 { return tINT64; } - __pascal { return tPASCAL; } - __stdcall { return tSTDCALL; } - _cdecl { return tCDECL; } - _fastcall { return tFASTCALL; } - _pascal { return tPASCAL; } - _stdcall { return tSTDCALL; } apicontract { return token_winrt( tAPICONTRACT, yytext, yylval ); } boolean { return tBOOLEAN; } byte { return tBYTE; } case { return tCASE; } - cdecl { return tCDECL; } char { return tCHAR; } coclass { return tCOCLASS; } const { return tCONST; } @@ -397,7 +392,6 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; methods { return tMETHODS; } module { return tMODULE; } namespace { return token_winrt( tNAMESPACE, yytext, yylval ); } - pascal { return tPASCAL; } properties { return tPROPERTIES; } register { return tREGISTER; } requires { return token_winrt( tREQUIRES, yytext, yylval ); } @@ -407,7 +401,6 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; sizeof { return tSIZEOF; } small { return tSMALL; } static { return tSTATIC; } - stdcall { return tSTDCALL; } struct { return tSTRUCT; } switch { return tSWITCH; } typedef { return tTYPEDEF; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8954033206a..1176c2427a1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -167,6 +167,10 @@ int parser_lex( PARSER_STYPE *yylval ); %token <num> aNUM aHEXNUM %token <dbl> aDOUBLE %token <str> aSTRING aWSTRING aSQSTRING +%token <str> tCDECL +%token <str> tFASTCALL +%token <str> tPASCAL +%token <str> tSTDCALL %token <uuid> aUUID %token aEOF aACF %token SHL SHR @@ -182,7 +186,7 @@ int parser_lex( PARSER_STYPE *yylval ); %token tAPICONTRACT %token tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT -%token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS +%token tCALLAS tCALLBACK tCASE tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE %token tCONTEXTHANDLESERIALIZE %token tCONTRACT @@ -204,7 +208,7 @@ int parser_lex( PARSER_STYPE *yylval ); %token tEXCLUSIVETO %token tEXPLICITHANDLE tEXTERN %token tFALSE -%token tFASTCALL tFAULTSTATUS +%token tFAULTSTATUS %token tFLAGS %token tFLOAT tFORCEALLOCATE %token tHANDLE @@ -241,7 +245,7 @@ int parser_lex( PARSER_STYPE *yylval ); %token tOPTIMIZE tOPTIONAL %token tOUT %token tOVERLOAD -%token tPARTIALIGNORE tPASCAL +%token tPARTIALIGNORE %token tPOINTERDEFAULT %token tPRAGMA_WARNING %token tPROGID tPROPERTIES @@ -264,7 +268,6 @@ int parser_lex( PARSER_STYPE *yylval ); %token tSOURCE %token tSTANDARD %token tSTATIC -%token tSTDCALL %token tSTRICTCONTEXTHANDLE %token tSTRING tSTRUCT %token tSWITCH tSWITCHIS tSWITCHTYPE @@ -729,10 +732,10 @@ attribute | pointer_type { $$ = make_attrv(ATTR_POINTERTYPE, $1); } ; -callconv: tCDECL { $$ = xstrdup("__cdecl"); } - | tFASTCALL { $$ = xstrdup("__fastcall"); } - | tPASCAL { $$ = xstrdup("__pascal"); } - | tSTDCALL { $$ = xstrdup("__stdcall"); } +callconv: tCDECL + | tFASTCALL + | tPASCAL + | tSTDCALL ; cases

1 0

Rémi Bernon : widl: Simplify preprocessor directive lexing.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 858ec42a31c5693cbae3ccf531e745864ee5884e URL: https://gitlab.winehq.org/wine/wine/-/commit/858ec42a31c5693cbae3ccf531e745… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Simplify preprocessor directive lexing. --- tools/widl/parser.l | 74 ++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index fa9a0c852ff..ac9925060f0 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -31,6 +31,7 @@ cident [a-zA-Z_][0-9a-zA-Z_]* %x ATTR %x PP_LINE +%x PP_FILE %x PP_PRAGMA %{ @@ -153,6 +154,14 @@ static int token_num( int token, const char *yytext, YYSTYPE *yylval ) return token; } +static void winrt_enable( int ns_prefix ) +{ + if (!list_empty( &import_stack ) && !winrt_mode) error_loc( "WinRT IDL file imported in non-winrt mode." ); + + use_abi_namespace = ns_prefix; + winrt_mode = TRUE; +} + %} /* @@ -161,43 +170,34 @@ static int token_num( int token, const char *yytext, YYSTYPE *yylval ) ************************************************************************** */ %% -<PP_LINE>[^\n]* { - int lineno; - char *cptr, *fname; - yy_pop_state(); - lineno = (int)strtol(yytext, &cptr, 10); - if(!lineno) - error_loc("Malformed '#...' line-directive; invalid linenumber\n"); - fname = strchr(cptr, '"'); - if(!fname) - error_loc("Malformed '#...' line-directive; missing filename\n"); - fname++; - cptr = strchr(fname, '"'); - if(!cptr) - error_loc("Malformed '#...' line-directive; missing terminating \"\n"); - *cptr = '\0'; - line_number = lineno - 1; /* We didn't read the newline */ - input_name = xstrdup(fname); - } -<PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; -<PP_PRAGMA>winrt[^\n]* { - if (!list_empty( &import_stack )) - { - if(!winrt_mode) - error_loc("winrt IDL file imported in non-winrt mode\n"); - }else { - const char *ptr = yytext+5; - - winrt_mode = TRUE; - - while(isspace(*ptr)) - ptr++; - if(!strncmp(ptr, "ns_prefix", 9) && (!*(ptr += 9) || isspace(*ptr))) - use_abi_namespace = TRUE; - } - yy_pop_state(); - } -<PP_PRAGMA>[^\n]* yylval->str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; +<PP_PRAGMA>{ + midl_echo/"(" { + yy_pop_state(); + return tCPPQUOTE; + } + winrt{ws}+ns_prefix[^\n]* { + yy_pop_state(); + winrt_enable( TRUE ); + } + winrt[^\n]* { + yy_pop_state(); + winrt_enable( FALSE ); + } + [^\n]* { + yy_pop_state(); + return token_str( aPRAGMA, yytext, yylval ); + } +} +<PP_LINE>[0-9]+{ws}* { + line_number = strtoul( yytext, NULL, 10 ) - 1; /* We didn't read the newline */ + yy_pop_state(); + yy_push_state(PP_FILE); + } +<PP_FILE>\"(\\[^n]|[^"\\\n])*\"{ws}* { + input_name = xstrdup( yytext + 1 ); + *strchr( input_name, '"' ) = 0; + } +<PP_FILE>[^"][^\n]* { yy_pop_state(); } <ATTR>{ \] { yy_pop_state(); return ']'; }

1 0

Rémi Bernon : widl: Simplify reserved keywords lexing.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 53ae787d02b53678d1865184f6660a889243952d URL: https://gitlab.winehq.org/wine/wine/-/commit/53ae787d02b53678d1865184f6660a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 17 09:14:14 2023 +0100 widl: Simplify reserved keywords lexing. --- tools/widl/parser.l | 452 +++++++++++++++++++++++----------------------------- tools/widl/parser.y | 14 +- 2 files changed, 208 insertions(+), 258 deletions(-)

1 0

Rémi Bernon : widl: Remove unused lexer aliases.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 83f9f2cd3cbf86727325aaa10cbec3bac8e2dce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/83f9f2cd3cbf86727325aaa10cbec3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 17 09:10:57 2023 +0100 widl: Remove unused lexer aliases. --- tools/widl/parser.l | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 269f74291a1..fa9a0c852ff 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -24,16 +24,10 @@ %option noyywrap %option 8bit never-interactive prefix="parser_" -nl \r?\n -ws [ \f\t\r] -hd [0-9a-fA-F] -cident [a-zA-Z_][0-9a-zA-Z_]* -u_suffix (u|U) -l_suffix (l|L) -int [0-9]+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? -hex 0(x|X){hd}+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? -uuid {hd}{8}-{hd}{4}-{hd}{4}-{hd}{4}-{hd}{12} -double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* +ws [ \f\t\r] +hd [0-9a-fA-F] +uuid {hd}{8}-{hd}{4}-{hd}{4}-{hd}{4}-{hd}{12} +cident [a-zA-Z_][0-9a-zA-Z_]* %x ATTR %x PP_LINE @@ -216,7 +210,7 @@ static int token_num( int token, const char *yytext, YYSTYPE *yylval ) ^{ws}*\#{ws}*pragma{ws}+ { yy_push_state( PP_PRAGMA ); } ^{ws}*midl_pragma{ws}+warning { return tPRAGMA_WARNING; } - {double} { + [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* { yylval->dbl = strtod( yytext, NULL ); return aDOUBLE; } @@ -229,8 +223,8 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; ^{ws}*\#{ws}* { yy_push_state(PP_LINE); } \[ { yy_push_state(ATTR); return '['; } - {hex} { return token_num( aHEXNUM, yytext, yylval ); } - {int} { return token_num( aNUM, yytext, yylval ); } + 0[xX]{hd}+([lL][uU]?|[uU][lL]?)? { return token_num( aHEXNUM, yytext, yylval ); } + [0-9]+([lL][uU]?|[uU][lL]?)? { return token_num( aNUM, yytext, yylval ); } L\"(\\.|[^"\\])*\" { return token_str( aWSTRING, yytext + 1, yylval ); } \"(\\.|[^"\\])*\" { return token_str( aSTRING, yytext, yylval ); }

1 0

Rémi Bernon : widl: Simplify uuid literals lexing.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: abbf6cefc55f0aeac4fb149c66b2bca5bc65c1fd URL: https://gitlab.winehq.org/wine/wine/-/commit/abbf6cefc55f0aeac4fb149c66b2bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Simplify uuid literals lexing. --- tools/widl/parser.l | 57 +++++++++++++++++++++++++++++++---------------------- tools/widl/parser.y | 31 +++-------------------------- tools/widl/utils.h | 3 --- 3 files changed, 36 insertions(+), 55 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 44741d4d63a..269f74291a1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -26,13 +26,13 @@ nl \r?\n ws [ \f\t\r] +hd [0-9a-fA-F] cident [a-zA-Z_][0-9a-zA-Z_]* u_suffix (u|U) l_suffix (l|L) int [0-9]+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? -hexd [0-9a-fA-F] -hex 0(x|X){hexd}+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? -uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12} +hex 0(x|X){hd}+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? +uuid {hd}{8}-{hd}{4}-{hd}{4}-{hd}{4}-{hd}{12} double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* %x ATTR @@ -101,24 +101,36 @@ static unsigned int xstrtoul(const char *nptr, char **endptr, int base) return val; } -struct uuid *parse_uuid(const char *u) +static int token_uuid( const char *str, YYSTYPE *yylval ) { - struct uuid* uuid = xmalloc(sizeof(*uuid)); - char b[3]; - /* it would be nice to use UuidFromStringA */ - uuid->Data1 = strtoul(u, NULL, 16); - uuid->Data2 = strtoul(u+9, NULL, 16); - uuid->Data3 = strtoul(u+14, NULL, 16); - b[2] = 0; - memcpy(b, u+19, 2); uuid->Data4[0] = strtoul(b, NULL, 16); - memcpy(b, u+21, 2); uuid->Data4[1] = strtoul(b, NULL, 16); - memcpy(b, u+24, 2); uuid->Data4[2] = strtoul(b, NULL, 16); - memcpy(b, u+26, 2); uuid->Data4[3] = strtoul(b, NULL, 16); - memcpy(b, u+28, 2); uuid->Data4[4] = strtoul(b, NULL, 16); - memcpy(b, u+30, 2); uuid->Data4[5] = strtoul(b, NULL, 16); - memcpy(b, u+32, 2); uuid->Data4[6] = strtoul(b, NULL, 16); - memcpy(b, u+34, 2); uuid->Data4[7] = strtoul(b, NULL, 16); - return uuid; + struct uuid *uuid; + char tmp[3] = {0}; + + if (*str == '\"') str++; + + uuid = xmalloc( sizeof(*uuid) ); + uuid->Data1 = strtoul( str , NULL, 16 ); + uuid->Data2 = strtoul( str + 9, NULL, 16 ); + uuid->Data3 = strtoul( str + 14, NULL, 16 ); + memcpy( tmp, str + 19, 2 ); + uuid->Data4[0] = strtoul( tmp, NULL, 16 ); + memcpy( tmp, str + 21, 2 ); + uuid->Data4[1] = strtoul( tmp, NULL, 16 ); + memcpy( tmp, str + 24, 2 ); + uuid->Data4[2] = strtoul( tmp, NULL, 16 ); + memcpy( tmp, str + 26, 2 ); + uuid->Data4[3] = strtoul( tmp, NULL, 16 ); + memcpy( tmp, str + 28, 2 ); + uuid->Data4[4] = strtoul( tmp, NULL, 16 ); + memcpy( tmp, str + 30, 2 ); + uuid->Data4[5] = strtoul( tmp, NULL, 16 ); + memcpy( tmp, str + 32, 2 ); + uuid->Data4[6] = strtoul( tmp, NULL, 16 ); + memcpy( tmp, str + 34, 2 ); + uuid->Data4[7] = strtoul( tmp, NULL, 16 ); + + yylval->uuid = uuid; + return aUUID; } static int token_str( int token, const char *str, YYSTYPE *yylval ) @@ -196,11 +208,8 @@ static int token_num( int token, const char *yytext, YYSTYPE *yylval ) <ATTR>{ \] { yy_pop_state(); return ']'; } + ({uuid}|\"{uuid}\") { return token_uuid( yytext, yylval ); } {cident} { return attr_token( yytext, yylval ); } - {uuid} { - yylval->uuid = parse_uuid( yytext ); - return aUUID; - } } <INITIAL>{ diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 031e5482792..a48a8ca54f3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -330,7 +330,6 @@ int parser_lex( PARSER_STYPE *yylval ); %type <num> pointer_type threading_type marshaling_behavior version %type <str> libraryhdr callconv cppquote importlib import %type <str> typename m_typename -%type <uuid> uuid_string %type <str> import_start %type <typelib> library_start librarydef %type <statement> statement typedef pragma_warning @@ -630,7 +629,7 @@ attribute | tCONTRACT '(' contract_req ')' { $$ = make_attrp(ATTR_CONTRACT, $3); } | tCONTRACTVERSION '(' contract_ver ')' { $$ = make_attrv(ATTR_CONTRACTVERSION, $3); } | tCONTROL { $$ = make_attr(ATTR_CONTROL); } - | tCUSTOM '(' uuid_string ',' expr_const ')' { $$ = make_custom_attr($3, $5); } + | tCUSTOM '(' aUUID ',' expr_const ')' { $$ = make_custom_attr($3, $5); } | tDECODE { $$ = make_attr(ATTR_DECODE); } | tDEFAULT { $$ = make_attr(ATTR_DEFAULT); } | tDEFAULTBIND { $$ = make_attr(ATTR_DEFAULTBIND); } @@ -720,8 +719,8 @@ attribute | tUIDEFAULT { $$ = make_attr(ATTR_UIDEFAULT); } | tUSESGETLASTERROR { $$ = make_attr(ATTR_USESGETLASTERROR); } | tUSERMARSHAL '(' type ')' { $$ = make_attrp(ATTR_USERMARSHAL, $3); } - | tUUID '(' uuid_string ')' { $$ = make_attrp(ATTR_UUID, $3); } - | tASYNCUUID '(' uuid_string ')' { $$ = make_attrp(ATTR_ASYNCUUID, $3); } + | tUUID '(' aUUID ')' { $$ = make_attrp(ATTR_UUID, $3); } + | tASYNCUUID '(' aUUID ')' { $$ = make_attrp(ATTR_ASYNCUUID, $3); } | tV1ENUM { $$ = make_attr(ATTR_V1ENUM); } | tVARARG { $$ = make_attr(ATTR_VARARG); } | tVERSION '(' version ')' { $$ = make_attrv(ATTR_VERSION, $3); } @@ -730,13 +729,6 @@ attribute | pointer_type { $$ = make_attrv(ATTR_POINTERTYPE, $1); } ; -uuid_string: - aUUID - | aSTRING { if (!is_valid_uuid($1)) - error_loc("invalid UUID: %s\n", $1); - $$ = parse_uuid($1); } - ; - callconv: tCDECL { $$ = xstrdup("__cdecl"); } | tFASTCALL { $$ = xstrdup("__fastcall"); } | tPASCAL { $$ = xstrdup("__pascal"); } @@ -3258,23 +3250,6 @@ static void check_all_user_types(const statement_list_t *stmts) } } -int is_valid_uuid(const char *s) -{ - int i; - - for (i = 0; i < 36; ++i) - if (i == 8 || i == 13 || i == 18 || i == 23) - { - if (s[i] != '-') - return FALSE; - } - else - if (!isxdigit(s[i])) - return FALSE; - - return s[i] == '\0'; -} - static statement_t *make_statement(enum statement_type type) { statement_t *stmt = xmalloc(sizeof(*stmt)); diff --git a/tools/widl/utils.h b/tools/widl/utils.h index f042f0e064c..2a994e9697d 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -35,9 +35,6 @@ size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) __at size_t widl_getline(char **linep, size_t *lenp, FILE *fp); -struct uuid *parse_uuid(const char *u); -int is_valid_uuid(const char *s); - /* buffer management */ extern void add_output_to_resources( const char *type, const char *name );

1 0