July 2021 - Wine-Commits - list.winehq.org

Huw Davies : include: Add IN6_IS_ADDR_LINKLOCAL() and IN6_IS_ADDR_SITELOCAL().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: c3c20fdc0b2d937edbd958dfd939a571dc27167e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c20fdc0b2d937edbd958df… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:50:20 2021 +0100 include: Add IN6_IS_ADDR_LINKLOCAL() and IN6_IS_ADDR_SITELOCAL(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index fc465804962..2f9d4f663ad 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -323,6 +323,16 @@ static inline BOOLEAN WS(IN6_IS_ADDR_UNSPECIFIED) ( const IN6_ADDR *a ) (a->s6_words[7] == 0)); } +static inline BOOLEAN WS(IN6_IS_ADDR_LINKLOCAL) ( const IN6_ADDR *a ) +{ + return ((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0x80)); +} + +static inline BOOLEAN WS(IN6_IS_ADDR_SITELOCAL) ( const IN6_ADDR *a ) +{ + return ((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0xc0)); +} + #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : mfmediaengine: Handle Play() when called before topology is set.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: bf824dbb921eded8bbc37eeb8ec76a1d2933f2b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf824dbb921eded8bbc37eeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 22 17:46:11 2021 +0300 mfmediaengine: Handle Play() when called before topology is set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index bd3fd04aabd..a555d0dad99 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -84,6 +84,8 @@ enum media_engine_flags FLAGS_ENGINE_FIRST_FRAME = 0x2000, FLAGS_ENGINE_IS_ENDED = 0x4000, FLAGS_ENGINE_NEW_FRAME = 0x8000, + FLAGS_ENGINE_SOURCE_PENDING = 0x10000, + FLAGS_ENGINE_PLAY_PENDING = 0x20000, }; struct vec3 @@ -1181,9 +1183,18 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return hr; } +static void media_engine_start_playback(struct media_engine *engine) +{ + PROPVARIANT var; + + var.vt = VT_EMPTY; + IMFMediaSession_Start(engine->session, &GUID_NULL, &var); +} + static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_engine *engine = impl_from_load_handler_IMFAsyncCallback(iface); + unsigned int start_playback; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; IUnknown *object = NULL; @@ -1194,6 +1205,9 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, engine->network_state = MF_MEDIA_ENGINE_NETWORK_LOADING; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADSTART, 0, 0); + start_playback = engine->flags & FLAGS_ENGINE_PLAY_PENDING; + media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING | FLAGS_ENGINE_PLAY_PENDING, FALSE); + if (FAILED(hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object))) WARN("Failed to create source object, hr %#x.\n", hr); @@ -1210,6 +1224,8 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, if (SUCCEEDED(hr)) { engine->network_state = MF_MEDIA_ENGINE_NETWORK_IDLE; + if (start_playback) + media_engine_start_playback(engine); } else { @@ -1387,6 +1403,9 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) &IID_IPropertyStore, (void **)&props); hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, &engine->load_handler, NULL); + if (SUCCEEDED(hr)) + media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING, TRUE); + if (props) IPropertyStore_Release(props); } @@ -1723,7 +1742,6 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) { struct media_engine *engine = impl_from_IMFMediaEngine(iface); - PROPVARIANT var; TRACE("%p.\n", iface); @@ -1736,8 +1754,10 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); - var.vt = VT_EMPTY; - IMFMediaSession_Start(engine->session, &GUID_NULL, &var); + if (!(engine->flags & FLAGS_ENGINE_SOURCE_PENDING)) + media_engine_start_playback(engine); + else + media_engine_set_flag(engine, FLAGS_ENGINE_PLAY_PENDING, TRUE); media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); }

1 0

