wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Paul Gofman : ddraw: Convert BOOL flags to bitfields in ddraw_surface.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: e1a79d4d7c1dc29af3b732048859e534e7c21f60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1a79d4d7c1dc29af3b73204… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 16 18:27:40 2020 +0300 ddraw: Convert BOOL flags to bitfields in ddraw_surface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 83e3ee10c0..aa90972bc1 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -195,8 +195,8 @@ struct ddraw_surface /* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there, * but no pointer to prevent temptations to traverse it in the wrong direction. */ - BOOL is_complex_root; - BOOL is_lost; + unsigned int is_complex_root : 1; + unsigned int is_lost : 1; /* Surface description, for GetAttachedSurface */ DDSURFACEDESC2 surface_desc;

1 0

Alistair Leslie-Hughes : ntdll: Correct compile error under macos.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: ccce5f769dbbab92b2fa872c27f1d36343a77afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccce5f769dbbab92b2fa872c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 17 21:53:20 2020 +1000 ntdll: Correct compile error under macos. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0568be63ad..c713a5d0a6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -31,6 +31,10 @@ # include <sys/mman.h> #endif +#if defined(__APPLE__) +# include <mach-o/getsect.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION

1 0

Dmitry Timoshkov : adsldp/tests: Fix memory leaks (Valgrind).
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: e521fe032730c6aa41d20017e9a20c1ec8bcf364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e521fe032730c6aa41d20017… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:12:15 2020 +0800 adsldp/tests: Fix memory leaks (Valgrind). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 01a3aec90e..fe9801a397 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -235,8 +235,12 @@ static void do_search(const struct search *s) trace("search DN %s\n", wine_dbgstr_w(s->dn)); hr = ADsGetObject(s->dn, &IID_IDirectorySearch, (void **)&ds); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) return; pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; pref.vValue.dwType = ADSTYPE_INTEGER; @@ -282,6 +286,7 @@ static void do_search(const struct search *s) ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i])); + IDirectorySearch_FreeColumn(ds, &col); FreeADsMem(name); res++; } @@ -485,6 +490,7 @@ static void test_DirectoryObject(void) hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADsOpenDSObject, (void **)&unk); todo_wine ok(hr == E_NOINTERFACE, "got %#x\n", hr); + if (hr == S_OK) IUnknown_Release(unk); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDispatch, (void **)&unk); ok(hr == S_OK, "got %#x\n", hr); IUnknown_Release(unk);

1 0

Dmitry Timoshkov : adsldp: Fix memory leaks (Valgrind).
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 2ff5eb7f13c4cf7dfeaf203410632d6597406c3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff5eb7f13c4cf7dfeaf2034… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:12:13 2020 +0800 adsldp: Fix memory leaks (Valgrind). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 7 +++++++ dlls/adsldp/schema.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b532b95fe5..c39221ec02 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -785,12 +785,14 @@ static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) { ldap_value_freeW(values); ldap_memfreeW(attr); + ber_free(ber, 0); goto exit; } attr = ldap_next_attributeW(ldap->ld, entry, ber); } + ber_free(ber, 0); entry = ldap_next_entry(ldap->ld, res); } @@ -1812,6 +1814,8 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL if (!col) return E_ADS_BAD_PARAMETER; + if (!wcsicmp(col->pszAttrName, L"ADsPath")) + heap_free(col->pADsValues[0].u.CaseIgnoreString); heap_free(col->pADsValues); heap_free(col->pszAttrName); @@ -1839,6 +1843,9 @@ static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEAR ldap_search_abandon_page(ldap->ld, ldap_ctx->page); if (ldap_ctx->res) ldap_msgfree(ldap_ctx->res); + if (ldap_ctx->ber) + ber_free(ldap_ctx->ber, 0); + heap_free(ldap_ctx); return S_OK; } diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index c8bcf3de66..abf8793b84 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -433,6 +433,7 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_single_count, ULONG *at_m } exit: + ldap_value_freeW(schema); ldap_msgfree(res); if (at) {

1 0

Dmitry Timoshkov : adsldp: Add support for paged search.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 213404da8065531a758938fd023114b2edc99cc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=213404da8065531a758938fd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:12:11 2020 +0800 adsldp: Add support for paged search. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c2f7ca8023..b532b95fe5 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -409,6 +409,7 @@ typedef struct struct ldap_search_context { + LDAPSearch *page; LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; @@ -1329,12 +1330,26 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte ctrls = ctrls_a; } - err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, - ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); + if (ldap->search.pagesize) + { + ldap_ctx->page = ldap_search_init_pageW(ldap->ld, ldap->object, ldap->search.scope, + filter, props, ldap->search.attribtypes_only, + ctrls, NULL, 0, 0, NULL); + if (ldap_ctx->page) + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, + ldap->search.pagesize, &count, &ldap_ctx->res); + else + err = LDAP_NO_MEMORY; + } + else + err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, + ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { TRACE("ldap_search_sW error %#x\n", err); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); heap_free(ldap_ctx); return HRESULT_FROM_WIN32(map_ldap_error(err)); } @@ -1384,11 +1399,42 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND else { if (ldap_ctx->pos >= ldap_ctx->count) + { + if (ldap_ctx->page) + { + ULONG err, count; + + ldap_msgfree(ldap_ctx->res); + ldap_ctx->res = NULL; + + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, ldap->search.pagesize, &count, &ldap_ctx->res); + if (err == LDAP_SUCCESS) + { + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + goto exit; + } + + if (err != LDAP_NO_RESULTS_RETURNED) + { + TRACE("ldap_get_next_page_s error %#x\n", err); + return HRESULT_FROM_WIN32(map_ldap_error(err)); + } + /* fall through */ + } + return S_ADS_NOMORE_ROWS; + } ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->entry); } +exit: if (!ldap_ctx->entry) return S_ADS_NOMORE_ROWS; @@ -1782,13 +1828,17 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); struct ldap_search_context *ldap_ctx = res; TRACE("%p,%p\n", iface, res); if (!res) return E_ADS_BAD_PARAMETER; - ldap_msgfree(ldap_ctx->res); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); + if (ldap_ctx->res) + ldap_msgfree(ldap_ctx->res); return S_OK; }

