wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Jactry Zeng : qasf: Implement IFileSourceFilter stub for WM ASF reader.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 5e38ba09e774ae551d099807041433359865e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e38ba09e774ae551d099807… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 6 11:54:06 2020 -0500 qasf: Implement IFileSourceFilter stub for WM ASF reader. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/asfreader.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ dlls/qasf/tests/asfreader.c | 2 +- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index e5dbd1d052..6d4a05a723 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); struct asf_reader { struct strmbase_filter filter; + IFileSourceFilter IFileSourceFilter_iface; }; static inline struct asf_reader *impl_reader_from_strmbase_filter(struct strmbase_filter *iface) @@ -45,10 +46,79 @@ static void asf_reader_destroy(struct strmbase_filter *iface) free(filter); } +static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) +{ + struct asf_reader *filter = impl_reader_from_strmbase_filter(iface); + + if (IsEqualGUID(iid, &IID_IFileSourceFilter)) + { + *out = &filter->IFileSourceFilter_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static struct strmbase_filter_ops filter_ops = { .filter_get_pin = asf_reader_get_pin, .filter_destroy = asf_reader_destroy, + .filter_query_interface = asf_reader_query_interface, +}; + +static inline struct asf_reader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) +{ + return CONTAINING_RECORD(iface, struct asf_reader, IFileSourceFilter_iface); +} + +static HRESULT WINAPI filesourcefilter_QueryInterface(IFileSourceFilter *iface, REFIID iid, void **out) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, iid, out); +} + +static ULONG WINAPI filesourcefilter_AddRef(IFileSourceFilter *iface) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + return IBaseFilter_AddRef(&filter->filter.IBaseFilter_iface); +} + +static ULONG WINAPI filesourcefilter_Release(IFileSourceFilter *iface) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + return IBaseFilter_Release(&filter->filter.IBaseFilter_iface); +} + +static HRESULT WINAPI filesourcefilter_Load(IFileSourceFilter *iface, LPCOLESTR filename, const AM_MEDIA_TYPE *type) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + FIXME("filter %p, filename %s, type %p, stub!\n", filter, debugstr_w(filename), type); + strmbase_dump_media_type(type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI filesourcefilter_GetCurFile(IFileSourceFilter *iface, LPOLESTR *filename, AM_MEDIA_TYPE *type) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + FIXME("filter %p, filename %p, type %p, stub!\n", filter, filename, type); + + return E_NOTIMPL; +} + +static const IFileSourceFilterVtbl filesourcefilter_vtbl = +{ + filesourcefilter_QueryInterface, + filesourcefilter_AddRef, + filesourcefilter_Release, + filesourcefilter_Load, + filesourcefilter_GetCurFile, }; HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) @@ -59,6 +129,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); + object->IFileSourceFilter_iface.lpVtbl = &filesourcefilter_vtbl; TRACE("Created WM ASF reader %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qasf/tests/asfreader.c b/dlls/qasf/tests/asfreader.c index 9098d5cfdf..607b1ca597 100644 --- a/dlls/qasf/tests/asfreader.c +++ b/dlls/qasf/tests/asfreader.c @@ -71,7 +71,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); - todo_wine check_interface(filter, &IID_IFileSourceFilter, TRUE); + check_interface(filter, &IID_IFileSourceFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IUnknown, TRUE);

1 0

Jactry Zeng : qasf: Implement WM ASF reader stub.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: b15298c2daf2ebd6bd46a759db6b7d6a5597b463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15298c2daf2ebd6bd46a759… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 6 11:54:05 2020 -0500 qasf: Implement WM ASF reader stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 1 + dlls/qasf/asfreader.c | 67 ++++++++++++++++ dlls/qasf/qasf_classes.idl | 7 ++ dlls/qasf/qasf_main.c | 3 + dlls/qasf/qasf_private.h | 1 + dlls/qasf/tests/Makefile.in | 1 + dlls/qasf/tests/asfreader.c | 192 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 272 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b15298c2daf2ebd6bd46…

1 0

Andrew Eikum : kernel32/tests: Actually run OpenFile tests.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 2cd776fffdf7a85dcfe13fdef70a1c817ef83dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd776fffdf7a85dcfe13fde… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 6 11:00:07 2020 -0500 kernel32/tests: Actually run OpenFile tests. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e8a31c6e74..29620654bd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3352,17 +3352,6 @@ static void test_OpenFile(void) ofs.szPathName ); } - length = GetCurrentDirectoryA(MAX_PATH, buff) + sizeof(filename); - - if (length >= MAX_PATH) - { - trace("Buffer too small, requested length = %d, but MAX_PATH = %d. Skipping test.\n", length, MAX_PATH); - return; - } - p = buff + strlen(buff); - if (p > buff && p[-1] != '\\') *p++ = '\\'; - strcpy( p, filename ); - memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); /* Create an empty file */ @@ -3389,8 +3378,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3404,8 +3393,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3419,8 +3408,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3434,8 +3423,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); @@ -3447,8 +3436,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); retval = GetFileAttributesA(filename); ok( retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file\n" );

1 0

Nikolay Sivov : mfreadwrite: Add support for seeking in Source Reader.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: f540d1615fe66c95a3824e86e5292a026511749e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f540d1615fe66c95a3824e86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 6 17:19:30 2020 +0300 mfreadwrite: Add support for seeking in Source Reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 147 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 115 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f540d1615fe66c95a382…

1 0

Nikolay Sivov : mfreadwrite: Implement MF_SOURCE_READER_ANY_STREAM for synchronous case.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 978d497d95d40f1189d663c7a9cdd5aa065c7905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=978d497d95d40f1189d663c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 6 17:19:29 2020 +0300 mfreadwrite: Implement MF_SOURCE_READER_ANY_STREAM for synchronous case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 146 +++++++++++++++++++++++++--------------- dlls/mfreadwrite/tests/mfplat.c | 43 +++++++----- 2 files changed, 119 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=978d497d95d40f1189d6…

1 0

Dmitry Timoshkov : adsldp/tests: Remove no longer needed goto.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 8a3de59fcb5c0bb8b3cfac559c1eead10cd43de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3de59fcb5c0bb8b3cfac55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:12:04 2020 +0800 adsldp/tests: Remove no longer needed goto. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 208a9fa2fe..e76bd2e0b6 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -505,7 +505,6 @@ todo_wine hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) goto fail; hr = IDirectorySearch_GetNextRow(ds, sh); ok(hr == S_OK, "got %#x\n", hr); @@ -517,7 +516,6 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); IDirectorySearch_Release(ds); -fail: IDirectoryObject_Release(dirobj); }

