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

Alexandre Julliard : wow64: Add thunks for the atom syscalls.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: de9f285ee5fae8eb7046dc4385daebb3ff243032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9f285ee5fae8eb7046dc43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 18:09:12 2021 +0200 wow64: Add thunks for the atom syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 4 ++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 10abe7a8b38..5c9bc8d4f27 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -78,6 +78,19 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun } +/********************************************************************** + * wow64_NtAddAtom + */ +NTSTATUS WINAPI wow64_NtAddAtom( UINT *args ) +{ + const WCHAR *name = get_ptr( &args ); + ULONG len = get_ulong( &args ); + RTL_ATOM *atom = get_ptr( &args ); + + return NtAddAtom( name, len, atom ); +} + + /********************************************************************** * wow64_NtAllocateLocallyUniqueId */ @@ -114,6 +127,30 @@ NTSTATUS WINAPI wow64_NtClose( UINT *args ) } +/********************************************************************** + * wow64_NtDeleteAtom + */ +NTSTATUS WINAPI wow64_NtDeleteAtom( UINT *args ) +{ + RTL_ATOM atom = get_ulong( &args ); + + return NtDeleteAtom( atom ); +} + + +/********************************************************************** + * wow64_NtFindAtom + */ +NTSTATUS WINAPI wow64_NtFindAtom( UINT *args ) +{ + const WCHAR *name = get_ptr( &args ); + ULONG len = get_ulong( &args ); + RTL_ATOM *atom = get_ptr( &args ); + + return NtFindAtom( name, len, atom ); +} + + /********************************************************************** * wow64_NtGetCurrentProcessorNumber */ @@ -146,6 +183,22 @@ NTSTATUS WINAPI wow64_NtQueryDefaultUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtQueryInformationAtom + */ +NTSTATUS WINAPI wow64_NtQueryInformationAtom( UINT *args ) +{ + RTL_ATOM atom = get_ulong( &args ); + ATOM_INFORMATION_CLASS class = get_ulong( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + if (class != AtomBasicInformation) FIXME( "class %u not supported\n", class ); + return NtQueryInformationAtom( atom, class, info, len, retlen ); +} + + /********************************************************************** * wow64_NtQueryInstallUILanguage */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 33e1670a391..583af0db476 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -22,12 +22,16 @@ #define __WOW64_SYSCALL_H #define ALL_SYSCALLS \ + SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ SYSCALL_ENTRY( NtClose ) \ + SYSCALL_ENTRY( NtDeleteAtom ) \ + SYSCALL_ENTRY( NtFindAtom ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryInformationAtom ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage )

1 0

Ziqing Hui : include: Add D2D13DPerspectiveTransform definitions.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: e1ad3757dd0a2690cd358b66b13776af1d35b877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1ad3757dd0a2690cd358b66… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 22 08:44:21 2021 +0800 include: Add D2D13DPerspectiveTransform definitions. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effects.idl | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index ee1dbe94728..5dde46cbb6a 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") +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);") typedef enum D2D1_BORDER_MODE { @@ -44,3 +45,26 @@ typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff } D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE; + +typedef enum D2D1_3DPERSPECTIVETRANSFORM_PROP +{ + D2D1_3DPERSPECTIVETRANSFORM_PROP_INTERPOLATION_MODE = 0x0, + D2D1_3DPERSPECTIVETRANSFORM_PROP_BORDER_MODE = 0x1, + D2D1_3DPERSPECTIVETRANSFORM_PROP_DEPTH = 0x2, + D2D1_3DPERSPECTIVETRANSFORM_PROP_PERSPECTIVE_ORIGIN = 0x3, + D2D1_3DPERSPECTIVETRANSFORM_PROP_LOCAL_OFFSET = 0x4, + D2D1_3DPERSPECTIVETRANSFORM_PROP_GLOBAL_OFFSET = 0x5, + D2D1_3DPERSPECTIVETRANSFORM_PROP_ROTATION_ORIGIN = 0x6, + D2D1_3DPERSPECTIVETRANSFORM_PROP_ROTATION = 0x7, + D2D1_3DPERSPECTIVETRANSFORM_PROP_FORCE_DWORD = 0xffffffff +} D2D1_3DPERSPECTIVETRANSFORM_PROP; + +typedef enum D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE +{ + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE;

1 0

Ziqing Hui : include: Add D2D1Composite definitions.
by Alexandre Julliard 22 Jul '21

22 Jul '21

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 22 Jul '21

22 Jul '21

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

Huw Davies : iphlpapi: Implement AllocateAndGetIpAddrTableFromStack() on top of GetIpAddrTable().
by Alexandre Julliard 22 Jul '21

22 Jul '21

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

Paul Gofman : mshtml: Do not lock document mode in create_document_event().
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: b7ddab2e46ecb64379d617b2536862cda5e66548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ddab2e46ecb64379d617b2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 21 23:44:31 2021 +0300 mshtml: Do not lock document mode in create_document_event(). Event may be created before the document is loaded. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 17f5fb35b71..5b040c4df62 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2334,7 +2334,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), event_id); + event = alloc_event(nsevent, doc->document_mode, event_id); if(!event) return E_OUTOFMEMORY;

