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

Piotr Caban : msvcrt: Return error when previously parsed type is accessed while demangling simple data type.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 42c2799589ae7f805e5f67a2b04f24e4aa3e0b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c2799589ae7f805e5f67a2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 8 15:34:44 2016 +0200 msvcrt: Return error when previously parsed type is accessed while demangling simple data type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/undname.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 7d06188..df3e4e8 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -945,6 +945,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ /* left and right are pushed as two separate strings */ + if (!pmt_ref) goto done; ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done;

1 0

Nikolay Sivov : xmllite/writer: Support trivial case of WriteAttributeString().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 895ad74fb0eaf4125c7f42d2c87b8efac632cad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895ad74fb0eaf4125c7f42d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 8 15:03:03 2016 +0300 xmllite/writer: Support trivial case of WriteAttributeString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 104 +++++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/writer.c | 26 ++++++++--- 2 files changed, 116 insertions(+), 14 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 9318bda..5e6769c 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -31,7 +31,7 @@ #include "initguid.h" DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); -static void check_output(IStream *stream, const char *expected, int line) +static void check_output(IStream *stream, const char *expected, BOOL todo, int line) { HGLOBAL hglobal; int len = strlen(expected), size; @@ -43,16 +43,20 @@ static void check_output(IStream *stream, const char *expected, int line) size = GlobalSize(hglobal); ptr = GlobalLock(hglobal); - if (size != len) + todo_wine_if(todo) { - ok_(__FILE__, line)(0, "data size mismatch, expected %u, got %u\n", len, size); - ok_(__FILE__, line)(0, "got %s, expected %s\n", ptr, expected); + if (size != len) + { + ok_(__FILE__, line)(0, "data size mismatch, expected %u, got %u\n", len, size); + ok_(__FILE__, line)(0, "got %s, expected %s\n", ptr, expected); + } + else + ok_(__FILE__, line)(!strncmp(ptr, expected, len), "got %s, expected %s\n", ptr, expected); } - else - ok_(__FILE__, line)(!strncmp(ptr, expected, len), "got %s, expected %s\n", ptr, expected); GlobalUnlock(hglobal); } -#define CHECK_OUTPUT(stream, expected) check_output(stream, expected, __LINE__) +#define CHECK_OUTPUT(stream, expected) check_output(stream, expected, FALSE, __LINE__) +#define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) /* used to test all Write* methods for consistent error state */ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) @@ -1054,6 +1058,91 @@ static void test_indentation(void) IStream_Release(stream); } +static void test_WriteAttributeString(void) +{ + static const WCHAR prefixW[] = {'p','r','e','f','i','x',0}; + static const WCHAR localW[] = {'l','o','c','a','l',0}; + static const WCHAR uriW[] = {'u','r','i',0}; + static const WCHAR uri2W[] = {'u','r','i','2',0}; + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a a=\"b\" />"); + IStream_Release(stream); + + /* with namespaces */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, aW, NULL, NULL, bW); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, bW); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, uri2W, NULL); +todo_wine + ok(hr == WR_E_XMLNSPREFIXDECLARATION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, NULL, uri2W); +todo_wine + ok(hr == WR_E_NSPREFIXDECLARED, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, NULL, bW); +todo_wine + ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT_TODO(stream, + "<a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" />"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1070,4 +1159,5 @@ START_TEST(writer) test_WriteCData(); test_WriteRaw(); test_indentation(); + test_WriteAttributeString(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 49e65cc..be5f0e1 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -44,6 +44,7 @@ static const WCHAR closepiW[] = {'?','>'}; static const WCHAR ltW[] = {'<'}; static const WCHAR gtW[] = {'>'}; static const WCHAR spaceW[] = {' '}; +static const WCHAR quoteW[] = {'"'}; struct output_buffer { @@ -284,7 +285,6 @@ static HRESULT write_output_buffer(xmlwriteroutput *output, const WCHAR *data, i static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR *data, int len) { - static const WCHAR quoteW[] = {'"'}; write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); write_output_buffer(output, data, len); write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); @@ -609,14 +609,14 @@ static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *p return E_NOTIMPL; } -static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR pwszPrefix, - LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri, - LPCWSTR pwszValue) +static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR ns_prefix, + LPCWSTR local_name, LPCWSTR ns_uri, LPCWSTR value) { + static const WCHAR eqW[] = {'=','"'}; xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), - wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); + TRACE("%p %s %s %s %s\n", This, debugstr_w(ns_prefix), debugstr_w(local_name), + debugstr_w(ns_uri), debugstr_w(value)); switch (This->state) { @@ -630,7 +630,19 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR ; } - return E_NOTIMPL; + if (ns_prefix || ns_uri) + { + FIXME("namespaces are not supported.\n"); + return E_NOTIMPL; + } + + write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer(This->output, local_name, -1); + write_output_buffer(This->output, eqW, ARRAY_SIZE(eqW)); + write_output_buffer(This->output, value, -1); + write_output_buffer(This->output, quoteW, ARRAY_SIZE(quoteW)); + + return S_OK; } static void write_cdata_section(xmlwriteroutput *output, const WCHAR *data, int len)

1 0

