wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Hugh McMaster : reg: Account for sizeof(WCHAR) when resizing the value name buffer during the query operation.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 90da210cb0a007d4d7e8d419461c3e86c363cadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90da210cb0a007d4d7e8d4194… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 21 08:47:15 2017 +0000 reg: Account for sizeof(WCHAR) when resizing the value name buffer during the query operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a6927d0..573c750 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -769,7 +769,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) else { max_value_len *= 2; - value_name = HeapReAlloc(GetProcessHeap(), 0, value_name, max_value_len); + value_name = HeapReAlloc(GetProcessHeap(), 0, value_name, max_value_len * sizeof(WCHAR)); } } else break;

1 0

Jacek Caban : rsaenh: Do not use stack variables out of frame (Coverity).
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 14ac2f60297917bee8fcb860241302c52ec9e1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ac2f60297917bee8fcb8602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 21 15:36:31 2017 +0200 rsaenh: Do not use stack variables out of frame (Coverity). Based on patch by Marcus Meissner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 69c7f80..1dfc896 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -50,52 +50,48 @@ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) { - const WCHAR *algid = NULL; + BCRYPT_ALG_HANDLE provider; + NTSTATUS status; switch (aiAlgid) { case CALG_MD2: md2_init(&pHashContext->md2); - break; + return TRUE; case CALG_MD4: MD4Init(&pHashContext->md4); - break; + return TRUE; case CALG_MD5: MD5Init(&pHashContext->md5); - break; + return TRUE; case CALG_SHA: A_SHAInit(&pHashContext->sha); - break; + return TRUE; case CALG_SHA_256: - algid = BCRYPT_SHA256_ALGORITHM; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); break; case CALG_SHA_384: - algid = BCRYPT_SHA384_ALGORITHM; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); break; case CALG_SHA_512: - algid = BCRYPT_SHA512_ALGORITHM; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); break; - } - if (algid) - { - BCRYPT_ALG_HANDLE provider; - NTSTATUS status; + default: + return TRUE; + } - status = BCryptOpenAlgorithmProvider(&provider, algid, MS_PRIMITIVE_PROVIDER, 0); - if (status) return FALSE; + if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); - BCryptCloseAlgorithmProvider(provider, 0); - if (status) return FALSE; - } - return TRUE; + status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + BCryptCloseAlgorithmProvider(provider, 0); + return !status; } BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pbData,

1 0

Jacek Caban : server: Remove no loner needed fd NULL check (Coverity).
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: f706d9f08fcb463582850a848ffe8fbf7c2ad4a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f706d9f08fcb463582850a848… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 21 15:19:37 2017 +0200 server: Remove no loner needed fd NULL check (Coverity). Spotted by Marcus Meissner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 1cb020f..cf7a434 100644 --- a/server/async.c +++ b/server/async.c @@ -208,7 +208,7 @@ void queue_async( struct async_queue *queue, struct async *async ) grab_object( async ); list_add_tail( &queue->queue, &async->queue_entry ); - if (async->fd) set_fd_signaled( async->fd, 0 ); + set_fd_signaled( async->fd, 0 ); } /* create an async on a given queue of a fd */

1 0

André Hentschel : wpcap: Fix build with newer pcap versions.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 28173f06932edd85a64a952120d29b9bb1e762ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=28173f06932edd85a64a95212… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 21 15:16:51 2017 +0200 wpcap: Fix build with newer pcap versions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b770067..fe46903 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -19,6 +19,11 @@ */ #include <pcap/pcap.h> + +/* pcap.h might define those: */ +#undef SOCKET +#undef INVALID_SOCKET + #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3::put_textContent implementation.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 281826ebd04d2ddaf56b69d129dddb6dca4307e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281826ebd04d2ddaf56b69d12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 21 15:11:10 2017 +0200 mshtml: Added IHTMLDOMNode3::put_textContent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/elements.js | 9 +++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ec18648..80bf31d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1241,8 +1241,25 @@ static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIAN static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("unsupported argument %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_Init(&nsstr, V_BSTR(&v)); + nsres = nsIDOMNode_SetTextContent(This->nsnode, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetTextContent failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 79eb68a..4167e32 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -68,6 +68,15 @@ function test_textContent() { div.innerHTML = "abc<script>/* */</script><div>text</div>"; ok(div.textContent === "abc/* */text", "div.textContent = " + div.textContent); + div.textContent = "test"; + ok(div.textContent === "test", "div.textContent = " + div.textContent); + ok(div.childNodes.length === 1, "div.childNodes.length = " + div.childNodes.length); + ok(div.firstChild.textContent === "test", "div.firstChild.textContent = " + div.firstChild.textContent); + + div.textContent = ""; + ok(div.textContent === "", "div.textContent = " + div.textContent); + ok(div.childNodes.length === 0, "div.childNodes.length = " + div.childNodes.length); + next_test(); }

