March 2020 - Wine-devel - list.winehq.org

[PATCH 3/7] dbghelp: Make dll builtin PE path search helper more generic.
by Jacek Caban 23 Mar '20

23 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/path.c | 86 ++++++++++++++++++++++++++++++++ dlls/dbghelp/pe_module.c | 91 ++++++++-------------------------- 3 files changed, 107 insertions(+), 71 deletions(-)

1 0

[PATCH 2/7] dbghelp: Use file_name helper in more places.
by Jacek Caban 23 Mar '20

23 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/elf_module.c | 14 +++++--------- dlls/dbghelp/macho_module.c | 21 +++++++-------------- dlls/dbghelp/module.c | 4 ++-- dlls/dbghelp/path.c | 4 ++-- 5 files changed, 18 insertions(+), 27 deletions(-)

1 0

[PATCH 1/7] dbghelp: Rename helpers to make unicode variants default.
by Jacek Caban 23 Mar '20

23 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/path.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)

1 0

Re: Jacek Caban : dbghelp: Use Windows API to map macho files.
by Ken Thomases 23 Mar '20

23 Mar '20

I assume that this and your other recent dbghelp changes are to get it building as PE, right? That's a little unfortunate since it should really use libunwind on macOS (and maybe Android?). I've got a partial implementation of that lying around somewhere. I guess we'll eventually have some mechanism to have a DLL partially implemented with host libraries and that will have to do. :-/ -Ken > On Mar 19, 2020, at 4:27 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: ebf57f01f4890b726a0af702ab7751258f5ab03d > URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf57f01f4890b726a0af702… > > Author: Jacek Caban <jacek(a)codeweavers.com> > Date: Thu Mar 19 18:35:54 2020 +0100 > > dbghelp: Use Windows API to map macho files. > > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/dbghelp/image_private.h | 2 +- > dlls/dbghelp/macho_module.c | 136 +++++++++++++++++++------------------------ > 2 files changed, 61 insertions(+), 77 deletions(-) > > Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebf57f01f4890b726a0a… >

2 1

[PATCH v2 4/8] activeds: Implement ADsBuildVarArrayStr.
by Dmitry Timoshkov 23 Mar '20

23 Mar '20

