August 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add tests for FOR / F 'skip' option.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 92356ca2b7901f9dc0afc491407a311c5347b87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=92356ca2b7901f9dc0afc4914… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 23:08:35 2011 +0200 cmd/tests: Add tests for FOR /F 'skip' option. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 36c0922..f5df409 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -647,6 +647,15 @@ for /f "delims=| " %%i in ("a d|") do echo %%i for /f "delims==" %%i in ("C r=d|") do echo %%i for /f "delims=" %%i in ("foo bar baz") do echo %%i for /f "delims=" %%i in ("c:\foo bar baz\..") do echo %%~fi +echo ......skip option +echo a > foo +echo b >> foo +echo c >> foo +for /f "skip=2" %%i in (foo) do echo %%i +for /f "skip=3" %%i in (foo) do echo %%i > output_file +if not exist output_file (echo no output) else (del output_file) +for /f "skip=4" %%i in (foo) do echo %%i > output_file +if not exist output_file (echo no output) else (del output_file) cd .. rd /s/q foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2244ed9..04e04a7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -475,6 +475,10 @@ c @todo_wine(a)C r @todo_wine(a)foo bar baz @todo_wine(a)c:\ +......skip option +(a)todo_wine@c +(a)todo_wine@no output +(a)todo_wine@no output -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Frédéric Delanoy : cmd: Quiet a noisy 'FOR /F' fixme.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 325bfc72e072585db4c09fc089ece10c01d03f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=325bfc72e072585db4c09fc08… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 23:08:36 2011 +0200 cmd: Quiet a noisy 'FOR /F' fixme. --- programs/cmd/builtins.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 99c4c3a..5d7df82 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -944,7 +944,10 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { only care about it if it is the path/options */ if (*curPos && *curPos != '/' && *curPos != '%') { if (isRecursive) WINE_FIXME("/R needs to handle supplied root\n"); - else WINE_FIXME("/F needs to handle options\n"); + else { + static unsigned int once; + if (!once++) WINE_FIXME("/F needs to handle options\n"); + } } break; }

1 0

