wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_texture().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: d71699141b5d53e4bc49fa4ba56785a850417f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71699141b5d53e4bc49fa4ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:29 2016 +0100 wined3d: Get resource info from the texture in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f423bf..a7394f8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3058,9 +3058,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, unsigned int width, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; const RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = surface->resource.device; - const struct wined3d_color_key_conversion *conversion; struct wined3d_texture *texture = surface->container; + struct wined3d_device *device = texture->resource.device; + const struct wined3d_color_key_conversion *conversion; struct wined3d_bo_address data; struct wined3d_format format; POINT dst_point = {0, 0}; @@ -3076,10 +3076,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) - && (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) + && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format, + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -3092,10 +3092,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) - && (!srgb || (surface->container->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) + && (!srgb || (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, - NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format, + NULL, texture->resource.usage, texture->resource.pool, texture->resource.format)) { DWORD src_location = surface->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_drawable().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: fad52d785976c06f3577375905d867a1f9fa1b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad52d785976c06f357737590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:28 2016 +0100 wined3d: Get resource info from the texture in surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b4e667f..2f423bf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3034,10 +3034,11 @@ static void surface_load_sysmem(struct wined3d_surface *surface, static HRESULT surface_load_drawable(struct wined3d_surface *surface, struct wined3d_context *context) { + struct wined3d_texture *texture = surface->container; RECT r; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && wined3d_resource_is_offscreen(&surface->container->resource)) + && wined3d_resource_is_offscreen(&texture->resource)) { ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); return WINED3DERR_INVALIDCALL; @@ -3045,7 +3046,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, surface_get_rect(surface, NULL, &r); surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); - surface_blt_to_drawable(surface->resource.device, context, + surface_blt_to_drawable(texture->resource.device, context, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_copy_simple_location().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 484f5f1ec5caa8e38ee5e6f721a25c7afbc58f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484f5f1ec5caa8e38ee5e6f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:27 2016 +0100 wined3d: Get resource info from the texture in surface_copy_simple_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4f1c379..b4e667f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2956,7 +2956,7 @@ static DWORD resource_access_from_location(DWORD location) static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_device *device = surface->container->resource.device; struct wined3d_context *context; const struct wined3d_gl_info *gl_info; struct wined3d_bo_address dst, src;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_ds_location().
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 5bf5bc2784254db16f55a347c9fd56456fa8728f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf5bc2784254db16f55a347c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:26 2016 +0100 wined3d: Get resource info from the texture in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ceea4fe..4f1c379 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2798,8 +2798,9 @@ void surface_modify_ds_location(struct wined3d_surface *surface, /* Context activation is done by the caller. */ static void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { + struct wined3d_texture *texture = surface->container; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = surface->resource.device; GLsizei w, h; TRACE("surface %p, context %p, new location %#x.\n", surface, context, location); @@ -2896,7 +2897,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)), NULL, WINED3D_LOCATION_DRAWABLE); - surface_depth_blt(surface, context, surface->container->texture_rgb.name, + surface_depth_blt(surface, context, texture->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target); checkGLcall("depth_blt");

1 0

Matteo Bruni : wined3d: Emulate luminance texture formats on core profile.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 565ef4f961a8ebec7bb3cf7bd8802f3c0902ec43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565ef4f961a8ebec7bb3cf7bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:08 2016 +0100 wined3d: Emulate luminance texture formats on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 81 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=565ef4f961a8ebec7bb3c…

1 0

Nikolay Sivov : xmllite/writer: Make it possible to use WriteRaw() multiple times.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 4dcbf2b4b235384d860a3ebdd88f182a46dc5a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcbf2b4b235384d860a3ebdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 10:41:26 2016 +0300 xmllite/writer: Make it possible to use WriteRaw() multiple times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 15 ++++++++++++++- dlls/xmllite/writer.c | 18 +++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7a958b3..b4d7102 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -863,6 +863,7 @@ static void test_WriteCData(void) static void test_WriteRaw(void) { static const WCHAR rawW[] = {'a','<',':',0}; + static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -884,6 +885,18 @@ static void test_WriteRaw(void) hr = IXmlWriter_WriteRaw(writer, rawW); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteRaw(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteRaw(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); @@ -899,7 +912,7 @@ static void test_WriteRaw(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:"); + CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:a<:a<:<a>a</a>"); IXmlWriter_Release(writer); IStream_Release(stream); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 61190c6..65d0bcc 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -767,10 +767,13 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr case XmlWriterState_ElemStarted: writer_close_starttag(This); break; - case XmlWriterState_DocClosed: - return WR_E_INVALIDACTION; + case XmlWriterState_Ready: + case XmlWriterState_DocStarted: + case XmlWriterState_PIDocStarted: + break; default: - ; + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; } write_encoding_bom(This); @@ -1043,11 +1046,11 @@ static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data) case XmlWriterState_PIDocStarted: break; default: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; } write_output_buffer(This->output, data, -1); - This->state = XmlWriterState_DocClosed; return S_OK; } @@ -1086,6 +1089,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal case XmlWriterState_Ready: break; default: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; } @@ -1099,6 +1103,9 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); + if (!local_name) + return E_INVALIDARG; + switch (This->state) { case XmlWriterState_Initial: @@ -1109,9 +1116,6 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre ; } - if (!local_name) - return E_INVALIDARG; - /* close pending element */ if (This->starttagopen) write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW));

