September 2020 - Wine-commits

Henri Verbeet : vkd3d-shader: Use proper variables for epilogue arguments.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: vkd3d Branch: master Commit: 5e523cedca074e546a4125afa72a533234f3b30b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e523cedca074e546a4125a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 4 20:49:17 2020 +0430 vkd3d-shader: Use proper variables for epilogue arguments. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9a6b632..ec6987b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6946,14 +6946,22 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxb { if (compiler->private_output_variable[i]) { + uint32_t argument_id = compiler->private_output_variable[i]; unsigned int argument_idx = count++; - arguments[argument_idx] = compiler->private_output_variable[i]; if (compiler->private_output_variable_array_idx[i]) { - arguments[argument_idx] = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, - arguments[argument_idx], compiler->private_output_variable_array_idx[i]); + uint32_t tmp_id; + + tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, + argument_id, compiler->private_output_variable_array_idx[i]); + tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone); + argument_id = vkd3d_spirv_build_op_variable(builder, + &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0); + vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone); } + + arguments[argument_idx] = argument_id; } }

1 0

Eric Wheeler : comctl32/listview: Add Get/SetSelectedColumn() support.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 578aae071b070519c0a1c6836c67954a5114ef96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=578aae071b070519c0a1c683… Author: Eric Wheeler <wine(a)linux.ewheeler.net> Date: Mon Sep 7 13:04:40 2020 +0300 comctl32/listview: Add Get/SetSelectedColumn() support. Selected column should be using different background color, this patch does not implement this. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 10 +++++++--- dlls/comctl32/tests/listview.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dba16d13a4..e31c787c4a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -99,7 +99,6 @@ * -- LVM_GETINSERTMARKRECT * -- LVM_GETNUMBEROFWORKAREAS * -- LVM_GETOUTLINECOLOR, LVM_SETOUTLINECOLOR - * -- LVM_GETSELECTEDCOLUMN, LVM_SETSELECTEDCOLUMN * -- LVM_GETISEARCHSTRINGW, LVM_GETISEARCHSTRINGA * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO @@ -248,6 +247,7 @@ typedef struct tagLISTVIEW_INFO /* columns */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ BOOL colRectsDirty; /* trigger column rectangles requery from header */ + INT selected_column; /* index for LVM_SETSELECTEDCOLUMN/LVM_GETSELECTEDCOLUMN */ /* item metrics */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ @@ -9506,6 +9506,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW * infoPtr->itemEdit.fEnabled = FALSE; infoPtr->iVersion = COMCTL32_VERSION; infoPtr->colRectsDirty = FALSE; + infoPtr->selected_column = -1; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -11465,7 +11466,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_GETOUTLINECOLOR: */ - /* case LVM_GETSELECTEDCOLUMN: */ + case LVM_GETSELECTEDCOLUMN: + return infoPtr->selected_column; case LVM_GETSELECTEDCOUNT: return LISTVIEW_GetSelectedCount(infoPtr); @@ -11638,7 +11640,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SETOUTLINECOLOR: */ - /* case LVM_SETSELECTEDCOLUMN: */ + case LVM_SETSELECTEDCOLUMN: + infoPtr->selected_column = (INT)wParam; + return TRUE; case LVM_SETSELECTIONMARK: return LISTVIEW_SetSelectionMark(infoPtr, (INT)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a9b853eda8..500cc363c2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6659,6 +6659,42 @@ static void test_item_state_change(void) } } +static void test_selected_column(void) +{ + static const DWORD styles[] = { LVS_ICON, LVS_LIST, LVS_REPORT, LVS_SMALLICON }; + int ret, i; + HWND hwnd; + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + hwnd = create_listview_control(styles[i]); + + /* Initial value */ + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -1, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, -100, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -100, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, 100, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == 100, "Unexpected column %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_SETSELECTEDCOLUMN, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTEDCOLUMN, 0, 0); + ok(ret == -1, "Unexpected column %d.\n", ret); + + DestroyWindow(hwnd); + } +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6766,6 +6802,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_selected_column(); unload_v6_module(ctx_cookie, hCtx);

1 0

Martin Storsjo : ntdll: Fix more corner cases for arm64 packed info unwinding.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 3395ee3631fe7088d33d5fd53f0e788741157e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3395ee3631fe7088d33d5fd5… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Sep 7 13:14:57 2020 +0300 ntdll: Fix more corner cases for arm64 packed info unwinding. Make sure to restore sp from fp for CR == 3. Fix unwinding of partial prologues/epilogues - the previous logic had an off-by-one for the pos/skip handling; fix a few more corner cases with odd number of saved registers. Functions with the H flag set (saving x0-x7 on the stack) should be considred having 4 nops (for the instructions saving the registers) in the prologue for unwind purposes. When unwinding through a partial epilogue, the same 4 nops should also be considered to be there (even though no sane epilogue would restore the registers there) based on how windows handles partial epilogue unwinding in those cases. Uncomment prologue/epilogue cases in an existing test and add tests for many more cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 41 +++--- dlls/ntdll/tests/exception.c | 322 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 340 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3395ee3631fe7088d33d…

1 0

Paul Gofman : ntdll/tests: Fix exception test failures on win10pro.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 0c857e92cb424bd7189b76b4035926f1688ab1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c857e92cb424bd7189b76b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 7 16:31:19 2020 +0300 ntdll/tests: Fix exception test failures on win10pro. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 465c123e67..c26cfb4a11 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -6962,12 +6962,14 @@ static void test_extended_context(void) length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 0); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 3); - ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT), + ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) + || broken(!ret && length == expected_length_xstate) /* win10pro */, "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); length = 0xdeadbeef; @@ -7149,7 +7151,9 @@ static void test_extended_context(void) length2 = 0xdeadbeef; p = pRtlLocateExtendedFeature(context_ex, 2, &length2); - ok(!p && length2 == sizeof(YMMCONTEXT), "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok((!p && length2 == sizeof(YMMCONTEXT)) + || broken(p && length2 == sizeof(YMMCONTEXT)) /* win10pro */, + "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 2, &length2); @@ -7171,7 +7175,8 @@ static void test_extended_context(void) - context_arch[test].context_length; ok(context_ex->XState.Offset == expected_offset, "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags); - ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT), + ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT) + || broken(context_ex->XState.Length == sizeof(XSTATE)) /* win10pro */, "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); ok(context_ex->All.Offset == -(int)context_arch[test].context_length, @@ -7267,7 +7272,8 @@ static void test_extended_context(void) context->ContextFlags); expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0; - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(!xs->Mask || broken(xs->Mask == 4) /* win10pro */, + "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -7275,7 +7281,7 @@ static void test_extended_context(void) ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask == 4 ? test_extended_context_data[i + 4] : 0xcccccccc), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; @@ -7292,7 +7298,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); xs->CompactionMask = 4; @@ -7307,7 +7314,8 @@ static void test_extended_context(void) ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); context_ex->XState.Length = sizeof(XSTATE);

