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

Jacek Caban : jscript: Create scope in setup_scope.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 403fb41cd136d02f304dc3fc570f23f7cf2a953e URL: http://source.winehq.org/git/wine.git/?a=commit;h=403fb41cd136d02f304dc3fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 17:15:06 2016 +0200 jscript: Create scope in setup_scope. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 33 ++++++++++++++++++++------------- dlls/jscript/function.c | 12 +++--------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index afa2b4b..871017c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2775,9 +2775,10 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc, jsval_t *argv) +static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t *scope_chain, jsdisp_t *variable_object, unsigned argc, jsval_t *argv) { const unsigned orig_stack = ctx->stack_top; + scope_chain_t *scope; unsigned i; jsval_t v; HRESULT hres; @@ -2822,14 +2823,21 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc frame->pop_variables = i; + hres = scope_push(scope_chain, variable_object, to_disp(variable_object), &scope); + if(FAILED(hres)) { + stack_popn(ctx, ctx->stack_top - orig_stack); + return hres; + } + for(i = 0; i < frame->function->func_cnt; i++) { if(frame->function->funcs[i].name && !frame->function->funcs[i].event_target) { jsdisp_t *func_obj; unsigned off; - hres = create_source_function(ctx, frame->bytecode, frame->function->funcs+i, frame->base_scope, &func_obj); + hres = create_source_function(ctx, frame->bytecode, frame->function->funcs+i, scope, &func_obj); if(FAILED(hres)) { stack_popn(ctx, ctx->stack_top - orig_stack); + scope_release(scope); return hres; } @@ -2839,7 +2847,8 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc } } - frame->base_scope->frame = frame; + scope->frame = frame; + frame->base_scope = frame->scope = scope; return S_OK; } @@ -2915,17 +2924,15 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->argc = argc; frame->bytecode = bytecode_addref(bytecode); - if(scope) { - frame->base_scope = frame->scope = scope_addref(scope); - - if(!(flags & (EXEC_GLOBAL|EXEC_EVAL))) { - hres = setup_scope(ctx, frame, argc, argv); - if(FAILED(hres)) { - release_bytecode(frame->bytecode); - heap_free(frame); - return hres; - } + if(!(flags & (EXEC_GLOBAL|EXEC_EVAL))) { + hres = setup_scope(ctx, frame, scope, variable_obj, argc, argv); + if(FAILED(hres)) { + release_bytecode(frame->bytecode); + heap_free(frame); + return hres; } + }else if(scope) { + frame->base_scope = frame->scope = scope_addref(scope); } frame->ip = function->instr_off; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 704d2ef..03d5cad 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -233,7 +233,6 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis BOOL is_constructor, BOOL caller_execs_source, jsval_t *r) { jsdisp_t *var_disp; - scope_chain_t *scope; DWORD exec_flags = 0; HRESULT hres; @@ -251,19 +250,14 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis if(FAILED(hres)) return hres; - hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); - jsdisp_release(var_disp); - if(FAILED(hres)) - return hres; - if(caller_execs_source) exec_flags |= EXEC_RETURN_TO_INTERP; if(is_constructor) exec_flags |= EXEC_CONSTRUCTOR; - hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, - &function->dispex, scope->jsobj, argc, argv, r); + hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, + &function->dispex, var_disp, argc, argv, r); - scope_release(scope); + jsdisp_release(var_disp); return hres; }

1 0

Michael Stefaniuc : dinput8/tests: Make use of todo_wine_if().
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 12f8274539f8674f83b65232afd6668a257ae4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f8274539f8674f83b65232a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 15:59:55 2016 +0200 dinput8/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/dinput.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index c3f80c6..0984767 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -99,12 +99,7 @@ static void test_preinitialization(void) enum_devices_tests[i].lpCallback, NULL, enum_devices_tests[i].dwFlags); - if (enum_devices_tests[i].todo) - { - todo_wine - ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput8_EnumDevice returned 0x%08x\n", i, hr); - } - else + todo_wine_if(enum_devices_tests[i].todo) ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput8_EnumDevice returned 0x%08x\n", i, hr); }

1 0

Michael Stefaniuc : oleaut32/tests: Use todo_wine_if() instead of ifdef constructs.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 9d74567ad30d741073461904479c08579ad8e196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d74567ad30d7410734619044… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 00:06:16 2016 +0200 oleaut32/tests: Use todo_wine_if() instead of ifdef constructs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 90 ++++++++----------------------------------- 1 file changed, 15 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d74567ad30d741073461…

