wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Alexandre Julliard : makefiles: Always expand the library name for cross-compiled import libraries.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: ffd2e484ba744c8a9ae8611bae6d613eabcf2342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd2e484ba744c8a9ae8611ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 26 14:57:39 2016 +0900 makefiles: Always expand the library name for cross-compiled import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7f81208..98645db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2001,13 +2001,11 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (submake->importlib && !strcmp( submake->importlib, name )) { - const char *dir = top_obj_dir_path( make, submake->base_dir ); - const char *ext = cross ? "cross.a" : *dll_ext ? "def" : "a"; - - if (!cross && submake->staticimplib) - lib = base_dir_path( submake, submake->staticimplib ); + if (cross || !*dll_ext || submake->staticimplib) + lib = base_dir_path( submake, strmake( "lib%s.a", name )); else - strarray_add( deps, strmake( "%s/lib%s.%s", dir, name, ext )); + strarray_add( deps, top_obj_dir_path( make, + strmake( "%s/lib%s.def", submake->base_dir, name ))); break; } @@ -2016,6 +2014,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (lib) { + if (cross) lib = replace_extension( lib, ".a", ".cross.a" ); lib = top_obj_dir_path( make, lib ); strarray_add( deps, lib ); strarray_add( &ret, lib );

1 0

Kerstin Noa : wined3d: Add NVIDIA GeForce GTX 980 GPU information.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 058783b8b494cf6c4df84a6130f70431b4371e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=058783b8b494cf6c4df84a613… Author: Kerstin Noa <ker.noa(a)posteo.de> Date: Fri Mar 25 17:52:31 2016 +0100 wined3d: Add NVIDIA GeForce GTX 980 GPU information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6bf1247..f14eaaf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1289,6 +1289,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960M, "NVIDIA GeForce GTX 960M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1737,6 +1738,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7b7b65b..242268d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1720,9 +1720,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401, - CARD_NVIDIA_GEFORCE_GTX960M = 0x139B, + CARD_NVIDIA_GEFORCE_GTX960M = 0x139b, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, + CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Stefan Dösinger : wined3d: Avoid storing rectangle pointers in struct wined3d_cs_present.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 08158f7e121bf90e4a49e8ab3bcad57cb844bc41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08158f7e121bf90e4a49e8ab3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 25 17:52:30 2016 +0100 wined3d: Avoid storing rectangle pointers in struct wined3d_cs_present. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 91e1759..3692c6b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -59,8 +59,8 @@ struct wined3d_cs_present enum wined3d_cs_op opcode; HWND dst_window_override; struct wined3d_swapchain *swapchain; - const RECT *src_rect; - const RECT *dst_rect; + RECT src_rect; + RECT dst_rect; DWORD flags; }; @@ -258,7 +258,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); - swapchain->swapchain_ops->swapchain_present(swapchain, op->src_rect, op->dst_rect, op->flags); + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); } void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, @@ -270,8 +270,8 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw op->opcode = WINED3D_CS_OP_PRESENT; op->dst_window_override = dst_window_override; op->swapchain = swapchain; - op->src_rect = src_rect; - op->dst_rect = dst_rect; + op->src_rect = *src_rect; + op->dst_rect = *dst_rect; op->flags = flags; cs->ops->submit(cs);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_swapchain_get_front_buffer_data().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: a36c7e6bdad29976d7b81bada73a5fc4a820c7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36c7e6bdad29976d7b81bada… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:29 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_swapchain_get_front_buffer_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c2883bb..1b6d2e5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -172,19 +172,11 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_texture *dst_texture, unsigned int sub_resource_idx) { - struct wined3d_surface *src_surface, *dst_surface; - struct wined3d_resource *sub_resource; RECT src_rect, dst_rect; TRACE("swapchain %p, dst_texture %p, sub_resource_idx %u.\n", swapchain, dst_texture, sub_resource_idx); - if (!(sub_resource = wined3d_texture_get_sub_resource(dst_texture, sub_resource_idx)) || - sub_resource->type != WINED3D_RTYPE_SURFACE) - return WINED3DERR_INVALIDCALL; - - dst_surface = surface_from_resource(sub_resource); - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + SetRect(&src_rect, 0, 0, swapchain->front_buffer->resource.width, swapchain->front_buffer->resource.height); dst_rect = src_rect; if (swapchain->desc.windowed) @@ -194,7 +186,8 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc wine_dbgstr_rect(&dst_rect)); } - return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + return wined3d_texture_blt(dst_texture, sub_resource_idx, &dst_rect, + swapchain->front_buffer, 0, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_device_copy_sub_resource_region().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 1c91fd4b388c039431380e92c68bfcbf928ab5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c91fd4b388c039431380e92c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:28 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_device_copy_sub_resource_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e2c6e5d..f91e3f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3915,9 +3915,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) { - struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; - struct wined3d_resource *tmp; RECT dst_rect, src_rect; HRESULT hr; @@ -4003,30 +4001,25 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } dst_texture = wined3d_texture_from_resource(dst_resource); - if (!(tmp = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx))) - { - WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); - return WINED3DERR_INVALIDCALL; - } - dst_surface = surface_from_resource(tmp); - src_texture = wined3d_texture_from_resource(src_resource); - if (!(tmp = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx))) - { - WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx); - return WINED3DERR_INVALIDCALL; - } - src_surface = surface_from_resource(tmp); if (src_box) + { SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); + } else - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + { + unsigned int level = src_sub_resource_idx % src_texture->level_count; + + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, level), + wined3d_texture_get_level_height(src_texture, level)); + } SetRect(&dst_rect, dst_x, dst_y, dst_x + (src_rect.right - src_rect.left), dst_y + (src_rect.bottom - src_rect.top)); - if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) WARN("Failed to blit, hr %#x.\n", hr); return hr;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_device_copy_resource().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: f1985edffa88878ef861545e11e252933c5f496b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1985edffa88878ef861545e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:27 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dbfa86c..e2c6e5d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3825,10 +3825,9 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { - struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; RECT dst_rect, src_rect; - unsigned int i, count; + unsigned int i, j; HRESULT hr; TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); @@ -3892,17 +3891,22 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - count = dst_texture->layer_count * dst_texture->level_count; - for (i = 0; i < count; ++i) + for (i = 0; i < dst_texture->level_count; ++i) { - dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); + SetRect(&dst_rect, 0, 0, + wined3d_texture_get_level_width(dst_texture, i), + wined3d_texture_get_level_height(dst_texture, i)); + SetRect(&src_rect, 0, 0, + wined3d_texture_get_level_width(src_texture, i), + wined3d_texture_get_level_height(dst_texture, i)); + for (j = 0; j < dst_texture->layer_count; ++j) + { + unsigned int idx = j * dst_texture->level_count + i; - SetRect(&dst_rect, 0, 0, dst_surface->resource.width, dst_surface->resource.height); - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); - if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, - src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) - ERR("Failed to blit, sub-resource %u, hr %#x.\n", i, hr); + if (FAILED(hr = wined3d_texture_blt(dst_texture, idx, &dst_rect, + src_texture, idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + ERR("Failed to blit, sub-resource %u, hr %#x.\n", idx, hr); + } } }

1 0

Henri Verbeet : wined3d: Pass a texture instead of a surface to context_generate_rt_mask_no_fbo().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: ee800283faf6f62e9942a4baf1664585da6bc670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee800283faf6f62e9942a4baf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:26 2016 +0100 wined3d: Pass a texture instead of a surface to context_generate_rt_mask_no_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9dbb25d..096cbac 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2443,12 +2443,12 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) } } -static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, const struct wined3d_surface *rt) +static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_texture *rt) { - if (!rt || rt->container->resource.format->id == WINED3DFMT_NULL) + if (!rt || rt->resource.format->id == WINED3DFMT_NULL) return 0; - else if (rt->container->swapchain) - return context_generate_rt_mask_from_resource(&rt->container->resource); + else if (rt->swapchain) + return context_generate_rt_mask_from_resource(&rt->resource); else return context_generate_rt_mask(context_get_offscreen_gl_buffer(context)); } @@ -2482,7 +2482,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } else { - rt_mask = context_generate_rt_mask_no_fbo(context, rt); + rt_mask = context_generate_rt_mask_no_fbo(context, rt->container); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -2572,7 +2572,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win else { rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0]) : NULL); + rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -2587,7 +2587,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win else { rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0]) : NULL); + rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -2637,7 +2637,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])); + return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])->container); else if (!context->render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource);