1 0

Matteo Bruni : d3d10core/tests: Add a test for DXGI_FORMAT_A8_UNORM textures.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: b2dcc1007a4bbcee2fd8016d75f749f5108bc4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2dcc1007a4bbcee2fd8016d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:12 2016 +0100 d3d10core/tests: Add a test for DXGI_FORMAT_A8_UNORM textures. Signed-off-by: Matteo Bruni <mbruni(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 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ba6f22e..dd63a64 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3790,6 +3790,13 @@ static void test_texture(void) 0xffb1c4de, 0xfff0f1f2, 0xfffafdfe, 0xff5a560f, 0xffd5ff00, 0xffc8f99f, 0xffaa00aa, 0xffdd55bb, }; + static const BYTE a8_data[] = + { + 0x00, 0x10, 0x20, 0x30, + 0x40, 0x50, 0x60, 0x70, + 0x80, 0x90, 0xa0, 0xb0, + 0xc0, 0xd0, 0xe0, 0xf0, + }; static const BYTE bc1_data[] = { 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, @@ -3836,6 +3843,8 @@ static void test_texture(void) }; static const struct texture srgb_texture = {4, 4, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture a8_texture = {4, 4, 1, DXGI_FORMAT_A8_UNORM, + {{a8_data, 4 * sizeof(*a8_data)}}}; static const struct texture bc1_texture = {8, 8, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; @@ -3876,6 +3885,13 @@ static void test_texture(void) 0xff708cba, 0xffdee0e2, 0xfff3fbfd, 0xff1a1801, 0xffa9ff00, 0xff93f159, 0xff670067, 0xffb8177f, }; + static const DWORD a8_colors[] = + { + 0x00000000, 0x10000000, 0x20000000, 0x30000000, + 0x40000000, 0x50000000, 0x60000000, 0x70000000, + 0x80000000, 0x90000000, 0xa0000000, 0xb0000000, + 0xc0000000, 0xd0000000, 0xe0000000, 0xf0000000, + }; static const DWORD bc_colors[] = { 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xff00ff00, @@ -3948,6 +3964,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, + {&ps_sample, &a8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 8.0f, level_1_colors}, @@ -4101,9 +4118,9 @@ static void test_texture(void) draw_quad(&test_context); get_texture_readback(test_context.backbuffer, &rb); - for (x = 0; x < 4; ++x) + for (y = 0; y < 4; ++y) { - for (y = 0; y < 4; ++y) + for (x = 0; x < 4; ++x) { color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); ok(compare_color(color, test->expected_colors[y * 4 + x], 1),

1 0

Jacek Caban : jscript: Added a few more arguments tests.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 47cf3fe36d4f5a2f83c0d48ee763c256cd6010c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47cf3fe36d4f5a2f83c0d48ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 24 16:39:23 2016 +0100 jscript: Added a few more arguments tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 3e60aba..5b1b510 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -194,6 +194,20 @@ ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.argu testRecFunc(true); ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.arguments); +function argumentsTest() { + var save = arguments; + with({arguments: 1}) { + ok(arguments === 1, "arguments = " + arguments); + (function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + })(); + } + eval('ok(arguments === save, "unexpected arguments");'); + [1,2].sort(function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + }); +} + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;");

1 0

Jacek Caban : jscript: Removed no longer used argument from exec_source.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 061592a205b031b41aca7404e54f87965ef72d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061592a205b031b41aca7404e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 24 14:28:08 2016 +0100 jscript: Removed no longer used argument from exec_source. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 687b06c..214d8fe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2543,7 +2543,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BOOL from_eval, jsval_t *ret) +HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) { exec_ctx_t *prev_ctx; jsval_t val; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dd8ed4c..3943c9a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -218,5 +218,5 @@ static inline void exec_addref(exec_ctx_t *ctx) void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,BOOL,jsval_t*) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index dcddf59..0d30fdb 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,7 +247,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, FALSE, r); + hres = exec_source(exec_ctx, function->code, function->func_code, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 03a26302..0755844 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -222,7 +222,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->exec_ctx, code, &code->global_code, TRUE, r); + hres = exec_source(ctx->exec_ctx, code, &code->global_code, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9519479..b1d4472 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -110,7 +110,7 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, FALSE, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -781,7 +781,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); + hres = exec_source(exec_ctx, code, &code->global_code, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Paul Gofman : d3d9/tests: Add test for D3DFMT_L8 format as render target.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 1d94ec8581e1c7bda66cc1e6c4d8cd88f9854651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d94ec8581e1c7bda66cc1e6c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 23 19:39:59 2016 +0300 d3d9/tests: Add test for D3DFMT_L8 format as render target. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f531dc5..0d7e987 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11272,13 +11272,14 @@ static void pixelshader_blending_test(void) } test_formats[] = { - {"D3DFMT_G16R16", D3DFMT_G16R16, 0x001818ff, 0x002010ff}, + {"D3DFMT_G16R16", D3DFMT_G16R16, 0x001820ff, 0x002010ff}, {"D3DFMT_R16F", D3DFMT_R16F, 0x0018ffff, 0x0020ffff}, - {"D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001818ff, 0x002010ff}, - {"D3DFMT_A16B16G16R16F", D3DFMT_A16B16G16R16F, 0x00181800, 0x00201000}, + {"D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001820ff, 0x002010ff}, + {"D3DFMT_A16B16G16R16F", D3DFMT_A16B16G16R16F, 0x00182000, 0x00201000}, {"D3DFMT_R32F", D3DFMT_R32F, 0x0018ffff, 0x0020ffff}, - {"D3DFMT_G32R32F", D3DFMT_G32R32F, 0x001818ff, 0x002010ff}, - {"D3DFMT_A32B32G32R32F", D3DFMT_A32B32G32R32F, 0x00181800, 0x00201000}, + {"D3DFMT_G32R32F", D3DFMT_G32R32F, 0x001820ff, 0x002010ff}, + {"D3DFMT_A32B32G32R32F", D3DFMT_A32B32G32R32F, 0x00182000, 0x00201000}, + {"D3DFMT_L8", D3DFMT_L8, 0x00181818, 0x00202020}, }; static const float quad[][5] = { @@ -11292,15 +11293,13 @@ static void pixelshader_blending_test(void) struct vec3 position; DWORD diffuse; } - /* Quad with R=0x10, G=0x20 */ quad1[] = { - {{-1.0f, -1.0f, 0.1f}, 0x80102000}, - {{-1.0f, 1.0f, 0.1f}, 0x80102000}, - {{ 1.0f, -1.0f, 0.1f}, 0x80102000}, - {{ 1.0f, 1.0f, 0.1f}, 0x80102000}, + {{-1.0f, -1.0f, 0.1f}, 0x80103000}, + {{-1.0f, 1.0f, 0.1f}, 0x80103000}, + {{ 1.0f, -1.0f, 0.1f}, 0x80103000}, + {{ 1.0f, 1.0f, 0.1f}, 0x80103000}, }, - /* Quad with R=0x20, G=0x10 */ quad2[] = { {{-1.0f, -1.0f, 0.1f}, 0x80201000},

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016