1 0

Dmitry Timoshkov : wldap32: Implement ldap_get_next_page_s.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 75f27dbe6e3d8ada8770dc07722293ea464222f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75f27dbe6e3d8ada8770dc07… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:12:04 2020 +0800 wldap32: Implement ldap_get_next_page_s. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 45fb35ef4d..32e7e91fb2 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -175,10 +175,38 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, struct l_timeval *timeout, ULONG pagesize, ULONG *count, WLDAP32_LDAPMessage **results ) { - FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout, +#ifdef HAVE_LDAP + ULONG ret; + + TRACE( "(%p, %p, %p, %u, %p, %p)\n", ld, search, timeout, pagesize, count, results ); + if (!ld || !search || !count || !results) return ~0u; - if (!ld) return ~0u; + if (search->cookie && search->cookie->bv_len == 0) + { + /* end of paged results */ + return WLDAP32_LDAP_NO_RESULTS_RETURNED; + } + + if (search->serverctrls[0]) + { + controlfreeW( search->serverctrls[0] ); + search->serverctrls[0] = NULL; + } + + TRACE("search->cookie: %s\n", search->cookie ? debugstr_an(search->cookie->bv_val, search->cookie->bv_len) : "NULL"); + ret = ldap_create_page_controlW( ld, pagesize, (struct WLDAP32_berval *)search->cookie, 1, &search->serverctrls[0] ); + if (ret != WLDAP32_LDAP_SUCCESS) return ret; + + ret = ldap_search_ext_sW( ld, search->dn, search->scope, + search->filter, search->attrs, search->attrsonly, + search->serverctrls, search->clientctrls, + search->timeout.tv_sec ? &search->timeout : NULL, search->sizelimit, results ); + if (ret != WLDAP32_LDAP_SUCCESS) return ret; + + return ldap_get_paged_count( ld, search, count, *results ); + +#endif return WLDAP32_LDAP_NOT_SUPPORTED; }

1 0

Dmitry Timoshkov : wldap32: Implement ldap_get_paged_count.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: df46f513cb1db7dd98f8d1d10098b649df5e7c6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=df46f513cb1db7dd98f8d1d1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:12:02 2020 +0800 wldap32: Implement ldap_get_paged_count. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 09ca19c6c3..45fb35ef4d 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -39,6 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#ifdef HAVE_LDAP +static struct berval null_cookie = { 0, NULL }; +#endif + /*********************************************************************** * ldap_create_page_controlA (WLDAP32.@) * @@ -77,7 +81,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, LDAPControlW *ctrl; BerElement *ber; ber_tag_t tag; - struct berval *berval, null_cookie = { 0, NULL }; + struct berval *berval; INT ret, len; char *val; @@ -181,15 +185,41 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG *count, WLDAP32_LDAPMessage *results ) { - ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results ); + ULONG ret; + LDAPControlW **server_ctrls = NULL; - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - /* FIXME: save the cookie from the server here */ + TRACE( "(%p, %p, %p, %p)\n", ld, search, count, results ); + + if (!ld || !count || !results) return WLDAP32_LDAP_PARAM_ERROR; + + *count = 0; + + ret = ldap_parse_resultW( ld, results, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + if (ret != WLDAP32_LDAP_SUCCESS) return ret; + + if (!server_ctrls) /* assume end of paged results */ + { + search->cookie = &null_cookie; + return WLDAP32_LDAP_SUCCESS; + } + + if (search->cookie) + { + ber_bvfree( search->cookie ); + search->cookie = NULL; + } + + ret = ldap_parse_page_controlW( ld, server_ctrls, count, (struct WLDAP32_berval **)&search->cookie ); + if (ret == WLDAP32_LDAP_SUCCESS) + TRACE("new search->cookie: %s, count %u\n", debugstr_an(search->cookie->bv_val, search->cookie->bv_len), *count); + + ldap_controls_freeW( server_ctrls ); -#endif return ret; + +#endif + return WLDAP32_LDAP_NOT_SUPPORTED; } /*********************************************************************** @@ -278,7 +308,7 @@ ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) while (*ctrls) controlfreeW( *ctrls++ ); heap_free( search->serverctrls ); controlarrayfreeW( search->clientctrls ); - if (search->cookie) + if (search->cookie && search->cookie != &null_cookie) ber_bvfree( search->cookie ); heap_free( search );

1 0

Dmitry Timoshkov : wldap32: Implement ldap_search_abandon_page.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 35b7856d50ad96cd21ae22e7473f3656ded3cede URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b7856d50ad96cd21ae22e7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:11:57 2020 +0800 wldap32: Implement ldap_search_abandon_page. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index d2d86e34af..09ca19c6c3 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -262,10 +262,31 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) { - FIXME( "(%p, %p)\n", ld, search ); +#ifdef HAVE_LDAP + LDAPControlW **ctrls; + + TRACE( "(%p, %p)\n", ld, search ); + + if (!ld || !search) return ~0u; + + strfreeW( search->dn ); + strfreeW( search->filter ); + strarrayfreeW( search->attrs ); + ctrls = search->serverctrls; + controlfreeW( ctrls[0] ); /* page control */ + ctrls++; + while (*ctrls) controlfreeW( *ctrls++ ); + heap_free( search->serverctrls ); + controlarrayfreeW( search->clientctrls ); + if (search->cookie) + ber_bvfree( search->cookie ); + heap_free( search ); - if (!ld) return ~0u; return WLDAP32_LDAP_SUCCESS; + +#else + return WLDAP32_LDAP_NOT_SUPPORTED; +#endif } PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope,

1 0

Dmitry Timoshkov : wldap32: Implement ldap_search_init_pageW.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 6e459129e7680156d3821539ce48acca1e1d95d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e459129e7680156d3821539… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:11:54 2020 +0800 wldap32: Implement ldap_search_init_pageW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 64 ++++++++++++++++++++++++++++++++++++-- dlls/wldap32/winldap_private.h | 11 ++++++- dlls/wldap32/wldap32.h | 70 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 140 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..d2d86e34af 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -281,7 +281,67 @@ PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG sco PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), - scope, debugstr_w(filter), attrs, attrsonly ); +#ifdef HAVE_LDAP + LDAPSearch *search; + DWORD i, len; + + TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", + ld, debugstr_w(dn), scope, debugstr_w(filter), attrs, attrsonly, + serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); + + search = heap_alloc_zero( sizeof(*search) ); + if (!search) + { + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; + } + + if (dn) + { + search->dn = strdupW( dn ); + if (!search->dn) goto fail; + } + if (filter) + { + search->filter = strdupW( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarraydupW( attrs ); + if (!search->attrs) goto fail; + } + + len = serverctrls ? controlarraylenW( serverctrls ) : 0; + search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) ); + if (!search->serverctrls) goto fail; + search->serverctrls[0] = NULL; /* reserve 0 for page control */ + for (i = 0; i < len; i++) + { + search->serverctrls[i + 1] = controldupW( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarraydupW( clientctrls ); + if (!search->clientctrls) goto fail; + } + + search->scope = scope; + search->attrsonly = attrsonly; + search->timeout.tv_sec = timelimit; + search->timeout.tv_usec = 0; + search->sizelimit = sizelimit; + search->cookie = NULL; + + return search; + +fail: + ldap_search_abandon_page( ld, search ); + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + +#endif return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..6903505096 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,16 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; -typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +typedef struct ldapsearch +{ + WCHAR *dn, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControlW **serverctrls; + LDAPControlW **clientctrls; + struct l_timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA { diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index c329a5b76b..537de67a87 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -241,6 +241,26 @@ static inline LPWSTR *strarrayUtoW( char **strarray ) return strarrayW; } +static inline LPWSTR *strarraydupW( LPWSTR *strarray ) +{ + LPWSTR *strarrayW = NULL; + DWORD size; + + if (strarray) + { + size = sizeof(WCHAR*) * (strarraylenW( strarray ) + 1); + if ((strarrayW = heap_alloc( size ))) + { + LPWSTR *p = strarray; + LPWSTR *q = strarrayW; + + while (*p) *q++ = strdupW( *p++ ); + *q = NULL; + } + } + return strarrayW; +} + static inline void strarrayfreeA( LPSTR *strarray ) { if (strarray) @@ -546,8 +566,34 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) } controlW->ldctl_oid = strUtoW( control->ldctl_oid ); - controlW->ldctl_value.bv_len = len; - controlW->ldctl_value.bv_val = val; + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; + controlW->ldctl_iscritical = control->ldctl_iscritical; + + return controlW; +} + +static inline LDAPControlW *controldupW( LDAPControlW *control ) +{ + LDAPControlW *controlW; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + if (!(val = heap_alloc( len ))) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } + + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) + { + heap_free( val ); + return NULL; + } + + controlW->ldctl_oid = strdupW( control->ldctl_oid ); + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; controlW->ldctl_iscritical = control->ldctl_iscritical; return controlW; @@ -684,6 +730,26 @@ static inline LDAPControlW **controlarrayUtoW( LDAPControl **controlarray ) return controlarrayW; } +static inline LDAPControlW **controlarraydupW( LDAPControlW **controlarray ) +{ + LDAPControlW **controlarrayW = NULL; + DWORD size; + + if (controlarray) + { + size = sizeof(LDAPControlW*) * (controlarraylenW( controlarray ) + 1); + if ((controlarrayW = heap_alloc( size ))) + { + LDAPControlW **p = controlarray; + LDAPControlW **q = controlarrayW; + + while (*p) *q++ = controldupW( *p++ ); + *q = NULL; + } + } + return controlarrayW; +} + static inline void controlarrayfreeA( LDAPControlA **controlarray ) { if (controlarray)

