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

Alistair Leslie-Hughes : xaudio2_7: Trace FAudio version being used.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: e7752e6191452e4e10c35e919fa76102755d7979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7752e6191452e4e10c35e91… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 20 07:38:03 2020 +0000 xaudio2_7: Trace FAudio version being used. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- dlls/xaudio2_7/xaudio_dll.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1bde1100b9..a7bcae77b9 100755 --- a/configure +++ b/configure @@ -15359,7 +15359,8 @@ done ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $FAUDIO_LIBS" for ac_func in FAudio_CommitOperationSet \ - F3DAudioInitialize8 + F3DAudioInitialize8 \ + FAudioLinkedVersion do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 7096e2fb66..b7bd7fb079 100644 --- a/configure.ac +++ b/configure.ac @@ -1756,7 +1756,8 @@ then [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \ - F3DAudioInitialize8], [$FAUDIO_LIBS]) + F3DAudioInitialize8 \ + FAudioLinkedVersion], [$FAUDIO_LIBS]) ]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index fa0361182c..e8b81b125a 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -90,6 +90,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); +#ifdef HAVE_FAUDIOLINKEDVERSION + TRACE("Using FAudio version %d\n", FAudioLinkedVersion() ); +#endif break; } return TRUE; diff --git a/include/config.h.in b/include/config.h.in index de434d6ed2..4fa805ef19 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -152,6 +152,9 @@ /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE +/* Define to 1 if you have the `FAudioLinkedVersion' function. */ +#undef HAVE_FAUDIOLINKEDVERSION + /* Define to 1 if you have the `FAudio_CommitOperationSet' function. */ #undef HAVE_FAUDIO_COMMITOPERATIONSET

1 0

