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

[PATCH v2 1/5] wldap32: Implement ldap_search_init_pageW.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

v2: Fix compilation without LDAP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 64 ++++++++++++++++++++++++++++++++-- dlls/wldap32/winldap_private.h | 13 +++++++ 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..f9b3de77b3 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -277,11 +277,69 @@ PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scop return NULL; } -PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope, +PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, 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(base), 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 (base) + { + search->base = strWtoU( base ); + if (!search->base) goto fail; + } + if (filter) + { + search->filter = strWtoU( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarrayWtoU( 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] = controlWtoU( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarrayWtoU( 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 ); +#endif return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..442b4a884a 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,20 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; +#ifdef HAVE_LDAP +typedef struct ldapsearch +{ + char *base, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControl **serverctrls; + LDAPControl **clientctrls; + struct timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; +#else typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +#endif typedef struct ldapsortkeyA { -- 2.25.2

1 1

[PATCH v2 5/5] adsldp: Add support for paged search.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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; } -- 2.25.2

1 0

[PATCH v2 4/5] wldap32: Implement ldap_get_next_page_s.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index f2501e0498..40cb03537e 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -175,10 +175,37 @@ 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; + } + + TRACE("search->cookie: %s\n", search->cookie ? debugstr_an(search->cookie->bv_val, search->cookie->bv_len) : "NULL"); + ret = ldap_create_page_control( ld->ld, pagesize, search->cookie, 1, &search->serverctrls[0] ); + if (search->cookie) + { + ber_bvfree( search->cookie ); + search->cookie = NULL; + } + if (ret != LDAP_SUCCESS) return map_error( ret ); + + ret = ldap_search_ext_s( ld->ld, search->base, search->scope, + search->filter, search->attrs, search->attrsonly, + search->serverctrls, search->clientctrls, + search->timeout.tv_sec ? &search->timeout : NULL, search->sizelimit, results ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + return ldap_get_paged_count( ld, search, count, *results ); + +#endif return WLDAP32_LDAP_NOT_SUPPORTED; } -- 2.25.2

1 0

[PATCH v2 3/5] wldap32: Implement ldap_get_paged_count.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 46 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 2709e126ab..f2501e0498 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,43 @@ 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; + LDAPControl **server_ctrls, *page_ctrl = NULL; + struct berval cookie; + + TRACE( "(%p, %p, %p, %p)\n", ld, search, count, results ); - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - /* FIXME: save the cookie from the server here */ + if (!ld || !count || !results) return WLDAP32_LDAP_PARAM_ERROR; + + *count = 0; + + server_ctrls = NULL; + ret = ldap_parse_result( ld->ld, results, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + if (server_ctrls) + page_ctrl = ldap_control_find( LDAP_CONTROL_PAGEDRESULTS, server_ctrls, NULL ); + + if (!page_ctrl) /* assume end of paged results */ + { + search->cookie = &null_cookie; + return WLDAP32_LDAP_SUCCESS; + } + + ret = ldap_parse_pageresponse_control( ld->ld, page_ctrl, (int *)count, &cookie ); + if (ret == LDAP_SUCCESS) + { + TRACE("new search->cookie: %s, count %u\n", debugstr_an(cookie.bv_val, cookie.bv_len), *count); + search->cookie = ber_bvdup( &cookie ); + } + + ldap_controls_free( server_ctrls ); + + return map_error( ret ); #endif - return ret; + return WLDAP32_LDAP_NOT_SUPPORTED; } /*********************************************************************** @@ -272,7 +304,7 @@ ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) strarrayfreeU( search->attrs ); controlarrayfreeU( search->serverctrls ); controlarrayfreeU( search->clientctrls ); - if (search->cookie) + if (search->cookie && search->cookie != &null_cookie) ber_bvfree( search->cookie ); heap_free( search ); -- 2.25.2

1 0

[PATCH v2 2/5] wldap32: Implement ldap_search_abandon_page.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index f9b3de77b3..2709e126ab 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -262,10 +262,25 @@ 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 + TRACE( "(%p, %p)\n", ld, search ); + + if (!ld || !search) return ~0u; + + strfreeU( search->base ); + strfreeU( search->filter ); + strarrayfreeU( search->attrs ); + controlarrayfreeU( search->serverctrls ); + controlarrayfreeU( 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, -- 2.25.2

1 0

[PATCH 1/3] devenum: Ignore the "left" parameter to IMoniker::BindToObject().
by Zebediah Figura 16 Apr '20

16 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 88 ++++++++++++++++-------------------- dlls/devenum/tests/devenum.c | 11 ++++- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 15e5c9642cb..b03b17f945a 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -377,73 +377,63 @@ static HRESULT WINAPI moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSiz return S_OK; } -static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, - IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult) +static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, + IMoniker *left, REFIID iid, void **out) { - struct moniker *This = impl_from_IMoniker(iface); - IUnknown * pObj = NULL; - IPropertyBag * pProp = NULL; - CLSID clsID; + struct moniker *moniker = impl_from_IMoniker(iface); + IPersistPropertyBag *persist_bag; + IPropertyBag *prop_bag; + IUnknown *unk; + CLSID clsid; VARIANT var; - HRESULT res = E_FAIL; + HRESULT hr; - TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); + TRACE("moniker %p, bind_ctx %p, left %p, iid %s, out %p.\n", + moniker, bind_ctx, left, debugstr_guid(iid), out); - if (!ppvResult) + if (!out) return E_POINTER; VariantInit(&var); - *ppvResult = NULL; + *out = NULL; - if(pmkToLeft==NULL) + if (FAILED(hr = IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) + return hr; + + V_VT(&var) = VT_BSTR; + if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL))) { - /* first activation of this class */ - LPVOID pvptr; - res=IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, &pvptr); - pProp = pvptr; - if (SUCCEEDED(res)) - { - V_VT(&var) = VT_BSTR; - res = IPropertyBag_Read(pProp, clsidW, &var, NULL); - } - if (SUCCEEDED(res)) - { - res = CLSIDFromString(V_BSTR(&var), &clsID); - VariantClear(&var); - } - if (SUCCEEDED(res)) - { - res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IUnknown,&pvptr); - pObj = pvptr; - } + IPropertyBag_Release(prop_bag); + return hr; } - if (pObj!=NULL) + hr = CLSIDFromString(V_BSTR(&var), &clsid); + VariantClear(&var); + if (FAILED(hr)) { - /* get the requested interface from the loaded class */ - res = S_OK; - if (pProp) { - HRESULT res2; - LPVOID ppv = NULL; - res2 = IUnknown_QueryInterface(pObj, &IID_IPersistPropertyBag, &ppv); - if (SUCCEEDED(res2)) { - res = IPersistPropertyBag_Load((IPersistPropertyBag *) ppv, pProp, NULL); - IPersistPropertyBag_Release((IPersistPropertyBag *) ppv); - } - } - if (SUCCEEDED(res)) - res= IUnknown_QueryInterface(pObj,riidResult,ppvResult); - IUnknown_Release(pObj); + IPropertyBag_Release(prop_bag); + return hr; } - if (pProp) + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk))) { - IPropertyBag_Release(pProp); + IPropertyBag_Release(prop_bag); + return hr; + } + + if (SUCCEEDED(IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void **)&persist_bag))) + { + hr = IPersistPropertyBag_Load(persist_bag, prop_bag, NULL); + IPersistPropertyBag_Release(persist_bag); } - TRACE("<- 0x%x\n", res); + if (SUCCEEDED(hr)) + hr = IUnknown_QueryInterface(unk, iid, out); - return res; + IUnknown_Release(unk); + IPropertyBag_Release(prop_bag); + + return hr; } static HRESULT WINAPI moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 01e6be98da7..4bdd2b46e82 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -46,8 +46,9 @@ static void test_devenum(void) GUID cat_guid, clsid; WCHAR *displayname; IBindCtx *bindctx; + HRESULT hr, hr2; + IUnknown *unk; VARIANT var; - HRESULT hr; int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, @@ -114,6 +115,14 @@ static void test_devenum(void) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) + IUnknown_Release(unk); + hr2 = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, (void **)&unk); + if (hr2 == S_OK) + IUnknown_Release(unk); + ok(hr2 == hr, "Expected hr %#x, got %#x.\n", hr, hr2); + hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); -- 2.26.0

