wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Francois Gouget : testbot/reporttest: Fix the spelling of a comment in the generated report.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: tools Branch: master Commit: 5d27d3038d1ba7140a1966acddbadafdcfdae571 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5d27d3038d1ba7140a1966a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 5 16:07:20 2021 +0100 testbot/reporttest: Fix the spelling of a comment in the generated report. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/reporttest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index a29f951..b86752b 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -240,7 +240,7 @@ int main(int argc, char** argv) unit[strlen(unit)-1] = '\0'; fprintf(logfile, "%s:%s start fake/%s/%s.c -\n", line+5, unit, line+5, unit); fprintf(logfile, "----- A standard successful unit test\n"); - fprintf(logfile, "----- Expected assessement: Success\n"); + fprintf(logfile, "----- Expected assessment: Success\n"); fprintf(logfile, "1234:%s: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.\n", unit); fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", line+5, unit); }

1 0

Francois Gouget : testbot/reporttest: Remove a left-over xmllite:writer stub.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: tools Branch: master Commit: 11586038aea17c31b87558d5d12c685437b4eeb1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=11586038aea17c31b87558d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 5 16:07:00 2021 +0100 testbot/reporttest: Remove a left-over xmllite:writer stub. xmllite:writer is used to test misplaced failed lines and should thus not appear as a stub too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 00b6c2b..eb9999e 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -1049,7 +1049,6 @@ stub wsnmp32:wsnmp stub wtsapi32:wtsapi stub xcopy.exe:xcopy stub xmllite:reader -stub xmllite:writer xmllite:writer start dlls/xmllite/tests/writer.c - ----- A unit test with a misplaced test failed line @@ -1058,4 +1057,4 @@ See the similar scenario before but note the lack of the extra test summary line here. Also beware of the end-of-file. 037c:writer: 1930 tests executed (0 marked as todo, 0 failures), 0 skipped. xmllite:writer:037c done (0) in 11s -writer.c:20: Test failed: A failure in the subprocess +writer.c:20: Test failed: A delayed failure, typically in a subprocess

1 0

Francois Gouget : testbot/reporttest: Remove a commented out include directive.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: tools Branch: master Commit: a8dc4131099cafa2a83a6f90b8a67a974d9074e4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a8dc4131099cafa2a83a6f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 5 16:03:45 2021 +0100 testbot/reporttest: Remove a commented out include directive. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/reporttest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index fecaa50..a29f951 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -17,7 +17,6 @@ */ #include <stdio.h> -//#include <unistd.h> #include <windows.h>

1 0

Francois Gouget : testbot/TestWTBS: Fix the patch range when --jobs points to a non-patch job.
by Alexandre Julliard 05 Feb '21

05 Feb '21

Module: tools Branch: master Commit: 1a7d958bfb7fb46696bb29abcfa43da674ecb9cd URL: https://source.winehq.org/git/tools.git/?a=commit;h=1a7d958bfb7fb46696bb29a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 5 16:03:35 2021 +0100 testbot/TestWTBS: Fix the patch range when --jobs points to a non-patch job. This resulted in an empty set of patch ranges which meant to check every patch. TestWTBS now distinguishes an undef $PatchRanges, which means to check all patches, from an empty @$PatchRanges, which means to ignore all patches. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 87b53fe..1cbec2e 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -131,11 +131,12 @@ while (@ARGV) } } -my $JobRanges = []; +my $JobRanges; if (!defined $Usage) { if (defined $OptJobs) { + $JobRanges = []; foreach my $Range (split /,+/, $OptJobs) { if ($Range =~ /^([0-9]+)$/) @@ -988,7 +989,11 @@ sub IsInRange($$) my ($Ranges, $Id) = @_; return 0 if (!$Id); - return 1 if (!$Ranges or !@$Ranges); + + # No range means to allow everything... + return 1 if (!$Ranges); + + # ...while an empty range means to reject everything foreach my $Range (@$Ranges) { return 1 if (($Range->[0] == 0 or $Range->[0] <= $Id) and @@ -1304,12 +1309,13 @@ sub CheckPatches() my $Jobs = CreateJobs(); my $Patches = CreatePatches(); - my $PatchRanges = []; + my $PatchRanges; if (@$JobRanges) { # Convert the job ranges into a list of patch ranges so that these patches: # 1. either have a job in the allowed job ranges, # 2. or have no job but are contiguous to a patch satisfying 1 or 2. + $PatchRanges = []; my ($First, $Last, $AddRange); foreach my $Patch (sort { $a->Id <=> $b->Id } @{$Patches->GetItems()}) {

