April 2021 - Wine-commits - list.winehq.org

Rémi Bernon : user32/tests: Add more GetKeyboardLayout(Name) tests.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 60c7823dcba837846853d621456ae6997174a885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c7823dcba837846853d621… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 27 12:06:50 2021 +0200 user32/tests: Add more GetKeyboardLayout(Name) tests. At least on recent Windows, the HKL values are a combination of user selected UI language in the low word, and keyboard layout id in the high word. The keyboard layout id used in HKL is sometimes different from its name, as returned by GetKeyboardLayoutName, in which case it's the "Layout Id" value in the corresponding registry key under the layout name. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 53 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2397b4104e4..c4c361575cd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -53,6 +53,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winreg.h" #include "ddk/hidsdi.h" #include "wine/test.h" @@ -3034,8 +3035,11 @@ static void test_get_async_key_state(void) static void test_keyboard_layout_name(void) { + WCHAR klid[KL_NAMELENGTH], tmpklid[KL_NAMELENGTH], layout_path[MAX_PATH], value[5]; + HKL layout, tmplayout, layouts[64]; + DWORD status, value_size; + int i, len; BOOL ret; - char klid[KL_NAMELENGTH]; if (0) /* crashes on native system */ ret = GetKeyboardLayoutNameA(NULL); @@ -3045,12 +3049,49 @@ static void test_keyboard_layout_name(void) ok(!ret, "got %d\n", ret); ok(GetLastError() == ERROR_NOACCESS, "got %d\n", GetLastError()); - if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return; + layout = GetKeyboardLayout(0); + + len = GetKeyboardLayoutList(ARRAY_SIZE(layouts), layouts); + ok(len > 0, "GetKeyboardLayoutList returned %d\n", len); + + for (i = len - 1; i >= 0; --i) + { + UINT id = (UINT_PTR)layouts[i]; + ActivateKeyboardLayout(layouts[i], 0); + GetKeyboardLayoutNameW(klid); + + if (id & 0x80000000) + { + todo_wine ok((id >> 28) == 0xf, "hkl high bits %#x, expected 0xf\n", id >> 28); + + value_size = sizeof(value); + wcscpy(layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\"); + wcscat(layout_path, klid); + status = RegGetValueW(HKEY_LOCAL_MACHINE, layout_path, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size); + todo_wine ok(!status, "RegGetValueW returned %x\n", status); + ok(value_size == 5 * sizeof(WCHAR), "RegGetValueW returned size %d\n", value_size); + + swprintf(tmpklid, KL_NAMELENGTH, L"%04X", (id >> 16) & 0x0fff); + todo_wine ok(!wcsicmp(value, tmpklid), "RegGetValueW returned %s, expected %s\n", debugstr_w(value), debugstr_w(tmpklid)); + } + else + { + swprintf(tmpklid, KL_NAMELENGTH, L"%08X", id >> 16); + ok(!wcsicmp(klid, tmpklid), "GetKeyboardLayoutNameW returned %s, expected %s\n", debugstr_w(klid), debugstr_w(tmpklid)); + } + + ActivateKeyboardLayout(layout, 0); + tmplayout = LoadKeyboardLayoutW(klid, KLF_ACTIVATE); + + /* The low word of HKL is the selected user lang and may be different as LoadKeyboardLayoutW also selects the default lang from the layout */ + ok(((UINT_PTR)tmplayout & ~0xffff) == ((UINT_PTR)layouts[i] & ~0xffff), "GetKeyboardLayout returned %p, expected %p\n", tmplayout, layouts[i]); + + /* The layout name only depends on the keyboard layout: the high word of HKL. */ + GetKeyboardLayoutNameW(tmpklid); + ok(!wcsicmp(klid, tmpklid), "GetKeyboardLayoutNameW returned %s, expected %s\n", debugstr_w(tmpklid), debugstr_w(klid)); + } - klid[0] = 0; - ret = GetKeyboardLayoutNameA(klid); - ok(ret, "GetKeyboardLayoutNameA failed %u\n", GetLastError()); - ok(!strcmp(klid, "00000409"), "expected 00000409, got %s\n", klid); + ActivateKeyboardLayout(layout, 0); } static void test_key_names(void)

