January 2021 - Wine-Commits

Hans Leidekker : wbemprox: Handle escaped backslashes in LIKE queries.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: d4032d69f6fe4290217cb21a05dc33b9add868b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4032d69f6fe4290217cb21a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:41 2021 +0100 wbemprox: Handle escaped backslashes in LIKE queries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 1 + dlls/wbemprox/tests/query.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 3d60825f24e..ec2a43c3f5f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -93,6 +93,7 @@ static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) while (*p && *q) { + if (q[0] == '\\' && q[1] == '\\') q++; if (*q == '%') { while (*q == '%') q++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 572920c7702..5d7559afe56 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1171,6 +1171,16 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) IEnumWbemClassObject_Release( result ); SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\\\%\"" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\%\"" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + todo_wine ok( hr == WBEM_E_INVALID_QUERY, "got %08x\n", hr ); + SysFreeString( query ); SysFreeString( wql ); }

1 0

Henri Verbeet : wined3d: End the current render pass in wined3d_buffer_vk_barrier().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: c75bbc5c22b4b884a1fef2ffea1ca5cddc4d590a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c75bbc5c22b4b884a1fef2ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:50 2021 +0100 wined3d: End the current render pass in wined3d_buffer_vk_barrier(). As we do for image barriers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ad5a7680457..4ab26c05040 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1575,6 +1575,8 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, TRACE(" %s -> %s.\n", wined3d_debug_bind_flags(buffer_vk->bind_mask), wined3d_debug_bind_flags(bind_mask)); + wined3d_context_vk_end_current_render_pass(context_vk); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(buffer_vk->bind_mask);

1 0

Byeongsik Jeon : gdi32: Preserve the GGO_UNHINTED bits until used.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: f0267395645eb8fc3b8409d7ae3b43e41929469a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0267395645eb8fc3b8409d7… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Jan 11 13:18:42 2021 +0900 gdi32: Preserve the GGO_UNHINTED bits until used. Fix a regression caused by 044315c0b3890676d9fd751d8191b0b7381e0b97. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 +-- dlls/gdi32/freetype.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index afd41aeec31..74ca4825de4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2955,6 +2955,7 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, /* Windows bitmap font, e.g. Small Fonts, uses ANSI character code as glyph index. "Treasure Adventure Game" depends on this. */ font_funcs->get_glyph_index( font, &index, FALSE ); + format &= ~GGO_GLYPH_INDEX; /* TODO: Window also turns off tategaki for glyphs passed in by index if their unicode code points fall outside of the range that is rotated. */ @@ -2970,8 +2971,6 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, } } - format &= ~(GGO_GLYPH_INDEX | GGO_UNHINTED); - if (mat && !memcmp( mat, &identity, sizeof(*mat) )) mat = NULL; if (format == GGO_METRICS && !mat && get_gdi_font_glyph_metrics( font, index, &gm, &abc )) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fffa3288503..b3fc565afe8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3515,6 +3515,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph font->matrix.eM11, font->matrix.eM12, font->matrix.eM21, font->matrix.eM22); + format &= ~GGO_UNHINTED; + needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face));

1 0

Dmitry Timoshkov : msi: Also set "MsiRunningElevated" installer property.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: dac655abce0397b3c1accec64039b8cd75beb561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac655abce0397b3c1accec6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 22 16:36:11 2020 +0300 msi: Also set "MsiRunningElevated" installer property. This property is supposed to be set starting from Windows Installer 4.0 targeting Windows Vista. This patch fixes the installer that checks this property in addition to VersionNT and ALLUSERS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2483d99e2b5..25e22f040a4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -737,6 +737,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ msi_set_property( package->db, L"AdminUser", L"1", -1 ); msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -963,6 +964,8 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, L"ALLUSERS", L"1", -1 ); } msi_set_property( package->db, L"AdminUser", L"1", -1 ); + msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db )

1 0

