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

Józef Kucia : d3d11: Implement d3d11_immediate_context_End().
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 0f6c5444c5bb93a6dd42705a711ee99e90ed37f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6c5444c5bb93a6dd42705a7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:30 2016 +0200 d3d11: Implement d3d11_immediate_context_End(). 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/device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ed902c7..8bf8f0c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -506,7 +506,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Begin(ID3D11DeviceContext static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext *iface, ID3D11Asynchronous *asynchronous) { - FIXME("iface %p, asynchronous %p stub!\n", iface, asynchronous); + struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); + HRESULT hr; + + TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GetData().
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 882a8f2b18326704eec7d518aade37da198de635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882a8f2b18326704eec7d518a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:31 2016 +0200 d3d11: Implement d3d11_immediate_context_GetData(). 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 22 ++++++++++++++++++++-- dlls/d3d11/utils.c | 11 +++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6fd5210..cdada42 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -57,6 +57,7 @@ const char *debug_float4(const float *values) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8bf8f0c..e0e12a1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -520,10 +520,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_End(ID3D11DeviceContext *i static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceContext *iface, ID3D11Asynchronous *asynchronous, void *data, UINT data_size, UINT data_flags) { - FIXME("iface %p, asynchronous %p, data %p, data_size %u, data_flags %#x stub!\n", + struct d3d_query *query = unsafe_impl_from_ID3D11Asynchronous(asynchronous); + unsigned int wined3d_flags; + HRESULT hr; + + TRACE("iface %p, asynchronous %p, data %p, data_size %u, data_flags %#x.\n", iface, asynchronous, data, data_size, data_flags); - return E_NOTIMPL; + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(data_flags); + + wined3d_mutex_lock(); + if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) + { + hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + } + else + { + WARN("Invalid data size %u.\n", data_size); + hr = E_INVALIDARG; + } + wined3d_mutex_unlock(); + + return hr; } static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 7b08d13..36cad41 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -374,6 +374,17 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) +{ + if (d3d11_flags & ~D3D11_ASYNC_GETDATA_DONOTFLUSH) + FIXME("Unhandled async getdata flags %#x.\n", d3d11_flags); + + if (d3d11_flags & D3D11_ASYNC_GETDATA_DONOTFLUSH) + return 0; + + return WINED3DGETDATA_FLUSH; +} + DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) { static const DWORD handled = D3D11_BIND_SHADER_RESOURCE

1 0

Józef Kucia : d3d11: Implement d3d11_query_GetDataSize().
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 7a756ad1b4ba639265cb8dac3d02fe285b979236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a756ad1b4ba639265cb8dac3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:32 2016 +0200 d3d11: Implement d3d11_query_GetDataSize(). 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/async.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index f91a053..38c8a28 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -136,9 +136,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_query_SetPrivateDataInterface(ID3D11Query static UINT STDMETHODCALLTYPE d3d11_query_GetDataSize(ID3D11Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D11Query(iface); + unsigned int data_size; - return 0; + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + data_size = wined3d_query_get_data_size(query->wined3d_query); + wined3d_mutex_unlock(); + + return data_size; } static void STDMETHODCALLTYPE d3d11_query_GetDesc(ID3D11Query *iface, D3D11_QUERY_DESC *desc)

1 0

Józef Kucia : d3d11/tests: Port test_timestamp_query( ) from d3d9.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 47c4b45256d5e23cb8d44b886e1d9cf36d680733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c4b45256d5e23cb8d44b886… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 6 12:02:33 2016 +0200 d3d11/tests: Port test_timestamp_query() from d3d9. 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/tests/d3d11.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b3b67c4..2f69042 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4300,6 +4300,163 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_timestamp_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + + ID3D11Asynchronous *timestamp_query, *timestamp_disjoint_query; + D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint, prev_disjoint; + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + unsigned int data_size, i; + ID3D11Device *device; + UINT64 timestamp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + query_desc.Query = D3D11_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(timestamp_query); + ok(data_size == sizeof(UINT64), "Got unexpected data size %u.\n", data_size); + + query_desc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&timestamp_disjoint_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(timestamp_disjoint_query); + ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); + + /* Test a TIMESTAMP_DISJOINT query. */ + ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); + ID3D11DeviceContext_End(context, timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + prev_disjoint = disjoint; + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + ok(disjoint.Disjoint == 0xff, "Disjoint data was modified.\n"); + + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), + D3D11_ASYNC_GETDATA_DONOTFLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + + hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ + ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); + + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + timestamp = 0xdeadbeef; + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(timestamp != 0xdeadbeef, "Timestamp was not modified.\n"); + + timestamp = 0xdeadbeef; + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + ID3D11DeviceContext_End(context, timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + /* It's not strictly necessary for the TIMESTAMP query to be inside a TIMESTAMP_DISJOINT query. */ + ID3D11Asynchronous_Release(timestamp_query); + query_desc.Query = D3D11_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11Asynchronous_Release(timestamp_query); + ID3D11Asynchronous_Release(timestamp_disjoint_query); + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D11Device *device; @@ -8915,6 +9072,7 @@ START_TEST(d3d11) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_timestamp_query(); test_device_removed_reason(); test_private_data(); test_blend();

1 0

Piotr Caban : ntdll: Add RtlRestoreContext implementation.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 4c50ef699564f7d7ab5ab78e082af6da4ab62b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c50ef699564f7d7ab5ab78e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 5 16:24:33 2016 +0200 ntdll: Add RtlRestoreContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 72 ++++++++++++++++++++++++--------------------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0fc4dcb..3874b3e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1293,7 +1293,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException -# @ stub -arch=x86_64 RtlRestoreContext +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4737b06..34b4b4a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -838,6 +838,7 @@ @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stub RtlResetRtlTranslations +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ca3e6ca..1db3a23 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3437,6 +3437,44 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") +/******************************************************************* + * RtlRestoreContext (NTDLL.@) + */ +void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) +{ + if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) + { + struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + context->Rbx = jmp->Rbx; + context->Rsp = jmp->Rsp; + context->Rbp = jmp->Rbp; + context->Rsi = jmp->Rsi; + context->Rdi = jmp->Rdi; + context->R12 = jmp->R12; + context->R13 = jmp->R13; + context->R14 = jmp->R14; + context->R15 = jmp->R15; + context->u.s.Xmm6 = jmp->Xmm6; + context->u.s.Xmm7 = jmp->Xmm7; + context->u.s.Xmm8 = jmp->Xmm8; + context->u.s.Xmm9 = jmp->Xmm9; + context->u.s.Xmm10 = jmp->Xmm10; + context->u.s.Xmm11 = jmp->Xmm11; + context->u.s.Xmm12 = jmp->Xmm12; + context->u.s.Xmm13 = jmp->Xmm13; + context->u.s.Xmm14 = jmp->Xmm14; + context->u.s.Xmm15 = jmp->Xmm15; + } + else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) + { + PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; + TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + context->Rip = (ULONG64)call_consolidate_callback( context, consolidate, rec ); + } + TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + set_cpu_context( context ); +} + /******************************************************************* * RtlUnwindEx (NTDLL.@) @@ -3597,41 +3635,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec *context = new_context; } - if (rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) - { - struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; - context->Rbx = jmp->Rbx; - context->Rsp = jmp->Rsp; - context->Rbp = jmp->Rbp; - context->Rsi = jmp->Rsi; - context->Rdi = jmp->Rdi; - context->R12 = jmp->R12; - context->R13 = jmp->R13; - context->R14 = jmp->R14; - context->R15 = jmp->R15; - context->Rip = jmp->Rip; - context->u.s.Xmm6 = jmp->Xmm6; - context->u.s.Xmm7 = jmp->Xmm7; - context->u.s.Xmm8 = jmp->Xmm8; - context->u.s.Xmm9 = jmp->Xmm9; - context->u.s.Xmm10 = jmp->Xmm10; - context->u.s.Xmm11 = jmp->Xmm11; - context->u.s.Xmm12 = jmp->Xmm12; - context->u.s.Xmm13 = jmp->Xmm13; - context->u.s.Xmm14 = jmp->Xmm14; - context->u.s.Xmm15 = jmp->Xmm15; - } - else if (rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) - { - PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; - TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); - target_ip = call_consolidate_callback( context, consolidate, rec ); - TRACE( "-> target=%p\n", target_ip ); - } context->Rax = (ULONG64)retval; context->Rip = (ULONG64)target_ip; - TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); - set_cpu_context( context ); + RtlRestoreContext(context, rec); }

1 0

Piotr Caban : msvcrt: Improve x86_64 nested exceptions handling.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: d9bacd98d8d23aefdd22755dc1ac4e3c67002921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bacd98d8d23aefdd22755dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 5 14:28:45 2016 +0200 msvcrt: Improve x86_64 nested exceptions handling. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 48 ++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 0379d30..d6d4b04 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -339,6 +339,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + const tryblock_info *in_catch; EXCEPTION_RECORD catch_record; CONTEXT context; UINT i, j; @@ -374,24 +375,38 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, } } + for (i=descr->tryblock_count; i>0; i--) + { + in_catch = rva_to_ptr(descr->tryblock, dispatch->ImageBase); + in_catch = &in_catch[i-1]; + + if (trylevel>in_catch->end_level && trylevel<=in_catch->catch_level) + break; + } + if (!i) + in_catch = NULL; + unwind_help = rva_to_ptr(descr->unwind_help, orig_frame); - unwind_help[0] = trylevel; - TRACE("current trylevel: %d, last catch block: %d\n", trylevel, unwind_help[1]); + if (trylevel > unwind_help[1]) + unwind_help[0] = unwind_help[1] = trylevel; + else + trylevel = unwind_help[1]; + TRACE("current trylevel: %d\n", trylevel); for (i=0; i<descr->tryblock_count; i++) { const tryblock_info *tryblock = rva_to_ptr(descr->tryblock, dispatch->ImageBase); tryblock = &tryblock[i]; - if (unwind_help[1] != -1) - { - if (unwind_help[1] < tryblock->start_level) continue; - if (unwind_help[1] > tryblock->end_level) continue; - } - if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; + if (in_catch) + { + if(tryblock->start_level <= in_catch->end_level) continue; + if(tryblock->end_level > in_catch->catch_level) continue; + } + /* got a try block */ for (j=0; j<tryblock->catchblock_count; j++) { @@ -419,8 +434,6 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("found catch(...) block\n"); } - unwind_help[1] = tryblock->end_level+1; - /* unwind stack and call catch */ memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; @@ -433,7 +446,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, catch_record.ExceptionInformation[4] = (ULONG_PTR)rec; catch_record.ExceptionInformation[5] = (ULONG_PTR)rva_to_ptr(catchblock->handler, dispatch->ImageBase); - RtlUnwindEx((void*)orig_frame, 0, &catch_record, NULL, &context, NULL); + RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &context, NULL); } } @@ -460,15 +473,22 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, ULONG64 orig_frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; int end_level = rec->ExceptionInformation[3]; + EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; + thread_data_t *data = msvcrt_get_thread_data(); frame_info *cur; cxx_local_unwind(orig_frame, dispatch, descr, end_level); /* FIXME: we should only unregister frames registered by call_catch_block here */ - for (cur = msvcrt_get_thread_data()->frame_info_head; cur; cur = cur->next) + for (cur = data->frame_info_head; cur; cur = cur->next) { - if ((ULONG64)cur > frame) - __CxxUnregisterExceptionObject((cxx_frame_info*)cur, FALSE); + if ((ULONG64)cur <= frame) + { + __CxxUnregisterExceptionObject((cxx_frame_info*)cur, + new_rec->ExceptionCode == CXX_EXCEPTION && + data->exc_record->ExceptionCode == CXX_EXCEPTION && + new_rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]); + } } return ExceptionContinueSearch; }