1 0

Dmitry Timoshkov : adsldp: Recognize ADS_SEARCHPREF_CACHE_RESULTS in IDirectorySearch::SetSearchPreference().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 220b871236517adb27f497355b428bdc62f47431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=220b871236517adb27f49735… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:57 2020 +0800 adsldp: Recognize ADS_SEARCHPREF_CACHE_RESULTS in IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 952e4931d4..f2773262a6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -401,6 +401,7 @@ typedef struct { ADS_SCOPEENUM scope; int pagesize; + BOOL cache_results; } search; } LDAP_namespace; @@ -1228,6 +1229,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S prefs[i].dwStatus = ADS_STATUS_S_OK; break; + case ADS_SEARCHPREF_CACHE_RESULTS: + if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) + { + FIXME("ADS_SEARCHPREF_CACHE_RESULTS: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("CACHE_RESULTS: %d\n", prefs[i].vValue.u.Boolean); + ldap->search.cache_results = prefs[i].vValue.u.Boolean; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1728,6 +1742,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs = NULL; ldap->search.scope = ADS_SCOPE_SUBTREE; ldap->search.pagesize = 0; + ldap->search.cache_results = TRUE; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0;

1 0

Dmitry Timoshkov : adsldp: Recognize ADS_SEARCHPREF_PAGESIZE in IDirectorySearch::SetSearchPreference().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 5c8f688f1a332af736197aa098e36c049cba968d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8f688f1a332af736197aa0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:51 2020 +0800 adsldp: Recognize ADS_SEARCHPREF_PAGESIZE in IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 2b5f621fba..952e4931d4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -400,6 +400,7 @@ typedef struct struct { ADS_SCOPEENUM scope; + int pagesize; } search; } LDAP_namespace; @@ -1214,6 +1215,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S break; } + case ADS_SEARCHPREF_PAGESIZE: + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_PAGESIZE: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("PAGESIZE: %d\n", prefs[i].vValue.u.Integer); + ldap->search.pagesize = prefs[i].vValue.u.Integer; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1713,6 +1727,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs_count_allocated = 0; ldap->attrs = NULL; ldap->search.scope = ADS_SCOPE_SUBTREE; + ldap->search.pagesize = 0; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0;

1 0

Dmitry Timoshkov : adsldp: Always fully initialize returned column values.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 0d15fb330d891a0f03470e14e40abaae48e33bf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d15fb330d891a0f03470e14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:44 2020 +0800 adsldp: Always fully initialize returned column values. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index a4467c0abe..2b5f621fba 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1393,13 +1393,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1421,13 +1418,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1459,13 +1453,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1488,13 +1479,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { struct berval **values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_values_len(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_free_len(values); @@ -1533,6 +1521,8 @@ static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDL if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + memset(col, 0, sizeof(*col)); + if (!wcsicmp(name, L"ADsPath")) { WCHAR *dn = ldap_get_dnW(ldap->ld, ldap_ctx->entry);

1 0

Dmitry Timoshkov : wldap32: Fix server controls lookup logic.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 6df25aafbb2999de30f17308cd516c509abeb05b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6df25aafbb2999de30f17308… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:39 2020 +0800 wldap32: Fix server controls lookup logic. This fixes 'supported == user_count' comparison if the server has duplicate control OIDs in the returned list. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 87eb779953..cf948bf037 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -439,10 +439,15 @@ static BOOL is_supported_server_ctrls( WLDAP32_LDAP *ld, LDAPControl **ctrls ) for (n = 0; n < user_count; n++) { + TRACE("looking for %s\n", debugstr_a(ctrls[n]->ldctl_oid)); + for (i = 0; i < server_count; i++) { if (!strncmp( ctrls[n]->ldctl_oid, ld->ld_server_ctrls[i]->bv_val, ld->ld_server_ctrls[i]->bv_len)) + { supported++; + break; + } } }

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