Henri Verbeet : wined3d: Properly convert Vulkan sample count format information.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: e796da7a5eda98f455fb02c7a1ca1e188c01faa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e796da7a5eda98f455fb02c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:49 2021 +0100 wined3d: Properly convert Vulkan sample count format information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4ec6e4db42d..e7e04e81557 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4133,6 +4133,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, unsigned int flags; const char *fixup; unsigned int i; + uint32_t mask; VkResult vr; for (i = 0; i < ARRAY_SIZE(vulkan_formats); ++i) @@ -4208,7 +4209,13 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, ERR("Failed to get image format properties, vr %s.\n", wined3d_debug_vkresult(vr)); return; } - format->f.multisample_types = image_properties.sampleCounts; + + mask = image_properties.sampleCounts & 0x3f; + while (mask) + { + i = (1u << wined3d_bit_scan(&mask)) - 1; + format->f.multisample_types |= 1u << i; + } } }

1 0

Henri Verbeet : wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: a3f829bbb8894410c7e2e5f909ef37415c33deac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f829bbb8894410c7e2e5f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:51 2021 +0100 wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer. Analogous to the GL backend. The alternative would be to potentially invalidate STATE_FRAMEBUFFER when changing the depth/stencil state object, which doesn't seem worth it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 04d24ba163a..b8414155dc0 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2174,7 +2174,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } - if (wined3d_state_uses_depth_buffer(state) && (view = state->fb.depth_stencil)) + if ((view = state->fb.depth_stencil)) { rtv_vk = wined3d_rendertarget_view_vk(view); vk_views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); @@ -2191,7 +2191,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, - ARRAY_SIZE(state->fb.render_targets), wined3d_state_uses_depth_buffer(state), 0))) + ARRAY_SIZE(state->fb.render_targets), !!state->fb.depth_stencil, 0))) { ERR("Failed to get render pass.\n"); return false;

1 0

Hans Leidekker : wbemprox/tests: Add tests for Win32_NetworkAdapter/Configuration.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: e8aa254f3425a140a955f9d250987c88042bb747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8aa254f3425a140a955f9d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:40 2021 +0100 wbemprox/tests: Add tests for Win32_NetworkAdapter/Configuration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5a59f0a8f8f..572920c7702 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -248,6 +248,9 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro case VT_R4: trace( "%s: %f\n", wine_dbgstr_w(prop), V_R4(&val) ); break; + case VT_BOOL: + trace( "%s: %d\n", wine_dbgstr_w(prop), V_BOOL(&val) ); + break; default: break; } @@ -1162,6 +1165,34 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + +static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapterConfiguration" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); + check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + check_property( obj, L"IPEnabled", VT_BOOL, CIM_BOOLEAN ); IWbemClassObject_Release( obj ); } @@ -1901,6 +1932,7 @@ START_TEST(query) test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_NetworkAdapter( services ); + test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services );

1 0