v2: Fix test failure under XP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 40 ++++++++++++++-- dlls/activeds/tests/Makefile.in | 5 ++ dlls/activeds/tests/activeds.c | 85 +++++++++++++++++++++++++++++++++ include/adshlp.h | 1 + 4 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 dlls/activeds/tests/Makefile.in create mode 100644 dlls/activeds/tests/activeds.c diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 6a825f0913..1b22da6765 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -101,10 +101,44 @@ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VAR /***************************************************** * ADsBuildVarArrayStr [ACTIVEDS.7] */ -HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *lppPathNames, DWORD dwPathNames, VARIANT* pvar) +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *str, DWORD count, VARIANT *var) { - FIXME("(%p, %d, %p)!stub\n",*lppPathNames, dwPathNames, pvar); - return E_NOTIMPL; + HRESULT hr; + SAFEARRAY *sa; + LONG idx, end = count; + + TRACE("(%p, %u, %p)\n", str, count, var); + + if (!var) return E_ADS_BAD_PARAMETER; + + sa = SafeArrayCreateVector(VT_VARIANT, 0, count); + if (!sa) return E_OUTOFMEMORY; + + VariantInit(var); + for (idx = 0; idx < end; idx++) + { + VARIANT item; + + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(str[idx]); + if (!V_BSTR(&item)) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + hr = SafeArrayPutElement(sa, &idx, &item); + SysFreeString(V_BSTR(&item)); + if (hr != S_OK) goto fail; + } + + V_VT(var) = VT_ARRAY | VT_VARIANT; + V_ARRAY(var) = sa; + return S_OK; + +fail: + SafeArrayDestroy(sa); + return hr; } /***************************************************** diff --git a/dlls/activeds/tests/Makefile.in b/dlls/activeds/tests/Makefile.in new file mode 100644 index 0000000000..25ae2a9bfd --- /dev/null +++ b/dlls/activeds/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = activeds.dll +IMPORTS = ole32 oleaut32 activeds + +C_SRCS = \ + activeds.c diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c new file mode 100644 index 0000000000..6f469f9dc1 --- /dev/null +++ b/dlls/activeds/tests/activeds.c @@ -0,0 +1,85 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * 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 <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" +#include "adshlp.h" +#include "adserr.h" + +#include "wine/test.h" + +static void test_ADsBuildVarArrayStr(void) +{ + const WCHAR *props[] = { L"prop1", L"prop2" }; + HRESULT hr; + VARIANT var, item, *data; + LONG start, end, idx; + + hr = ADsBuildVarArrayStr(NULL, 0, NULL); + ok(hr == E_ADS_BAD_PARAMETER || hr == E_FAIL /* XP */, "got %#x\n", hr); + + hr = ADsBuildVarArrayStr(NULL, 0, &var); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#x\n", hr); + ok(start == 0, "got %d\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#x\n", hr); + ok(end == -1, "got %d\n", end); + VariantClear(&var); + + hr = ADsBuildVarArrayStr((LPWSTR *)props, ARRAY_SIZE(props), &var); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_VARIANT), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#x\n", hr); + ok(start == 0, "got %d\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#x\n", hr); + ok(end == 1, "got %d\n", end); + idx = 0; + hr = SafeArrayGetElement(V_ARRAY(&var), &idx, &item); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); + ok(!lstrcmpW(V_BSTR(&item), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&item))); + VariantClear(&item); + hr = SafeArrayAccessData(V_ARRAY(&var), (void *)&data); + ok(hr == S_OK, "got %#x\n", hr); + ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); + ok(!lstrcmpW(V_BSTR(&data[0]), L"prop1"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[0]))); + ok(V_VT(&data[0]) == VT_BSTR, "got %d\n", V_VT(&data[0])); + ok(!lstrcmpW(V_BSTR(&data[1]), L"prop2"), "got %s\n", wine_dbgstr_w(V_BSTR(&data[1]))); + hr = SafeArrayUnaccessData(V_ARRAY(&var)); + ok(hr == S_OK, "got %#x\n", hr); + VariantClear(&var); +} + +START_TEST(activeds) +{ + test_ADsBuildVarArrayStr(); +} diff --git a/include/adshlp.h b/include/adshlp.h index a574e5061f..0b08c1a99c 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -24,6 +24,7 @@ extern "C" { #endif HRESULT WINAPI ADsBuildEnumerator(IADsContainer*,IEnumVARIANT**); +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*); HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); -- 2.25.1

1 0

[PATCH v3 1/8] wldap32: Add support for ldap_bind_s(LDAP_AUTH_NEGOTIATE).
by Dmitry Timoshkov 23 Mar '20

23 Mar '20