1 0

Paul Gofman : ntdll/tests: Fix virtual test failures on win10pro.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 7ec069d85f5235db98e57291825b9d602ae47ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec069d85f5235db98e57291… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 7 16:31:20 2020 +0300 ntdll/tests: Fix virtual test failures on win10pro. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 47eb784cbb..7049f234a9 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -612,7 +612,9 @@ static void test_user_shared_data(void) for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i], "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, + ok(xstate.AllFeatures[i] == feature_sizes[i] + || broken(!xstate.AllFeatures[i]) /* win10pro */, + "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i, xstate.Features[i].Size, feature_sizes[i]);

1 0

Rémi Bernon : widl: Output interface C names in method argument list.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 6698a2ef7f1b481fb3e9562c4915fefb39635a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6698a2ef7f1b481fb3e9562c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 3 14:52:07 2020 +0200 widl: Output interface C names in method argument list. This fixes WinRT interface generation where only simple names were used instead of the C interface names. With the previous sample idl: #ifdef __WIDL__ #pragma winrt ns_prefix #endif import "wtypes.idl"; namespace Windows { [object] interface IFoo {} [object] interface IBar { HRESULT DoBar([in] IFoo *foo); } } $ widl -o windows.foo.h windows.foo.idl Generated file diff before/after: diff --git a/windows.foo.h b/windows.foo.h index 3790dc7..65151cb 100644 --- a/windows.foo.h +++ b/windows.foo.h @@ -123,7 +123,7 @@ typedef struct __x_ABI_CWindows_CIBarVtbl { /*** IBar methods ***/ HRESULT (STDMETHODCALLTYPE *DoBar)( __x_ABI_CWindows_CIBar *This, - IFoo *foo); + __x_ABI_CWindows_CIFoo *foo); END_INTERFACE } __x_ABI_CWindows_CIBarVtbl; @@ -138,7 +138,7 @@ interface __x_ABI_CWindows_CIBar { #define __x_ABI_CWindows_CIBar_DoBar(This,foo) (This)->lpVtbl->DoBar(This,foo) #else /*** IBar methods ***/ -static FORCEINLINE HRESULT __x_ABI_CWindows_CIBar_DoBar(__x_ABI_CWindows_CIBar* This,IFoo *foo) { +static FORCEINLINE HRESULT __x_ABI_CWindows_CIBar_DoBar(__x_ABI_CWindows_CIBar* This,__x_ABI_CWindows_CIFoo *foo) { return This->lpVtbl->DoBar(This,foo); } #endif Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 3 +-- tools/widl/header.c | 42 ++++++++++++++++++++---------------------- tools/widl/header.h | 2 +- tools/widl/proxy.c | 4 ++-- 4 files changed, 24 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6698a2ef7f1b481fb3e9…

