July 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : msvcrt: Remove redundant NULL checks before free().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: dbafbcccfcc49b90afcf849ed55c5fdd13b2fd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbafbcccfcc49b90afcf849ed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:09:32 2016 +0200 msvcrt: Remove redundant NULL checks before free(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 2 +- dlls/msvcrt/file.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 46b1859..893ed7b 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -365,7 +365,7 @@ void CDECL MSVCRT__wperror(const MSVCRT_wchar_t* str) } } MSVCRT_perror(buffer); - if (buffer) MSVCRT_free(buffer); + MSVCRT_free(buffer); } /********************************************************************* diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5a2f1e6..432d5c7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3498,8 +3498,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) if (!WriteFile(hand, q, size, &num_written, NULL)) num_written = -1; release_ioinfo(info); - if(p) - MSVCRT_free(p); + MSVCRT_free(p); if (num_written != size) { TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n",

1 0

Hans Leidekker : webservices: Add support for writing double values.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: df4046a3705972978c408cf44ab0fd636e25e31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4046a3705972978c408cf44… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:30 2016 +0200 webservices: Add support for writing double values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 +-- dlls/webservices/tests/writer.c | 113 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 2 + dlls/webservices/writer.c | 100 +++++++++++++++++++++++++++++ include/webservices.h | 5 ++ 5 files changed, 224 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9e33000..1a51257 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2271,7 +2271,7 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U #if defined(__i386__) || defined(__x86_64__) #define RC_DOWN 0x100; -static BOOL set_fp_rounding( unsigned short *save ) +BOOL set_fp_rounding( unsigned short *save ) { #ifdef __GNUC__ unsigned short fpword; @@ -2286,7 +2286,7 @@ static BOOL set_fp_rounding( unsigned short *save ) return FALSE; #endif } -static void restore_fp_rounding( unsigned short fpword ) +void restore_fp_rounding( unsigned short fpword ) { #ifdef __GNUC__ __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); @@ -2295,12 +2295,12 @@ static void restore_fp_rounding( unsigned short fpword ) #endif } #else -static BOOL set_fp_rounding( unsigned short *save ) +BOOL set_fp_rounding( unsigned short *save ) { FIXME( "not implemented\n" ); return FALSE; } -static void restore_fp_rounding( unsigned short fpword ) +void restore_fp_rounding( unsigned short fpword ) { FIXME( "not implemented\n" ); } diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 9055021..d230cdd 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -21,6 +21,25 @@ #include "webservices.h" #include "wine/test.h" +#include <math.h> +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + +#ifndef NAN +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + static HRESULT set_output( WS_XML_WRITER *writer ) { WS_XML_WRITER_TEXT_ENCODING encoding; @@ -1871,6 +1890,99 @@ static void test_text_types(void) WsFreeWriter( writer ); } +static void test_double(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + static const struct + { + double val; + const char *result; + } + tests[] = + { + {0.0, "<t>0</t>"}, + {1.0, "<t>1</t>"}, + {-1.0, "<t>-1</t>"}, + {1.0000000000000001, "<t>1</t>"}, + {1.0000000000000002, "<t>1.0000000000000002</t>"}, + {1.0000000000000003, "<t>1.0000000000000002</t>"}, + {1.0000000000000004, "<t>1.0000000000000004</t>"}, + {100000000000000, "<t>100000000000000</t>"}, + {1000000000000000, "<t>1E+15</t>"}, + {0.1, "<t>0.1</t>"}, + {0.01, "<t>1E-2</t>"}, + {-0.1, "<t>-0.1</t>"}, + {-0.01, "<t>-1E-2</t>"}, + {1.7976931348623158e308, "<t>1.7976931348623157E+308</t>"}, + {-1.7976931348623158e308, "<t>-1.7976931348623157E+308</t>"}, + }; + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_DOUBLE_TEXT text; + ULONG i; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + text.text.textType = WS_XML_TEXT_TYPE_DOUBLE; + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + text.value = tests[i].val; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + text.value = NAN; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>NaN</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + text.value = INFINITY; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>INF</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + text.value = -INFINITY; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>-INF</t>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1896,4 +2008,5 @@ START_TEST(writer) test_WsWriteNode(); test_WsCopyNode(); test_text_types(); + test_double(); } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index bad2dfb..26cba38 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -33,6 +33,8 @@ WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDE HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; +BOOL set_fp_rounding( unsigned short * ) DECLSPEC_HIDDEN; +void restore_fp_rounding( unsigned short ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 85a8973..48c7382 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <stdio.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -1042,6 +1043,92 @@ static ULONG format_uint64( const UINT64 *ptr, unsigned char *buf ) return wsprintfA( (char *)buf, "%I64u", *ptr ); } +static ULONG format_double( const double *ptr, unsigned char *buf ) +{ + static const double precision = 0.0000000000000001; + unsigned char *p = buf; + double val = *ptr; /* FIXME: use long double */ + int neg, mag, mag2, use_exp; + + if (isnan( val )) + { + memcpy( buf, "NaN", 3 ); + return 3; + } + if (isinf( val )) + { + if (val < 0) + { + memcpy( buf, "-INF", 4 ); + return 4; + } + memcpy( buf, "INF", 3 ); + return 3; + } + if (val == 0.0) + { + *p = '0'; + return 1; + } + + if ((neg = val < 0)) + { + *p++ = '-'; + val = -val; + } + + mag = log10( val ); + use_exp = (mag >= 15 || (neg && mag >= 1) || mag <= -1); + if (use_exp) + { + if (mag < 0) mag -= 1; + val = val / pow( 10.0, mag ); + mag2 = mag; + mag = 0; + } + else if (mag < 1) mag = 0; + + while (val > precision || mag >= 0) + { + double weight = pow( 10.0, mag ); + if (weight > 0 && !isinf( weight )) + { + int digit = floor( val / weight ); + val -= digit * weight; + *(p++) = '0' + digit; + } + if (!mag && val > 0) *(p++) = '.'; + mag--; + } + + if (use_exp) + { + int i, j; + *(p++) = 'E'; + if (mag2 > 0) *(p++) = '+'; + else + { + *(p++) = '-'; + mag2 = -mag2; + } + mag = 0; + while (mag2 > 0) + { + *(p++) = '0' + mag2 % 10; + mag2 /= 10; + mag++; + } + for (i = -mag, j = -1; i < j; i++, j--) + { + p[i] ^= p[j]; + p[j] ^= p[i]; + p[i] ^= p[j]; + } + } + + return p - buf; +} + static ULONG format_guid( const GUID *ptr, unsigned char *buf ) { static const char fmt[] = "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x"; @@ -1111,6 +1198,19 @@ static HRESULT text_to_utf8text( const WS_XML_TEXT *text, WS_XML_UTF8_TEXT **ret if (!(*ret = alloc_utf8_text( buf, len ))) return E_OUTOFMEMORY; return S_OK; } + case WS_XML_TEXT_TYPE_DOUBLE: + { + const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; + unsigned char buf[24]; /* "-1.1111111111111111E-308" */ + unsigned short fpword; + ULONG len; + + if (!set_fp_rounding( &fpword )) return E_NOTIMPL; + len = format_double( &double_text->value, buf ); + restore_fp_rounding( fpword ); + if (!(*ret = alloc_utf8_text( buf, len ))) return E_OUTOFMEMORY; + return S_OK; + } case WS_XML_TEXT_TYPE_GUID: { const WS_XML_GUID_TEXT *id = (const WS_XML_GUID_TEXT *)text; diff --git a/include/webservices.h b/include/webservices.h index c9c2ade..e35e389 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -577,6 +577,11 @@ typedef struct _WS_XML_UINT64_TEXT { unsigned __int64 value; } WS_XML_UINT64_TEXT; +typedef struct _WS_XML_DOUBLE_TEXT { + WS_XML_TEXT text; + double value; +} WS_XML_DOUBLE_TEXT; + typedef struct _WS_XML_GUID_TEXT { WS_XML_TEXT text; GUID value;

1 0

Michael Stefaniuc : qcap/tests: Remove a redundant NULL check before CoTaskMemFree().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 5287add1c476374c1e21b75d90d57854a11a3470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5287add1c476374c1e21b75d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:11:15 2016 +0200 qcap/tests: Remove a redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 4c02034..e927d59 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1721,8 +1721,7 @@ static void test_smart_tee_filter(void) endwhile: if (pinInfo.pFilter) IBaseFilter_Release(pinInfo.pFilter); - if (id) - CoTaskMemFree(id); + CoTaskMemFree(id); IPin_Release(pin); pinNumber++; }

1 0

Michael Stefaniuc : wined3d: Remove a redundant NULL check before HeapFree ().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 10925fa4515a1cac31dad436a38e575423a1bd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10925fa4515a1cac31dad436a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:09:10 2016 +0200 wined3d: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6a9f7fc..9a9eafb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -459,8 +459,7 @@ struct wined3d_string_buffer *string_buffer_get(struct wined3d_string_buffer_lis if (!buffer || !string_buffer_init(buffer)) { ERR("Couldn't allocate buffer for temporary string.\n"); - if (buffer) - HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, buffer); return NULL; } }

1 0

Michael Stefaniuc : ole32: Remove a redundant NULL check before CoTaskMemFree().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 66f13236fe3d5f4cfa17d48182ebf2d397280b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f13236fe3d5f4cfa17d4818… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:13:13 2016 +0200 ole32: Remove a redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 9cffb63..c7a9b27 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2713,8 +2713,7 @@ static void OLE_FreeClipDataArray(ULONG count, CLIPDATA * pClipDataArray) { ULONG i; for (i = 0; i < count; i++) - if (pClipDataArray[i].pClipData) - CoTaskMemFree(pClipDataArray[i].pClipData); + CoTaskMemFree(pClipDataArray[i].pClipData); } /***********************************************************************

1 0

Henri Verbeet : wined3d: Send resource destruction through the command stream.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 38f3d59ed694afba7913b4992d13cb044a09126c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f3d59ed694afba7913b4992… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:01 2016 +0200 wined3d: Send resource destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 -- dlls/wined3d/resource.c | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b52970f..32e7092 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4993,8 +4993,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - context_resource_released(device, resource, type); - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index be7dfb4..a475dc0 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -233,6 +233,14 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3D_OK; } +static void wined3d_resource_destroy_object(void *object) +{ + struct wined3d_resource *resource = object; + + wined3d_resource_free_sysmem(resource); + context_resource_released(resource->device, resource, resource->type); +} + void resource_cleanup(struct wined3d_resource *resource) { const struct wined3d *d3d = resource->device->wined3d; @@ -245,9 +253,8 @@ void resource_cleanup(struct wined3d_resource *resource) adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); } - wined3d_resource_free_sysmem(resource); - device_resource_released(resource->device, resource); + wined3d_cs_emit_destroy_object(resource->device->cs, wined3d_resource_destroy_object, resource); } void resource_unload(struct wined3d_resource *resource)

1 0

Hans Leidekker : webservices: Return the number of bytes written from WsWriteXmlBufferToBytes.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: da5c332c924cbc4c485c48edab083ec6527b1988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5c332c924cbc4c485c48eda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:33 2016 +0200 webservices: Return the number of bytes written from WsWriteXmlBufferToBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 50cd398..45c5021 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1929,6 +1929,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu if (!(buf = ws_alloc( heap, xmlbuf->size ))) return WS_E_QUOTA_EXCEEDED; memcpy( buf, xmlbuf->ptr, xmlbuf->size ); *bytes = buf; + *size = xmlbuf->size; return S_OK; }

1 0

Hans Leidekker : webservices: Inherit the prefix only if parent and child namespaces match.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: d921526312e7f2da54c53a8d4f91ba330db7e761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d921526312e7f2da54c53a8d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:31 2016 +0200 webservices: Inherit the prefix only if parent and child namespaces match. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 29 ++++++++++++++++++++++++----- dlls/webservices/writer.c | 7 +++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d230cdd..6be47b5 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -364,7 +364,7 @@ static void test_WsWriteStartElement(void) { HRESULT hr; WS_XML_WRITER *writer; - WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}; + WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}; hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; @@ -404,21 +404,40 @@ static void test_WsWriteStartElement(void) hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\">", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/>", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/></p:a>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteStartElement( writer, NULL, &localname2, &ns2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\"><b/>", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\"><b xmlns=\"ns2\"/>", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\"><b/></a>", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\"><b xmlns=\"ns2\"/></p:a>", __LINE__ ); WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 48c7382..f8512dc 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -929,8 +929,11 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; - if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) - prefix = writer->current->hdr.prefix; + if (!prefix && node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) + { + elem = &parent->hdr; + if (WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) prefix = elem->prefix; + } if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; elem = &node->hdr;

1 0

Michael Stefaniuc : qedit: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 1e662d92ba0bed2cafad33fa9b09394979bc0e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e662d92ba0bed2cafad33fa9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:11:54 2016 +0200 qedit: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 7cbc0f8..cd35740 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -89,8 +89,7 @@ static ULONG WINAPI Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) TRACE("(%p) new ref = %u\n", This, refCount); if (refCount == 0) { - if (This->mtype.pbFormat) - CoTaskMemFree(This->mtype.pbFormat); + CoTaskMemFree(This->mtype.pbFormat); CoTaskMemFree(This); } return refCount; @@ -276,10 +275,8 @@ static void SampleGrabber_cleanup(SG_Impl *This) IMemInputPin_Release(This->memOutput); if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); - if (This->mtype.pbFormat) - CoTaskMemFree(This->mtype.pbFormat); - if (This->bufferData) - CoTaskMemFree(This->bufferData); + CoTaskMemFree(This->mtype.pbFormat); + CoTaskMemFree(This->bufferData); if(This->seekthru_unk) IUnknown_Release(This->seekthru_unk); } @@ -384,8 +381,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) size = 0; EnterCriticalSection(&This->filter.csFilter); if (This->bufferLen != size) { - if (This->bufferData) - CoTaskMemFree(This->bufferData); + CoTaskMemFree(This->bufferData); This->bufferData = size ? CoTaskMemAlloc(size) : NULL; This->bufferLen = size; } @@ -586,8 +582,7 @@ SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_ debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), type->lSampleSize, debugstr_guid(&type->formattype), type->cbFormat); - if (This->mtype.pbFormat) - CoTaskMemFree(This->mtype.pbFormat); + CoTaskMemFree(This->mtype.pbFormat); This->mtype = *type; This->mtype.pUnk = NULL; if (type->cbFormat) { @@ -936,8 +931,7 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) && !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (This->sg->mtype.pbFormat) - CoTaskMemFree(This->sg->mtype.pbFormat); + CoTaskMemFree(This->sg->mtype.pbFormat); This->sg->mtype = *type; This->sg->mtype.pUnk = NULL; if (type->cbFormat) {

1 0

Michael Stefaniuc : devenum: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: cf3d95795032c7b906fbb62fee5312820595e7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3d95795032c7b906fbb62fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:10:57 2016 +0200 devenum: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 828d661..17d9850 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -262,8 +262,8 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) error_cleanup_types: - if (clsMajorType) CoTaskMemFree(clsMajorType); - if (clsMinorType) CoTaskMemFree(clsMinorType); + CoTaskMemFree(clsMajorType); + CoTaskMemFree(clsMinorType); } RegCloseKey(hkeyMajorType); @@ -358,7 +358,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) error_cleanup: RegCloseKey(hkeyPinKey); - if (rgPin->strName) CoTaskMemFree(rgPin->strName); + CoTaskMemFree(rgPin->strName); } RegCloseKey(hkeyPins);

1 0