Dmitry Timoshkov : msxml3: Add support for windows-125x encodings to IMXWriter::put_encoding().
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 3d37d45ed061b62f0d4d5066c8204daaa0fbb59c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d37d45ed061b62f0d4d5066… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 09:51:50 2020 +0800 msxml3: Add support for windows-125x encodings to IMXWriter::put_encoding(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a5bfdf1e99..029e9aac0d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -63,6 +63,15 @@ typedef enum XmlEncoding_ISO_8859_9, XmlEncoding_UTF16, XmlEncoding_UTF8, + XmlEncoding_windows_1250, + XmlEncoding_windows_1251, + XmlEncoding_windows_1252, + XmlEncoding_windows_1253, + XmlEncoding_windows_1254, + XmlEncoding_windows_1255, + XmlEncoding_windows_1256, + XmlEncoding_windows_1257, + XmlEncoding_windows_1258, XmlEncoding_Unknown } xml_encoding; @@ -84,6 +93,15 @@ static const WCHAR iso_8859_13W[] = {'i','s','o','-','8','8','5','9','-','1','3' static const WCHAR iso_8859_15W[] = {'i','s','o','-','8','8','5','9','-','1','5',0}; static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; +static const WCHAR windows_1250W[] = {'w','i','n','d','o','w','s','-','1','2','5','0',0}; +static const WCHAR windows_1251W[] = {'w','i','n','d','o','w','s','-','1','2','5','1',0}; +static const WCHAR windows_1252W[] = {'w','i','n','d','o','w','s','-','1','2','5','2',0}; +static const WCHAR windows_1253W[] = {'w','i','n','d','o','w','s','-','1','2','5','3',0}; +static const WCHAR windows_1254W[] = {'w','i','n','d','o','w','s','-','1','2','5','4',0}; +static const WCHAR windows_1255W[] = {'w','i','n','d','o','w','s','-','1','2','5','5',0}; +static const WCHAR windows_1256W[] = {'w','i','n','d','o','w','s','-','1','2','5','6',0}; +static const WCHAR windows_1257W[] = {'w','i','n','d','o','w','s','-','1','2','5','7',0}; +static const WCHAR windows_1258W[] = {'w','i','n','d','o','w','s','-','1','2','5','8',0}; static const struct xml_encoding_data xml_encoding_map[] = { { iso_8859_1W, XmlEncoding_ISO_8859_1, 28591 }, @@ -96,7 +114,16 @@ static const struct xml_encoding_data xml_encoding_map[] = { { iso_8859_7W, XmlEncoding_ISO_8859_7, 28597 }, { iso_8859_9W, XmlEncoding_ISO_8859_9, 28599 }, { utf16W, XmlEncoding_UTF16, ~0 }, - { utf8W, XmlEncoding_UTF8, CP_UTF8 } + { utf8W, XmlEncoding_UTF8, CP_UTF8 }, + { windows_1250W,XmlEncoding_windows_1250, 1250 }, + { windows_1251W,XmlEncoding_windows_1251, 1251 }, + { windows_1252W,XmlEncoding_windows_1252, 1252 }, + { windows_1253W,XmlEncoding_windows_1253, 1253 }, + { windows_1254W,XmlEncoding_windows_1254, 1254 }, + { windows_1255W,XmlEncoding_windows_1255, 1255 }, + { windows_1256W,XmlEncoding_windows_1256, 1256 }, + { windows_1257W,XmlEncoding_windows_1257, 1257 }, + { windows_1258W,XmlEncoding_windows_1258, 1258 } }; typedef enum

1 0

Dmitry Timoshkov : wldap32: Add support for ldap_bind_s(LDAP_AUTH_NEGOTIATE).
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 364ac6787a39e2037f87ca7d728c949564c634b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364ac6787a39e2037f87ca7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:15 2020 +0800 wldap32: Add support for ldap_bind_s(LDAP_AUTH_NEGOTIATE). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wldap32/bind.c | 131 ++++++++++++++++++++++++++++++++++++----- dlls/wldap32/winldap_private.h | 2 + dlls/wldap32/wldap32.h | 32 ++++++++++ include/config.h.in | 3 + 6 files changed, 155 insertions(+), 15 deletions(-) diff --git a/configure b/configure index a7bcae77b9..d263b46594 100755 --- a/configure +++ b/configure @@ -7427,6 +7427,7 @@ for ac_header in \ port.h \ pthread.h \ pwd.h \ + sasl/sasl.h \ sched.h \ scsi/scsi.h \ scsi/scsi_ioctl.h \ diff --git a/configure.ac b/configure.ac index b7bd7fb079..9770be795c 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 4fa805ef19..1014935387 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -779,6 +779,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

1 0

Dmitry Timoshkov : wldap32: Handle NULL return in ldap_get_values_lenW.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 3c3d0f6f004550832c52e0ab25d7c405213b3315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c3d0f6f004550832c52e0ab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:22 2020 +0800 wldap32: Handle NULL return in ldap_get_values_lenW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/value.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index bcfa9a2f6b..4e1701c926 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -229,12 +229,14 @@ PWCHAR * CDECL ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, P if (!attrU) return NULL; bv = ldap_get_values_len( ld, entry, attrU ); + if (bv) + { + retU = bv2str_array( bv ); + ret = strarrayUtoW( retU ); - retU = bv2str_array( bv ); - ret = strarrayUtoW( retU ); - - ldap_value_free_len( bv ); - strarrayfreeU( retU ); + ldap_value_free_len( bv ); + strarrayfreeU( retU ); + } strfreeU( attrU ); #endif

1 0

Dmitry Timoshkov : adsldp: Add support for IADsOpenDSObject::OpenDSObject(ADS_SECURE_AUTHENTICATION).
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 791791931c173e9b45aedee2bb56e9bcfe6d5375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=791791931c173e9b45aedee2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:33 2020 +0800 adsldp: Add support for IADsOpenDSObject::OpenDSObject(ADS_SECURE_AUTHENTICATION). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 23 +++++++++++++++++++---- include/winldap.h | 12 ++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index bc4e9780b0..b60d164515 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "objbase.h" #include "rpcproxy.h" +#include "rpc.h" #include "iads.h" #include "adserr.h" #define SECURITY_WIN32 @@ -777,10 +778,24 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B if (flags & ADS_SECURE_AUTHENTICATION) { - FIXME("ADS_SECURE_AUTHENTICATION is not supported\n"); - hr = ERROR_DS_AUTH_METHOD_NOT_SUPPORTED; - ldap_unbind(ld); - goto fail; + SEC_WINNT_AUTH_IDENTITY_W id; + + id.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + id.Domain = (unsigned short *)host; + id.DomainLength = wcslen(host); + id.User = (unsigned short *)user; + id.UserLength = user ? wcslen(user) : 0; + id.Password = (unsigned short *)password; + id.PasswordLength = password ? wcslen(password) : 0; + + err = ldap_bind_sW(ld, NULL, (WCHAR *)&id, LDAP_AUTH_NEGOTIATE); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_bind_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); + ldap_unbind(ld); + goto fail; + } } else { diff --git a/include/winldap.h b/include/winldap.h index e5c1faa3c1..bd5acab767 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -184,6 +184,18 @@ typedef struct berelement #define LDAP_RES_EXTENDED 0x78 #define LDAP_RES_ANY (-1) +#define LDAP_AUTH_SIMPLE 0x80 +#define LDAP_AUTH_SASL 0x83 +#define LDAP_AUTH_OTHERKIND 0x86 + +#define LDAP_AUTH_EXTERNAL (LDAP_AUTH_OTHERKIND | 0x0020) +#define LDAP_AUTH_SICILY (LDAP_AUTH_OTHERKIND | 0x0200) +#define LDAP_AUTH_NEGOTIATE (LDAP_AUTH_OTHERKIND | 0x0400) +#define LDAP_AUTH_MSN (LDAP_AUTH_OTHERKIND | 0x0800) +#define LDAP_AUTH_NTLM (LDAP_AUTH_OTHERKIND | 0x1000) +#define LDAP_AUTH_DPA (LDAP_AUTH_OTHERKIND | 0x2000) +#define LDAP_AUTH_DIGEST (LDAP_AUTH_OTHERKIND | 0x4000) + typedef struct ldap { struct

1 0

Dmitry Timoshkov : activeds: Implement ADsBuildVarArrayStr.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 39a930abeb72868ac27fd74303fe88a1130ffe35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39a930abeb72868ac27fd743… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:39 2020 +0800 activeds: Implement ADsBuildVarArrayStr. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/activeds/activeds_main.c | 40 +++++++++++++++++-- dlls/activeds/tests/Makefile.in | 5 +++ dlls/activeds/tests/activeds.c | 85 +++++++++++++++++++++++++++++++++++++++++ include/adshlp.h | 1 + 6 files changed, 130 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d263b46594..73d9d7ef82 100755 --- a/configure +++ b/configure @@ -20106,6 +20106,7 @@ wine_fn_config_makefile dlls/acledit enable_acledit wine_fn_config_makefile dlls/aclui enable_aclui wine_fn_config_makefile dlls/activeds.tlb enable_activeds_tlb wine_fn_config_makefile dlls/activeds enable_activeds +wine_fn_config_makefile dlls/activeds/tests enable_tests wine_fn_config_makefile dlls/actxprxy enable_actxprxy wine_fn_config_makefile dlls/adsiid enable_adsiid wine_fn_config_makefile dlls/adsldp enable_adsldp diff --git a/configure.ac b/configure.ac index 9770be795c..3e4b05816d 100644 --- a/configure.ac +++ b/configure.ac @@ -2806,6 +2806,7 @@ WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) WINE_CONFIG_MAKEFILE(dlls/activeds) +WINE_CONFIG_MAKEFILE(dlls/activeds/tests) WINE_CONFIG_MAKEFILE(dlls/actxprxy) WINE_CONFIG_MAKEFILE(dlls/adsiid) WINE_CONFIG_MAKEFILE(dlls/adsldp) 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**);

