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

Jacek Caban : vbscipt: Allow ':' to be a separator in select case statement.
by Alexandre Julliard 10 Mar '14

10 Mar '14

Module: wine Branch: master Commit: aa045d51b33fabad949a339ba0c3d73342499b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa045d51b33fabad949a339ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 14:52:56 2014 +0100 vbscipt: Allow ':' to be a separator in select case statement. --- dlls/vbscript/parser.y | 12 +++++++++--- dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3004c3b..cd69f5d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -205,7 +205,7 @@ SimpleStatement { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } | tFOR tEACH Identifier tIN Expression tNL StatementsNl_opt tNEXT { $$ = new_foreach_statement(ctx, $3, $5, $7); } - | tSELECT tCASE Expression tNL CaseClausules tEND tSELECT + | tSELECT tCASE Expression StSep CaseClausules tEND tSELECT { $$ = new_select_statement(ctx, $3, $5); } MemberExpression @@ -273,8 +273,8 @@ Else_opt CaseClausules : /* empty */ { $$ = NULL; } - | tCASE tELSE tNL StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } - | tCASE ExpressionList tNL StatementsNl_opt CaseClausules + | tCASE tELSE StSep StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE ExpressionList StSep StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } Arguments_opt @@ -442,6 +442,12 @@ ArgumentDecl Identifier : tIdentifier { $$ = $1; } | tPROPERTY { $$ = propertyW; } + +/* Some statements accept both new line and ':' as a separator */ +StSep + : tNL + | ':' + %% static int parser_error(parser_ctx_t *ctx, const char *str) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 46b34c4..374a986 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -224,6 +224,10 @@ if false then x = y : if true then call ok(false, "embedded if called") if false then x=1 else x=2 end if +x = false +if false then x = true : x = true +Call ok(x = false, "x <> false") + if false then ok false, "if false called" end if @@ -538,6 +542,22 @@ end select select case 0 end select +x = false +select case 2 + case 3,1,2,4: x = true + case 5,6,7 + Call ok(false, "unexpected case") +end select +Call ok(x, "wrong case") + +x = false +select case 2: case 5,6,7: Call ok(false, "unexpected case") + case 2,1,2,4 + x = true + case else: Call ok(false, "unexpected case else") +end select +Call ok(x, "wrong case") + if false then Sub testsub x = true

1 0

Jacek Caban : vbscript: Added support for VARIANT references to interp_newenum.
by Alexandre Julliard 10 Mar '14

10 Mar '14

