wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

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

07 Jul '16

Module: wine Branch: master Commit: 93f589df0d8601ca011d25b1ba83943675bc02a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f589df0d8601ca011d25b1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:32 2016 +0200 d3d10core/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/d3d10core/tests/device.c | 155 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7067ee6..4ef1b49 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3443,6 +3443,160 @@ 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}; + + D3D10_QUERY_DATA_TIMESTAMP_DISJOINT disjoint, prev_disjoint; + ID3D10Query *timestamp_query, *timestamp_disjoint_query; + struct d3d10core_test_context test_context; + D3D10_QUERY_DESC query_desc; + unsigned int data_size, i; + ID3D10Device *device; + UINT64 timestamp; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + query_desc.Query = D3D10_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Query_GetDataSize(timestamp_query); + ok(data_size == sizeof(UINT64), "Got unexpected data size %u.\n", data_size); + + query_desc.Query = D3D10_QUERY_TIMESTAMP_DISJOINT; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_disjoint_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Query_GetDataSize(timestamp_disjoint_query); + ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); + + /* Test a TIMESTAMP_DISJOINT query. */ + ID3D10Query_Begin(timestamp_disjoint_query); + ID3D10Query_End(timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(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 = ID3D10Query_GetData(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 = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(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 = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), D3D10_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 = ID3D10Query_GetData(timestamp_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(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. */ + ID3D10Query_Begin(timestamp_disjoint_query); + + hr = ID3D10Query_GetData(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); + + ID3D10Query_End(timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + timestamp = 0xdeadbeef; + hr = ID3D10Query_GetData(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 = ID3D10Query_GetData(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 = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + ID3D10Query_End(timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(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 = ID3D10Query_GetData(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. */ + ID3D10Query_Release(timestamp_query); + query_desc.Query = D3D10_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D10Query_End(timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10Query_Release(timestamp_query); + ID3D10Query_Release(timestamp_disjoint_query); + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D10Device *device; @@ -8257,6 +8411,7 @@ START_TEST(device) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_timestamp_query(); test_device_removed_reason(); test_scissor(); test_clear_state();

1 0

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

07 Jul '16

Module: wine Branch: master Commit: a9f09cf06037e43b5a987e8e7d1bd5177c53c754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f09cf06037e43b5a987e8e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:31 2016 +0200 d3d11: Implement d3d10_query_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/async.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 2e57ed6..fa38484 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -292,9 +292,27 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) { - FIXME("iface %p, data %p, data_size %u, flags %#x stub!\n", iface, data, data_size, flags); + struct d3d_query *query = impl_from_ID3D10Query(iface); + unsigned int wined3d_flags; + HRESULT hr; + + TRACE("iface %p, data %p, data_size %u, flags %#x.\n", iface, data, data_size, flags); + + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(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 E_NOTIMPL; + return hr; } static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface)

1 0

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

07 Jul '16

Module: wine Branch: master Commit: 2cadc6793bcc4bc831865eddb3e0c518714fd032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cadc6793bcc4bc831865eddb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:30 2016 +0200 d3d11: Implement d3d10_query_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/async.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 494a23b..2e57ed6 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -279,7 +279,15 @@ static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + HRESULT hr; + + TRACE("iface %p.\n", iface); + + 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 d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags)

1 0

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

07 Jul '16

Module: wine Branch: master Commit: 718d3119e56a6e56dd929015b59d8fba4596412e URL: http://source.winehq.org/git/wine.git/?a=commit;h=718d3119e56a6e56dd929015b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:29 2016 +0200 d3d11: Implement d3d10_query_Begin(). 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 323a348..494a23b 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -266,7 +266,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + HRESULT hr; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface)

1 0

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

07 Jul '16

Module: wine Branch: master Commit: cc6be0c49e7507a4352a72d1dcdc65f5b32b4cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6be0c49e7507a4352a72d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:28 2016 +0200 d3d11: Implement d3d10_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 38c8a28..323a348 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -283,9 +283,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + unsigned int data_size; + + TRACE("iface %p.\n", iface); - return 0; + wined3d_mutex_lock(); + data_size = wined3d_query_get_data_size(query->wined3d_query); + wined3d_mutex_unlock(); + + return data_size; } /* ID3D10Query methods */

1 0

Huw Davies : gdi32: Precompute the destination colours for sources with a colour table.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: f7b6a7d77afef6a176233ae79a15819d692a29f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b6a7d77afef6a176233ae79… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 7 08:44:32 2016 +0100 gdi32: Precompute the destination colours for sources with a colour table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 269 ++++++++++++++++++++++++++++------------- 1 file changed, 187 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7b6a7d77afef6a176233…

1 0

Huw Davies : gdi32: Use a binary search for PtInRegion() and RectInRegion( ).
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: f59d3f60e1ada4fbd37a8c7a71f917b309cee837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59d3f60e1ada4fbd37a8c7a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 6 11:09:13 2016 +0100 gdi32: Use a binary search for PtInRegion() and RectInRegion(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 646512f..cea2dab 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1038,15 +1038,7 @@ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - int i; - - if (obj->numRects > 0 && is_in_rect(&obj->extents, x, y)) - for (i = 0; i < obj->numRects; i++) - if (is_in_rect(&obj->rects[i], x, y)) - { - ret = TRUE; - break; - } + region_find_pt( obj, x, y, &ret ); GDI_ReleaseObj( hrgn ); } return ret; @@ -1071,6 +1063,7 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) WINEREGION *obj; BOOL ret = FALSE; RECT rc; + int i; /* swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ @@ -1079,29 +1072,23 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - RECT *pCurRect, *pRectEnd; - - /* this is (just) a useful optimization */ if ((obj->numRects > 0) && overlapping(&obj->extents, &rc)) { - for (pCurRect = obj->rects, pRectEnd = pCurRect + - obj->numRects; pCurRect < pRectEnd; pCurRect++) + for (i = region_find_pt( obj, rc.left, rc.top, &ret ); !ret && i < obj->numRects; i++ ) { - if (pCurRect->bottom <= rc.top) + if (obj->rects[i].bottom <= rc.top) continue; /* not far enough down yet */ - if (pCurRect->top >= rc.bottom) + if (obj->rects[i].top >= rc.bottom) break; /* too far down */ - if (pCurRect->right <= rc.left) + if (obj->rects[i].right <= rc.left) continue; /* not far enough over yet */ - if (pCurRect->left >= rc.right) { + if (obj->rects[i].left >= rc.right) continue; - } ret = TRUE; - break; } } GDI_ReleaseObj(hrgn);

1 0

Huw Davies : gdi32: Use a binary search to generate the clipped rects.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 7fd44a511f1093c79361485ba80e803b272bbb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd44a511f1093c79361485ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 6 11:09:12 2016 +0100 gdi32: Use a binary search to generate the clipped rects. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 314c651..9bd263c 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -280,7 +280,7 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl if (!(region = get_wine_region( clip ))) return 0; - for (i = 0; i < region->numRects; i++) + for (i = region_find_pt( region, rect.left, rect.top, NULL ); i < region->numRects; i++) { if (region->rects[i].top >= rect.bottom) break; if (!intersect_rect( out, &rect, &region->rects[i] )) continue; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 15e50e1..9c58747 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -370,6 +370,39 @@ static inline void release_wine_region(HRGN rgn) GDI_ReleaseObj(rgn); } +/********************************************************** + * region_find_pt + * + * Return either the index of the rectangle that contains (x,y) or the first + * rectangle after it. Sets *hit to TRUE if the region contains (x,y). + * Note if (x,y) follows all rectangles, then the return value will be rgn->numRects. + */ +static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit ) +{ + int i, start = 0, end = rgn->numRects - 1; + BOOL h = FALSE; + + while (start <= end) + { + i = (start + end) / 2; + + if (rgn->rects[i].bottom <= y || + (rgn->rects[i].top <= y && rgn->rects[i].right <= x)) + start = i + 1; + else if (rgn->rects[i].top > y || + (rgn->rects[i].bottom > y && rgn->rects[i].left > x)) + end = i - 1; + else + { + h = TRUE; + break; + } + } + + if (hit) *hit = h; + return h ? i : start; +} + /* null driver entry points */ extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,

1 0

Andrew Eikum : xaudio2: Always set current OpenAL context before making AL calls.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 49078e00a51876df38d0c572193195be6700bad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49078e00a51876df38d0c5721… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 6 14:48:18 2016 -0500 xaudio2: Always set current OpenAL context before making AL calls. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e83bc22..b2a5e3b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -36,6 +36,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); +static ALCboolean (ALC_APIENTRY *palcSetThreadContext)(ALCcontext*); static HINSTANCE instance; @@ -101,6 +102,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) return FALSE; } + if(!alcIsExtensionPresent(NULL, "ALC_EXT_thread_local_context") || + !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ + ERR("XAudio2 requires the ALC_EXT_thread_local_context extension (OpenAL-Soft >= 1.12)\n"); + return FALSE; + } + break; } return TRUE; @@ -313,6 +320,8 @@ static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, al_gain = Volume; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); return S_OK; @@ -366,6 +375,8 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) TRACE("%p\n", This); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); if(!This->in_use){ @@ -728,6 +739,8 @@ static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, else r = Ratio; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_PITCH, r); return S_OK; @@ -740,6 +753,8 @@ static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *p TRACE("%p, %p\n", This, pRatio); + palcSetThreadContext(This->xa2->al_ctx); + alGetSourcef(This->al_src, AL_PITCH, &ratio); *pRatio = ratio; @@ -1377,6 +1392,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, dump_fmt(pSourceFormat); + palcSetThreadContext(This->al_ctx); + EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ @@ -1752,12 +1769,6 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - if(alcMakeContextCurrent(This->al_ctx) == ALC_FALSE){ - WARN("alcMakeContextCurrent failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - hr = IAudioClient_Start(This->aclient); if (FAILED(hr)) { @@ -2415,6 +2426,8 @@ static DWORD WINAPI engine_threadproc(void *arg) continue; } + palcSetThreadContext(This->al_ctx); + do_engine_tick(This); LeaveCriticalSection(&This->lock);

1 0

Jacek Caban : mshtml: Export IElementSelector for all elements in compatibility mode >= IE8.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: d72d640308ce015b50a8b26c6bf6baeb560d9527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72d640308ce015b50a8b26c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 12:50:18 2016 +0200 mshtml: Export IElementSelector for all elements in compatibility mode >= IE8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 3 ++- dlls/mshtml/htmlarea.c | 3 ++- dlls/mshtml/htmlbody.c | 3 ++- dlls/mshtml/htmlcomment.c | 3 ++- dlls/mshtml/htmlelem.c | 13 ++++++++++--- dlls/mshtml/htmlembed.c | 3 ++- dlls/mshtml/htmlform.c | 3 ++- dlls/mshtml/htmlframe.c | 3 ++- dlls/mshtml/htmlgeneric.c | 3 ++- dlls/mshtml/htmlhead.c | 9 ++++++--- dlls/mshtml/htmliframe.c | 3 ++- dlls/mshtml/htmlimg.c | 3 ++- dlls/mshtml/htmlinput.c | 9 ++++++--- dlls/mshtml/htmllink.c | 3 ++- dlls/mshtml/htmlmeta.c | 3 ++- dlls/mshtml/htmlobject.c | 3 ++- dlls/mshtml/htmloption.c | 6 ++++-- dlls/mshtml/htmlscript.c | 3 ++- dlls/mshtml/htmlselect.c | 3 ++- dlls/mshtml/htmlstyleelem.c | 3 ++- dlls/mshtml/htmltable.c | 3 ++- dlls/mshtml/htmltablecell.c | 3 ++- dlls/mshtml/htmltablerow.c | 3 ++- dlls/mshtml/htmltextarea.c | 3 ++- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/tests/documentmode.js | 20 +++++++++++++++++++- 26 files changed, 87 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d72d640308ce015b50a8b…

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
68
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 2016