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
April 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
2 participants
1016 discussions
Start a n
N
ew thread
Dmitry Timoshkov : activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_LEAF).
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: d0eaaea8556481628955fd675046cbecc2ebbee5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d0eaaea8556481628955fd67…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:33 2020 +0800 activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_LEAF). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 10 ++++++++++ dlls/activeds/tests/activeds.c | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index d89c4cb847..d68f1cb8e9 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -275,6 +275,16 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat case ADS_FORMAT_X500_DN: *adspath = path->dn ? SysAllocString(path->dn) : SysAllocStringLen(NULL, 0); break; + + case ADS_FORMAT_LEAF: + if (!path->dn) + *adspath = SysAllocStringLen(NULL, 0); + else + { + WCHAR *p = wcschr(path->dn, ','); + *adspath = p ? SysAllocStringLen(path->dn, p - path->dn) : SysAllocString(path->dn); + } + break; } TRACE("=> %s\n", debugstr_w(*adspath)); diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 9ecab56034..118c87634b 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -161,7 +161,6 @@ todo_wine hr = IADsPathname_Retrieve(path, ADS_FORMAT_LEAF, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"a=b"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);
1
0
0
0
Dmitry Timoshkov : activeds: Implement some simple cases for IADsPathname::Retrieve().
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 03e3800d89663c6d6a16c9d26a3ee07d11b8a8c0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=03e3800d89663c6d6a16c9d2…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:29 2020 +0800 activeds: Implement some simple cases for IADsPathname::Retrieve(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 16 ++++++++++++++-- dlls/activeds/tests/activeds.c | 2 -- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 3a1d9e8c16..d89c4cb847 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -252,7 +252,7 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat if (path->dn) len += wcslen(path->dn); *adspath = SysAllocStringLen(NULL, len); - if (!*adspath) return E_OUTOFMEMORY; + if (!*adspath) break; wcscpy(*adspath, path->provider); wcscat(*adspath, L"://"); @@ -263,10 +263,22 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat } if (path->dn) wcscat(*adspath, path->dn); break; + + case ADS_FORMAT_PROVIDER: + *adspath = SysAllocString(path->provider); + break; + + case ADS_FORMAT_SERVER: + *adspath = path->provider ? SysAllocString(path->server) : SysAllocStringLen(NULL, 0); + break; + + case ADS_FORMAT_X500_DN: + *adspath = path->dn ? SysAllocString(path->dn) : SysAllocStringLen(NULL, 0); + break; } TRACE("=> %s\n", debugstr_w(*adspath)); - return S_OK; + return *adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 6e5ecdf573..9ecab56034 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -151,13 +151,11 @@ todo_wine hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_SERVER, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"sample:123"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);
1
0
0
0
Dmitry Timoshkov : activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_X500).
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 29967463ad26b4d1f935dc1db78994102c507a03 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=29967463ad26b4d1f935dc1d…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:26 2020 +0800 activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_X500). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 32 +++++++++++++++++++++++++++++--- dlls/activeds/tests/activeds.c | 3 +-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index cffaf3d8e6..3a1d9e8c16 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -234,13 +234,39 @@ static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspath) { Pathname *path = impl_from_IADsPathname(iface); + int len; - FIXME("%p,%d,%p: stub\n", iface, type, adspath); + TRACE("%p,%d,%p\n", iface, type, adspath); if (!adspath) return E_INVALIDARG; - *adspath = SysAllocString(path->provider); - return *adspath ? S_OK : E_OUTOFMEMORY; + switch (type) + { + default: + FIXME("type %d not implemented\n", type); + /* fall through */ + + case ADS_FORMAT_X500: + len = wcslen(path->provider) + 3; + if (path->server) len += wcslen(path->server) + 1; + if (path->dn) len += wcslen(path->dn); + + *adspath = SysAllocStringLen(NULL, len); + if (!*adspath) return E_OUTOFMEMORY; + + wcscpy(*adspath, path->provider); + wcscat(*adspath, L"://"); + if (path->server) + { + wcscat(*adspath, path->server); + wcscat(*adspath, L"/"); + } + if (path->dn) wcscat(*adspath, path->dn); + break; + } + + TRACE("=> %s\n", debugstr_w(*adspath)); + return S_OK; } static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index dff30bbbba..6e5ecdf573 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -105,7 +105,6 @@ todo_wine bstr = NULL; hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(bstr && !wcscmp(bstr, L"LDAP://"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); @@ -147,12 +146,12 @@ todo_wine hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"LDAP://sample:123/a=b,c=d,e=f"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); ok(hr == S_OK, "got %#x\n", hr); +todo_wine ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);
1
0
0
0
Dmitry Timoshkov : activeds: Implement remaining cases for IADsPathname::Set().
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 606ececd8e2ed52c1fe418363f2482c4a32f62fc URL:
https://source.winehq.org/git/wine.git/?a=commit;h=606ececd8e2ed52c1fe41836…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:20 2020 +0800 activeds: Implement remaining cases for IADsPathname::Set(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 4733c5315f..cffaf3d8e6 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -184,8 +184,32 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) if (!adspath) return E_INVALIDARG; + if (type == ADS_SETTYPE_PROVIDER) + { + SysFreeString(path->provider); + path->provider = SysAllocString(adspath); + return path->provider ? S_OK : E_OUTOFMEMORY; + } + + if (type == ADS_SETTYPE_SERVER) + { + SysFreeString(path->server); + path->server = SysAllocString(adspath); + return path->server ? S_OK : E_OUTOFMEMORY; + } + + if (type == ADS_SETTYPE_DN) + { + SysFreeString(path->dn); + path->dn = SysAllocString(adspath); + return path->dn ? S_OK : E_OUTOFMEMORY; + } + if (type != ADS_SETTYPE_FULL) + { FIXME("type %d not implemented\n", type); + return E_INVALIDARG; + } hr = parse_path(adspath, &provider, &server, &dn); if (hr == S_OK)
1
0
0
0
Dmitry Timoshkov : activeds: Implement IADsPathname::Set(ADS_SETTYPE_FULL).
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 3656d57a9a4376131249a875bfe84450a678024f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3656d57a9a4376131249a875…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:16 2020 +0800 activeds: Implement IADsPathname::Set(ADS_SETTYPE_FULL). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 90 +++++++++++++++++++++++++++++++++++++++--- dlls/activeds/tests/activeds.c | 3 +- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 52a94cbb18..4733c5315f 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "iads.h" +#include "adserr.h" #include "wine/heap.h" #include "wine/debug.h" @@ -39,7 +40,7 @@ typedef struct { IADsPathname IADsPathname_iface; LONG ref; - BSTR adspath; + BSTR provider, server, dn; } Pathname; static inline Pathname *impl_from_IADsPathname(IADsPathname *iface) @@ -80,6 +81,9 @@ static ULONG WINAPI path_Release(IADsPathname *iface) if (!ref) { TRACE("destroying %p\n", iface); + SysFreeString(path->provider); + SysFreeString(path->server); + SysFreeString(path->dn); heap_free(path); } @@ -113,16 +117,88 @@ static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID rii return E_NOTIMPL; } +static HRESULT parse_path(BSTR path, BSTR *provider, BSTR *server, BSTR *dn) +{ + WCHAR *p, *p_server; + int server_len; + + *provider = NULL; + *server = NULL; + *dn = NULL; + + if (wcsnicmp(path, L"LDAP:", 5) != 0) + return E_ADS_BAD_PATHNAME; + + *provider = SysAllocStringLen(path, 4); + if (!*provider) return E_OUTOFMEMORY; + + p = path + 5; + if (!*p) return S_OK; + + if (*p++ != '/' || *p++ != '/' || !*p) + return E_ADS_BAD_PATHNAME; + + p_server = p; + server_len = 0; + while (*p && *p != '/') + { + p++; + server_len++; + } + if (server_len == 0) return E_ADS_BAD_PATHNAME; + + *server = SysAllocStringLen(p_server, server_len); + if (!*server) + { + SysFreeString(*provider); + return E_OUTOFMEMORY; + } + + if (!*p) return S_OK; + + if (*p++ != '/' || !*p) + { + SysFreeString(*provider); + SysFreeString(*server); + return E_ADS_BAD_PATHNAME; + } + + *dn = SysAllocString(p); + if (!*dn) + { + SysFreeString(*provider); + SysFreeString(*server); + return E_OUTOFMEMORY; + } + + return S_OK; +} + static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) { Pathname *path = impl_from_IADsPathname(iface); + HRESULT hr; + BSTR provider, server, dn; - FIXME("%p,%s,%d: stub\n", iface, debugstr_w(adspath), type); + TRACE("%p,%s,%d\n", iface, debugstr_w(adspath), type); if (!adspath) return E_INVALIDARG; - path->adspath = SysAllocString(adspath); - return path->adspath ? S_OK : E_OUTOFMEMORY; + if (type != ADS_SETTYPE_FULL) + FIXME("type %d not implemented\n", type); + + hr = parse_path(adspath, &provider, &server, &dn); + if (hr == S_OK) + { + SysFreeString(path->provider); + SysFreeString(path->server); + SysFreeString(path->dn); + + path->provider = provider; + path->server = server; + path->dn = dn; + } + return hr; } static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) @@ -139,7 +215,7 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat if (!adspath) return E_INVALIDARG; - *adspath = SysAllocString(path->adspath); + *adspath = SysAllocString(path->provider); return *adspath ? S_OK : E_OUTOFMEMORY; } @@ -223,7 +299,9 @@ static HRESULT Pathname_create(REFIID riid, void **obj) path->IADsPathname_iface.lpVtbl = &IADsPathname_vtbl; path->ref = 1; - path->adspath = NULL; + path->provider = SysAllocString(L"LDAP"); + path->server = NULL; + path->dn = NULL; hr = IADsPathname_QueryInterface(&path->IADsPathname_iface, riid, obj); IADsPathname_Release(&path->IADsPathname_iface); diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 81fe754058..dff30bbbba 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -104,7 +104,6 @@ todo_wine bstr = NULL; hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); -todo_wine ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(bstr && !wcscmp(bstr, L"LDAP://"), "got %s\n", wine_dbgstr_w(bstr)); @@ -148,12 +147,12 @@ todo_wine hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); ok(hr == S_OK, "got %#x\n", hr); +todo_wine ok(!wcscmp(bstr, L"LDAP://sample:123/a=b,c=d,e=f"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);
1
0
0
0
Dmitry Timoshkov : activeds/tests: Add some IADsPathname tests.
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 18631864de0de879dc6966ca66e283c92bb942a5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=18631864de0de879dc6966ca…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:14 2020 +0800 activeds/tests: Add some IADsPathname tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/tests/activeds.c | 98 ++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 23 ++++++++++ 2 files changed, 121 insertions(+) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 6f469f9dc1..81fe754058 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -19,15 +19,20 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "initguid.h" #include "iads.h" #include "adshlp.h" #include "adserr.h" #include "wine/test.h" +DEFINE_GUID(CLSID_Pathname,0x080d0d78,0xf421,0x11d0,0xa3,0x6e,0x00,0xc0,0x4f,0xb9,0x50,0xdc); + static void test_ADsBuildVarArrayStr(void) { const WCHAR *props[] = { L"prop1", L"prop2" }; @@ -79,7 +84,100 @@ static void test_ADsBuildVarArrayStr(void) VariantClear(&var); } +static void test_Pathname(void) +{ + static const WCHAR * const elem[3] = { L"a=b",L"c=d",L"e=f" }; + HRESULT hr; + IADsPathname *path; + BSTR bstr; + LONG count, i; + + hr = CoCreateInstance(&CLSID_Pathname, 0, CLSCTX_INPROC_SERVER, &IID_IADsPathname, (void **)&path); + ok(hr == S_OK, "got %#x\n", hr); + + count = 0xdeadbeef; + hr = IADsPathname_GetNumElements(path, &count); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(count == 0, "got %d\n", count); + + bstr = NULL; + hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(bstr && !wcscmp(bstr, L"LDAP://"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + bstr = SysAllocString(L"LDAP://sample"); + hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); + ok(hr == S_OK, "got %#x\n", hr); + SysFreeString(bstr); + + count = 0xdeadbeef; + hr = IADsPathname_GetNumElements(path, &count); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(count == 0, "got %d\n", count); + + hr = IADsPathname_GetElement(path, 0, &bstr); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_INDEX), "got %#x\n", hr); + SysFreeString(bstr); + + bstr = SysAllocString(L"LDAP://sample:123/a=b,c=d,e=f"); + hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); + ok(hr == S_OK, "got %#x\n", hr); + SysFreeString(bstr); + + count = 0xdeadbeef; + hr = IADsPathname_GetNumElements(path, &count); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(count == 3, "got %d\n", count); + for (i = 0; i < count; i++) + { + hr = IADsPathname_GetElement(path, i, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + ok(!wcscmp(bstr, elem[i]), "%u: %s\n", i, wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } + + hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + ok(!wcscmp(bstr, L"LDAP://sample:123/a=b,c=d,e=f"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IADsPathname_Retrieve(path, ADS_FORMAT_SERVER, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(!wcscmp(bstr, L"sample:123"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IADsPathname_Retrieve(path, ADS_FORMAT_LEAF, &bstr); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(!wcscmp(bstr, L"a=b"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + IADsPathname_Release(path); +} + START_TEST(activeds) { + CoInitialize(NULL); + + test_Pathname(); test_ADsBuildVarArrayStr(); + + CoUninitialize(); } diff --git a/include/iads.idl b/include/iads.idl index e9eaab77be..6dfafce3a8 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -370,6 +370,29 @@ typedef enum ADS_SECURITY_INFO_SACL = 0x8 } ADS_SECURITY_INFO_ENUM; +typedef enum +{ + ADS_SETTYPE_FULL = 1, + ADS_SETTYPE_PROVIDER = 2, + ADS_SETTYPE_SERVER = 3, + ADS_SETTYPE_DN = 4 +} ADS_SETTYPE_ENUM; + +typedef enum +{ + ADS_FORMAT_WINDOWS = 1, + ADS_FORMAT_WINDOWS_NO_SERVER = 2, + ADS_FORMAT_WINDOWS_DN = 3, + ADS_FORMAT_WINDOWS_PARENT = 4, + ADS_FORMAT_X500 = 5, + ADS_FORMAT_X500_NO_SERVER = 6, + ADS_FORMAT_X500_DN = 7, + ADS_FORMAT_X500_PARENT = 8, + ADS_FORMAT_SERVER = 9, + ADS_FORMAT_PROVIDER = 10, + ADS_FORMAT_LEAF = 11 +} ADS_FORMAT_ENUM; + /***************************************************************************** * IADsContainer interface */
1
0
0
0
Zebediah Figura : maintainers: Take maintainership of the HTTP server libraries.
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 8af510ea47f868f4c065a54e0a6f862adcaa4095 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8af510ea47f868f4c065a54e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 19:13:14 2020 -0500 maintainers: Take maintainership of the HTTP server libraries. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f7b44e1b05..7f228f93bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -142,7 +142,7 @@ F: dlls/hidclass.sys/ F: dlls/winehid.sys/ HTTP server -P: Zebediah Figura <z.figura12(a)gmail.com> +M: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/httpapi/ F: dlls/http.sys/
1
0
0
0
Zebediah Figura : maintainers: Take maintainership of DirectShow.
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 522b970815b120ae182b4717a3c411a2b392d7bc URL:
https://source.winehq.org/git/wine.git/?a=commit;h=522b970815b120ae182b4717…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 19:13:13 2020 -0500 maintainers: Take maintainership of DirectShow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 88876773d2..f7b44e1b05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -103,8 +103,8 @@ F: dlls/dpnet/ F: dlls/dpwsockx/ DirectShow +M: Zebediah Figura <z.figura12(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/amstream/ F: dlls/mciqtz32/ F: dlls/qasf/
1
0
0
0
Zebediah Figura : maintainers: Add myself to some sections.
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: 99c020a0265aad7b825e29d7038629921eac3372 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=99c020a0265aad7b825e29d7…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 19:13:12 2020 -0500 maintainers: Add myself to some sections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 82f434af2b..88876773d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -104,13 +104,15 @@ F: dlls/dpwsockx/ DirectShow P: Andrew Eikum <aeikum(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/amstream/ F: dlls/mciqtz32/ +F: dlls/qasf/ F: dlls/qcap/ F: dlls/qedit/ F: dlls/quartz/ F: dlls/strmbase/ -F: dlls/winegstreamer/ +F: dlls/winegstreamer/gstdemux.c F: dlls/wineqtdecoder/ DirectWrite @@ -139,6 +141,11 @@ F: dlls/hid/ F: dlls/hidclass.sys/ F: dlls/winehid.sys/ +HTTP server +P: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/httpapi/ +F: dlls/http.sys/ + Input methods M: Aric Stewart <aric(a)codeweavers.com> F: dlls/imm32/ @@ -162,6 +169,7 @@ F: dlls/msvc*/ MSI installers M: Hans Leidekker <hans(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/msi/ Netstat @@ -205,6 +213,12 @@ P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c +Plug and Play +P: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/newdev/ +F: dlls/ntoskrnl.exe/pnp.c +F: dlls/setupapi/devinst.c + Postscript Driver M: Huw Davies <huw(a)codeweavers.com> F: dlls/wineps.drv/ @@ -222,6 +236,7 @@ F: dlls/riched20 RPC Runtime P: Huw Davies <huw(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 F: tools/widl
1
0
0
0
Zebediah Figura : maintainers: Add Paul Gofman to the Staging branch section.
by Alexandre Julliard
10 Apr '20
10 Apr '20
Module: wine Branch: master Commit: f57776117b9cb69c061d0a34bddfe24cc9274894 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f57776117b9cb69c061d0a34…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 19:13:11 2020 -0500 maintainers: Add Paul Gofman to the Staging branch section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 93e89193b7..82f434af2b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -313,5 +313,6 @@ W:
https://wiki.winehq.org/StableRules
Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> P: Zebediah Figura <z.figura12(a)gmail.com> +P: Paul Gofman <gofmanp(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W:
https://wine-staging.com/
1
0
0
0
← Newer
1
...
67
68
69
70
71
72
73
...
102
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
101
102
Results per page:
10
25
50
100
200