v2: Support ANSI credentials. v3: Fix compilation without LDAP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wldap32/bind.c | 131 +++++++++++++++++++++++++++++---- dlls/wldap32/winldap_private.h | 2 + dlls/wldap32/wldap32.h | 32 ++++++++ include/config.h.in | 3 + 5 files changed, 154 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 7096e2fb66..83e659742b 100644 --- a/configure.ac +++ b/configure.ac @@ -487,6 +487,7 @@ AC_CHECK_HEADERS(\ port.h \ pthread.h \ pwd.h \ + sasl/sasl.h \ sched.h \ scsi/scsi.h \ scsi/scsi_ioctl.h \ diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 27fb286f50..63d4208eef 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -25,10 +25,14 @@ #ifdef HAVE_LDAP_H #include <ldap.h> #endif +#ifdef HAVE_SASL_SASL_H +#include <sasl/sasl.h> +#endif #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "rpc.h" #include "winldap_private.h" #include "wldap32.h" @@ -156,20 +160,67 @@ ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method ) if (!dnW) goto exit; } if (cred) { - credW = strAtoW( cred ); - if (!credW) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + credW = strAtoW( cred ); + if (!credW) goto exit; + } + else + credW = (WCHAR *)cred /* SEC_WINNT_AUTH_IDENTITY_A */; } ret = ldap_bind_sW( ld, dnW, credW, method ); exit: strfreeW( dnW ); - strfreeW( credW ); + if (credW != (WCHAR *)cred) strfreeW( credW ); #endif return ret; } +#ifdef HAVE_LDAP_H + +static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) +{ +#ifdef HAVE_SASL_SASL_H + SEC_WINNT_AUTH_IDENTITY_A *id = defaults; + sasl_interact_t *sasl = interact; + + TRACE( "%p,%08x,%p,%p\n", ld, flags, defaults, interact ); + + while (sasl->id != SASL_CB_LIST_END) + { + TRACE("sasl->id = %04lx\n", sasl->id); + + if (sasl->id == SASL_CB_GETREALM) + { + sasl->result = id->Domain; + sasl->len = id->DomainLength; + } + else if (sasl->id == SASL_CB_USER) + { + sasl->result = id->User; + sasl->len = id->UserLength; + } + else if (sasl->id == SASL_CB_PASS) + { + sasl->result = id->Password; + sasl->len = id->PasswordLength; + } + + sasl++; + } + + return LDAP_SUCCESS; +#else + FIXME( "%p,%08x,%p,%p: stub\n", ld, flags, defaults, interact ); + return LDAP_SUCCESS; +#endif /* HAVE_SASL_SASL_H */ +} + +#endif /* HAVE_LDAP_H */ + /*********************************************************************** * ldap_bind_sW (WLDAP32.@) * @@ -197,21 +248,71 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR; - if (dn) { - dnU = strWtoU( dn ); - if (!dnU) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + if (dn) + { + dnU = strWtoU( dn ); + if (!dnU) goto exit; + } + if (cred) + { + credU = strWtoU( cred ); + if (!credU) goto exit; + + pwd.bv_len = strlen( credU ); + pwd.bv_val = credU; + } + + ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); } - if (cred) { - credU = strWtoU( cred ); - if (!credU) goto exit; - - pwd.bv_len = strlen( credU ); - pwd.bv_val = credU; + else if (method == WLDAP32_LDAP_AUTH_NEGOTIATE) + { + SEC_WINNT_AUTH_IDENTITY_A idU; + SEC_WINNT_AUTH_IDENTITY_W idW; + SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)cred; + + memset( &idU, 0, sizeof(idU) ); + + if (id) + { + if (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + idW.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + idW.Domain = (unsigned short *)strnAtoW( (char *)id->Domain, id->DomainLength, &idW.DomainLength ); + idW.User = (unsigned short *)strnAtoW( (char *)id->User, id->UserLength, &idW.UserLength ); + idW.Password = (unsigned short *)strnAtoW( (char *)id->Password, id->PasswordLength, &idW.PasswordLength ); + + id = &idW; + } + + idU.Domain = (unsigned char *)strnWtoU( id->Domain, id->DomainLength, &idU.DomainLength ); + idU.User = (unsigned char *)strnWtoU( id->User, id->UserLength, &idU.UserLength ); + idU.Password = (unsigned char *)strnWtoU( id->Password, id->PasswordLength, &idU.PasswordLength ); + } + + ret = map_error( ldap_sasl_interactive_bind_s( ld, + NULL /* server will ignore DN anyway */, + NULL /* query supportedSASLMechanisms */, + NULL, NULL, LDAP_SASL_QUIET, sasl_interact, &idU )); + + if (id && (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI)) + { + strfreeW( (WCHAR *)idW.Domain ); + strfreeW( (WCHAR *)idW.User ); + strfreeW( (WCHAR *)idW.Password ); + } + + strfreeU( (char *)idU.Domain ); + strfreeU( (char *)idU.User ); + strfreeU( (char *)idU.Password ); + } + else + { + FIXME( "method %#x not supported\n", method ); + return WLDAP32_LDAP_PARAM_ERROR; } - - ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 74223029b7..df257dafec 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -101,6 +101,8 @@ typedef struct berelement #define WLDAP32_LDAP_OPT_SECURITY_CONTEXT 0x99 #define WLDAP32_LDAP_OPT_ROOTDSE_CACHE 0x9a +#define WLDAP32_LDAP_AUTH_NEGOTIATE 0x486 + typedef struct ldap { struct diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 1d4052002a..c329a5b76b 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -93,6 +93,38 @@ static inline LPWSTR strUtoW( char *str ) return ret; } +static inline LPWSTR strnAtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) +{ + LPWSTR ret = NULL; + *outlen = 0; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, inlen, NULL, 0 ); + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, str, inlen, ret, len ); + *outlen = len; + } + } + return ret; +} + +static inline char *strnWtoU( LPCWSTR str, DWORD inlen, DWORD *outlen ) +{ + LPSTR ret = NULL; + *outlen = 0; + if (str) + { + DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, inlen, NULL, 0, NULL, NULL ); + if ((ret = heap_alloc( len ))) + { + WideCharToMultiByte( CP_UTF8, 0, str, inlen, ret, len, NULL, NULL ); + *outlen = len; + } + } + return ret; +} + static inline void strfreeA( LPSTR str ) { heap_free( str ); diff --git a/include/config.h.in b/include/config.h.in index de434d6ed2..e48e398ca8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -776,6 +776,9 @@ /* Define to 1 if you have the `roundf' function. */ #undef HAVE_ROUNDF +/* Define to 1 if you have the <sasl/sasl.h> header file. */ +#undef HAVE_SASL_SASL_H + /* Define to 1 if you have the <sched.h> header file. */ #undef HAVE_SCHED_H -- 2.25.1

1 0

[PATCH 1/8] wldap32: Add support for ldap_bind_s(LDAP_AUTH_NEGOTIATE). (resend)
by Dmitry Timoshkov 23 Mar '20

23 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wldap32/bind.c | 121 +++++++++++++++++++++++++++++---- dlls/wldap32/winldap_private.h | 2 + dlls/wldap32/wldap32.h | 16 +++++ include/config.h.in | 3 + 5 files changed, 128 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 7096e2fb66..83e659742b 100644 --- a/configure.ac +++ b/configure.ac @@ -487,6 +487,7 @@ AC_CHECK_HEADERS(\ port.h \ pthread.h \ pwd.h \ + sasl/sasl.h \ sched.h \ scsi/scsi.h \ scsi/scsi_ioctl.h \ diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 27fb286f50..76d76323b2 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -25,10 +25,14 @@ #ifdef HAVE_LDAP_H #include <ldap.h> #endif +#ifdef HAVE_SASL_SASL_H +#include <sasl/sasl.h> +#endif #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "rpc.h" #include "winldap_private.h" #include "wldap32.h" @@ -156,20 +160,68 @@ ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method ) if (!dnW) goto exit; } if (cred) { - credW = strAtoW( cred ); - if (!credW) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + credW = strAtoW( cred ); + if (!credW) goto exit; + } + else + credW = (WCHAR *)cred /* SEC_WINNT_AUTH_IDENTITY_A */; } ret = ldap_bind_sW( ld, dnW, credW, method ); exit: strfreeW( dnW ); - strfreeW( credW ); + if (credW != (WCHAR *)cred) strfreeW( credW ); #endif return ret; } +#ifdef HAVE_SASL_SASL_H + +static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) +{ + SEC_WINNT_AUTH_IDENTITY_W *id = defaults; + sasl_interact_t *sasl = interact; + + TRACE( "%p,%08x,%p,%p\n", ld, flags, defaults, interact ); + + while (sasl->id != SASL_CB_LIST_END) + { + if (sasl->id == SASL_CB_GETREALM) + { + sasl->result = id->Domain; + sasl->len = id->DomainLength; + } + else if (sasl->id == SASL_CB_AUTHNAME) + { + sasl->result = id->User; + sasl->len = id->UserLength; + } + else if (sasl->id == SASL_CB_PASS) + { + sasl->result = id->Password; + sasl->len = id->PasswordLength; + } + + sasl++; + } + + return LDAP_SUCCESS; +} + +#else + +static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) +{ + FIXME( "%p,%08x,%p,%p: stub\n", ld, flags, defaults, interact ); + return LDAP_SUCCESS; +} + +#endif /* HAVE_SASL_SASL_H */ + /*********************************************************************** * ldap_bind_sW (WLDAP32.@) * @@ -197,21 +249,60 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR; - if (dn) { - dnU = strWtoU( dn ); - if (!dnU) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + if (dn) + { + dnU = strWtoU( dn ); + if (!dnU) goto exit; + } + if (cred) + { + credU = strWtoU( cred ); + if (!credU) goto exit; + + pwd.bv_len = strlen( credU ); + pwd.bv_val = credU; + } + + ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); } - if (cred) { - credU = strWtoU( cred ); - if (!credU) goto exit; - - pwd.bv_len = strlen( credU ); - pwd.bv_val = credU; + else if (method == WLDAP32_LDAP_AUTH_NEGOTIATE) + { + SEC_WINNT_AUTH_IDENTITY_A idU; + + memset( &idU, 0, sizeof(idU) ); + + if (cred) + { + SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)cred; + + if (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + FIXME( "ANSI credentials not supported\n" ); + return WLDAP32_LDAP_PARAM_ERROR; + } + + idU.Domain = (unsigned char *)strnWtoU( id->Domain, id->DomainLength, &idU.DomainLength ); + idU.User = (unsigned char *)strnWtoU( id->User, id->UserLength, &idU.UserLength ); + idU.Password = (unsigned char *)strnWtoU( id->Password, id->PasswordLength, &idU.PasswordLength ); + } + + ret = map_error( ldap_sasl_interactive_bind_s( ld, + NULL /* server will ignore DN anyway */, + NULL /* query supportedSASLMechanisms */, + NULL, NULL, LDAP_SASL_QUIET, sasl_interact, &idU )); + + strfreeU( (char *)idU.Domain ); + strfreeU( (char *)idU.User ); + strfreeU( (char *)idU.Password ); + } + else + { + FIXME( "method %#x not supported\n", method ); + return WLDAP32_LDAP_PARAM_ERROR; } - - ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 74223029b7..df257dafec 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -101,6 +101,8 @@ typedef struct berelement #define WLDAP32_LDAP_OPT_SECURITY_CONTEXT 0x99 #define WLDAP32_LDAP_OPT_ROOTDSE_CACHE 0x9a +#define WLDAP32_LDAP_AUTH_NEGOTIATE 0x486 + typedef struct ldap { struct diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 1d4052002a..080765896c 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -93,6 +93,22 @@ static inline LPWSTR strUtoW( char *str ) return ret; } +static inline char *strnWtoU( LPCWSTR str, DWORD inlen, DWORD *outlen ) +{ + LPSTR ret = NULL; + *outlen = 0; + if (str) + { + DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, inlen, NULL, 0, NULL, NULL ); + if ((ret = heap_alloc( len ))) + { + WideCharToMultiByte( CP_UTF8, 0, str, inlen, ret, len, NULL, NULL ); + *outlen = len; + } + } + return ret; +} + static inline void strfreeA( LPSTR str ) { heap_free( str ); diff --git a/include/config.h.in b/include/config.h.in index de434d6ed2..e48e398ca8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -776,6 +776,9 @@ /* Define to 1 if you have the `roundf' function. */ #undef HAVE_ROUNDF +/* Define to 1 if you have the <sasl/sasl.h> header file. */ +#undef HAVE_SASL_SASL_H + /* Define to 1 if you have the <sched.h> header file. */ #undef HAVE_SCHED_H -- 2.25.1

2 3

[PATCH 2/2] winex11.drv: Update _NET_WM_STATE before resizing windows.
by Zhiyi Zhang 23 Mar '20

23 Mar '20

According to the Extended Window Manager Hints (EWMH) spec 1.3 regarding _NET_WM_STATE_FULLSCREEN, "the Window Manager is responsible for restoring the original geometry after a switch from fullscreen back to normal window.", which means that removing _NET_WM_STATE_FULLSCREEN from a window may cause the window to receive a ConfigureNotify event to restore the window size, thus causing a application resize action to be overwritten by the window managers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 --- dlls/winex11.drv/window.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 948b133701..8ef5014224 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8445,10 +8445,7 @@ static void test_fullscreen(void) flush_events(TRUE); GetWindowRect(hwnd, &rc); - /* FVWM used by the TestBots are not EWMH compliant. So this bug doesn't appear on TestBots. */ - todo_wine_if(rc.right - rc.left != 100) ok(rc.right - rc.left == 100, "Expect width %d, got %d.\n", 100, rc.right - rc.left); - todo_wine_if(rc.bottom - rc.top != 100) ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd..350a559c53 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1260,6 +1260,7 @@ static void sync_window_position( struct x11drv_win_data *data, set_size_hints( data, style ); set_mwm_hints( data, style, ex_style ); + update_net_wm_states( data ); data->configure_serial = NextRequest( data->display ); XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); #ifdef HAVE_LIBXSHAPE -- 2.20.1

2 2

[PATCH 1/2] user32/tests: Test restoring a full screen window with WS_THICKFRAME style.
by Zhiyi Zhang 23 Mar '20

23 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 56072bebf7..948b133701 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8432,6 +8432,26 @@ static void test_fullscreen(void) } } + /* Test restoring a full screen window with WS_THICKFRAME style to normal */ + /* Add WS_THICKFRAME style later so that the window can cover the entire monitor */ + hwnd = CreateWindowA("fullscreen_class", NULL, WS_POPUP | WS_VISIBLE, 0, 0, mi.rcMonitor.right, + mi.rcMonitor.bottom, NULL, NULL, GetModuleHandleA(NULL), NULL); + ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError()); + flush_events(TRUE); + + /* Add WS_THICKFRAME and exit full screen */ + SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE) | WS_THICKFRAME); + SetWindowPos(hwnd, 0, 0, 0, 100, 100, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + /* FVWM used by the TestBots are not EWMH compliant. So this bug doesn't appear on TestBots. */ + todo_wine_if(rc.right - rc.left != 100) + ok(rc.right - rc.left == 100, "Expect width %d, got %d.\n", 100, rc.right - rc.left); + todo_wine_if(rc.bottom - rc.top != 100) + ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top); + DestroyWindow(hwnd); + UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); } -- 2.20.1