1 0

Henri Verbeet : wined3d: Evict managed resources through the command stream.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: cac28d32fc1c83c0a942786e84f95c31ea675add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac28d32fc1c83c0a942786e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:01 2016 +0200 wined3d: Evict managed resources through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ff2fff5..0d5c151 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -55,6 +55,7 @@ enum wined3d_cs_op WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, WINED3D_CS_OP_QUERY_ISSUE, + WINED3D_CS_OP_UNLOAD_RESOURCE, }; struct wined3d_cs_present @@ -275,6 +276,12 @@ struct wined3d_cs_query_issue DWORD flags; }; +struct wined3d_cs_unload_resource +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1243,6 +1250,25 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu cs->ops->submit(cs); } +static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_unload_resource *op = data; + struct wined3d_resource *resource = op->resource; + + resource->resource_ops->resource_unload(resource); +} + +void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) +{ + struct wined3d_cs_unload_resource *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; + op->resource = resource; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1274,6 +1300,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, + /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a633a2d..74a07ec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4544,7 +4544,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); - resource->resource_ops->resource_unload(resource); + wined3d_cs_emit_unload_resource(device->cs, resource); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f300e4b..01af06f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3090,6 +3090,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; +void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)

1 0

Henri Verbeet : wined3d: Invalidate STATE_STREAMSRC in buffer_unload() if needed.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 0072830804e844de3b06bb25e3c4b68b7db52c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0072830804e844de3b06bb25e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:00 2016 +0200 wined3d: Invalidate STATE_STREAMSRC in buffer_unload() if needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 ++++++++---------- dlls/wined3d/device.c | 3 --- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9e0892e..d51d0e8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -538,6 +538,14 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->stride = 0; buffer->conversion_stride = 0; buffer->flags &= ~WINED3D_BUFFER_HASDESC; + + /* The stream source state handler might have read the memory of the + * vertex buffer already and got the memory in the vbo which is not + * valid any longer. Dirtify the stream source to force a reload. This + * happens only once per changed vertexbuffer and should occur rather + * rarely. */ + if (resource->bind_count) + device_invalidate_state(device, STATE_STREAMSRC); } resource_unload(resource); @@ -545,18 +553,8 @@ static void buffer_unload(struct wined3d_resource *resource) static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) { - struct wined3d_device *device = buffer->resource.device; - buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - - /* The stream source state handler might have read the memory of - * the vertex buffer already and got the memory in the vbo which - * is not valid any longer. Dirtify the stream source to force a - * reload. This happens only once per changed vertexbuffer and - * should occur rather rarely. */ - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); } static void wined3d_buffer_destroy_object(void *object) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1bafd5e..a633a2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4547,9 +4547,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) resource->resource_ops->resource_unload(resource); } } - - /* Invalidate stream sources, the buffer(s) may have been evicted. */ - device_invalidate_state(device, STATE_STREAMSRC); } static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain)

1 0

