May 2020 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Introduce a (stub) SPIR-V fixed-function vertex pipe implementation.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 029282dedcb2948670f5c2c61fe89afeba2783f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=029282dedcb2948670f5c2c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 18 20:40:47 2020 +0430 wined3d: Introduce a (stub) SPIR-V fixed-function vertex pipe implementation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/shader_spirv.c | 77 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index dc229f3465..7423165268 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1938,7 +1938,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!wined3d_adapter_vk_init_format_info(adapter_vk, vk_info)) goto fail_vulkan; - adapter->vertex_pipe = &none_vertex_pipe; + adapter->vertex_pipe = wined3d_spirv_vertex_pipe_init_vk(); adapter->fragment_pipe = &none_fragment_pipe; adapter->misc_state_template = misc_state_template_vk; adapter->shader_backend = wined3d_spirv_shader_backend_init_vk(); diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 28add47c7e..fc43ec33f9 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1,5 +1,6 @@ /* * Copyright 2018 Henri Verbeet for CodeWeavers + * Copyright 2019 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -504,3 +505,79 @@ const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(vo { return &spirv_shader_backend_vk; } + +static void spirv_vertex_pipe_vk_vp_enable(const struct wined3d_context *context, BOOL enable) +{ + /* Nothing to do. */ +} + +static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) +{ + memset(caps, 0, sizeof(*caps)); +} + +static uint32_t spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return 0; +} + +static void *spirv_vertex_pipe_vk_vp_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) +{ + if (shader_backend != &spirv_shader_backend_vk) + { + FIXME("SPIR-V vertex pipe without SPIR-V shader backend not implemented.\n"); + return NULL; + } + + return shader_priv; +} + +static void spirv_vertex_pipe_vk_vp_free(struct wined3d_device *device, struct wined3d_context *context) +{ + /* Nothing to do. */ +} + +static const struct wined3d_state_entry_template spirv_vertex_pipe_vk_vp_states[] = +{ + {STATE_RENDER(WINED3D_RS_RANGEFOGENABLE), {STATE_RENDER(WINED3D_RS_RANGEFOGENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_CLIPPING), {STATE_RENDER(WINED3D_RS_CLIPPING), state_nop}}, + {STATE_RENDER(WINED3D_RS_LIGHTING), {STATE_RENDER(WINED3D_RS_LIGHTING), state_nop}}, + {STATE_RENDER(WINED3D_RS_AMBIENT), {STATE_RENDER(WINED3D_RS_AMBIENT), state_nop}}, + {STATE_RENDER(WINED3D_RS_COLORVERTEX), {STATE_RENDER(WINED3D_RS_COLORVERTEX), state_nop}}, + {STATE_RENDER(WINED3D_RS_LOCALVIEWER), {STATE_RENDER(WINED3D_RS_LOCALVIEWER), state_nop}}, + {STATE_RENDER(WINED3D_RS_NORMALIZENORMALS), {STATE_RENDER(WINED3D_RS_NORMALIZENORMALS), state_nop}}, + {STATE_RENDER(WINED3D_RS_DIFFUSEMATERIALSOURCE), {STATE_RENDER(WINED3D_RS_DIFFUSEMATERIALSOURCE), state_nop}}, + {STATE_RENDER(WINED3D_RS_SPECULARMATERIALSOURCE), {STATE_RENDER(WINED3D_RS_SPECULARMATERIALSOURCE), state_nop}}, + {STATE_RENDER(WINED3D_RS_AMBIENTMATERIALSOURCE), {STATE_RENDER(WINED3D_RS_AMBIENTMATERIALSOURCE), state_nop}}, + {STATE_RENDER(WINED3D_RS_EMISSIVEMATERIALSOURCE), {STATE_RENDER(WINED3D_RS_EMISSIVEMATERIALSOURCE), state_nop}}, + {STATE_RENDER(WINED3D_RS_VERTEXBLEND), {STATE_RENDER(WINED3D_RS_VERTEXBLEND), state_nop}}, + {STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE), {STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSIZE), {STATE_RENDER(WINED3D_RS_POINTSIZE), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSCALE_A), {STATE_RENDER(WINED3D_RS_POINTSCALE_A), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSCALE_B), {STATE_RENDER(WINED3D_RS_POINTSCALE_B), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSCALE_C), {STATE_RENDER(WINED3D_RS_POINTSCALE_C), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), {STATE_RENDER(WINED3D_RS_POINTSIZE_MAX), state_nop}}, + {STATE_RENDER(WINED3D_RS_INDEXEDVERTEXBLENDENABLE), {STATE_RENDER(WINED3D_RS_INDEXEDVERTEXBLENDENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_TWEENFACTOR), {STATE_RENDER(WINED3D_RS_TWEENFACTOR), state_nop}}, + {STATE_MATERIAL, {STATE_MATERIAL, state_nop}}, + {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), state_nop}}, + {STATE_LIGHT_TYPE, {STATE_LIGHT_TYPE, state_nop}}, + {0}, /* Terminate */ +}; + +static const struct wined3d_vertex_pipe_ops spirv_vertex_pipe_vk = +{ + .vp_enable = spirv_vertex_pipe_vk_vp_enable, + .vp_get_caps = spirv_vertex_pipe_vk_vp_get_caps, + .vp_get_emul_mask = spirv_vertex_pipe_vk_vp_get_emul_mask, + .vp_alloc = spirv_vertex_pipe_vk_vp_alloc, + .vp_free = spirv_vertex_pipe_vk_vp_free, + .vp_states = spirv_vertex_pipe_vk_vp_states, +}; + +const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void) +{ + return &spirv_vertex_pipe_vk; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82ea7239c6..ee0e3545c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2517,6 +2517,8 @@ extern const struct wined3d_vertex_pipe_ops none_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; +const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void) DECLSPEC_HIDDEN; + /* "Base" state table */ HRESULT compile_state_table(struct wined3d_state_entry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions,

1 0

Józef Kucia : wined3d: Introduce a (stub) SPIR-V fixed-function fragment pipe implementation.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: a282a8e7656f0d107d8fc3373e75b126432deb11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a282a8e7656f0d107d8fc337… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 18 20:40:48 2020 +0430 wined3d: Introduce a (stub) SPIR-V fixed-function fragment pipe implementation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/shader_spirv.c | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7423165268..253c3da726 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1939,7 +1939,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, goto fail_vulkan; adapter->vertex_pipe = wined3d_spirv_vertex_pipe_init_vk(); - adapter->fragment_pipe = &none_fragment_pipe; + adapter->fragment_pipe = wined3d_spirv_fragment_pipe_init_vk(); adapter->misc_state_template = misc_state_template_vk; adapter->shader_backend = wined3d_spirv_shader_backend_init_vk(); diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index fc43ec33f9..2dc07b14f1 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -581,3 +581,85 @@ const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void) { return &spirv_vertex_pipe_vk; } + +static void spirv_fragment_pipe_vk_fp_enable(const struct wined3d_context *context, BOOL enable) +{ + /* Nothing to do. */ +} + +static void spirv_fragment_pipe_vk_fp_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) +{ + memset(caps, 0, sizeof(*caps)); +} + +static uint32_t spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return 0; +} + +static void *spirv_fragment_pipe_vk_fp_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) +{ + if (shader_backend != &spirv_shader_backend_vk) + { + FIXME("SPIR-V fragment pipe without SPIR-V shader backend not implemented.\n"); + return NULL; + } + + return shader_priv; +} + +static void spirv_fragment_pipe_vk_fp_free(struct wined3d_device *device, struct wined3d_context *context) +{ + /* Nothing to do. */ +} + +static BOOL spirv_fragment_pipe_vk_fp_alloc_context_data(struct wined3d_context *context) +{ + return TRUE; +} + +static void spirv_fragment_pipe_vk_fp_free_context_data(struct wined3d_context *context) +{ + /* Nothing to do. */ +} + +static const struct wined3d_state_entry_template spirv_fragment_pipe_vk_fp_states[] = +{ + {STATE_RENDER(WINED3D_RS_SHADEMODE), {STATE_RENDER(WINED3D_RS_SHADEMODE), state_nop}}, + {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_ALPHAREF), {STATE_RENDER(WINED3D_RS_ALPHAREF), state_nop}}, + {STATE_RENDER(WINED3D_RS_ALPHAFUNC), {STATE_RENDER(WINED3D_RS_ALPHAFUNC), state_nop}}, + {STATE_RENDER(WINED3D_RS_FOGENABLE), {STATE_RENDER(WINED3D_RS_FOGENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_FOGCOLOR), {STATE_RENDER(WINED3D_RS_FOGCOLOR), state_nop}}, + {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), state_nop}}, + {STATE_RENDER(WINED3D_RS_FOGSTART), {STATE_RENDER(WINED3D_RS_FOGSTART), state_nop}}, + {STATE_RENDER(WINED3D_RS_FOGEND), {STATE_RENDER(WINED3D_RS_FOGEND), state_nop}}, + {STATE_RENDER(WINED3D_RS_FOGDENSITY), {STATE_RENDER(WINED3D_RS_FOGDENSITY), state_nop}}, + {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_nop}}, + {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), state_nop}}, + {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_nop}}, + {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), state_nop}}, + {STATE_POINT_ENABLE, {STATE_POINT_ENABLE, state_nop}}, + {STATE_COLOR_KEY, {STATE_COLOR_KEY, state_nop}}, + {0}, /* Terminate */ +}; + +static const struct wined3d_fragment_pipe_ops spirv_fragment_pipe_vk = +{ + .fp_enable = spirv_fragment_pipe_vk_fp_enable, + .get_caps = spirv_fragment_pipe_vk_fp_get_caps, + .get_emul_mask = spirv_fragment_pipe_vk_fp_get_emul_mask, + .alloc_private = spirv_fragment_pipe_vk_fp_alloc, + .free_private = spirv_fragment_pipe_vk_fp_free, + .allocate_context_data = spirv_fragment_pipe_vk_fp_alloc_context_data, + .free_context_data = spirv_fragment_pipe_vk_fp_free_context_data, + .color_fixup_supported = shader_spirv_color_fixup_supported, + .states = spirv_fragment_pipe_vk_fp_states, +}; + +const struct wined3d_fragment_pipe_ops *wined3d_spirv_fragment_pipe_init_vk(void) +{ + return &spirv_fragment_pipe_vk; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee0e3545c9..fff944f777 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2513,6 +2513,8 @@ extern const struct wined3d_fragment_pipe_ops nvts_fragment_pipeline DECLSPEC_HI extern const struct wined3d_fragment_pipe_ops nvrc_fragment_pipeline DECLSPEC_HIDDEN; extern const struct wined3d_fragment_pipe_ops glsl_fragment_pipe DECLSPEC_HIDDEN; +const struct wined3d_fragment_pipe_ops *wined3d_spirv_fragment_pipe_init_vk(void) DECLSPEC_HIDDEN; + extern const struct wined3d_vertex_pipe_ops none_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN;

1 0

Chip Davis : winemac.drv: Use InitOnceExecuteOnce to initialize OpenGL.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: a55320f00b7d2b69e709d45fdf6c2afde84d1b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a55320f00b7d2b69e709d45f… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun May 17 17:44:15 2020 -0500 winemac.drv: Use InitOnceExecuteOnce to initialize OpenGL. Currently, there is a race condition where if two threads call into OpenGL at the same time, one of them will initialize OpenGL, but the other will barrel on ahead, thinking GL is already initialized, even though the first thread hasn't finished initializing it yet. One of the symptoms of this is that no pixel formats appear to be available, because the first thread hasn't yet enumerated the available pixel formats. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index b80c8fffb0..b66af0f1c4 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4242,7 +4242,7 @@ static void load_extensions(void) } -static BOOL init_opengl(void) +static BOOL CALLBACK init_opengl(INIT_ONCE *init_once, void *context, void **param) { static BOOL init_done = FALSE; unsigned int i; @@ -4654,13 +4654,15 @@ static struct opengl_funcs opengl_funcs = */ struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(PHYSDEV dev, UINT version) { + static INIT_ONCE opengl_init = INIT_ONCE_STATIC_INIT; + if (version != WINE_WGL_DRIVER_VERSION) { ERR("version mismatch, opengl32 wants %u but macdrv has %u\n", version, WINE_WGL_DRIVER_VERSION); return NULL; } - if (!init_opengl()) return (void *)-1; + if (!InitOnceExecuteOnce(&opengl_init, init_opengl, NULL, NULL)) return (void *)-1; return &opengl_funcs; }

1 0

Jacek Caban : winegcc: Default to ucrtbase.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 14d97456a95948616e3343f02859b017cca15135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d97456a95948616e3343f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 16:58:53 2020 +0200 winegcc: Default to ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 8 ++++++++ tools/makedep.c | 3 +++ tools/winegcc/winegcc.c | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index bc93de023f..c98b72f7d3 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -33,6 +33,14 @@ #define _WIN64 #endif +#ifndef _MSVCR_VER +# define _MSVCR_VER 140 +#endif + +#if !defined(_UCRT) && _MSVCR_VER >= 140 +# define _UCRT +#endif + #if !defined(_MSC_VER) && !defined(__int64) # if defined(_WIN64) && !defined(__MINGW64__) # define __int64 long diff --git a/tools/makedep.c b/tools/makedep.c index 653c5488e1..536d2263e3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4337,11 +4337,13 @@ static void load_sources( struct makefile *make ) if (make->use_msvcrt) { + unsigned int msvcrt_version = 0; for (i = 0; i < make->imports.count; i++) { if (strncmp( make->imports.str[i], "msvcr", 5 ) && strncmp( make->imports.str[i], "ucrt", 4 )) continue; if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); crt_dll = make->imports.str[i]; + sscanf( crt_dll, "msvcr%u", &msvcrt_version ); } if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { @@ -4349,6 +4351,7 @@ static void load_sources( struct makefile *make ) strarray_add( &make->imports, crt_dll ); } if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); + else strarray_add( &make->define_args, strmake( "-D_MSVCR_VER=%u", msvcrt_version )); } LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c966c08665..143910ae63 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1208,7 +1208,7 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "winecrt0"); if (opts->use_msvcrt) { - if (!crt_lib) add_library(opts, lib_dirs, files, "msvcrt"); + if (!crt_lib) add_library(opts, lib_dirs, files, "ucrtbase"); else strarray_add(files, strmake("-a%s", crt_lib)); } if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel");

1 0

Zhiyi Zhang : wined3d: Move device window to the correct output when handling WM_ACTIVATEAPP with full screen swapchains.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 7962c3194ec7c4706cda8f54962a9996dfc7313a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7962c3194ec7c4706cda8f54… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 15 15:45:51 2020 +0800 wined3d: Move device window to the correct output when handling WM_ACTIVATEAPP with full screen swapchains. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dbbfc8e72c..21e9ec459e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1239,9 +1239,11 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; + struct wined3d_output_desc output_desc; unsigned int screensaver_active; struct wined3d_output *output; BOOL focus_messages, filter; + HRESULT hr; /* This code is not protected by the wined3d mutex, so it may run while * wined3d_device_reset is active. Testing on Windows shows that changing @@ -1251,6 +1253,13 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (!(focus_messages = device->wined3d->flags & WINED3D_FOCUS_MESSAGES)) filter = wined3d_filter_messages(window, TRUE); + output = wined3d_swapchain_get_output(swapchain); + if (!output) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return; + } + if (activate) { SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); @@ -1266,16 +1275,19 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa * * Guild Wars 1 wants a WINDOWPOSCHANGED message on the device window to * resume drawing after a focus loss. */ - SetWindowPos(window, NULL, 0, 0, swapchain->state.desc.backbuffer_width, - swapchain->state.desc.backbuffer_height, SWP_NOACTIVATE | SWP_NOZORDER); + if (SUCCEEDED(hr = wined3d_output_get_desc(output, &output_desc))) + SetWindowPos(window, NULL, output_desc.desktop_rect.left, + output_desc.desktop_rect.top, swapchain->state.desc.backbuffer_width, + swapchain->state.desc.backbuffer_height, SWP_NOACTIVATE | SWP_NOZORDER); + else + ERR("Failed to get output description, hr %#x.\n", hr); } if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { - output = wined3d_swapchain_get_output(swapchain); - if (!output || FAILED(wined3d_output_set_display_mode(output, + if (FAILED(hr = wined3d_output_set_display_mode(output, &swapchain->state.d3d_mode))) - ERR("Failed to set display mode.\n"); + ERR("Failed to set display mode, hr %#x.\n", hr); } if (swapchain == device->swapchains[0]) @@ -1289,9 +1301,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa device->restore_screensaver = FALSE; } - output = wined3d_swapchain_get_output(swapchain); - if (!output || FAILED(wined3d_output_set_display_mode(output, NULL))) - ERR("Failed to set display mode.\n"); + if (FAILED(hr = wined3d_output_set_display_mode(output, NULL))) + ERR("Failed to set display mode, hr %#x.\n", hr); swapchain->reapply_mode = TRUE;

1 0

Martin Storsjo : ntdll: Properly restore x29/x30 for arm64 packed unwind data with local stack.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 5f14b6357b8fefcd390f52b0c7a50790e5361976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f14b6357b8fefcd390f52b0… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 18 15:16:29 2020 +0300 ntdll: Properly restore x29/x30 for arm64 packed unwind data with local stack. For the CR == 3 case, x29/x30 should be restored from x29, not from sp, which may have been decremented further for local stack storage. This fixes uwinding the stack for C++ exceptions in code generated by MSVC. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e81ea8f82e..4c5944759f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1558,7 +1558,12 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (!skip) { - if (func->u.s.CR == 3) restore_regs( 29, 2, 0, context, ptrs ); + if (func->u.s.CR == 3) + { + DWORD64 *fp = (DWORD64 *) context->u.s.Fp; /* u.X[29] */ + context->u.X[29] = fp[0]; + context->u.X[30] = fp[1]; + } context->Sp += local_size; if (fp_size) restore_fpregs( 8, fp_size / 8, int_size, context, ptrs ); if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs );

1 0

Jacek Caban : dmusicf.h: Move typedef below enum declarations.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: f6c3b07e9f5acf01c76520462f1ffdde5e711522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c3b07e9f5acf01c7652046… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 14:46:50 2020 +0200 dmusicf.h: Move typedef below enum declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dmusicf.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/dmusicf.h b/include/dmusicf.h index bf488e563e..ebf5e551e6 100644 --- a/include/dmusicf.h +++ b/include/dmusicf.h @@ -320,11 +320,6 @@ extern "C" { /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_VARIATIONT_TYPES DMUS_VARIATIONT_TYPES; -typedef enum enumDMUS_EMBELLISHT_TYPES DMUS_EMBELLISHT_TYPES; -typedef enum enumDMUS_PATTERNT_TYPES DMUS_PATTERNT_TYPES; - /* actual enumerations */ enum enumDMUS_VARIATIONT_TYPES { DMUS_VARIATIONT_SEQUENTIAL = 0x0, @@ -353,6 +348,10 @@ enum enumDMUS_PATTERNT_TYPES { DMUS_PATTERNT_RANDOM_ROW = 0x5 }; +typedef enum enumDMUS_VARIATIONT_TYPES DMUS_VARIATIONT_TYPES; +typedef enum enumDMUS_EMBELLISHT_TYPES DMUS_EMBELLISHT_TYPES; +typedef enum enumDMUS_PATTERNT_TYPES DMUS_PATTERNT_TYPES; + /***************************************************************************** * Structures

1 0

Gijs Vermeulen : ucrtbase: Add more _o forwards.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 8119865d479fe54bac27f996f153091b479735bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8119865d479fe54bac27f996… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 15 17:35:26 2020 +0200 ucrtbase: Add more _o forwards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49146 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 502 ++++++++++---------- dlls/ucrtbase/ucrtbase.spec | 504 ++++++++++----------- 2 files changed, 503 insertions(+), 503 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8119865d479fe54bac27…

1 0

Zebediah Figura : explorer: Implement IShellWindows::OnNavigate().
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 54e1559a253315f4243cbe405c82647dde3ac36d URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e1559a253315f4243cbe40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 23:29:42 2020 -0500 explorer: Implement IShellWindows::OnNavigate(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 5 ++++- programs/explorer/desktop.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index eea505ff61..207733afe7 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1068,8 +1068,11 @@ static void test_ShellWindows(void) ok(!ret, "Got window %#x.\n", ret); ok(!disp, "Got IDispatch %p.\n", &disp); + hr = IShellWindows_OnNavigate(shellwindows, 0, &v); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IShellWindows_OnNavigate(shellwindows, cookie, &v); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 53dcd21817..264a8cb810 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -151,6 +151,7 @@ struct window { LONG cookie, hwnd; int class; + ITEMIDLIST *pidl; }; struct shellwindows @@ -1241,10 +1242,40 @@ static HRESULT WINAPI shellwindows_Revoke(IShellWindows *iface, LONG cookie) return S_FALSE; } -static HRESULT WINAPI shellwindows_OnNavigate(IShellWindows *iface, LONG cookie, VARIANT *loc) +static HRESULT WINAPI shellwindows_OnNavigate(IShellWindows *iface, LONG cookie, VARIANT *location) { - FIXME("0x%x %s\n", cookie, debugstr_variant(loc)); - return E_NOTIMPL; + struct shellwindows *sw = impl_from_IShellWindows(iface); + unsigned int i; + + TRACE("iface %p, cookie %u, location %s.\n", iface, cookie, debugstr_variant(location)); + + if (V_VT(location) != (VT_ARRAY | VT_UI1)) + { + FIXME("Unexpected variant type %s.\n", debugstr_vt(V_VT(location))); + return E_NOTIMPL; + } + + EnterCriticalSection(&sw->cs); + + for (i = 0; i < sw->count; ++i) + { + if (sw->windows[i].cookie == cookie) + { + size_t len = V_ARRAY(location)->rgsabound[0].cElements; + if (!(sw->windows[i].pidl = realloc(sw->windows[i].pidl, len))) + { + LeaveCriticalSection(&sw->cs); + return E_OUTOFMEMORY; + } + memcpy(sw->windows[i].pidl, V_ARRAY(location)->pvData, len); + + LeaveCriticalSection(&sw->cs); + return S_OK; + } + } + + LeaveCriticalSection(&sw->cs); + return E_INVALIDARG; } static HRESULT WINAPI shellwindows_OnActivated(IShellWindows *iface, LONG cookie, VARIANT_BOOL active)

1 0

Paul Gofman : ntoskrnl.exe: Emulate full user shared data area range.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: b40be1d43bba7749d9c45dcd42219393300c8124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b40be1d43bba7749d9c45dcd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 18 12:25:50 2020 +0300 ntoskrnl.exe: Emulate full user shared data area range. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 0973b3a80a..dad4e5d660 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -33,6 +33,8 @@ #include "wine/debug.h" #include "wine/exception.h" +#define KSHARED_USER_DATA_PAGE_SIZE 0x1000 + #ifdef __i386__ WINE_DEFAULT_DEBUG_CHANNEL(int); @@ -790,9 +792,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1; SIZE_T offset = data - user_shared_data; - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { ULONGLONG temp = 0; + + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &temp, wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex ); context->Rip += prefixlen + len + 2; @@ -811,8 +815,9 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1; SIZE_T offset = data - user_shared_data; - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); switch (*instr) { case 0x8a: store_reg_byte( context, instr[1], wine_user_shared_data + offset, rex ); break; @@ -832,8 +837,9 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) SIZE_T offset = data - user_shared_data; len = long_addr ? sizeof(DWORD64) : sizeof(DWORD); - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution;

1 0