January 2014 - Wine-commits

Henri Verbeet : d3d9/tests: Direct3DCreate9() is always available if we have d3d9.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: a1b963490a80f92aa3359f5ee97215c0b3064c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b963490a80f92aa3359f5ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:39 2014 +0100 d3d9/tests: Direct3DCreate9() is always available if we have d3d9. --- dlls/d3d9/tests/Makefile.in | 2 +- dlls/d3d9/tests/d3d9ex.c | 8 +- dlls/d3d9/tests/device.c | 299 +++++++++++++++++------------------ dlls/d3d9/tests/stateblock.c | 63 +++----- dlls/d3d9/tests/vertexdeclaration.c | 48 ++---- dlls/d3d9/tests/visual.c | 28 +--- 6 files changed, 188 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1b963490a80f92aa3359…

1 0

Frédéric Delanoy : msxml3/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: fd096ddbc9b1e00d1eb32b01531b78071c8cc568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd096ddbc9b1e00d1eb32b015… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:38 2014 +0100 msxml3/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/msxml3/tests/domdoc.c | 21 +++------------------ dlls/msxml3/tests/httpreq.c | 19 ++----------------- 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9c698c2..e33db88 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -45,21 +45,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static int g_unexpectedcall, g_expectedcall; struct msxmlsupported_data_t @@ -102,7 +87,7 @@ static const char *debugstr_msxml_guid(REFIID riid) else if (IsEqualIID(&IID_IMXNamespaceManager, riid)) return "IMXNamespaceManager"; else - return debugstr_guid(riid); + return wine_dbgstr_guid(riid); } static void get_class_support_data(struct msxmlsupported_data_t *table) @@ -10839,7 +10824,7 @@ static void test_supporterrorinfo(void) if (hr == S_OK) { hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid); - ok(hr == S_OK, "got 0x%08x for %s\n", hr, debugstr_guid(*iid)); + ok(hr == S_OK, "got 0x%08x for %s\n", hr, wine_dbgstr_guid(*iid)); IUnknown_Release(unk); } @@ -10875,7 +10860,7 @@ static void test_supporterrorinfo(void) if (hr == S_OK) { hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid); - ok(hr == S_OK, "%d: got 0x%08x for %s\n", ptr->type, hr, debugstr_guid(*iid)); + ok(hr == S_OK, "%d: got 0x%08x for %s\n", ptr->type, hr, wine_dbgstr_guid(*iid)); IUnknown_Release(unk); } diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index ad074de..d74b01a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -87,21 +87,6 @@ DEFINE_EXPECT(htmldoc2_get_all); DEFINE_EXPECT(htmldoc2_get_url); DEFINE_EXPECT(collection_get_length); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static int g_unexpectedcall, g_expectedcall; static BSTR alloc_str_from_narrow(const char *str) @@ -1099,7 +1084,7 @@ static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID riid, vo return S_OK; } - ok(0, "unexpected query interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected query interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1158,7 +1143,7 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, { } else - ok(0, "unexpected request: sid %s, riid %s\n", debugstr_guid(service), debugstr_guid(riid)); + ok(0, "unexpected request: sid %s, riid %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(riid)); return E_NOTIMPL; }

1 0

