wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : jscript: Support calling properties with getters.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 29d9659095fd76e303f204050ab4c85d0a0486e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d9659095fd76e303f20405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 31 20:05:26 2021 +0200 jscript: Support calling properties with getters. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 130 ++++++++++++++++++++++++++--------------------- dlls/mshtml/tests/es5.js | 13 +++++ 2 files changed, 85 insertions(+), 58 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a1a1af5a141..973ea4c7142 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -389,64 +389,6 @@ static HRESULT convert_params(const DISPPARAMS *dp, jsval_t *buf, unsigned *argc return S_OK; } -static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, WORD flags, - unsigned argc, jsval_t *argv, jsval_t *r, IServiceProvider *caller) -{ - HRESULT hres; - - switch(prop->type) { - case PROP_BUILTIN: { - if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { - WARN("%s is not a constructor\n", debugstr_w(prop->name)); - return E_INVALIDARG; - } - - if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { - vdisp_t vthis; - - if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - if(jsthis) - set_disp(&vthis, jsthis); - else - set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); - vdisp_release(&vthis); - }else { - /* Function object calls are special case */ - hres = Function_invoke(This, jsthis, flags, argc, argv, r); - } - return hres; - } - case PROP_PROTREF: - return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, - This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); - case PROP_JSVAL: { - if(!is_object_instance(prop->u.val)) { - FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); - return E_FAIL; - } - - TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); - - return disp_call_value(This->ctx, get_object(prop->u.val), - jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, - flags, argc, argv, r); - } - case PROP_ACCESSOR: - FIXME("accessor\n"); - return E_NOTIMPL; - case PROP_IDX: - FIXME("Invoking PROP_IDX not yet supported\n"); - return E_NOTIMPL; - case PROP_DELETED: - assert(0); - } - - assert(0); - return E_FAIL; -} - static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) { jsdisp_t *prop_obj = This; @@ -571,6 +513,78 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return S_OK; } +static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r, IServiceProvider *caller) +{ + HRESULT hres; + + switch(prop->type) { + case PROP_BUILTIN: { + if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { + WARN("%s is not a constructor\n", debugstr_w(prop->name)); + return E_INVALIDARG; + } + + if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { + vdisp_t vthis; + + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; + if(jsthis) + set_disp(&vthis, jsthis); + else + set_jsdisp(&vthis, This); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); + vdisp_release(&vthis); + }else { + /* Function object calls are special case */ + hres = Function_invoke(This, jsthis, flags, argc, argv, r); + } + return hres; + } + case PROP_PROTREF: + return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, + This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); + case PROP_JSVAL: { + if(!is_object_instance(prop->u.val) || !get_object(prop->u.val)) { + FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); + return E_FAIL; + } + + TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); + + return disp_call_value(This->ctx, get_object(prop->u.val), + jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, + flags, argc, argv, r); + } + case PROP_ACCESSOR: + case PROP_IDX: { + jsval_t val; + + hres = prop_get(This, prop, &val); + if(FAILED(hres)) + return hres; + + if(is_object_instance(val) && get_object(val)) { + hres = disp_call_value(This->ctx, get_object(val), + jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, + flags, argc, argv, r); + }else { + FIXME("invoke %s\n", debugstr_jsval(val)); + hres = E_NOTIMPL; + } + + jsval_release(val); + return hres; + } + case PROP_DELETED: + assert(0); + break; + } + + return E_FAIL; +} + HRESULT builtin_set_const(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { TRACE("%p %s\n", jsthis, debugstr_jsval(value)); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 09ea9e0d657..e8c523b0bf7 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -513,6 +513,19 @@ sync_test("defineProperty", function() { test_accessor_prop_desc(obj, "no_setter", desc); obj.no_setter = false; ok(obj.no_setter === true, "no_setter = " + obj.no_setter); + + /* call prop with getter */ + desc = { + get: function() { + return function(x) { + ok(x === 100, "x = " + x); + return 10; + }; + } + }; + Object.defineProperty(obj, "funcprop", desc); + test_accessor_prop_desc(obj, "funcprop", desc); + ok(obj.funcprop(100) === 10, "obj.funcprop() = " + obj.funcprop(100)); }); sync_test("defineProperties", function() {

1 0

Rémi Bernon : winex11.drv: Update INPUT mouse coordinates directly.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 29d56fcb8b450701433a2d2572ec345ffd9633ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d56fcb8b450701433a2d25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 25 19:00:19 2021 +0100 winex11.drv: Update INPUT mouse coordinates directly. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8a379e5a3b7..8b39458fd37 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -592,7 +592,7 @@ static BOOL is_old_motion_event( unsigned long serial ) * * Map the input event coordinates so they're relative to the desktop. */ -static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, const INPUT *input ) +static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, INPUT *input ) { POINT pt = { input->u.mi.dx, input->u.mi.dy }; @@ -611,7 +611,8 @@ static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); - return pt; + input->u.mi.dx = pt.x; + input->u.mi.dy = pt.y; } @@ -623,7 +624,6 @@ static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPUT *input ) { struct x11drv_win_data *data; - POINT pt; input->type = INPUT_MOUSE; @@ -647,7 +647,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU } if (!(data = get_win_data( hwnd ))) return; - pt = map_event_coords( hwnd, window, data, input ); + map_event_coords( hwnd, window, data, input ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100) @@ -670,8 +670,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { - RECT rect; - SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); + RECT rect = { input->u.mi.dx, input->u.mi.dy, input->u.mi.dx + 1, input->u.mi.dy + 1 }; SERVER_START_REQ( update_window_zorder ) { @@ -685,8 +684,6 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU SERVER_END_REQ; } - input->u.mi.dx = pt.x; - input->u.mi.dy = pt.y; __wine_send_input( hwnd, input ); }

1 0

Rémi Bernon : winex11.drv: Introduce new map_event_coords helper.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 40f101e2884298045f52097b45a562b1054aab9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f101e2884298045f52097b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 25 19:00:18 2021 +0100 winex11.drv: Introduce new map_event_coords helper. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index dd25f8b172c..8a379e5a3b7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -587,6 +587,34 @@ static BOOL is_old_motion_event( unsigned long serial ) } +/*********************************************************************** + * map_event_coords + * + * Map the input event coordinates so they're relative to the desktop. + */ +static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, const INPUT *input ) +{ + POINT pt = { input->u.mi.dx, input->u.mi.dy }; + + TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); + + if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } + + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + + TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); + + return pt; +} + + /*********************************************************************** * send_mouse_input * @@ -618,24 +646,8 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU return; } - if (window != root_window) - { - pt.x = input->u.mi.dx; - pt.y = input->u.mi.dy; - } - else pt = root_to_virtual_screen( input->u.mi.dx, input->u.mi.dy ); - if (!(data = get_win_data( hwnd ))) return; - - if (window == data->whole_window) - { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } - - if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + pt = map_event_coords( hwnd, window, data, input ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100)

1 0

Nikolay Sivov : combase: Move IGlobalOptions implementation.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: c1cb17131556c601ebd98524a440e7758497a85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1cb17131556c601ebd98524… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 31 18:15:50 2021 +0300 combase: Move IGlobalOptions implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 162 +++++++++++++++++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 96 --------------------------- dlls/ole32/oleproxy.c | 13 ---- 4 files changed, 162 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cb17131556c601ebd9…

1 0

Zebediah Figura : ntoskrnl/tests: Fix a test failure on LUA Windows.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: e687f589dc23f604dc34d53e2b1ef0d1ee81294b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e687f589dc23f604dc34d53e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 31 11:16:31 2021 -0500 ntoskrnl/tests: Fix a test failure on LUA Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 50abb9f9d1f..c3ebe5b8ee1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -173,6 +173,17 @@ static BOOL testsign_create_cert(struct testsign_context *ctx) ok(ret, "Failed to set provider info, error %#x\n", GetLastError()); ctx->root_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, "root"); + if (!ctx->root_store && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Failed to open root store.\n"); + + ret = CertFreeCertificateContext(ctx->cert); + ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + ret = CryptReleaseContext(ctx->provider, 0); + ok(ret, "failed to release context, error %u\n", GetLastError()); + + return FALSE; + } ok(!!ctx->root_store, "Failed to open store, error %u\n", GetLastError()); ret = CertAddCertificateContextToStore(ctx->root_store, ctx->cert, CERT_STORE_ADD_ALWAYS, &ctx->root_cert); if (!ret && GetLastError() == ERROR_ACCESS_DENIED)

1 0

Jan Sikorski : wined3d: Introduce wined3d_gl_get_internal_format().
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: f42f8925f770ef7db5e84dc211b2586959531d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42f8925f770ef7db5e84dc2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 31 12:27:39 2021 +0200 wined3d: Introduce wined3d_gl_get_internal_format(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 18 ++---------------- dlls/wined3d/wined3d_private.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f2f408f11e..0736f612f12 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1999,13 +1999,7 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); - if (srgb) - internal = format_gl->srgb_internal; - else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) - internal = format_gl->rt_internal; - else - internal = format_gl->internal; - + internal = wined3d_gl_get_internal_format(resource, format_gl, srgb); if (!internal) FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); @@ -2146,16 +2140,8 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format if (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { + GLenum internal = wined3d_gl_get_internal_format(&dst_texture->resource, format_gl, srgb); unsigned int dst_row_pitch, dst_slice_pitch; - GLenum internal; - - if (srgb) - internal = format_gl->srgb_internal; - else if (dst_texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET - && wined3d_resource_is_offscreen(&dst_texture->resource)) - internal = format_gl->rt_internal; - else - internal = format_gl->internal; wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21941afbd82..e9e73da9f25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5930,6 +5930,17 @@ static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_te ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; } +static inline GLuint wined3d_gl_get_internal_format(struct wined3d_resource *resource, + const struct wined3d_format_gl *format_gl, bool srgb) +{ + if (srgb) + return format_gl->srgb_internal; + else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) + return format_gl->rt_internal; + else + return format_gl->internal; +} + static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_info, const struct wined3d_format *format) { return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup);

1 0

Jan Sikorski : wined3d: Add resolve_format parameter to blitter_blit.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 99dc5b78a18f685d9ca38c590e45562d1fbd7c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99dc5b78a18f685d9ca38c59… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 31 12:27:37 2021 +0200 wined3d: Add resolve_format parameter to blitter_blit. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 +++++---- dlls/wined3d/glsl_shader.c | 13 +++++---- dlls/wined3d/surface.c | 11 +++++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 55 +++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 57 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99dc5b78a18f685d9ca3…

1 0

Jan Sikorski : wined3d: Pass format id for typeless resolve through wined3d_blt_fx.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 2adae568a65142e3a53ac8d1722e9b150cdea707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2adae568a65142e3a53ac8d1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 31 12:27:36 2021 +0200 wined3d: Pass format id for typeless resolve through wined3d_blt_fx. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- dlls/wined3d/device.c | 5 ++++- dlls/wined3d/surface.c | 1 + include/wine/wined3d.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 08e3811436d..6af1fce825f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1686,7 +1686,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *i { struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); - struct wined3d_blt_fx wined3d_fx; + struct wined3d_blt_fx wined3d_fx = {0}; DWORD unsupported_flags; DWORD fill_colour = 0; HRESULT hr = DD_OK; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71ca6740c37..ea5f6259b7e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5166,6 +5166,7 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, { struct wined3d_texture *dst_texture, *src_texture; unsigned int dst_level, src_level; + struct wined3d_blt_fx fx = {0}; RECT dst_rect, src_rect; TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, " @@ -5192,6 +5193,8 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, return; } + fx.resolve_format_id = format_id; + dst_texture = texture_from_resource(dst_resource); src_texture = texture_from_resource(src_resource); @@ -5202,7 +5205,7 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), wined3d_texture_get_level_height(src_texture, src_level)); wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, - src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + src_texture, src_sub_resource_idx, &src_rect, 0, &fx, WINED3D_TEXF_POINT); } HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5d07d8c401..855f739c9df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1509,6 +1509,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("src_color_key {0x%08x, 0x%08x}.\n", fx->src_color_key.color_space_low_value, fx->src_color_key.color_space_high_value); + TRACE("resolve_format_id %s.\n", debug_d3dformat(fx->resolve_format_id)); } dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 197a56d1952..b1b435602bb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2014,6 +2014,7 @@ struct wined3d_blt_fx DWORD fx; struct wined3d_color_key dst_color_key; struct wined3d_color_key src_color_key; + enum wined3d_format_id resolve_format_id; }; struct wined3d_buffer_desc

1 0

Paul Gofman : ntdll: Close server socket before calling exit().
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 51f7c9d15ed4af06f39f863c253252f77336d0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51f7c9d15ed4af06f39f863c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:15 2021 +0300 ntdll: Close server socket before calling exit(). So if a native exit handler hangs the process eventually gets killed by server. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 12 ++++++++++++ dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 3f446e8348a..50d89f79c0d 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1470,6 +1470,18 @@ static void init_teb64( TEB *teb ) #endif } +/*********************************************************************** + * process_exit_wrapper + * + * Close server socket and exit process normally. + */ +void process_exit_wrapper( int status ) +{ + close( fd_socket ); + exit( status ); +} + + /*********************************************************************** * server_init_process * diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00d29ae706b..1a882a99855 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -329,7 +329,7 @@ static void exit_thread( int status ) void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_thread( get_unix_exit_code( status ), exit ); + signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3987cc6c4d0..b49789b641e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -164,6 +164,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * apc_result_t *result ) DECLSPEC_HIDDEN; extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; +extern void process_exit_wrapper( int status ) DECLSPEC_HIDDEN; extern size_t server_init_process(void) DECLSPEC_HIDDEN; extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN;

1 0

Paul Gofman : server: Add sigkill timer even if msg_fd is closed.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 672df33f7d7b3a221d636bf561fa4c6052af7fb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=672df33f7d7b3a221d636bf5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:14 2021 +0300 server: Add sigkill timer even if msg_fd is closed. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 9ca1eb64469..433c0cbdd73 100644 --- a/server/process.c +++ b/server/process.c @@ -503,7 +503,7 @@ static void process_sigkill( void *private ) static void start_sigkill_timer( struct process *process ) { grab_object( process ); - if (process->unix_pid != -1 && process->msg_fd) + if (process->unix_pid != -1) process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); else process_died( process );

1 0

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 2021