Huw Davies : iphlpapi: Retrieve the IPv4 addresses using an export rather than a helper.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 8d9d7fc5d2b858182ab76f29ece658616004b7c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d9d7fc5d2b858182ab76f29… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:50:19 2021 +0100 iphlpapi: Retrieve the IPv4 addresses using an export rather than a helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6e1d95ab321..b2d597fd9ab 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -76,6 +76,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); +DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); static const NPI_MODULEID *ip_module_id( USHORT family ) { @@ -350,7 +351,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c if (!(pairs = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; ptr = (SOCKADDR_IN6 *)&pairs[dst_count]; - if ((ret = getIPAddrTable( &table, GetProcessHeap(), 0 ))) + if ((ret = AllocateAndGetIpAddrTableFromStack( &table, FALSE, GetProcessHeap(), 0 ))) { HeapFree( GetProcessHeap(), 0, pairs ); return ret;

1 0

Huw Davies : iphlpapi: Implement AllocateAndGetIpAddrTableFromStack() on top of GetIpAddrTable().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 24ca70a60cbe61ea70e7710ae7724f0ab7b4105b URL: https://source.winehq.org/git/wine.git/?a=commit;h=24ca70a60cbe61ea70e7710a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:50:18 2021 +0100 iphlpapi: Implement AllocateAndGetIpAddrTableFromStack() on top of GetIpAddrTable(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 76 +++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8442bc2b4a9..6e1d95ab321 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -139,48 +139,6 @@ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask IpMask, DWORD IfIndex, PULONG N return ERROR_NOT_SUPPORTED; } -static int IpAddrTableNumericSorter(const void *a, const void *b) -{ - int ret = 0; - - if (a && b) - ret = ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; - return ret; -} - -/****************************************************************** - * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) - * - * Get interface-to-IP address mapping table. - * Like GetIpAddrTable(), but allocate the returned table from heap. - * - * PARAMS - * ppIpAddrTable [Out] pointer into which the MIB_IPADDRTABLE is - * allocated and returned. - * bOrder [In] whether to sort the table - * heap [In] heap from which the table is allocated - * flags [In] flags to HeapAlloc - * - * RETURNS - * ERROR_INVALID_PARAMETER if ppIpAddrTable is NULL, other error codes on - * failure, NO_ERROR on success. - */ -DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, - BOOL bOrder, HANDLE heap, DWORD flags) -{ - DWORD ret; - - TRACE("ppIpAddrTable %p, bOrder %d, heap %p, flags 0x%08x\n", - ppIpAddrTable, bOrder, heap, flags); - ret = getIPAddrTable(ppIpAddrTable, heap, flags); - if (!ret && bOrder) - qsort((*ppIpAddrTable)->table, (*ppIpAddrTable)->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); - TRACE("returning %d\n", ret); - return ret; -} - - /****************************************************************** * CancelIPChangeNotify (IPHLPAPI.@) * @@ -2189,6 +2147,40 @@ err: } +/****************************************************************** + * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) + * + * Get interface-to-IP address mapping table. + * Like GetIpAddrTable(), but allocate the returned table from heap. + * + * PARAMS + * table [Out] pointer into which the MIB_IPADDRTABLE is + * allocated and returned. + * sort [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * + */ +DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ) +{ + DWORD err, size = FIELD_OFFSET(MIB_IPADDRTABLE, table[2]), attempt; + + TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags ); + + for (attempt = 0; attempt < 5; attempt++) + { + *table = HeapAlloc( heap, flags, size ); + if (!*table) return ERROR_NOT_ENOUGH_MEMORY; + + err = GetIpAddrTable( *table, &size, sort ); + if (!err) break; + HeapFree( heap, flags, *table ); + if (err != ERROR_INSUFFICIENT_BUFFER) break; + } + + return err; +} + /****************************************************************** * GetIpForwardTable (IPHLPAPI.@) *

1 0

Ziqing Hui : include: Add D2D1Composite definitions.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 3ef3166b5c0939a84086fcd5aef83f0b20427d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ef3166b5c0939a84086fcd5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 22 08:44:22 2021 +0800 include: Add D2D1Composite definitions. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effects.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 5dde46cbb6a..4154276345b 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -18,6 +18,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") typedef enum D2D1_BORDER_MODE { @@ -68,3 +69,9 @@ typedef enum D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 0x4, D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff } D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE; + +typedef enum D2D1_COMPOSITE_PROP +{ + D2D1_COMPOSITE_PROP_MODE = 0x0, + D2D1_COMPOSITE_PROP_FORCE_DWORD = 0xffffffff +} D2D1_COMPOSITE_PROP;

1 0

Huw Davies : iphlpapi: Implement GetIpAddrTable() on top of nsi.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: beb844448731a2413e3700877c237dc9f5968870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb844448731a2413e370087… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:50:17 2021 +0100 iphlpapi: Implement GetIpAddrTable() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 103 ++++++++++++++++++++--------------------- dlls/iphlpapi/tests/iphlpapi.c | 2 + 2 files changed, 51 insertions(+), 54 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 93d9b0440dd..8442bc2b4a9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -148,19 +148,6 @@ static int IpAddrTableNumericSorter(const void *a, const void *b) return ret; } -static int IpAddrTableLoopbackSorter(const void *a, const void *b) -{ - const MIB_IPADDRROW *left = a, *right = b; - int ret = 0; - - if (isIfIndexLoopback(left->dwIndex)) - ret = 1; - else if (isIfIndexLoopback(right->dwIndex)) - ret = -1; - - return ret; -} - /****************************************************************** * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) * @@ -2131,6 +2118,10 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) return ERROR_SUCCESS; } +static int ipaddrrow_cmp( const void *a, const void *b ) +{ + return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; +} /****************************************************************** * GetIpAddrTable (IPHLPAPI.@) @@ -2138,59 +2129,63 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) * Get interface-to-IP address mapping table. * * PARAMS - * pIpAddrTable [Out] buffer for mapping table - * pdwSize [In/Out] length of output buffer - * bOrder [In] whether to sort the table + * table [Out] buffer for mapping table + * size [In/Out] length of output buffer + * sort [In] whether to sort the table * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h * - * NOTES - * If pdwSize is less than required, the function will return - * ERROR_INSUFFICIENT_BUFFER, and *pdwSize will be set to the required byte - * size. - * If bOrder is true, the returned table will be sorted by the next hop and - * an assortment of arbitrary parameters. */ -DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL bOrder) +DWORD WINAPI GetIpAddrTable( MIB_IPADDRTABLE *table, ULONG *size, BOOL sort ) { - DWORD ret; + DWORD err, count, needed, i, loopback, row_num = 0; + struct nsi_ipv4_unicast_key *keys; + struct nsi_ip_unicast_rw *rw; - TRACE("pIpAddrTable %p, pdwSize %p, bOrder %d\n", pIpAddrTable, pdwSize, - (DWORD)bOrder); - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - PMIB_IPADDRTABLE table; + TRACE( "table %p, size %p, sort %d\n", table, size, sort ); + if (!size) return ERROR_INVALID_PARAMETER; + + err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, (void **)&keys, sizeof(*keys), + (void **)&rw, sizeof(*rw), NULL, 0, NULL, 0, &count, 0 ); + if (err) return err; - ret = getIPAddrTable(&table, GetProcessHeap(), 0); - if (ret == NO_ERROR) + needed = FIELD_OFFSET( MIB_IPADDRTABLE, table[count] ); + + if (!table || *size < needed) { - ULONG size = FIELD_OFFSET(MIB_IPADDRTABLE, table[table->dwNumEntries]); + *size = needed; + err = ERROR_INSUFFICIENT_BUFFER; + goto err; + } - if (!pIpAddrTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - *pdwSize = size; - memcpy(pIpAddrTable, table, size); - /* sort by numeric IP value */ - if (bOrder) - qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter); - /* sort ensuring loopback interfaces are in the end */ - else - qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries, - sizeof(MIB_IPADDRROW), IpAddrTableLoopbackSorter); - ret = NO_ERROR; - } - HeapFree(GetProcessHeap(), 0, table); + table->dwNumEntries = count; + + for (loopback = 0; loopback < 2; loopback++) /* Move the loopback addresses to the end */ + { + for (i = 0; i < count; i++) + { + MIB_IPADDRROW *row = table->table + row_num; + + if (!!loopback != (keys[i].luid.Info.IfType == MIB_IF_TYPE_LOOPBACK)) continue; + + row->dwAddr = keys[i].addr.WS_s_addr; + ConvertInterfaceLuidToIndex( &keys[i].luid, &row->dwIndex ); + ConvertLengthToIpv4Mask( rw[i].on_link_prefix, &row->dwMask ); + row->dwBCastAddr = 1; + row->dwReasmSize = 0xffff; + row->unused1 = 0; + row->wType = MIB_IPADDR_PRIMARY; + row_num++; + } } - } - TRACE("returning %d\n", ret); - return ret; + + if (sort) qsort( table->table, count, sizeof(MIB_IPADDRROW), ipaddrrow_cmp ); +err: + NsiFreeTable( keys, rw, NULL, NULL ); + + return err; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1deac9b64f1..51566034f51 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -203,6 +203,8 @@ static void testGetIpAddrTable(void) for (i = 0; i < buf->dwNumEntries; i++) { ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); + ok (buf->table[i].dwBCastAddr == 1, "Test[%d]: got %08x\n", i, buf->table[i].dwBCastAddr); + ok (buf->table[i].dwReasmSize == 0xffff, "Test[%d]: got %08x\n", i, buf->table[i].dwReasmSize); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); }

