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

Jacek Caban : mshtml: Move detach_document_node call to HTMLDocumentNode_unlink.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: d9da6e642e1ba85e302eec659f08970ee88a881d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9da6e642e1ba85e302eec65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 15:56:36 2019 +0100 mshtml: Move detach_document_node call to HTMLDocumentNode_unlink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 656acaf..5b14678 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4966,7 +4966,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - detach_document_node(This); + TRACE("(%p)\n", This); + heap_free(This->event_vector); ConnectionPointContainer_Destroy(&This->basedoc.cp_container); } @@ -4994,6 +4995,7 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) nsIDOMHTMLDocument *nsdoc = This->nsdoc; release_document_mutation(This); + detach_document_node(This); This->nsdoc = NULL; nsIDOMHTMLDocument_Release(nsdoc); This->window = NULL;

1 0

Isira Seneviratne : wineandroid.drv: Add Override annotation to overridden methods.
by Alexandre Julliard 28 Mar '19

28 Mar '19

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

Isira Seneviratne : wineandroid.drv: Remove unnecessary 'extends Object' statement.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 31f2a182e6f08f2e01b6b35b497817b9bfdbe9e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f2a182e6f08f2e01b6b35b… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Feb 21 15:05:04 2019 +0530 wineandroid.drv: Remove unnecessary 'extends Object' statement. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 14385c0..0562f88 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -326,7 +326,7 @@ public class WineActivity extends Activity private HashMap<Integer,WineWindow> win_map = new HashMap<Integer,WineWindow>(); - protected class WineWindow extends Object + protected class WineWindow { static protected final int HWND_MESSAGE = 0xfffffffd; static protected final int SWP_NOZORDER = 0x04;

1 0

Claudio Fontana : kernel32: Allow empty profile section and key name strings.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: be678a52e163111085ab3694b6c1f3af8e4d4a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=be678a52e163111085ab3694… Author: Claudio Fontana <claudio.fontana(a)linaro.org> Date: Fri Mar 22 23:49:28 2019 +0100 kernel32: Allow empty profile section and key name strings. Consider "" a normal section, and fix calculation for zero length section name string and key name string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8036 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18099 Signed-off-by: Claudio Fontana <claudio.fontana(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 40 ++++++++++++++++------------------------ dlls/kernel32/tests/profile.c | 2 -- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 65a8f28..027693e 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -500,7 +500,7 @@ static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) { while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, name )) + if (!strcmpiW( (*section)->name, name )) { PROFILESECTION *to_del = *section; *section = to_del->next; @@ -524,7 +524,7 @@ static BOOL PROFILE_DeleteKey( PROFILESECTION **section, { while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, section_name )) + if (!strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -556,7 +556,7 @@ static void PROFILE_DeleteAllKeys( LPCWSTR section_name) PROFILESECTION **section= &CurProfile->section; while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, section_name )) + if (!strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -582,31 +582,28 @@ static PROFILEKEY *PROFILE_Find( PROFILESECTION **section, LPCWSTR section_name, LPCWSTR key_name, BOOL create, BOOL create_always ) { LPCWSTR p; - int seclen, keylen; + int seclen = 0, keylen = 0; while (PROFILE_isspaceW(*section_name)) section_name++; if (*section_name) + { p = section_name + strlenW(section_name) - 1; - else - p = section_name; - - while ((p > section_name) && PROFILE_isspaceW(*p)) p--; - seclen = p - section_name + 1; + while ((p > section_name) && PROFILE_isspaceW(*p)) p--; + seclen = p - section_name + 1; + } while (PROFILE_isspaceW(*key_name)) key_name++; if (*key_name) + { p = key_name + strlenW(key_name) - 1; - else - p = key_name; - - while ((p > key_name) && PROFILE_isspaceW(*p)) p--; - keylen = p - key_name + 1; + while ((p > key_name) && PROFILE_isspaceW(*p)) p--; + keylen = p - key_name + 1; + } while (*section) { - if ( ((*section)->name[0]) - && (!(strncmpiW( (*section)->name, section_name, seclen ))) - && (((*section)->name)[seclen] == '\0') ) + if (!strncmpiW((*section)->name, section_name, seclen) && + ((*section)->name)[seclen] == '\0') { PROFILEKEY **key = &(*section)->key; @@ -873,7 +870,7 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, while (section) { - if (section->name[0] && !strcmpiW( section->name, section_name )) + if (!strcmpiW( section->name, section_name )) { UINT oldlen = len; for (key = section->key; key; key = key->next) @@ -988,11 +985,6 @@ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, if (!def_val) def_val = empty_strW; if (key_name) { - if (!key_name[0]) - { - PROFILE_CopyEntry(buffer, def_val, len, TRUE); - return strlenW(buffer); - } key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE, FALSE); PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len, TRUE ); @@ -1002,7 +994,7 @@ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, return strlenW( buffer ); } /* no "else" here ! */ - if (section && section[0]) + if (section) { INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE); if (!buffer[0]) /* no luck -> def_val */ diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c075e0a..8a0089b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -153,9 +153,7 @@ static void test_profile_string(void) /* works only in unicode, ascii crashes */ ret=GetPrivateProfileStringW(sW, emptyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); - todo_wine ok(ret == 10, "expected 10, got %u\n", ret); - todo_wine ok(!lstrcmpW(valnokeyW,bufW), "expected %s, got %s\n", wine_dbgstr_w(valnokeyW), wine_dbgstr_w(bufW) );

1 0

Józef Kucia : wined3d: Cleanup CheckDepthStencilCapability().
by Alexandre Julliard 28 Mar '19

28 Mar '19

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

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

28 Mar '19

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 CheckRenderTargetCapability().
by Alexandre Julliard 28 Mar '19

28 Mar '19

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: Cleanup wined3d_check_surface_capability().
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 0b7407287d0262a537de47d0f155c359a717895a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7407287d0262a537de47d0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:51 2019 +0100 wined3d: Cleanup wined3d_check_surface_capability(). 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, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c66ed9c..8c40526 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1506,23 +1506,15 @@ static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *ada return TRUE; } -static BOOL wined3d_check_surface_capability(const struct wined3d_format *format) +static BOOL wined3d_check_surface_format(const struct wined3d_format *format) { if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] | format->flags[WINED3D_GL_RES_TYPE_RB]) & WINED3DFMT_FLAG_BLIT) - { - TRACE("[OK]\n"); return TRUE; - } if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) == (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) - { - TRACE("[OK]\n"); return TRUE; - } - /* Reject other formats */ - TRACE("[FAILED]\n"); return FALSE; } @@ -1591,9 +1583,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3D_BIND_DEPTH_STENCIL; if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { - if (!wined3d_check_surface_capability(format)) + if (!wined3d_check_surface_format(format)) { - TRACE("[FAILED] - Not supported for plain surfaces.\n"); + TRACE("%s is not supported for plain surfaces.\n", debug_d3dformat(format->id)); return WINED3DERR_NOTAVAILABLE; }

1 0

Józef Kucia : wined3d: Always check format flags in wined3d_check_depth_stencil_match().
by Alexandre Julliard 28 Mar '19

28 Mar '19

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: Add adapter_check_format() to adapter_ops.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 2727dcb07f35ccce4096dbf0c1e119a5f99a7552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2727dcb07f35ccce4096dbf0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:53 2019 +0100 wined3d: Add adapter_check_format() to adapter_ops. 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 | 24 +++++++++++++++++++++ dlls/wined3d/directx.c | 47 +++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 8 +++++++ 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 99073f4..a076a98 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4385,10 +4385,34 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->MaxAnisotropy = gl_info->limits.anisotropy; } +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) +{ + unsigned int i; + + if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) + return TRUE; + + for (i = 0; i < adapter->cfg_count; ++i) + { + const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; + + if (wined3d_check_pixel_format_color(cfg, rt_format) + && wined3d_check_pixel_format_depth(cfg, ds_format)) + { + return TRUE; + } + } + + return FALSE; +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { wined3d_adapter_gl_create_context, adapter_gl_get_wined3d_caps, + adapter_gl_check_format, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c978122..8e77138 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1277,7 +1277,7 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, +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 */ @@ -1297,7 +1297,7 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format * return TRUE; } -static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, +BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BOOL lockable = FALSE; @@ -1331,6 +1331,7 @@ 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) { + const struct wined3d_format *adapter_format; const struct wined3d_format *rt_format; const struct wined3d_format *ds_format; const struct wined3d_adapter *adapter; @@ -1344,6 +1345,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_INVALIDCALL; adapter = wined3d->adapters[adapter_idx]; + + adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); 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); @@ -1358,33 +1361,17 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + if (adapter->adapter_ops->adapter_check_format(adapter, adapter_format, rt_format, ds_format)) { - const struct wined3d_pixel_format *cfgs; - unsigned int cfg_count; - unsigned int i; - - cfgs = adapter->cfgs; - cfg_count = adapter->cfg_count; - for (i = 0; i < cfg_count; ++i) - { - if (wined3d_check_pixel_format_color(&cfgs[i], rt_format) - && wined3d_check_pixel_format_depth(&cfgs[i], ds_format)) - { - TRACE("Formats match.\n"); - return WINED3D_OK; - } - } - - TRACE("Unsupported format pair: %s and %s.\n", - debug_d3dformat(render_target_format_id), - debug_d3dformat(depth_stencil_format_id)); - - return WINED3DERR_NOTAVAILABLE; + TRACE("Formats match.\n"); + return WINED3D_OK; } - TRACE("Formats match.\n"); - return WINED3D_OK; + TRACE("Unsupported format pair: %s and %s.\n", + debug_d3dformat(render_target_format_id), + debug_d3dformat(depth_stencil_format_id)); + + return WINED3DERR_NOTAVAILABLE; } HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, @@ -2336,10 +2323,18 @@ static void adapter_no3d_get_wined3d_caps(const struct wined3d_adapter *adapter, { } +static BOOL adapter_no3d_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) +{ + return TRUE; +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { wined3d_adapter_no3d_create_context, adapter_no3d_get_wined3d_caps, + adapter_no3d_check_format, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22e7441..83fc09d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2680,6 +2680,9 @@ struct wined3d_adapter_ops BOOL (*adapter_create_context)(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); + BOOL (*adapter_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); }; /* The adapter structure */ @@ -4721,4 +4724,9 @@ 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