June 2022 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1/effect: Handle initial values for D2D1_PROPERTY_TYPE_BOOL.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 2d29ec34bab4a7f38d00a2142b70156febccd116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d29ec34bab4a7f38d00a214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 14:44:18 2022 +0300 d2d1/effect: Handle initial values for D2D1_PROPERTY_TYPE_BOOL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 52e09033e6d..e2bc80e2f07 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -829,6 +829,7 @@ static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, co { void *src = NULL; UINT32 _uint32; + BOOL _bool; p->data.offset = props->offset; p->size = sizes[type]; @@ -842,6 +843,12 @@ static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, co _uint32 = wcstoul(value, NULL, 10); src = &_uint32; break; + case D2D1_PROPERTY_TYPE_BOOL: + if (!wcscmp(value, L"true")) _bool = TRUE; + else if (!wcscmp(value, L"false")) _bool = FALSE; + else return E_INVALIDARG; + src = &_bool; + break; case D2D1_PROPERTY_TYPE_IUNKNOWN: case D2D1_PROPERTY_TYPE_COLOR_CONTEXT: break; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f1cec1d7a0b..b893e9e8564 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -50,6 +50,10 @@ L"<?xml version='1.0'?> \ <Property name='Max' type='uint32' value='100'/> \ <Property name='Default' type='uint32' value='10'/> \ </Property> \ + <Property name='Bool' type='bool'> \ + <Property name='DisplayName' type='string' value='Bool property'/> \ + <Property name='Default' type='bool' value='false'/> \ + </Property> \ </Effect> \ ";

1 0

Nikolay Sivov : d2d1/effect: Create effect instance properties from builtin effect description.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 216e56ac3c01774117ce15d3d8cab9341ea78d65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216e56ac3c01774117ce15d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 18:42:43 2022 +0300 d2d1/effect: Create effect instance properties from builtin effect description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 34 +++++++++++ dlls/d2d1/effect.c | 140 +++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/factory.c | 148 +---------------------------------------------- 3 files changed, 173 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=216e56ac3c01774117ce…

1 0

Nikolay Sivov : d2d1/effect: Initial implementation of property access methods.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: bf0c621cbd165f829b88730e26a523bc4c17ea6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf0c621cbd165f829b88730e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 19:05:14 2022 +0300 d2d1/effect: Initial implementation of property access methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 202 +++++++++++++++++++++++++++++++++++++------------ dlls/d2d1/tests/d2d1.c | 3 +- include/d2d1_1.idl | 1 + 3 files changed, 155 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf0c621cbd165f829b88…

1 0

Nikolay Sivov : d2d1/effect: Add D2D1_PROPERTY_CACHED property.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 9c4aea6de150c94576babba3b4d41dba8cc9f472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c4aea6de150c94576babba3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 19:10:32 2022 +0300 d2d1/effect: Add D2D1_PROPERTY_CACHED property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 2 ++ dlls/d2d1/tests/d2d1.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 5dc86cccb75..46e53693277 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -1029,6 +1029,8 @@ HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effec return E_FAIL; } + d2d_effect_properties_add(&object->properties, L"Cached", D2D1_PROPERTY_CACHED, D2D1_PROPERTY_TYPE_BOOL, L"false"); + *effect = &object->ID2D1Effect_iface; TRACE("Created effect %p.\n", *effect); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7eaf3427e50..874d977f56f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10416,11 +10416,11 @@ static void test_effect(BOOL d3d11) ok(IsEqualGUID(&clsid, test->clsid), "Got unexpected clsid %s, expected %s.\n", debugstr_guid(&clsid), debugstr_guid(test->clsid)); - hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED, - D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(cached == FALSE, "Got unexpected cached %d.\n", cached); + cached = TRUE; + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED, D2D1_PROPERTY_TYPE_BOOL, + (BYTE *)&cached, sizeof(cached)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(cached == FALSE, "Got unexpected cached %d.\n", cached); hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION, D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision));

1 0

