March 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : scrrun: Fix Skip() for file collection.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: fac1c0d25b8852767dbbf53b9b5ce3997ad0c604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac1c0d25b8852767dbbf53b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 10 13:23:33 2014 +0400 scrrun: Fix Skip() for file collection. --- dlls/scrrun/filesystem.c | 15 ++++++++++++++- dlls/scrrun/tests/filesystem.c | 3 --- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5b6d6cb..ccdb9ee 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1001,9 +1001,22 @@ static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) TRACE("(%p)->(%d)\n", This, celt); - while (FindNextFileW(handle, &data) && celt) + if (!celt) return S_OK; + + if (!handle) + { + handle = start_enumeration(This->data.u.filecoll.coll->path, &data, TRUE); + if (!handle) return S_FALSE; + This->data.u.filecoll.find = handle; + } + else if (!FindNextFileW(handle, &data)) + return S_FALSE; + + do + { if (is_file_data(&data)) --celt; + } while (celt && FindNextFileW(handle, &data)); return celt ? S_FALSE : S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 0588509..426cf83 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1106,7 +1106,6 @@ 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); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1119,9 +1118,7 @@ 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); ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); VariantClear(&var2[0]);

1 0

Qian Hong : user32/tests: Skip more winstation tests when no enough privileges.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 298e050b438733d61a86cb8de7b2835c48820710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298e050b438733d61a86cb8de… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Mar 10 11:09:11 2014 +0800 user32/tests: Skip more winstation tests when no enough privileges. --- dlls/user32/tests/winstation.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 4f664dd..7f91b8b 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -297,7 +297,8 @@ static BOOL CALLBACK open_window_station_callbackA(LPSTR winsta, LPARAM lp) static void test_enumstations(void) { - BOOL ret; + DWORD ret; + HWINSTA hwinsta; if (0) /* Crashes instead */ { @@ -307,6 +308,15 @@ static void test_enumstations(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError()); } + hwinsta = CreateWindowStationA("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); + ret = GetLastError(); + ok(hwinsta != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", ret); + if (!hwinsta) + { + win_skip("Not enough privileges for CreateWindowStation\n"); + return; + } + SetLastError(0xdeadbeef); ret = EnumWindowStationsA(open_window_station_callbackA, 0x12345); ok(ret == 0x12345, "EnumWindowStationsA returned %x\n", ret);

1 0

Nikolay Sivov : msxml3/tests: Fixed some test failures.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: c633a51773d0f5cf0d1b7ae6f60d4b5da60b1248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c633a51773d0f5cf0d1b7ae6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 10 09:16:58 2014 +0400 msxml3/tests: Fixed some test failures. --- dlls/msxml3/tests/saxreader.c | 43 ++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c5fcaa7..5b78e9a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2124,6 +2124,7 @@ static void test_saxreader(void) static const CHAR testXmlA[] = "test.xml"; static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; IXMLDOMDocument *doc; + char seqname[50]; VARIANT_BOOL v; while (table->clsid) @@ -2453,7 +2454,8 @@ static void test_saxreader(void) V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; - if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40)) test_seq = cdata_test_alt; else test_seq = cdata_test; @@ -2461,14 +2463,16 @@ static void test_saxreader(void) set_expected_seq(test_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test", TRUE); + sprintf(seqname, "%s: cdata test", table->name); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); /* 2. CDATA sections */ stream = create_test_stream(test2_cdata_xml, -1); V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; - if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40)) test_seq = cdata_test2_alt; else test_seq = cdata_test2; @@ -2476,7 +2480,8 @@ static void test_saxreader(void) set_expected_seq(test_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test 2", TRUE); + sprintf(seqname, "%s: cdata test 2", table->name); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); IStream_Release(stream); @@ -2485,7 +2490,8 @@ static void test_saxreader(void) V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; - if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40)) test_seq = cdata_test3_alt; else test_seq = cdata_test3; @@ -2493,7 +2499,8 @@ static void test_saxreader(void) set_expected_seq(test_seq); hr = ISAXXMLReader_parse(reader, var); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test 3", TRUE); + sprintf(seqname, "%s: cdata test 3", table->name); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); IStream_Release(stream); @@ -5071,25 +5078,25 @@ static void test_mxattr_addAttribute(void) EXPECT_HR(hr, E_INVALIDARG); hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getType(saxattr, 0, &value, &len); EXPECT_HR(hr, E_INVALIDARG); hr = ISAXAttributes_getType(saxattr, 0, NULL, &len); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getType(saxattr, 0, &value, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getType(saxattr, 0, NULL, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); @@ -5180,22 +5187,22 @@ static void test_mxattr_addAttribute(void) IsEqualGUID(table->clsid, &CLSID_SAXAttributes60)) { hr = ISAXAttributes_getValueFromQName(saxattr, NULL, 0, NULL, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, NULL, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getValueFromName(saxattr, NULL, 0, NULL, 0, NULL, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, NULL, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, &value, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr); } else {