1 0

Gabriel Ivăncescu : user32: Keep toplevel minimized windows offscreen if they're already.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: dd417540bb3afb3aa5a04a007eea9a7ee347655b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd417540bb3afb3aa5a04a00… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 4 18:34:38 2021 +0200 user32: Keep toplevel minimized windows offscreen if they're already. Some applications (e.g. Lego Worlds, Hitman 2) use (-32000,-32000) to determine whether a window is minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 3 --- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c457ce16d4e..eecccb70001 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11574,7 +11574,6 @@ todo_wine ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); -todo_wine ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); todo_wine @@ -11583,7 +11582,6 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); GetWindowRect(hwnd, &rect); -todo_wine ok(rect.left == -32000 && rect.top == -32000, "got window rect %s\n", wine_dbgstr_rect(&rect)); ShowWindow(hwnd, SW_SHOWNORMAL); @@ -11591,7 +11589,6 @@ todo_wine ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); -todo_wine ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); todo_wine diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 9e5a0c238af..072b574f3aa 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1688,6 +1688,14 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC } if (!(pWinpos->flags & SWP_NOMOVE)) { + /* If the window is toplevel minimized off-screen, force keep it there */ + if ((wndPtr->dwStyle & WS_MINIMIZE) && + wndPtr->window_rect.left <= -32000 && wndPtr->window_rect.top <= -32000 && + (!wndPtr->parent || wndPtr->parent == GetDesktopWindow())) + { + pWinpos->x = -32000; + pWinpos->y = -32000; + } new_window_rect->left = pWinpos->x; new_window_rect->top = pWinpos->y; new_window_rect->right += pWinpos->x - old_window_rect->left;

1 0

Gabriel Ivăncescu : user32/tests: Test minimized window placement after trying to change position.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 9ef33b5e2086b8abf18358036ce48e3310976f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef33b5e2086b8abf1835803… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 4 18:34:37 2021 +0200 user32/tests: Test minimized window placement after trying to change position. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 47864340e39..c457ce16d4e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11547,6 +11547,61 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + wp.flags = WPF_SETMINPOSITION; + wp.showCmd = SW_NORMAL; + wp.ptMinPosition.x = wp.ptMinPosition.y = 100; + wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100; + wp.rcNormalPosition = orig; + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + ShowWindow(hwnd, SW_MINIMIZE); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + ret = SetWindowPos(hwnd, NULL, 100, 100, 151, 151, SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "failed to set window pos, error %u\n", GetLastError()); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); +todo_wine + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); +todo_wine + ok(rect.left == -32000 && rect.top == -32000, "got window rect %s\n", wine_dbgstr_rect(&rect)); + + ShowWindow(hwnd, SW_SHOWNORMAL); + + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); +todo_wine + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); +todo_wine + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + GetWindowRect(hwnd, &rect); + ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); }

1 0

Rémi Bernon : widl: Distinguish interface declarations from interface references.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 621b4fa6971f5fc4590246f8250718cc76cf836c URL: https://source.winehq.org/git/wine.git/?a=commit;h=621b4fa6971f5fc4590246f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 4 17:43:43 2021 +0100 widl: Distinguish interface declarations from interface references. Interface referencing should probably check for a previous type declaration, but Wine IDLs currently have many places where this is broken. This is for instance the case when a coclass use the inner interface statement to declare an interface without any previous declaration. And in mimeole.idl, coclass are being declared with the same name as their interface, to generate the corresponding CLSID. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5008a35f64f..1505e3e88a0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -286,7 +286,8 @@ static typelib_t *current_typelib; %type <type_qualifier> type_qualifier m_type_qual_list %type <function_specifier> function_specifier %type <declspec> decl_spec decl_spec_no_type m_decl_spec_no_type -%type <type> inherit interface interfacedef interfacedec +%type <type> inherit interface interfacedef +%type <type> interfaceref %type <type> dispinterface dispinterfacehdr dispinterfacedef %type <type> module modulehdr moduledef %type <str> namespacedef @@ -356,7 +357,8 @@ m_acf: /* empty */ | aACF acf_statements gbl_statements: { $$ = NULL; } | gbl_statements namespacedef '{' { push_namespace($2); } gbl_statements '}' { pop_namespace($2); $$ = append_statements($1, $5); } - | gbl_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); } + | gbl_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } + | gbl_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); } | gbl_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | gbl_statements coclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); @@ -375,7 +377,8 @@ gbl_statements: { $$ = NULL; } ; imp_statements: { $$ = NULL; } - | imp_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); } + | imp_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } + | imp_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); } | imp_statements namespacedef '{' { push_namespace($2); } imp_statements '}' { pop_namespace($2); $$ = append_statements($1, $5); } | imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } @@ -928,7 +931,7 @@ class_interfaces: { $$ = NULL; } ; class_interface: - m_attributes interfacedec { $$ = make_ifref($2); $$->attrs = $1; } + m_attributes interfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } ; dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } @@ -996,9 +999,11 @@ interfacedef: interfacehdr inherit | dispinterfacedef semicolon_opt { $$ = $1; } ; -interfacedec: - interface ';' { $$ = $1; } - | dispinterface ';' { $$ = $1; } +interfaceref: + tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } + | tINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } + | tDISPINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } + | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } ; module: tMODULE aIDENTIFIER { $$ = type_new_module($2); }