1 0

Nikolay Sivov : ole32: Fix spy callback arguments for IMalloc::GetSize().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 06d36b1adf1ae7b73a200d6a35a143f6b3fd91c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d36b1adf1ae7b73a200d6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 16 22:01:50 2020 +0300 ole32: Fix spy callback arguments for IMalloc::GetSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 35 +++++++++++++++++++++-------------- dlls/ole32/tests/compobj.c | 8 ++++++++ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 410691b2a8..1b19be424c 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -296,26 +296,33 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) * win95: size allocated (4 byte boundaries) * win2k: size originally requested !!! (allocated on 8 byte boundaries) */ -static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) +static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *mem) { - SIZE_T cb; - BOOL fSpyed = FALSE; + BOOL spyed_block = FALSE, spy_active = FALSE; + SIZE_T size; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreGetSize(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return (SIZE_T)-1; + + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreGetSize(Malloc32.pSpy, mem, spyed_block); + } - cb = HeapSize(GetProcessHeap(),0,pv); + size = HeapSize(GetProcessHeap(), 0, mem); - if(Malloc32.pSpy) { - cb = IMallocSpy_PostGetSize(Malloc32.pSpy, cb, fSpyed); - LeaveCriticalSection(&IMalloc32_SpyCS); - } + if (spy_active) + { + size = IMallocSpy_PostGetSize(Malloc32.pSpy, size, spyed_block); + LeaveCriticalSection(&IMalloc32_SpyCS); + } - return cb; + return size; } /****************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b0a6ba1ea7..d6ccbc5882 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3068,6 +3068,7 @@ static void test_CoWaitForMultipleHandles(void) static void test_CoGetMalloc(void) { IMalloc *imalloc; + SIZE_T size; HRESULT hr; char *ptr; int ret; @@ -3121,6 +3122,13 @@ static void test_CoGetMalloc(void) ret = IMalloc_DidAlloc(imalloc, ptr + 4); ok(ret == 0, "Unexpected return value %d.\n", ret); + /* GetSize() */ + size = IMalloc_GetSize(imalloc, NULL); + ok(size == (SIZE_T)-1, "Unexpected return value.\n"); + + size = IMalloc_GetSize(imalloc, ptr); + ok(size == 16, "Unexpected return value.\n"); + IMalloc_Free(imalloc, ptr); IMalloc_Release(imalloc);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020