1 0

Paul Gofman : mshtml: Default to IE11 for Internet URL zone.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: 4eb35fb2375fa9d1ce3d35d6d3911ee6e449acfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb35fb2375fa9d1ce3d35d6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 21 23:44:32 2021 +0300 mshtml: Default to IE11 for Internet URL zone. Fixes Swords of Legends Online launcher. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index abe403ea976..4352e93eba3 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -828,15 +828,10 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, DWORD zone; HRESULT hres; - /* - * Internet URL zone is treated differently. Native defaults to latest supported - * mode. We default to IE8. Ideally, we'd sync that with version used for IE=edge - * X-UA-Compatible version, allow configuration and default to higher version - * (once it's well supported). - */ + /* Internet URL zone is treated differently and defaults to the latest supported mode. */ hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), window->url, &zone, 0); if(SUCCEEDED(hres) && zone == URLZONE_INTERNET) - mode = COMPAT_MODE_IE8; + mode = COMPAT_MODE_IE11; } set_document_mode(This, mode, FALSE);

1 0

Francois Gouget : oleaut32: Setting sThousand to a non-breaking space also matches regular spaces.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: c50dff867d797f7c43a8a319afb735fea6e8bf31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c50dff867d797f7c43a8a319… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 00:03:43 2021 +0200 oleaut32: Setting sThousand to a non-breaking space also matches regular spaces. As the test_VarParseNumFromStrMisc() tests show the converse is not true. Note also that the " 1 000" test was failing as expected because in the French locale Wine was not recognizing regular spaces as thousands separators. Now it does and Wine incorrectly allows them before the first digit, just like it does for the English tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51450 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 32 +++++++++++++------------------- dlls/oleaut32/variant.c | 10 +++++++++- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d3a1a2e3a31..50af05e47cc 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1916,7 +1916,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Trailing thousands separators are allowed as usual */ - todo_wine_if(spaces[i] == ' ') EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(3,FAILDIG); } @@ -1949,7 +1948,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Non-breaking space and regular spaces work */ - todo_wine_if(i == 0) EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -1965,34 +1963,31 @@ static void test_VarParseNumFromStrFr(void) /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1 001,0", NUMPRS_THOUSANDS); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(4,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,0); - todo_wine ok(np.cDig == 4, "Expected cDig = 4, got %d\n", np.cDig); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,0); - todo_wine EXPECTRGB(2,0); - todo_wine EXPECTRGB(3,1); + EXPECT2(1,0); + EXPECTRGB(2,0); + EXPECTRGB(3,1); EXPECTRGB(4,FAILDIG); /* With flag, consecutive thousands separators are allowed */ CONVERT("1 000", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, thousands separators can be sprinkled at random */ CONVERT("1 00 0 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, but leading thousands separators are not allowed */ CONVERT(" 1 000", NUMPRS_THOUSANDS); - EXPECTFAIL; + todo_wine EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(1,FAILDIG); @@ -2039,7 +2034,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine_if(i==0) EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2067,12 +2062,11 @@ static void test_VarParseNumFromStrFr(void) /* Thousands flag can also be used with currency */ WCONVERT(L"1 234,5 \x20ac", NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL); - todo_wine EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,2); - todo_wine EXPECTRGB(2,3); - todo_wine EXPECTRGB(3,4); - todo_wine EXPECTRGB(4,5); + EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); + EXPECT2(1,2); + EXPECTRGB(2,3); + EXPECTRGB(3,4); + EXPECTRGB(4,5); EXPECTRGB(5,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 208d5b63c8f..fbcc8ce693f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1615,6 +1615,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla DWORD dwState = B_EXPONENT_START|B_INEXACT_ZEROS; int iMaxDigits = ARRAY_SIZE(rgbTmp); int cchUsed = 0; + OLECHAR cDigitSeparator2; TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); @@ -1634,6 +1635,10 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla return DISP_E_TYPEMISMATCH; VARIANT_GetLocalisedNumberChars(&chars, lcid, dwFlags); + /* Setting the thousands separator to a non-breaking space implies regular + * spaces are allowed too. But the converse is not true. + */ + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; /* First consume all the leading symbols and space from the string */ while (1) @@ -1674,6 +1679,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; chars.cDigitSeparator = chars.cCurrencyDigitSeparator; + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; } else if (pNumprs->dwInFlags & NUMPRS_PARENS && *lpszStr == '(' && !(pNumprs->dwOutFlags & NUMPRS_PARENS)) @@ -1781,7 +1787,9 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla cchUsed++; } } - else if (*lpszStr == chars.cDigitSeparator && pNumprs->dwInFlags & NUMPRS_THOUSANDS) + else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++;

