February 2016 - Wine-commits

Hans Leidekker : webservices: Insert an end element node for self-closing tags in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: fe65b87dac3698f1062630ef3629538368840071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe65b87dac3698f1062630ef3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:01 2016 +0100 webservices: Insert an end element node for self-closing tags 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1b3dd2f..664f183 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -387,7 +387,6 @@ enum reader_state READER_STATE_BOF, READER_STATE_STARTELEMENT, READER_STATE_STARTATTRIBUTE, - READER_STATE_STARTENDELEMENT, READER_STATE_STARTCDATA, READER_STATE_CDATA, READER_STATE_TEXT, @@ -987,8 +986,9 @@ static HRESULT read_element( struct reader *reader ) if (!read_cmp( reader, "/>", 2 )) { read_skip( reader, 2 ); - reader->current = reader->current->parent; - reader->state = READER_STATE_STARTENDELEMENT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + read_insert_node( reader, reader->current, node ); + reader->state = READER_STATE_ENDELEMENT; } else {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_ROOT_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: d2ecd8692a3d33a05e46d3bc985f6c75e8621f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ecd8692a3d33a05e46d3bc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:02 2016 +0100 webservices: Implement WS_MOVE_TO_ROOT_ELEMENT 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 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 664f183..87887ce 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1319,6 +1319,31 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING return read_to_startelement( reader, found ); } +static BOOL move_to_root_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node; + + if (!(ptr = list_head( &reader->root->children ))) return FALSE; + node = LIST_ENTRY( ptr, struct node, entry ); + if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = node; + return TRUE; + } + while ((ptr = list_next( &reader->root->children, &node->entry ))) + { + struct node *next = LIST_ENTRY( ptr, struct node, entry ); + if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = next; + return TRUE; + } + node = next; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1332,6 +1357,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found } switch (move) { + case WS_MOVE_TO_ROOT_ELEMENT: + success = move_to_root_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_NEXT_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 9b58a3993f57c8012c71c2a188481fbfbd8105ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b58a3993f57c8012c71c2a18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:03 2016 +0100 webservices: Implement WS_MOVE_TO_NEXT_ELEMENT 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 87887ce..e613a45 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1344,6 +1344,24 @@ static BOOL move_to_root_element( struct reader *reader ) return FALSE; } +static BOOL move_to_next_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node = reader->current; + + while ((ptr = list_next( &node->parent->children, &node->entry ))) + { + struct node *next = LIST_ENTRY( ptr, struct node, entry ); + if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = next; + return TRUE; + } + node = next; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1361,6 +1379,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_root_element( reader ); break; + case WS_MOVE_TO_NEXT_ELEMENT: + success = move_to_next_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_PREVIOUS_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 36df4893bf8a54b1616ff53f022c221761731488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36df4893bf8a54b1616ff53f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:04 2016 +0100 webservices: Implement WS_MOVE_TO_PREVIOUS_ELEMENT 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index e613a45..19aa1af 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1362,6 +1362,24 @@ static BOOL move_to_next_element( struct reader *reader ) return FALSE; } +static BOOL move_to_prev_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node = reader->current; + + while ((ptr = list_prev( &node->parent->children, &node->entry ))) + { + struct node *prev = LIST_ENTRY( ptr, struct node, entry ); + if (prev->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = prev; + return TRUE; + } + node = prev; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1383,6 +1401,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_next_element( reader ); break; + case WS_MOVE_TO_PREVIOUS_ELEMENT: + success = move_to_prev_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 0706019a079900e3c5167f923334368f7e108eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0706019a079900e3c5167f923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:30:00 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9931057..16b6555 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -76,7 +76,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,

1 0

Andrew Eikum : xaudio2: Handle openal source allocation failure.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: ecadabe25b11bbd2bb41facf40dfc592e12632ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecadabe25b11bbd2bb41facf4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 9 10:39:23 2016 -0600 xaudio2: Handle openal source allocation failure. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 32bc1c8..6d766a1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -32,6 +32,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); @@ -1415,11 +1416,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; return hr; } alGenSources(1, &src->al_src); + if(!src->al_src){ + static int once = 0; + if(!once++) + ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); + HeapFree(GetProcessHeap(), 0, src->fmt); + src->in_use = FALSE; + return E_OUTOFMEMORY; + } + alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs); alSourcePlay(src->al_src);

1 0

Sebastian Lackner : vcomp/tests: Reenable architecture dependent tests.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: a77e14714e495ecc63654374d53585a227b4c67f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77e14714e495ecc63654374d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:46:45 2016 +0100 vcomp/tests: Reenable architecture dependent tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 4f030d3..914b55f 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1406,13 +1406,15 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, - /* { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, */ /* depends on Architecture */ { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, +#endif }; struct { @@ -1424,8 +1426,10 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, +#endif }; int i;

1 0

Sebastian Lackner : vcomp: Implement 64-bit atomic instructions.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: b29c072e315ee0440c162574b905e8d768153f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29c072e315ee0440c162574b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:47:13 2016 +0100 vcomp: Implement 64-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vcomp/vcomp.spec | 22 +++++++-------- dlls/vcomp100/vcomp100.spec | 22 +++++++-------- dlls/vcomp110/vcomp110.spec | 22 +++++++-------- dlls/vcomp120/vcomp120.spec | 22 +++++++-------- dlls/vcomp90/vcomp90.spec | 22 +++++++-------- 6 files changed, 122 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b29c072e315ee0440c162…

1 0

Sebastian Lackner : vcomp/tests: Add tests for 64-bit atomic instructions.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 3fefd3aa2df5ebb91afd6cba81b94a0c85fef68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fefd3aa2df5ebb91afd6cba8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:47:59 2016 +0100 vcomp/tests: Add tests for 64-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fefd3aa2df5ebb91afd6…

1 0

Sebastian Lackner : ntdll/tests: Simplify exception tests by using todo_wine_if.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 5b478f7c7e9043576d7e5d5d7328bdff6bb8722f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b478f7c7e9043576d7e5d5d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:05:54 2016 +0100 ntdll/tests: Simplify exception tests by using todo_wine_if. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index bd2fa40..d6a610e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1800,13 +1800,10 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) outputdebugstring_exceptions = 0; OutputDebugStringA("Hello World"); - if (todo) - todo_wine - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", - outputdebugstring_exceptions, numexc); - else - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", - outputdebugstring_exceptions, numexc); + + todo_wine_if(todo) + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); }

1 0