wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Alexandre Julliard : Wine release 3.10
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: website Branch: master Commit: 39105f61a0d3e3bab8808a50909cd57d362851bb URL: https://source.winehq.org/git/website.git/?a=commit;h=39105f61a0d3e3bab8808… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:11:08 2018 +0200 Wine release 3.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018061101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018061101.xml b/news/en/2018061101.xml new file mode 100644 index 0000000..6562c86 --- /dev/null +++ b/news/en/2018061101.xml @@ -0,0 +1,16 @@ +<news> +<date>June 11, 2018</date> +<title>Wine 3.10 Released</title> +<body> + The Wine development release 3.10 is now available. + <a href="{$root}/announce/3.10">What's new</a> in this release: +<ul> + <li>Swapchain support in Direct 3D 12.</li> + <li>Vulkan support updated to the latest spec.</li> + <li>Debugger support for Wow64 processes.</li> + <li>Still more support for the Task Scheduler.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.10 : Alexandre Julliard : Release 3.10
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: refs/tags/wine-3.10 Tag: 8baf65325b5611fe0793094a380e7dc18d73ab95 URL: https://source.winehq.org/git/wine.git/?a=tag;h=8baf65325b5611fe0793094a380… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:08:39 2018 +0200 Release 3.10

1 0

Alexandre Julliard : Release 3.10.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: e470221dcaaadf10f222551997ff837f1e7557de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e470221dcaaadf10f2225519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 20:08:39 2018 +0200 Release 3.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 690 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 371 insertions(+), 341 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e470221dcaaadf10f222…

1 0

