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

Mikhail Paulyshka : msvcp140: Implement _To_byte.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: aaaac6ffecff2b025a78513560b349c506958ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaaac6ffecff2b025a7851356… Author: Mikhail Paulyshka <me(a)mixaill.tk> Date: Mon Jul 10 12:59:02 2017 +0200 msvcp140: Implement _To_byte. Signed-off-by: Mikhail Paulyshka <me(a)mixaill.tk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 6 ++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 284f674..0216450 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3731,7 +3731,7 @@ @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield -@ stub _To_byte +@ cdecl _To_byte(wstr ptr) _To_byte @ cdecl _To_wide(str ptr) @ cdecl _Tolower(long ptr) _Tolower @ cdecl _Toupper(long ptr) _Toupper diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index f3dd4a0..7cb75f5 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -152,6 +152,7 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static HMODULE msvcp; @@ -215,6 +216,7 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); init_thiscall_thunk(); @@ -469,6 +471,52 @@ static void test_chore(void) p__Release_chore(&chore); } +static void test_to_byte(void) +{ + static const WCHAR test_1[] = {'T', 'E', 'S', 'T', 0}; + static const WCHAR test_2[] = {0x9580, 0x9581, 0x9582, 0x9583, 0}; /* some CJK characters */ + static const WCHAR *tests[] = {test_1, test_2}; + + char dst[MAX_PATH + 4] = "ABC\0XXXXXXX"; + char compare[MAX_PATH + 4] = "ABC\0XXXXXXX"; + int ret,expected; + unsigned int i, j; + WCHAR longstr[MAX_PATH + 3]; + + ret = p_To_byte(NULL, NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(tests[0], NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(NULL, dst); + ok(!ret, "Got unexpected result %d\n", ret); + + ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", dst); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + ret = p_To_byte(tests[i], dst); + expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare), + NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", dst, i); + } + + /* Output length is limited to MAX_PATH.*/ + for (i = MAX_PATH - 2; i < MAX_PATH + 2; ++i) + { + for (j = 0; j < i; j++) + longstr[j] = 'A'; + longstr[i] = 0; + memset(dst, 0xff, sizeof(dst)); + memset(compare, 0xff, sizeof(compare)); + + ret = p_To_byte(longstr, dst); + expected = WideCharToMultiByte(CP_ACP, 0, longstr, -1, compare, MAX_PATH, NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, length %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, length %u\n", dst, i); + } +} + static void test_to_wide(void) { /* öäüß€Ÿ.A.B in cp1252, the two . are an undefined value and delete. @@ -524,6 +572,7 @@ START_TEST(msvcp140) test__ContextCallback(); test__TaskEventLogger(); test_chore(); + test_to_byte(); test_to_wide(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f80c9b6..70c3677 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,6 +11224,12 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif +int __cdecl _To_byte(const wchar_t *src, char *dst) +{ + TRACE("(%s %p)\n", debugstr_w(src), dst); + return WideCharToMultiByte(CP_ACP, 0, src, -1, dst, MAX_PATH, NULL, NULL); +} + int __cdecl _To_wide(const char *src, wchar_t *dst) { TRACE("(%s %p)\n", debugstr_a(src), dst);

1 0

Józef Kucia : wined3d: Avoid creating event queries manually.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 0edb71a35ffe00450b315a735b9853bd2d982e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edb71a35ffe00450b315a735… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:25:47 2017 +0200 wined3d: Avoid creating event queries manually. Fixes a regression introduced by commit be20ddc38b3f9e101460f5f8f04015b148d3e13d. 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/wined3d/buffer.c | 15 +++++++++------ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5740d65..9cd74fa 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -815,6 +815,8 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const struct wined3d_gl_info *gl_info) { enum wined3d_event_query_result ret; + struct wined3d_query *query; + HRESULT hr; /* No fencing needs to be done if the app promises not to overwrite * existing data. */ @@ -830,20 +832,21 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st if (!This->query) { - TRACE("Creating event query for buffer %p\n", This); + TRACE("Creating event query for buffer %p.\n", This); - if (!wined3d_event_query_supported(gl_info)) + hr = wined3d_query_create(This->resource.device, WINED3D_QUERY_TYPE_EVENT, + NULL, &wined3d_null_parent_ops, &query); + if (hr == WINED3DERR_NOTAVAILABLE) { FIXME("Event queries not supported, dropping async buffer locks.\n"); goto drop_query; } - - This->query = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->query)); - if (!This->query) + if (FAILED(hr)) { - ERR("Failed to allocate event query memory, dropping async buffer locks.\n"); + ERR("Failed to create event query, hr %#x.\n", hr); goto drop_query; } + This->query = CONTAINING_RECORD(query, struct wined3d_event_query, query); /* Since we don't know about old draws a glFinish is needed once */ gl_info->gl_ops.gl.p_glFinish(); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8445922..e76011c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -83,7 +83,7 @@ static struct wined3d_pipeline_statistics_query *wined3d_pipeline_statistics_que return CONTAINING_RECORD(query, struct wined3d_pipeline_statistics_query, query); } -BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) +static BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1025c98..d687e78 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1669,7 +1669,6 @@ enum wined3d_event_query_result enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; -BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_occlusion_query {

1 0

Józef Kucia : wined3d: Clean up buffer_sync_apple().
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 11c902ebc76a4487ba2ad65f2bbd15cb274c0917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c902ebc76a4487ba2ad65f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:25:48 2017 +0200 wined3d: Clean up buffer_sync_apple(). 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/wined3d/buffer.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9cd74fa..26f3dea 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -812,7 +812,7 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) } /* The caller provides a context and binds the buffer */ -static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const struct wined3d_gl_info *gl_info) +static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const struct wined3d_gl_info *gl_info) { enum wined3d_event_query_result ret; struct wined3d_query *query; @@ -825,16 +825,16 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st if (flags & WINED3D_MAP_DISCARD) { - GL_EXTCALL(glBufferData(This->buffer_type_hint, This->resource.size, NULL, This->buffer_object_usage)); + GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, buffer->buffer_object_usage)); checkGLcall("glBufferData"); return; } - if (!This->query) + if (!buffer->query) { - TRACE("Creating event query for buffer %p.\n", This); + TRACE("Creating event query for buffer %p.\n", buffer); - hr = wined3d_query_create(This->resource.device, WINED3D_QUERY_TYPE_EVENT, + hr = wined3d_query_create(buffer->resource.device, WINED3D_QUERY_TYPE_EVENT, NULL, &wined3d_null_parent_ops, &query); if (hr == WINED3DERR_NOTAVAILABLE) { @@ -846,14 +846,15 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st ERR("Failed to create event query, hr %#x.\n", hr); goto drop_query; } - This->query = CONTAINING_RECORD(query, struct wined3d_event_query, query); + buffer->query = CONTAINING_RECORD(query, struct wined3d_event_query, query); /* Since we don't know about old draws a glFinish is needed once */ gl_info->gl_ops.gl.p_glFinish(); return; } - TRACE("Synchronizing buffer %p\n", This); - ret = wined3d_event_query_finish(This->query, This->resource.device); + + TRACE("Synchronizing buffer %p.\n", buffer); + ret = wined3d_event_query_finish(buffer->query, buffer->resource.device); switch (ret) { case WINED3D_EVENT_QUERY_NOT_STARTED: @@ -862,26 +863,26 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st return; case WINED3D_EVENT_QUERY_WRONG_THREAD: - WARN("Cannot synchronize buffer lock due to a thread conflict\n"); + WARN("Cannot synchronize buffer lock due to a thread conflict.\n"); goto drop_query; default: - ERR("wined3d_event_query_finish returned %u, dropping async buffer locks\n", ret); + ERR("wined3d_event_query_finish returned %u, dropping async buffer locks.\n", ret); goto drop_query; } drop_query: - if (This->query) + if (buffer->query) { - struct wined3d_query *query = &This->query->query; + struct wined3d_query *query = &buffer->query->query; query->query_ops->query_destroy(query); - This->query = NULL; + buffer->query = NULL; } gl_info->gl_ops.gl.p_glFinish(); - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); - This->flags &= ~WINED3D_BUFFER_APPLESYNC; + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + checkGLcall("glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); + buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; } static void buffer_mark_used(struct wined3d_buffer *buffer)

1 0

Józef Kucia : wined3d: Introduce wined3d fence objects.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: c45b908abc0c4d163dbff0e4e8456c155286f04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45b908abc0c4d163dbff0e4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:25:49 2017 +0200 wined3d: Introduce wined3d fence objects. Use fences for the APPLESYNC codepath, and implement event queries on top of fences. 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/wined3d/buffer.c | 54 +++++------- dlls/wined3d/context.c | 92 ++++++++++---------- dlls/wined3d/drawprim.c | 12 +-- dlls/wined3d/query.c | 185 ++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 70 +++++++++------- 5 files changed, 235 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c45b908abc0c4d163dbff…

1 0

Józef Kucia : d3d10core/tests: Prefer draw_color_quad () to custom pixel shader.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: d165f4200d0690eb5314dfee3770ef95133ee072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165f4200d0690eb5314dfee3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:52:19 2017 +0200 d3d10core/tests: Prefer draw_color_quad() to custom pixel shader. 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 | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5159bad..a10f40d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4279,37 +4279,18 @@ static void test_scissor(void) D3D10_RASTERIZER_DESC rs_desc; ID3D10RasterizerState *rs; D3D10_RECT scissor_rect; - ID3D10PixelShader *ps; ID3D10Device *device; DWORD color; HRESULT hr; static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; - static const DWORD ps_code[] = - { -#if 0 - float4 main(float4 position : SV_POSITION) : SV_Target - { - return float4(0.0, 1.0, 0.0, 1.0); - } -#endif - 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, - 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, - }; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; if (!init_test_context(&test_context)) return; device = test_context.device; - hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); - ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - rs_desc.FillMode = D3D10_FILL_SOLID; rs_desc.CullMode = D3D10_CULL_BACK; rs_desc.FrontCounterClockwise = FALSE; @@ -4323,8 +4304,6 @@ static void test_scissor(void) hr = ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D10Device_PSSetShader(device, ps); - scissor_rect.left = 160; scissor_rect.top = 120; scissor_rect.right = 480; @@ -4334,7 +4313,7 @@ static void test_scissor(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); check_texture_color(test_context.backbuffer, 0xff0000ff, 1); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -4348,7 +4327,7 @@ static void test_scissor(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); ID3D10Device_RSSetState(device, rs); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -4361,7 +4340,6 @@ static void test_scissor(void) ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); ID3D10RasterizerState_Release(rs); - ID3D10PixelShader_Release(ps); release_test_context(&test_context); }

1 0

Józef Kucia : d3d11/tests: Prefer draw_color_quad() to custom pixel shader.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 0c2bbdd95ccfe2574474386df5f1da5447f80b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2bbdd95ccfe2574474386df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:52:20 2017 +0200 d3d11/tests: Prefer draw_color_quad() to custom pixel shader. 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 | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 69d8517..00e11fb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7967,28 +7967,12 @@ static void test_scissor(void) D3D11_RASTERIZER_DESC rs_desc; ID3D11RasterizerState *rs; D3D11_RECT scissor_rect; - ID3D11PixelShader *ps; ID3D11Device *device; DWORD color; HRESULT hr; static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; - static const DWORD ps_code[] = - { -#if 0 - float4 main(float4 position : SV_POSITION) : SV_Target - { - return float4(0.0, 1.0, 0.0, 1.0); - } -#endif - 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, - 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, - }; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; if (!init_test_context(&test_context, NULL)) return; @@ -7996,9 +7980,6 @@ static void test_scissor(void) device = test_context.device; immediate_context = test_context.immediate_context; - hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - rs_desc.FillMode = D3D11_FILL_SOLID; rs_desc.CullMode = D3D11_CULL_BACK; rs_desc.FrontCounterClockwise = FALSE; @@ -8012,8 +7993,6 @@ static void test_scissor(void) hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D11DeviceContext_PSSetShader(immediate_context, ps, NULL, 0); - scissor_rect.left = 160; scissor_rect.top = 120; scissor_rect.right = 480; @@ -8023,7 +8002,7 @@ static void test_scissor(void) ID3D11DeviceContext_ClearRenderTargetView(immediate_context, test_context.backbuffer_rtv, red); check_texture_color(test_context.backbuffer, 0xff0000ff, 1); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -8037,7 +8016,7 @@ static void test_scissor(void) ID3D11DeviceContext_ClearRenderTargetView(immediate_context, test_context.backbuffer_rtv, red); ID3D11DeviceContext_RSSetState(immediate_context, rs); - draw_quad(&test_context); + draw_color_quad(&test_context, &green); color = get_texture_color(test_context.backbuffer, 320, 60); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(test_context.backbuffer, 80, 240); @@ -8050,7 +8029,6 @@ static void test_scissor(void) ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); ID3D11RasterizerState_Release(rs); - ID3D11PixelShader_Release(ps); release_test_context(&test_context); }

1 0

Michael Stefaniuc : d2d1: Make use of the available ARRAY_SIZE macro.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 6f22d67077f7fda1a3e9477df2a2148bbf9e3542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f22d67077f7fda1a3e9477df… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 7 17:15:14 2017 +0200 d2d1: Make use of the available ARRAY_SIZE macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 4 ++-- dlls/d2d1/brush.c | 4 ++-- dlls/d2d1/render_target.c | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43904bb..6d9c352 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -210,7 +210,7 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D2D1_ALPHA_MODE_IGNORE }, }; - for (i = 0; i < sizeof(supported_formats) / sizeof(*supported_formats); ++i) + for (i = 0; i < ARRAY_SIZE(supported_formats); ++i) { if (supported_formats[i].format == format->format && supported_formats[i].alphaMode == format->alphaMode) @@ -476,7 +476,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d return hr; } - for (i = 0, d2d_format = NULL; i < sizeof(format_lookup) / sizeof(*format_lookup); ++i) + for (i = 0, d2d_format = NULL; i < ARRAY_SIZE(format_lookup); ++i) { if (IsEqualGUID(&wic_format, format_lookup[i].wic)) { diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 601f40f..51ef71a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -868,7 +868,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (brush->type >= sizeof(brush_sizes) / sizeof(*brush_sizes)) + if (brush->type >= ARRAY_SIZE(brush_sizes)) { ERR("Unhandled brush type %#x.\n", brush->type); return E_NOTIMPL; @@ -877,7 +877,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b buffer_desc.ByteWidth = brush_sizes[brush->type]; if (opacity_brush) { - if (opacity_brush->type >= sizeof(brush_sizes) / sizeof(*brush_sizes)) + if (opacity_brush->type >= ARRAY_SIZE(brush_sizes)) { ERR("Unhandled opacity brush type %#x.\n", opacity_brush->type); return E_NOTIMPL; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 20ea534..37121d9 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -2738,7 +2738,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_outline, - sizeof(il_desc_outline) / sizeof(*il_desc_outline), vs_code_outline, sizeof(vs_code_outline), + ARRAY_SIZE(il_desc_outline), vs_code_outline, sizeof(vs_code_outline), &render_target->shape_resources[D2D_SHAPE_TYPE_OUTLINE].il))) { WARN("Failed to create outline input layout, hr %#x.\n", hr); @@ -2746,7 +2746,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_triangle, - sizeof(il_desc_triangle) / sizeof(*il_desc_triangle), vs_code_triangle, sizeof(vs_code_triangle), + ARRAY_SIZE(il_desc_triangle), vs_code_triangle, sizeof(vs_code_triangle), &render_target->shape_resources[D2D_SHAPE_TYPE_TRIANGLE].il))) { WARN("Failed to create triangle input layout, hr %#x.\n", hr); @@ -2754,8 +2754,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_bezier_outline, - sizeof(il_desc_bezier_outline) / sizeof(*il_desc_bezier_outline), - vs_code_bezier_outline, sizeof(vs_code_bezier_outline), + ARRAY_SIZE(il_desc_bezier_outline), vs_code_bezier_outline, sizeof(vs_code_bezier_outline), &render_target->shape_resources[D2D_SHAPE_TYPE_BEZIER_OUTLINE].il))) { WARN("Failed to create bezier outline input layout, hr %#x.\n", hr); @@ -2763,7 +2762,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_bezier, - sizeof(il_desc_bezier) / sizeof(*il_desc_bezier), vs_code_bezier, sizeof(vs_code_bezier), + ARRAY_SIZE(il_desc_bezier), vs_code_bezier, sizeof(vs_code_bezier), &render_target->shape_resources[D2D_SHAPE_TYPE_BEZIER].il))) { WARN("Failed to create bezier input layout, hr %#x.\n", hr); @@ -2798,7 +2797,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t goto err; } - for (i = 0; i < sizeof(brush_shaders) / sizeof(*brush_shaders); ++i) + for (i = 0; i < ARRAY_SIZE(brush_shaders); ++i) { const struct brush_shader *bs = &brush_shaders[i]; if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->device, bs->byte_code, bs->byte_code_size,

1 0

Nikolay Sivov : d3drm: Use existing helper to manage child frames array.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: b3903a13771afe9e22af54bc5867dde7de114530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3903a13771afe9e22af54bc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:46 2017 +0300 d3drm: Use existing helper to manage child frames array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/frame.c | 31 ++++++------------------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 067c0e6..89e6414 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -65,8 +65,8 @@ struct d3drm_frame IDirect3DRM *d3drm; LONG ref; struct d3drm_frame *parent; - ULONG nb_children; - ULONG children_capacity; + SIZE_T nb_children; + SIZE_T children_size; IDirect3DRMFrame3 **children; ULONG nb_visuals; ULONG visuals_capacity; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 0d6ee14..ffe7506 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -807,7 +807,7 @@ static HRESULT WINAPI d3drm_frame1_GetClassName(IDirect3DRMFrame *iface, DWORD * static HRESULT WINAPI d3drm_frame3_AddChild(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *child) { - struct d3drm_frame *This = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *child_obj = unsafe_impl_from_IDirect3DRMFrame3(child); TRACE("iface %p, child %p.\n", iface, child); @@ -831,32 +831,13 @@ static HRESULT WINAPI d3drm_frame3_AddChild(IDirect3DRMFrame3 *iface, IDirect3DR } } - if ((This->nb_children + 1) > This->children_capacity) - { - ULONG new_capacity; - IDirect3DRMFrame3** children; - - if (!This->children_capacity) - { - new_capacity = 16; - children = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMFrame3*)); - } - else - { - new_capacity = This->children_capacity * 2; - children = HeapReAlloc(GetProcessHeap(), 0, This->children, new_capacity * sizeof(IDirect3DRMFrame3*)); - } - - if (!children) - return E_OUTOFMEMORY; - - This->children_capacity = new_capacity; - This->children = children; - } + if (!d3drm_array_reserve((void **)&frame->children, &frame->children_size, + frame->nb_children + 1, sizeof(*frame->children))) + return E_OUTOFMEMORY; - This->children[This->nb_children++] = child; + frame->children[frame->nb_children++] = child; IDirect3DRMFrame3_AddRef(child); - child_obj->parent = This; + child_obj->parent = frame; return D3DRM_OK; }

