- Wine-Commits - list.winehq.org

Francois Gouget : advapi32/tests: Separate the EnumServicesStatus() and EnumServicesStatusEx() tests.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 3bfe31570735cfb09c7d3cfdc2d1e0b06e870559 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bfe31570735cfb09c7d3cfdc2d1e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 16 19:23:31 2023 +0100 advapi32/tests: Separate the EnumServicesStatus() and EnumServicesStatusEx() tests. --- dlls/advapi32/tests/service.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 8a4fdec05ab..2d38f9e6a90 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1072,7 +1072,6 @@ static void test_enum_svc(void) DWORD servicecountactive, servicecountinactive; ENUM_SERVICE_STATUSA *services; ENUM_SERVICE_STATUSW *servicesW; - ENUM_SERVICE_STATUS_PROCESSA *exservices; UINT i; /* All NULL or wrong */ @@ -1452,6 +1451,19 @@ static void test_enum_svc(void) ok(servicecountinactive == 0, "Inactive services mismatch %lu\n", servicecountinactive); CloseServiceHandle(scm_handle); +} + +static void test_enum_svc_ex(void) +{ + SC_HANDLE scm_handle; + BOOL ret; + DWORD bufsize, needed, returned, resume; + DWORD neededW, returnedW; + DWORD tempneeded, tempreturned, missing; + DWORD servicecountactive, servicecountinactive; + ENUM_SERVICE_STATUSA *services; + ENUM_SERVICE_STATUS_PROCESSA *exservices; + UINT i; /* More or less the same for EnumServicesStatusExA */ if (!pEnumServicesStatusExA) @@ -1627,9 +1639,24 @@ static void test_enum_svc(void) /* Store the needed bytes */ tempneeded = needed; + /* Show the Ex call returns the same service count as the regular enum */ + EnumServicesStatusA(scm_handle, SERVICE_WIN32, SERVICE_STATE_ALL, + NULL, 0, &needed, &returned, NULL); + services = HeapAlloc(GetProcessHeap(), 0, needed); + returned = 0xdeadbeef; + ret = EnumServicesStatusA(scm_handle, SERVICE_WIN32, SERVICE_STATE_ALL, + services, needed, &needed, &returned, NULL); + ok(ret, "Expected success, got error %lu\n", GetLastError()); + ok(needed == 0, "Expected needed buffer to be 0 as we are done\n"); + ok(returned != 0xdeadbeef && returned > 0, "Expected some returned services\n"); + HeapFree(GetProcessHeap(), 0, services); + + /* Store the number of returned services */ + tempreturned = returned; + /* Allocate the correct needed bytes */ - exservices = HeapAlloc(GetProcessHeap(), 0, needed); - bufsize = needed; + exservices = HeapAlloc(GetProcessHeap(), 0, tempneeded); + bufsize = tempneeded; needed = 0xdeadbeef; returned = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2913,6 +2940,7 @@ START_TEST(service) test_get_servicekeyname(); test_query_svc(); test_enum_svc(); + test_enum_svc_ex(); test_close(); test_wow64(); /* Test the creation, querying and deletion of a service */

1 0

Francois Gouget : advapi32/tests: Better check the EnumServicesStatusExW() output.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 1da9e7c0874884d73a98a01115a4c683eb18a579 URL: https://gitlab.winehq.org/wine/wine/-/commit/1da9e7c0874884d73a98a01115a4c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 17 11:47:19 2023 +0100 advapi32/tests: Better check the EnumServicesStatusExW() output. It only has this one test. --- dlls/advapi32/tests/service.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 2d38f9e6a90..8736aaab04c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1631,10 +1631,16 @@ static void test_enum_svc_ex(void) /* Test to show we get the same needed buffer size for the W-call */ neededW = 0xdeadbeef; + returnedW = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = pEnumServicesStatusExW(scm_handle, 0, SERVICE_WIN32, SERVICE_STATE_ALL, NULL, 0, &neededW, &returnedW, NULL, NULL); ok(!ret, "Expected failure\n"); + ok(returnedW == 0, "Expected no service returned, got %ld\n", returned); + ok(neededW != 0xdeadbeef && neededW > 0, "Expected the needed buffer size\n"); ok(neededW == needed, "Expected needed buffersize to be the same for A- and W-calls\n"); + ok(GetLastError() == ERROR_MORE_DATA, + "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); /* Store the needed bytes */ tempneeded = needed;

1 0

Francois Gouget : advapi32/tests: Improve the resume handle service tests.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: eecb285841e336faa2fed43b53aa76916845e3bf URL: https://gitlab.winehq.org/wine/wine/-/commit/eecb285841e336faa2fed43b53aa76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 17 11:24:22 2023 +0100 advapi32/tests: Improve the resume handle service tests. Fix the comments to not imply that the tests expect all services but one to be returned. Add a test of the needed buffer size to retrieve the remaining services and document the limits of the test. --- dlls/advapi32/tests/service.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index fbb18b048a0..2527be27d5f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1300,7 +1300,10 @@ static void test_enum_svc(void) ok(returnedW != 0xdeadbeef && returnedW > 0, "Expected some returned services\n"); HeapFree(GetProcessHeap(), 0, servicesW); - /* Allocate less than the needed bytes and don't specify a resume handle */ + /* Allocate less than the needed bytes and don't specify a resume handle. + * More than one service will be missing because of the space needed for + * the strings. + */ services = HeapAlloc(GetProcessHeap(), 0, tempneeded); bufsize = (tempreturned - 1) * sizeof(ENUM_SERVICE_STATUSA); needed = 0xdeadbeef; @@ -1309,7 +1312,11 @@ static void test_enum_svc(void) ret = EnumServicesStatusA(scm_handle, SERVICE_WIN32, SERVICE_STATE_ALL, services, bufsize, &needed, &returned, NULL); ok(!ret, "Expected failure\n"); - ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for this one service\n"); + ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size\n"); + todo_wine ok(needed < tempneeded, "Expected a smaller needed buffer size for the missing services\n"); + /* Experiments show bufsize + needed < tempneeded which proves the needed + * buffer size is an approximation. So it's best not to probe more. + */ ok(returned < tempreturned, "Expected fewer services to be returned\n"); ok(GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); @@ -1323,7 +1330,8 @@ static void test_enum_svc(void) ret = EnumServicesStatusA(scm_handle, SERVICE_WIN32, SERVICE_STATE_ALL, services, bufsize, &needed, &returned, &resume); ok(!ret, "Expected failure\n"); - ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for this one service\n"); + ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for the missing services\n"); + todo_wine ok(needed < tempneeded, "Expected a smaller needed buffer size for the missing services\n"); ok(returned < tempreturned, "Expected fewer services to be returned\n"); todo_wine ok(resume, "Expected a resume handle\n"); ok(GetLastError() == ERROR_MORE_DATA, @@ -1615,7 +1623,10 @@ static void test_enum_svc(void) /* Store the number of returned services */ tempreturned = returned; - /* Allocate less than the needed bytes and don't specify a resume handle */ + /* Allocate less than the needed bytes and don't specify a resume handle. + * More than one service will be missing because of the space needed for + * the strings. + */ exservices = HeapAlloc(GetProcessHeap(), 0, tempneeded); bufsize = (tempreturned - 1) * sizeof(ENUM_SERVICE_STATUSA); needed = 0xdeadbeef; @@ -1624,7 +1635,11 @@ static void test_enum_svc(void) ret = pEnumServicesStatusExA(scm_handle, 0, SERVICE_WIN32, SERVICE_STATE_ALL, (BYTE*)exservices, bufsize, &needed, &returned, NULL, NULL); ok(!ret, "Expected failure\n"); - ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size\n"); + ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for the missing services\n"); + todo_wine ok(needed < tempneeded, "Expected a smaller needed buffer size for the missing services\n"); + /* Experiments show bufsize + needed < tempneeded which proves the needed + * buffer size is an approximation. So it's best not to probe more. + */ ok(returned < tempreturned, "Expected fewer services to be returned\n"); ok(GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); @@ -1638,13 +1653,14 @@ static void test_enum_svc(void) ret = pEnumServicesStatusExA(scm_handle, 0, SERVICE_WIN32, SERVICE_STATE_ALL, (BYTE*)exservices, bufsize, &needed, &returned, &resume, NULL); ok(!ret, "Expected failure\n"); - ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size\n"); + ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for the missing services\n"); + todo_wine ok(needed < tempneeded, "Expected a smaller needed buffer size for the missing services\n"); ok(returned < tempreturned, "Expected fewer services to be returned\n"); todo_wine ok(resume, "Expected a resume handle\n"); ok(GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); - /* Fetch that last service but pass a bigger buffer size */ + /* Fetch the missing services but pass a bigger buffer size */ missing = tempreturned - returned; bufsize = tempneeded; needed = 0xdeadbeef;

1 0

Rémi Bernon : widl: Group <ATTR> tokens together.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: a46facfd8cfa42b073a65257becdc5bbba621471 URL: https://gitlab.winehq.org/wine/wine/-/commit/a46facfd8cfa42b073a65257becdc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Group <ATTR> tokens together. --- tools/widl/parser.l | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d534b23bf02..02db1cfeeb1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -199,12 +199,16 @@ struct uuid *parse_uuid(const char *u) <SQUOTE>\\\' addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>\\. addcchar('\\'); addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>. addcchar(yytext[0]); -<ATTR>\] yy_pop_state(); return ']'; -<ATTR>{cident} return attr_token(yytext, yylval); -<ATTR>{uuid} { - yylval->uuid = parse_uuid(yytext); - return aUUID; - } + +<ATTR>{ + \] { yy_pop_state(); return ']'; } + + {cident} { return attr_token( yytext, yylval ); } + {uuid} { + yylval->uuid = parse_uuid( yytext ); + return aUUID; + } +} <INITIAL>{ ^{ws}*\#{ws}*pragma{ws}+ { yy_push_state( PP_PRAGMA ); }

1 0

Rémi Bernon : widl: Group <INITIAL> tokens together.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 832d6985c8d383e69e8ce1f442ff746d013c874e URL: https://gitlab.winehq.org/wine/wine/-/commit/832d6985c8d383e69e8ce1f442ff74… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Group <INITIAL> tokens together. --- tools/widl/parser.l | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8698f084354..d534b23bf02 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -139,7 +139,6 @@ struct uuid *parse_uuid(const char *u) ************************************************************************** */ %% -<INITIAL>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(PP_PRAGMA); <PP_LINE>[^\n]* { int lineno; char *cptr, *fname; @@ -177,7 +176,6 @@ struct uuid *parse_uuid(const char *u) yy_pop_state(); } <PP_PRAGMA>[^\n]* yylval->str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; -<INITIAL>^{ws}*midl_pragma{ws}+warning return tPRAGMA_WARNING; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); @@ -207,10 +205,17 @@ struct uuid *parse_uuid(const char *u) yylval->uuid = parse_uuid(yytext); return aUUID; } -<INITIAL>{double} { - yylval->dbl = strtod(yytext, NULL); - return aDOUBLE; - } + +<INITIAL>{ + ^{ws}*\#{ws}*pragma{ws}+ { yy_push_state( PP_PRAGMA ); } + ^{ws}*midl_pragma{ws}+warning { return tPRAGMA_WARNING; } + + {double} { + yylval->dbl = strtod( yytext, NULL ); + return aDOUBLE; + } +} + SAFEARRAY{ws}*/\( return tSAFEARRAY; {cident} return kw_token(yytext, yylval);

1 0

Rémi Bernon : widl: Group <INITIAL,ATTR> tokens together.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 2b3a910184b7afb4b1014d75e2a4bfc44e40ae92 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b3a910184b7afb4b1014d75e2a4bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Group <INITIAL,ATTR> tokens together. --- tools/widl/parser.l | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 92955516e9e..8698f084354 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -140,7 +140,6 @@ struct uuid *parse_uuid(const char *u) */ %% <INITIAL>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(PP_PRAGMA); -<INITIAL,ATTR>^{ws}*\#{ws}* yy_push_state(PP_LINE); <PP_LINE>[^\n]* { int lineno; char *cptr, *fname; @@ -202,40 +201,47 @@ struct uuid *parse_uuid(const char *u) <SQUOTE>\\\' addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>\\. addcchar('\\'); addcchar(yytext[1]); <QUOTE,WSTRQUOTE,SQUOTE>. addcchar(yytext[0]); -<INITIAL,ATTR>\[ yy_push_state(ATTR); return '['; <ATTR>\] yy_pop_state(); return ']'; <ATTR>{cident} return attr_token(yytext, yylval); <ATTR>{uuid} { yylval->uuid = parse_uuid(yytext); return aUUID; } -<INITIAL,ATTR>{hex} { - yylval->num = xstrtoul(yytext, NULL, 0); - return aHEXNUM; - } -<INITIAL,ATTR>{int} { - yylval->num = xstrtoul(yytext, NULL, 0); - return aNUM; - } <INITIAL>{double} { yylval->dbl = strtod(yytext, NULL); return aDOUBLE; } SAFEARRAY{ws}*/\( return tSAFEARRAY; {cident} return kw_token(yytext, yylval); -<INITIAL,ATTR>\n line_number++; -<INITIAL,ATTR>{ws} -<INITIAL,ATTR>\<\< return SHL; -<INITIAL,ATTR>\>\> return SHR; -<INITIAL,ATTR>\-\> return MEMBERPTR; -<INITIAL,ATTR>== return EQUALITY; -<INITIAL,ATTR>!= return INEQUALITY; -<INITIAL,ATTR>\>= return GREATEREQUAL; -<INITIAL,ATTR>\<= return LESSEQUAL; -<INITIAL,ATTR>\|\| return LOGICALOR; -<INITIAL,ATTR>&& return LOGICALAND; -<INITIAL,ATTR>\.\.\. return ELLIPSIS; -<INITIAL,ATTR>. return yytext[0]; + +<INITIAL,ATTR>{ + ^{ws}*\#{ws}* { yy_push_state(PP_LINE); } + \[ { yy_push_state(ATTR); return '['; } + + {hex} { + yylval->num = xstrtoul(yytext, NULL, 0); + return aHEXNUM; + } + {int} { + yylval->num = xstrtoul(yytext, NULL, 0); + return aNUM; + } + + \n { line_number++; } + {ws} {} + \<\< { return SHL; } + \>\> { return SHR; } + \-\> { return MEMBERPTR; } + == { return EQUALITY; } + != { return INEQUALITY; } + \>= { return GREATEREQUAL; } + \<= { return LESSEQUAL; } + \|\| { return LOGICALOR; } + && { return LOGICALAND; } + \.\.\. { return ELLIPSIS; } + . { return yytext[0]; } +} + <<EOF>> { if (!list_empty( &import_stack )) return aEOF;

1 0

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

March 17, 2023

Module: wine Branch: master Commit: 194c002c6ee3ad98df97cc561dc8857a8145cf2d URL: https://gitlab.winehq.org/wine/wine/-/commit/194c002c6ee3ad98df97cc561dc885… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 17 09:04:57 2023 +0100 widl: Simplify string literals lexing. --- tools/widl/parser.l | 75 +++++++++++++++++------------------------------------ 1 file changed, 24 insertions(+), 51 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 539e6f381ed..066d61a5a84 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -35,12 +35,9 @@ hex 0(x|X){hexd}+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12} double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* -%x QUOTE -%x WSTRQUOTE %x ATTR %x PP_LINE %x PP_PRAGMA -%x SQUOTE %{ @@ -67,13 +64,6 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include "parser.tab.h" -static void addcchar(char c); -static char *get_buffered_cstring(void); - -static char *cbuffer; -static int cbufidx; -static int cbufalloc = 0; - static int kw_token(const char *kw, YYSTYPE *yylval); static int attr_token(const char *kw, YYSTYPE *yylval); @@ -131,6 +121,26 @@ struct uuid *parse_uuid(const char *u) return uuid; } +static int token_str( int token, const char *str, YYSTYPE *yylval ) +{ + char *tmp = xstrdup( str ); + + if (token == aWSTRING || token == aSTRING || token == aSQSTRING) + { + char *src, *dst; + src = dst = ++tmp; /* skip first quote */ + while (*src) + { + if (*src == '\\') src++; + *dst++ = *src++; + } + dst[-1] = 0; /* strip last quote */ + } + + yylval->str = tmp; + return token; +} + static int token_num( int token, const char *yytext, YYSTYPE *yylval ) { yylval->num = xstrtoul( yytext, NULL, 0 ); @@ -182,29 +192,6 @@ static int token_num( int token, const char *yytext, YYSTYPE *yylval ) yy_pop_state(); } <PP_PRAGMA>[^\n]* yylval->str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; -<INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; -<QUOTE>\" { - yy_pop_state(); - yylval->str = get_buffered_cstring(); - return aSTRING; - } -<INITIAL,ATTR>L\" yy_push_state(WSTRQUOTE); cbufidx = 0; -<WSTRQUOTE>\" { - yy_pop_state(); - yylval->str = get_buffered_cstring(); - return aWSTRING; - } -<INITIAL,ATTR>\' yy_push_state(SQUOTE); cbufidx = 0; -<SQUOTE>\' { - yy_pop_state(); - yylval->str = get_buffered_cstring(); - return aSQSTRING; - } -<QUOTE,WSTRQUOTE,SQUOTE>\\\\ | -<QUOTE,WSTRQUOTE>\\\" addcchar(yytext[1]); -<SQUOTE>\\\' addcchar(yytext[1]); -<QUOTE,WSTRQUOTE,SQUOTE>\\. addcchar('\\'); addcchar(yytext[1]); -<QUOTE,WSTRQUOTE,SQUOTE>. addcchar(yytext[0]); <ATTR>{ \] { yy_pop_state(); return ']'; } @@ -236,6 +223,10 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; {hex} { return token_num( aHEXNUM, yytext, yylval ); } {int} { return token_num( aNUM, yytext, yylval ); } + L\"(\\.|[^"\\])*\" { return token_str( aWSTRING, yytext + 1, yylval ); } + \"(\\.|[^"\\])*\" { return token_str( aSTRING, yytext, yylval ); } + \'(\\.|[^'\\])*\' { return token_str( aSQSTRING, yytext, yylval ); } + \n { line_number++; } {ws} {} \<\< { return SHL; } @@ -508,24 +499,6 @@ static int attr_token(const char *kw, YYSTYPE *yylval) return kw_token(kw, yylval); } -static void addcchar(char c) -{ - if(cbufidx >= cbufalloc) - { - cbufalloc += 1024; - cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0])); - if(cbufalloc > 65536) - parser_warning("Reallocating string buffer larger than 64kB\n"); - } - cbuffer[cbufidx++] = c; -} - -static char *get_buffered_cstring(void) -{ - addcchar(0); - return xstrdup(cbuffer); -} - void pop_import(void) { struct list *entry = list_head( &import_stack );

1 0

Rémi Bernon : widl: Avoid freeing input_name in pop_import.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: d359837fcc410a09b780bd4f31cd45611fd61360 URL: https://gitlab.winehq.org/wine/wine/-/commit/d359837fcc410a09b780bd4f31cd45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 17 13:47:01 2023 +0100 widl: Avoid freeing input_name in pop_import. The pointers are used in loc_info input_name without copy. --- tools/widl/parser.l | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 066d61a5a84..a1be68d8bd9 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -512,7 +512,7 @@ void pop_import(void) if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); yy_switch_to_buffer( state->buffer ); - free( input_name ); + input_name = state->input_name; line_number = state->line_number; free( state ); @@ -556,7 +556,6 @@ static void switch_to_acf(void) if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); - free( input_name ); input_name = xstrdup( acf_name ); file = open_input_file( input_name );

1 0

Rémi Bernon : widl: Introduce a new helper to produce num tokens.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: baa3680f2e72fc3b86770ca462e7321485f48a89 URL: https://gitlab.winehq.org/wine/wine/-/commit/baa3680f2e72fc3b86770ca462e732… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Introduce a new helper to produce num tokens. --- tools/widl/parser.l | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 02db1cfeeb1..539e6f381ed 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -131,6 +131,12 @@ struct uuid *parse_uuid(const char *u) return uuid; } +static int token_num( int token, const char *yytext, YYSTYPE *yylval ) +{ + yylval->num = xstrtoul( yytext, NULL, 0 ); + return token; +} + %} /* @@ -227,14 +233,8 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; ^{ws}*\#{ws}* { yy_push_state(PP_LINE); } \[ { yy_push_state(ATTR); return '['; } - {hex} { - yylval->num = xstrtoul(yytext, NULL, 0); - return aHEXNUM; - } - {int} { - yylval->num = xstrtoul(yytext, NULL, 0); - return aNUM; - } + {hex} { return token_num( aHEXNUM, yytext, yylval ); } + {int} { return token_num( aNUM, yytext, yylval ); } \n { line_number++; } {ws} {}

1 0

Sven Baars : kernelbase: Also call NtOpenKeyEx() on empty key names.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 88fa3459b928c6d27f56c67778c0e5d45ebbaa5b URL: https://gitlab.winehq.org/wine/wine/-/commit/88fa3459b928c6d27f56c67778c0e5… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 11:56:31 2023 +0100 kernelbase: Also call NtOpenKeyEx() on empty key names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54691 --- dlls/advapi32/tests/registry.c | 4 ++-- dlls/kernelbase/registry.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 723950a4d0f..528875261d6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1510,11 +1510,11 @@ static void test_reg_delete_key(void) ok(ret == ERROR_SUCCESS, "Could not open key, got %ld\n", ret); ret = RegDeleteKeyExA(key, "", KEY_WOW64_32KEY, 0); - todo_wine_if(ptr_size == 64) ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); + ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); RegCloseKey(key); ret = RegOpenKeyExA(hkey_main, "deleteme", 0, KEY_READ | KEY_WOW64_32KEY, &key); - todo_wine_if(ptr_size == 64) ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); RegCloseKey(key); } diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d414b210026..daf1afa2cd6 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -155,7 +155,7 @@ static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWOR attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; + if (len > 0 && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; str.Buffer = name->Buffer; @@ -202,7 +202,7 @@ static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWOR /* wrapper for NtOpenKeyEx to handle Wow6432 nodes */ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD options, ACCESS_MASK access ) { - HKEY subkey, subkey_root = root; + HKEY subkey = 0, subkey_root = root; NTSTATUS status = 0; *retkey = NULL; @@ -228,7 +228,7 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op return status; } - while (!status && name.Length) + while (!status && (name.Length || !subkey)) { status = open_subkey( &subkey, subkey_root, &name, options, access ); if (subkey_root && subkey_root != root) NtClose( subkey_root );

1 0