Michael Stefaniuc : dsound: Fix refcounting for the secondary buffer object .
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 6d7c38256f258dcb71d73e573954c00b77b40202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7c38256f258dcb71d73e573… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 25 23:42:44 2011 +0200 dsound: Fix refcounting for the secondary buffer object. This fixes a regression introduced in 6b64e0090cb7. --- dlls/dsound/buffer.c | 57 +++++++++++++++++++++++++----------------- dlls/dsound/dsound_private.h | 2 + dlls/dsound/sound3d.c | 8 +++++- 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 7399015..5c8fbba 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -374,6 +374,10 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref was %d\n", This, ref - 1); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); + return ref; } @@ -384,28 +388,9 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { - DirectSoundDevice_RemoveBuffer(This->device, This); - RtlDeleteResource(&This->lock); - - if (This->hwbuf) - IDsDriverBuffer_Release(This->hwbuf); - if (!This->hwbuf || (This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY)) { - This->buffer->ref--; - list_remove(&This->entry); - if (This->buffer->ref==0) { - HeapFree(GetProcessHeap(),0,This->buffer->memory); - HeapFree(GetProcessHeap(),0,This->buffer); - } - } - - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - HeapFree(GetProcessHeap(), 0, This->notifies); - HeapFree(GetProcessHeap(), 0, This->pwfx); - HeapFree(GetProcessHeap(), 0, This); + if (!ref && !InterlockedDecrement(&This->numIfaces)) + secondarybuffer_destroy(This); - TRACE("(%p) released\n", This); - } return ref; } @@ -971,6 +956,7 @@ HRESULT IDirectSoundBufferImpl_Create( TRACE("Created buffer at %p\n", dsb); dsb->ref = 1; + dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; dsb->iks = NULL; @@ -1123,6 +1109,30 @@ HRESULT IDirectSoundBufferImpl_Create( return err; } +void secondarybuffer_destroy(IDirectSoundBufferImpl *This) +{ + DirectSoundDevice_RemoveBuffer(This->device, This); + RtlDeleteResource(&This->lock); + + if (This->hwbuf) + IDsDriverBuffer_Release(This->hwbuf); + if (!This->hwbuf || (This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY)) { + This->buffer->ref--; + list_remove(&This->entry); + if (This->buffer->ref == 0) { + HeapFree(GetProcessHeap(), 0, This->buffer->memory); + HeapFree(GetProcessHeap(), 0, This->buffer); + } + } + + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + HeapFree(GetProcessHeap(), 0, This->notifies); + HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This); + + TRACE("(%p) released\n", This); +} + HRESULT IDirectSoundBufferImpl_Destroy( IDirectSoundBufferImpl *pdsb) { @@ -1130,7 +1140,7 @@ HRESULT IDirectSoundBufferImpl_Destroy( /* This keeps the *_Destroy functions from possibly deleting * this object until it is ready to be deleted */ - IDirectSoundBufferImpl_AddRef(&pdsb->IDirectSoundBuffer8_iface); + InterlockedIncrement(&pdsb->numIfaces); if (pdsb->iks) { WARN("iks not NULL\n"); @@ -1150,7 +1160,7 @@ HRESULT IDirectSoundBufferImpl_Destroy( pdsb->notify = NULL; } - while (IDirectSoundBuffer8_Release(&pdsb->IDirectSoundBuffer8_iface) > 0); + secondarybuffer_destroy(pdsb); return S_OK; } @@ -1196,6 +1206,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->buffer->ref++; list_add_head(&dsb->buffer->buffers, &dsb->entry); dsb->ref = 1; + dsb->numIfaces = 1; dsb->state = STATE_STOPPED; dsb->buf_mixpos = dsb->sec_mixpos = 0; dsb->notify = NULL; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index fb02495..1410a9c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -159,6 +159,7 @@ HRESULT DirectSoundDevice_VerifyCertification(DirectSoundDevice * device, struct IDirectSoundBufferImpl { IDirectSoundBuffer8 IDirectSoundBuffer8_iface; + LONG numIfaces; /* "in use interfaces" refcount */ LONG ref; /* IDirectSoundBufferImpl fields */ DirectSoundDevice* device; @@ -206,6 +207,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; +void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; /***************************************************************************** * PrimaryBuffer implementation structure diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 956013d..48b49bc 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -335,7 +335,12 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(LPDIRECTSOUND3DBUFFER iface) { IDirectSound3DBufferImpl *This = (IDirectSound3DBufferImpl *)iface; ULONG ref = InterlockedIncrement(&(This->ref)); + TRACE("(%p) ref was %d\n", This, ref - 1); + + if(ref == 1) + InterlockedIncrement(&This->dsb->numIfaces); + return ref; } @@ -347,7 +352,8 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(LPDIRECTSOUND3DBUFFER iface if (!ref) { This->dsb->ds3db = NULL; - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER8)This->dsb); + if (!InterlockedDecrement(&This->dsb->numIfaces)) + secondarybuffer_destroy(This->dsb); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); }

1 0

Frédéric Delanoy : cmd/tests: Ensure ATTRIB tests pass on more Windows platforms.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 16744ed65ed1630e13312ae2b1a0db49acd38b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16744ed65ed1630e13312ae2b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 01:09:50 2011 +0200 cmd/tests: Ensure ATTRIB tests pass on more Windows platforms. There can be some default 'I' extended file attribute pertaining to non-indexable file/folders by Indexing Service, e.g. when using CIFS. --- programs/cmd/tests/test_builtins.cmd.exp | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ae21f05..a9e550b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -477,22 +477,22 @@ bar removed foobar removed bar\baz removed ------------ Testing attrib -------------- -(a)todo_wine@A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo +(a)todo_wine@A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo(a)or_broken@A I @pwd@\foobar\foo ... read-only attribute -(a)todo_wine@A R @pwd@\foobar\foo(a)or_broken@A R @pwd@\foobar\foo +(a)todo_wine@A R @pwd@\foobar\foo(a)or_broken@A R @pwd@\foobar\foo(a)or_broken@A R I @pwd@\foobar\foo foo foo original contents Read-only file not deleted Read-only file forcibly deleted ... recursive behaviour -(a)todo_wine@A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2 -(a)todo_wine@A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1 -(a)todo_wine@A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2 -(a)todo_wine@A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar +(a)todo_wine@A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 +(a)todo_wine@A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1(a)or_broken@A R I @pwd@\foobar\level1 +(a)todo_wine@A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2(a)or_broken@A R I @pwd@\foobar\baz\level2 +(a)todo_wine@A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar(a)or_broken@A I @pwd@\foobar\bar ... folders processing -(a)todo_wine@ @pwd@\foobar(a)or_broken@ @pwd@\foobar -(a)todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz -(a)todo_wine@A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto +(a)todo_wine@ @pwd@\foobar(a)or_broken@ @pwd@\foobar(a)or_broken@ I @pwd@\foobar +(a)todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz(a)or_broken@ R I @pwd@\foobar\baz +(a)todo_wine@A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto toto lulu file created in read-only dir