Nikolay Sivov : d2d1/effect: Mark most of system properties as read-only.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 71c23a421d2589644cf86d1181d5870599b4f454 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71c23a421d2589644cf86d11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 19:17:45 2022 +0300 d2d1/effect: Mark most of system properties as read-only. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/effect.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0db9dd6d360..d2cb78b9b69 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -615,6 +615,7 @@ struct d2d_effect_property WCHAR *name; D2D1_PROPERTY_TYPE type; UINT32 index; + BOOL readonly; union { size_t offset; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 46e53693277..9a9cac84f5f 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -81,6 +81,14 @@ HRESULT d2d_effect_properties_add(struct d2d_effect_properties *props, const WCH p = &props->properties[props->count++]; p->index = index; if (p->index < 0x80000000) props->custom_count++; + + if (index == D2D1_PROPERTY_CACHED + || index == D2D1_PROPERTY_PRECISION) + { + p->readonly = FALSE; + } + else + p->readonly = TRUE; p->name = wcsdup(name); p->type = type; if (p->type == D2D1_PROPERTY_TYPE_STRING) @@ -213,6 +221,8 @@ static HRESULT d2d_effect_property_get_value(const struct d2d_effect *effect, static HRESULT d2d_effect_property_set_value(struct d2d_effect_property *property, D2D1_PROPERTY_TYPE type, const BYTE *value, UINT32 size) { + if (property->readonly) return E_INVALIDARG; + FIXME("Unimplemented.\n"); return S_OK;

1 0

Nikolay Sivov : d2d1/effect: Implement custom effects creation.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 9f3523c5b2a8e68b068f193524bc4fce4fcf9024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3523c5b2a8e68b068f1935… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 22:42:45 2022 +0300 d2d1/effect: Implement custom effects creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 25 +++++---- dlls/d2d1/effect.c | 123 +++++++++++++++++++++++++++++++++---------- dlls/d2d1/factory.c | 30 +++++++---- dlls/d2d1/tests/d2d1.c | 133 +++++++++++++++++++++++------------------------ 4 files changed, 193 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f3523c5b2a8e68b068f…

1 0

Zebediah Figura : dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList).
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: f66880c86aa283503434a0ff871a38082d2452e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f66880c86aa283503434a0ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:09:57 2022 -0500 dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList). >From 17e2d5c1ca655a29775e1a4cd08d9fdec9654dcd. --- dlls/dnsapi/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 12aa1086540..0e2f1b39ece 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -387,6 +387,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, const WCHA struct get_serverlist_params params = { AF_INET6, buffer, len }; return RESOLV_CALL( get_serverlist, &params ); } + /* Windows does not implement this, but we need it in iphlpapi. */ case DnsConfigSearchList: { struct get_searchlist_params params = { buffer, len };

1 0

Zebediah Figura : dnsapi: ntdll_umbstowcs() deals in characters, not bytes.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 91083d451022bdac99ac6c349f0965dec1d1db67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91083d451022bdac99ac6c34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:03:47 2022 -0500 dnsapi: ntdll_umbstowcs() deals in characters, not bytes. --- dlls/dnsapi/libresolv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index e19e867c76c..51a44f88aa5 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -127,7 +127,7 @@ static NTSTATUS resolv_get_searchlist( void *args ) const struct get_searchlist_params *params = args; DNS_TXT_DATAW *list = params->list; DWORD i, needed, str_needed = 0; - char *ptr, *end; + WCHAR *ptr, *end; init_resolver(); @@ -145,11 +145,11 @@ static NTSTATUS resolv_get_searchlist( void *args ) *params->len = needed; list->dwStringCount = i; - ptr = (char *)(list->pStringArray + i); - end = ptr + str_needed; + ptr = (WCHAR *)(list->pStringArray + i); + end = ptr + str_needed / sizeof(WCHAR); for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) { - list->pStringArray[i] = (WCHAR *)ptr; + list->pStringArray[i] = ptr; ptr += ntdll_umbstowcs( _res.dnsrch[i], strlen(_res.dnsrch[i]) + 1, list->pStringArray[i], end - ptr ); }

1 0

Zebediah Figura : dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList).
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 23d85e6e9ab0b7f0f79beb41fe6738c50d02d632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23d85e6e9ab0b7f0f79beb41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 15:33:42 2022 -0500 dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList). DNS_TEXT_DATA contains pointers and is thus not WoW64 compatible. Since the API is internal to Wine, use a simpler format instead of fixing our WoW64 translation. The problem was found by Brendan Shanks; this solution was suggested by Hans Leidekker. --- dlls/dnsapi/dnsapi.h | 2 +- dlls/dnsapi/libresolv.c | 21 ++++++++------------- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index f27cce9a99d..a81cb712f3e 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -128,7 +128,7 @@ extern const char *debugstr_type( unsigned short ) DECLSPEC_HIDDEN; struct get_searchlist_params { - DNS_TXT_DATAW *list; + WCHAR *list; DWORD *len; }; diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 51a44f88aa5..fd645d53fd7 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -125,16 +125,15 @@ static DNS_STATUS map_h_errno( int error ) static NTSTATUS resolv_get_searchlist( void *args ) { const struct get_searchlist_params *params = args; - DNS_TXT_DATAW *list = params->list; - DWORD i, needed, str_needed = 0; + WCHAR *list = params->list; + DWORD i, needed = 0; WCHAR *ptr, *end; init_resolver(); for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) - str_needed += (strlen(_res.dnsrch[i]) + 1) * sizeof(WCHAR); - - needed = FIELD_OFFSET(DNS_TXT_DATAW, pStringArray[i]) + str_needed; + needed += (strlen(_res.dnsrch[i]) + 1) * sizeof(WCHAR); + needed += sizeof(WCHAR); /* null terminator */ if (!list || *params->len < needed) { @@ -143,16 +142,12 @@ static NTSTATUS resolv_get_searchlist( void *args ) } *params->len = needed; - list->dwStringCount = i; - ptr = (WCHAR *)(list->pStringArray + i); - end = ptr + str_needed / sizeof(WCHAR); + ptr = list; + end = ptr + needed / sizeof(WCHAR); for (i = 0; i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) - { - list->pStringArray[i] = ptr; - ptr += ntdll_umbstowcs( _res.dnsrch[i], strlen(_res.dnsrch[i]) + 1, - list->pStringArray[i], end - ptr ); - } + ptr += ntdll_umbstowcs( _res.dnsrch[i], strlen(_res.dnsrch[i]) + 1, ptr, end - ptr ); + *ptr = 0; /* null terminator */ return ERROR_SUCCESS; } diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 65d3793011b..a95a581532f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1138,7 +1138,7 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags DWORD err, i, size, attempt, sockaddr_len; WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; DNS_ADDR_ARRAY *servers; - DNS_TXT_DATAW *search; + WCHAR *search; while (aa) { @@ -1192,9 +1192,9 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags (search = heap_alloc( size ))) { if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, search, &size ) && - search->dwStringCount && wcslen( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) + search[0] && wcslen( search ) < MAX_DNS_SUFFIX_STRING_LENGTH) { - wcscpy( aa->DnsSuffix, search->pStringArray[0] ); + wcscpy( aa->DnsSuffix, search ); } heap_free( search ); }

1 0

Zebediah Figura : ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs().
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 88b77020f27b83d5c11eb425756a0dee20ad5f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b77020f27b83d5c11eb425… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 22 17:06:07 2022 -0500 ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs(). These functions do match e.g. mbstowcs() and MultiByteToWideChar(), but that fact is not inherently obvious [and they don't match RtlMultiByteToUnicodeN(), for example.] --- dlls/ntdll/unix/env.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a71df03966f..f69e4e80f0d 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -364,6 +364,13 @@ static BOOL is_dynamic_env_var( const char *var ) /****************************************************************** * ntdll_umbstowcs (ntdll.so) + * + * Convert a multi-byte string in the Unix code page to UTF-16. Returns the + * number of characters converted, which may be less than the entire source + * string. The destination string must not be NULL. + * + * The size of the output buffer, and the return value, are both given in + * characters, not bytes. */ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) { @@ -381,6 +388,11 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) /****************************************************************** * ntdll_wcstoumbs (ntdll.so) + * + * Convert a UTF-16 string to a multi-byte string in the Unix code page. + * The destination string must not be NULL. + * + * The size of the source string is given in characters, not bytes. */ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) {

1 0