1 0

Nikolay Sivov : d3drm: Use existing helper to manage lights array.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 0459a3273d92237787ca9326e1bbc0ec43f5e2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0459a3273d92237787ca9326e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:47 2017 +0300 d3drm: Use existing helper to manage lights array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/frame.c | 33 +++++++-------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 89e6414..16c1415 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -71,8 +71,8 @@ struct d3drm_frame ULONG nb_visuals; ULONG visuals_capacity; IDirect3DRMVisual **visuals; - ULONG nb_lights; - ULONG lights_capacity; + SIZE_T nb_lights; + SIZE_T lights_size; IDirect3DRMLight **lights; D3DRMMATRIX4D transform; D3DCOLOR scenebackground; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index ffe7506..7d89686 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -875,9 +875,8 @@ static HRESULT WINAPI d3drm_frame1_AddChild(IDirect3DRMFrame *iface, IDirect3DRM static HRESULT WINAPI d3drm_frame3_AddLight(IDirect3DRMFrame3 *iface, IDirect3DRMLight *light) { - struct d3drm_frame *This = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); ULONG i; - IDirect3DRMLight** lights; TRACE("iface %p, light %p.\n", iface, light); @@ -885,33 +884,15 @@ static HRESULT WINAPI d3drm_frame3_AddLight(IDirect3DRMFrame3 *iface, IDirect3DR return D3DRMERR_BADOBJECT; /* Check if already existing and return gracefully without increasing ref count */ - for (i = 0; i < This->nb_lights; i++) - if (This->lights[i] == light) + for (i = 0; i < frame->nb_lights; i++) + if (frame->lights[i] == light) return D3DRM_OK; - if ((This->nb_lights + 1) > This->lights_capacity) - { - ULONG new_capacity; - - if (!This->lights_capacity) - { - new_capacity = 16; - lights = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMLight*)); - } - else - { - new_capacity = This->lights_capacity * 2; - lights = HeapReAlloc(GetProcessHeap(), 0, This->lights, new_capacity * sizeof(IDirect3DRMLight*)); - } - - if (!lights) - return E_OUTOFMEMORY; - - This->lights_capacity = new_capacity; - This->lights = lights; - } + if (!d3drm_array_reserve((void **)&frame->lights, &frame->lights_size, + frame->nb_lights + 1, sizeof(*frame->lights))) + return E_OUTOFMEMORY; - This->lights[This->nb_lights++] = light; + frame->lights[frame->nb_lights++] = light; IDirect3DRMLight_AddRef(light); return D3DRM_OK;