Matteo Bruni : d3dx9/tests: Add a test for texture shaders.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: a7a89b8b003ae7c642ca30b6ec6ed120494e2e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a89b8b003ae7c642ca30b6e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 5 20:56:35 2016 +0200 d3dx9/tests: Add a test for texture shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 242 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 87d13d2..011f756 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -116,6 +116,22 @@ static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, got->x, got->y, got->z, got->w); } +static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) +{ + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + return TRUE; +} + static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1991,6 +2007,230 @@ static void test_D3DXSaveTextureToFileInMemory(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(volume_texture); } +void test_texture_shader(void) +{ + static const DWORD shader_zero[] = {0x0}; + static const DWORD shader_invalid[] = {0xeeee0100}; + static const DWORD shader_empty[] = {0xfffe0200, 0x0000ffff}; +#if 0 +float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR +{ + return float4(pos, 1.0); +} +#endif + static const DWORD shader_code[] = + { + 0x54580100, 0x0015fffe, 0x42415443, 0x0000001c, 0x0000001f, 0x54580100, 0x00000000, 0x00000000, + 0x00000100, 0x0000001c, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x000afffe, + 0x54494c43, 0x00000004, 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0014fffe, 0x434c5846, 0x00000002, 0x10000003, 0x00000001, 0x00000000, + 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x10000001, 0x00000001, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, + }; + IDirect3DVolumeTexture9 *volume_texture; + IDirect3DCubeTexture9 *cube_texture; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + ID3DXTextureShader *tx; + unsigned int x, y, z; + ID3DXBuffer *buffer; + unsigned int *data; + D3DLOCKED_RECT lr; + D3DLOCKED_BOX lb; + IDirect3D9 *d3d; + D3DCAPS9 caps; + HRESULT hr; + HWND wnd; + + hr = D3DXCreateTextureShader(NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(NULL, &tx); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_invalid, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_zero, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_empty, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_code, &tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetFunction(tx, &buffer); + todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + if (FAILED(hr)) + { + skip("Texture shaders not supported, skipping further tests.\n"); + IUnknown_Release(tx); + return; + } + ID3DXBuffer_Release(buffer); + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window.\n"); + IUnknown_Release(tx); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object.\n"); + DestroyWindow(wnd); + IUnknown_Release(tx); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + IUnknown_Release(tx); + return; + } + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, + &texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillTextureTX(texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lr.pBits; + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + unsigned int expected = 0xff000000 | x << 16 | y << 8; + /* The third position coordinate is apparently undefined for 2D textures. */ + unsigned int color = data[y * lr.Pitch / sizeof(*data) + x] & 0xffffff00; + + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u).\n", color, x, y); + } + } + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + + IDirect3DTexture9_Release(texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Cube textures not supported, skipping tests.\n"); + goto cleanup; + } + + hr = IDirect3DDevice9_CreateCubeTexture(device, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, + &cube_texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillCubeTextureTX(cube_texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + for (z = 0; z < 6; ++z) + { + static const char * const mapping[6][3] = + { + {"-x", "-y", "1"}, + {"+x", "-y", "0"}, + {"+y", "1", "+x"}, + {"-y", "0", "+x"}, + {"1", "-y", "+x"}, + {"0", "-y", "-x"}, + }; + + hr = IDirect3DCubeTexture9_LockRect(cube_texture, z, 0, &lr, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lr.pBits; + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + unsigned int color = data[y * lr.Pitch / sizeof(*data) + x]; + unsigned int expected = 0xff000000; + unsigned int i; + + for (i = 0; i < 3; ++i) + { + int component; + + if (mapping[z][i][0] == '0') + component = 0; + else if (mapping[z][i][0] == '1') + component = 255; + else + component = mapping[z][i][1] == 'x' ? x * 2 - 255 : y * 2 - 255; + if (mapping[z][i][0] == '-') + component = -component; + expected |= max(component, 0) << i * 8; + } + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u, %u).\n", + color, x, y, z); + } + } + hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, z, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + } + + IDirect3DCubeTexture9_Release(cube_texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) || caps.MaxVolumeExtent < 64) + { + skip("Volume textures not supported, skipping test.\n"); + goto cleanup; + } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 64, 64, 64, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillVolumeTextureTX(volume_texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(volume_texture, 0, &lb, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lb.pBits; + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 64; ++y) + { + for (x = 0; x < 64; ++x) + { + unsigned int expected = 0xff000000 | ((x * 4 + 2) << 16) | ((y * 4 + 2) << 8) | (z * 4 + 2); + unsigned int color = data[z * lb.SlicePitch / sizeof(*data) + y * lb.RowPitch / sizeof(*data) + x]; + + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u, %u).\n", + color, x, y, z); + } + } + } + hr = IDirect3DVolumeTexture9_UnlockBox(volume_texture, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(volume_texture); + + cleanup: + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + IUnknown_Release(tx); +} + START_TEST(texture) { HWND wnd; @@ -2053,4 +2293,6 @@ START_TEST(texture) IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd); + + test_texture_shader(); }

1 0

Matteo Bruni : d3dx11: Use debugstr_a() to trace a user-supplied string.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 285981e3efaaaa5e61e590657c4424e5184f709b URL: http://source.winehq.org/git/wine.git/?a=commit;h=285981e3efaaaa5e61e590657… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 5 20:56:31 2016 +0200 d3dx11: Use debugstr_a() to trace a user-supplied string. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index b5a6ded..2c17ffb 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -32,7 +32,7 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", - debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point, + debugstr_a(data), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); if (pump)

1 0

Jacek Caban : jscript/tests: Added more tests.
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: afc63fd570e889594a331ff2d8eeafd758b9f17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc63fd570e889594a331ff2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 17:15:20 2016 +0200 jscript/tests: Added more tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4990826..c179265 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -269,6 +269,24 @@ testNoRes(); testRes() && testRes(); testNoRes(), testNoRes(); +(function() { + eval("var x=1;"); + ok(x === 1, "x = " + x); +})(); + +(function() { + var e = eval; + var r = e(1); + ok(r === 1, "r = " + r); + (function(x, a) { x(a); })(eval, "2"); +})(); + +(function(r) { + r = eval("1"); + ok(r === 1, "r = " + r); + (function(x, a) { x(a); })(eval, "2"); +})(); + tmp = (function(){ return testNoRes(), testRes();})(); var f1, f2; @@ -384,6 +402,20 @@ ok(typeof(obj2) === "object", "typeof(obj2) = " + typeof(obj2)); var obj3 = new Object; ok(typeof(obj3) === "object", "typeof(obj3) is not object"); +(function() { + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); + function func() {} + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); + func = 0; + ok(typeof(func) === "number", "typeof(func) = " + typeof(func)); +})(); + +(function(f) { + ok(typeof(f) === "function", "typeof(f) = " + typeof(f)); + function f() {}; + ok(typeof(f) === "function", "typeof(f) = " + typeof(f)); +})(1); + for(var iter in "test") ok(false, "unexpected forin call, test = " + iter); @@ -1286,6 +1318,38 @@ try { ok(false, "deleteTest not throwed exception?"); }catch(ex) {} +(function() { + var to_delete = 2; + var r = delete to_delete; + ok(r === false, "delete 1 returned " + r); + if(r) + return; + ok(to_delete === 2, "to_delete = " + to_delete); + + to_delete = new Object(); + r = delete to_delete; + ok(r === false, "delete 2 returned " + r); + ok(typeof(to_delete) === "object", "typeof(to_delete) = " + typeof(to_delete)); +})(); + +(function(to_delete) { + var r = delete to_delete; + ok(r === false, "delete 3 returned " + r); + ok(to_delete === 2, "to_delete = " + to_delete); + + to_delete = new Object(); + r = delete to_delete; + ok(r === false, "delete 4 returned " + r); + ok(typeof(to_delete) === "object", "typeof(to_delete) = " + typeof(to_delete)); +})(2); + +(function() { + with({to_delete: new Object()}) { + var r = delete to_delete; + ok(r === true, "delete returned " + r); + } +})(); + if (false) if (true) ok(false, "if evaluated"); @@ -1533,6 +1597,24 @@ tmp = (function() { })(); ok(tmp, "tmp = " + tmp); +(function() { + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); + with(new Object()) { + var x = false && function func() {}; + } + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); +})(); + +(function() { + ok(x === undefined, "x = " + x); // x is declared, but never initialized + with({x: 1}) { + ok(x === 1, "x = " + x); + var x = 2; + ok(x === 2, "x = " + x); + } + ok(x === undefined, "x = " + x); +})(); + /* NoNewline rule parser tests */ while(true) { if(true) break

1 0

Michael Stefaniuc : gdi32/tests: Make use of todo_wine_if().
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 68f1df237a73559a4fdd6babae16706873f1dc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f1df237a73559a4fdd6baba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 16:00:51 2016 +0200 gdi32/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 373d2a1..96c4623 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2952,13 +2952,8 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(!efd.total, "no fonts should be enumerated for empty font_name\n"); for (i = 0; i < efd.total; i++) { -/* FIXME: remove completely once Wine is fixed */ -if (efd.lf[i].lfCharSet != font_charset) -{ -todo_wine - ok(efd.lf[i].lfCharSet == font_charset, "%d: got charset %d\n", i, efd.lf[i].lfCharSet); -} -else + /* FIXME: remove completely once Wine is fixed */ + todo_wine_if(efd.lf[i].lfCharSet != font_charset) ok(efd.lf[i].lfCharSet == font_charset, "%d: got charset %d\n", i, efd.lf[i].lfCharSet); ok(!strcmp(efd.lf[i].lfFaceName, font_name), "expected %s, got %s\n", font_name, efd.lf[i].lfFaceName);

1 0

Nikolay Sivov : d3dx9: Remove dead assignment (Coverity).
by Alexandre Julliard Aug. 5, 2016

Aug. 5, 2016

Module: wine Branch: master Commit: 29fee71f1d0e26680c858dc44ce42885f4e3cd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fee71f1d0e26680c858dc44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 09:17:16 2016 +0300 d3dx9: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 3204ea7..c26aa72 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5662,7 +5662,6 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da pt->corner = POINTTYPE_CURVE_END; } outline->count--; - lastpt = &outline->items[outline->count - 1]; } else { /* outline closed with a line from end to start point */ attempt_line_merge(outline, outline->count - 1, &pt->pos, FALSE, cos_table);

1 0