March 2015 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Fix a typo in a trace in context_create().
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: f298d30b39c78d4b7463a766d4336c92c1d18615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f298d30b39c78d4b7463a766d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 10 19:29:40 2015 +0100 wined3d: Fix a typo in a trace in context_create(). --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fa8d768..af29e69 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1465,7 +1465,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!(hdc = GetDC(swapchain->win_handle))) { - WARN("Failed to retireve device context, trying swapchain backup.\n"); + WARN("Failed to retrieve device context, trying swapchain backup.\n"); if ((hdc = swapchain_get_backup_dc(swapchain))) hdc_is_private = TRUE;

1 0

Stefan Dösinger : d3d8/tests: Add a test for signed formats.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: a46cad41b3be30b6ffd30038a4782b18812c62ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46cad41b3be30b6ffd30038a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:42 2015 +0100 d3d8/tests: Add a test for signed formats. --- dlls/d3d8/tests/visual.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 291 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a46cad41b3be30b6ffd30…

1 0

Stefan Dösinger : ddraw/tests: Add a test for signed formats.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 937522ffd09f6408a98a8647984f0b12ef7ee50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=937522ffd09f6408a98a86479… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:43 2015 +0100 ddraw/tests: Add a test for signed formats. --- dlls/ddraw/tests/ddraw4.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 206 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 436 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=937522ffd09f6408a98a8…

1 0

Stefan Dösinger : ddraw: Set DDPF_BUMPLUMINANCE for V5U5L6 and X8L8V8U8.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: b07b350286ab489c0026163aa92964420cebb994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07b350286ab489c0026163aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:44 2015 +0100 ddraw: Set DDPF_BUMPLUMINANCE for V5U5L6 and X8L8V8U8. --- dlls/ddraw/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index ad271bc..f22db3e 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -310,7 +310,7 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_f break; case WINED3DFMT_R5G5_SNORM_L6_UNORM: - DDPixelFormat->dwFlags = DDPF_BUMPDUDV; + DDPixelFormat->dwFlags = DDPF_BUMPDUDV | DDPF_BUMPLUMINANCE; DDPixelFormat->dwFourCC = 0; DDPixelFormat->u1.dwBumpBitCount = 16; DDPixelFormat->u2.dwBumpDuBitMask = 0x0000001f; @@ -320,7 +320,7 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_f break; case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - DDPixelFormat->dwFlags = DDPF_BUMPDUDV; + DDPixelFormat->dwFlags = DDPF_BUMPDUDV | DDPF_BUMPLUMINANCE; DDPixelFormat->dwFourCC = 0; DDPixelFormat->u1.dwBumpBitCount = 32; DDPixelFormat->u2.dwBumpDuBitMask = 0x000000ff;

1 0

Stefan Dösinger : ddraw: Remove support for V16U16.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 2702f28e669c88a81f6361c9cc4b374114c17f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2702f28e669c88a81f6361c9c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:45 2015 +0100 ddraw: Remove support for V16U16. None of my Windows drivers support this format. At best this will confuse applications trying to pick X8L8V8U8. --- dlls/ddraw/device.c | 1 - dlls/ddraw/utils.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f0dcf16..582a1d4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1066,7 +1066,6 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_R8G8_SNORM, WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, - WINED3DFMT_R16G16_SNORM, WINED3DFMT_R10G11B11_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM }; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index f22db3e..c85abb5 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -299,16 +299,6 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_f DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; break; - case WINED3DFMT_R16G16_SNORM: - DDPixelFormat->dwFlags = DDPF_BUMPDUDV; - DDPixelFormat->dwFourCC = 0; - DDPixelFormat->u1.dwBumpBitCount = 32; - DDPixelFormat->u2.dwBumpDuBitMask = 0x0000ffff; - DDPixelFormat->u3.dwBumpDvBitMask = 0xffff0000; - DDPixelFormat->u4.dwBumpLuminanceBitMask = 0x00000000; - DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; - break; - case WINED3DFMT_R5G5_SNORM_L6_UNORM: DDPixelFormat->dwFlags = DDPF_BUMPDUDV | DDPF_BUMPLUMINANCE; DDPixelFormat->dwFourCC = 0; @@ -551,13 +541,6 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix { return WINED3DFMT_R8G8_SNORM; } - else if ( (DDPixelFormat->u1.dwBumpBitCount == 32 ) && - (DDPixelFormat->u2.dwBumpDuBitMask == 0x0000ffff) && - (DDPixelFormat->u3.dwBumpDvBitMask == 0xffff0000) && - (DDPixelFormat->u4.dwBumpLuminanceBitMask == 0x00000000) ) - { - return WINED3DFMT_R16G16_SNORM; - } else if ( (DDPixelFormat->u1.dwBumpBitCount == 16 ) && (DDPixelFormat->u2.dwBumpDuBitMask == 0x0000001f) && (DDPixelFormat->u3.dwBumpDvBitMask == 0x000003e0) &&

1 0

Stefan Dösinger : wined3d: Initialize WINED3DTA_TEMP.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 406cfefc2f98f8d52efe2d689c9f11564905232d URL: http://source.winehq.org/git/wine.git/?a=commit;h=406cfefc2f98f8d52efe2d689… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:46 2015 +0100 wined3d: Initialize WINED3DTA_TEMP. --- dlls/wined3d/arb_program_shader.c | 3 +++ dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 688bdb7..e7ee1c1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6298,6 +6298,9 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (lowest_disabled_stage < 7 && settings->emul_clipplanes) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); + if (tempreg_used || settings->sRGB_write) + shader_addline(&buffer, "MOV tempreg, 0.0;\n"); + /* Generate texture sampling instructions) */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0804997..0b239f9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5413,7 +5413,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf shader_addline(buffer, "vec4 tmp0, tmp1;\n"); shader_addline(buffer, "vec4 ret;\n"); if (tempreg_used || settings->sRGB_write) - shader_addline(buffer, "vec4 temp_reg;\n"); + shader_addline(buffer, "vec4 temp_reg = vec4(0.0);\n"); shader_addline(buffer, "vec4 arg0, arg1, arg2;\n"); for (stage = 0; stage < MAX_TEXTURES; ++stage)

1 0

Michael Stefaniuc : mshtml/tests: '%' doesn' t needs escaping in a C string (sparse).
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: b211f9123bc0e062ea52f87f7df19bd513ca5e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b211f9123bc0e062ea52f87f7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 11 11:00:10 2015 +0100 mshtml/tests: '%' doesn't needs escaping in a C string (sparse). --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f083bae..fca96a0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7764,8 +7764,8 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_put_search((IUnknown*)elem, "?????word???press"); test_anchor_search((IUnknown*)elem, "?????word???press", FALSE); - test_anchor_put_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD"); /* encoded cjk characters */ - test_anchor_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD", FALSE); + test_anchor_put_search((IUnknown*)elem, "?q=%E4%BD%A0%E5%A5%BD"); /* encoded cjk characters */ + test_anchor_search((IUnknown*)elem, "?q=%E4%BD%A0%E5%A5%BD", FALSE); test_anchor_put_search((IUnknown*)elem, "?how?old=are"); test_anchor_search((IUnknown*)elem, "?how?old=are", FALSE);

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_GetPrivateData().
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: f205b413f4ff17691be9df7b7e64d17378a70408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f205b413f4ff17691be9df7b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:50 2015 +0100 d3d10core: Implement d3d10_sampler_state_GetPrivateData(). --- dlls/d3d10core/state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 90e6938..6d6087d 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -574,10 +574,12 @@ static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState * static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10SamplerState *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture3d_SetPrivateData().
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 721d399038eeb99aaff7f1e84967ae736ca7931e URL: http://source.winehq.org/git/wine.git/?a=commit;h=721d399038eeb99aaff7f1e84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:51 2015 +0100 d3d10core: Implement d3d10_texture3d_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/texture.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 51d021b..266e1bd 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -107,6 +107,7 @@ struct d3d10_texture3d ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE3D_DESC desc; ID3D10Device1 *device; diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 4b32f3d..0ddba7f 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -404,6 +404,9 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *parent) { + struct d3d10_texture3d *texture = parent; + + wined3d_private_store_cleanup(&texture->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -449,10 +452,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, @@ -567,6 +572,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; + wined3d_private_store_init(&texture->private_store); texture->desc = *desc; wined3d_desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; @@ -587,6 +593,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic &d3d10_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); + wined3d_private_store_cleanup(&texture->private_store); return hr; } texture->desc.MipLevels = levels;

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture3d_SetPrivateDataInterface().
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 2d96cefbb7ed3cae0d1beeb5fa7f513cb903b95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d96cefbb7ed3cae0d1beeb5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:52 2015 +0100 d3d10core: Implement d3d10_texture3d_SetPrivateDataInterface(). --- dlls/d3d10core/texture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 0ddba7f..67ccbb5 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -463,9 +463,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&texture->private_store, guid, data); } static void STDMETHODCALLTYPE d3d10_texture3d_GetType(ID3D10Texture3D *iface,

1 0