Zebediah Figura : msvcrt: Avoid using inline assembly in call_filter().
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 9867d10e28364777d0c8f9a3ad2caec73c036ca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9867d10e28364777d0c8f9a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 4 17:23:34 2018 -0500 msvcrt: Avoid using inline assembly in call_filter(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 508e2ee..29540cd 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -187,15 +187,16 @@ __ASM_GLOBAL_FUNC( call_finally_block, "movl 8(%esp), %ebp\n\t" "jmp *4(%esp)" ); -static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) -{ - int ret; - __asm__ __volatile__ ("pushl %%ebp; pushl %3; movl %2,%%ebp; call *%%eax; popl %%ebp; popl %%ebp" - : "=a" (ret) - : "0" (func), "r" (ebp), "r" (arg) - : "ecx", "edx", "memory" ); - return ret; -} +extern int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ); + +__ASM_GLOBAL_FUNC( call_filter, + "pushl %ebp\n\t" + "pushl 12(%esp)\n\t" + "movl 20(%esp), %ebp\n\t" + "call *12(%esp)\n\t" + "popl %ebp\n\t" + "popl %ebp\n\t" + "ret" ); static inline int call_unwind_func( int (*func)(void), void *ebp ) {

1 0

Zebediah Figura : msvcrt: Avoid using inline assembly in call_finally_block().
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: f96a3b735bd2dacf323d132413b93765013bed1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f96a3b735bd2dacf323d1324… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 4 17:23:33 2018 -0500 msvcrt: Avoid using inline assembly in call_finally_block(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 2c845b2..508e2ee 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -181,11 +181,11 @@ __ASM_GLOBAL_FUNC( continue_after_catch, "leal 12(%edx), %ebp\n\t" "jmp *%eax" ); -static inline void call_finally_block( void *code_block, void *base_ptr ) -{ - __asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" - : : "a" (code_block), "g" (base_ptr)); -} +extern void DECLSPEC_NORETURN call_finally_block( void *code_block, void *base_ptr ); + +__ASM_GLOBAL_FUNC( call_finally_block, + "movl 8(%esp), %ebp\n\t" + "jmp *4(%esp)" ); static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) { @@ -938,7 +938,6 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, frame->trylevel = pScopeTable[trylevel].previousTryLevel; TRACE("__finally block %p\n",pScopeTable[trylevel].lpfnHandler); call_finally_block(pScopeTable[trylevel].lpfnHandler, &frame->_ebp); - ERR("Returned from __finally block - expect crash!\n"); } } trylevel = pScopeTable[trylevel].previousTryLevel; @@ -1012,7 +1011,6 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), frame->trylevel = scope_table->entries[trylevel].previousTryLevel; TRACE("__finally block %p\n",scope_table->entries[trylevel].lpfnHandler); call_finally_block(scope_table->entries[trylevel].lpfnHandler, &frame->_ebp); - ERR("Returned from __finally block - expect crash!\n"); } } trylevel = scope_table->entries[trylevel].previousTryLevel;

1 0

Zebediah Figura : msvcrt: Avoid using inline assembly in continue_after_catch().
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 701e1b6f8126b88d68e01f6e34b2446a4a8c4854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=701e1b6f8126b88d68e01f6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 4 17:23:32 2018 -0500 msvcrt: Avoid using inline assembly in continue_after_catch(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index ee12fb6..2c845b2 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -172,12 +172,14 @@ __ASM_GLOBAL_FUNC( call_copy_ctor, "ret" ); /* continue execution to the specified address after exception is caught */ -static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -{ - __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" - : : "r" (frame), "a" (addr) ); - for (;;) ; /* unreached */ -} +extern void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ); + +__ASM_GLOBAL_FUNC( continue_after_catch, + "movl 4(%esp), %edx\n\t" + "movl 8(%esp), %eax\n\t" + "movl -4(%edx), %esp\n\t" + "leal 12(%edx), %ebp\n\t" + "jmp *%eax" ); static inline void call_finally_block( void *code_block, void *base_ptr ) {

1 0

Jacek Caban : mshtml/tests: Silence noisy traces.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: dac8036fb601581d36f44400990756d7f56ce988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac8036fb601581d36f44400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:08:12 2018 +0200 mshtml/tests: Silence noisy traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1f40fed..3729fc3 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -906,7 +906,7 @@ static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, return S_OK; } - trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid)); + if(winetest_debug > 1) trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -1248,7 +1248,7 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void return E_NOINTERFACE; } - trace("Binding::QI(%s)\n", wine_dbgstr_guid(riid)); + if(winetest_debug > 1) trace("Binding::QI(%s)\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -2727,7 +2727,7 @@ static HRESULT WINAPI CustomDocHostUIHandler_QueryInterface(IDocHostUIHandler2 * if(IsEqualGUID(&IID_IDocHostShowUI, riid)) return E_NOINTERFACE; /* TODO */ - trace("CustomDocHostUIHandler::QI(%s)\n", wine_dbgstr_guid(riid)); + if(winetest_debug > 1) trace("CustomDocHostUIHandler::QI(%s)\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -5328,7 +5328,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) return E_NOINTERFACE; /* IE10 */ else if(IsEqualGUID(&IID_IDocHostUIHandlerPriv, riid)) return E_NOINTERFACE; /* ? */ - else + else if(winetest_debug > 1) trace("QI(%s)\n", wine_dbgstr_guid(riid)); if(*ppv)

1 0

Józef Kucia : wined3d: Disallow disabling GLSL on core profile contexts.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: bf9a1a2e917fe6cd93340369c09a559803515050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf9a1a2e917fe6cd93340369… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 13:48:56 2018 +0200 wined3d: Disallow disabling GLSL on core profile contexts. 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 | 9 ++++++++- dlls/wined3d/wined3d_main.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9bc9c31..baab2e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2608,7 +2608,14 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) { - BOOL glsl = wined3d_settings.glslRequested && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); + BOOL glsl = wined3d_settings.use_glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !wined3d_settings.use_glsl) + { + ERR_(winediag)("Ignoring the UseGLSL registry key. " + "GLSL is the only shader backend available on core profile contexts. " + "You need to explicitly set GL version to use legacy contexts.\n"); + glsl = TRUE; + } if (glsl && gl_info->supported[ARB_VERTEX_SHADER] && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_shader_backend; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index e322b4d..f8a84a1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -225,8 +225,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!strcmp(buffer,"disabled")) { ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); - TRACE("Use of GL Shading Language disabled\n"); - wined3d_settings.glslRequested = FALSE; + TRACE("Use of GL Shading Language disabled.\n"); + wined3d_settings.use_glsl = FALSE; } } if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33bc463..d190f7c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -385,7 +385,7 @@ struct wined3d_settings unsigned int cs_multithreaded; BOOL explicit_gl_version; DWORD max_gl_version; - BOOL glslRequested; + BOOL use_glsl; int offscreen_rendering_mode; unsigned short pci_vendor_id; unsigned short pci_device_id;

1 0

Józef Kucia : d3d12/tests: Fix resource state transitions in test_swapchain_draw().
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 9e5e87d201a97fded23142339c9eb2d88bfbfa28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e5e87d201a97fded2314233… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:05:11 2018 +0200 d3d12/tests: Fix resource state transitions in test_swapchain_draw(). 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/d3d12/tests/d3d12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index a6d7219..99641be 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -788,6 +788,9 @@ static void test_swapchain_draw(void) ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); ID3D12Device_CreateRenderTargetView(context.device, backbuffer, NULL, context.rtv); + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL);

1 0

Józef Kucia : d3d12/tests: Add option to run tests with validation layers.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 2c3f102d7db7a2562f3bfb339051d80ee4a92605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c3f102d7db7a2562f3bfb33… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 11 12:05:10 2018 +0200 d3d12/tests: Add option to run tests with validation layers. 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/d3d12/tests/d3d12.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 51967a0..a6d7219 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -813,18 +813,28 @@ static void test_swapchain_draw(void) START_TEST(d3d12) { + BOOL enable_debug_layer = FALSE; unsigned int argc, i; + ID3D12Debug *debug; char **argv; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); } + if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + { + ID3D12Debug_EnableDebugLayer(debug); + ID3D12Debug_Release(debug); + } + print_adapter_info(); test_interfaces();

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
63
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 June 2018