ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scrrun: IEnumVARIANT::Next should stop once it has enumerated the asked number the folder elements.

This commit is contained in:
Dmitry Timoshkov 2014-01-28 11:36:11 +09:00 committed by Alexandre Julliard
parent f5279ad37d
commit 553078161d
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/scrrun/filesystem.c
View File

@ -526,8 +526,6 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel
do do
{ {
if (count >= celt) break;
if (is_dir_data(&data)) if (is_dir_data(&data))
{ {
IFolder *folder; IFolder *folder;
@ -543,6 +541,9 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel
V_DISPATCH(&var[count]) = (IDispatch*)folder; V_DISPATCH(&var[count]) = (IDispatch*)folder;
count++; count++;
} }
if (count >= celt) break;
} while (FindNextFileW(handle, &data)); } while (FindNextFileW(handle, &data));
if (fetched) if (fetched)

9
dlls/scrrun/tests/filesystem.c
View File

@ -885,17 +885,9 @@ static void test_FolderCollection(void)
VariantInit(&var); VariantInit(&var);
fetched = 0; fetched = 0;
hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched);
if (i == 2) todo_wine
{
ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); ok(hr == S_OK, "%d: got 0x%08x\n", i, hr);
ok(fetched == 1, "%d: got %d\n", i, fetched); ok(fetched == 1, "%d: got %d\n", i, fetched);
ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var)); ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var));
} else
{
ok(hr == S_OK, "%d: got 0x%08x\n", i, hr);
ok(fetched == 1, "%d: got %d\n", i, fetched);
ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var));
}
hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
@ -915,7 +907,6 @@ if (i == 2) todo_wine
VariantClear(&var); VariantClear(&var);
} }
todo_wine
ok(found_a == 1 && found_b == 1 && found_c == 1, ok(found_a == 1 && found_b == 1 && found_c == 1,
"each folder should be found 1 time instead of %d/%d/%d\n", "each folder should be found 1 time instead of %d/%d/%d\n",
found_a, found_b, found_c); found_a, found_b, found_c);