1 0

Francois Gouget : oleaut32: VarParseNumFromStr() does not allow leading thousands separators.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: de70f7289e23e895956927e7e3ce2ed23a188e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de70f7289e23e895956927e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 00:03:47 2021 +0200 oleaut32: VarParseNumFromStr() does not allow leading thousands separators. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 50af05e47cc..47dfbefc081 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1606,7 +1606,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, but leading thousands separators are not allowed */ CONVERT(",1,000", NUMPRS_THOUSANDS); - todo_wine EXPECTFAIL; + EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1,", NUMPRS_THOUSANDS); @@ -1983,7 +1983,7 @@ static void test_VarParseNumFromStrFr(void) /* With flag, but leading thousands separators are not allowed */ CONVERT(" 1 000", NUMPRS_THOUSANDS); - todo_wine EXPECTFAIL; + EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fbcc8ce693f..35e4539c2ef 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1652,6 +1652,12 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla lpszStr++; } while (iswspace(*lpszStr)); } + else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) + { + return DISP_E_TYPEMISMATCH; /* Not allowed before the first digit */ + } else if (pNumprs->dwInFlags & NUMPRS_LEADING_PLUS && *lpszStr == chars.cPositiveSymbol && !(pNumprs->dwOutFlags & NUMPRS_LEADING_PLUS))

1 0

Francois Gouget : oleaut32: Fix VarParseNumFromStr()'s support for trailing thousands separator spaces.
by Alexandre Julliard 22 Jul '21

22 Jul '21

Module: wine Branch: master Commit: c2aeb915f4fc05d596aec0ff43f5e5f26569cd21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2aeb915f4fc05d596aec0ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 00:03:49 2021 +0200 oleaut32: Fix VarParseNumFromStr()'s support for trailing thousands separator spaces. If a trailing character is a thousands separator, VarParseNumFromStr() only processes it if NUMPRS_THOUSANDS was specified; even if that character is also a space and NUMPRS_TRAILING_WHITE was specified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 47dfbefc081..73df13fe5c9 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1903,7 +1903,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to the thousands separator are never allowed! */ - todo_wine EXPECTFAIL; + EXPECTFAIL; } else { @@ -2020,7 +2020,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine EXPECTFAIL; + EXPECTFAIL; } else { diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 35e4539c2ef..e4993de75a5 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1923,7 +1923,22 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* Consume any trailing symbols and space */ while (1) { - if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && iswspace(*lpszStr)) + if ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2)) + { + if (pNumprs->dwInFlags & NUMPRS_THOUSANDS) + { + pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; + cchUsed++; + lpszStr++; + } + else + { + /* Not allowed, even with NUMPRS_TRAILING_WHITE */ + break; + } + } + else if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && iswspace(*lpszStr)) { pNumprs->dwOutFlags |= NUMPRS_TRAILING_WHITE; do

1 0