2 4

[PATCH 1/2] winegstreamer: Remove some unused imports.
by Zebediah Figura 16 Apr '20

16 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 2364ac84dc5..097edf273f5 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,5 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase -- 2.26.0

1 1

[PATCH] winapi_test: Remove useless winbase.h for wininet test, in tests.dat.
by Serge Gautherie 16 Apr '20

16 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/tests.dat | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..ba2850b 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1594,7 +1594,6 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h -winbase.h wininet.h %include -- 2.10.0.windows.1

1 0

[PATCH] oledb32: Remove redundant NULL check before CoTaskMemFree()
by Michael Stefaniuc 15 Apr '20

15 Apr '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/dslocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 8a7f2d134c..86a334bea0 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -72,8 +72,7 @@ static void destroy_datasource(struct datasource *data) CoTaskMemFree(data->propinfoset->rgPropertyInfos); CoTaskMemFree(data->propinfoset); } - if (data->description) - CoTaskMemFree(data->description); + CoTaskMemFree(data->description); if (data->provider) IDBProperties_Release(data->provider); -- 2.25.2

1 0

[PATCH 2/2] winegcc: Reorder DECLSPEC_NORETURN on error().
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winegcc/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 3d6b8f3..8ec6b8e 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -52,7 +52,7 @@ enum target_platform PLATFORM_CYGWIN }; -void error(const char* s, ...) DECLSPEC_NORETURN; +DECLSPEC_NORETURN void error(const char* s, ...); void* xmalloc(size_t size); void* xrealloc(void* p, size_t size); -- 2.10.0.windows.1

1 0