1 0

Nikolay Sivov : scrrun/tests: Use a writable location for folder creation test.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: b2a8a0893fee0a0b6dcba29714cc9dde907da8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a8a0893fee0a0b6dcba2971… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 10 15:03:15 2014 +0400 scrrun/tests: Use a writable location for folder creation test. --- dlls/scrrun/tests/filesystem.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 426cf83..a09d54b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -127,19 +127,26 @@ static void test_interfaces(void) static void test_createfolder(void) { + WCHAR pathW[MAX_PATH], buffW[MAX_PATH]; HRESULT hr; - WCHAR pathW[MAX_PATH]; BSTR path; IFolder *folder; + BOOL ret; + + GetTempPathW(MAX_PATH, pathW); + GetTempFileNameW(pathW, NULL, 0, buffW); + DeleteFileW(buffW); + ret = CreateDirectoryW(buffW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); /* create existing directory */ - GetCurrentDirectoryW(sizeof(pathW)/sizeof(WCHAR), pathW); - path = SysAllocString(pathW); + path = SysAllocString(buffW); folder = (void*)0xdeabeef; hr = IFileSystem3_CreateFolder(fs3, path, &folder); ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); ok(folder == NULL, "got %p\n", folder); SysFreeString(path); + RemoveDirectoryW(buffW); } static void test_textstream(void)

1 0

Alexandre Julliard : makedep: Add a helper function for concatenating paths.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: c3c35dcff8e25b74ef5cb2fcfb5b38e21efdc4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c35dcff8e25b74ef5cb2fcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 10 11:10:55 2014 +0100 makedep: Add a helper function for concatenating paths. --- tools/makedep.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fe8a614..eb77d57 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -454,12 +454,23 @@ static char *get_relative_path( const char *from, const char *dest ) /******************************************************************* + * concat_paths + */ +static char *concat_paths( const char *base, const char *path ) +{ + if (!base) return xstrdup( path[0] ? path : "." ); + if (path[0] == '/') return xstrdup( path ); + if (!path[0]) return xstrdup( base ); + return strmake( "%s/%s", base, path ); +} + + +/******************************************************************* * base_dir_path */ static char *base_dir_path( const char *path ) { - if (base_dir && path[0] != '/') return strmake( "%s/%s", base_dir, path ); - return xstrdup( path ); + return concat_paths( base_dir, path ); } @@ -468,8 +479,7 @@ static char *base_dir_path( const char *path ) */ static char *src_dir_path( const char *path ) { - if (src_dir) return strmake( "%s/%s", src_dir, path ); - return xstrdup( path ); + return concat_paths( src_dir, path ); } @@ -478,8 +488,7 @@ static char *src_dir_path( const char *path ) */ static char *top_obj_dir_path( const char *path ) { - if (top_obj_dir) return strmake( "%s/%s", top_obj_dir, path ); - return xstrdup( path ); + return concat_paths( top_obj_dir, path ); } @@ -488,7 +497,7 @@ static char *top_obj_dir_path( const char *path ) */ static char *top_dir_path( const char *path ) { - if (top_src_dir) return strmake( "%s/%s", top_src_dir, path ); + if (top_src_dir) return concat_paths( top_src_dir, path ); return top_obj_dir_path( path ); }

1 0

