December 2021 - Wine-commits

Esme Povirk : maintainers: Updating my email address.
by Alexandre Julliard 29 Dec '21

29 Dec '21

Module: wine Branch: master Commit: 58b1dc9f47310ba868cbcb3083de1b423247e7b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b1dc9f47310ba868cbcb30… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Dec 29 13:39:23 2021 -0600 maintainers: Updating my email address. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1f92c3a50b..97f9c78ae21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -118,7 +118,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -146,7 +146,7 @@ F: dlls/win32u/printdrv.c F: dlls/win32u/region.c GDIPlus -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -240,7 +240,7 @@ F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -280,7 +280,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 TWAIN -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -314,9 +314,10 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: tools/widl Windows Imaging Component -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ +F: dlls/wmphoto/ Windows Management Instrumentation M: Hans Leidekker <hans(a)codeweavers.com> @@ -376,7 +377,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */

1 0

Conor McCarthy : wined3d: Also check the internal format when determining GL raw blit compatibility.
by Alexandre Julliard 28 Dec '21

28 Dec '21

Module: wine Branch: master Commit: 586b52204e7524c4ee4f7a8c6001a6442e897a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586b52204e7524c4ee4f7a8c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 21 14:18:22 2021 +1000 wined3d: Also check the internal format when determining GL raw blit compatibility. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51935 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 851c3c36b82..a638ec4eeae 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6163,6 +6163,26 @@ static void raw_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de clear_rects, draw_rect, flags, colour, depth, stencil); } +static bool gl_formats_compatible(struct wined3d_texture *src_texture, DWORD src_location, + struct wined3d_texture *dst_texture, DWORD dst_location) +{ + GLuint src_internal, dst_internal; + bool src_ds, dst_ds; + + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + if (src_ds == dst_ds) + return true; + /* Also check the internal format because, e.g. WINED3DFMT_D24_UNORM_S8_UINT has nonzero depth and stencil + * sizes as does WINED3DFMT_R24G8_TYPELESS when bound with flag WINED3D_BIND_DEPTH_STENCIL, but these share + * the same internal format with WINED3DFMT_R24_UNORM_X8_TYPELESS. */ + src_internal = wined3d_gl_get_internal_format(&src_texture->resource, + wined3d_format_gl(src_texture->resource.format), src_location == WINED3D_LOCATION_TEXTURE_SRGB); + dst_internal = wined3d_gl_get_internal_format(&dst_texture->resource, + wined3d_format_gl(dst_texture->resource.format), dst_location == WINED3D_LOCATION_TEXTURE_SRGB); + return src_internal == dst_internal; +} + static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, @@ -6177,19 +6197,15 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; - bool src_ds, dst_ds; DWORD location; - src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; - dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; - /* If we would need to copy from a renderbuffer or drawable, we'd probably * be better off using the FBO blitter directly, since we'd need to use it * to copy the resource contents to the texture anyway. * * We also can't copy between depth/stencil and colour resources, since * the formats are considered incompatible in OpenGL. */ - if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_ds != dst_ds) + if (op != WINED3D_BLIT_OP_RAW_BLIT || !gl_formats_compatible(src_texture, src_location, dst_texture, dst_location) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)))))

1 0

Michael Stefaniuc : d3d10core/tests: Don't test stencil_ref again if it wasn't touched.
by Alexandre Julliard 28 Dec '21

28 Dec '21

Module: wine Branch: master Commit: 0b9ec86c26e1728b4c2428252bd2aaa41a37e785 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9ec86c26e1728b4c242825… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 17 23:49:07 2021 +0100 d3d10core/tests: Don't test stencil_ref again if it wasn't touched. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a1c4be46b7f..d7fc9efa901 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5717,7 +5717,6 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); tmp_ds_state = NULL; ID3D10Device_OMGetDepthStencilState(device, &tmp_ds_state, NULL); - ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D10DepthStencilState_Release(tmp_ds_state);

1 0