1 0

André Hentschel : ws2_32/tests: Turn a randomly behaving test into a trace.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 64732ccab43aca40f27cfbda34befddc8594ab7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64732ccab43aca40f27cfbda3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 25 15:18:37 2016 +0200 ws2_32/tests: Turn a randomly behaving test into a trace. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ed31f25..d47c175 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -638,14 +638,14 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( n_sent == n_expected, "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); - /* Receive a part of the out-of-band data and check atmark state */ + /* Receive a part of the out-of-band data and print atmark state */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, 0, par->buflen ); ok ( n_recvd == 8, "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, 8 ); n_expected -= 8; ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); + trace( "oob_server (%x): %s the OOB mark: %i\n", id, atmark == 1 ? "not at" : "at", atmark ); /* Receive the rest of the out-of-band data and check atmark state */ do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen );

1 0

Thomas Faber : usp10: Avoid buffer overrun in ReplaceInsertChars.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 37845242658a25edef059f3e1c0230d1b4b6255d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37845242658a25edef059f3e1… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 26 10:57:50 2016 +0200 usp10: Avoid buffer overrun in ReplaceInsertChars. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3fdf84b..3ee412a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1596,7 +1596,7 @@ static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutCha cWalk=cWalk+1; /* Insert */ - for (i = 1; replacements[i] != 0x0000 && i < 3; i++) + for (i = 1; i < 3 && replacements[i] != 0x0000; i++) { int j; for (j = *pcChars; j > cWalk; j--)

1 0

Nikolay Sivov : msxml3: Remove redundant refcount field.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 01c63bdf7686fe2248bc2ab24a7920fdefb2ef0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c63bdf7686fe2248bc2ab24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 22:28:00 2016 +0300 msxml3: Remove redundant refcount field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e0b6e1c..55339e1 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -114,7 +114,6 @@ typedef struct { httprequest req; IServerXMLHTTPRequest IServerXMLHTTPRequest_iface; - LONG ref; } serverhttp; static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) @@ -1737,7 +1736,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - ULONG ref = InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->req.ref ); TRACE("(%p)->(%u)\n", This, ref ); return ref; } @@ -1745,7 +1744,7 @@ static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface) static ULONG WINAPI ServerXMLHTTPRequest_Release(IServerXMLHTTPRequest *iface) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - ULONG ref = InterlockedDecrement( &This->ref ); + ULONG ref = InterlockedDecrement( &This->req.ref ); TRACE("(%p)->(%u)\n", This, ref ); @@ -2041,7 +2040,6 @@ HRESULT ServerXMLHTTP_create(void **obj) init_httprequest(&req->req); req->IServerXMLHTTPRequest_iface.lpVtbl = &ServerXMLHTTPRequestVtbl; - req->ref = 1; *obj = &req->IServerXMLHTTPRequest_iface;

1 0

Jacek Caban : mshtml: Added scripted XHR tests with emulated HTTP connection.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 2ad4e9f422f6d7e0a0cf710199f681b709ddf895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad4e9f422f6d7e0a0cf71019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:45:17 2016 +0200 mshtml: Added scripted XHR tests with emulated HTTP connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/rsrc.rc | 6 + dlls/mshtml/tests/script.c | 465 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/winetest.js | 49 +++++ dlls/mshtml/tests/xhr.js | 37 ++++ 4 files changed, 535 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ad4e9f422f6d7e0a0cf7…

1 0