January 2016 - Wine-commits

Jacek Caban : mshtml: Skip unused named args in Invoke calls.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 8a20cf4cf82d005f0cecd786fde201aafd541573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a20cf4cf82d005f0cecd786f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 20:49:24 2016 +0100 mshtml: Skip unused named args in Invoke calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/tests/script.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ff4e28a..3980daf 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -617,6 +617,7 @@ static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { + DISPPARAMS params = {dp->rgvarg+dp->cNamedArgs, NULL, dp->cArgs-dp->cNamedArgs, 0}; ITypeInfo *ti; IUnknown *unk; UINT argerr=0; @@ -634,7 +635,7 @@ static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags, return E_FAIL; } - hres = ITypeInfo_Invoke(ti, unk, func->id, flags, dp, res, ei, &argerr); + hres = ITypeInfo_Invoke(ti, unk, func->id, flags, &params, res, ei, &argerr); IUnknown_Release(unk); return hres; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2511939..73b1185 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1926,6 +1926,23 @@ static void test_func(IDispatchEx *obj) hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); ok(hres == S_OK || broken(E_ACCESSDENIED), "InvokeEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { + DISPID named_args[2] = { DISPID_THIS, 0xdeadbeef }; + VARIANT args[2]; + + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.rgdispidNamedArgs = named_args; + dp.cNamedArgs = 2; + dp.cArgs = 2; + dp.rgvarg = &var; + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)obj; + V_VT(args+1) = VT_I4; + V_I4(args+1) = 3; + hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var);

1 0

Jacek Caban : mshtml: Added IHTMLDocument2:: get_defaultCharset implementation.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 5910925728d4ad103d42c3d281134db48001ac93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5910925728d4ad103d42c3d28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 12 14:42:46 2016 +0100 mshtml: Added IHTMLDocument2::get_defaultCharset implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 ++++-- dlls/mshtml/main.c | 53 +++++++++++++++++++++++++++++++++----------- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87be653..784a578 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -921,8 +921,11 @@ static HRESULT WINAPI HTMLDocument_put_defaultCharset(IHTMLDocument2 *iface, BST static HRESULT WINAPI HTMLDocument_get_defaultCharset(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = charset_string_from_cp(GetACP()); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLDocument_get_mimeType(IHTMLDocument2 *iface, BSTR *p) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 0b6f6ac..8a366bd 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -54,25 +54,35 @@ static HDC display_dc; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; -UINT cp_from_charset_string(BSTR charset) +static BOOL ensure_mlang(void) { - MIMECSETINFO info; + IMultiLanguage2 *new_mlang; HRESULT hres; - if(!mlang) { - IMultiLanguage2 *new_mlang; - - hres = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, - &IID_IMultiLanguage2, (void**)&new_mlang); - if(FAILED(hres)) { - ERR("Could not create CMultiLanguage instance\n"); - return CP_UTF8; - } + if(mlang) + return TRUE; - if(InterlockedCompareExchangePointer((void**)&mlang, new_mlang, NULL)) - IMultiLanguage2_Release(new_mlang); + hres = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, + &IID_IMultiLanguage2, (void**)&new_mlang); + if(FAILED(hres)) { + ERR("Could not create CMultiLanguage instance\n"); + return FALSE; } + if(InterlockedCompareExchangePointer((void**)&mlang, new_mlang, NULL)) + IMultiLanguage2_Release(new_mlang); + + return TRUE; +} + +UINT cp_from_charset_string(BSTR charset) +{ + MIMECSETINFO info; + HRESULT hres; + + if(!ensure_mlang()) + return CP_UTF8; + hres = IMultiLanguage2_GetCharsetInfo(mlang, charset, &info); if(FAILED(hres)) { FIXME("GetCharsetInfo failed: %08x\n", hres); @@ -82,6 +92,23 @@ UINT cp_from_charset_string(BSTR charset) return info.uiInternetEncoding; } +BSTR charset_string_from_cp(UINT cp) +{ + MIMECPINFO info; + HRESULT hres; + + if(!ensure_mlang()) + return SysAllocString(NULL); + + hres = IMultiLanguage2_GetCodePageInfo(mlang, cp, GetUserDefaultUILanguage(), &info); + if(FAILED(hres)) { + ERR("GetCodePageInfo failed: %08x\n", hres); + return SysAllocString(NULL); + } + + return SysAllocString(info.wszWebCharset); +} + static void thread_detach(void) { thread_data_t *thread_data; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2f03501..f57dff2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1271,6 +1271,7 @@ static inline void windowref_release(windowref_t *ref) } UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; +BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize dest VARIANT before VariantCopy call.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: f2ceadc6e6e6b7906400b6df84ac385d263cf394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ceadc6e6e6b7906400b6df8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 12 15:43:53 2016 +0100 mshtml: Initialize dest VARIANT before VariantCopy call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ad016b9..df2d9a4 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1468,8 +1468,10 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var HRESULT hres; hres = dispex_get_dprop_ref(&event_target->dispex, event_info[eid].attr_name, FALSE, &v); - if(SUCCEEDED(hres) && V_VT(v) != VT_EMPTY) + if(SUCCEEDED(hres) && V_VT(v) != VT_EMPTY) { + V_VT(var) = VT_EMPTY; return VariantCopy(var, v); + } data = get_event_target_data(event_target, FALSE); if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) {

1 0

Stefan Dösinger : d3d10core/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: f37472ae21cc14bea97d6116faaa20387ae1d9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37472ae21cc14bea97d6116f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 10 11:21:30 2016 +0000 d3d10core/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0dd7707..464acd0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4637,6 +4637,92 @@ static void test_update_subresource(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *backbuffer, *multi; + ID3D10Device *device; + ULONG refcount; + DWORD color; + HRESULT hr; + unsigned int x, y; + struct texture_readback rb; + BOOL all_zero = TRUE; + UINT count = 0; + HWND window; + IDXGISwapChain *swapchain; + ID3D10RenderTargetView *rtview; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); + todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); + if (!count) + { + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); + goto done; + } + + window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)backbuffer, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + ID3D10Device_ClearRenderTargetView(device, rtview, white); + + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 2; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)backbuffer, 0, + (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + + get_texture_readback(backbuffer, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + color = get_readback_color(&rb, x, y); + if (!compare_color(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_texture_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + ID3D10RenderTargetView_Release(rtview); + ID3D10Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D10Texture2D_Release(multi); + DestroyWindow(window); +done: + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -4664,4 +4750,5 @@ START_TEST(device) test_il_append_aligned(); test_fragment_coords(); test_update_subresource(); + test_multisample_init(); }

1 0

Stefan Dösinger : d3d11/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 616e965789b10e615442e0a557c6cc30bafbc694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616e965789b10e615442e0a55… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 10 11:21:31 2016 +0000 d3d11/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3fdc897..d295f19 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4425,6 +4425,96 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_multisample_init(void) +{ + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *backbuffer, *multi; + ID3D11Device *device; + ID3D11DeviceContext *context; + ULONG refcount; + DWORD color; + HRESULT hr; + unsigned int x, y; + struct texture_readback rb; + BOOL all_zero = TRUE; + UINT count = 0; + HWND window; + IDXGISwapChain *swapchain; + ID3D11RenderTargetView *rtview; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); + todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); + if (!count) + { + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); + goto done; + } + + window = CreateWindowA("static", "d3d11_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)backbuffer, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_ClearRenderTargetView(context, rtview, white); + + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 2; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &multi); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)backbuffer, 0, + (ID3D11Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + + get_texture_readback(backbuffer, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + color = get_readback_color(&rb, x, y); + if (!compare_color(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_texture_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + ID3D11DeviceContext_Release(context); + ID3D11RenderTargetView_Release(rtview); + ID3D11Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D11Texture2D_Release(multi); + DestroyWindow(window); +done: + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -4454,4 +4544,5 @@ START_TEST(d3d11) test_fragment_coords(); test_update_subresource(); test_resource_map(); + test_multisample_init(); }

1 0

Stefan Dösinger : d3d10core/tests: Viewport properties are integers.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: c447e691b92aede799e2ac2d5dfdbaff5cc2ec72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c447e691b92aede799e2ac2d5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 10 11:21:32 2016 +0000 d3d10core/tests: Viewport properties are integers. Shuts up an MSVC warning. Note that in d3d11 those members are FLOATs. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 464acd0..539ded8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3584,10 +3584,10 @@ static void test_texture(void) ID3D10Device_VSSetShader(device, vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); - vp.TopLeftX = 0.0f; - vp.TopLeftY = 0.0f; - vp.Width = 640.0f; - vp.Height = 480.0f; + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; ID3D10Device_RSSetViewports(device, 1, &vp);

1 0

Gerald Pfeifer : wined3d: Fix incorrect indentation of several break statements in in set_tex_op.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: f5a8580589661e92d57ea76e5cb6f162fe47366c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a8580589661e92d57ea76e5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 10 19:22:46 2016 +0800 wined3d: Fix incorrect indentation of several break statements in in set_tex_op. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 47afa42..1d80fa0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2767,7 +2767,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2789,7 +2789,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_ALPHA_ADD_COLOR: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2817,7 +2817,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_COLOR_ADD_ALPHA: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2845,7 +2845,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_INVALPHA_ADD_COLOR: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2873,7 +2873,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_INVCOLOR_ADD_ALPHA: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2907,7 +2907,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MULTIPLY_ADD: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2929,7 +2929,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_BUMPENVMAP_LUMINANCE: case WINED3D_TOP_BUMPENVMAP: if (gl_info->supported[NV_TEXTURE_SHADER2])

1 0

Józef Kucia : wined3d: Recognize SM4 ftou opcode.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 5b5efd552ee77d6cea64b0fef6447aa0ffe151bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5efd552ee77d6cea64b0fef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:20 2016 +0100 wined3d: Recognize SM4 ftou opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 59780f8..6b67c7d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5251,6 +5251,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, + /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IEQ */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66a541a..a18e7a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7899,6 +7899,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, + /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6aa5bd5..d63a377 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -79,6 +79,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_EXPP */ "expp", /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", + /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_IADD */ "iadd", /* WINED3DSIH_IEQ */ "ieq", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d0d6291..c1f20b0 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -93,6 +93,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_FRC = 0x1a, WINED3D_SM4_OP_FTOI = 0x1b, + WINED3D_SM4_OP_FTOU = 0x1c, WINED3D_SM4_OP_GE = 0x1d, WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, @@ -264,6 +265,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, "F", "F"}, {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, "F", "F"}, {WINED3D_SM4_OP_FTOI, WINED3DSIH_FTOI, "I", "F"}, + {WINED3D_SM4_OP_FTOU, WINED3DSIH_FTOU, "U", "F"}, {WINED3D_SM4_OP_GE, WINED3DSIH_GE, "U", "FF"}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, "I", "II"}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 805e32e..86f4123 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -494,6 +494,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_EXPP, WINED3DSIH_FRC, WINED3DSIH_FTOI, + WINED3DSIH_FTOU, WINED3DSIH_GE, WINED3DSIH_IADD, WINED3DSIH_IEQ,

1 0

Józef Kucia : wined3d: Recognize SM4 ilt opcode.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: 893619dfcd16d05981c8b5b836a3482fb960cc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=893619dfcd16d05981c8b5b83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:21 2016 +0100 wined3d: Recognize SM4 ilt opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6b67c7d..e54fc24 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5258,6 +5258,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_ILT */ NULL, /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a18e7a8..fa02ed8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7906,6 +7906,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, + /* WINED3DSIH_ILT */ NULL, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d63a377..d3482fc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", + /* WINED3DSIH_ILT */ "ilt", /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c1f20b0..acc1b4b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -99,6 +99,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, + WINED3D_SM4_OP_ILT = 0x22, WINED3D_SM4_OP_IMAX = 0x24, WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, @@ -271,6 +272,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "U"}, {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, + {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "U", "II"}, {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86f4123..d603898 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -501,6 +501,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IF, WINED3DSIH_IFC, WINED3DSIH_IGE, + WINED3DSIH_ILT, WINED3DSIH_IMAX, WINED3DSIH_IMIN, WINED3DSIH_IMUL,

1 0

Józef Kucia : wined3d: Recognize SM4 imad opcode.
by Alexandre Julliard 12 Jan '16

12 Jan '16

Module: wine Branch: master Commit: c0055712383dd83003ce65ef6f5925a98af4be70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0055712383dd83003ce65ef6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:22 2016 +0100 wined3d: Recognize SM4 imad opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e54fc24..5aa5669 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5259,6 +5259,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_ILT */ NULL, + /* WINED3DSIH_IMAD */ NULL, /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa02ed8..218585c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7907,6 +7907,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_ILT */ NULL, + /* WINED3DSIH_IMAD */ NULL, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d3482fc..ef6b141 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -87,6 +87,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_ILT */ "ilt", + /* WINED3DSIH_IMAD */ "imad", /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index acc1b4b..91db7da 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -100,6 +100,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_ILT = 0x22, + WINED3D_SM4_OP_IMAD = 0x23, WINED3D_SM4_OP_IMAX = 0x24, WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, @@ -273,6 +274,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "U", "II"}, + {WINED3D_SM4_OP_IMAD, WINED3DSIH_IMAD, "I", "II"}, {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d603898..8274a98 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -502,6 +502,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IFC, WINED3DSIH_IGE, WINED3DSIH_ILT, + WINED3DSIH_IMAD, WINED3DSIH_IMAX, WINED3DSIH_IMIN, WINED3DSIH_IMUL,

1 0