Jacek Caban : mshtml: Removed no longer used nav_test.html file.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 141998f63ce387dac78b79e558f33630e92aac5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=141998f63ce387dac78b79e55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 15:24:43 2016 +0200 mshtml: Removed no longer used nav_test.html file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/nav_test.html | 92 ----------------------------------------- 1 file changed, 92 deletions(-) diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html deleted file mode 100644 index 1021444..0000000 --- a/dlls/mshtml/tests/nav_test.html +++ /dev/null @@ -1,92 +0,0 @@ -<html> -<head> -<script> -function ok(b,m) { - return external.ok(b, m); -} - -function nav_parent_test() { - external.trace("Running _parent navigation tests..."); - - var iframe = document.getElementById("testframe"); - var subframe = iframe.contentWindow.document.createElement("iframe"); - - subframe.onload = function() { - var doc = subframe.contentWindow.document; - doc.body.innerHTML = '<a href="blank2.html" id="aid" target="_parent">test</a>'; - doc.getElementById("aid").click(); - } - - iframe.onload = function() { - iframe.onload = null; - var href = iframe.contentWindow.location.href; - ok(/.*blank2.html/.test(href), "Unexpected href " + href); - next_test(); - } - - iframe.contentWindow.document.body.appendChild(subframe); - subframe.src = "blank.html"; -} - -function window_navigate_test() { - external.trace("Running window.navigate() tests..."); - - var iframe = document.getElementById("testframe"); - - iframe.onload = function() { - iframe.onload = null; - var href = iframe.contentWindow.location.href; - ok(href === "about:blank", "Unexpected href " + href); - next_test(); - } - - iframe.contentWindow.navigate("about:blank"); -} - -function window_open_self_test() { - external.trace("Running window.open(_self) tests..."); - - var iframe = document.getElementById("testframe"); - var iframe_window = iframe.contentWindow; - - iframe.onload = function() { - iframe.onload = null; - var href = iframe.contentWindow.location.href; - ok(/.*blank.html\?window_open_self/.test(href), "Unexpected href " + href); - ok(iframe.contentWindow === iframe_window, "iframe.contentWindow !== iframe_window"); - next_test(); - } - - iframe_window.open("blank.html?window_open_self", "_self"); -} - -function detached_src_test() { - var iframe = document.createElement("iframe"); - var onload_called = false; - - iframe.onload = function() { - onload_called = true; - next_test(); - } - - iframe.src = "blank.html"; - document.body.appendChild(iframe); - ok(onload_called === false, "called onload too early?"); -} - -var tests = [ - nav_parent_test, - window_navigate_test, - window_open_self_test, - detached_src_test, - function() { external.reportSuccess(); } -]; - -function next_test() { - window.setTimeout(tests.shift(), 0); -} -</script> -<body onload="next_test()"> -<iframe src="about:blank" id="testframe"></iframe> -</body> -</html>

1 0

Alexandre Julliard : Release 1.9.14.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: abb221fa81b60f53c14f6864bbfb9453455aeeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb221fa81b60f53c14f6864b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 23:59:59 2016 +0900 Release 1.9.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 778 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 382 insertions(+), 419 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abb221fa81b60f53c14f6…

1 0

Tag wine-1.9.14 : Alexandre Julliard : Release 1.9.14
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: refs/tags/wine-1.9.14 Tag: df8b70b2adbbbaab4610a600fe59b71e51c23f2d URL: http://source.winehq.org/git/wine.git/?a=tag;h=df8b70b2adbbbaab4610a600fe59… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 23:59:59 2016 +0900 Release 1.9.14

1 0

Michael Stefaniuc : qcap/tests: Remove a redundant NULL check before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

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 : qedit: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

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 : winmm: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: fb1f42754d6c562903fa285e930da3d01d453b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1f42754d6c562903fa285e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:12:55 2016 +0200 winmm: 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/winmm/waveform.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 2d8b838..1915c21 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -899,8 +899,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, hr = IAudioClient_IsFormatSupported(device->client, AUDCLNT_SHAREMODE_SHARED, &target, &closer_fmt); - if(closer_fmt) - CoTaskMemFree(closer_fmt); + CoTaskMemFree(closer_fmt); if(hr != S_OK) return WAVERR_BADFORMAT; @@ -1119,8 +1118,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IAudioClient_IsFormatSupported(device->client, AUDCLNT_SHAREMODE_SHARED, device->orig_fmt, &closer_fmt); - if(closer_fmt) - CoTaskMemFree(closer_fmt); + CoTaskMemFree(closer_fmt); if((hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !(info->flags & WAVE_FORMAT_DIRECT)) ret = WINMM_MapDevice(device, TRUE, is_out); else

1 0

Michael Stefaniuc : msvcrt: Remove redundant NULL checks before free().
by Alexandre Julliard 08 Jul '16

08 Jul '16

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

Michael Stefaniuc : urlmon: Remove a redundant NULL check before CoTaskMemFree().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 7218d488647388816e599420a596c416be72d80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7218d488647388816e599420a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:17:24 2016 +0200 urlmon: Remove a redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index d8bba1b..2759f3d 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -429,7 +429,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD if(pszAdditionalRequestHeaders) *pszAdditionalRequestHeaders = additional_headers; - else if(additional_headers) + else CoTaskMemFree(additional_headers); return hres;

1 0