July 2017 - Wine-commits - list.winehq.org

Henri Verbeet : d3drm/tests: Simplify a conditional expression.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 7227889496cf9e1f057c5ee6769d1f70fd56d28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7227889496cf9e1f057c5ee67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 12 18:42:28 2017 +0200 d3drm/tests: Simplify a conditional expression. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c59763d..1ab81e4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -109,7 +109,7 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr); ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size); - size = size2 = !!*name ? 1 : 0; + size = size2 = !!*name; hr = IDirect3DRMObject_GetClassName(object, &size, cname); ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok_(__FILE__, line)(size == size2, "Got size %u.\n", size);

1 0

Henri Verbeet : winex11: Only use glXSwapBuffersMscOML() for child windows.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 147f9341031b7a808d18a2d3545e19fdd2c7c92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=147f9341031b7a808d18a2d35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 12 18:42:29 2017 +0200 winex11: Only use glXSwapBuffersMscOML() for child windows. The notion that glXSwapBuffersMscOML() with 0/0/0 target_msc/divisor/remainder is supposed to behave like glXSwapBuffers() with respect to the swap interval turns out to have been a misconception on my behalf, the extension spec doesn't actually say that. Adding to the confusion is the fact that some drivers do in fact behave like that in practice. It's possible to make glXSwapBuffersMscOML() use the proper swap interval, but it's much easier to just use glXSwapBuffers() instead. One consequence of the approach taken in this patch is that child window buffer swaps aren't necessarily synchronised to vblank, but ultimately that's up to X11DRV_FLUSH_GL_DRAWABLE, not the buffer swap. This fixes a regression introduced by commit e75bc6228ebcbdc1a3877a6ac6954611dedf8a71. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 28f033d..5eb70a8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3356,7 +3356,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) escape.gl_drawable = gl->window; /* fall through */ default: - if (pglXSwapBuffersMscOML) + if (escape.gl_drawable && pglXSwapBuffersMscOML) { pglFlush(); target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 );

1 0

Piotr Caban : gdiplus: Support GdipSetSmoothingMode in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 910975a944ca90701381e4acd5eb02b1b345be13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910975a944ca90701381e4acd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 17:51:03 2017 +0200 gdiplus: Support GdipSetSmoothingMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f20178a..277bbd2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5972,6 +5972,20 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mod if(graphics->busy) return ObjectBusy; + if(graphics->smoothing == mode) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) { + GpStatus stat; + BOOL antialias = (mode != SmoothingModeDefault && + mode != SmoothingModeNone && mode != SmoothingModeHighSpeed); + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetAntiAliasMode, (mode << 1) + antialias); + if(stat != Ok) + return stat; + } + graphics->smoothing = mode; return Ok;

1 0

Piotr Caban : gdiplus: Support GdipSetCompositingMode in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 1cecd479855c30a1023a281d6cabef1b1eb2fac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cecd479855c30a1023a281d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:13 2017 +0200 gdiplus: Support GdipSetCompositingMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 277bbd2..091b196 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5808,6 +5808,19 @@ GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics *graphics, if(graphics->busy) return ObjectBusy; + if(graphics->compmode == mode) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetCompositingMode, mode); + if(stat != Ok) + return stat; + } + graphics->compmode = mode; return Ok;

1 0

Piotr Caban : gdiplus: Support GdipSetCompositingQuality in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: f2483748eb0d9dd9eb19c88a353205d9cea92de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2483748eb0d9dd9eb19c88a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:19 2017 +0200 gdiplus: Support GdipSetCompositingQuality in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 091b196..91c54d3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5837,6 +5837,19 @@ GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics *graphics, if(graphics->busy) return ObjectBusy; + if(graphics->compqual == quality) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetCompositingQuality, quality); + if(stat != Ok) + return stat; + } + graphics->compqual = quality; return Ok;

1 0

Piotr Caban : gdiplus: Support GdipSetInterpolationMode in metafiles.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 29968cfdc8bab164fc5d4fe2b598d680f950cfe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29968cfdc8bab164fc5d4fe2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:23 2017 +0200 gdiplus: Support GdipSetInterpolationMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 91c54d3..a56ac43 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5872,6 +5872,19 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, if (mode == InterpolationModeHighQuality) mode = InterpolationModeHighQualityBicubic; + if (mode == graphics->interpolation) + return Ok; + + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetInterpolationMode, mode); + if (stat != Ok) + return stat; + } + graphics->interpolation = mode; return Ok;

1 0

Piotr Caban : gdiplus: Add EMF+ properties records tests.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 9d40addbebd4a8d9bce2bb924562a8b8d503de94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d40addbebd4a8d9bce2bb924… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 11:42:14 2017 +0200 gdiplus: Add EMF+ properties records tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index cbf63a6..2ed8355 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2406,6 +2406,83 @@ static void test_drawimage(void) expect(Ok, stat); } +static const emfplus_record properties_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeSetTextRenderingHint}, + {0, EmfPlusRecordTypeSetPixelOffsetMode}, + {0, EmfPlusRecordTypeSetAntiAliasMode}, + {0, EmfPlusRecordTypeSetCompositingMode}, + {0, EmfPlusRecordTypeSetCompositingQuality}, + {0, EmfPlusRecordTypeSetInterpolationMode}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_properties(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault); + expect(Ok, stat); + stat = GdipSetTextRenderingHint(graphics, TextRenderingHintAntiAlias); + expect(Ok, stat); + + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + stat = GdipSetPixelOffsetMode(graphics, PixelOffsetModeHighQuality); + expect(Ok, stat); + + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + stat = GdipSetSmoothingMode(graphics, SmoothingModeAntiAlias); + expect(Ok, stat); + + stat = GdipSetCompositingMode(graphics, CompositingModeSourceOver); + expect(Ok, stat); + stat = GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + expect(Ok, stat); + + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + stat = GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + expect(Ok, stat); + + stat = GdipSetInterpolationMode(graphics, InterpolationModeDefault); + expect(Ok, stat); + stat = GdipSetInterpolationMode(graphics, InterpolationModeHighQuality); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "properties.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, properties_records, "properties"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2444,6 +2521,7 @@ START_TEST(metafile) test_clipping(); test_gditransform(); test_drawimage(); + test_properties(); GdiplusShutdown(gdiplusToken); }

