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
9f4c67d5
Commit
9f4c67d5
authored
Jul 08, 2005
by
Michael Jung
Committed by
Alexandre Julliard
Jul 08, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return correct HRESULT code in UnixFolder's IEnumIDList::Next.
Corresponding test.
parent
199efb74
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
shfldr_unixfs.c
dlls/shell32/shfldr_unixfs.c
+1
-1
shlfolder.c
dlls/shell32/tests/shlfolder.c
+8
-5
No files found.
dlls/shell32/shfldr_unixfs.c
View file @
9f4c67d5
...
@@ -1603,7 +1603,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface,
...
@@ -1603,7 +1603,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface,
if
(
pceltFetched
)
if
(
pceltFetched
)
*
pceltFetched
=
i
;
*
pceltFetched
=
i
;
return
i
==
celt
?
S_OK
:
S_FALSE
;
return
(
i
==
0
)
?
S_FALSE
:
S_OK
;
}
}
static
HRESULT
WINAPI
UnixSubFolderIterator_IEnumIDList_Skip
(
IEnumIDList
*
iface
,
ULONG
celt
)
static
HRESULT
WINAPI
UnixSubFolderIterator_IEnumIDList_Skip
(
IEnumIDList
*
iface
,
ULONG
celt
)
...
...
dlls/shell32/tests/shlfolder.c
View file @
9f4c67d5
...
@@ -104,7 +104,7 @@ static void Cleanup(void)
...
@@ -104,7 +104,7 @@ static void Cleanup(void)
static
void
test_EnumObjects
(
IShellFolder
*
iFolder
)
static
void
test_EnumObjects
(
IShellFolder
*
iFolder
)
{
{
IEnumIDList
*
iEnumList
;
IEnumIDList
*
iEnumList
;
ITEMIDLIST
*
newPIDL
,
*
(
idlArr
[
5
])
;
LPITEMIDLIST
newPIDL
,
idlArr
[
10
]
;
ULONG
NumPIDLs
;
ULONG
NumPIDLs
;
int
i
=
0
,
j
;
int
i
=
0
,
j
;
HRESULT
hr
;
HRESULT
hr
;
...
@@ -131,10 +131,13 @@ static void test_EnumObjects(IShellFolder *iFolder)
...
@@ -131,10 +131,13 @@ static void test_EnumObjects(IShellFolder *iFolder)
hr
=
IShellFolder_EnumObjects
(
iFolder
,
NULL
,
SHCONTF_FOLDERS
|
SHCONTF_NONFOLDERS
|
SHCONTF_INCLUDEHIDDEN
,
&
iEnumList
);
hr
=
IShellFolder_EnumObjects
(
iFolder
,
NULL
,
SHCONTF_FOLDERS
|
SHCONTF_NONFOLDERS
|
SHCONTF_INCLUDEHIDDEN
,
&
iEnumList
);
ok
(
hr
==
S_OK
,
"EnumObjects failed %08lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"EnumObjects failed %08lx
\n
"
,
hr
);
while
(
IEnumIDList_Next
(
iEnumList
,
1
,
&
newPIDL
,
&
NumPIDLs
)
==
S_OK
)
/* This is to show that, contrary to what is said on MSDN on IEnumIDList::Next,
{
* the filesystem shellfolders return S_OK even if less then 'celt' items are
idlArr
[
i
++
]
=
newPIDL
;
* returned (in contrast to S_FALSE). We have to do it in a loop since WinXP
}
* only ever returns a single entry per call. */
while
(
IEnumIDList_Next
(
iEnumList
,
10
-
i
,
&
idlArr
[
i
],
&
NumPIDLs
)
==
S_OK
)
i
+=
NumPIDLs
;
ok
(
i
==
5
,
"i: %d
\n
"
,
i
);
hr
=
IEnumIDList_Release
(
iEnumList
);
hr
=
IEnumIDList_Release
(
iEnumList
);
ok
(
hr
==
S_OK
,
"IEnumIDList_Release failed %08lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"IEnumIDList_Release failed %08lx
\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