1 0

Rémi Bernon : widl: Factor and cleanup runtimeclass type declaration and definition.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 7a01eb2aad8007b9abba60544cde7ede9e67321a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a01eb2aad8007b9abba6054… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 4 17:43:42 2021 +0100 widl: Factor and cleanup runtimeclass type declaration and definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 23 ++++++----------------- tools/widl/typetree.c | 26 ++++++++++++++------------ tools/widl/typetree.h | 5 +++-- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index db4fdb253ad..5008a35f64f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -98,7 +98,6 @@ static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); -static attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func); @@ -306,7 +305,7 @@ static typelib_t *current_typelib; %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list %type <type> coclass coclassdef -%type <type> runtimeclass runtimeclass_hdr runtimeclass_def +%type <type> runtimeclass runtimeclass_def %type <type> apicontract %type <num> contract_ver %type <num> pointer_type threading_type marshaling_behavior version @@ -905,22 +904,12 @@ coclassdef: attributes coclass '{' class_interfaces '}' semicolon_opt ; runtimeclass: - tRUNTIMECLASS aIDENTIFIER { $$ = type_new_runtimeclass($2, current_namespace); } - | tRUNTIMECLASS aKNOWNTYPE { $$ = find_type($2, NULL, 0); - if (type_get_type_detect_alias($$) != TYPE_RUNTIMECLASS) - error_loc("%s was not declared a runtimeclass at %s:%d\n", $2, - $$->loc_info.input_name, $$->loc_info.line_number); - } - ; - -runtimeclass_hdr: attributes runtimeclass { $$ = $2; - check_def($$); - $$->attrs = check_runtimeclass_attrs($2->name, $1); - } + tRUNTIMECLASS aIDENTIFIER { $$ = type_runtimeclass_declare($2, current_namespace); } + | tRUNTIMECLASS aKNOWNTYPE { $$ = type_runtimeclass_declare($2, current_namespace); } ; -runtimeclass_def: runtimeclass_hdr '{' class_interfaces '}' semicolon_opt - { $$ = type_runtimeclass_define($1, $3); } +runtimeclass_def: attributes runtimeclass '{' class_interfaces '}' semicolon_opt + { $$ = type_runtimeclass_define($2, $1, $4); } ; apicontract: attributes tAPICONTRACT aIDENTIFIER '{' '}' @@ -2529,7 +2518,7 @@ attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs) return attrs; } -static attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs) +attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; if (!attrs) return attrs; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index cfd186fb02b..825348ddef4 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -205,17 +205,6 @@ type_t *type_new_module(char *name) return type; } -type_t *type_new_runtimeclass(char *name, struct namespace *namespace) -{ - type_t *type = get_type(TYPE_RUNTIMECLASS, name, NULL, 0); - if (type->type_type != TYPE_RUNTIMECLASS || type->defined) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - type->name, type->loc_info.input_name, type->loc_info.line_number); - type->name = name; - type->namespace = namespace; - return type; -} - type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is) { @@ -522,8 +511,21 @@ type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *i return coclass; } -type_t *type_runtimeclass_define(type_t *runtimeclass, ifref_list_t *ifaces) +type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) +{ + type_t *type = get_type(TYPE_RUNTIMECLASS, name, namespace, 0); + if (type_get_type_detect_alias(type) != TYPE_RUNTIMECLASS) + error_loc("runtimeclass %s previously not declared a runtimeclass at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + return type; +} + +type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) { + if (runtimeclass->defined) + error_loc("runtimeclass %s already defined at %s:%d\n", + runtimeclass->name, runtimeclass->loc_info.input_name, runtimeclass->loc_info.line_number); + runtimeclass->attrs = check_runtimeclass_attrs(runtimeclass->name, attrs); runtimeclass->details.runtimeclass.ifaces = ifaces; runtimeclass->defined = TRUE; if (!type_runtimeclass_get_default_iface(runtimeclass)) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 69d00dee49b..8a8e1c529ac 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -30,6 +30,7 @@ enum name_type { }; attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); +attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref); @@ -46,13 +47,13 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); -type_t *type_new_runtimeclass(char *name, struct namespace *namespace); +type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); -type_t *type_runtimeclass_define(type_t *runtimeclass, ifref_list_t *ifaces); +type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); char *gen_name(void);

1 0

Rémi Bernon : widl: Factor and cleanup coclass type declaration and definition.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 84b7faeb52480eebfb53041f0db923a65c3b6e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b7faeb52480eebfb53041f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 4 17:43:41 2021 +0100 widl: Factor and cleanup coclass type declaration and definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 24 ++++++------------------ tools/widl/typetree.c | 25 ++++++++++++++----------- tools/widl/typetree.h | 6 ++++-- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a610a630282..db4fdb253ad 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -98,7 +98,6 @@ static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); -static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); @@ -306,7 +305,7 @@ static typelib_t *current_typelib; %type <declarator> m_any_declarator any_declarator any_declarator_no_direct any_direct_declarator %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list -%type <type> coclass coclasshdr coclassdef +%type <type> coclass coclassdef %type <type> runtimeclass runtimeclass_hdr runtimeclass_def %type <type> apicontract %type <num> contract_ver @@ -897,23 +896,12 @@ qualified_type: | aNAMESPACE '.' { init_lookup_namespace($1); } qualified_seq { $$ = $4; } ; -coclass: tCOCLASS aIDENTIFIER { $$ = type_new_coclass($2); } - | tCOCLASS aKNOWNTYPE { $$ = find_type($2, NULL, 0); - if (type_get_type_detect_alias($$) != TYPE_COCLASS) - error_loc("%s was not declared a coclass at %s:%d\n", - $2, $$->loc_info.input_name, - $$->loc_info.line_number); - } - ; - -coclasshdr: attributes coclass { $$ = $2; - check_def($$); - $$->attrs = check_coclass_attrs($2->name, $1); - } +coclass: tCOCLASS aIDENTIFIER { $$ = type_coclass_declare($2); } + | tCOCLASS aKNOWNTYPE { $$ = type_coclass_declare($2); } ; -coclassdef: coclasshdr '{' class_interfaces '}' semicolon_opt - { $$ = type_coclass_define($1, $3); } +coclassdef: attributes coclass '{' class_interfaces '}' semicolon_opt + { $$ = type_coclass_define($2, $1, $4); } ; runtimeclass: @@ -2528,7 +2516,7 @@ static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs) return attrs; } -static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs) +attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; if (!attrs) return attrs; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a18ffe1f4a5..cfd186fb02b 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -205,16 +205,6 @@ type_t *type_new_module(char *name) return type; } -type_t *type_new_coclass(char *name) -{ - type_t *type = get_type(TYPE_COCLASS, name, NULL, 0); - if (type->type_type != TYPE_COCLASS || type->defined) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - type->name, type->loc_info.input_name, type->loc_info.line_number); - type->name = name; - return type; -} - type_t *type_new_runtimeclass(char *name, struct namespace *namespace) { type_t *type = get_type(TYPE_RUNTIMECLASS, name, NULL, 0); @@ -512,8 +502,21 @@ void type_module_define(type_t *module, statement_list_t *stmts) module->defined = TRUE; } -type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces) +type_t *type_coclass_declare(char *name) +{ + type_t *type = get_type(TYPE_COCLASS, name, NULL, 0); + if (type_get_type_detect_alias(type) != TYPE_COCLASS) + error_loc("coclass %s previously not declared a coclass at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + return type; +} + +type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces) { + if (coclass->defined) + error_loc("coclass %s already defined at %s:%d\n", + coclass->name, coclass->loc_info.input_name, coclass->loc_info.line_number); + coclass->attrs = check_coclass_attrs(coclass->name, attrs); coclass->details.coclass.ifaces = ifaces; coclass->defined = TRUE; return coclass; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index dc44c3f5fa7..69d00dee49b 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -29,6 +29,8 @@ enum name_type { NAME_C }; +attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); + type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref); type_t *type_new_alias(const decl_spec_t *t, const char *name); @@ -38,7 +40,7 @@ type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr type_t *type_new_basic(enum type_basic_type basic_type); type_t *type_new_int(enum type_basic_type basic_type, int sign); type_t *type_new_void(void); -type_t *type_new_coclass(char *name); +type_t *type_coclass_declare(char *name); type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums); type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields); type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); @@ -49,7 +51,7 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts); -type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces); +type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); type_t *type_runtimeclass_define(type_t *runtimeclass, ifref_list_t *ifaces); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type);

1 0

Rémi Bernon : widl: Remove constant t parameter from find_type_or_error.
by Alexandre Julliard 04 Feb '21

04 Feb '21

Module: wine Branch: master Commit: 6a1b6a20a3774be05b1a10dfd94cd2c060815c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1b6a20a3774be05b1a10df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 4 17:43:40 2021 +0100 widl: Remove constant t parameter from find_type_or_error. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 328829cc0da..a610a630282 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -75,7 +75,7 @@ static void append_chain_callconv(type_t *chain, char *callconv); static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type_or_error(const char *name, int t); +static type_t *find_type_or_error(const char *name); static var_t *reg_const(var_t *var); @@ -859,17 +859,17 @@ ident: aIDENTIFIER { $$ = make_var($1); } | aKNOWNTYPE { $$ = make_var($<str>1); } ; -base_type: tBYTE { $$ = find_type_or_error($<str>1, 0); } - | tWCHAR { $$ = find_type_or_error($<str>1, 0); } +base_type: tBYTE { $$ = find_type_or_error($<str>1); } + | tWCHAR { $$ = find_type_or_error($<str>1); } | int_std | tSIGNED int_std { $$ = type_new_int(type_basic_get_type($2), -1); } | tUNSIGNED int_std { $$ = type_new_int(type_basic_get_type($2), 1); } | tUNSIGNED { $$ = type_new_int(TYPE_BASIC_INT, 1); } - | tFLOAT { $$ = find_type_or_error($<str>1, 0); } - | tDOUBLE { $$ = find_type_or_error($<str>1, 0); } - | tBOOLEAN { $$ = find_type_or_error($<str>1, 0); } - | tERRORSTATUST { $$ = find_type_or_error($<str>1, 0); } - | tHANDLET { $$ = find_type_or_error($<str>1, 0); } + | tFLOAT { $$ = find_type_or_error($<str>1); } + | tDOUBLE { $$ = find_type_or_error($<str>1); } + | tBOOLEAN { $$ = find_type_or_error($<str>1); } + | tERRORSTATUST { $$ = find_type_or_error($<str>1); } + | tHANDLET { $$ = find_type_or_error($<str>1); } ; m_int: @@ -888,12 +888,12 @@ int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } ; qualified_seq: - aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + aKNOWNTYPE { $$ = find_type_or_error($1); } | aIDENTIFIER '.' { push_lookup_namespace($1); } qualified_seq { $$ = $4; } ; qualified_type: - aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + aKNOWNTYPE { $$ = find_type_or_error($1); } | aNAMESPACE '.' { init_lookup_namespace($1); } qualified_seq { $$ = $4; } ; @@ -1014,7 +1014,7 @@ interfacedef: interfacehdr inherit | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' semicolon_opt { $$ = $1; - type_interface_define($$, find_type_or_error($3, 0), $6); + type_interface_define($$, find_type_or_error($3), $6); } | dispinterfacedef semicolon_opt { $$ = $1; } ; @@ -1247,14 +1247,14 @@ acf_int_statements acf_int_statement : tTYPEDEF acf_attributes aKNOWNTYPE ';' - { type_t *type = find_type_or_error($3, 0); + { type_t *type = find_type_or_error($3); type->attrs = append_attr_list(type->attrs, $2); } ; acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' - { type_t *iface = find_type_or_error($3, 0); + { type_t *iface = find_type_or_error($3); if (type_get_type(iface) != TYPE_INTERFACE) error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); @@ -2092,11 +2092,11 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) return NULL; } -static type_t *find_type_or_error(const char *name, int t) +static type_t *find_type_or_error(const char *name) { type_t *type; - if (!(type = find_type(name, current_namespace, t)) && - !(type = find_type(name, lookup_namespace, t))) + if (!(type = find_type(name, current_namespace, 0)) && + !(type = find_type(name, lookup_namespace, 0))) { error_loc("type '%s' not found\n", name); return NULL; @@ -2909,7 +2909,7 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->declspec.type = find_type_or_error("handle_t", 0); + idl_handle->declspec.type = find_type_or_error("handle_t"); type_function_add_head_arg(func->declspec.type, idl_handle); } } @@ -3200,7 +3200,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls, int declonl LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type_or_error(var->name, 0); + type_t *type = find_type_or_error(var->name); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL;

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
92
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 February 2021