1 0

Henri Verbeet : wined3d: Replace context_generate_rt_mask_from_surface() with context_generate_rt_mask_from_resource().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: adb495ec374ec53730258eca3b281436a4dc7c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb495ec374ec53730258eca3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:25 2016 +0100 wined3d: Replace context_generate_rt_mask_from_surface() with context_generate_rt_mask_from_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d28ebd3..9dbb25d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -335,9 +335,15 @@ static inline DWORD context_generate_rt_mask(GLenum buffer) return buffer ? (1u << 31) | buffer : 0; } -static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) +static inline DWORD context_generate_rt_mask_from_resource(struct wined3d_resource *resource) { - return (1u << 31) | wined3d_texture_get_gl_buffer(target->container); + if (resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return 0; + } + + return (1u << 31) | wined3d_texture_get_gl_buffer(wined3d_texture_from_resource(resource)); } static inline void context_set_fbo_key_for_surface(const struct wined3d_context *context, @@ -2442,7 +2448,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *conte if (!rt || rt->container->resource.format->id == WINED3DFMT_NULL) return 0; else if (rt->container->swapchain) - return context_generate_rt_mask_from_surface(rt); + return context_generate_rt_mask_from_resource(&rt->container->resource); else return context_generate_rt_mask(context_get_offscreen_gl_buffer(context)); } @@ -2471,7 +2477,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine { context->current_fbo = NULL; context_bind_fbo(context, GL_FRAMEBUFFER, 0); - rt_mask = context_generate_rt_mask_from_surface(rt); + rt_mask = context_generate_rt_mask_from_resource(&rt->container->resource); } } else @@ -2555,7 +2561,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win { context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); - rt_mask = context_generate_rt_mask_from_surface(wined3d_rendertarget_view_get_surface(rts[0])); + rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); } /* If the framebuffer is not the device's fb the device's fb has to be reapplied @@ -2633,7 +2639,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])); else if (!context->render_offscreen) - return context_generate_rt_mask_from_surface(wined3d_rendertarget_view_get_surface(rts[0])); + return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= context->d3d_info->valid_rt_mask;

1 0

Jacek Caban : jscript: Get rid of no longer needed exec_ctx_t.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 32d9c59868423570a2b0d2aaef31fb6e6ba30fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d9c59868423570a2b0d2aae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:50:16 2016 +0100 jscript: Get rid of no longer needed exec_ctx_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 53 +++++++++++-------------------------------------- dlls/jscript/engine.h | 16 +-------------- dlls/jscript/function.c | 16 +++++---------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 33 ++++++++++-------------------- dlls/jscript/jscript.h | 1 - 6 files changed, 29 insertions(+), 92 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 27c8ad7..f6ade36 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -295,33 +295,6 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(script_ctx_t *script_ctx, exec_ctx_t **ret) -{ - exec_ctx_t *ctx; - - ctx = heap_alloc_zero(sizeof(exec_ctx_t)); - if(!ctx) - return E_OUTOFMEMORY; - - ctx->ref = 1; - - script_addref(script_ctx); - ctx->script = script_ctx; - - *ret = ctx; - return S_OK; -} - -void exec_release(exec_ctx_t *ctx) -{ - if(--ctx->ref) - return; - - if(ctx->script) - script_release(ctx->script); - heap_free(ctx); -} - static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, BSTR name_bstr, DWORD flags, DISPID *id) { IDispatchEx *dispex; @@ -2530,7 +2503,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, +static HRESULT setup_call_frame(script_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj) { call_frame_t *frame; @@ -2554,7 +2527,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; frame->ip = function->instr_off; - frame->stack_base = ctx->script->stack_top; + frame->stack_base = ctx->stack_top; frame->ret = jsval_undefined(); if(scope) @@ -2562,23 +2535,21 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ if(this_obj) frame->this_obj = this_obj; - else if(ctx->script->host_global) - frame->this_obj = ctx->script->host_global; + else if(ctx->host_global) + frame->this_obj = ctx->host_global; else - frame->this_obj = to_disp(ctx->script->global); + frame->this_obj = to_disp(ctx->global); IDispatch_AddRef(frame->this_obj); frame->is_global = is_global; frame->variable_obj = jsdisp_addref(variable_obj); - frame->exec_ctx = ctx; - - frame->prev_frame = ctx->script->call_ctx; - ctx->script->call_ctx = frame; + frame->prev_frame = ctx->call_ctx; + ctx->call_ctx = frame; return S_OK; } -HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, +HRESULT exec_source(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj, jsval_t *ret) { jsval_t val; @@ -2591,12 +2562,12 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(!func->funcs[i].name) continue; - hres = create_source_function(ctx->script, code, func->funcs+i, scope, &func_obj); + hres = create_source_function(ctx, code, func->funcs+i, scope, &func_obj); if(FAILED(hres)) return hres; if(func->funcs[i].event_target) - hres = bind_event_target(ctx->script, func->funcs+i, func_obj); + hres = bind_event_target(ctx, func->funcs+i, func_obj); else hres = jsdisp_propput_name(variable_obj, func->funcs[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); @@ -2605,7 +2576,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc } for(i=0; i < func->var_cnt; i++) { - if(!is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { + if(!is_global || !lookup_global_members(ctx, func->variables[i], NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); @@ -2618,7 +2589,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(FAILED(hres)) return hres; - hres = enter_bytecode(ctx->script, func, &val); + hres = enter_bytecode(ctx, func, &val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b7bb1d2..3af3eac 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -208,21 +208,7 @@ typedef struct _call_frame_t { function_code_t *function; struct _call_frame_t *prev_frame; - exec_ctx_t *exec_ctx; } call_frame_t; -struct _exec_ctx_t { - LONG ref; - - script_ctx_t *script; -}; - -static inline void exec_addref(exec_ctx_t *ctx) -{ - ctx->ref++; -} - -void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_exec_ctx(script_ctx_t*,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,BOOL,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT exec_source(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,BOOL,jsdisp_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 84ef469..0a531a5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -206,7 +206,6 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis jsval_t *r) { jsdisp_t *var_disp, *arg_disp; - exec_ctx_t *exec_ctx; scope_chain_t *scope; HRESULT hres; @@ -239,17 +238,12 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, &exec_ctx); - if(SUCCEEDED(hres)) { - jsdisp_t *prev_args; + jsdisp_t *prev_args; - prev_args = function->arguments; - function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, FALSE, var_disp, r); - function->arguments = prev_args; - - exec_release(exec_ctx); - } + prev_args = function->arguments; + function->arguments = arg_disp; + hres = exec_source(ctx, function->code, function->func_code, scope, this_obj, FALSE, var_disp, r); + function->arguments = prev_args; scope_release(scope); } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 3249a02..60a7332 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -223,7 +223,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->call_ctx->exec_ctx, code, &code->global_code, frame->scope, + hres = exec_source(ctx, code, &code->global_code, frame->scope, frame->this_obj, frame->is_global, frame->variable_obj, r); release_bytecode(code); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 2a85dd4..ef176db 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -102,18 +102,12 @@ static inline BOOL is_started(script_ctx_t *ctx) static HRESULT exec_global_code(JScript *This, bytecode_t *code) { - exec_ctx_t *exec_ctx; HRESULT hres; - hres = create_exec_ctx(This->ctx, &exec_ctx); - if(FAILED(hres)) - return hres; - IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, NULL); - exec_release(exec_ctx); + hres = exec_source(This->ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, NULL); IActiveScriptSite_OnLeaveScript(This->site); return hres; @@ -774,26 +768,19 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, return hres; if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { - exec_ctx_t *exec_ctx; - - hres = create_exec_ctx(This->ctx, &exec_ctx); - if(SUCCEEDED(hres)) { - jsval_t r; - - IActiveScriptSite_OnEnterScript(This->site); + jsval_t r; - clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, &r); - if(SUCCEEDED(hres)) { - if(pvarResult) - hres = jsval_to_variant(r, pvarResult); - jsval_release(r); - } - exec_release(exec_ctx); + IActiveScriptSite_OnEnterScript(This->site); - IActiveScriptSite_OnLeaveScript(This->site); + clear_ei(This->ctx); + hres = exec_source(This->ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, &r); + if(SUCCEEDED(hres)) { + if(pvarResult) + hres = jsval_to_variant(r, pvarResult); + jsval_release(r); } + IActiveScriptSite_OnLeaveScript(This->site); return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1c7303e..53272c9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -36,7 +36,6 @@ typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; typedef struct _script_ctx_t script_ctx_t; -typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; typedef struct {

1 0

Jacek Caban : jscript: Store is_global flag in call_frame_t.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 00ce4419b4151297559720911d3095bac1757487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ce4419b4151297559720911… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:50:06 2016 +0100 jscript: Store is_global flag in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 12 ++++++------ dlls/jscript/engine.h | 6 +++--- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0a46b58..27c8ad7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -295,7 +295,7 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(script_ctx_t *script_ctx, BOOL is_global, exec_ctx_t **ret) +HRESULT create_exec_ctx(script_ctx_t *script_ctx, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -304,7 +304,6 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, BOOL is_global, exec_ctx_t **r return E_OUTOFMEMORY; ctx->ref = 1; - ctx->is_global = is_global; script_addref(script_ctx); ctx->script = script_ctx; @@ -2532,7 +2531,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj) + IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj) { call_frame_t *frame; @@ -2569,6 +2568,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->this_obj = to_disp(ctx->script->global); IDispatch_AddRef(frame->this_obj); + frame->is_global = is_global; frame->variable_obj = jsdisp_addref(variable_obj); frame->exec_ctx = ctx; @@ -2579,7 +2579,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ } HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) + IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj, jsval_t *ret) { jsval_t val; unsigned i; @@ -2605,7 +2605,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc } for(i=0; i < func->var_cnt; i++) { - if(!ctx->is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { + if(!is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); @@ -2614,7 +2614,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc } } - hres = setup_call_frame(ctx, code, func, scope, this_obj, variable_obj); + hres = setup_call_frame(ctx, code, func, scope, this_obj, is_global, variable_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8b54bd2..b7bb1d2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -202,6 +202,7 @@ typedef struct _call_frame_t { IDispatch *this_obj; jsdisp_t *variable_obj; + BOOL is_global; bytecode_t *bytecode; function_code_t *function; @@ -214,7 +215,6 @@ struct _exec_ctx_t { LONG ref; script_ctx_t *script; - BOOL is_global; }; static inline void exec_addref(exec_ctx_t *ctx) @@ -223,6 +223,6 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_exec_ctx(script_ctx_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT create_exec_ctx(script_ctx_t*,exec_ctx_t**) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,BOOL,jsdisp_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 8cd363d..84ef469 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -239,13 +239,13 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, FALSE, &exec_ctx); + hres = create_exec_ctx(ctx, &exec_ctx); if(SUCCEEDED(hres)) { jsdisp_t *prev_args; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, var_disp, r); + hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, FALSE, var_disp, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 73bee82..3249a02 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -224,7 +224,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, - frame->this_obj, frame->variable_obj, r); + frame->this_obj, frame->is_global, frame->variable_obj, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 88c1616..2a85dd4 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -105,14 +105,14 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) exec_ctx_t *exec_ctx; HRESULT hres; - hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, &exec_ctx); if(FAILED(hres)) return hres; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -776,14 +776,14 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { exec_ctx_t *exec_ctx; - hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, &exec_ctx); if(SUCCEEDED(hres)) { jsval_t r; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, &r); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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