February 2016 - Wine-commits

Huw Davies : ole32/tests: Add more drag and drop tests.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: d468ed1e999674d0711f0dbb090c4e18206d87d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d468ed1e999674d0711f0dbb0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:34 2016 +0000 ole32/tests: Add more drag and drop tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/dragdrop.c | 118 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 027e0da..09112b8 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -140,7 +140,123 @@ struct method_call call_lists[][30] = { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, { DoDragDrop_effect_out, 0, 0, 0, 0 }, { end_seq, 0, 0, 0, 0 } - } + }, + { /* Multiple initial effects */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_Drop, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a drop */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_DROP, 0, 0 }, + { DT_Drop, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_DROP, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First QueryContinueDrag cancels */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_CANCEL, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_CANCEL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a cancel */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, DRAGDROP_S_CANCEL, 0, 0 }, + { DT_DragLeave, 0, 0, 0, 0 }, + + { DoDragDrop_ret, DRAGDROP_S_CANCEL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, + { /* First couple of QueryContinueDrag return S_OK followed by a E_FAIL */ + { DoDragDrop_effect_in, 0, 0, DROPEFFECT_COPY | DROPEFFECT_MOVE, 0 }, + { DO_EnumFormatEtc, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { EnumFMT_Reset, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_OK, 0, 1 }, + { EnumFMT_Next, 0, S_FALSE, 0, 1 }, + { DO_QueryGetData, 0, S_OK, 0, 1 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragEnter, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, S_OK, 0, 0 }, + { DT_DragOver, DROPEFFECT_COPY | DROPEFFECT_MOVE, S_OK, DROPEFFECT_COPY, 0 }, + { DS_GiveFeedback, DROPEFFECT_COPY, DRAGDROP_S_USEDEFAULTCURSORS, 0, 0 }, + + { DS_QueryContinueDrag, 0, E_FAIL, 0, 0 }, + { DT_DragLeave, 0, 0, 0, 0 }, + + { DoDragDrop_ret, E_FAIL, 0, 0, 0 }, + { DoDragDrop_effect_out, 0, 0, 0, 0 }, + { end_seq, 0, 0, 0, 0 } + }, }; static int droptarget_refs;

1 0

Alistair Leslie-Hughes : gdi32/tests: Add tests for GetPath using metafile.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: bd571e7d1d9749195941988a7c267eed7260e28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd571e7d1d9749195941988a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 23 18:16:49 2016 +1100 gdi32/tests: Add tests for GetPath using metafile. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f464720..a90c533 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2661,6 +2661,62 @@ static void test_mf_clipping(void) DestroyWindow(hwnd); } +static const unsigned char MF_PATH_BITS[] = +{ + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0x02, + 0x32, 0x00, 0x32, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x13, 0x02, 0x96, 0x00, 0x32, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x13, 0x02, 0x96, 0x00, 0x96, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x13, 0x02, 0x32, 0x00, + 0x96, 0x00, 0x05, 0x00, 0x00, 0x00, 0x13, 0x02, + 0x32, 0x00, 0x32, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x1b, 0x04, 0x14, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static void test_mf_GetPath(void) +{ + HDC hdc; + HMETAFILE hmf; + BOOL ret; + int size; + + SetLastError(0xdeadbeef); + hdc = CreateMetaFileA(NULL); + ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); + + BeginPath(hdc); + ret = MoveToEx(hdc, 50, 50, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(hdc, 50, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 150, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 150, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 50, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + Rectangle(hdc, 10, 10, 20, 20); + EndPath(hdc); + + size = GetPath(hdc, NULL, NULL, 0); + ok( size == -1, "GetPath returned %d.\n", size); + + hmf = CloseMetaFile(hdc); + ok(hmf != 0, "CloseMetaFile error %d\n", GetLastError()); + + if (compare_mf_bits (hmf, MF_PATH_BITS, sizeof(MF_PATH_BITS), "mf_GetPath") != 0) + { + dump_mf_bits(hmf, "mf_GetPath"); + EnumMetaFile(0, hmf, mf_enum_proc, 0); + } + + ret = DeleteMetaFile(hmf); + ok( ret, "DeleteMetaFile error %d\n", GetLastError()); +} + static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData) { LPMETAFILEPICT lpMFP = (LPMETAFILEPICT)lpData; @@ -3461,6 +3517,7 @@ START_TEST(metafile) test_SetMetaFileBits(); test_mf_ExtTextOut_on_path(); test_mf_clipping(); + test_mf_GetPath(); /* For metafile conversions */ test_mf_conversions();

1 0

Austin English : include: Fix tagLOGCOLORSPACEW indentation.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 0366b4194e617643463bb9d7a21b81ae6b5a7b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0366b4194e617643463bb9d7a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 23 02:40:28 2016 -0600 include: Fix tagLOGCOLORSPACEW indentation. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index ff11406..dbe12cd 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -193,7 +193,7 @@ typedef struct tagLOGCOLORSPACEA CHAR lcsFilename[MAX_PATH]; } LOGCOLORSPACEA, *LPLOGCOLORSPACEA; - typedef struct tagLOGCOLORSPACEW +typedef struct tagLOGCOLORSPACEW { DWORD lcsSignature; DWORD lcsVersion;

1 0

Alexandre Julliard : winepulse.drv: Avoid some printf format warnings.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 9bfff40db571bf4b4e0f704e6a05401ddf88567f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bfff40db571bf4b4e0f704e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 21:53:34 2016 +0900 winepulse.drv: Avoid some printf format warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 04e9a0b..d57b822 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -662,7 +662,7 @@ static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) UINT32 oldpad = This->pad; if(This->local_buffer){ - size_t to_write; + UINT32 to_write; BYTE *buf = This->local_buffer + This->lcl_offs_bytes; if(This->pad > bytes){

1 0

Hans Leidekker : webservices: Add support for namespace attributes in the writer.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 2d53f131183ce24d89c38dee46780aace3fe2995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d53f131183ce24d89c38dee4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:50 2016 +0100 webservices: Add support for namespace attributes in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 119 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 99 insertions(+), 20 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 88dab77..2ea3486 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -485,7 +485,6 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) if (text) write_bytes( writer, text->value.bytes, text->value.length ); write_char( writer, quote ); - /* FIXME: ignoring namespace */ return S_OK; } @@ -503,21 +502,42 @@ static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING return S_OK; } +static HRESULT write_namespace_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) +{ + unsigned char quote = attr->singleQuote ? '\'' : '"'; + ULONG size; + HRESULT hr; + + /* ' xmlns:prefix="namespace"' */ + + size = attr->ns->length + 9 /* ' xmlns=""' */; + if (attr->prefix) size += attr->prefix->length + 1 /* ':' */; + if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; + + write_bytes( writer, (const BYTE *)" xmlns", 6 ); + if (attr->prefix) + { + write_char( writer, ':' ); + write_bytes( writer, attr->prefix->bytes, attr->prefix->length ); + } + write_char( writer, '=' ); + write_char( writer, quote ); + write_bytes( writer, attr->ns->bytes, attr->ns->length ); + write_char( writer, quote ); + + return S_OK; +} + static HRESULT write_startelement( struct writer *writer ) { WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; ULONG size, i; HRESULT hr; - /* '<prefix:localname prefix:attr="value"... xmlns:prefix="ns"' */ + /* '<prefix:localname prefix:attr="value"... xmlns:prefix="ns"'... */ size = elem->localName->length + 1 /* '<' */; if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; - if (elem->ns->length && !is_current_namespace( writer, elem->ns )) - { - size += strlen(" xmlns") + elem->ns->length + 3 /* '=""' */; - if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; - } if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_char( writer, '<' ); @@ -529,23 +549,20 @@ static HRESULT write_startelement( struct writer *writer ) write_bytes( writer, elem->localName->bytes, elem->localName->length ); for (i = 0; i < elem->attributeCount; i++) { + if (elem->attributes[i]->isXmlNs) continue; if ((hr = write_attribute( writer, elem->attributes[i] )) != S_OK) return hr; } - if (elem->ns->length && !is_current_namespace( writer, elem->ns )) + for (i = 0; i < elem->attributeCount; i++) { - if ((hr = set_current_namespace( writer, elem->ns )) != S_OK) return hr; - - write_bytes( writer, (const BYTE *)" xmlns", 6 ); - if (elem->prefix) - { - write_char( writer, ':' ); - write_bytes( writer, elem->prefix->bytes, elem->prefix->length ); - } - write_char( writer, '=' ); - write_char( writer, '"' ); - write_bytes( writer, elem->ns->bytes, elem->ns->length ); - write_char( writer, '"' ); + if (!elem->attributes[i]->isXmlNs || !elem->attributes[i]->prefix) continue; + if ((hr = write_namespace_attribute( writer, elem->attributes[i] )) != S_OK) return hr; + } + for (i = 0; i < elem->attributeCount; i++) + { + if (!elem->attributes[i]->isXmlNs || elem->attributes[i]->prefix) continue; + if ((hr = write_namespace_attribute( writer, elem->attributes[i] )) != S_OK) return hr; } + return S_OK; } @@ -576,9 +593,70 @@ static HRESULT write_endelement( struct writer *writer ) return S_OK; } +static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *ns, BOOL single ) +{ + WS_XML_ATTRIBUTE *attr; + WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; + HRESULT hr; + + if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; + + attr->singleQuote = !!single; + attr->isXmlNs = 1; + if (prefix && !(attr->prefix = alloc_xml_string( prefix->bytes, prefix->length ))) + { + free_attribute( attr ); + return E_OUTOFMEMORY; + } + if (!(attr->ns = alloc_xml_string( ns->bytes, ns->length ))) + { + free_attribute( attr ); + return E_OUTOFMEMORY; + } + if ((hr = append_attribute( elem, attr )) != S_OK) + { + free_attribute( attr ); + return hr; + } + return S_OK; +} + +static const WS_XML_ATTRIBUTE *find_namespace_attribute( const WS_XML_ELEMENT_NODE *elem, + const WS_XML_STRING *prefix, + const WS_XML_STRING *ns ) +{ + ULONG i; + for (i = 0; i < elem->attributeCount; i++) + { + if (!elem->attributes[i]->isXmlNs) continue; + if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && + WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) + { + return elem->attributes[i]; + } + } + return NULL; +} + +static HRESULT write_set_element_namespace( struct writer *writer ) +{ + WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; + HRESULT hr; + + if (!elem->ns->length || is_current_namespace( writer, elem->ns ) || + find_namespace_attribute( elem, elem->prefix, elem->ns )) return S_OK; + + if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) + return hr; + + return set_current_namespace( writer, elem->ns ); +} + static HRESULT write_endstartelement( struct writer *writer ) { HRESULT hr; + if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; write_char( writer, '>' ); @@ -609,6 +687,7 @@ static HRESULT write_close_element( struct writer *writer ) if (writer->state == WRITER_STATE_STARTELEMENT) { /* '/>' */ + if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; write_char( writer, '/' );

1 0

Hans Leidekker : webservices: Implement WsWriteXmlnsAttribute.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 21d9e5181d8ca4434ab6e3847f3ec4980ef3c7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d9e5181d8ca4434ab6e3847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:51 2016 +0100 webservices: Implement WsWriteXmlnsAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 193 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 19 ++++ include/webservices.h | 2 + 4 files changed, 215 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21d9e5181d8ca4434ab6e…

1 0

Hans Leidekker : webservices: Implement WsGetPrefixFromNamespace.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 2a4063cd86ea196b0e4b8cc8d6e7686331e72f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4063cd86ea196b0e4b8cc8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:52 2016 +0100 webservices: Implement WsGetPrefixFromNamespace. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 93 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 31 +++++++++++++ include/webservices.h | 2 + 4 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 0e67eaf..446fa1d 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1211,6 +1211,98 @@ static void test_WsWriteXmlnsAttribute(void) WsFreeWriter( writer ); } +static void prepare_prefix_test( WS_XML_WRITER *writer ) +{ + const WS_XML_STRING p = {1, (BYTE *)"p"}, localname = {1, (BYTE *)"t"}, ns = {2, (BYTE *)"ns"}; + HRESULT hr; + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndStartElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); +} + +static void test_WsGetPrefixFromNamespace(void) +{ + const WS_XML_STRING p = {1, (BYTE *)"p"}, localname = {1, (BYTE *)"t"}, *prefix; + const WS_XML_STRING ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetPrefixFromNamespace( NULL, NULL, FALSE, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetPrefixFromNamespace( NULL, NULL, FALSE, &prefix, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetPrefixFromNamespace( writer, NULL, FALSE, &prefix, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* element must be committed */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* but writer can't be positioned on end element node */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* required = TRUE */ + prefix = NULL; + prepare_prefix_test( writer ); + hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( prefix != NULL, "prefix not set\n" ); + if (prefix) + { + ok( prefix->length == 1, "got %u\n", prefix->length ); + ok( !memcmp( prefix->bytes, "p", 1 ), "wrong prefix\n" ); + } + + prefix = (const WS_XML_STRING *)0xdeadbeef; + hr = WsGetPrefixFromNamespace( writer, &ns2, TRUE, &prefix, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( prefix == (const WS_XML_STRING *)0xdeadbeef, "prefix set\n" ); + + /* required = FALSE */ + prefix = NULL; + prepare_prefix_test( writer ); + hr = WsGetPrefixFromNamespace( writer, &ns, FALSE, &prefix, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( prefix != NULL, "prefix not set\n" ); + if (prefix) + { + ok( prefix->length == 1, "got %u\n", prefix->length ); + ok( !memcmp( prefix->bytes, "p", 1 ), "wrong prefix\n" ); + } + + prefix = (const WS_XML_STRING *)0xdeadbeef; + hr = WsGetPrefixFromNamespace( writer, &ns2, FALSE, &prefix, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( prefix == NULL, "prefix not set\n" ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1227,4 +1319,5 @@ START_TEST(writer) test_WsWriteAttribute(); test_WsWriteStartCData(); test_WsWriteXmlnsAttribute(); + test_WsGetPrefixFromNamespace(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3b0f1fc..f0a843a 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -79,7 +79,7 @@ @ stub WsGetOperationContextProperty @ stub WsGetPolicyAlternativeCount @ stub WsGetPolicyProperty -@ stub WsGetPrefixFromNamespace +@ stdcall WsGetPrefixFromNamespace(ptr ptr long ptr ptr) @ stdcall WsGetReaderNode(ptr ptr ptr) @ stub WsGetReaderPosition @ stdcall WsGetReaderProperty(ptr long ptr long ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f55f644..14bddfb 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -493,6 +493,37 @@ static inline BOOL is_current_namespace( struct writer *writer, const WS_XML_STR return (WsXmlStringEquals( writer->current_ns, ns, NULL ) == S_OK); } +/************************************************************************** + * WsGetPrefixFromNamespace [webservices.@] + */ +HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STRING *ns, + BOOL required, const WS_XML_STRING **prefix, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_ELEMENT_NODE *elem; + BOOL found = FALSE; + + TRACE( "%p %s %d %p %p\n", handle, debugstr_xmlstr(ns), required, prefix, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !ns || !prefix) return E_INVALIDARG; + + elem = &writer->current->hdr; + if (elem->prefix && is_current_namespace( writer, ns )) + { + *prefix = elem->prefix; + found = TRUE; + } + if (!found) + { + if (required) return WS_E_INVALID_FORMAT; + *prefix = NULL; + return S_FALSE; + } + return S_OK; +} + static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) { WS_XML_STRING *str; diff --git a/include/webservices.h b/include/webservices.h index 73b7f0a..cd82cb7 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -556,6 +556,8 @@ void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetPrefixFromNamespace(WS_XML_WRITER*, const WS_XML_STRING*, BOOL, + const WS_XML_STRING**, WS_ERROR*); HRESULT WINAPI WsGetReaderNode(WS_XML_READER*, const WS_XML_NODE**, WS_ERROR*); HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, void*, ULONG, WS_ERROR*);

1 0

Hans Leidekker : webservices: Set bytes pointer to NULL if length is zero in alloc_xml_string and alloc_utf8_text.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: bc131a26534de74581e6fa171581eebbaaf3a3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc131a26534de74581e6fa171… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:53 2016 +0100 webservices: Set bytes pointer to NULL if length is zero in alloc_xml_string and alloc_utf8_text. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 55cd4ac..2abb82a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -665,7 +665,7 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *data, ULONG len ) if (!(ret = heap_alloc( sizeof(*ret) + len ))) return NULL; ret->length = len; - ret->bytes = (BYTE *)(ret + 1); + ret->bytes = len ? (BYTE *)(ret + 1) : NULL; ret->dictionary = NULL; ret->id = 0; if (data) memcpy( ret->bytes, data, len ); @@ -679,7 +679,7 @@ WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *data, ULONG len ) if (!(ret = heap_alloc( sizeof(*ret) + len ))) return NULL; ret->text.textType = WS_XML_TEXT_TYPE_UTF8; ret->value.length = len; - ret->value.bytes = (BYTE *)(ret + 1); + ret->value.bytes = len ? (BYTE *)(ret + 1) : NULL; ret->value.dictionary = NULL; ret->value.id = 0; if (data) memcpy( ret->value.bytes, data, len ); @@ -881,10 +881,8 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) if (!len) goto error; if ((hr = parse_name( start, len, &attr->prefix, &attr->localName )) != S_OK) goto error; - if (!attr->prefix->length) attr->prefix->bytes = NULL; hr = E_OUTOFMEMORY; if (!(attr->ns = alloc_xml_string( NULL, 0 ))) goto error; - attr->ns->bytes = NULL; hr = WS_E_INVALID_FORMAT; read_skip_whitespace( reader ); @@ -907,11 +905,8 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) } read_skip( reader, 1 ); - if (!(text = alloc_utf8_text( start, len ))) - { - free_attribute( attr ); - return E_OUTOFMEMORY; - } + hr = E_OUTOFMEMORY; + if (!(text = alloc_utf8_text( start, len ))) goto error; attr->value = &text->text; attr->singleQuote = (quote == '\''); @@ -957,9 +952,9 @@ static HRESULT read_element( struct reader *reader ) if (!len) goto error; if ((hr = parse_name( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; - if (!elem->prefix->length) elem->prefix->bytes = NULL; hr = E_OUTOFMEMORY; if (!(elem->ns = alloc_xml_string( NULL, 0 ))) goto error; + elem->ns->bytes = (BYTE *)(elem->ns + 1); reader->current_attr = 0; for (;;)

1 0

Hans Leidekker : webservices: Add support for namespace attributes in the reader.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: e0ff2f930ddc3811e090efa5702bb1d6ea351b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ff2f930ddc3811e090efa57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:54 2016 +0100 webservices: Add support for namespace attributes in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 2abb82a..92a8184 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -862,10 +862,12 @@ static HRESULT parse_name( const unsigned char *str, unsigned int len, static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { + static const WS_XML_STRING xmlns = {5, (BYTE *)"xmlns"}; WS_XML_ATTRIBUTE *attr; WS_XML_UTF8_TEXT *text; unsigned int len = 0, ch, skip, quote; const unsigned char *start; + WS_XML_STRING *prefix, *localname; HRESULT hr = WS_E_INVALID_FORMAT; if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; @@ -880,9 +882,19 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) } if (!len) goto error; - if ((hr = parse_name( start, len, &attr->prefix, &attr->localName )) != S_OK) goto error; + if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) goto error; hr = E_OUTOFMEMORY; - if (!(attr->ns = alloc_xml_string( NULL, 0 ))) goto error; + if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) + { + attr->isXmlNs = 1; + if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) goto error; + attr->localName = localname; + } + else + { + attr->prefix = prefix; + attr->localName = localname; + } hr = WS_E_INVALID_FORMAT; read_skip_whitespace( reader ); @@ -906,8 +918,18 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) read_skip( reader, 1 ); hr = E_OUTOFMEMORY; - if (!(text = alloc_utf8_text( start, len ))) goto error; - attr->value = &text->text; + if (attr->isXmlNs) + { + if (!(attr->ns = alloc_xml_string( start, len ))) goto error; + if (!(text = alloc_utf8_text( NULL, 0 ))) goto error; + attr->value = &text->text; + } + else + { + if (!(attr->ns = alloc_xml_string( NULL, 0 ))) goto error; + if (!(text = alloc_utf8_text( start, len ))) goto error; + attr->value = &text->text; + } attr->singleQuote = (quote == '\''); *ret = attr;

1 0

Charles Davis : winecoreaudio.drv: Don' t use pointer constants with an integer type (Clang).
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: c8e87bd87831bed62fb01d68def5dd568bcaeb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e87bd87831bed62fb01d68d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 19 15:48:08 2016 -0700 winecoreaudio.drv: Don't use pointer constants with an integer type (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 1733418..5ec5646 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -29,10 +29,10 @@ MIDIClientRef CoreMIDI_CreateClient(CFStringRef name) { - MIDIClientRef client = NULL; + MIDIClientRef client = 0; if (MIDIClientCreate(name, NULL /* FIXME use notify proc */, NULL, &client) != noErr) - return NULL; + return 0; return client; }

1 0