Module: wine Branch: master Commit: 86ee4e959a71a9715dec98b0df59f82fb3cb91aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ee4e959a71a9715dec98b0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 14:53:10 2014 +0100 vbscript: Added support for VARIANT references to interp_newenum. --- dlls/vbscript/interp.c | 63 +++++++++++++++++++++++------------------- dlls/vbscript/tests/lang.vbs | 13 ++++++++- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d05c961..066d675 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -309,33 +309,42 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } -static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *v) +static void stack_pop_deref(exec_ctx_t *ctx, variant_val_t *r) { - VARIANT *var; - - var = stack_pop(ctx); + VARIANT *v; - if(V_VT(var) == (VT_BYREF|VT_VARIANT)) { - v->owned = FALSE; - var = V_VARIANTREF(var); + v = stack_pop(ctx); + if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { + r->owned = FALSE; + r->v = V_VARIANTREF(v); }else { - v->owned = TRUE; + r->owned = TRUE; + r->v = v; } +} + +static inline void release_val(variant_val_t *v) +{ + if(v->owned) + VariantClear(v->v); +} + +static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *r) +{ + stack_pop_deref(ctx, r); - if(V_VT(var) == VT_DISPATCH) { + if(V_VT(r->v) == VT_DISPATCH) { DISPPARAMS dp = {0}; HRESULT hres; - hres = disp_call(ctx->script, V_DISPATCH(var), DISPID_VALUE, &dp, &v->store); - if(v->owned) - IDispatch_Release(V_DISPATCH(var)); + hres = disp_call(ctx->script, V_DISPATCH(r->v), DISPID_VALUE, &dp, &r->store); + if(r->owned) + IDispatch_Release(V_DISPATCH(r->v)); if(FAILED(hres)) return hres; - v->owned = TRUE; - v->v = &v->store; - }else { - v->v = var; + r->owned = TRUE; + r->v = &r->store; } return S_OK; @@ -370,12 +379,6 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) return S_OK; } -static inline void release_val(variant_val_t *v) -{ - if(v->owned) - VariantClear(v->v); -} - static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) { variant_val_t val; @@ -1079,21 +1082,23 @@ static HRESULT interp_step(exec_ctx_t *ctx) static HRESULT interp_newenum(exec_ctx_t *ctx) { - VARIANT *v, r; + variant_val_t v; + VARIANT r; HRESULT hres; TRACE("\n"); - v = stack_pop(ctx); - switch(V_VT(v)) { + stack_pop_deref(ctx, &v); + + switch(V_VT(v.v)) { case VT_DISPATCH|VT_BYREF: case VT_DISPATCH: { IEnumVARIANT *iter; DISPPARAMS dp = {0}; VARIANT iterv; - hres = disp_call(ctx->script, V_ISBYREF(v) ? *V_DISPATCHREF(v) : V_DISPATCH(v), DISPID_NEWENUM, &dp, &iterv); - VariantClear(v); + hres = disp_call(ctx->script, V_ISBYREF(v.v) ? *V_DISPATCHREF(v.v) : V_DISPATCH(v.v), DISPID_NEWENUM, &dp, &iterv); + release_val(&v); if(FAILED(hres)) return hres; @@ -1115,8 +1120,8 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) break; } default: - FIXME("Unsupported for %s\n", debugstr_variant(v)); - VariantClear(v); + FIXME("Unsupported for %s\n", debugstr_variant(v.v)); + release_val(&v); return E_NOTIMPL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 374a986..c1af191 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -19,6 +19,7 @@ Option Explicit dim x, y, z +Dim obj call ok(true, "true is not true?") ok true, "true is not true?" @@ -486,6 +487,17 @@ next Call ok(y = 1, "y = " & y) Call ok(x = 2, "x = " & x) +Set obj = collectionObj +Call obj.reset() +y = 0 +x = 10 +for each x in obj + y = y+1 + Call ok(x = y, "x <> y") +next +Call ok(y = 3, "y = " & y) +Call ok(getVT(x) = "VT_EMPTY*", "getVT(x) = " & getVT(x)) + x = false select case 3 case 2 @@ -767,7 +779,6 @@ Stop set x = testObj Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) -Dim obj Set obj = New EmptyClass Call ok(getVT(obj) = "VT_DISPATCH*", "getVT(obj) = " & getVT(obj))

1 0

Nikolay Sivov : msxml3: Remove dynamic properties support.
by Alexandre Julliard 10 Mar '14

10 Mar '14

Module: wine Branch: master Commit: 5b43c42c8832f3e6d0b70a54b01938f43b950647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b43c42c8832f3e6d0b70a54b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 8 19:06:11 2014 +0400 msxml3: Remove dynamic properties support. --- dlls/msxml3/dispex.c | 105 ----------------------------------------- dlls/msxml3/domimpl.c | 3 -- dlls/msxml3/msxml_private.h | 2 - dlls/msxml3/mxnamespace.c | 1 - dlls/msxml3/mxwriter.c | 2 - dlls/msxml3/node.c | 1 - dlls/msxml3/nodemap.c | 1 - dlls/msxml3/parseerror.c | 1 - dlls/msxml3/saxreader.c | 1 - dlls/msxml3/schema.c | 1 - dlls/msxml3/selection.c | 1 - dlls/msxml3/stylesheet.c | 2 - dlls/msxml3/tests/domdoc.c | 16 ++++++- dlls/msxml3/tests/saxreader.c | 28 +++++++++-- dlls/msxml3/tests/schema.c | 17 ++++++- 15 files changed, 55 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b43c42c8832f3e6d0b70…

1 0

Nikolay Sivov : msxml3/tests: Fixed some test failures.
by Alexandre Julliard 10 Mar '14

10 Mar '14

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: Fix Next() for file collection.
by Alexandre Julliard 10 Mar '14

10 Mar '14

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

Nikolay Sivov : scrrun: Fix Skip() for file collection.
by Alexandre Julliard 10 Mar '14

10 Mar '14

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

Nikolay Sivov : scrrun/tests: Use a writable location for folder creation test.
by Alexandre Julliard 10 Mar '14

10 Mar '14

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 10 Mar '14

10 Mar '14

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 : makedep: Pass the source directory as root for building documentation.
by Alexandre Julliard 10 Mar '14

10 Mar '14

Module: wine Branch: master Commit: 727ff27907b2ecad9c9cbae471f05d07ed0563ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=727ff27907b2ecad9c9cbae47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 10 11:13:44 2014 +0100 makedep: Pass the source directory as root for building documentation. --- tools/makedep.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index eb77d57..b518756 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1903,32 +1903,36 @@ static struct strarray output_sources(void) if (spec_file) { - if (c2man_files.count && top_obj_dir) + if (c2man_files.count) { char *manext = get_expanded_make_variable( "api_manext" ); output( "manpages::\n" ); - output( "\t%s -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/man%s", top_obj_dir, manext ? manext : "3w" )); + output_filename( strmake( "-o %s/man%s", top_obj_dir_path( "documentation" ), manext ? manext : "3w" )); output_filenames( c2man_files ); output( "\n" ); output( "htmlpages::\n" ); - output( "\t%s -Th -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -Th -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/html", top_obj_dir )); + output_filename( strmake( "-o %s", top_obj_dir_path( "documentation/html" ))); output_filenames( c2man_files ); output( "\n" ); output( "sgmlpages::\n" ); - output( "\t%s -Ts -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -Ts -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/api-guide", top_obj_dir )); + output_filename( strmake( "-o %s", top_obj_dir_path( "documentation/api-guide" ))); output_filenames( c2man_files ); output( "\n" ); output( "xmlpages::\n" ); - output( "\t%s -Tx -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir ); + output( "\t%s -Tx -w %s", top_dir_path( "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_dir_path( "" ))); output_filename( strmake( "-I%s", top_dir_path( "include" ))); - output_filename( strmake( "-o %s/documentation/api-guide-xml", top_obj_dir )); + output_filename( strmake( "-o %s", top_obj_dir_path( "documentation/api-guide-xml" ))); output_filenames( c2man_files ); output( "\n" ); strarray_add( &phony_targets, "manpages" );

1 0

Alexandre Julliard : c2man: Remove a possible path from the spec file name.
by Alexandre Julliard 10 Mar '14

10 Mar '14

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