1 0

Dmitry Timoshkov : adsldp: Implement IADs::GetInfo().
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 47982e361173843b8601647798703c2e13dcf953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47982e361173843b86016477… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:43 2020 +0800 adsldp: Implement IADs::GetInfo(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 3e5a5e310e..07f79a9993 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,5 @@ MODULE = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 uuid +IMPORTS = ole32 oleaut32 secur32 activeds uuid DELAYIMPORTS = netapi32 wldap32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b60d164515..58db41a094 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -29,6 +29,7 @@ #include "rpcproxy.h" #include "rpc.h" #include "iads.h" +#include "adshlp.h" #include "adserr.h" #define SECURITY_WIN32 #include "security.h" @@ -503,8 +504,18 @@ static HRESULT WINAPI ldapns_get_Schema(IADs *iface, BSTR *retval) static HRESULT WINAPI ldapns_GetInfo(IADs *iface) { - FIXME("%p: stub\n", iface); - return E_NOTIMPL; + HRESULT hr; + VARIANT var; + + TRACE("%p\n", iface); + + hr = ADsBuildVarArrayStr(NULL, 0, &var); + if (hr == S_OK) + { + hr = IADs_GetInfoEx(iface, var, 0); + VariantClear(&var); + } + return hr; } static HRESULT WINAPI ldapns_SetInfo(IADs *iface)

1 0

Dmitry Timoshkov : adsldp: Implement IADs::GetInfoEx().
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 9c3ca265ad599d7a95dfca07eef31fd8201ab3d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3ca265ad599d7a95dfca07… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:46 2020 +0800 adsldp: Implement IADs::GetInfoEx(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 142 ++++++++++++++++++++++++++++++++++++++++++- dlls/adsldp/adsldp_private.h | 10 +++ 2 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 58db41a094..942c471dfb 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -40,7 +40,6 @@ #include "adsldp_private.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp); @@ -372,6 +371,12 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) return hr; } +struct ldap_attribute +{ + WCHAR *name; + WCHAR **values; +}; + typedef struct { IADs IADs_iface; @@ -381,6 +386,8 @@ typedef struct BSTR host; BSTR object; ULONG port; + ULONG attrs_count, attrs_count_allocated; + struct ldap_attribute *attrs; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -422,6 +429,23 @@ static ULONG WINAPI ldapns_AddRef(IADs *iface) return InterlockedIncrement(&ldap->ref); } +static void free_attributes(LDAP_namespace *ldap) +{ + ULONG i; + + if (!ldap->attrs) return; + + for (i = 0; i < ldap->attrs_count; i++) + { + ldap_memfreeW(ldap->attrs[i].name); + ldap_value_freeW(ldap->attrs[i].values); + } + + heap_free(ldap->attrs); + ldap->attrs = NULL; + ldap->attrs_count = 0; +} + static ULONG WINAPI ldapns_Release(IADs *iface) { LDAP_namespace *ldap = impl_from_IADs(iface); @@ -433,6 +457,7 @@ static ULONG WINAPI ldapns_Release(IADs *iface) if (ldap->ld) ldap_unbind(ldap->ld); SysFreeString(ldap->host); SysFreeString(ldap->object); + free_attributes(ldap); heap_free(ldap); } @@ -548,10 +573,118 @@ static HRESULT WINAPI ldapns_PutEx(IADs *iface, LONG code, BSTR name, VARIANT pr return E_NOTIMPL; } +static HRESULT add_attribute(LDAP_namespace *ldap, WCHAR *name, WCHAR **values) +{ + struct ldap_attribute *new_attrs; + + if (!ldap->attrs) + { + ldap->attrs = heap_alloc(256 * sizeof(ldap->attrs[0])); + if (!ldap->attrs) return E_OUTOFMEMORY; + ldap->attrs_count_allocated = 256; + } + else if (ldap->attrs_count_allocated < ldap->attrs_count + 1) + { + new_attrs = heap_realloc(ldap->attrs, (ldap->attrs_count_allocated * 2) * sizeof(*new_attrs)); + if (!new_attrs) return E_OUTOFMEMORY; + + ldap->attrs_count_allocated *= 2; + ldap->attrs = new_attrs; + } + + ldap->attrs[ldap->attrs_count].name = name; + ldap->attrs[ldap->attrs_count].values = values; + ldap->attrs_count++; + + return S_OK; +} + static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) { - FIXME("%p,%s,%d: stub\n", iface, wine_dbgstr_variant(&prop), reserved); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IADs(iface); + HRESULT hr; + SAFEARRAY *sa; + VARIANT *item; + WCHAR **props = NULL, *attr, **values; + DWORD i, count, err; + LDAPMessage *res = NULL, *entry; + BerElement *ber; + + TRACE("%p,%s,%d\n", iface, wine_dbgstr_variant(&prop), reserved); + + free_attributes(ldap); + + if (!ldap->ld) return E_NOTIMPL; + + if (V_VT(&prop) != (VT_ARRAY | VT_VARIANT)) + return E_ADS_BAD_PARAMETER; + + sa = V_ARRAY(&prop); + if (sa->cDims != 1) + return E_ADS_BAD_PARAMETER; + + hr = SafeArrayAccessData(sa, (void *)&item); + if (hr != S_OK) return hr; + + count = sa->rgsabound[0].cElements; + if (count) + { + props = heap_alloc((count + 1) * sizeof(props[0])); + if (!props) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + for (i = 0; i < count; i++) + { + if (V_VT(&item[i]) != VT_BSTR) + { + hr = E_ADS_BAD_PARAMETER; + goto exit; + } + props[i] = V_BSTR(&item[i]); + } + props[sa->rgsabound[0].cElements] = NULL; + } + + err = ldap_search_sW(ldap->ld, NULL, LDAP_SCOPE_BASE, (WCHAR *)L"(objectClass=*)", props, FALSE, &res); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_search_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); + goto exit; + } + + entry = ldap_first_entry(ldap->ld, res); + while (entry) + { + attr = ldap_first_attributeW(ldap->ld, entry, &ber); + while (attr) + { + TRACE("attr: %s\n", debugstr_w(attr)); + + values = ldap_get_valuesW(ldap->ld, entry, attr); + + hr = add_attribute(ldap, attr, values); + if (hr != S_OK) + { + ldap_value_freeW(values); + ldap_memfreeW(attr); + goto exit; + } + + attr = ldap_next_attributeW(ldap->ld, entry, ber); + } + + entry = ldap_next_entry(ldap->ld, res); + } + +exit: + if (res) ldap_msgfree(res); + heap_free(props); + SafeArrayUnaccessData(sa); + return hr; } static const IADsVtbl IADs_vtbl = @@ -867,6 +1000,9 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->ld = NULL; ldap->host = NULL; ldap->object = NULL; + ldap->attrs_count = 0; + ldap->attrs_count_allocated = 0; + ldap->attrs = NULL; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 8748d0496d..0443ffbf6e 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -19,6 +19,16 @@ #ifndef _ADSLDP_PRIVATE_H #define _ADSLDP_PRIVATE_H +#include "wine/heap.h" + +static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc((wcslen(src) + 1) * sizeof(WCHAR)))) wcscpy(dst, src); + return dst; +} + DWORD map_ldap_error(DWORD) DECLSPEC_HIDDEN; #endif

1 0

Dmitry Timoshkov : adsldp: Implement IADs::Get().
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: afeb8edd9da963ecb76365ef972a8391a30f4445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afeb8edd9da963ecb76365ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:51 2020 +0800 adsldp: Implement IADs::Get(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 942c471dfb..7cc23438f1 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -551,8 +551,43 @@ static HRESULT WINAPI ldapns_SetInfo(IADs *iface) static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IADs(iface); + HRESULT hr; + ULONG i; + + TRACE("%p,%s,%p\n", iface, debugstr_w(name), prop); + + if (!name || !prop) return E_ADS_BAD_PARAMETER; + + if (!ldap->attrs_count) + { + hr = IADs_GetInfo(iface); + if (hr != S_OK) return hr; + } + + for (i = 0; i < ldap->attrs_count; i++) + { + if (!wcsicmp(name, ldap->attrs[i].name)) + { + ULONG count = ldap_count_valuesW(ldap->attrs[i].values); + if (!count) + { + V_BSTR(prop) = NULL; + V_VT(prop) = VT_BSTR; + return S_OK; + } + + if (count > 1) + FIXME("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); + + V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); + if (!V_BSTR(prop)) return E_OUTOFMEMORY; + V_VT(prop) = VT_BSTR; + return S_OK; + } + } + + return E_ADS_PROPERTY_NOT_FOUND; } static HRESULT WINAPI ldapns_Put(IADs *iface, BSTR name, VARIANT prop)

1 0

Dmitry Timoshkov : adsldp: Add support for multi-valued attributes to IADs::Get().
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: fa4820c203eb6175d6fa030d8cb98bddc2391e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa4820c203eb6175d6fa030d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 21:14:53 2020 +0800 adsldp: Add support for multi-valued attributes to IADs::Get(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7cc23438f1..03f7571afd 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -569,7 +569,7 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) { if (!wcsicmp(name, ldap->attrs[i].name)) { - ULONG count = ldap_count_valuesW(ldap->attrs[i].values); + LONG count = ldap_count_valuesW(ldap->attrs[i].values); if (!count) { V_BSTR(prop) = NULL; @@ -578,12 +578,45 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) } if (count > 1) - FIXME("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); - - V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); - if (!V_BSTR(prop)) return E_OUTOFMEMORY; - V_VT(prop) = VT_BSTR; - return S_OK; + { + SAFEARRAY *sa; + VARIANT item; + LONG idx; + + TRACE("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); + + sa = SafeArrayCreateVector(VT_VARIANT, 0, count); + if (!sa) return E_OUTOFMEMORY; + + for (idx = 0; idx < count; idx++) + { + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(ldap->attrs[i].values[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(prop) = VT_ARRAY | VT_VARIANT; + V_ARRAY(prop) = sa; + return S_OK; +fail: + SafeArrayDestroy(sa); + return hr; + } + else + { + V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); + if (!V_BSTR(prop)) return E_OUTOFMEMORY; + V_VT(prop) = VT_BSTR; + return S_OK; + } } }

1 0