1 0

Ziqing Hui : user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 1ab8710016d4dc0cb0c61280dd7443b2a89b6b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ab8710016d4dc0cb0c61280… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 23 11:31:36 2021 +0800 user32/tests: Add tests for maximizing and restoring windows without WS_CAPTION. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dbb5f4ce5b5..a37afd2dc5e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6649,6 +6649,21 @@ static void test_ShowWindow(void) RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient; LPARAM ret; MONITORINFO mon_info; + unsigned int i; + + DWORD test_style[] = + { + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MAXIMIZEBOX | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_MAXIMIZEBOX, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE | WS_SYSMENU, + WS_OVERLAPPED | WS_VISIBLE | WS_THICKFRAME, + WS_OVERLAPPED | WS_VISIBLE + }; SetRect(&rcClient, 0, 0, 90, 90); rcMain = rcClient; @@ -6905,6 +6920,50 @@ static void test_ShowWindow(void) DestroyWindow(hwnd); flush_events(TRUE); + + /* test maximize and restore windows without setting WS_CAPTION */ + + for (i = 0; i < ARRAY_SIZE(test_style); ++i) + { + SetRect(&rcMain, 0, 0, 90, 90); + OffsetRect(&rcMain, 120, 120); + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, test_style[i], + rcMain.left, rcMain.top, + rcMain.right - rcMain.left, rcMain.bottom - rcMain.top, + 0, 0, 0, NULL); + ok(hwnd != NULL, "Test %u: failed to create window with error %u\n", i, GetLastError()); + + GetWindowRect(hwnd, &rcMain); + ok(rcMain.left > mon_info.rcMonitor.left && + rcMain.right < mon_info.rcMonitor.right && + rcMain.top > mon_info.rcMonitor.top && + rcMain.bottom < mon_info.rcMonitor.bottom, + "Test %u: window should not be fullscreen\n", i); + + rcMaximized = (test_style[i] & WS_MAXIMIZEBOX) ? mon_info.rcWork : mon_info.rcMonitor; + AdjustWindowRectEx(&rcMaximized, GetWindowLongA(hwnd, GWL_STYLE) & ~WS_BORDER, + 0, GetWindowLongA(hwnd, GWL_EXSTYLE)); + + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "unexpected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & WS_MAXIMIZE, "Test %u: window should be maximized\n", i); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMaximized, &rc), "Test %u: expected %s, got %s\n", + i, wine_dbgstr_rect(&rcMaximized), wine_dbgstr_rect(&rc)); + + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "unexpected ret: %lu\n", ret); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(!(style & WS_MAXIMIZE), "Test %u: window should not be maximized\n", i); + GetWindowRect(hwnd, &rc); + ok(EqualRect(&rcMain, &rc), "Test %u: expected %s, got %s\n", + i, wine_dbgstr_rect(&rcMain), wine_dbgstr_rect(&rc)); + + DestroyWindow(hwnd); + + flush_events(TRUE); + } } static void test_ShowWindow_owned(HWND hwndMain)

1 0

Ziqing Hui : winex11.drv: Correct a full screen condition.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 57b1b21a84b15f121eef998a31151d760beb8c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b1b21a84b15f121eef998a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 23 11:31:50 2021 +0800 winex11.drv: Correct a full screen condition. The if condition here came from 47c54c4ae7f235780a55ddf670503db4afc11055, which is to detect full screen window. However, according to tests in previous commit, there is possibility that a window without setting WS_CAPTION is not full screen, for example, main window of Tencent WeChat. And windows like this can also be maximized or restored. So that we can not treat WS_CAPTION as our full screen condition. This fixes maximizing Tencent WeChat by dragging it to screen edge. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 99943478729..1772a27c48b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1163,7 +1163,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) data->window_rect.bottom - data->window_rect.top, cx, cy ); style = GetWindowLongW( data->hwnd, GWL_STYLE ); - if ((style & WS_CAPTION) == WS_CAPTION) + if ((style & WS_CAPTION) == WS_CAPTION || !is_window_rect_full_screen( &data->whole_rect )) { read_net_wm_states( event->display, data ); if ((data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)))