Alexandre Julliard : c2man: Remove a possible path from the spec file name.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 4c062b37024221640bd117b3c2027dc9be550587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c062b37024221640bd117b3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 10 11:15:04 2014 +0100 c2man: Remove a possible path from the spec file name. --- tools/c2man.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index f55b1b1..029f460 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -99,13 +99,14 @@ sub process_extra_comment($); sub process_spec_file($) { my $spec_name = shift; - my ($dll_name, $dll_ext) = split(/\./, $spec_name); + (my $basename = $spec_name) =~ s/.*\///; + my ($dll_name, $dll_ext) = split(/\./, $basename); $dll_ext = "dll" if ( $dll_ext eq "spec" ); my $uc_dll_name = uc $dll_name; my $spec_details = { - NAME => $spec_name, + NAME => $basename, DLL_NAME => $dll_name, DLL_EXT => $dll_ext, NUM_EXPORTS => 0,

1 0

Jacek Caban : vbscript: Use VariantCopyInd in invoke_variant_prop.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 6f45902252c06711c9ee0998693e5ccdd46b2e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f45902252c06711c9ee09986… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 14:52:44 2014 +0100 vbscript: Use VariantCopyInd in invoke_variant_prop. --- dlls/vbscript/tests/lang.vbs | 10 +++++++++- dlls/vbscript/vbdisp.c | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9189163..46b34c4 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1061,12 +1061,20 @@ Class ArrClass classarr(2) = 3 classarr(3) = 4 End Sub + + Public Sub testVarVT + Call ok(getVT(var) = "VT_ARRAY|VT_VARIANT*", "getVT(var) = " & getVT(var)) + End Sub End Class Set obj = new ArrClass -'todo_wine Call ok(getVT(obj.classarr) = "VT_ARRAY|VT_VARIANT", "getVT(obj.classarr) = " & getVT(obj.classarr)) +Call ok(getVT(obj.classarr) = "VT_ARRAY|VT_VARIANT", "getVT(obj.classarr) = " & getVT(obj.classarr)) 'todo_wine Call ok(obj.classarr(1) = 2, "obj.classarr(1) = " & obj.classarr(1)) +obj.var = arr +Call ok(getVT(obj.var) = "VT_ARRAY|VT_VARIANT", "getVT(obj.var) = " & getVT(obj.var)) +Call obj.testVarVT + Sub arrarg(byref refarr, byval valarr, byref refarr2, byval valarr2) Call ok(getVT(refarr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(refarr) = " & getVT(refarr)) Call ok(getVT(valarr) = "VT_ARRAY|VT_VARIANT*", "getVT(valarr) = " & getVT(valarr)) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index e902e00..6382570 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -109,7 +109,7 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA return DISP_E_MEMBERNOTFOUND; /* That's what tests show */ } - hres = VariantCopy(res, v); + hres = VariantCopyInd(res, v); break; case DISPATCH_PROPERTYPUT: { @@ -129,7 +129,7 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA if(res) V_VT(res) = VT_EMPTY; - hres = VariantCopy(v, put_val); + hres = VariantCopyInd(v, put_val); break; }

1 0

Jacek Caban : vbscipt: Use VariantCopyInd in exec_script.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 6ad651bf77a465ef421ffc6febfafa3efc61d4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad651bf77a465ef421ffc6fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 14:52:35 2014 +0100 vbscipt: Use VariantCopyInd in exec_script. --- dlls/vbscript/interp.c | 4 ++-- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8f55563..d05c961 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2029,9 +2029,9 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP if(func->args[i].by_ref) exec.args[i] = *v; else - hres = VariantCopy(exec.args+i, V_VARIANTREF(v)); + hres = VariantCopyInd(exec.args+i, V_VARIANTREF(v)); }else { - hres = VariantCopy(exec.args+i, v); + hres = VariantCopyInd(exec.args+i, v); } if(FAILED(hres)) { release_exec(&exec); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4c444f2..9189163 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1067,4 +1067,13 @@ Set obj = new ArrClass 'todo_wine Call ok(getVT(obj.classarr) = "VT_ARRAY|VT_VARIANT", "getVT(obj.classarr) = " & getVT(obj.classarr)) 'todo_wine Call ok(obj.classarr(1) = 2, "obj.classarr(1) = " & obj.classarr(1)) +Sub arrarg(byref refarr, byval valarr, byref refarr2, byval valarr2) + Call ok(getVT(refarr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(refarr) = " & getVT(refarr)) + Call ok(getVT(valarr) = "VT_ARRAY|VT_VARIANT*", "getVT(valarr) = " & getVT(valarr)) + Call ok(getVT(refarr2) = "VT_ARRAY|VT_VARIANT*", "getVT(refarr2) = " & getVT(refarr2)) + Call ok(getVT(valarr2) = "VT_ARRAY|VT_VARIANT*", "getVT(valarr2) = " & getVT(valarr2)) +End Sub + +Call arrarg(arr, arr, obj.classarr, obj.classarr) + reportSuccess()

1 0

Nikolay Sivov : scrrun: Fix Next() for file collection.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: a9a2c9b5391680ef55c01f8168b6ef7c9e78f8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a2c9b5391680ef55c01f816… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 10 13:23:14 2014 +0400 scrrun: Fix Next() for file collection. --- dlls/scrrun/filesystem.c | 53 ++++++++++------------------------------ dlls/scrrun/tests/filesystem.c | 6 +---- 2 files changed, 14 insertions(+), 45 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 70bc341..5b6d6cb 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -761,7 +761,7 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) return ref; } -static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data) +static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data, BOOL file) { static const WCHAR allW[] = {'*',0}; WCHAR pathW[MAX_PATH]; @@ -776,10 +776,10 @@ static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data) handle = FindFirstFileW(pathW, data); if (handle == INVALID_HANDLE_VALUE) return 0; - /* find first dir */ + /* find first dir/file */ while (1) { - if (is_dir_data(data)) + if (file ? is_file_data(data) : is_dir_data(data)) break; if (!FindNextFileW(handle, data)) @@ -807,7 +807,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel if (!handle) { - handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); + handle = start_enumeration(This->data.u.foldercoll.coll->path, &data, FALSE); if (!handle) return S_FALSE; This->data.u.foldercoll.find = handle; @@ -857,7 +857,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel if (!handle) { - handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); + handle = start_enumeration(This->data.u.foldercoll.coll->path, &data, FALSE); if (!handle) return S_FALSE; This->data.u.foldercoll.find = handle; @@ -957,43 +957,19 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, if (fetched) *fetched = 0; + if (!celt) return S_OK; + if (!handle) { - static const WCHAR allW[] = {'*',0}; - WCHAR pathW[MAX_PATH]; - BSTR parent = This->data.u.filecoll.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; - - while (1) - { - if (is_file_data(&data)) - break; - else - if (!FindNextFileW(handle, &data)) - { - FindClose(handle); - return S_FALSE; - } - } - + handle = start_enumeration(This->data.u.filecoll.coll->path, &data, TRUE); + if (!handle) return S_FALSE; This->data.u.filecoll.find = handle; } - else if (celt) - FindNextFileW(handle, &data); + else if (!FindNextFileW(handle, &data)) + return S_FALSE; do { - if (count >= celt) break; - if (is_file_data(&data)) { IFile *file; @@ -1007,17 +983,14 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, V_VT(&var[count]) = VT_DISPATCH; V_DISPATCH(&var[count]) = (IDispatch*)file; - count++; + if (++count >= celt) break; } } 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 filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 2b7118f..0588509 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1089,12 +1089,10 @@ todo_wine ok(0, "unexpected file %s was found\n", wine_dbgstr_w(str)); SysFreeString(str); - /* FIXME: uncomment once Wine is fixed - IFile_Release(file); */ + IFile_Release(file); VariantClear(&var); } -todo_wine ok(found_a == 1 && found_b == 1 && found_c == 1, "each file should be found 1 time instead of %d/%d/%d\n", found_a, found_b, found_c); @@ -1102,9 +1100,7 @@ todo_wine VariantInit(&var); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); -todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); -todo_wine ok(fetched == 0, "got %d\n", fetched); hr = IEnumVARIANT_Reset(enumvar);

1 0

Marcus Meissner : wtsapi32: Remove useless info free (Coverity).
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: a2894d4e4184d669f1ad76cb09d9e87e2ba10e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2894d4e4184d669f1ad76cb0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 8 10:15:41 2014 +0100 wtsapi32: Remove useless info free (Coverity). --- dlls/wtsapi32/tests/wtsapi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 4c2a9e9..0a5a1ed 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -69,13 +69,11 @@ static void test_WTSEnumerateProcessesW(void) ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); - info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef);

1 0