1 0

Rémi Bernon : widl: Support fully qualified names in WinRT mode.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 280932536f9c05bf09f2010eb14ca552a762e6e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=280932536f9c05bf09f2010e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 3 14:42:01 2020 +0200 widl: Support fully qualified names in WinRT mode. Interfaces are going to reference each other across namespaces, so this implements a type lookup with the full name. It supports the following idl syntax in WinRT mode: #ifdef __WIDL__ #pragma winrt ns_prefix #endif import "wtypes.idl"; namespace Windows { namespace Foo { [object] interface IFoo {} } namespace Bar { [object] interface IBar { HRESULT DoBar([in] Windows.Foo.IFoo *foo); } } } That was previously failing to parse the Windows.Foo.IFoo part and to lookup the corresponding type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.h | 1 + tools/widl/parser.l | 2 +- tools/widl/parser.y | 60 +++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index a67b160d48..a6dc94ae6b 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -38,6 +38,7 @@ void pop_import(void); #define parse_only import_stack_ptr int is_type(const char *name); +int is_namespace(const char *name); int do_warning(char *toggle, warning_list_t *wnum); int is_warning_enabled(int warning); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3cbf4ff2d2..925265d00d 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -451,7 +451,7 @@ static int kw_token(const char *kw) return kwp->token; } parser_lval.str = xstrdup(kw); - return is_type(kw) ? aKNOWNTYPE : aIDENTIFIER; + return is_type(kw) ? aKNOWNTYPE : is_namespace(kw) ? aNAMESPACE : aIDENTIFIER; } static int attr_token(const char *kw) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 91c5b809bb..7d5aaebf33 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -81,6 +81,8 @@ static var_t *reg_const(var_t *var); static void push_namespace(const char *name); static void pop_namespace(const char *name); +static void init_lookup_namespace(const char *name); +static void push_lookup_namespace(const char *name); static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); @@ -122,6 +124,7 @@ static struct namespace global_namespace = { }; static struct namespace *current_namespace = &global_namespace; +static struct namespace *lookup_namespace = &global_namespace; static typelib_t *current_typelib; @@ -156,7 +159,7 @@ static typelib_t *current_typelib; } %token <str> aIDENTIFIER aPRAGMA -%token <str> aKNOWNTYPE +%token <str> aKNOWNTYPE aNAMESPACE %token <num> aNUM aHEXNUM %token <dbl> aDOUBLE %token <str> aSTRING aWSTRING aSQSTRING @@ -271,7 +274,7 @@ static typelib_t *current_typelib; %type <str> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl -%type <type> type +%type <type> type qualified_seq qualified_type %type <ifref> coclass_int %type <ifref_list> coclass_ints %type <var> arg ne_union_field union_field s_field case enum declaration @@ -817,6 +820,16 @@ int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } | tINT3264 { $$ = type_new_int(TYPE_BASIC_INT3264, 0); } ; +qualified_seq: + aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + | aIDENTIFIER '.' { push_lookup_namespace($1); } qualified_seq { $$ = $4; } + ; + +qualified_type: + aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + | 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) @@ -837,6 +850,7 @@ coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt ; namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } + | tNAMESPACE aNAMESPACE { $$ = $2; } ; coclass_ints: { $$ = NULL; } @@ -881,7 +895,7 @@ dispinterfacedef: dispinterfacehdr '{' ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } + | ':' qualified_type { $$ = $2; } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } @@ -1096,7 +1110,7 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, current_nam ; type: tVOID { $$ = type_new_void(); } - | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } + | qualified_type { $$ = $1; } | base_type { $$ = $1; } | enumdef { $$ = $1; } | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } @@ -1848,6 +1862,20 @@ static void pop_namespace(const char *name) current_namespace = current_namespace->parent; } +static void init_lookup_namespace(const char *name) +{ + if (!(lookup_namespace = find_sub_namespace(&global_namespace, name))) + error_loc("namespace '%s' not found\n", name); +} + +static void push_lookup_namespace(const char *name) +{ + struct namespace *namespace; + if (!(namespace = find_sub_namespace(lookup_namespace, name))) + error_loc("namespace '%s' not found\n", name); + lookup_namespace = namespace; +} + struct rtype { const char *name; type_t *type; @@ -1959,12 +1987,14 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) static type_t *find_type_or_error(const char *name, int t) { - type_t *type = find_type(name, current_namespace, t); - if (!type) { - error_loc("type '%s' not found\n", name); - return NULL; - } - return type; + type_t *type; + if (!(type = find_type(name, current_namespace, t)) && + !(type = find_type(name, lookup_namespace, t))) + { + error_loc("type '%s' not found\n", name); + return NULL; + } + return type; } static type_t *find_type_or_error2(char *name, int t) @@ -1976,7 +2006,15 @@ static type_t *find_type_or_error2(char *name, int t) int is_type(const char *name) { - return find_type(name, current_namespace, 0) != NULL; + return find_type(name, current_namespace, 0) != NULL || + find_type(name, lookup_namespace, 0) != NULL; +} + +int is_namespace(const char *name) +{ + if (!winrt_mode) return 0; + return find_sub_namespace(current_namespace, name) != NULL || + find_sub_namespace(&global_namespace, name) != NULL; } type_t *get_type(enum type_type type, char *name, struct namespace *namespace, int t)