Dmitry Timoshkov : scrrun/tests: Add more tests for IFolderCollection using a dedicated temporary directory.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 9c6deb2b72dfb44f272a88feb916d8a2ea3f702f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6deb2b72dfb44f272a88feb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:43 2014 +0900 scrrun/tests: Add more tests for IFolderCollection using a dedicated temporary directory. --- dlls/scrrun/tests/filesystem.c | 118 ++++++++++++++++++++++++++++++++-------- 1 file changed, 95 insertions(+), 23 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6942a3d..7c0fe7b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -786,20 +786,26 @@ static void test_GetFolder(void) static void test_FolderCollection(void) { + static const WCHAR fooW[] = {'\\','f','o','o',0}; static const WCHAR aW[] = {'\\','a',0}; static const WCHAR bW[] = {'\\','b',0}; + static const WCHAR cW[] = {'\\','c',0}; IFolderCollection *folders; - WCHAR buffW[MAX_PATH], pathW[MAX_PATH], path2W[MAX_PATH]; + WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; IEnumVARIANT *enumvar, *clone; - LONG count, count2, ref, ref2; + LONG count, ref, ref2, i; IUnknown *unk, *unk2; IFolder *folder; ULONG fetched; - VARIANT var; + VARIANT var, var2[2]; HRESULT hr; BSTR str; + int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, buffW); + GetTempPathW(MAX_PATH, pathW); + GetTempFileNameW(pathW, fooW, 0, buffW); + DeleteFileW(buffW); + CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); hr = IFileSystem3_GetFolder(fs3, str, &folder); @@ -813,6 +819,10 @@ static void test_FolderCollection(void) lstrcatW(pathW, aW); CreateDirectoryW(pathW, NULL); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, bW); + CreateDirectoryW(pathW, NULL); + hr = IFolder_get_SubFolders(folder, &folders); ok(hr == S_OK, "got 0x%08x\n", hr); IFolder_Release(folder); @@ -820,17 +830,19 @@ static void test_FolderCollection(void) count = 0; hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count > 0, "got %d\n", count); +todo_wine + ok(count == 2, "got %d\n", count); - lstrcpyW(path2W, buffW); - lstrcatW(path2W, bW); - CreateDirectoryW(path2W, NULL); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, cW); + CreateDirectoryW(pathW, NULL); /* every time property is requested it scans directory */ - count2 = 0; - hr = IFolderCollection_get_Count(folders, &count2); + count = 0; + hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count2 > count, "got %d, %d\n", count, count2); +todo_wine + ok(count == 3, "got %d\n", count); hr = IFolderCollection_get__NewEnum(folders, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -870,29 +882,89 @@ static void test_FolderCollection(void) hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); + for (i = 0; i < 3; i++) + { + VariantInit(&var); + fetched = 0; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); +if (i == 2) todo_wine +{ + 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)); +} 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); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IFolder_get_Name(folder, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (!lstrcmpW(str, aW + 1)) + found_a++; + else if (!lstrcmpW(str, bW + 1)) + found_b++; + else if (!lstrcmpW(str, cW + 1)) + found_c++; + SysFreeString(str); + + IFolder_Release(folder); + VariantClear(&var); + } + +todo_wine + ok(found_a == 1 && found_b == 1 && found_c == 1, + "each folder should be found 1 time instead of %d/%d/%d\n", + found_a, found_b, found_c); + VariantInit(&var); - fetched = 0; + fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); - ok(V_VT(&var) == VT_DISPATCH, "got type %d\n", V_VT(&var)); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(fetched == 0, "got %d\n", fetched); - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); + hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); - - str = NULL; - hr = IFolder_get_Name(folder, &str); + hr = IEnumVARIANT_Skip(enumvar, 2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 0); ok(hr == S_OK, "got 0x%08x\n", hr); - SysFreeString(str); - IFolder_Release(folder); - VariantClear(&var); + VariantInit(&var2[0]); + VariantInit(&var2[1]); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 0, var2, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 0, "got %d\n", fetched); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); +todo_wine + ok(hr == S_FALSE, "got 0x%08x\n", hr); +todo_wine + ok(fetched == 1, "got %d\n", fetched); + ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); + VariantClear(&var2[0]); + VariantClear(&var2[1]); IEnumVARIANT_Release(enumvar); IUnknown_Release(unk); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, aW); + RemoveDirectoryW(pathW); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, bW); + RemoveDirectoryW(pathW); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, cW); RemoveDirectoryW(pathW); - RemoveDirectoryW(path2W); + RemoveDirectoryW(buffW); IFolderCollection_Release(folders); }

1 0