Gabriel Ivăncescu : winex11.drv: Map the window in UpdateLayeredWindow.
by Alexandre Julliard 28 Dec '21

28 Dec '21

Module: wine Branch: master Commit: a22dd45a79b80e1496820c7c7b81d9185755ff82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22dd45a79b80e1496820c7c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 22 20:17:03 2021 +0200 winex11.drv: Map the window in UpdateLayeredWindow. Fixes a regression introduced by 8892b79118fde5f2307ecbbdb03a8d0c489c8b3d, because set_window_pos is called before UpdateLayeredWindow, which calls the driver's WindowPosChanged earlier. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51984 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 29473ceba06..36fb41ac710 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2716,7 +2716,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO RECT rect, src_rect; HDC hdc = 0; HBITMAP dib; - BOOL ret = FALSE; + BOOL mapped, ret = FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -2737,8 +2737,18 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO else set_surface_color_key( surface, color_key ); if (surface) window_surface_add_ref( surface ); + mapped = data->mapped; release_win_data( data ); + /* layered windows are mapped only once their attributes are set */ + if (!mapped) + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + + if ((style & WS_VISIBLE) && ((style & WS_MINIMIZE) || is_window_rect_mapped( window_rect ))) + map_window( hwnd, style ); + } + if (!surface) return FALSE; if (!info->hdcSrc) {

1 0

Zebediah Figura : include: Fix the definition of D3D_PRIMITIVE enum members.
by Alexandre Julliard 28 Dec '21

28 Dec '21

Module: wine Branch: master Commit: 97d5aaeaa73ab47c4c8ae5a7356641e469b62036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97d5aaeaa73ab47c4c8ae5a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 25 18:29:08 2021 -0600 include: Fix the definition of D3D_PRIMITIVE enum members. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 05577d34daf..7a53a84079d 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -319,7 +319,7 @@ typedef enum D3D_PRIMITIVE D3D_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D_PRIMITIVE_23_CONTROL_POINT_PATCH, @@ -363,7 +363,7 @@ typedef enum D3D_PRIMITIVE D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH,

1 0

Alex Henrie : comctl32/tests: Use GetLocaleInfoA when the buffer size is in bytes (Coverity).
by Alexandre Julliard 28 Dec '21

28 Dec '21

Module: wine Branch: master Commit: b173a96237b1f1c02c642f3d4a57ecb507ebc664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b173a96237b1f1c02c642f3d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 26 16:17:26 2021 -0700 comctl32/tests: Use GetLocaleInfoA when the buffer size is in bytes (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index f26fb1bd3ca..affd21da825 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -56,7 +56,7 @@ static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); static void detect_locale(void) { DWORD reading_layout; - rtl = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, + rtl = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, (void *)&reading_layout, sizeof(reading_layout)) && reading_layout == 1; }

1 0

Alex Henrie : advapi32/tests: Accept a variable number of x's in some RegEnumValue name overflow tests.
by Alexandre Julliard 27 Dec '21

27 Dec '21

Module: wine Branch: master Commit: b75bd0627ee9152bab2b0e206bd1f40c59ddc8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75bd0627ee9152bab2b0e20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 26 23:21:18 2021 -0700 advapi32/tests: Accept a variable number of x's in some RegEnumValue name overflow tests. Fixes intermittent testbot failures. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ca371f73d65..af4ed1e8465 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -545,7 +545,7 @@ static void test_enum_value(void) data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); @@ -555,15 +555,16 @@ static void test_enum_value(void) /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow empty name */ val_count = 0; data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); @@ -572,8 +573,9 @@ static void test_enum_value(void) ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow data */ val_count = 20;

1 0

Alexandre Julliard : winecrt0: Check __WINE_PE_BUILD instead of compiler macros.
by Alexandre Julliard 27 Dec '21

27 Dec '21