1 0

Jacek Caban : dwrite.idl: Use DEFINE_ENUM_FLAG_OPERATORS for enums that need it.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: eb0c19e89b6ec9a0b7a231410aaa7464fcfd5957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb0c19e89b6ec9a0b7a23141… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 7 12:49:53 2020 +0200 dwrite.idl: Use DEFINE_ENUM_FLAG_OPERATORS for enums that need it. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dwrite.idl b/include/dwrite.idl index d5ce849386..64cb5ee488 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -147,6 +147,7 @@ typedef enum DWRITE_FONT_SIMULATIONS DWRITE_FONT_SIMULATIONS_BOLD, DWRITE_FONT_SIMULATIONS_OBLIQUE } DWRITE_FONT_SIMULATIONS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DWRITE_FONT_SIMULATIONS);") typedef enum DWRITE_PIXEL_GEOMETRY { @@ -328,6 +329,7 @@ typedef enum DWRITE_SCRIPT_SHAPES DWRITE_SCRIPT_SHAPES_DEFAULT = 0, DWRITE_SCRIPT_SHAPES_NO_VISUAL = 1 } DWRITE_SCRIPT_SHAPES; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DWRITE_SCRIPT_SHAPES);") typedef enum DWRITE_NUMBER_SUBSTITUTION_METHOD {

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 0713b754f0392791b16ec8ce7909badca54a03be URL: https://source.winehq.org/git/wine.git/?a=commit;h=0713b754f0392791b16ec8ce… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 7 23:17:05 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2f9a0a4eb5..b992960a28 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-05-10 19:59+0900\n" +"PO-Revision-Date: 2020-09-07 22:53+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -3606,7 +3606,7 @@ msgstr "ゲームコントローラ" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "ゲームコントローラのテストと設定をします。" #: jscript.rc:28 msgid "Error converting object to primitive type" @@ -3614,17 +3614,15 @@ msgstr "オブジェクトを基本型に変換できません" #: jscript.rc:29 msgid "Invalid procedure call or argument" -msgstr "手続き呼び出しまたは引数が無効です" +msgstr "使用できない手続き呼び出しまたは引数です" #: jscript.rc:30 msgid "Subscript out of range" msgstr "添字が範囲外です" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "用紙切れ - " +msgstr "スタックスペースが不足しています" #: jscript.rc:32 msgid "Object required" @@ -3672,7 +3670,7 @@ msgstr "'='を期待していました" #: jscript.rc:43 msgid "Invalid character" -msgstr "無効な文字です" +msgstr "使用できない文字です" #: jscript.rc:44 msgid "Unterminated string constant" @@ -3763,16 +3761,12 @@ msgid "JScript object expected" msgstr "JScript オブジェクトを期待していました" #: jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "配列オブジェクトを期待していました" +msgstr "列挙子オブジェクトを期待していました" #: jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Boolean オブジェクトを期待していました" +msgstr "正規表現オブジェクトを期待していました" #: jscript.rc:65 msgid "Syntax error in regular expression" @@ -3784,7 +3778,7 @@ msgstr "例外が送出されましたが捕捉されませんでした" #: jscript.rc:68 msgid "URI to be encoded contains invalid characters" -msgstr "エンコードされる URI に無効な文字が含まれています" +msgstr "エンコードされる URI に使用できない文字が含まれています" #: jscript.rc:67 msgid "URI to be decoded is incorrect" @@ -3841,7 +3835,7 @@ msgstr "処理は成功しました。\n" #: winerror.mc:33 msgid "Invalid function.\n" -msgstr "ファンクションが正しくありません。\n" +msgstr "使用できないファンクションです。\n" #: winerror.mc:38 msgid "File not found.\n" @@ -6797,10 +6791,8 @@ msgid "Connection reset by peer.\n" msgstr "相手側により接続がリセットされました。\n" #: winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "未実装" +msgstr "未実装です。\n" #: winerror.mc:3760 msgid "No Signature found in file.\n" @@ -8402,7 +8394,7 @@ msgstr "接続をテスト(&T)" #: version.rc:92 msgid "Advanced" -msgstr "中級" +msgstr "高度" #: version.rc:95 msgid "Network settings" @@ -12504,6 +12496,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- サポートしているコマンド -\n" +"\n" +"hardlink ハードリンクの管理\n" #: fsutil.mc:35 msgid "" @@ -12511,10 +12506,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - サポートしているコマンド -\n" +"\n" +"create ハードリンクを作成する\n" #: fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "構文: fsutil hardlink create <新規> <既存>\n" #: hostname.rc:30 msgid "Usage: hostname\n" @@ -12526,7 +12524,7 @@ msgstr "エラー: 無効なオプション '%c'。\n" #: hostname.rc:32 msgid "Error: Could not get hostname: %u.\n" -msgstr "エラー: ホスト名が得られません: %u\n" +msgstr "エラー: ホスト名が得られません: %u。\n" #: hostname.rc:33 msgid "" @@ -16519,10 +16517,8 @@ msgid "&Beginner" msgstr "初級(&B)" #: winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "インターフェイス" +msgstr "中級(&I)" #: winemine.rc:46 msgid "&Expert" @@ -16553,10 +16549,8 @@ msgid "Beginner" msgstr "初級" #: winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "インターフェイス" +msgstr "中級" #: winemine.rc:66 msgid "Expert"

1 0

Derek Lesho : mfplat: Remove fallback media source.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: c58bb881a08a7abd175466f648ac9c9f4e09e4cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c58bb881a08a7abd175466f6… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 2 14:25:58 2020 -0500 mfplat: Remove fallback media source. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 207 +-------------------------------------------- dlls/mfplat/tests/mfplat.c | 106 +++++++++++++---------- 2 files changed, 64 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c58bb881a08a7abd1754…

1 0