1 0

Alistair Leslie-Hughes : include: Support all version of BackgroundCopyManager from bits.h.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 8ef2d4ea836d5fdaa440e8ffc5a6e7bb3efbb057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef2d4ea836d5fdaa440e8ffc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 21 01:34:01 2017 +0000 include: Support all version of BackgroundCopyManager from bits.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bits1_5.idl | 2 ++ include/bits2_0.idl | 5 +++++ include/bits2_5.idl | 2 ++ 3 files changed, 9 insertions(+) diff --git a/include/bits1_5.idl b/include/bits1_5.idl index 274a7de..5937ce0 100644 --- a/include/bits1_5.idl +++ b/include/bits1_5.idl @@ -86,3 +86,5 @@ interface IBackgroundCopyJob2 : IBackgroundCopyJob HRESULT SetCredentials(BG_AUTH_CREDENTIALS *cred); HRESULT RemoveCredentials(BG_AUTH_TARGET target, BG_AUTH_SCHEME scheme); } + +cpp_quote("#include \"bits2_0.h\"") diff --git a/include/bits2_0.idl b/include/bits2_0.idl index efe6dde..1d17c38 100644 --- a/include/bits2_0.idl +++ b/include/bits2_0.idl @@ -32,11 +32,14 @@ cpp_quote("#define BG_COPY_FILE_ALL 15") cpp_quote("#define BG_LENGTH_TO_EOF (UINT64)(-1)") +cpp_quote("#ifndef _BG_FILE_RANGE_DEFINED") +cpp_quote("#define _BG_FILE_RANGE_DEFINED") typedef struct _BG_FILE_RANGE { UINT64 InitialOffset; UINT64 Length; } BG_FILE_RANGE; +cpp_quote("#endif") [ uuid(443c8934-90ff-48ed-bcde-26f5c7450042), @@ -93,3 +96,5 @@ library BackgroundCopyManager2_0 interface IBackgroundCopyJob3; interface IBackgroundCopyFile2; } + +cpp_quote("#include \"bits2_5.h\"") diff --git a/include/bits2_5.idl b/include/bits2_5.idl index 29ea75c..c58dc8a 100644 --- a/include/bits2_5.idl +++ b/include/bits2_5.idl @@ -98,3 +98,5 @@ library BackgroundCopyManager2_5 interface IBackgroundCopyCallback; interface IBackgroundCopyJobHttpOptions; } + +cpp_quote("#include \"bits3_0.h\"")

1 0

