February 2021 - Wine-devel - list.winehq.org

[PATCH v2 2/7] adsldp: split the user into a domain and a username, where possible
by Damjan Jovanovic 13 Feb '21

13 Feb '21

Extensive tests show that, for the secure authentication case, adsldp's IADsOpenDSObject::OpenDSObject() and wldap32's ldap_bind_s() both agree on success/failure and generate equivalent network packets, only when IADsOpenDSObject::OpenDSObject() splits up "domain\user" style usernames into SEC_WINNT_AUTH_IDENTITY_W's Domain and User, while ldap_bind_s() receives them already split up like that, regardless of the domain's format (domain, domain.local) or even correctness. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50634 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/adsldp/adsldp.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)

2 1

[PATCH v2 3/7] adsldp: implement the ADS_SEARCHPREF_SIZE_LIMIT search preference
by Damjan Jovanovic 13 Feb '21

13 Feb '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/adsldp/adsldp.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/7] activeds: implement ADsSetLastError() and ADsGetLastError()
by Damjan Jovanovic 13 Feb '21

13 Feb '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/activeds/activeds_main.c | 90 ++++++++++++++++++++++++++++++++-- dlls/activeds/tests/activeds.c | 69 ++++++++++++++++++++++++++ include/adshlp.h | 2 + 3 files changed, 157 insertions(+), 4 deletions(-)

1 0

[PATCH v2 0/7] active/adsldp/wldap32 patches
by Damjan Jovanovic 13 Feb '21

13 Feb '21

This patchset gets .NET's System.DirectoryServices API to a minimally functional level. It can now be used to (at least) log in and search, using the DirectoryEntry and DirectorySearcher classes. Try 2 splits up https://source.winehq.org/patches/data/199454 into an adsldp patch and a wldap32 patch, rewrites https://source.winehq.org/patches/data/199453 to only defer the 0 results case to GetFirstRow()/GetNextRow() and adds a test for this, and rewrites the most controversial patch, https://source.winehq.org/patches/data/199455, with a novel way of supplying credentials in a SASL mechanism-specific form. Damjan Jovanovic

1 0

[PATCH] winealsa: Add card number to duplicate device descriptions.
by Doug Kingston 13 Feb '21

13 Feb '21

Devices with the same device description cannot be distinguished. Add card number to the description of second and subsequent instances of devices with the same description. This mimics Windows behavior. Signed-off-by: Doug Kingston <dpk(a)google.com> --- dlls/winealsa.drv/mmdevdrv.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 318350471db..a26d09a0bd7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -22,6 +22,8 @@ #include "config.h" #include <stdarg.h> +#define _GNU_SOURCE +#include <stdio.h> #include <math.h> #include "windef.h" @@ -521,6 +523,36 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***id } } +struct card_type { + struct list entry; + int first_card_number; + char string[1]; +}; + +static struct list card_types = LIST_INIT(card_types); + +static BOOL need_card_number(int card, const char *string) +{ + struct card_type *cptr; + + LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) + { + if(!strcmp(string, cptr->string)) + return card != cptr->first_card_number; + } + + /* this is the first instance of string */ + cptr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct card_type) + strlen(string)); + if(!cptr) + /* Default to displaying card number if we can't track cards */ + return TRUE; + + cptr->first_card_number = card; + strcpy(cptr->string, string); + list_add_head(&card_types, &cptr->entry); + return FALSE; +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { @@ -564,6 +596,17 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, cardpath, err, snd_strerror(err)); alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, nameW); }else{ + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical instances, second and subsequent instances get + * instance number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); -- 2.24.3 (Apple Git-128)

2 1

[PATCH] comctl32/tests: Add more cases for ImageList_Remove().
by Serge Gautherie 13 Feb '21

