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

Re: [PATCH 0/2] MR308: Add "wine/str.h", use "wine/heap.h" and it in winemenubuilder

by Alexandre Julliard (＠julliard)

> What's the reason for the header being blocked from coexisting with msvcrt? Function naming conflict? In modules that use msvcrt we can use standard functions like wcslen() and wcscpy(). That's better than inventing our own. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/308#note_2673

June 24, 2022

[PATCH v2 4/4] ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs().

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> 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 ) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/307

June 24, 2022

[PATCH v2 3/4] dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList).

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> 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 ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/307

June 24, 2022

[PATCH v2 2/4] dnsapi: ntdll_umbstowcs() deals in characters, not bytes.

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> --- 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 ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/307

June 24, 2022

[PATCH v2 1/4] dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList).

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> https://gitlab.winehq.org/wine/wine/-/merge_requests/307

June 24, 2022

[PATCH v2 0/5] MR307: dnsapi: Fix wow64 translation.

by Zebediah Figura (＠zfigura)

-- v2: ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs(). dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList). dnsapi: ntdll_umbstowcs() deals in characters, not bytes. dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList). https://gitlab.winehq.org/wine/wine/-/merge_requests/307

June 24, 2022

Re: [PATCH 0/2] MR308: Add "wine/str.h", use "wine/heap.h" and it in winemenubuilder

by Davide Beatrici (＠davidebeatrici)

> It doesn't reduce complexity in the usage to have two sets of functions that do the same thing only with subtle differences. Obviously you are not going to get rid of the Win32 APIs, so now you'd have to keep both sets of functions in your head to be able to understand the code. My idea was to replace all calls to the other functions, but it would probably be a shock to anyone used to the current code. In retrospective it's probably not worth it since, as you said, there are only subtle differences and not actual improvements. > Note also that the vast majority of Unicode functions take character counts, so adding helpers that take byte counts would make it even harder to get right. I actually think it's the opposite, especially when allocating memory: it's very easy to forget to multiply by `sizeof(WCHAR)`. I'm still convinced the UTF conversion functions provided in this PR would be a great addition, but ideally they should live in `unicode.h` and not a new header. What's the reason for the header being blocked from coexisting with `msvcrt`? Function naming conflict? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/308#note_2669

June 24, 2022

Re: [PATCH 0/2] MR308: Add "wine/str.h", use "wine/heap.h" and it in winemenubuilder

by Alexandre Julliard (＠julliard)

It doesn't reduce complexity in the usage to have two sets of functions that do the same thing only with subtle differences. Obviously you are not going to get rid of the Win32 APIs, so now you'd have to keep both sets of functions in your head to be able to understand the code. Note also that the vast majority of Unicode functions take character counts, so adding helpers that take byte counts would make it even harder to get right. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/308#note_2668

June 24, 2022

Re: [PATCH 0/5] MR307: dnsapi: Fix wow64 translation.

by Zebediah Figura

On 6/24/22 03:01, Hans Leidekker (@hans) wrote: > Hans Leidekker (@hans) commented about dlls/dnsapi/query.c: >> case DnsConfigSearchList: >> { >> - struct get_searchlist_params params = { buffer, len }; >> - return RESOLV_CALL( get_searchlist, &params ); >> + struct get_searchlist_params params; >> + DNS_TXT_DATAW *data = buffer; >> + unsigned int i, count, needed; >> + DWORD list_len = *len; >> + WCHAR *p; >> + >> + params.list = NULL; >> + params.count = &count; >> + params.len = &list_len; >> + if ((ret = RESOLV_CALL( get_searchlist, &params ))) >> + return ret; >> + needed = FIELD_OFFSET(DNS_TXT_DATAW, pStringArray[count]) + list_len; > Since Windows doesn't implement this query, couldn't we pick something without pointers to keep it simple? A double null terminated string perhaps? > That'd be simpler indeed. I'll write a new patch.

June 24, 2022

Re: [PATCH 0/5] MR307: dnsapi: Fix wow64 translation.

by Zebediah Figura

On 6/24/22 01:36, Huw Davies (@huw) wrote: > Huw Davies (@huw) commented about dlls/dnsapi/libresolv.c: >> *params->len = needed; >> list->dwStringCount = i; >> >> - ptr = (char *)(list->pStringArray + i); >> + ptr = (WCHAR *)(list->pStringArray + i); >> end = ptr + str_needed; > str_needed is calculated in `BYTE`s. > Oops, thanks for catching that.

June 24, 2022