wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Francois Gouget : advapi32/tests: Skip some tests if the EventLog service crashed.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 2078afb9283d2a69b4e4c8b22f8101a15f70d092 URL: https://gitlab.winehq.org/wine/wine/-/commit/2078afb9283d2a69b4e4c8b22f8101… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 17 14:14:42 2023 +0100 advapi32/tests: Skip some tests if the EventLog service crashed. advapi32:eventlog crashes the EventLog service in some Windows versions so defend against that condition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53461 --- dlls/advapi32/tests/service.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index c999255fbcc..da8495da45f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2919,19 +2919,25 @@ static void test_EventLog(void) ok(status.dwServiceType == SERVICE_WIN32_SHARE_PROCESS || status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, "got %#lx\n", status.dwServiceType); - ok(status.dwCurrentState == SERVICE_RUNNING, "got %#lx\n", status.dwCurrentState); - todo_wine - ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || - status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || - status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), - "got %#lx\n", status.dwControlsAccepted); - ok(status.dwWin32ExitCode == 0, "got %#lx\n", status.dwWin32ExitCode); ok(status.dwServiceSpecificExitCode == 0, "got %#lx\n", status.dwServiceSpecificExitCode); ok(status.dwCheckPoint == 0, "got %#lx\n", status.dwCheckPoint); ok(status.dwWaitHint == 0, "got %#lx\n", status.dwWaitHint); - ok(status.dwProcessId != 0, "got %#lx\n", status.dwProcessId); ok(status.dwServiceFlags == 0 || status.dwServiceFlags == SERVICE_RUNS_IN_SYSTEM_PROCESS /* XP */, "got %#lx\n", status.dwServiceFlags); + if (status.dwCurrentState == SERVICE_STOPPED && + status.dwWin32ExitCode == ERROR_PROCESS_ABORTED) + win_skip("EventLog crashed!\n"); + else + { + ok(status.dwCurrentState == SERVICE_RUNNING, "got %#lx\n", status.dwCurrentState); + todo_wine + ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), + "got %#lx\n", status.dwControlsAccepted); + ok(status.dwWin32ExitCode == 0, "got %#lx\n", status.dwWin32ExitCode); + ok(status.dwProcessId != 0, "got %#lx\n", status.dwProcessId); + } CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle);

1 0

Francois Gouget : advapi32/tests: Enumerate the services using the Unicode API.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 42bd3bb79a10ca01363cd7c883ef5ddeb5472b85 URL: https://gitlab.winehq.org/wine/wine/-/commit/42bd3bb79a10ca01363cd7c883ef5d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 17 14:42:43 2023 +0100 advapi32/tests: Enumerate the services using the Unicode API. The ANSI one is broken in some UTF-8 locales which prevents most of the tests from running. So use the Unicode API for most tests and just confirm that it is consistent with the ANSI one instead of doing the reverse. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52895 --- dlls/advapi32/tests/service.c | 155 ++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 75 deletions(-)

1 0

Francois Gouget : advapi32/tests: Take into account service start / stop race conditions.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 81e33a34841a48beb1103bf967586f5a8d3c4e40 URL: https://gitlab.winehq.org/wine/wine/-/commit/81e33a34841a48beb1103bf967586f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 16 20:18:13 2023 +0100 advapi32/tests: Take into account service start / stop race conditions. Services sometimes start or stop between two EnumServicesStatus() calls. Fortunately this is rare so the tests can just retry to get the expected result. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460 --- dlls/advapi32/tests/service.c | 149 ++++++++++++++++++++++++++++++++---------- 1 file changed, 115 insertions(+), 34 deletions(-)

1 0

Francois Gouget : advapi32/tests: Better check the EnumServicesStatusExW() output.
by Alexandre Julliard 17 Mar '23

17 Mar '23

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: Separate the EnumServicesStatus() and EnumServicesStatusEx() tests.
by Alexandre Julliard 17 Mar '23

17 Mar '23

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 account for starting and stopping services.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 7b3f804606b2b3864cce6f53e9840482a963cbb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b3f804606b2b3864cce6f53e98404… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 16 18:46:18 2023 +0100 advapi32/tests: Better account for starting and stopping services. The START_PENDING and STOP_PENDING services don't always have a process id. Also trace unusual service states so we can identify which ones behave in unexpected ways. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460 --- dlls/advapi32/tests/service.c | 60 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 2527be27d5f..8a4fdec05ab 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1420,10 +1420,30 @@ static void test_enum_svc(void) */ if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState == SERVICE_STOPPED) - servicecountinactive--; - else + switch (status.dwCurrentState) + { + case SERVICE_START_PENDING: + case SERVICE_STOP_PENDING: + case SERVICE_PAUSE_PENDING: + case SERVICE_PAUSED: + case SERVICE_CONTINUE_PENDING: + trace("Got state %lx for service %s\n", status.dwCurrentState, + services[i].lpServiceName); + /* fall through */ + + case SERVICE_RUNNING: servicecountactive--; + break; + + case SERVICE_STOPPED: + servicecountinactive--; + break; + + default: + ok(0, "Got unknown state %lx for service %s\n", + status.dwCurrentState, services[i].lpServiceName); + break; + } } } HeapFree(GetProcessHeap(), 0, services); @@ -1739,21 +1759,45 @@ static void test_enum_svc(void) if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState != SERVICE_STOPPED) + switch (status.dwCurrentState) { + case SERVICE_START_PENDING: + case SERVICE_STOP_PENDING: + trace("Got state %lx (pid=%04lx) for service %s\n", + status.dwCurrentState, status.dwProcessId, + exservices[i].lpServiceName); + /* There may or may not be a process id */ + servicecountactive--; + break; + + case SERVICE_PAUSE_PENDING: + case SERVICE_PAUSED: + case SERVICE_CONTINUE_PENDING: + trace("Got state %lx (pid=%04lx) for service %s\n", + status.dwCurrentState, status.dwProcessId, + exservices[i].lpServiceName); + /* fall through */ + + case SERVICE_RUNNING: /* We expect a process id for every running service */ ok(status.dwProcessId > 0, "Expected a process id for this running service (%s)\n", exservices[i].lpServiceName); - servicecountactive--; - } - else - { + break; + + case SERVICE_STOPPED: /* We shouldn't have a process id for inactive services */ ok(status.dwProcessId == 0, "Service %s state %lu shouldn't have an associated process id\n", exservices[i].lpServiceName, status.dwCurrentState); servicecountinactive--; + break; + + default: + ok(0, "Got unknown state %lx (pid=%04lx) for service %s\n", + status.dwCurrentState, status.dwProcessId, + exservices[i].lpServiceName); + break; } } }

1 0

Francois Gouget : advapi32/tests: Improve the resume handle service tests.
by Alexandre Julliard 17 Mar '23

17 Mar '23

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: Avoid freeing input_name in pop_import.
by Alexandre Julliard 17 Mar '23

17 Mar '23

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: Simplify string literals lexing.
by Alexandre Julliard 17 Mar '23

17 Mar '23

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: Introduce a new helper to produce num tokens.
by Alexandre Julliard 17 Mar '23

17 Mar '23

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

← Newer
1
...
46
47
48
49
50
51
52
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2023