winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2020
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
996 discussions
Start a n
N
ew thread
Dmitry Timoshkov : adsldp/tests: Add some tests for IDirectorySearch.
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: 032d848ac4b31838158b4f9d9dbcd424f2949d02 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=032d848ac4b31838158b4f9d…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 16:04:26 2020 +0800 adsldp/tests: Add some tests for IDirectorySearch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 245 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=032d848ac4b31838158b…
1
0
0
0
Dmitry Timoshkov : adsldp: Add support for special column name "ADsPath" to IDirectorySearch::GetColumn().
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: e5ecd3b465ec9667f167166804393806c343d0db URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e5ecd3b465ec9667f1671668…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:40 2020 +0800 adsldp: Add support for special column name "ADsPath" to IDirectorySearch::GetColumn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index fed9a8afca..7385a40e25 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1342,6 +1342,42 @@ static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDL if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + if (!wcsicmp(name, L"ADsPath")) + { + WCHAR *dn = ldap_get_dnW(ldap->ld, ldap_ctx->entry); + + col->pADsValues = heap_alloc(sizeof(col->pADsValues[0])); + if (!col->pADsValues) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + count = sizeof(L"LDAP://") + (wcslen(ldap->host) + 1 /* '/' */) * sizeof(WCHAR); + if (dn) count += wcslen(dn) * sizeof(WCHAR); + + col->pADsValues[0].u.CaseIgnoreString = heap_alloc(count); + if (!col->pADsValues[0].u.CaseIgnoreString) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + wcscpy(col->pADsValues[0].u.CaseIgnoreString, L"LDAP://"); + wcscat(col->pADsValues[0].u.CaseIgnoreString, ldap->host); + wcscat(col->pADsValues[0].u.CaseIgnoreString, L"/"); + if (dn) wcscat(col->pADsValues[0].u.CaseIgnoreString, dn); + col->dwADsType = ADSTYPE_CASE_IGNORE_STRING; + col->dwNumValues = 1; + col->pszAttrName = strdupW(name); + + TRACE("=> %s\n", debugstr_w(col->pADsValues[0].u.CaseIgnoreString)); + hr = S_OK; +exit: + ldap_memfreeW(dn); + return hr; + } + values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE;
1
0
0
0
Dmitry Timoshkov : adsldp: Implement IDirectorySearch::GetColumn().
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: 889e66c2fea2a05845a01a40e626330d495430a3 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=889e66c2fea2a05845a01a40…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:16 2020 +0800 adsldp: Implement IDirectorySearch::GetColumn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 51 ++++++++++++++++++++++++++++++++++++++++++-- dlls/adsldp/adsldp_private.h | 17 +++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 859d42546f..fed9a8afca 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1301,11 +1301,58 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR return S_ADS_NOMORE_COLUMNS; } +static HRESULT add_column_values(ADS_SEARCH_COLUMN *col, struct berval **values, DWORD count) +{ + DWORD i; + + col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + if (!col->pADsValues) + return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + { + DWORD outlen; + TRACE("=> %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); + col->pADsValues[i].u.CaseIgnoreString = strnAtoW(values[i]->bv_val, values[i]->bv_len, &outlen); + if (!col->pADsValues[i].u.CaseIgnoreString) + { + heap_free(col->pADsValues); + return E_OUTOFMEMORY; + } + } + + col->dwADsType = ADSTYPE_CASE_IGNORE_STRING; + col->dwNumValues = count; + + return S_OK; +} + static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR name, PADS_SEARCH_COLUMN col) { - FIXME("%p,%p,%s,%p: stub\n", iface, res, debugstr_w(name), col); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + HRESULT hr; + struct berval **values; + ULONG count; + + TRACE("%p,%p,%s,%p\n", iface, res, debugstr_w(name), col); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + + values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); + if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE; + + count = ldap_count_values_len(values); + + hr = add_column_values(col, values, count); + ldap_value_free_len(values); + if (hr == S_OK) + col->pszAttrName = strdupW(name); + + return hr; } static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COLUMN col) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 0443ffbf6e..149d52eb63 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -29,6 +29,23 @@ static inline WCHAR *strdupW(const WCHAR *src) return dst; } +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 + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, str, inlen, ret, len ); + ret[len] = 0; + *outlen = len; + } + } + return ret; +} + DWORD map_ldap_error(DWORD) DECLSPEC_HIDDEN; #endif
1
0
0
0
Dmitry Timoshkov : adsldp: Add special column "ADsPath" at the end of the entry.
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: e53a00944e1f494e36fdb72356463f038af5de23 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e53a00944e1f494e36fdb723…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:04 2020 +0800 adsldp: Add special column "ADsPath" at the end of the entry. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b59b31b21a..859d42546f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -401,6 +401,7 @@ struct ldap_search_context LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; + BOOL add_ADsPath; }; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -1274,7 +1275,10 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR if (!name || !ldap_ctx || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; if (!ldap_ctx->ber) + { attr = ldap_first_attributeW(ldap->ld, ldap_ctx->entry, &ldap_ctx->ber); + ldap_ctx->add_ADsPath = TRUE; + } else attr = ldap_next_attributeW(ldap->ld, ldap_ctx->entry, ldap_ctx->ber); @@ -1285,6 +1289,13 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR ldap_memfreeW(attr); return *name ? S_OK : E_OUTOFMEMORY; } + else if (ldap_ctx->add_ADsPath) + { + ldap_ctx->add_ADsPath = FALSE; + *name = AllocADsStr((WCHAR *)L"ADsPath"); + TRACE("=> %s\n", debugstr_w(*name)); + return *name ? S_OK : E_OUTOFMEMORY; + } *name = NULL; return S_ADS_NOMORE_COLUMNS;
1
0
0
0
Dmitry Timoshkov : adsldp: Implement IDirectorySearch::GetNextColumnName().
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: 3adc9c5b215aac869cff7e36aeeddc9bc2ace670 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3adc9c5b215aac869cff7e36…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:09:39 2020 +0800 adsldp: Implement IDirectorySearch::GetNextColumnName(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 31 ++++++++++++++++++++++++++++--- include/adshlp.h | 2 ++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 350523222a..b59b31b21a 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -399,6 +399,7 @@ typedef struct struct ldap_search_context { LDAPMessage *res, *entry; + BerElement *ber; ULONG count, pos; }; @@ -1249,6 +1250,7 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND return S_ADS_NOMORE_ROWS; ldap_ctx->pos++; + ldap_ctx->ber = NULL; return S_OK; } @@ -1259,10 +1261,33 @@ static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_ return E_NOTIMPL; } -static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *names) +static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *name) { - FIXME("%p,%p,%p: stub\n", iface, res, names); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + WCHAR *attr; + + TRACE("%p,%p,%p\n", iface, res, name); + + if (!ldap->ld) return E_NOTIMPL; + + if (!name || !ldap_ctx || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + + if (!ldap_ctx->ber) + attr = ldap_first_attributeW(ldap->ld, ldap_ctx->entry, &ldap_ctx->ber); + else + attr = ldap_next_attributeW(ldap->ld, ldap_ctx->entry, ldap_ctx->ber); + + if (attr) + { + TRACE("=> %s\n", debugstr_w(attr)); + *name = AllocADsStr(attr); + ldap_memfreeW(attr); + return *name ? S_OK : E_OUTOFMEMORY; + } + + *name = NULL; + return S_ADS_NOMORE_COLUMNS; } static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, diff --git a/include/adshlp.h b/include/adshlp.h index 0b08c1a99c..dac57857ed 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -28,7 +28,9 @@ 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**); +LPWSTR WINAPI AllocADsStr(LPWSTR); BOOL WINAPI FreeADsMem(LPVOID); +BOOL WINAPI FreeADsStr(LPWSTR); #ifdef __cplusplus }
1
0
0
0
Dmitry Timoshkov : adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic.
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: d2ab8296d48e4c0148ab48bf61aa719d39af7bb4 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d2ab8296d48e4c0148ab48bf…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:09:20 2020 +0800 adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e3b0bce9a2..350523222a 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1211,11 +1211,9 @@ static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HAN if (!res) return E_ADS_BAD_PARAMETER; - ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); - ldap_ctx->pos = 0; - ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + ldap_ctx->entry = NULL; - return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; + return IDirectorySearch_GetNextRow(iface, res); } static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) @@ -1233,6 +1231,10 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND { 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); } else @@ -1241,10 +1243,14 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND return S_ADS_NOMORE_ROWS; ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->res); - ldap_ctx->pos++; } - return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; + if (!ldap_ctx->entry) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->pos++; + + return S_OK; } static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res)
1
0
0
0
Dmitry Timoshkov : adsldp: Add a trace.
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: 7758d7a11c9295dc19b9e1c16946a5f90c811423 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7758d7a11c9295dc19b9e1c1…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:09:01 2020 +0800 adsldp: Add a trace. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 76a3f285c4..e3b0bce9a2 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1124,6 +1124,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SCOPE_BASE: case ADS_SCOPE_ONELEVEL: case ADS_SCOPE_SUBTREE: + TRACE("SEARCH_SCOPE: %d\n", prefs[i].vValue.u.Integer); ldap->search.scope = prefs[i].vValue.u.Integer; prefs[i].dwStatus = ADS_STATUS_S_OK; break;
1
0
0
0
Dmitry Timoshkov : adsldp: Fix a memory leak.
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: 381b1396b9330b45782daad5a5bc1f2652b91b12 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=381b1396b9330b45782daad5…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:08:54 2020 +0800 adsldp: Fix a memory leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 4957828391..76a3f285c4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1169,7 +1169,10 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = heap_alloc((count + 1) * sizeof(props[0])); if (!props) + { + heap_free(ldap_ctx); return E_OUTOFMEMORY; + } for (i = 0; i < count; i++) props[i] = names[i];
1
0
0
0
Jacek Caban : dbghelp: Use LONG_PTR instead of long type.
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: f803da493aeb4cf118fb9b076e8042c2535fbcdb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f803da493aeb4cf118fb9b07…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 16:51:49 2020 +0100 dbghelp: Use LONG_PTR instead of long type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/dbghelp_private.h | 68 ++++++++++++++-------------- dlls/dbghelp/dwarf.c | 100 ++++++++++++++++++++--------------------- dlls/dbghelp/elf_module.c | 50 ++++++++++----------- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 70 ++++++++++++++--------------- dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/module.c | 4 +- dlls/dbghelp/msc.c | 6 +-- dlls/dbghelp/stabs.c | 54 +++++++++++----------- dlls/dbghelp/storage.c | 8 ++-- dlls/dbghelp/symbol.c | 18 ++++---- dlls/dbghelp/type.c | 2 +- 13 files changed, 193 insertions(+), 193 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=f803da493aeb4cf118fb…
1
0
0
0
Jacek Caban : dbghelp: Remove unused code in module_find_cb.
by Alexandre Julliard
26 Mar '20
26 Mar '20
Module: wine Branch: master Commit: 8d702a3aa54fc61bd146f584e66364a12a0ee3a0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8d702a3aa54fc61bd146f584…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 16:51:20 2020 +0100 dbghelp: Remove unused code in module_find_cb. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 06208d109d..24649cf280 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -474,7 +474,7 @@ struct module_find static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) { struct module_find* mf = user; - DWORD size, checksum, timestamp; + DWORD size, timestamp; unsigned matched = 0; /* the matching weights: @@ -524,30 +524,6 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) if (timestamp == mf->dw1 && size == mf->dw2) matched++; } break; - case DMT_MACHO: - case DMT_ELF: - { - HANDLE file; - - file = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file == INVALID_HANDLE_VALUE) break; - - checksum = calc_crc32(file); - if (checksum == mf->dw1) matched += 2; - else - { - struct image_file_map fmap; - WARN("Found %s, but wrong checksums: %08x %08x\n", debugstr_w(buffer), checksum, mf->dw1); - if (elf_map_handle(file, &fmap)) /* FIXME: validate macho files */ - { - image_unmap_file(&fmap); - matched++; - } - } - CloseHandle(file); - } - break; case DMT_PDB: { struct pdb_lookup pdb_lookup;
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
...
100
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
Results per page:
10
25
50
100
200