Module: wine Branch: master Commit: 49ee0f58e8e1f993c2fb91c088bc88a373c16e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ee0f58e8e1f993c2fb91c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 15:01:47 2021 +0100 winecrt0: Check __WINE_PE_BUILD instead of compiler macros. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52287 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/register.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index ce4167b9647..757e424fed5 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -31,7 +31,7 @@ static inline void *image_base(void) { -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD extern IMAGE_DOS_HEADER __ImageBase; return (void *)&__ImageBase; #else

1 0

Alexandre Julliard : ntdll: Preserve the startup Unix directory unless it's on a removable device.
by Alexandre Julliard 27 Dec '21

27 Dec '21

Module: wine Branch: master Commit: 3e73437ae8f04a12200bf537758d22e5f9723637 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e73437ae8f04a12200bf537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 18:51:16 2021 +0100 ntdll: Preserve the startup Unix directory unless it's on a removable device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52256 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- dlls/ntdll/unix/server.c | 23 ++++++++++++----------- dlls/ntdll/unix/unix_private.h | 3 +++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 07bfa6c22c4..a29b5cbb980 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6223,7 +6223,7 @@ static inline BOOL is_device_placeholder( int fd ) return !memcmp( buffer, wine_placeholder, sizeof(wine_placeholder) - 1 ); } -static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) +NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) { struct stat st; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a388247beb2..b8c7ce715e6 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -75,6 +75,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winnt.h" +#include "winioctl.h" #include "wine/server.h" #include "wine/debug.h" #include "unix_private.h" @@ -1172,6 +1173,16 @@ static int setup_config_dir(void) } else if (errno != EEXIST) fatal_perror( "cannot create %s/dosdevices", config_dir ); + if (fd_cwd != -1) + { + FILE_FS_DEVICE_INFORMATION info; + if (!get_device_info( fd_cwd, &info ) && (info.Characteristics & FILE_REMOVABLE_MEDIA)) + { + close( fd_cwd ); + fd_cwd = -1; + } + } + if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY ); fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); return fd_cwd; @@ -1215,7 +1226,6 @@ static void server_connect_error( const char *serverdir ) * server_connect * * Attempt to connect to an existing server socket. - * We need to be in the server directory already. */ static int server_connect(void) { @@ -1544,16 +1554,7 @@ void server_init_process_done(void) { void *entry, *teb; NTSTATUS status; - int suspend, needs_close, unixdir; - - if (peb->ProcessParameters->CurrentDirectory.Handle && - !server_get_unix_fd( peb->ProcessParameters->CurrentDirectory.Handle, - FILE_TRAVERSE, &unixdir, &needs_close, NULL, NULL )) - { - fchdir( unixdir ); - if (needs_close) close( unixdir ); - } - else chdir( "/" ); /* avoid locking removable devices */ + int suspend; #ifdef __APPLE__ send_server_task_port(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d9ce8300fa9..42b03cab8f6 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -105,6 +105,8 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; +struct _FILE_FS_DEVICE_INFORMATION; + extern const char wine_build[] DECLSPEC_HIDDEN; extern const char *home_dir DECLSPEC_HIDDEN; @@ -267,6 +269,7 @@ extern NTSTATUS get_full_path( const WCHAR *name, const WCHAR *curdir, WCHAR **p extern NTSTATUS open_unix_file( HANDLE *handle, const char *unix_name, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, ULONG attributes, ULONG sharing, ULONG disposition, ULONG options, void *ea_buffer, ULONG ea_length ) DECLSPEC_HIDDEN; +extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *info ) DECLSPEC_HIDDEN; extern void init_files(void) DECLSPEC_HIDDEN; extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN;

1 0

Jacek Konieczny : winealsa.drv: Use separate port for each output device.
by Alexandre Julliard 27 Dec '21

27 Dec '21

Module: wine Branch: master Commit: 240f2f39632a08d81e8133dde20b441d8378ed0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=240f2f39632a08d81e8133dd… Author: Jacek Konieczny <jajcus(a)jajcus.net> Date: Sun Dec 19 15:20:28 2021 +0100 winealsa.drv: Use separate port for each output device. This fixes use of multiple MIDI outputs while keeping the flexibility of proper ALSA sequencer port subscriptions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52220 Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 55 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 073c0a6e3f3..a4d76a30fdf 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -83,6 +83,7 @@ typedef struct { void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; snd_seq_addr_t addr; + int port_out; } WINE_MIDIOUT; static WINE_MIDIIN MidiInDev [MAX_MIDIINDRV ]; @@ -106,7 +107,6 @@ static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; static int port_in; -static int port_out; static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */ static CRITICAL_SECTION_DEBUG critsect_debug = @@ -245,14 +245,6 @@ static int midiOpenSeq(BOOL create_client) /* Setting the client name is the only init to do */ snd_seq_set_client_name(midiSeq, "WINE midi driver"); - port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", - SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, - SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); - if (port_out < 0) - TRACE("Unable to create output port\n"); - else - TRACE("Outport port %d created successfully\n", port_out); - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); @@ -274,7 +266,6 @@ static int midiCloseSeq(void) { EnterCriticalSection(&midiSeqLock); if (--numOpenMidiSeq == 0) { - snd_seq_delete_simple_port(midiSeq, port_out); snd_seq_delete_simple_port(midiSeq, port_in); snd_seq_close(midiSeq); midiSeq = NULL; @@ -736,6 +727,8 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { int ret; + int port_out; + char port_out_name[32]; TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { @@ -782,12 +775,37 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; - /* Connect our app port to the device port */ EnterCriticalSection(&midiSeqLock); - ret = snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, - MidiOutDev[wDevID].addr.port); + /* Create a port dedicated to a specific device */ + /* Keep the old name without a number for the first port */ + if (wDevID) + sprintf(port_out_name, "WINE ALSA Output #%d", wDevID); + + port_out = snd_seq_create_simple_port(midiSeq, wDevID?port_out_name:"WINE ALSA Output", + SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); + + if (port_out < 0) { + TRACE("Unable to create output port\n"); + MidiOutDev[wDevID].port_out = -1; + } else { + TRACE("Outport port %d created successfully\n", port_out); + MidiOutDev[wDevID].port_out = port_out; + + /* Connect our app port to the device port */ + ret = snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, + MidiOutDev[wDevID].addr.port); + + /* usually will happen when the port is already connected */ + /* other errors should not be fatal either */ + if (ret < 0) + WARN("Could not connect port %d to %d:%d: %s\n", + wDevID, MidiOutDev[wDevID].addr.client, + MidiOutDev[wDevID].addr.port, snd_strerror(ret)); + } LeaveCriticalSection(&midiSeqLock); - if (ret < 0) + + if (port_out < 0) return MMSYSERR_NOTENABLED; TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); @@ -823,7 +841,9 @@ static DWORD modClose(WORD wDevID) case MOD_MIDIPORT: case MOD_SYNTH: EnterCriticalSection(&midiSeqLock); - snd_seq_disconnect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + snd_seq_delete_simple_port(midiSeq, MidiOutDev[wDevID].port_out); + MidiOutDev[wDevID].port_out = -1; LeaveCriticalSection(&midiSeqLock); midiCloseSeq(); break; @@ -868,7 +888,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) snd_seq_event_t event; snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); - snd_seq_ev_set_source(&event, port_out); + snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); snd_seq_ev_set_subs(&event); switch (evt & 0xF0) { @@ -1037,7 +1057,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); - snd_seq_ev_set_source(&event, port_out); + snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); snd_seq_ev_set_subs(&event); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); EnterCriticalSection(&midiSeqLock); @@ -1199,6 +1219,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* MidiOutDev[MODM_NumDevs].caps.wNotes = 16; } MidiOutDev[MODM_NumDevs].bEnabled = TRUE; + MidiOutDev[MODM_NumDevs].port_out = -1; TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" "\tALSA info: midi dev-type=%x, capa=0\n",

1 0