13 Feb '21

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/comctl32/tests/imagelist.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index ed9b1cc..3f34197 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -404,10 +404,22 @@ static void test_add_remove(void) HICON hicon2 ; HICON hicon3 ; + /* removing from NULL handle should fail */ + ok(!pImageList_Remove(NULL, 1), "Removed nonexistent item 1 from NULL handle\n"); + ok(!pImageList_Remove(NULL, 0), "Removed nonexistent item 0 from NULL handle\n"); + ok(!pImageList_Remove(NULL, -1), "Removed all items from NULL handle\n"); + ok(!pImageList_Remove(NULL, -2), "Removed nonexistent item -2 from NULL handle\n"); + /* create an imagelist to play with */ himl = pImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); + /* remove from empty list */ + ok(!pImageList_Remove(himl, 1), "Removed nonexistent item 1 from empty list\n"); + ok(!pImageList_Remove(himl, 0), "Removed nonexistent item 0 from empty list\n"); + ok(pImageList_Remove(himl, -1), "Failed to remove all items from empty list\n"); + ok(!pImageList_Remove(himl, -2), "Removed nonexistent item -2 from empty list\n"); + /* load the icons to add to the image list */ hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); ok(hicon1 != 0, "no hicon1\n"); @@ -416,30 +428,33 @@ static void test_add_remove(void) hicon3 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); ok(hicon3 != 0, "no hicon3\n"); - /* remove when nothing exists */ - ok(!pImageList_Remove(himl, 0), "Removed nonexistent icon.\n"); - /* removing everything from an empty imagelist should succeed */ - ok(pImageList_Remove(himl, -1), "Removed nonexistent icon\n"); - /* add three */ ok(0 == pImageList_ReplaceIcon(himl, -1, hicon1), "Failed to add icon1.\n"); ok(1 == pImageList_ReplaceIcon(himl, -1, hicon2), "Failed to add icon2.\n"); ok(2 == pImageList_ReplaceIcon(himl, -1, hicon3), "Failed to add icon3.\n"); /* remove an index out of range */ - ok(!pImageList_Remove(himl, 4711), "removed nonexistent icon\n"); + ok(!pImageList_Remove(himl, 3), "Removed nonexistent item 3\n"); + ok(!pImageList_Remove(himl, -2), "Removed nonexistent item -2\n"); /* remove three */ - ok(pImageList_Remove(himl, 0), "Can't remove 0\n"); - ok(pImageList_Remove(himl, 0), "Can't remove 0\n"); - ok(pImageList_Remove(himl, 0), "Can't remove 0\n"); + ok(pImageList_Remove(himl, 2), "Can't remove item 2\n"); + ok(pImageList_Remove(himl, 0), "Can't remove item 0 (1st)\n"); + ok(pImageList_Remove(himl, 0), "Can't remove item 0 (2nd)\n"); /* remove one extra */ ok(!pImageList_Remove(himl, 0), "Removed nonexistent icon.\n"); + ok(pImageList_Remove(himl, -1), "Failed to remove all items from emptied list\n"); /* destroy it */ ok(pImageList_Destroy(himl), "Failed to destroy imagelist.\n"); + /* removing from an invalid handle should fail */ + ok(!pImageList_Remove(himl, 1), "Removed nonexistent item 1 from bad handle\n"); + ok(!pImageList_Remove(himl, 0), "Removed nonexistent item 0 from bad handle\n"); + ok(!pImageList_Remove(himl, -1), "Removed all items from bad handle\n"); + ok(!pImageList_Remove(himl, -2), "Removed nonexistent item -2 from bad handle\n"); + ok(-1 == pImageList_ReplaceIcon((HIMAGELIST)0xdeadbeef, -1, hicon1), "Don't crash on bad handle\n"); ok(DestroyIcon(hicon1), "Failed to destroy icon 1.\n"); -- 2.10.0.windows.1

2 2

Wine staging 6.2 release
by Alistair Leslie-Hughes 13 Feb '21