Nikolay Sivov : make_unicode: Remove unused variable.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: ea1afd6597a0868d2696864f94e9e664eb349a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1afd6597a0868d2696864f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 14:34:02 2021 +0300 make_unicode: Remove unused variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index da4c732bc3e..5d180310b48 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1235,7 +1235,6 @@ sub dump_linebreak($) { my $filename = shift; my @break_table; - my $next_group = 0; my $INPUT = open_data_file( $UNIDATA, "LineBreak.txt" ); while (<$INPUT>)

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.GUID.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: ebff7de0c986f68b9c065e513c7a6bd125f3f616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebff7de0c986f68b9c065e51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:39 2021 +0100 wbemprox: Implement Win32_NetworkAdapter.GUID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 27 ++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 27 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 39166a21171..d33cf1d03cc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -197,6 +197,7 @@ static const struct column col_networkadapter[] = { L"AdapterTypeID", CIM_UINT16 }, { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"GUID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Index", CIM_UINT32 }, { L"InterfaceIndex", CIM_UINT32 }, { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -603,6 +604,7 @@ struct record_networkadapter UINT16 adaptertypeid; const WCHAR *description; const WCHAR *device_id; + const WCHAR *guid; UINT32 index; UINT32 interface_index; const WCHAR *mac_address; @@ -2651,6 +2653,24 @@ static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) } } +#define GUID_SIZE 39 +static WCHAR *guid_to_str( const GUID *ptr ) +{ + WCHAR *ret; + if (!(ret = heap_alloc( GUID_SIZE * sizeof(WCHAR) ))) return NULL; + swprintf( ret, GUID_SIZE, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + ptr->Data1, ptr->Data2, ptr->Data3, ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], + ptr->Data4[3], ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); + return ret; +} + +static WCHAR *get_networkadapter_guid( const IF_LUID *luid ) +{ + GUID guid; + if (ConvertInterfaceLuidToGuid( luid, &guid )) return NULL; + return guid_to_str( &guid ); +} + static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) { WCHAR device_id[11]; @@ -2689,6 +2709,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->adaptertypeid = adaptertypeid; rec->description = heap_strdupW( aa->Description ); rec->device_id = heap_strdupW( device_id ); + rec->guid = get_networkadapter_guid( &aa->Luid ); rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); @@ -2877,13 +2898,9 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) static WCHAR *get_settingid( UINT32 index ) { GUID guid; - WCHAR *ret, *str; memset( &guid, 0, sizeof(guid) ); guid.Data1 = index; - UuidToStringW( &guid, &str ); - ret = heap_strdupW( str ); - RpcStringFreeW( &str ); - return ret; + return guid_to_str( &guid ); } static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 67c0b218ce1..5a59f0a8f8f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,6 +1144,32 @@ static void test_SystemSecurity( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_NetworkAdapter( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_OperatingSystem( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); @@ -1874,6 +1900,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_NetworkAdapter( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services );

1 0