2 1

[tools] testbot: Simplify building Wine.
by Francois Gouget 23 Mar '20

23 Mar '20

The shared BuildWine() function will reconfigure Wine if given the configure parameters, and build the specified Wine target. For the build VMs the configure options disable the X and FreeType checks, tell Wine not to build the WineTest executable, and the buildtests target ensures only the tests are built. Meanwhile the wine VMs essentially use the default configure options and make target. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47849 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 71 +------------------------------ testbot/bin/build/Reconfig.pl | 55 +++--------------------- testbot/bin/build/WineReconfig.pl | 29 ++----------- testbot/bin/build/WineTest.pl | 30 ++----------- testbot/lib/Build/Utils.pm | 26 ++++++++++- 5 files changed, 38 insertions(+), 173 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 4c342a5ac1..b2c13c8924 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -50,72 +50,6 @@ use WineTestBot::Missions; use WineTestBot::Utils; -# -# Build helpers -# - - -sub BuildNative() -{ - InfoMsg "\nRebuilding native tools\n"; - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-native' && set -x && ". - "time make -j$CPUCount __tooldeps__"); - if ($? != 0) - { - LogMsg "The Wine native tools build failed\n"; - return !1; - } - - return 1; -} - -sub BuildTestExecutables($$$) -{ - my ($TaskMissions, $Impacts, $Build) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - - my (@BuildDirs, @TestExes); - foreach my $TestInfo (values %{$Impacts->{Tests}}) - { - next if (!$TestInfo->{UnitCount}); - push @BuildDirs, $TestInfo->{Path}; - my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; - push @TestExes, $TestExe; - unlink("$DataDir/wine-$Build/$TestExe"); # Ignore errors - } - - InfoMsg "\nBuilding the $Build Wine test executable(s)\n"; - if (!@BuildDirs) - { - InfoMsg "Nothing to do\n"; - return 1; - } - - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time make -j$CPUCount ". join(" ", sort @BuildDirs)); - if ($? != 0) - { - LogMsg "The $Build Wine crossbuild failed\n"; - return !1; - } - - my $Success = 1; - foreach my $TestExe (@TestExes) - { - if (!-f "$DataDir/wine-$Build/$TestExe") - { - LogMsg "Make didn't produce the $Build $TestExe file\n"; - $Success = !1; - } - } - - return $Success; -} - - # # Setup and command line processing # @@ -233,9 +167,8 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - ($Impacts->{PatchedRoot} and !BuildNative()) or - !BuildTestExecutables($TaskMissions, $Impacts, "exe32") or - !BuildTestExecutables($TaskMissions, $Impacts, "exe64")) + !BuildWine($TaskMissions, "no-rm", "exe32", undef, "buildtests") or + !BuildWine($TaskMissions, "no-rm", "exe64", undef, "buildtests")) { exit(1); } diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 62644e11a9..dd403effa9 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -51,60 +51,15 @@ use WineTestBot::Missions; # Build helpers # -sub BuildNative($) -{ - my ($NoRm) = @_; - - rmtree "$DataDir/wine-native" if (!$NoRm); - mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); - - # Rebuild from scratch to make sure cruft will not accumulate - InfoMsg "\nRebuilding native tools\n"; - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-native' && set -x && ". - "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". - "time make -j$CPUCount __tooldeps__"); - - if ($? != 0) - { - LogMsg "The Wine native tools build failed\n"; - return !1; - } - - return 1; -} - -sub BuildCross($$$) -{ - my ($TaskMissions, $NoRm, $Build) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - rmtree "$DataDir/wine-$Build" if (!$NoRm); - mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); - - # Rebuild from scratch to make sure cruft will not accumulate - InfoMsg "\nRebuilding the $Build Wine test executables\n"; - my $CPUCount = GetCPUCount(); - my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". - "time make -j$CPUCount buildtests"); - if ($? != 0) - { - LogMsg "The $Build Wine crossbuild failed\n"; - return !1; - } - - return 1; -} - sub UpdateWineBuilds($$) { my ($TaskMissions, $NoRm) = @_; - return BuildNative($NoRm) && - BuildCross($TaskMissions, $NoRm, "exe32") && - BuildCross($TaskMissions, $NoRm, "exe64"); + my $Configure = "--without-x --without-freetype --disable-winetest"; + return BuildWine($TaskMissions, $NoRm, "exe32", + $Configure, "buildtests") && + BuildWine($TaskMissions, $NoRm, "exe64", + "$Configure --enable-win64", "buildtests"); } diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index ad0d429e1f..383c6bfd57 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -43,44 +43,21 @@ use File::Path; use Build::Utils; use WineTestBot::Config; use WineTestBot::Missions; +use WineTestBot::Utils qw(ShQuote); # # Build helpers # -sub BuildWine($$$$;$) -{ - my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - rmtree "$DataDir/wine-$Build" if (!$NoRm); - mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); - - # If $NoRm is not set, rebuild from scratch to make sure cruft will not - # accumulate - InfoMsg "\nRebuilding the $Build Wine\n"; - my $CPUCount = GetCPUCount(); - $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time ../wine/configure $Extras && ". - "time make -j$CPUCount"); - if ($? != 0) - { - LogMsg "The $Build Wine build failed\n"; - return !1; - } - - return 1; -} - sub UpdateWineBuilds($$) { my ($TaskMissions, $NoRm) = @_; return BuildWine($TaskMissions, $NoRm, "win32", "") && BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && - BuildWine($TaskMissions, $NoRm, "wow32", "", "$DataDir/wine-wow64"); + BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64=". + ShQuote("$DataDir/wine-wow64")); } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1afe9b8bd7..1a7507670b 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -47,30 +47,6 @@ use WineTestBot::Missions; use WineTestBot::Utils; -# -# Build helpers -# - -sub BuildWine($$) -{ - my ($TaskMissions, $Build) = @_; - - return 1 if (!$TaskMissions->{Builds}->{$Build}); - - InfoMsg "\nRebuilding the $Build Wine\n"; - my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-$Build' && set -x && ". - "time make -j$CPUCount"); - if ($? != 0) - { - LogMsg "The $Build build failed\n"; - return !1; - } - - return 1; -} - - # # Test helpers # @@ -447,9 +423,9 @@ if ($Action eq "testpatch") { $Impacts = ApplyPatch("wine", "$DataDir/staging/$FileName"); exit(1) if (!$Impacts or - !BuildWine($TaskMissions, "win32") or - !BuildWine($TaskMissions, "wow64") or - !BuildWine($TaskMissions, "wow32")); + !BuildWine($TaskMissions, "no-rm", "win32", undef) or + !BuildWine($TaskMissions, "no-rm", "wow64", undef) or + !BuildWine($TaskMissions, "no-rm", "wow32", undef)); } foreach my $Mission (@{$TaskMissions->{Missions}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 8a6982c5de..3050be1393 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -29,7 +29,7 @@ use Exporter 'import'; our @EXPORT = qw(GetToolName InfoMsg LogMsg Error GitPull ApplyPatch GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd - GetTestLauncher BuildTestLauncher UpdateAddOns + GetTestLauncher BuildTestLauncher BuildWine UpdateAddOns SetupWineEnvironment GetWineDir GetTestDir RunWine CreateWinePrefix); @@ -317,6 +317,30 @@ sub BuildTestLauncher() return 1; } +sub BuildWine($$$$;$) +{ + my ($TaskMissions, $NoRm, $Build, $Configure, $Targets) = @_; + $Targets ||= ""; + + return 1 if (!$TaskMissions->{Builds}->{$Build}); + # Rebuild from scratch to make sure cruft will not accumulate + rmtree "$DataDir/wine-$Build" if (!$NoRm); + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); + + InfoMsg "\nRebuilding the $Build Wine\n"; + my $CPUCount = GetCPUCount(); + system("cd '$DataDir/wine-$Build' && set -x && ". + (defined $Configure ? "time ../wine/configure $Configure && " : ""). + "time make -j$CPUCount $Targets"); + if ($? != 0) + { + LogMsg "The $Build Wine build failed\n"; + return !1; + } + + return 1; +} + # # Wine addons updates -- 2.20.1

1 0