Dmitry Timoshkov : scrrun: Make IFolderCollection:: get_Count use is_dir_data() helper.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: bd25ef789ce571b9bd99c20ef361578fb191ae09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd25ef789ce571b9bd99c20ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:48 2014 +0900 scrrun: Make IFolderCollection::get_Count use is_dir_data() helper. --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index bfb201c..f7664c3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -913,7 +913,7 @@ static HRESULT WINAPI foldercoll_get_Count(IFolderCollection *iface, LONG *count do { - if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (is_dir_data(&data)) *count += 1; } while (FindNextFileW(handle, &data)); FindClose(handle); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 7c0fe7b..b0b527b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -830,7 +830,6 @@ static void test_FolderCollection(void) count = 0; hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 2, "got %d\n", count); lstrcpyW(pathW, buffW); @@ -841,7 +840,6 @@ todo_wine count = 0; hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 3, "got %d\n", count); hr = IFolderCollection_get__NewEnum(folders, NULL);

1 0

Dmitry Timoshkov : scrrun: Make IEnumVARIANT::Skip work after IEnumVARIANT ::Reset for a folder collection.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: eb2abf262ce8e354a8b775d7c33a296279808e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2abf262ce8e354a8b775d7c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:52 2014 +0900 scrrun: Make IEnumVARIANT::Skip work after IEnumVARIANT::Reset for a folder collection. --- dlls/scrrun/filesystem.c | 77 ++++++++++++++++++++++++++-------------- dlls/scrrun/tests/filesystem.c | 3 +- 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f7664c3..7d09a82 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -467,6 +467,36 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) return ref; } +static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data) +{ + static const WCHAR allW[] = {'*',0}; + WCHAR pathW[MAX_PATH]; + int len; + HANDLE handle; + + strcpyW(pathW, path); + len = strlenW(pathW); + if (pathW[len-1] != '\\') + strcatW(pathW, bsW); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, data); + if (handle == INVALID_HANDLE_VALUE) return 0; + + /* find first dir */ + while (1) + { + if (is_dir_data(data)) + break; + + if (!FindNextFileW(handle, data)) + { + FindClose(handle); + return 0; + } + } + return handle; +} + static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); @@ -481,32 +511,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel if (!handle) { - static const WCHAR allW[] = {'*',0}; - WCHAR pathW[MAX_PATH]; - BSTR parent = This->data.u.foldercoll.coll->path; - int len; - - strcpyW(pathW, parent); - len = SysStringLen(parent); - if (parent[len-1] != '\\') - strcatW(pathW, bsW); - strcatW(pathW, allW); - handle = FindFirstFileW(pathW, &data); - if (handle == INVALID_HANDLE_VALUE) - return S_FALSE; - - /* find first dir */ - while (1) - { - if (is_dir_data(&data)) - break; - else - if (!FindNextFileW(handle, &data)) - { - FindClose(handle); - return S_FALSE; - } - } + handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); + if (!handle) return S_FALSE; This->data.u.foldercoll.find = handle; } @@ -551,10 +557,27 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel TRACE("(%p)->(%d)\n", This, celt); - while (FindNextFileW(handle, &data) && celt) + if (!handle) + { + handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); + if (!handle) return S_FALSE; + + This->data.u.foldercoll.find = handle; + } + else + { + if (!FindNextFileW(handle, &data)) + return S_FALSE; + } + + do + { if (is_dir_data(&data)) --celt; + if (!celt) break; + } while (FindNextFileW(handle, &data)); + return celt ? S_FALSE : S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b0b527b..d6e094a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -929,9 +929,9 @@ todo_wine hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 2); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&var2[0]); @@ -942,7 +942,6 @@ todo_wine ok(fetched == 0, "got %d\n", fetched); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); -todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); todo_wine ok(fetched == 1, "got %d\n", fetched);

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT::Skip shouldn' t skip anything if asked number of folder elements is 0.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 758ebb2121e9461df2b0c2ad10f229c746cad774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758ebb2121e9461df2b0c2ad1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:56 2014 +0900 scrrun: IEnumVARIANT::Skip shouldn't skip anything if asked number of folder elements is 0. --- dlls/scrrun/filesystem.c | 2 ++ dlls/scrrun/tests/filesystem.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 7d09a82..0292ab8 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -557,6 +557,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel TRACE("(%p)->(%d)\n", This, celt); + if (!celt) return S_OK; + if (!handle) { handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index d6e094a..b1de309 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -931,7 +931,6 @@ todo_wine hr = IEnumVARIANT_Skip(enumvar, 2); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&var2[0]);

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT::Next shouldn' t fetch anything if asked number of folder elements is 0.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 6da1993129dcb706f4f38121a615e664659c5ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da1993129dcb706f4f38121a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:00 2014 +0900 scrrun: IEnumVARIANT::Next shouldn't fetch anything if asked number of folder elements is 0. --- dlls/scrrun/filesystem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0292ab8..bc1cc79 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -509,6 +509,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel if (fetched) *fetched = 0; + if (!celt) return S_OK; + if (!handle) { handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); @@ -516,7 +518,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } - else if (celt) + else FindNextFileW(handle, &data); do

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT:: Next should handle FindNextFileW failure.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 8f69ecdff748bbe13c17cb08f75ff99239238dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f69ecdff748bbe13c17cb08f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:04 2014 +0900 scrrun: IEnumVARIANT::Next should handle FindNextFileW failure. --- dlls/scrrun/filesystem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index bc1cc79..1cf1ea1 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -519,7 +519,10 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } else - FindNextFileW(handle, &data); + { + if (!FindNextFileW(handle, &data)) + return S_FALSE; + } do {

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT:: Next should always return number of fetched folder elements.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: f5279ad37db5e6c1f5d900b08322868a972cbf70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5279ad37db5e6c1f5d900b08… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:07 2014 +0900 scrrun: IEnumVARIANT::Next should always return number of fetched folder elements. --- dlls/scrrun/filesystem.c | 5 +---- dlls/scrrun/tests/filesystem.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1cf1ea1..39b3241 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -545,13 +545,10 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel } } while (FindNextFileW(handle, &data)); - if (count < celt) - return S_FALSE; - if (fetched) *fetched = count; - return S_OK; + return (count < celt) ? S_FALSE : S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b1de309..02a29e5 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -942,7 +942,6 @@ todo_wine fetched = -1; hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); ok(hr == S_FALSE, "got 0x%08x\n", hr); -todo_wine ok(fetched == 1, "got %d\n", fetched); ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); VariantClear(&var2[0]);

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT:: Next should stop once it has enumerated the asked number the folder elements.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 553078161dbddf7cca44837663ef6858a62dd760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553078161dbddf7cca4483766… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:11 2014 +0900 scrrun: IEnumVARIANT::Next should stop once it has enumerated the asked number the folder elements. --- dlls/scrrun/filesystem.c | 5 +++-- dlls/scrrun/tests/filesystem.c | 9 --------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 39b3241..630e7e3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -526,8 +526,6 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel do { - if (count >= celt) break; - if (is_dir_data(&data)) { IFolder *folder; @@ -543,6 +541,9 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel V_DISPATCH(&var[count]) = (IDispatch*)folder; count++; } + + if (count >= celt) break; + } while (FindNextFileW(handle, &data)); if (fetched) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 02a29e5..c764ae7 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -885,17 +885,9 @@ static void test_FolderCollection(void) VariantInit(&var); fetched = 0; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); -if (i == 2) todo_wine -{ - 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)); -} 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); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -915,7 +907,6 @@ if (i == 2) todo_wine VariantClear(&var); } -todo_wine ok(found_a == 1 && found_b == 1 && found_c == 1, "each folder should be found 1 time instead of %d/%d/%d\n", found_a, found_b, found_c);

1 0