13 Feb '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.2 (669 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * include: Define DECLSPEC_SELECTANY on MinGW. * widl: Support WinRT eventadd/eventremove attributes. * widl: Support WinRT flags attribute parsing. * d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha. * kernel32: Strip invalid characters from mask in FindFirstFileExW. * kernel32/tests: Add tests for FindFirstFileA with invalid characters. * widl: Generate WinRT runtimeclass name constants. * ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory. * ntdll: Implement ObjectTypesInformation in NtQueryObject. * server: Register types during startup. * server: Rename ObjectType to Type. * ntdll: Set TypeIndex for ObjectTypeInformation in NtQueryObject. * ntdll: Mimic object type behavior for different windows versions. * widl: Factor and cleanup interface type declaration and definition. * widl: Factor and cleanup dispinterface type declaration and definition. * widl: Factor and cleanup apicontract type declaration and definition. * widl: Factor and cleanup module type declaration and definition. * widl: Fold aIDENTIFIER / aKNOWNTYPE rules together. * server: Correctly treat zero access mask in duplicate_token wineserver call. * ntdll: Improve invalid paramater handling in NtAccessCheck. * widl: Add explicit namespace parameter to find_type_or_error. * widl: Use explicit namespace parameter for qualified names. * widl: Disallow qualified types in expressions. * widl: Remove aNAMESPACE token from the lexer. * widl: Fold inherit cases by using typename rule in qualified_type. * widl: Support referencing qualified interface names. * ntdll: Implement NtQueryVirtualMemory(MemorySectionName). * ntdll/tests: Add tests for NtQueryVirtualMemory(MemorySectionName). * ntdll: Allow to query section names from other processes. * server: Fix process access rights in get_mapping_file handler. * widl: Support WinRT static attribute parsing. * include: Add Windows.Media.SpeechSynthesis.SpeechSynthesizer runtimeclass. * widl: Support WinRT requires keyword. * widl: Support WinRT parameterized type parsing. * widl: Introduce new strappend helper. Added: * None Updated: * xactengine3_7-Notification * ntdll-Junction_Points * widl-winrt-support NOTE: The applied patches number are low due to some patcheset being disabled. Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 6/6] wldap32: log in with the authentication name instead of the authorization name
by Damjan Jovanovic 12 Feb '21

12 Feb '21

Resend of https://source.winehq.org/patches/data/198804 My continued testing and Hans's tests show this patch to be correct. Those that disagree (Dmitry?), please retest and submit results on the bug report? Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50572 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wldap32/bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

3 7

[PATCH vkd3d v2 1/5] vkd3d-shader: Use hlsl_report_message() to report use of reserved keywords.
by Zebediah Figura 12 Feb '21

12 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index b1090844..7e1fe14d 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -65,8 +65,8 @@ ANY (.) {RESERVED4} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", ctx->line_no, yytext); - set_parse_status(&ctx->status, PARSE_ERR); + hlsl_report_message(ctx, *yylloc, HLSL_LEVEL_ERROR, + "Reserved keyword \"%s\" used.\n", yytext); } BlendState {return KW_BLENDSTATE; } -- 2.30.0

3 14

[PATCH v3 1/3] vcomp: Change _vcomp_fork_call_wrapper() args parameter type to void **.
by Paul Gofman 12 Feb '21

12 Feb '21

That is assumed in the asm implementation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - use a helper function for valist conversion. v3: - fix compilation on ARM. dlls/vcomp/main.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 7b97dfc72c8..11dfb78030b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -117,9 +117,14 @@ struct vcomp_task_data unsigned int dynamic_chunksize; }; +static void **ptr_from_va_list(__ms_va_list valist) +{ + return *(void ***)&valist; +} + #if defined(__i386__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -154,7 +159,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__x86_64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushq %rbp\n\t" __ASM_SEH(".seh_pushreg %rbp\n\t") @@ -198,7 +203,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__arm__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "push {r4, r5, LR}\n\t" "mov r4, r0\n\t" @@ -234,7 +239,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__aarch64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "stp x29, x30, [SP,#-16]!\n\t" "mov x29, SP\n\t" @@ -263,7 +268,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #else -static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args) +static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args) { ERR("Not implemented for this architecture\n"); } @@ -1406,7 +1411,7 @@ static DWORD WINAPI _vcomp_fork_worker(void *param) if (team != NULL) { LeaveCriticalSection(&vcomp_section); - _vcomp_fork_call_wrapper(team->wrapper, team->nargs, team->valist); + _vcomp_fork_call_wrapper(team->wrapper, team->nargs, ptr_from_va_list(team->valist)); EnterCriticalSection(&vcomp_section); thread_data->team = NULL; @@ -1540,7 +1545,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) } vcomp_set_thread_data(&thread_data); - _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, team_data.valist); + _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, ptr_from_va_list(team_data.valist)); vcomp_set_thread_data(prev_thread_data); prev_thread_data->fork_threads = 0; -- 2.29.2

1 2