1 0

Hans Leidekker : webservices: Add support for UNIQUE_ID records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: f40d88a0c757b4eac4b021752ea9f9bb9da5ec2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40d88a0c757b4eac4b021752… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:36 2017 +0200 webservices: Add support for UNIQUE_ID records 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 | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e3b9214..e262254 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -719,6 +719,9 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_GUID: return RECORD_GUID_TEXT; + case WS_XML_TEXT_TYPE_UNIQUE_ID: + return RECORD_UNIQUE_ID_TEXT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -861,6 +864,13 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); return S_OK; } + case RECORD_UNIQUE_ID_TEXT: + { + WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_unique_id->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2494,6 +2504,9 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_GUID: return RECORD_GUID_TEXT_WITH_ENDELEMENT; + case WS_XML_TEXT_TYPE_UNIQUE_ID: + return RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2642,6 +2655,14 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); return S_OK; } + case RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT: + { + WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + sizeof(text_unique_id->value) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3204,9 +3225,8 @@ static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapp const WS_UNIQUE_ID_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - WS_XML_UTF16_TEXT utf16; - unsigned char buf[46]; /* "urn:uuid:00000000-0000-0000-0000-000000000000" */ + WS_XML_UNIQUE_ID_TEXT text_unique_id; + WS_XML_UTF16_TEXT text_utf16; const WS_UNIQUE_ID *ptr; HRESULT hr; @@ -3222,16 +3242,15 @@ static HRESULT write_type_unique_id( struct writer *writer, WS_TYPE_MAPPING mapp if (ptr->uri.length) { - utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; - utf16.bytes = (BYTE *)ptr->uri.chars; - utf16.byteCount = ptr->uri.length * sizeof(WCHAR); - return write_type_text( writer, mapping, &utf16.text ); + text_utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + text_utf16.bytes = (BYTE *)ptr->uri.chars; + text_utf16.byteCount = ptr->uri.length * sizeof(WCHAR); + return write_type_text( writer, mapping, &text_utf16.text ); } - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_urn( &ptr->guid, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_unique_id.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; + text_unique_id.value = ptr->guid; + return write_type_text( writer, mapping, &text_unique_id.text ); } static HRESULT write_type_string( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hans Leidekker : webservices: Add support for DATETIME records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: dbe2163d43733a940de200733ff8ffb11ab1fdcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe2163d43733a940de200733… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:37 2017 +0200 webservices: Add support for DATETIME records 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 | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e262254..2071a95 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -722,6 +722,9 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_UNIQUE_ID: return RECORD_UNIQUE_ID_TEXT; + case WS_XML_TEXT_TYPE_DATETIME: + return RECORD_DATETIME_TEXT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -871,6 +874,19 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); return S_OK; } + case RECORD_DATETIME_TEXT: + { + WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; + UINT64 val = text_datetime->value.ticks; + + assert( val <= TICKS_MAX ); + if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; + else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -2507,6 +2523,9 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_UNIQUE_ID: return RECORD_UNIQUE_ID_TEXT_WITH_ENDELEMENT; + case WS_XML_TEXT_TYPE_DATETIME: + return RECORD_DATETIME_TEXT_WITH_ENDELEMENT; + default: FIXME( "unhandled text type %u\n", text->textType ); return 0; @@ -2663,6 +2682,20 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); return S_OK; } + case RECORD_DATETIME_TEXT_WITH_ENDELEMENT: + { + WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; + UINT64 val = text_datetime->value.ticks; + + assert( val <= TICKS_MAX ); + if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; + else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + + if ((hr = write_grow_buffer( writer, 1 + sizeof(val) )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL; @@ -3176,8 +3209,7 @@ static HRESULT write_type_datetime( struct writer *writer, WS_TYPE_MAPPING mappi const WS_DATETIME_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - WS_XML_UTF8_TEXT utf8; - unsigned char buf[34]; /* "0000-00-00T00:00:00.0000000-00:00" */ + WS_XML_DATETIME_TEXT text_datetime; const WS_DATETIME *ptr; HRESULT hr; @@ -3192,10 +3224,9 @@ static HRESULT write_type_datetime( struct writer *writer, WS_TYPE_MAPPING mappi if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); if (ptr->ticks > TICKS_MAX || ptr->format > WS_DATETIME_FORMAT_NONE) return WS_E_INVALID_FORMAT; - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = buf; - utf8.value.length = format_datetime( ptr, buf ); - return write_type_text( writer, mapping, &utf8.text ); + text_datetime.text.textType = WS_XML_TEXT_TYPE_DATETIME; + text_datetime.value = *ptr; + return write_type_text( writer, mapping, &text_datetime.text ); } static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping,

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 35de20a8b3d48debf5753999021758a2fc040ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35de20a8b3d48debf57539990… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:38 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 520 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 520 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35de20a8b3d48debf5753…

1 0