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
57f3d503
Commit
57f3d503
authored
Mar 30, 2020
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Mar 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adsldp: Fix IDirectorySearch::GetColumn() behaviour for not found case.
Signed-off-by:
Dmitry Timoshkov
<
dmitry@baikal.ru
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
21959bf0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
adsldp.c
dlls/adsldp/adsldp.c
+5
-1
ldap.c
dlls/adsldp/tests/ldap.c
+12
-0
No files found.
dlls/adsldp/adsldp.c
View file @
57f3d503
...
@@ -1434,7 +1434,11 @@ exit:
...
@@ -1434,7 +1434,11 @@ exit:
}
}
values
=
ldap_get_values_lenW
(
ldap
->
ld
,
ldap_ctx
->
entry
,
name
);
values
=
ldap_get_values_lenW
(
ldap
->
ld
,
ldap_ctx
->
entry
,
name
);
if
(
!
values
)
return
ERROR_DS_NO_ATTRIBUTE_OR_VALUE
;
if
(
!
values
)
{
memset
(
col
,
0
,
sizeof
(
*
col
));
return
E_ADS_COLUMN_NOT_SET
;
}
count
=
ldap_count_values_len
(
values
);
count
=
ldap_count_values_len
(
values
);
...
...
dlls/adsldp/tests/ldap.c
View file @
57f3d503
...
@@ -417,6 +417,18 @@ todo_wine
...
@@ -417,6 +417,18 @@ todo_wine
ok
(
hr
==
E_ADS_BAD_PARAMETER
,
"got %#x
\n
"
,
hr
);
ok
(
hr
==
E_ADS_BAD_PARAMETER
,
"got %#x
\n
"
,
hr
);
}
}
hr
=
IDirectorySearch_GetFirstRow
(
ds
,
sh
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
memset
(
&
col
,
0x55
,
sizeof
(
col
));
hr
=
IDirectorySearch_GetColumn
(
ds
,
sh
,
(
WCHAR
*
)
L"deadbeef"
,
&
col
);
ok
(
hr
==
E_ADS_COLUMN_NOT_SET
,
"got %#x
\n
"
,
hr
);
ok
(
!
col
.
pszAttrName
,
"got %p
\n
"
,
col
.
pszAttrName
);
ok
(
col
.
dwADsType
==
ADSTYPE_INVALID
||
broken
(
col
.
dwADsType
!=
ADSTYPE_INVALID
)
/* XP */
,
"got %d
\n
"
,
col
.
dwADsType
);
ok
(
!
col
.
pADsValues
,
"got %p
\n
"
,
col
.
pADsValues
);
ok
(
!
col
.
dwNumValues
,
"got %u
\n
"
,
col
.
dwNumValues
);
ok
(
!
col
.
hReserved
,
"got %p
\n
"
,
col
.
hReserved
);
hr
=
IDirectorySearch_CloseSearchHandle
(
ds
,
sh
);
hr
=
IDirectorySearch_CloseSearchHandle
(
ds
,
sh
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %#x
\n
"
,
hr
);
...
...
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