Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
29967463
Commit
29967463
authored
Apr 10, 2020
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Apr 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_X500).
Signed-off-by:
Dmitry Timoshkov
<
dmitry@baikal.ru
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
606ececd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
5 deletions
+30
-5
pathname.c
dlls/activeds/pathname.c
+29
-3
activeds.c
dlls/activeds/tests/activeds.c
+1
-2
No files found.
dlls/activeds/pathname.c
View file @
29967463
...
@@ -234,13 +234,39 @@ static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type)
...
@@ -234,13 +234,39 @@ static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type)
static
HRESULT
WINAPI
path_Retrieve
(
IADsPathname
*
iface
,
LONG
type
,
BSTR
*
adspath
)
static
HRESULT
WINAPI
path_Retrieve
(
IADsPathname
*
iface
,
LONG
type
,
BSTR
*
adspath
)
{
{
Pathname
*
path
=
impl_from_IADsPathname
(
iface
);
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
;
if
(
!
adspath
)
return
E_INVALIDARG
;
*
adspath
=
SysAllocString
(
path
->
provider
);
switch
(
type
)
return
*
adspath
?
S_OK
:
E_OUTOFMEMORY
;
{
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
)
static
HRESULT
WINAPI
path_GetNumElements
(
IADsPathname
*
iface
,
LONG
*
count
)
...
...
dlls/activeds/tests/activeds.c
View file @
29967463
...
@@ -105,7 +105,6 @@ todo_wine
...
@@ -105,7 +105,6 @@ todo_wine
bstr
=
NULL
;
bstr
=
NULL
;
hr
=
IADsPathname_Retrieve
(
path
,
ADS_FORMAT_X500
,
&
bstr
);
hr
=
IADsPathname_Retrieve
(
path
,
ADS_FORMAT_X500
,
&
bstr
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
todo_wine
ok
(
bstr
&&
!
wcscmp
(
bstr
,
L"LDAP://"
),
"got %s
\n
"
,
wine_dbgstr_w
(
bstr
));
ok
(
bstr
&&
!
wcscmp
(
bstr
,
L"LDAP://"
),
"got %s
\n
"
,
wine_dbgstr_w
(
bstr
));
SysFreeString
(
bstr
);
SysFreeString
(
bstr
);
...
@@ -147,12 +146,12 @@ todo_wine
...
@@ -147,12 +146,12 @@ todo_wine
hr
=
IADsPathname_Retrieve
(
path
,
ADS_FORMAT_X500
,
&
bstr
);
hr
=
IADsPathname_Retrieve
(
path
,
ADS_FORMAT_X500
,
&
bstr
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
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
));
ok
(
!
wcscmp
(
bstr
,
L"LDAP://sample:123/a=b,c=d,e=f"
),
"got %s
\n
"
,
wine_dbgstr_w
(
bstr
));
SysFreeString
(
bstr
);
SysFreeString
(
bstr
);
hr
=
IADsPathname_Retrieve
(
path
,
ADS_FORMAT_PROVIDER
,
&
bstr
);
hr
=
IADsPathname_Retrieve
(
path
,
ADS_FORMAT_PROVIDER
,
&
bstr
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
todo_wine
ok
(
!
wcscmp
(
bstr
,
L"LDAP"
),
"got %s
\n
"
,
wine_dbgstr_w
(
bstr
));
ok
(
!
wcscmp
(
bstr
,
L"LDAP"
),
"got %s
\n
"
,
wine_dbgstr_w
(
bstr
));
SysFreeString
(
bstr
);
SysFreeString
(
bstr
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment