June 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Send sampler object desctruction through the command stream.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 29788075e0bc736c09f92c9200ecf56509f601c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29788075e0bc736c09f92c920… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:00 2016 +0200 wined3d: Send sampler object desctruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 865198b..1a2e2a1 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -33,23 +33,28 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) return refcount; } -ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) +static void wined3d_sample_destroy_object(void *object) { - ULONG refcount = InterlockedDecrement(&sampler->refcount); + struct wined3d_sampler *sampler = object; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + context = context_acquire(sampler->device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); + context_release(context); + + HeapFree(GetProcessHeap(), 0, sampler); +} + +ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) +{ + ULONG refcount = InterlockedDecrement(&sampler->refcount); + TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) - { - context = context_acquire(sampler->device, NULL); - gl_info = context->gl_info; - GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); - context_release(context); - - HeapFree(GetProcessHeap(), 0, sampler); - } + wined3d_cs_emit_destroy_object(sampler->device->cs, wined3d_sample_destroy_object, sampler); return refcount; }

1 0

Andrew Eikum : urlmon: Allow NULL IBindStatusCallback in UrlOpenStream.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: a4a8693e8922af2d8f4bdadc3e3cf4812263d645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a8693e8922af2d8f4bdadc3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 21 14:13:09 2016 -0500 urlmon: Allow NULL IBindStatusCallback in UrlOpenStream. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/stream.c | 3 +++ dlls/urlmon/umstream.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 354d809..6717198 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -380,6 +380,9 @@ static void test_URLOpenStreamW(void) CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); CHECK_CALLED(OnDataAvailable); CHECK_CALLED(OnStopBinding); + + hr = URLOpenStreamW(NULL, INDEX_HTML, 0, NULL); + ok(hr == S_OK, "URLOpenStreamW failed with error 0x%08x\n", hr); } START_TEST(stream) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 9c94658..01cc755 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -182,8 +182,20 @@ static const IBindStatusCallbackVtbl BlockingBindStatusCallbackVtbl = static HRESULT WINAPI AsyncBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); - HRESULT hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + HRESULT hr = S_OK; + + if(This->pBSC) + hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + else{ + DWORD size = pbindinfo->cbSize; + memset(pbindinfo, 0, size); + pbindinfo->cbSize = size; + + *grfBINDF = 0; + } + *grfBINDF |= BINDF_PULLDATA | BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE; + return hr; }

1 0

Józef Kucia : d3d11/tests: Use get_rtv_desc() in test_render_target_views().
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 7e1fd3d3c9f2df922f2a567342ed40252b0603aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1fd3d3c9f2df922f2a56734… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:34 2016 +0200 d3d11/tests: Use get_rtv_desc() in test_render_target_views(). 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, 2 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3c92855..8626b68 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5637,20 +5637,12 @@ static void test_render_target_views(void) UINT miplevel_count; UINT array_size; }; - struct rtv - { - DXGI_FORMAT format; - D3D11_RTV_DIMENSION dimension; - unsigned int miplevel_idx; - unsigned int layer_idx; - unsigned int layer_count; - }; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; static struct test { struct texture texture; - struct rtv rtv; + struct rtv_desc rtv; DWORD expected_colors[4]; } tests[] = @@ -5724,23 +5716,7 @@ static void test_render_target_views(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); - rtv_desc.Format = texture_desc.Format; - rtv_desc.ViewDimension = test->rtv.dimension; - if (test->rtv.dimension == D3D11_RTV_DIMENSION_TEXTURE2D) - { - U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; - } - else if (test->rtv.dimension == D3D11_RTV_DIMENSION_TEXTURE2DARRAY) - { - U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; - U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; - U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; - } - else - { - trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); - } - + get_rtv_desc(&rtv_desc, &test->rtv); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr);

1 0

Hugh McMaster : msvcrt: Implement _wperror.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 56eb4d3105733693f8de43eacf8e20ed922cb65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=56eb4d3105733693f8de43eac… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 22 01:53:00 2016 +0000 msvcrt: Implement _wperror. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/errno.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index efbd688..5fae918 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1568,7 +1568,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7476995..38fdfe9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1925,7 +1925,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7aa2d19..4ef7358 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1949,7 +1949,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index f236db5..6bd5083 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -641,7 +641,7 @@ @ cdecl _wmkdir(wstr) MSVCRT__wmkdir @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ cdecl _wputenv(wstr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 5414dc6..7e3f265 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -637,7 +637,7 @@ @ cdecl _wmkdir(wstr) MSVCRT__wmkdir @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ cdecl _wputenv(wstr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a6f0a90..1c1dc1a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1250,7 +1250,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 48aed2c..13d1bab 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1223,7 +1223,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ stub _wprintf_l diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 641ca35..46b1859 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -344,6 +344,31 @@ void CDECL MSVCRT_perror(const char* str) } /********************************************************************* + * _wperror (MSVCRT.@) + */ +void CDECL MSVCRT__wperror(const MSVCRT_wchar_t* str) +{ + MSVCRT_size_t size; + char *buffer = NULL; + + if (str && *str) + { + size = MSVCRT_wcstombs(NULL, str, 0); + if (size == -1) return; + size++; + buffer = MSVCRT_malloc(size); + if (!buffer) return; + if (MSVCRT_wcstombs(buffer, str, size) == -1) + { + MSVCRT_free(buffer); + return; + } + } + MSVCRT_perror(buffer); + if (buffer) MSVCRT_free(buffer); +} + +/********************************************************************* * _wcserror_s (MSVCRT.@) */ int CDECL MSVCRT__wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, int err) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 37107d5..274d2e7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1184,7 +1184,7 @@ @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen # stub _woutput_s -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen (wstr wstr) MSVCRT__wpopen # stub _wprintf_l(wstr ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index da03fd1..ecfb612 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2097,7 +2097,7 @@ @ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ varargs _wopen(wstr long) MSVCRT__wopen -@ stub _wperror(wstr) +@ cdecl _wperror(wstr) MSVCRT__wperror @ cdecl _wpopen(wstr wstr) MSVCRT__wpopen @ cdecl _wputenv(wstr) @ cdecl _wputenv_s(wstr wstr)

1 0

Iván Matellanes : msvcirt: Implement ostream:: operator<< for integers.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: c969efcaf219300244bbd460f028acb56982630a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c969efcaf219300244bbd460f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:49 2016 +0100 msvcirt: Implement ostream::operator<< for integers. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 51 +++++++++++++++++++++++++++++++++++++------- dlls/msvcirt/tests/msvcirt.c | 43 +++++++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c969efcaf219300244bbd…

1 0

Józef Kucia : d3d10core/tests: Use get_rtv_desc() in test_render_target_views().
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: eab40edba5e457459270e14c0f8113d7457bc419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab40edba5e457459270e14c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:35 2016 +0200 d3d10core/tests: Use get_rtv_desc() in test_render_target_views(). 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 | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index eabc659..1f70e22 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2166,7 +2166,7 @@ static void test_render_target_views(void) static struct test { struct texture texture; - struct rtv rtv; + struct rtv_desc rtv; DWORD expected_colors[4]; } tests[] = @@ -2238,23 +2238,7 @@ static void test_render_target_views(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); - rtv_desc.Format = texture_desc.Format; - rtv_desc.ViewDimension = test->rtv.dimension; - if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2D) - { - U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; - } - else if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2DARRAY) - { - U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; - U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; - U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; - } - else - { - trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); - } - + get_rtv_desc(&rtv_desc, &test->rtv); hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr);

1 0

Józef Kucia : wined3d: Use single function for STATE_CONSTANT_BUFFER.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: a0269a4ab154e8f11ba7ea47971603dfc10a7ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0269a4ab154e8f11ba7ea479… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:33 2016 +0200 wined3d: Use single function for STATE_CONSTANT_BUFFER. 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/state.c | 51 +++++++++++---------------------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6b9cd3d..b157389 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4832,53 +4832,24 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); } -static void state_cb(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, - enum wined3d_shader_type type, unsigned int base, unsigned int count) +static void state_cb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + enum wined3d_shader_type shader_type = state_id - STATE_CONSTANT_BUFFER(0); + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer; - unsigned int i; + unsigned int i, base, count; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) { - buffer = state->cb[type][i]; + buffer = state->cb[shader_type][i]; GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, buffer ? buffer->buffer_object : 0)); } checkGLcall("glBindBufferBase"); } -static void state_cb_vs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, base, count); -} - -static void state_cb_gs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_GEOMETRY, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, base, count); -} - -static void state_cb_ps(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, base, count); -} - static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -4896,11 +4867,11 @@ static void state_shader_resource_binding(struct wined3d_context *context, const struct StateEntryTemplate misc_state_template[] = { - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_vs, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_gs, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb_ps, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb_warn, }, WINED3D_GL_EXT_NONE }, { STATE_SHADER_RESOURCE_BINDING, { STATE_SHADER_RESOURCE_BINDING, state_shader_resource_binding}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRCBLEND), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE },

1 0

Nikolay Sivov : Update data tables to Unicode 9.0.0.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 58e0972c5ca8c82f65860733aaf3aeb41a7725bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e0972c5ca8c82f65860733a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 22 15:00:22 2016 +0300 Update data tables to Unicode 9.0.0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 11 +- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 298 ++++++----- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 1262 ++++++++++++++++++++++---------------------- dlls/dwrite/scripts.h | 268 +++++----- dlls/usp10/bracket.c | 2 +- dlls/usp10/breaking.c | 6 +- dlls/usp10/indicsyllable.c | 108 ++-- dlls/usp10/linebreak.c | 298 ++++++----- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 108 ++-- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 2 +- libs/wine/casemap.c | 45 +- libs/wine/wctype.c | 38 +- loader/l_intl.nls | Bin 6406 -> 6470 bytes tools/make_unicode | 24 +- 19 files changed, 1280 insertions(+), 1200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58e0972c5ca8c82f65860…

1 0

Józef Kucia : wined3d: Recognize vThreadID register.
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: 12754d0f255b3514a0b9f5b67b628fa936edd536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12754d0f255b3514a0b9f5b67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:29 2016 +0200 wined3d: Recognize vThreadID register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7682850..b79416f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1752,6 +1752,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_THREADID: + shader_addline(buffer, "vThreadID"); + break; + case WINED3DSPR_THREADGROUPID: shader_addline(buffer, "vThreadGroupID"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6e224f6..447861c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -252,6 +252,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, + WINED3D_SM5_RT_THREAD_ID = 0x20, WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, @@ -833,7 +834,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_THREAD_ID */ WINED3DSPR_THREADID, /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 78cbe24..40eb8e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,6 +388,7 @@ enum wined3d_shader_register_type WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, + WINED3DSPR_THREADID, WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX,

1 0

Michael Stefaniuc : shell32: Avoid using CopyRect().
by Alexandre Julliard June 22, 2016

June 22, 2016

Module: wine Branch: master Commit: ee3deec635b03f0508f3d087ab1999b889c2205b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3deec635b03f0508f3d087a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:54:09 2016 +0200 shell32: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 7 +++---- dlls/shell32/shlmenu.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 0cee30f..bbccf88 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -498,7 +498,7 @@ static LRESULT navpane_splitter_beginresize(ExplorerBrowserImpl *This, HWND hwnd SetCapture(hwnd); - CopyRect(&This->splitter_rc, &This->navpane.rc); + This->splitter_rc = This->navpane.rc; This->splitter_rc.left = This->splitter_rc.right - SPLITTER_WIDTH; splitter_draw(GetParent(hwnd), &This->splitter_rc); @@ -516,8 +516,7 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L dx = (SHORT)LOWORD(lParam); TRACE("%d.\n", dx); - CopyRect(&rc, &This->navpane.rc); - + rc = This->navpane.rc; new_width = This->navpane.width + dx; if(new_width > NP_MIN_WIDTH && This->sv_rc.right - new_width > SV_MIN_WIDTH) { @@ -525,7 +524,7 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L rc.left = rc.right - SPLITTER_WIDTH; splitter_draw(GetParent(hwnd), &This->splitter_rc); splitter_draw(GetParent(hwnd), &rc); - CopyRect(&This->splitter_rc, &rc); + This->splitter_rc = rc; } return TRUE; diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 694b5d1..7a960ad 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -613,7 +613,7 @@ LRESULT WINAPI FileMenu_DrawItem( clrPrevBkgnd = SetBkColor(lpdis->hDC, GetSysColor (COLOR_MENU)); } - CopyRect(&TextRect, &(lpdis->rcItem)); + TextRect = lpdis->rcItem; /* add the menubitmap */ menuinfo = FM_GetMenuInfo(pMyItem->hMenu);

1 0