Zebediah Figura : krnl386.exe16: Fail int 21, 4e if the volume label is an empty string.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 6de3c8f1a8428d45849c89637956ac87ef7a7691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de3c8f1a8428d45849c89637… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:21:09 2017 -0500 krnl386.exe16: Fail int 21, 4e if the volume label is an empty string. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/int21.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 308fc49..6455b13 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -3876,6 +3876,7 @@ static unsigned INT21_FindHelper(LPCWSTR fullPath, unsigned drive, unsigned coun if (count) return 0; path[0] = drive + 'A'; if (!GetVolumeInformationW(path, entry->cAlternateFileName, 13, NULL, NULL, NULL, NULL, 0)) return 0; + if (!entry->cAlternateFileName[0]) return 0; RtlSecondsSince1970ToTime( 0, (LARGE_INTEGER *)&entry->ftCreationTime ); RtlSecondsSince1970ToTime( 0, (LARGE_INTEGER *)&entry->ftLastAccessTime ); RtlSecondsSince1970ToTime( 0, (LARGE_INTEGER *)&entry->ftLastWriteTime );

1 0

Nikolay Sivov : xmllite/reader: Added a helper for setting current attribute cursor.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: b06dd7d804950ceb8fdc420453b08914bc559172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06dd7d804950ceb8fdc42045… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 21 15:00:04 2017 +0300 xmllite/reader: Added a helper for setting current attribute cursor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0a3d21c..ac0fe33 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2951,6 +2951,15 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } +static void reader_set_current_attribute(xmlreader *reader, struct attribute *attr) +{ + reader->attr = attr; + reader->chunk_read_off = 0; + reader_set_strvalue(reader, StringValue_Prefix, &attr->prefix); + reader_set_strvalue(reader, StringValue_QualifiedName, &attr->qname); + reader_set_strvalue(reader, StringValue_Value, &attr->value); +} + static HRESULT reader_move_to_first_attribute(xmlreader *reader) { if (!reader->attr_count) @@ -2959,11 +2968,7 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader) if (!reader->attr) reader_inc_depth(reader); - reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); - reader->chunk_read_off = 0; - reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &reader->attr->qname); - reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); + reader_set_current_attribute(reader, LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry)); return S_OK; } @@ -2991,13 +2996,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) next = list_next(&This->attrs, &This->attr->entry); if (next) - { - This->attr = LIST_ENTRY(next, struct attribute, entry); - This->chunk_read_off = 0; - reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); - } + reader_set_current_attribute(This, LIST_ENTRY(next, struct attribute, entry)); return next ? S_OK : S_FALSE; } @@ -3096,11 +3095,7 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, if (name_len == target_name_len && uri_len == target_uri_len && !strcmpW(name, local_name) && !strcmpW(uri, namespace_uri)) { - This->attr = attr; - This->chunk_read_off = 0; - reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); + reader_set_current_attribute(This, attr); return S_OK; } }

1 0

Nikolay Sivov : xmllite/reader: Implement MoveToAttributeByName().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: be5679108ca4890f0e06578bc49ababe1353dffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5679108ca4890f0e06578bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 21 15:00:03 2017 +0300 xmllite/reader: Implement MoveToAttributeByName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 185 ++++++++++++++++++++++++++++---------------- dlls/xmllite/tests/reader.c | 85 ++++++++++++++++++++ 2 files changed, 204 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be5679108ca4890f0e065…

1 0

Józef Kucia : d3d11: Fix race condition in d3d_sampler_state_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: e1983836b7ce8f7e47d87d756c986e72f247e7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1983836b7ce8f7e47d87d756… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:04 2017 +0200 d3d11: Fix race condition in d3d_sampler_state_create(). Spotted by Kimmo Myllyvirta. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 64fae13..b7c9264 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1441,7 +1441,6 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 state->ID3D11SamplerState_iface.lpVtbl = &d3d11_sampler_state_vtbl; state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; - wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); state->desc = *desc; @@ -1465,7 +1464,6 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 { ERR("Failed to insert sampler state entry.\n"); wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); return E_FAIL; } @@ -1477,10 +1475,8 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); wine_rb_remove(&device->sampler_states, &state->entry); - wined3d_mutex_unlock(); return hr; } - wined3d_mutex_unlock(); state->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(state->device); @@ -1521,12 +1517,16 @@ HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_ return S_OK; } - wined3d_mutex_unlock(); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + wined3d_mutex_unlock(); return E_OUTOFMEMORY; + } - if (FAILED(hr = d3d_sampler_state_init(object, device, &normalized_desc))) + hr = d3d_sampler_state_init(object, device, &normalized_desc); + wined3d_mutex_unlock(); + if (FAILED(hr)) { WARN("Failed to initialize sampler state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017