1 0

Nikolay Sivov : msxml3: Fix attributes formatting.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 897b77ce05353b528bb98cfd7790df0f88391d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=897b77ce05353b528bb98cfd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 00:28:23 2011 +0400 msxml3: Fix attributes formatting. --- dlls/msxml3/mxwriter.c | 5 +++-- dlls/msxml3/tests/saxreader.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 843ea4a..fd6681d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -754,8 +754,6 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( hr = ISAXAttributes_getLength(attr, &length); if (FAILED(hr)) return hr; - if (length) xmlOutputBufferWriteString(This->buffer, " "); - for (i = 0; i < length; i++) { const WCHAR *str; @@ -764,6 +762,9 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( hr = ISAXAttributes_getQName(attr, i, &str, &len); if (FAILED(hr)) return hr; + /* space separator in front of every attribute */ + xmlOutputBufferWriteString(This->buffer, " "); + s = xmlchar_from_wchar(str); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 74fd9c7..e72c4a9 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1394,6 +1394,7 @@ struct writer_startendelement_t { const char *qname; const char *output; HRESULT hr; + ISAXAttributes *attr; }; static const struct writer_startendelement_t writer_startendelement[] = { @@ -1475,6 +1476,13 @@ static const struct writer_startendelement_t writer_startendelement[] = { { &CLSID_MXXMLWriter30, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK }, { &CLSID_MXXMLWriter40, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK }, { &CLSID_MXXMLWriter60, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK }, + + /* with attributes */ + { &CLSID_MXXMLWriter, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, + /* 65 */ + { &CLSID_MXXMLWriter30, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, + { &CLSID_MXXMLWriter40, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, + { &CLSID_MXXMLWriter60, StartElement, "uri", "local", "uri:local", "<uri:local a:attr1=\"a1\" attr2=\"a2\">", S_OK, &saxattributes }, { NULL } }; @@ -1557,7 +1565,7 @@ static void test_mxwriter_startendelement_batch(const struct writer_startendelem if (table->type == StartElement) hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), - _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), NULL); + _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), table->attr); else hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), lstrlen(table->uri), _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname)); @@ -1676,10 +1684,6 @@ static void test_mxwriter_startendelement(void) todo_wine ok(!lstrcmpW(_bstr_("<><b></b><nspace:c/></a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); - /* try with attributes */ - hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1, &saxattributes); - ok(hr == S_OK, "got %08x\n", hr); - hr = ISAXContentHandler_endDocument(content); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : msxml3/tests: Tests for default properties values.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: d338323a0fc5735cf1a629d631ff2d040d60a082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d338323a0fc5735cf1a629d63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 08:09:31 2011 +0400 msxml3/tests: Tests for default properties values. --- dlls/msxml3/tests/saxreader.c | 176 ++++++++++++++++++++++++++-------------- 1 files changed, 114 insertions(+), 62 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e72c4a9..841e6a6 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1088,6 +1088,113 @@ static void test_mxwriter_contenthandler(void) IMXWriter_Release(writer); } +struct msxmlsupported_data_t +{ + const GUID *clsid; + const char *name; + BOOL supported; +}; + +static struct msxmlsupported_data_t msxmlsupported_data[] = +{ + { &CLSID_MXXMLWriter, "MXXMLWriter" }, + { &CLSID_MXXMLWriter30, "MXXMLWriter30" }, + { &CLSID_MXXMLWriter40, "MXXMLWriter40" }, + { &CLSID_MXXMLWriter60, "MXXMLWriter60" }, + { NULL } +}; + +static BOOL is_mxwriter_supported(const GUID *clsid, const struct msxmlsupported_data_t *table) +{ + while (table->clsid) + { + if (table->clsid == clsid) return table->supported; + table++; + } + return FALSE; +} + +struct mxwriter_props_t +{ + const GUID *clsid; + VARIANT_BOOL bom; + VARIANT_BOOL disable_escape; + VARIANT_BOOL indent; + VARIANT_BOOL omitdecl; + VARIANT_BOOL standalone; + const char *encoding; +}; + +static const struct mxwriter_props_t mxwriter_default_props[] = +{ + { &CLSID_MXXMLWriter, VARIANT_TRUE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, "UTF-16" }, + { &CLSID_MXXMLWriter30, VARIANT_TRUE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, "UTF-16" }, + { &CLSID_MXXMLWriter40, VARIANT_TRUE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, "UTF-16" }, + { &CLSID_MXXMLWriter60, VARIANT_TRUE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, "UTF-16" }, + { NULL } +}; + +static void test_mxwriter_default_properties(const struct mxwriter_props_t *table) +{ + int i = 0; + + while (table->clsid) + { + IMXWriter *writer; + VARIANT_BOOL b; + BSTR encoding; + HRESULT hr; + + if (!is_mxwriter_supported(table->clsid, msxmlsupported_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + b = !table->bom; + hr = IMXWriter_get_byteOrderMark(writer, &b); + EXPECT_HR(hr, S_OK); + ok(table->bom == b, "test %d: got BOM %d, expected %d\n", i, b, table->bom); + + b = !table->disable_escape; + hr = IMXWriter_get_disableOutputEscaping(writer, &b); + EXPECT_HR(hr, S_OK); + ok(table->disable_escape == b, "test %d: got disable escape %d, expected %d\n", i, b, + table->disable_escape); + + b = !table->indent; + hr = IMXWriter_get_indent(writer, &b); + EXPECT_HR(hr, S_OK); + ok(table->indent == b, "test %d: got indent %d, expected %d\n", i, b, table->indent); + + b = !table->omitdecl; + hr = IMXWriter_get_omitXMLDeclaration(writer, &b); + EXPECT_HR(hr, S_OK); + ok(table->omitdecl == b, "test %d: got omitdecl %d, expected %d\n", i, b, table->omitdecl); + + b = !table->standalone; + hr = IMXWriter_get_standalone(writer, &b); + EXPECT_HR(hr, S_OK); + ok(table->standalone == b, "test %d: got standalone %d, expected %d\n", i, b, table->standalone); + + hr = IMXWriter_get_encoding(writer, &encoding); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(encoding, _bstr_(table->encoding)), "test %d: got encoding %s, expected %s\n", + i, wine_dbgstr_w(encoding), table->encoding); + SysFreeString(encoding); + + IMXWriter_Release(writer); + + table++; + i++; + } +} + static void test_mxwriter_properties(void) { static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; @@ -1098,6 +1205,8 @@ static void test_mxwriter_properties(void) HRESULT hr; BSTR str, str2; + test_mxwriter_default_properties(mxwriter_default_props); + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1105,43 +1214,18 @@ static void test_mxwriter_properties(void) hr = IMXWriter_get_disableOutputEscaping(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr); - b = VARIANT_TRUE; - hr = IMXWriter_get_disableOutputEscaping(writer, &b); - ok(hr == S_OK, "got %08x\n", hr); - ok(b == VARIANT_FALSE, "got %d\n", b); - hr = IMXWriter_get_byteOrderMark(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr); - b = VARIANT_FALSE; - hr = IMXWriter_get_byteOrderMark(writer, &b); - ok(hr == S_OK, "got %08x\n", hr); - ok(b == VARIANT_TRUE, "got %d\n", b); - hr = IMXWriter_get_indent(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr); - b = VARIANT_TRUE; - hr = IMXWriter_get_indent(writer, &b); - ok(hr == S_OK, "got %08x\n", hr); - ok(b == VARIANT_FALSE, "got %d\n", b); - hr = IMXWriter_get_omitXMLDeclaration(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr); - b = VARIANT_TRUE; - hr = IMXWriter_get_omitXMLDeclaration(writer, &b); - ok(hr == S_OK, "got %08x\n", hr); - ok(b == VARIANT_FALSE, "got %d\n", b); - hr = IMXWriter_get_standalone(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr); - b = VARIANT_TRUE; - hr = IMXWriter_get_standalone(writer, &b); - ok(hr == S_OK, "got %08x\n", hr); - ok(b == VARIANT_FALSE, "got %d\n", b); - /* set and check */ hr = IMXWriter_put_standalone(writer, VARIANT_TRUE); ok(hr == S_OK, "got %08x\n", hr); @@ -1177,7 +1261,7 @@ static void test_mxwriter_properties(void) str = (void*)0xdeadbeef; hr = IMXWriter_get_encoding(writer, &str); ok(hr == S_OK, "got %08x\n", hr); - ok(lstrcmpW(str, utf16W) == 0, "expected empty string, got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, emptyW) == 0, "expected empty string, got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* invalid encoding name */ @@ -1486,22 +1570,6 @@ static const struct writer_startendelement_t writer_startendelement[] = { { NULL } }; -struct msxmlsupported_data_t -{ - const GUID *clsid; - const char *name; - BOOL supported; -}; - -static struct msxmlsupported_data_t msxmlsupported_data[] = -{ - { &CLSID_MXXMLWriter, "MXXMLWriter" }, - { &CLSID_MXXMLWriter30, "MXXMLWriter30" }, - { &CLSID_MXXMLWriter40, "MXXMLWriter40" }, - { &CLSID_MXXMLWriter60, "MXXMLWriter60" }, - { NULL } -}; - static void get_supported_mxwriter_data(struct msxmlsupported_data_t *table) { while (table->clsid) @@ -1520,23 +1588,10 @@ static void get_supported_mxwriter_data(struct msxmlsupported_data_t *table) } } -static BOOL is_mxwriter_supported(const GUID *clsid, const struct msxmlsupported_data_t *table) -{ - while (table->clsid) - { - if (table->clsid == clsid) return table->supported; - table++; - } - return FALSE; -} - static void test_mxwriter_startendelement_batch(const struct writer_startendelement_t *table) { - int i; + int i = 0; - get_supported_mxwriter_data(msxmlsupported_data); - - i = 0; while (table->clsid) { ISAXContentHandler *content; @@ -1928,7 +1983,6 @@ static void test_mxwriter_encoding(void) START_TEST(saxreader) { ISAXXMLReader *reader; - IMXWriter *writer; HRESULT hr; hr = CoInitialize(NULL); @@ -1948,12 +2002,10 @@ START_TEST(saxreader) test_saxreader(); test_encoding(); - hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, - &IID_IMXWriter, (void**)&writer); - if (hr == S_OK) + /* MXXMLWriter tests */ + get_supported_mxwriter_data(msxmlsupported_data); + if (is_mxwriter_supported(&CLSID_MXXMLWriter, msxmlsupported_data)) { - IMXWriter_Release(writer); - test_mxwriter_contenthandler(); test_mxwriter_startenddocument(); test_mxwriter_startendelement();

1 0

Frédéric Delanoy : cmd: Make some WCHAR arrays static.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: ef70d88be06b5aa463093e9cf84c2c2cf5750b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef70d88be06b5aa463093e9cf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 23:08:30 2011 +0200 cmd: Make some WCHAR arrays static. --- programs/cmd/builtins.c | 8 ++++---- programs/cmd/directory.c | 2 +- programs/cmd/wcmdmain.c | 24 ++++++++++++------------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7b8f76d..99c4c3a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -902,8 +902,8 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WIN32_FIND_DATAW fd; HANDLE hff; int i; - const WCHAR inW[] = {'i','n'}; - const WCHAR doW[] = {'d','o'}; + static const WCHAR inW[] = {'i','n'}; + static const WCHAR doW[] = {'d','o'}; CMD_LIST *setStart, *thisSet, *cmdStart, *cmdEnd; WCHAR variable[4]; WCHAR *firstCmd; @@ -1250,7 +1250,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, if (isIF) processThese = conditionTRUE; while (*cmdList) { - const WCHAR ifElse[] = {'e','l','s','e'}; + static const WCHAR ifElse[] = {'e','l','s','e'}; /* execute all appropriate commands */ curPosition = *cmdList; @@ -1615,7 +1615,7 @@ void WCMD_move (void) { else if (strstrW (quals, parmY)) force = TRUE; else { - const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; + static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) && ! lstrcmpiW (copycmd, parmY)); diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index f397951..217f31c 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -878,7 +878,7 @@ void WCMD_directory (WCHAR *cmd) { strcatW (path, starW); } else { - const WCHAR slashStarW[] = {'\\','*','\0'}; + static const WCHAR slashStarW[] = {'\\','*','\0'}; strcatW (path, slashStarW); } } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 63e8c16..04e1391 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -321,7 +321,7 @@ static void WCMD_show_prompt (void) { len = GetEnvironmentVariableW(envPrompt, prompt_string, sizeof(prompt_string)/sizeof(WCHAR)); if ((len == 0) || (len >= (sizeof(prompt_string)/sizeof(WCHAR)))) { - const WCHAR dfltPrompt[] = {'$','P','$','G','\0'}; + static const WCHAR dfltPrompt[] = {'$','P','$','G','\0'}; strcpyW (prompt_string, dfltPrompt); } p = prompt_string; @@ -1048,7 +1048,7 @@ void WCMD_run_program (WCHAR *command, int called) { WCHAR thisDir[MAX_PATH] = {'\0'}; WCHAR *pos = NULL; BOOL found = FALSE; - const WCHAR slashW[] = {'\\','\0'}; + static const WCHAR slashW[] = {'\\','\0'}; /* Work on the first directory on the search path */ pos = strchrW(pathposn, ';'); @@ -1753,10 +1753,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE CMD_LIST *lastEntry = NULL; CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ - const WCHAR remCmd[] = {'r','e','m'}; - const WCHAR forCmd[] = {'f','o','r'}; - const WCHAR ifCmd[] = {'i','f'}; - const WCHAR ifElse[] = {'e','l','s','e'}; + static const WCHAR remCmd[] = {'r','e','m'}; + static const WCHAR forCmd[] = {'f','o','r'}; + static const WCHAR ifCmd[] = {'i','f'}; + static const WCHAR ifElse[] = {'e','l','s','e'}; BOOL inRem = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; @@ -1799,9 +1799,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); /* Show prompt before batch line IF echo is on and in batch program */ if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { - const WCHAR spc[]={' ','\0'}; - const WCHAR echoDot[] = {'e','c','h','o','.'}; - const WCHAR echoCol[] = {'e','c','h','o',':'}; + static const WCHAR spc[]={' ','\0'}; + static const WCHAR echoDot[] = {'e','c','h','o','.'}; + static const WCHAR echoCol[] = {'e','c','h','o',':'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); DWORD curr_size = strlenW(extraSpace); DWORD min_len = (curr_size < len ? curr_size : len); @@ -1838,7 +1838,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Certain commands need special handling */ if (curStringLen == 0 && curCopyTo == curString) { - const WCHAR forDO[] = {'d','o'}; + static const WCHAR forDO[] = {'d','o'}; /* If command starts with 'rem ', ignore any &&, ( etc. */ if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos)) { @@ -1884,7 +1884,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Special handling for the 'FOR' command */ if (inFor && lastWasWhiteSpace) { - const WCHAR forIN[] = {'i','n'}; + static const WCHAR forIN[] = {'i','n'}; WINE_TRACE("Found 'FOR ', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); @@ -2296,7 +2296,7 @@ int wmain (int argc, WCHAR *argvW[]) } if (opt_q) { - const WCHAR eoff[] = {'O','F','F','\0'}; + static const WCHAR eoff[] = {'O','F','F','\0'}; WCMD_echo(eoff); }

1 0

Frédéric Delanoy : cmd/tests: Add FOR tests for various quoted parameters.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 199f788c315f191433b1dbf98b2facf647af4a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199f788c315f191433b1dbf98… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 23:08:31 2011 +0200 cmd/tests: Add FOR tests for various quoted parameters. --- programs/cmd/tests/test_builtins.cmd | 4 ++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 618a6c7..4f5111c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -434,6 +434,10 @@ for %%i in (@tab@ foo(a)tab@) do echo %%i for(a)tab@ %%i in(a)tab@(@tab(a)M) do echo %%i for %%i(a)tab@in (X)@tab(a)do@tab(a)echo %%i for(a)tab@ %%j in(a)tab@(@tab(a)M, N, O(a)tab@) do echo %%j +for %%i in (`echo A B`) do echo %%i +for %%i in ('echo A B') do echo %%i +for %%i in ("echo A B") do echo %%i +for %%i in ("A B" C) do echo %%i goto :endForTestFun1 :forTestFun1 echo %1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a9e550b..239a394 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -322,6 +322,15 @@ X M N O +`echo +A +B` +'echo +A +B' +(a)todo_wine@"echo A B" +(a)todo_wine@"A B" +C ...imbricated FORs @todo_wine(a)X Y @todo_wine(a)X Y

1 0

Frédéric Delanoy : cmd/tests: Add basic FOR / F tests.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: bf0e1c7ca7a567c306cfdb2bb22cc93845ef92b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0e1c7ca7a567c306cfdb2bb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 23:08:32 2011 +0200 cmd/tests: Add basic FOR /F tests. --- programs/cmd/tests/test_builtins.cmd | 48 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 30 ++++++++++++++++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4f5111c..4123d4c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -585,6 +585,54 @@ set /a var=foo=19, foo %%= 4 + (bar %%= 7) & echo. set foo= set bar= set var= +echo ...for /F +mkdir foobar & cd foobar +echo ......string argument +for /F %%i in ("a b c") do echo %%i +for /f %%i in ("a ") do echo %%i +for /f %%i in ("a") do echo %%i +fOr /f %%i in (" a") do echo %%i +for /f %%i in (" a ") do echo %%i +echo ......fileset argument +echo .........basic blank handling +echo a b c>foo +for /f %%i in (foo) do echo %%i +echo a >foo +for /f %%i in (foo) do echo %%i +echo a>foo +for /f %%i in (foo) do echo %%i +echo a>foo +for /f %%i in (foo) do echo %%i +echo a >foo +for /f %%i in (foo) do echo %%i +echo. > foo +for /f %%i in (foo) do echo %%i +echo. >> foo +echo b > foo +for /f %%i in (foo) do echo %%i +echo .........multi-line with empty lines +echo a Z f> foo +echo. >> foo +echo.>> foo +echo b bC>> foo +echo c>> foo +echo. >> foo +for /f %%b in (foo) do echo %%b +echo .........multiple files +echo q w > bar +echo.>> bar +echo kkk>>bar +for /f %%k in (foo bar) do echo %%k +for /f %%k in (bar foo) do echo %%k +rem echo ......command argument +rem Not implemented on NT4 +rem FIXME: Not testable right now in wine: not implemented and would need +rem preliminary grep-like program implementation (e.g. like findstr or fc) even +rem for a simple todo_wine test +rem (for /f "usebackq" %%i in (`echo z a b`) do echo %%i) || echo not supported +rem (for /f usebackq %%i in (`echo z a b`) do echo %%i) || echo not supported +cd .. +rd /s/q foobar echo -----------Testing del /a----------- del /f/q *.test > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 239a394..8e74c79 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -431,6 +431,36 @@ bar 0 @todo_wine(a)5@or_broken(a)0 +...for /F +......string argument +a +a +a +a +a +......fileset argument +.........basic blank handling +a +a +a +a +a +b +.........multi-line with empty lines +a +b +c +.........multiple files +a +b +c +q +kkk +q +kkk +a +b +c -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Frédéric Delanoy : cmd/tests: Add tests for FOR / F 'eol' option.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 1755885472f5612dcb8ee544d1ba46d246aae449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1755885472f5612dcb8ee544d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 23:08:33 2011 +0200 cmd/tests: Add tests for FOR /F 'eol' option. --- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4123d4c..af3b52e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -631,6 +631,14 @@ rem preliminary grep-like program implementation (e.g. like findstr or fc) even rem for a simple todo_wine test rem (for /f "usebackq" %%i in (`echo z a b`) do echo %%i) || echo not supported rem (for /f usebackq %%i in (`echo z a b`) do echo %%i) || echo not supported +echo ......eol option +for /f "eol=@" %%i in (" ad") do echo %%i +for /f "eol=@" %%i in (" z(a)y") do echo %%i +for /f "eol=|" %%i in ("a|d") do echo %%i +for /f "eol=@" %%i in ("@y") do echo %%i > output_file +if not exist output_file (echo no output) else (del output_file) +for /f "eol==" %%i in ("=y") do echo %%i > output_file +if not exist output_file (echo no output) else (del output_file) cd .. rd /s/q foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8e74c79..3ff7eeb 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -461,6 +461,12 @@ kkk a b c +......eol option +(a)todo_wine@ad +(a)todo_wine@z(a)y +(a)todo_wine@a|d +(a)todo_wine@no output +(a)todo_wine@no output -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0