1 0

Nikolay Sivov : d3drm: Use existing helper to manage visuals array.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 671ac168e2d008b6dd6f62d441e1bb8bf9b28048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671ac168e2d008b6dd6f62d44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:48 2017 +0300 d3drm: Use existing helper to manage visuals array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/frame.c | 33 +++++++-------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 16c1415..861c3ab 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -68,8 +68,8 @@ struct d3drm_frame SIZE_T nb_children; SIZE_T children_size; IDirect3DRMFrame3 **children; - ULONG nb_visuals; - ULONG visuals_capacity; + SIZE_T nb_visuals; + SIZE_T visuals_size; IDirect3DRMVisual **visuals; SIZE_T nb_lights; SIZE_T lights_size; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 7d89686..aa7633b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1064,9 +1064,8 @@ static HRESULT WINAPI d3drm_frame1_AddRotation(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddVisual(IDirect3DRMFrame3 *iface, IUnknown *visual) { - struct d3drm_frame *This = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); ULONG i; - IDirect3DRMVisual** visuals; TRACE("iface %p, visual %p.\n", iface, visual); @@ -1074,33 +1073,15 @@ static HRESULT WINAPI d3drm_frame3_AddVisual(IDirect3DRMFrame3 *iface, IUnknown return D3DRMERR_BADOBJECT; /* Check if already existing and return gracefully without increasing ref count */ - for (i = 0; i < This->nb_visuals; i++) - if (This->visuals[i] == (IDirect3DRMVisual *)visual) + for (i = 0; i < frame->nb_visuals; i++) + if (frame->visuals[i] == (IDirect3DRMVisual *)visual) return D3DRM_OK; - if ((This->nb_visuals + 1) > This->visuals_capacity) - { - ULONG new_capacity; - - if (!This->visuals_capacity) - { - new_capacity = 16; - visuals = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMVisual*)); - } - else - { - new_capacity = This->visuals_capacity * 2; - visuals = HeapReAlloc(GetProcessHeap(), 0, This->visuals, new_capacity * sizeof(IDirect3DRMVisual*)); - } - - if (!visuals) - return E_OUTOFMEMORY; - - This->visuals_capacity = new_capacity; - This->visuals = visuals; - } + if (!d3drm_array_reserve((void **)&frame->visuals, &frame->visuals_size, + frame->nb_visuals + 1, sizeof(*frame->visuals))) + return E_OUTOFMEMORY; - This->visuals[This->nb_visuals++] = (IDirect3DRMVisual *)visual; + frame->visuals[frame->nb_visuals++] = (IDirect3DRMVisual *)visual; IDirect3DRMVisual_AddRef(visual); return D3DRM_OK;

1 0