Alexandre Julliard : ntdll: Always inline NtCurrentTeb() on ARM.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: fc7c3b51ac27b0b4f19c871d0d5e298b5cf535ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7c3b51ac27b0b4f19c871d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 10:37:54 2021 +0100 ntdll: Always inline NtCurrentTeb() on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 8 -------- dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/signal_arm.c | 41 ++++++++--------------------------------- dlls/ntdll/unixlib.h | 4 +++- include/winnt.h | 2 +- tools/winebuild/import.c | 6 ++---- 7 files changed, 17 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f3ec8fd9e39..9f7bfae76d3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -189,7 +189,7 @@ @ stub NtCreateToken @ stdcall -syscall NtCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) # @ stub NtCreateWaitablePort -@ stdcall -arch=win32,arm64 NtCurrentTeb() +@ stdcall -arch=i386,arm64 NtCurrentTeb() @ stdcall -syscall NtDebugActiveProcess(long long) # @ stub NtDebugContinue @ stdcall -syscall NtDelayExecution(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0461183460d..b1544ba15fe 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -304,12 +304,4 @@ __ASM_STDCALL_FUNC( DbgBreakPoint, 0, "bkpt #0; bx lr; nop; nop; nop; nop" ); */ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "bkpt #0; bx lr; nop; nop; nop; nop" ); -/********************************************************************** - * NtCurrentTeb (NTDLL.@) - */ -TEB * WINAPI NtCurrentTeb(void) -{ - return unix_funcs->NtCurrentTeb(); -} - #endif /* __arm__ */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 31cfb43d11f..43c769f2d2a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1508,7 +1508,9 @@ static double CDECL ntdll_tan( double d ) { return tan( d ); } */ static struct unix_funcs unix_funcs = { +#ifdef __aarch64__ NtCurrentTeb, +#endif DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 231f23e354a..385e4807990 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -68,8 +68,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); -static pthread_key_t teb_key; - /*********************************************************************** * signal context platform-specific definitions @@ -584,23 +582,21 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) * call_user_apc_dispatcher */ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, - "mov r4, r0\n\t" /* context_ptr */ "mov r5, r1\n\t" /* ctx */ "mov r6, r2\n\t" /* arg1 */ "mov r7, r3\n\t" /* arg2 */ "ldr r8, [sp]\n\t" /* func */ "ldr r9, [sp, #4]\n\t" /* dispatcher */ - "bl " __ASM_NAME("NtCurrentTeb") "\n\t" - "add r10, r0, #0x1d8\n\t" /* arm_thread_data()->syscall_frame */ - "movs r0, r4\n\t" + "mrc p15, 0, r10, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "cmp r0, #0\n\t" /* context_ptr */ "beq 1f\n\t" "ldr r0, [r0, #0x38]\n\t" /* context_ptr->Sp */ "sub r0, r0, #0x1c8\n\t" /* sizeof(CONTEXT) + offsetof(frame,r4) */ "mov ip, #0\n\t" - "str ip, [r10]\n\t" + "str ip, [r10, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "mov sp, r0\n\t" "b 2f\n" - "1:\tldr r0, [r10]\n\t" + "1:\tldr r0, [r10, #0x1d8]\n\t" "sub r0, #0x1a0\n\t" "mov sp, r0\n\t" "mov r0, #3\n\t" @@ -613,7 +609,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "str r0, [sp, #4]\n\t" /* context.R0 = STATUS_USER_APC */ "mov r0, sp\n\t" "mov ip, #0\n\t" - "str ip, [r10]\n\t" + "str ip, [r10, #0x1d8]\n\t" "2:\tmov r1, r5\n\t" /* ctx */ "mov r2, r6\n\t" /* arg1 */ "mov r3, r7\n\t" /* arg2 */ @@ -634,17 +630,10 @@ __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, * call_user_exception_dispatcher */ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "mov r4, r0\n\t" - "mov r5, r1\n\t" - "mov r6, r2\n\t" - "bl " __ASM_NAME("NtCurrentTeb") "\n\t" - "add r7, r0, #0x1d8\n\t" /* arm_thread_data()->syscall_frame */ - "mov r0, r4\n\t" - "mov r1, r5\n\t" - "mov r2, r6\n\t" - "ldr r3, [r7]\n\t" + "mrc p15, 0, r7, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "ldr r3, [r7, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "mov ip, #0\n\t" - "str ip, [r7]\n\t" + "str ip, [r7, #0x1d8]\n\t" "add r3, r3, #8\n\t" "ldm r3, {r5-r11}\n\t" "ldr r4, [r3, #32]\n\t" @@ -911,7 +900,6 @@ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_E */ void signal_init_threading(void) { - pthread_key_create( &teb_key, NULL ); } @@ -937,11 +925,7 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { -#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) - /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); -#endif - pthread_setspecific( teb_key, teb ); } @@ -1057,13 +1041,4 @@ void signal_exit_thread( int status, void (*func)(int) ) call_thread_exit_func( status, func, NtCurrentTeb() ); } - -/********************************************************************** - * NtCurrentTeb (NTDLL.@) - */ -TEB * WINAPI NtCurrentTeb(void) -{ - return pthread_getspecific( teb_key ); -} - #endif /* __arm__ */ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 7ed3148e4c4..0847c7e07ca 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,12 +27,14 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 106 +#define NTDLL_UNIXLIB_VERSION 107 struct unix_funcs { /* Nt* functions */ +#ifdef __aarch64__ TEB * (WINAPI *NtCurrentTeb)(void); +#endif /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); diff --git a/include/winnt.h b/include/winnt.h index 83f03b62ade..fba721f7f02 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2801,7 +2801,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } -#elif defined(__arm__) && defined(__MINGW32__) +#elif defined(__arm__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f0730aa2fe7..2ff63c2265d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1577,10 +1577,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcmp r4, r5\n" ); output( "\tbcs 5f\n" ); output( "\tsub sp, sp, #8\n" ); - output( "\tpush {r0-r3}\n" ); - output( "\tbl %s\n", asm_name("NtCurrentTeb") ); - output( "\tadd r7, r0, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ - output( "\tpop {r0-r3}\n" ); + output( "\tmrc p15, 0, r7, c13, c0, 2\n" ); /* NtCurrentTeb() */ + output( "\tadd r7, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ output( "\tmrs ip, CPSR\n" ); output( "\tstr ip, [sp, #4]\n" ); output( "\tstr sp, [r7]\n" ); /* syscall frame */

1 0