1 0

Alistair Leslie-Hughes : msado15: Support Properties interface on Field.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: d5aa637737d1fbe97438638867f3ecfc6ecf96eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5aa637737d1fbe974386388… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 23 08:24:57 2021 +1000 msado15: Support Properties interface on Field. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 144 ++++++++++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 20 ++++++ 4 files changed, 164 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3479ceb5b02..6b85c84e8e8 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -184,6 +184,7 @@ static REFIID tid_ids[] = { &IID__Connection, &IID_Field, &IID_Fields, + &IID_Properties, &IID__Recordset, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 55afac3f389..600dcb90a97 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -48,6 +48,7 @@ typedef enum tid_t { Connection_tid, Field_tid, Fields_tid, + Properties_tid, Recordset_tid, Stream_tid, LAST_tid diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 68d4c22d802..d71904193c9 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -65,6 +65,7 @@ struct field { Field Field_iface; ISupportErrorInfo ISupportErrorInfo_iface; + Properties Properties_iface; LONG refs; WCHAR *name; DataTypeEnum type; @@ -79,6 +80,11 @@ static inline struct field *impl_from_Field( Field *iface ) return CONTAINING_RECORD( iface, struct field, Field_iface ); } +static inline struct field *impl_from_Properties( Properties *iface ) +{ + return CONTAINING_RECORD( iface, struct field, Properties_iface ); +} + static ULONG WINAPI field_AddRef( Field *iface ) { struct field *field = impl_from_Field( iface ); @@ -181,8 +187,12 @@ static HRESULT WINAPI field_Invoke( Field *iface, DISPID member, REFIID riid, LC static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) { - FIXME( "%p, %p\n", iface, obj ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + TRACE( "%p, %p\n", iface, obj ); + + *obj = &field->Properties_iface; + Properties_AddRef(&field->Properties_iface); + return S_OK; } static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) @@ -447,6 +457,135 @@ static const ISupportErrorInfoVtbl field_supporterrorinfo_vtbl = field_supporterrorinfo_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI field_props_QueryInterface(Properties *iface, REFIID riid, void **ppv) +{ + struct field *field = impl_from_Properties( iface ); + + if (IsEqualGUID( riid, &IID_Properties) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppv = &field->Properties_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + Field_AddRef(&field->Field_iface); + return S_OK; +} + +static ULONG WINAPI field_props_AddRef(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + return Field_AddRef(&field->Field_iface); +} + +static ULONG WINAPI field_props_Release(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + return Field_Release(&field->Field_iface); +} + +static HRESULT WINAPI field_props_GetTypeInfoCount(Properties *iface, UINT *count) +{ + struct field *field = impl_from_Properties( iface ); + TRACE( "%p, %p\n", field, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI field_props_GetTypeInfo(Properties *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + struct field *field = impl_from_Properties( iface ); + TRACE( "%p, %u, %u, %p\n", field, index, lcid, info ); + return get_typeinfo(Properties_tid, info); +} + +static HRESULT WINAPI field_props_GetIDsOfNames(Properties *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + struct field *field = impl_from_Properties( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Properties_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_props_Invoke(Properties *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + struct field *field = impl_from_Properties( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + + hr = get_typeinfo(Properties_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &field->Field_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_props_get_Count(Properties *iface, LONG *count) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %p\n", field, count); + *count = 0; + return S_OK; +} + +static HRESULT WINAPI field_props__NewEnum(Properties *iface, IUnknown **object) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %p\n", field, object); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_props_Refresh(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p\n", field); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_props_get_Item(Properties *iface, VARIANT index, Property **object) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %s, %p\n", field, debugstr_variant(&index), object); + return MAKE_ADO_HRESULT(adErrItemNotFound); +} + +static struct PropertiesVtbl field_properties_vtbl = +{ + field_props_QueryInterface, + field_props_AddRef, + field_props_Release, + field_props_GetTypeInfoCount, + field_props_GetTypeInfo, + field_props_GetIDsOfNames, + field_props_Invoke, + field_props_get_Count, + field_props__NewEnum, + field_props_Refresh, + field_props_get_Item +}; + static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *recordset, Field **obj ) { struct field *field; @@ -454,6 +593,7 @@ static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *re if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; field->Field_iface.lpVtbl = &field_vtbl; field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; + field->Properties_iface.lpVtbl = &field_properties_vtbl; if (!(field->name = strdupW( name ))) { heap_free( field ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index db606f21fab..b5f1b70dedd 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,8 @@ static void test_Recordset(void) ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; + Properties *props; + Property *prop; LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; @@ -184,6 +186,24 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( name ); + hr = Field_QueryInterface(field, &IID_Properties, (void**)&props); + ok( hr == E_NOINTERFACE, "got %08x\n", hr ); + + hr = Field_get_Properties(field, &props); + ok( hr == S_OK, "got %08x\n", hr ); + + count = -1; + hr = Properties_get_Count(props, &count); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); + + V_VT( &index ) = VT_I4; + V_I4( &index ) = 1000; + hr = Properties_get_Item(props, index, &prop); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + + Properties_Release(props); + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); ok( is_eof( recordset ), "not eof\n" );

1 0

Francois Gouget : winetest/dissect: Link the report pages to the test index pages.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: tools Branch: master Commit: 5fb8a7aa9b3b49fc513955e67140546793e719ba URL: https://source.winehq.org/git/tools.git/?a=commit;h=5fb8a7aa9b3b49fc513955e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 27 12:44:56 2021 +0200 winetest/dissect: Link the report pages to the test index pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 0ae7251..3e91a8d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -562,7 +562,9 @@ sub create_test_unit_box() { $dllinfo{$dll}->{first} = "$dll:$unit"; } - return create_box("$dll:$unit", "testfile", get_source_link(undef, undef)); + my $box = create_box("$dll:$unit", "testfile", get_source_link(undef, undef)); + $box->{testname} = "$dll:$unit"; + return $box; } sub close_test_unit($) @@ -961,6 +963,10 @@ for (my $i = 0; $i <= $#boxes; $i++) { printf REPORT "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; printf REPORT "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + if ($boxes[$i]->{testname}) + { + printf REPORT "<a href='/data/tests/%s.html'>all results</a> | ", $boxes[$i]->{testname}; + } printf REPORT "<a href=\"#%s\">↑</a>", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; printf REPORT "<a href=\"#%s\">↓</a>", $boxes[$i]->{next} if defined $boxes[$i]->{next}; print REPORT "</div></div>\n"; @@ -987,7 +993,12 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n"; printf FILE "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; - printf FILE "<div class=\"updownbar\">%s</div>\n", $boxes[$i]->{title}; + printf FILE "<div class=\"updownbar\">%s", $boxes[$i]->{title}; + if ($boxes[$i]->{testname}) + { + printf FILE "<div class='ralign'><a href='/data/tests/%s.html'>all results</a></div>", $boxes[$i]->{testname}; + } + print FILE "</div>\n"; print FILE $boxes[$i]->{data}, "</div>\n"; print FILE end_html(); close FILE or mydie "error writing to '$tmpdir/$boxes[$i]->{id}.html': $!";

1 0

Francois Gouget : winetest/build-patterns: Add a page showing failure patterns.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: tools Branch: master Commit: bce49667e6418c326ade5704ee65c5bf8c6930d6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bce49667e6418c326ade570… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 27 12:45:07 2021 +0200 winetest/build-patterns: Add a page showing failure patterns. The new page shows the failure patterns across time and test configurations to help detect Wine changes that cause new failures, and identify when failures happen in specific configurations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48164 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 3 +- winetest/build-patterns | 636 ++++++++++++++++++++++++++++++++++++++++++++++++ winetest/gather | 65 +++++ winetest/report.css | 46 ++++ winetest/winetest.cron | 1 + 5 files changed, 750 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=bce49667e6418c326ad…

1 0

Francois Gouget : winetest/dissect: Link test units to the matching failure pattern.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: tools Branch: master Commit: a02e0b637d50693124d8e2576132a81c4c410aa2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a02e0b637d50693124d8e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 27 12:45:10 2021 +0200 winetest/dissect: Link test units to the matching failure pattern. If a test unit had a failure it will appear in the global failure patterns page. So add a link. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 3e91a8d..ea76cb8 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -625,6 +625,7 @@ sub close_test_unit($) $failures += $extra_failures; $summary = "$s_total $todo $failures $skipped" if (!defined $summary); print SUM "- $dll $unit $summary $source\n"; + $testbox->{pattern} = "$dll:$unit" if ($failures); if ($failures && ++$failed_units > $maxfailedtests) { mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } @@ -963,6 +964,10 @@ for (my $i = 0; $i <= $#boxes; $i++) { printf REPORT "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; printf REPORT "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + if ($boxes[$i]->{pattern}) + { + printf REPORT "<a href=\"/data/patterns.html#%s\">pattern</a> | ", $boxes[$i]->{pattern}; + } if ($boxes[$i]->{testname}) { printf REPORT "<a href='/data/tests/%s.html'>all results</a> | ", $boxes[$i]->{testname}; @@ -993,12 +998,16 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n"; printf FILE "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; - printf FILE "<div class=\"updownbar\">%s", $boxes[$i]->{title}; + printf FILE "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + if ($boxes[$i]->{pattern}) + { + printf FILE "<a href=\"/data/patterns.html#%s\">pattern</a> | ", $boxes[$i]->{pattern}; + } if ($boxes[$i]->{testname}) { - printf FILE "<div class='ralign'><a href='/data/tests/%s.html'>all results</a></div>", $boxes[$i]->{testname}; + printf FILE "<a href='/data/tests/%s.html'>all results</a>", $boxes[$i]->{testname}; } - print FILE "</div>\n"; + print FILE "</div></div>\n"; print FILE $boxes[$i]->{data}, "</div>\n"; print FILE end_html(); close FILE or mydie "error writing to '$tmpdir/$boxes[$i]->{id}.html': $!";

1 0

Alexandre Julliard : dbghelp: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: f14632f345b478e875bf327964eaeca6dbf4cc54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f14632f345b478e875bf3279… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:33:48 2021 +0200 dbghelp: Support loading builtins from the architecture-specific PE directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index a2057947a42..b281c19de88 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -31,6 +31,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +#ifdef __i386__ +static const WCHAR pe_dir[] = L"\\i386-windows"; +#elif defined __x86_64__ +static const WCHAR pe_dir[] = L"\\x86_64-windows"; +#elif defined __arm__ +static const WCHAR pe_dir[] = L"\\arm-windows"; +#elif defined __aarch64__ +static const WCHAR pe_dir[] = L"\\aarch64-windows"; +#else +static const WCHAR pe_dir[] = L""; +#endif + static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} static inline BOOL is_sep(WCHAR ch) {return ch == '/' || ch == '\\';} @@ -694,6 +706,7 @@ WCHAR *get_dos_file_name(const WCHAR *filename) BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) { const WCHAR *env; + WCHAR *p, *end; size_t len, i; HANDLE file; WCHAR *buf; @@ -703,7 +716,6 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((env = process_getenv(process, L"WINEBUILDDIR"))) { - WCHAR *p, *end; const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; const WCHAR dot_dllW[] = {'.','d','l','l',0}; @@ -755,8 +767,19 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma WCHAR env_name[64]; swprintf(env_name, ARRAY_SIZE(env_name), L"WINEDLLDIR%u", i); if (!(env = process_getenv(process, env_name))) return FALSE; - len = wcslen(env) + wcslen(name) + 2; + len = wcslen(env) + wcslen(pe_dir) + wcslen(name) + 2; if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; + if (!(p = wcsrchr(name, '.')) || lstrcmpW(p, L".so")) + { + swprintf(buf, len, L"%s%s\\%s", env, pe_dir, name); + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; + } + } swprintf(buf, len, L"%s\\%s", env, name); file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : makefiles: Install PE files in an architecture-specific directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: c59126d403de0f749207a1d5e741274cb92fa64d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59126d403de0f749207a1d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:45:32 2021 +0200 makefiles: Install PE files in an architecture-specific directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 14 ++++++++++++++ configure.ac | 9 +++++++++ tools/makedep.c | 9 ++++++++- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index b52495f741f..d9e01a277c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,7 @@ nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine srcdir = @srcdir@ SHELL = /bin/sh +ARCH = @ARCH@ CC = @CC@ CXX = @CXX@ CPPBIN = @CPPBIN@ diff --git a/configure b/configure index dba0950b490..d22c0cf89cc 100755 --- a/configure +++ b/configure @@ -775,6 +775,7 @@ AR BISON FLEX TOOLSDIR +ARCH TARGETFLAGS LD CPPBIN @@ -5870,6 +5871,19 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +case $host_cpu in + *i[3456789]86*) ARCH="i386" + ;; + *x86_64*) ARCH="x86_64" + ;; + *aarch64*) ARCH="aarch64" + ;; + *arm*) ARCH="arm" + ;; + *) ARCH="" + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5 $as_echo_n "checking for the directory containing the Wine tools... " >&6; } if ${wine_cv_toolsdir+:} false; then : diff --git a/configure.ac b/configure.ac index 68366339ea2..c90e78d8bb7 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,15 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +dnl Normalize CPU architecture +case $host_cpu in + *i[[3456789]]86*) AC_SUBST(ARCH,"i386") ;; + *x86_64*) AC_SUBST(ARCH,"x86_64") ;; + *aarch64*) AC_SUBST(ARCH,"aarch64") ;; + *arm*) AC_SUBST(ARCH,"arm") ;; + *) AC_SUBST(ARCH,"") ;; +esac + AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, [wine_cv_toolsdir="$with_wine_tools" if test -z "$with_wine_tools"; then diff --git a/tools/makedep.c b/tools/makedep.c index 0eef646479b..c54eda772db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -158,6 +158,8 @@ static const char *tools_ext; static const char *exe_ext; static const char *dll_ext; static const char *man_ext; +static const char *arch; +static const char *pe_dir; static const char *crosstarget; static const char *crossdebug; static const char *fontforge; @@ -3321,7 +3323,7 @@ static void output_module( struct makefile *make ) } strarray_add( &make->all_targets, strmake( "%s", make->module )); add_install_rule( make, make->module, strmake( "%s", make->module ), - strmake( "c$(dlldir)/%s", make->module )); + strmake( "c%s/%s", pe_dir, make->module )); debug_file = get_debug_file( make, make->module ); output( "%s:", module_path ); } @@ -4434,6 +4436,7 @@ int main( int argc, char *argv[] ) exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" ); man_ext = get_expanded_make_variable( top_makefile, "api_manext" ); dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so"; + arch = get_expanded_make_variable( top_makefile, "ARCH" ); crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" ); crossdebug = get_expanded_make_variable( top_makefile, "CROSSDEBUG" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); @@ -4454,6 +4457,10 @@ int main( int argc, char *argv[] ) if (!exe_ext) exe_ext = ""; if (!tools_ext) tools_ext = ""; if (!man_ext) man_ext = "3w"; + if (arch) + pe_dir = strmake( "$(dlldir)/%s-windows", arch ); + else + pe_dir = "$(dlldir)"; top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" );

1 0

Alexandre Julliard : makefiles: Install PE import libraries in the architecture-specific directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: ee81814f2baa78975ff4ecb1522b0fb74620442b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee81814f2baa78975ff4ecb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 16:40:00 2021 +0200 makefiles: Install PE import libraries in the architecture-specific directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 56 +++++++++++++------------------------------------------- 1 file changed, 13 insertions(+), 43 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c54eda772db..a6d525a92e8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -148,7 +148,6 @@ static struct strarray enable_tests; static struct strarray cmdline_vars; static struct strarray subdirs; static struct strarray disabled_dirs; -static struct strarray cross_import_libs; static struct strarray delay_import_libs; static struct strarray top_install_lib; static struct strarray top_install_dev; @@ -2128,26 +2127,6 @@ static struct makefile *get_parent_makefile( struct makefile *make ) } -/******************************************************************* - * needs_cross_lib - */ -static int needs_cross_lib( const struct makefile *make ) -{ - const char *name; - if (!crosstarget) return 0; - if (make->importlib) name = make->importlib; - else if (make->staticlib) - { - name = replace_extension( make->staticlib, ".a", "" ); - if (!strncmp( name, "lib", 3 )) name += 3; - } - else return 0; - if (strarray_exists( &cross_import_libs, name )) return 1; - if (delay_load_flag && strarray_exists( &delay_import_libs, name )) return 1; - return 0; -} - - /******************************************************************* * needs_delay_lib */ @@ -2683,8 +2662,8 @@ static struct strarray output_importlib_symlinks( const struct makefile *make ) int i, count = 0; ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; if (needs_delay_lib( make )) ext[count++] = "delay.a"; - if (needs_cross_lib( make )) ext[count++] = "cross.a"; for (i = 0; i < count; i++) { @@ -3125,10 +3104,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && !(source->file->flags & FLAG_C_UNIX) && - (make->is_cross || - ((source->file->flags & FLAG_C_IMPLIB) && - (needs_cross_lib( make ) || needs_delay_lib( make ))) || - (make->staticlib && needs_cross_lib( make )))); + (make->is_cross || (make->module && make->staticlib) || + (source->file->flags & FLAG_C_IMPLIB))); int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || @@ -3449,14 +3426,12 @@ static void output_module( struct makefile *make ) strmake( "lib%s.a", make->importlib ), strmake( "d$(dlldir)/lib%s.a", make->importlib )); } - if (crosstarget && (needs_cross_lib( make ) || needs_delay_lib( make ))) + if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); - if (needs_cross_lib( make )) - { - strarray_add( &make->clean_files, strmake( "lib%s.cross.a", make->importlib )); - output_filename( strmake( "%s.cross.a", importlib_path )); - } + + strarray_add( &make->clean_files, strmake( "lib%s.cross.a", make->importlib )); + output_filename( strmake( "%s.cross.a", importlib_path )); if (needs_delay_lib( make )) { strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); @@ -3472,6 +3447,9 @@ static void output_module( struct makefile *make ) output_filename( spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.cross.a", make->importlib ), + strmake( "d%s/lib%s.a", pe_dir, make->importlib )); } if (needs_implib_symlink( make )) strarray_addall( &top_makefile->clean_files, output_importlib_symlinks( make )); @@ -3502,7 +3480,7 @@ static void output_static_lib( struct makefile *make ) output( " && %s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); - if (needs_cross_lib( make )) + if (crosstarget && make->module) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -3514,6 +3492,8 @@ static void output_static_lib( struct makefile *make ) tools_path( make, "winebuild" ), crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n" ); + add_install_rule( make, make->staticlib, name, + strmake( "d%s/%s", pe_dir, make->staticlib )); } } @@ -4301,16 +4281,6 @@ static void load_sources( struct makefile *make ) make->is_cross = crosstarget && make->use_msvcrt; - if (make->is_cross) - { - strarray_addall_uniq( &cross_import_libs, make->imports ); - strarray_addall_uniq( &cross_import_libs, make->extra_imports ); - if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); - strarray_add_uniq( &cross_import_libs, "winecrt0" ); - strarray_add_uniq( &cross_import_libs, "kernel32" ); - strarray_add_uniq( &cross_import_libs, "ntdll" ); - } - if (!*dll_ext || make->is_cross) for (i = 0; i < make->delayimports.count; i++) strarray_add_uniq( &delay_import_libs, get_base_name( make->delayimports.str[i] ));

1 0