March 2019 - Wine-Commits - list.winehq.org

Francois Gouget : TestBot/TestAgent: Old Net::OpenSSH versions don' t have disconnect().
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: tools Branch: master Commit: 09c955efd51764aa713de23b64901bc489b74fec URL: https://source.winehq.org/git/tools.git/?a=commit;h=09c955efd51764aa713de23… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 09:51:26 2019 +0100 TestBot/TestAgent: Old Net::OpenSSH versions don't have disconnect(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7c85e8a..ca8a81b 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -128,7 +128,6 @@ sub Disconnect($) { # This may close the SSH channel ($self->{fd}) as a side-effect, # which will avoid undue delays. - $self->{ssh}->disconnect(); $self->{ssh} = undef; waitpid($self->{sshpid}, 0); $self->{sshpid} = undef;

1 0

Józef Kucia : wined3d: Use adapter_check_format() in wined3d_check_render_target_format().
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 8497ba8a7336c67235e9b76587a43e9d763d058d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8497ba8a7336c67235e9b765… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:56 2019 +0100 wined3d: Use adapter_check_format() in wined3d_check_render_target_format(). wined3d_check_pixel_format_{color,depth}() functions are moved to adapter_gl.c. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 73 ++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 86 +----------------------------------------- dlls/wined3d/wined3d_private.h | 5 --- 3 files changed, 73 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 30c1515..3aaceaf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4385,6 +4385,56 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->MaxAnisotropy = gl_info->limits.anisotropy; } +static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) +{ + /* Float formats need FBOs. If FBOs are used this function isn't called */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) + return FALSE; + + /* Probably a RGBA_float or color index mode. */ + if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) + return FALSE; + + if (cfg->redSize < format->red_size + || cfg->greenSize < format->green_size + || cfg->blueSize < format->blue_size + || cfg->alphaSize < format->alpha_size) + return FALSE; + + return TRUE; +} + +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) +{ + BOOL lockable = FALSE; + + /* Float formats need FBOs. If FBOs are used this function isn't called */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) + return FALSE; + + if ((format->id == WINED3DFMT_D16_LOCKABLE) || (format->id == WINED3DFMT_D32_FLOAT)) + lockable = TRUE; + + /* On some modern cards like the Geforce8/9, GLX doesn't offer some + * depth/stencil formats which D3D9 reports. We can safely report + * "compatible" formats (e.g. D24 can be used for D16) as long as we + * aren't dealing with a lockable format. This also helps D3D <= 7 as they + * expect D16 which isn't offered without this on Geforce8 cards. */ + if (!(cfg->depthSize == format->depth_size || (!lockable && cfg->depthSize > format->depth_size))) + return FALSE; + + /* Some cards like Intel i915 ones only offer D24S8 but lots of games also + * need a format without stencil. We can allow a mismatch if the format + * doesn't have any stencil bits. If it does have stencil bits the size + * must match, or stencil wrapping would break. */ + if (format->stencil_size && cfg->stencilSize != format->stencil_size) + return FALSE; + + return TRUE; +} + static BOOL adapter_gl_check_format(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, const struct wined3d_format *ds_format) @@ -4394,14 +4444,35 @@ static BOOL adapter_gl_check_format(const struct wined3d_adapter *adapter, if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) return TRUE; + if (adapter_format && rt_format) + { + /* In backbuffer mode the front and backbuffer share the same WGL + * pixelformat. The format must match in RGB, alpha is allowed to be + * different. (Only the backbuffer can have alpha.) */ + if (adapter_format->red_size != rt_format->red_size + || adapter_format->green_size != rt_format->green_size + || adapter_format->blue_size != rt_format->blue_size) + { + TRACE("Render target format %s doesn't match with adapter format %s.\n", + debug_d3dformat(rt_format->id), debug_d3dformat(adapter_format->id)); + return FALSE; + } + } + for (i = 0; i < adapter->cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; + /* Check if there is a WGL pixel format matching the requirements, the format should also be window + * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ + if (adapter_format && rt_format && !cfg->windowDrawable) + continue; + if ((!adapter_format || wined3d_check_pixel_format_color(cfg, adapter_format)) && (!rt_format || wined3d_check_pixel_format_color(cfg, rt_format)) - && wined3d_check_pixel_format_depth(cfg, ds_format)) + && (!ds_format || wined3d_check_pixel_format_depth(cfg, ds_format))) { + TRACE("Pixel format %d is compatible.\n", cfg->iPixelFormat); return TRUE; } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 260fcc3..75f1fdd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1277,56 +1277,6 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) -{ - /* Float formats need FBOs. If FBOs are used this function isn't called */ - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - return FALSE; - - /* Probably a RGBA_float or color index mode. */ - if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) - return FALSE; - - if (cfg->redSize < format->red_size - || cfg->greenSize < format->green_size - || cfg->blueSize < format->blue_size - || cfg->alphaSize < format->alpha_size) - return FALSE; - - return TRUE; -} - -BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) -{ - BOOL lockable = FALSE; - - /* Float formats need FBOs. If FBOs are used this function isn't called */ - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - return FALSE; - - if ((format->id == WINED3DFMT_D16_LOCKABLE) || (format->id == WINED3DFMT_D32_FLOAT)) - lockable = TRUE; - - /* On some modern cards like the Geforce8/9, GLX doesn't offer some - * depth/stencil formats which D3D9 reports. We can safely report - * "compatible" formats (e.g. D24 can be used for D16) as long as we - * aren't dealing with a lockable format. This also helps D3D <= 7 as they - * expect D16 which isn't offered without this on Geforce8 cards. */ - if (!(cfg->depthSize == format->depth_size || (!lockable && cfg->depthSize > format->depth_size))) - return FALSE; - - /* Some cards like Intel i915 ones only offer D24S8 but lots of games also - * need a format without stencil. We can allow a mismatch if the format - * doesn't have any stencil bits. If it does have stencil bits the size - * must match, or stencil wrapping would break. */ - if (format->stencil_size && cfg->stencilSize != format->stencil_size) - return FALSE; - - return TRUE; -} - HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id) @@ -1446,41 +1396,7 @@ static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *ada if (!(rt_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - { - const struct wined3d_pixel_format *cfgs = adapter->cfgs; - unsigned int i; - - /* In backbuffer mode the front and backbuffer share the same WGL - * pixelformat. The format must match in RGB, alpha is allowed to be - * different. (Only the backbuffer can have alpha.) */ - if (adapter_format->red_size != rt_format->red_size - || adapter_format->green_size != rt_format->green_size - || adapter_format->blue_size != rt_format->blue_size) - { - TRACE("Render target format %s doesn't match with adapter format %s.\n", - debug_d3dformat(rt_format->id), debug_d3dformat(adapter_format->id)); - return FALSE; - } - - /* Check if there is a WGL pixel format matching the requirements, the format should also be window - * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ - for (i = 0; i < adapter->cfg_count; ++i) - { - if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&cfgs[i], adapter_format) - && wined3d_check_pixel_format_color(&cfgs[i], rt_format)) - { - TRACE("Pixel format %d is compatible with format %s.\n", - cfgs[i].iPixelFormat, debug_d3dformat(rt_format->id)); - return TRUE; - } - } - - return FALSE; - } - - return TRUE; + return adapter->adapter_ops->adapter_check_format(adapter, adapter_format, rt_format, NULL); } static BOOL wined3d_check_surface_format(const struct wined3d_format *format) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83fc09d..b9f906a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4724,9 +4724,4 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs) /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) DECLSPEC_HIDDEN; -BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) DECLSPEC_HIDDEN; - #endif

1 0

Józef Kucia : wined3d: Move pixel formats to wined3d_adapter_gl.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: cad72d3cd7a40e2c1f70d19b988e19da62710bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad72d3cd7a40e2c1f70d19b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:57 2019 +0100 wined3d: Move pixel formats to wined3d_adapter_gl. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 46 +++++++++++++++++++++++++++--------------- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/directx.c | 16 ++++++++++----- dlls/wined3d/wined3d_private.h | 17 ++++++++++++++-- 4 files changed, 58 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cad72d3cd7a40e2c1f70…

1 0

Józef Kucia : wined3d: Call wined3d_check_pixel_format_color() also for adapter format.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 7358bb01b6e17b5ba7fcd2c8ac18500e4af7f4d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7358bb01b6e17b5ba7fcd2c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:55 2019 +0100 wined3d: Call wined3d_check_pixel_format_color() also for adapter format. In preparation for the next commit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 801d11c..260fcc3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1468,6 +1468,7 @@ static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *ada for (i = 0; i < adapter->cfg_count; ++i) { if (cfgs[i].windowDrawable + && wined3d_check_pixel_format_color(&cfgs[i], adapter_format) && wined3d_check_pixel_format_color(&cfgs[i], rt_format)) { TRACE("Pixel format %d is compatible with format %s.\n",

1 0

Józef Kucia : wined3d: Always check format flags in wined3d_check_depth_stencil_match().
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 0b7a403e93b24eec1125665f608c8b4c0d62d089 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7a403e93b24eec1125665f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:52 2019 +0100 wined3d: Always check format flags in wined3d_check_depth_stencil_match(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c40526..c978122 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1335,7 +1335,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, const struct wined3d_format *ds_format; const struct wined3d_adapter *adapter; - TRACE("wined3d %p, adapter_idx %u, device_type %s,\n" + TRACE("wined3d %p, adapter_idx %u, device_type %s, " "adapter_format %s, render_target_format %s, depth_stencil_format %s.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), debug_d3dformat(render_target_format_id), debug_d3dformat(depth_stencil_format_id)); @@ -1346,16 +1346,19 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, adapter = wined3d->adapters[adapter_idx]; rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3D_BIND_RENDER_TARGET); ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3D_BIND_DEPTH_STENCIL); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + + if (!(rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET)) { - if ((rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET) - && (ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) - { - TRACE("Formats match.\n"); - return WINED3D_OK; - } + WARN("Format %s is not render target format.\n", debug_d3dformat(rt_format->id)); + return WINED3DERR_NOTAVAILABLE; } - else + if (!(ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + { + WARN("Format %s is not depth/stencil format.\n", debug_d3dformat(ds_format->id)); + return WINED3DERR_NOTAVAILABLE; + } + + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { const struct wined3d_pixel_format *cfgs; unsigned int cfg_count; @@ -1372,13 +1375,16 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3D_OK; } } - } - TRACE("Unsupported format pair: %s and %s.\n", - debug_d3dformat(render_target_format_id), - debug_d3dformat(depth_stencil_format_id)); + TRACE("Unsupported format pair: %s and %s.\n", + debug_d3dformat(render_target_format_id), + debug_d3dformat(depth_stencil_format_id)); - return WINED3DERR_NOTAVAILABLE; + return WINED3DERR_NOTAVAILABLE; + } + + TRACE("Formats match.\n"); + return WINED3D_OK; } HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx,

1 0

Józef Kucia : wined3d: Cleanup CheckRenderTargetCapability().
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 5b58a70953149db8d4756cb7a218b58c3909cbff URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b58a70953149db8d4756cb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:50 2019 +0100 wined3d: Cleanup CheckRenderTargetCapability(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 612b813..c66ed9c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1463,16 +1463,13 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada return TRUE; } -/* Check the render target capabilities of a format */ -static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, +static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, enum wined3d_gl_resource_type gl_type) { - /* Filter out non-RT formats */ - if (!(check_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) + if (!(rt_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - return TRUE; + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { const struct wined3d_pixel_format *cfgs = adapter->cfgs; @@ -1481,11 +1478,12 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, /* In backbuffer mode the front and backbuffer share the same WGL * pixelformat. The format must match in RGB, alpha is allowed to be * different. (Only the backbuffer can have alpha.) */ - if (adapter_format->red_size != check_format->red_size - || adapter_format->green_size != check_format->green_size - || adapter_format->blue_size != check_format->blue_size) + if (adapter_format->red_size != rt_format->red_size + || adapter_format->green_size != rt_format->green_size + || adapter_format->blue_size != rt_format->blue_size) { - TRACE("[FAILED]\n"); + TRACE("Render target format %s doesn't match with adapter format %s.\n", + debug_d3dformat(rt_format->id), debug_d3dformat(adapter_format->id)); return FALSE; } @@ -1494,15 +1492,18 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&cfgs[i], check_format)) + && wined3d_check_pixel_format_color(&cfgs[i], rt_format)) { TRACE("Pixel format %d is compatible with format %s.\n", - cfgs[i].iPixelFormat, debug_d3dformat(check_format->id)); + cfgs[i].iPixelFormat, debug_d3dformat(rt_format->id)); return TRUE; } } + + return FALSE; } - return FALSE; + + return TRUE; } static BOOL wined3d_check_surface_capability(const struct wined3d_format *format) @@ -1683,7 +1684,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if ((bind_flags & WINED3D_BIND_RENDER_TARGET) - && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) + && !wined3d_check_render_target_format(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3D_BIND_RENDER_TARGET, but format %s is not supported for render targets.\n", debug_d3dformat(check_format_id));

1 0

Józef Kucia : wined3d: Always check if format has depth/ stencil flags in wined3d_check_depth_stencil_format().
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 1e9277bf9748e20e04925896b16f09d48b2d1d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e9277bf9748e20e04925896… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:49 2019 +0100 wined3d: Always check if format has depth/stencil flags in wined3d_check_depth_stencil_format(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 381ed65..612b813 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1434,6 +1434,8 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada { if (!ds_format->depth_size && !ds_format->stencil_size) return FALSE; + if (!(ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + return FALSE; /* Blacklist formats not supported on Windows */ if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */ @@ -1443,13 +1445,7 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada return FALSE; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ - if (ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - return TRUE; - } - else + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { unsigned int i; @@ -1460,9 +1456,11 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada && wined3d_check_pixel_format_depth(cfg, ds_format)) return TRUE; } + + return FALSE; } - return FALSE; + return TRUE; } /* Check the render target capabilities of a format */

1 0

Józef Kucia : wined3d: Cleanup CheckDepthStencilCapability().
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: f30f8c818dcf2e534f48ee39f524f7671d8bf63f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f30f8c818dcf2e534f48ee39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:48 2019 +0100 wined3d: Cleanup CheckDepthStencilCapability(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 45e2871..381ed65 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1428,25 +1428,19 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 return hr; } -/* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ -static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *display_format, const struct wined3d_format *ds_format, +static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *ds_format, enum wined3d_gl_resource_type gl_type) { - /* Only allow depth/stencil formats */ - if (!(ds_format->depth_size || ds_format->stencil_size)) + if (!ds_format->depth_size && !ds_format->stencil_size) return FALSE; /* Blacklist formats not supported on Windows */ - switch (ds_format->id) + if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */ + || ds_format->id == WINED3DFMT_S4X4_UINT_D24_UNORM) { - case WINED3DFMT_S1_UINT_D15_UNORM: /* Breaks the shadowvol2 dx7 sdk sample */ - case WINED3DFMT_S4X4_UINT_D24_UNORM: - TRACE("[FAILED] - not supported on windows.\n"); - return FALSE; - - default: - break; + TRACE("Format %s is blacklisted.\n", debug_d3dformat(ds_format->id)); + return FALSE; } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -1459,11 +1453,10 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, { unsigned int i; - /* Walk through all WGL pixel formats to find a match */ for (i = 0; i < adapter->cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; - if (wined3d_check_pixel_format_color(cfg, display_format) + if (wined3d_check_pixel_format_color(cfg, adapter_format) && wined3d_check_pixel_format_depth(cfg, ds_format)) return TRUE; } @@ -1704,7 +1697,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad continue; if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) + && !wined3d_check_depth_stencil_format(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3D_BIND_DEPTH_STENCIL, but format %s is not supported for depth/stencil buffers.\n", debug_d3dformat(check_format_id));

1 0

Isira Seneviratne : wineandroid.drv: Add Override annotation to overridden methods.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: f33c51bb8c407da4a4d24e41a2cc77b31baf9490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f33c51bb8c407da4a4d24e41… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Mar 28 15:26:30 2019 +0530 wineandroid.drv: Add Override annotation to overridden methods. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 9229955..14385c0 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -672,6 +672,7 @@ public class WineActivity extends Activity return window; } + @Override public void onSurfaceTextureAvailable( SurfaceTexture surftex, int width, int height ) { Log.i( LOGTAG, String.format( "onSurfaceTextureAvailable win %08x %dx%d %s", @@ -679,6 +680,7 @@ public class WineActivity extends Activity window.set_surface( surftex, is_client ); } + @Override public void onSurfaceTextureSizeChanged( SurfaceTexture surftex, int width, int height ) { Log.i( LOGTAG, String.format( "onSurfaceTextureSizeChanged win %08x %dx%d %s", @@ -686,6 +688,7 @@ public class WineActivity extends Activity window.set_surface( surftex, is_client); } + @Override public boolean onSurfaceTextureDestroyed( SurfaceTexture surftex ) { Log.i( LOGTAG, String.format( "onSurfaceTextureDestroyed win %08x %s", @@ -694,6 +697,7 @@ public class WineActivity extends Activity return false; // hold on to the texture since the app may still be using it } + @Override public void onSurfaceTextureUpdated(SurfaceTexture surftex) { } @@ -704,6 +708,7 @@ public class WineActivity extends Activity return current_cursor; } + @Override public boolean onGenericMotionEvent( MotionEvent event ) { if (is_client) return false; // let the whole window handle it @@ -722,6 +727,7 @@ public class WineActivity extends Activity return super.onGenericMotionEvent(event); } + @Override public boolean onTouchEvent( MotionEvent event ) { if (is_client) return false; // let the whole window handle it @@ -736,6 +742,7 @@ public class WineActivity extends Activity event.getButtonState(), 0 ); } + @Override public boolean dispatchKeyEvent( KeyEvent event ) { Log.i( LOGTAG, String.format( "view key event win %08x action %d keycode %d (%s)",

1 0

Jacek Caban : mshtml: Add IHTMLDOMNode3::get_namespaceURI implementation.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 4257a14f47d22dee250fecb71d05d9835755179d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4257a14f47d22dee250fecb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 15:55:56 2019 +0100 mshtml: Add IHTMLDOMNode3::get_namespaceURI implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 10 ++++++++-- dlls/mshtml/tests/elements.js | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ee504f9..36cfc80 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1227,8 +1227,14 @@ static HRESULT WINAPI HTMLDOMNode3_get_localName(IHTMLDOMNode3 *iface, VARIANT * static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIANT *p) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&nsstr, NULL); + nsres = nsIDOMNode_GetNamespaceURI(This->nsnode, &nsstr); + return return_nsstr_variant(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 287ff35..7bf5c24 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -174,15 +174,19 @@ function test_createElementNS() { elem = document.createElementNS(null, "test"); ok(elem.tagName === "test", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === null, "elem.namespaceURI = " + elem.namespaceURI); elem = document.createElementNS(svg_ns, "test"); ok(elem.tagName === "test", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === svg_ns, "elem.namespaceURI = " + elem.namespaceURI); elem = document.createElementNS(svg_ns, "svg"); ok(elem.tagName === "svg", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === svg_ns, "elem.namespaceURI = " + elem.namespaceURI); elem = document.createElementNS("test", "svg"); ok(elem.tagName === "svg", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === "test", "elem.namespaceURI = " + elem.namespaceURI); next_test(); }

1 0