1 0

Alexandre Julliard : wow64: Add thunks for a few simple syscalls.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: e8984787ac2bbfdaaeca9483352c6d5525d84a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8984787ac2bbfdaaeca9483… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 18:05:19 2021 +0200 wow64: Add thunks for a few simple syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 110 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wow64/syscall.h | 35 +++++++++++++++ dlls/wow64/wow64_private.h | 10 +++++ 3 files changed, 153 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 12e13b17574..10abe7a8b38 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -39,12 +39,16 @@ typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); static const syscall_thunk syscall_thunks[] = { - NULL +#define SYSCALL_ENTRY(func) wow64_ ## func, + ALL_SYSCALLS +#undef SYSCALL_ENTRY }; static const char *syscall_names[] = { - "" +#define SYSCALL_ENTRY(func) #func, + ALL_SYSCALLS +#undef SYSCALL_ENTRY }; static unsigned short syscall_map[1024]; @@ -74,6 +78,108 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun } +/********************************************************************** + * wow64_NtAllocateLocallyUniqueId + */ +NTSTATUS WINAPI wow64_NtAllocateLocallyUniqueId( UINT *args ) +{ + LUID *luid = get_ptr( &args ); + + return NtAllocateLocallyUniqueId( luid ); +} + + +/********************************************************************** + * wow64_NtAllocateUuids + */ +NTSTATUS WINAPI wow64_NtAllocateUuids( UINT *args ) +{ + ULARGE_INTEGER *time = get_ptr( &args ); + ULONG *delta = get_ptr( &args ); + ULONG *sequence = get_ptr( &args ); + UCHAR *seed = get_ptr( &args ); + + return NtAllocateUuids( time, delta, sequence, seed ); +} + + +/********************************************************************** + * wow64_NtClose + */ +NTSTATUS WINAPI wow64_NtClose( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + + return NtClose( handle ); +} + + +/********************************************************************** + * wow64_NtGetCurrentProcessorNumber + */ +NTSTATUS WINAPI wow64_NtGetCurrentProcessorNumber( UINT *args ) +{ + return NtGetCurrentProcessorNumber(); +} + + +/********************************************************************** + * wow64_NtQueryDefaultLocale + */ +NTSTATUS WINAPI wow64_NtQueryDefaultLocale( UINT *args ) +{ + BOOLEAN user = get_ulong( &args ); + LCID *lcid = get_ptr( &args ); + + return NtQueryDefaultLocale( user, lcid ); +} + + +/********************************************************************** + * wow64_NtQueryDefaultUILanguage + */ +NTSTATUS WINAPI wow64_NtQueryDefaultUILanguage( UINT *args ) +{ + LANGID *lang = get_ptr( &args ); + + return NtQueryDefaultUILanguage( lang ); +} + + +/********************************************************************** + * wow64_NtQueryInstallUILanguage + */ +NTSTATUS WINAPI wow64_NtQueryInstallUILanguage( UINT *args ) +{ + LANGID *lang = get_ptr( &args ); + + return NtQueryInstallUILanguage( lang ); +} + + +/********************************************************************** + * wow64_NtSetDefaultLocale + */ +NTSTATUS WINAPI wow64_NtSetDefaultLocale( UINT *args ) +{ + BOOLEAN user = get_ulong( &args ); + LCID lcid = get_ulong( &args ); + + return NtSetDefaultLocale( user, lcid ); +} + + +/********************************************************************** + * wow64_NtSetDefaultUILanguage + */ +NTSTATUS WINAPI wow64_NtSetDefaultUILanguage( UINT *args ) +{ + LANGID lang = get_ulong( &args ); + + return NtSetDefaultUILanguage( lang ); +} + + /********************************************************************** * get_syscall_num */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h new file mode 100644 index 00000000000..33e1670a391 --- /dev/null +++ b/dlls/wow64/syscall.h @@ -0,0 +1,35 @@ +/* + * WoW64 syscall definitions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WOW64_SYSCALL_H +#define __WOW64_SYSCALL_H + +#define ALL_SYSCALLS \ + SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ + SYSCALL_ENTRY( NtAllocateUuids ) \ + SYSCALL_ENTRY( NtClose ) \ + SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ + SYSCALL_ENTRY( NtQueryDefaultLocale ) \ + SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ + SYSCALL_ENTRY( NtSetDefaultLocale ) \ + SYSCALL_ENTRY( NtSetDefaultUILanguage ) + +#endif /* __WOW64_SYSCALL_H */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 2c8f6f313fc..c441f1bf481 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -21,6 +21,12 @@ #ifndef __WOW64_PRIVATE_H #define __WOW64_PRIVATE_H +#include "syscall.h" + +#define SYSCALL_ENTRY(func) extern NTSTATUS WINAPI wow64_ ## func( UINT *args ) DECLSPEC_HIDDEN; +ALL_SYSCALLS +#undef SYSCALL_ENTRY + extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; @@ -43,4 +49,8 @@ static inline const WCHAR *get_machine_wow64_dir( USHORT machine ) } } +static inline ULONG get_ulong( UINT **args ) { return *(*args)++; } +static inline HANDLE get_handle( UINT **args ) { return LongToHandle( *(*args)++ ); } +static inline void *get_ptr( UINT **args ) { return ULongToPtr( *(*args)++ ); } + #endif /* __WOW64_PRIVATE_H */

1 0

Alexandre Julliard : wow64: Load the backend cpu dll at process init.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 42dec97d1a54528af832e37e865302295d3e3e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42dec97d1a54528af832e37e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 13:33:57 2021 +0200 wow64: Load the backend cpu dll at process init. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 61 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wow64/wow64_private.h | 41 +++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index a4acb8ba646..504580e8717 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -27,10 +27,14 @@ #include "winnt.h" #include "winternl.h" #include "wine/exception.h" +#include "wow64_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wow); +USHORT native_machine = 0; +USHORT current_machine = 0; + void *dummy = RtlUnwind; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) @@ -54,6 +58,55 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun } +/********************************************************************** + * load_cpu_dll + */ +static HMODULE load_cpu_dll(void) +{ + NTSTATUS status; + HMODULE module; + UNICODE_STRING str; + WCHAR path[MAX_PATH]; + const WCHAR *dir, *name; + + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + name = (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); + break; + case IMAGE_FILE_MACHINE_ARM: + name = L"wowarmhw.dll"; + break; + default: + ERR( "unsupported machine %04x\n", current_machine ); + RtlExitUserProcess( 1 ); + } + + dir = get_machine_wow64_dir( IMAGE_FILE_MACHINE_TARGET_HOST ); + + swprintf( path, MAX_PATH, L"%s\\%s", dir, name ); + RtlInitUnicodeString( &str, path ); + if ((status = LdrLoadDll( NULL, 0, &str, &module ))) + { + ERR( "failed to load CPU dll %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + return module; +} + + +/********************************************************************** + * process_init + */ +static void process_init(void) +{ + RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); + if (!current_machine) current_machine = native_machine; + + load_cpu_dll(); +} + + /********************************************************************** * Wow64SystemServiceEx (NTDLL.@) */ @@ -69,5 +122,11 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) */ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) { - FIXME( "stub\n" ); + static BOOL init_done; + + if (!init_done) + { + init_done = TRUE; + process_init(); + } } diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h new file mode 100644 index 00000000000..52cc40566b1 --- /dev/null +++ b/dlls/wow64/wow64_private.h @@ -0,0 +1,41 @@ +/* + * WoW64 private definitions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WOW64_PRIVATE_H +#define __WOW64_PRIVATE_H + +extern USHORT native_machine DECLSPEC_HIDDEN; +extern USHORT current_machine DECLSPEC_HIDDEN; + +/* cf. GetSystemWow64Directory2 */ +static inline const WCHAR *get_machine_wow64_dir( USHORT machine ) +{ + switch (machine) + { + case IMAGE_FILE_MACHINE_TARGET_HOST: return L"\\??\\C:\\windows\\system32"; + case IMAGE_FILE_MACHINE_I386: return L"\\??\\C:\\windows\\syswow64"; + case IMAGE_FILE_MACHINE_ARMNT: return L"\\??\\C:\\windows\\sysarm32"; + case IMAGE_FILE_MACHINE_AMD64: return L"\\??\\C:\\windows\\sysx8664"; + case IMAGE_FILE_MACHINE_ARM64: return L"\\??\\C:\\windows\\sysarm64"; + default: return NULL; + } +} + +#endif /* __WOW64_PRIVATE_H */

1 0

Alexandre Julliard : wow64: Add stubs for Wow64LdrpInitialize() and Wow64SystemServiceEx().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: c51682618430027758c037dc27292c5e0436ca0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c51682618430027758c037dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 15:03:24 2021 +0200 wow64: Add stubs for Wow64LdrpInitialize() and Wow64SystemServiceEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 6 +++++ dlls/wow64/syscall.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/wow64.spec | 4 +-- 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index 9d0618f8e3e..8dc4dac5ba7 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -1,2 +1,8 @@ MODULE = wow64.dll IMPORTLIB = wow64 +IMPORTS = ntdll winecrt0 + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f000000 + +C_SRCS = \ + syscall.c diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c new file mode 100644 index 00000000000..a4acb8ba646 --- /dev/null +++ b/dlls/wow64/syscall.c @@ -0,0 +1,73 @@ +/* + * WoW64 syscall wrapping + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wine/exception.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wow); + +void *dummy = RtlUnwind; + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + return TRUE; +} + +void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) +{ + EXCEPTION_RECORD record; + + record.ExceptionCode = EXCEPTION_WINE_STUB; + record.ExceptionFlags = EH_NONCONTINUABLE; + record.ExceptionRecord = NULL; + record.ExceptionAddress = __wine_spec_unimplemented_stub; + record.NumberParameters = 2; + record.ExceptionInformation[0] = (ULONG_PTR)module; + record.ExceptionInformation[1] = (ULONG_PTR)function; + for (;;) RtlRaiseException( &record ); +} + + +/********************************************************************** + * Wow64SystemServiceEx (NTDLL.@) + */ +NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) +{ + FIXME( "stub\n" ); + return STATUS_INVALID_SYSTEM_SERVICE; +} + + +/********************************************************************** + * Wow64LdrpInitialize (NTDLL.@) + */ +void WINAPI Wow64LdrpInitialize( CONTEXT *context ) +{ + FIXME( "stub\n" ); +} diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index f9230ced19a..a477b6b628a 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -10,7 +10,7 @@ @ stub Wow64IsControlFlowGuardEnforced @ stub Wow64IsStackExtentsCheckEnforced @ stub Wow64KiUserCallbackDispatcher -@ stub Wow64LdrpInitialize +@ stdcall Wow64LdrpInitialize(ptr) @ stub Wow64LogPrint @ stub Wow64NotifyUnsimulateComplete @ stub Wow64PassExceptionToGuest @@ -22,6 +22,6 @@ @ stub Wow64ShallowThunkSIZE_T32TO64 @ stub Wow64ShallowThunkSIZE_T64TO32 @ stub Wow64SuspendLocalThread -@ stub Wow64SystemServiceEx +@ stdcall -norelay Wow64SystemServiceEx(long ptr) @ stub Wow64ValidateUserCallTarget @ stub Wow64ValidateUserCallTargetFilter

1 0

Jacek Caban : gdi32: Remove no longer used Polygon and Polyline driver entry points.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 1f5cc0e5ef4518f3cfdebc1a75adf84529350f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5cc0e5ef4518f3cfdebc1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:26:49 2021 +0200 gdi32: Remove no longer used Polygon and Polyline driver entry points. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 28 ---------------------------- dlls/gdi32/dibdrv/dibdrv.h | 2 -- dlls/gdi32/dibdrv/graphics.c | 24 ++---------------------- dlls/gdi32/driver.c | 17 ----------------- dlls/gdi32/enhmfdrv/dc.c | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/mfdrv/init.c | 2 -- dlls/gdi32/path.c | 35 ----------------------------------- dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 15 files changed, 3 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f5cc0e5ef4518f3cfde…

1 0