July 2021 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_get_sample_function().
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: c2ea032a71245a0338a8aab958b48c110ac83d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2ea032a71245a0338a8aab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 8 10:36:53 2021 +0200 wined3d: Use wined3d_mask_from_size() in shader_glsl_get_sample_function(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eb805f43a9f..5ae90148dc8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3463,8 +3463,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) ++coord_size; sample_function->offset_size = offset ? deriv_size : 0; - sample_function->coord_mask = (1u << coord_size) - 1; - sample_function->deriv_mask = (1u << deriv_size) - 1; + sample_function->coord_mask = wined3d_mask_from_size(coord_size); + sample_function->deriv_mask = wined3d_mask_from_size(deriv_size); sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); }

1 0

Hugh McMaster : reg: Support use of registry views in the 'import' command.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 0c71a9879d894e4b82de2909c9c44e36c0bbb35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c71a9879d894e4b82de2909… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 8 21:12:16 2021 +1000 reg: Support use of registry views in the 'import' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 11 +++++++++-- programs/reg/tests/import.c | 48 ++++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 5750dbf0c79..36d148ca395 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -83,6 +83,7 @@ struct parser WCHAR two_wchars[2]; /* first two characters from the encoding check */ BOOL is_unicode; /* parsing Unicode or ASCII data */ short int reg_version; /* registry file version */ + REGSAM sam; /* 32-bit or 64-bit registry view (if set) */ HKEY hkey; /* current registry key */ WCHAR *key_name; /* current key name */ WCHAR *value_name; /* value name */ @@ -373,7 +374,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) return ERROR_INVALID_PARAMETER; res = RegCreateKeyExW(key_class, key_path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, &parser->hkey, NULL); + KEY_ALL_ACCESS|parser->sam, NULL, &parser->hkey, NULL); if (res == ERROR_SUCCESS) { @@ -980,6 +981,8 @@ int reg_import(int argc, WCHAR *argvW[]) if (argc > 4) goto invalid; + parser.sam = 0; + if (argc == 4) { WCHAR *str = argvW[3]; @@ -989,7 +992,11 @@ int reg_import(int argc, WCHAR *argvW[]) str++; - if (lstrcmpiW(str, L"reg:32") && lstrcmpiW(str, L"reg:64")) + if (!lstrcmpiW(str, L"reg:32")) + parser.sam = KEY_WOW64_32KEY; + else if (!lstrcmpiW(str, L"reg:64")) + parser.sam = KEY_WOW64_64KEY; + else goto invalid; } diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index edae8277eb3..976dd381f07 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -3728,20 +3728,20 @@ static void test_registry_view_win64(void) run_reg_exe("reg import reg5.reg /reg:32", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); - todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); - todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, 0); - todo_wine verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine open_key(hkey, "subkey", KEY_WOW64_32KEY, &subkey); - todo_wine verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); - todo_wine verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); - todo_wine close_key(subkey); - todo_wine close_key(hkey); + open_key(hkey, "subkey", KEY_WOW64_32KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); @@ -3819,20 +3819,20 @@ static void test_registry_view_wow64(void) run_reg_exe("reg import reg5.reg /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); - todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, 0); - todo_wine verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine open_key(hkey, "subkey", KEY_WOW64_64KEY, &subkey); - todo_wine verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); - todo_wine verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); - todo_wine close_key(subkey); - todo_wine close_key(hkey); + open_key(hkey, "subkey", KEY_WOW64_64KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY);

1 0

Alexandre Julliard : ntdll: Pass a length pointer instead of an IO_STATUS_BLOCK to the async callbacks.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 92a66c08ba7546e170b193c0209dd85d3dfc3eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a66c08ba7546e170b193c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:21:51 2021 +0200 ntdll: Pass a length pointer instead of an IO_STATUS_BLOCK to the async callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 27 +++++++++------------------ dlls/ntdll/unix/server.c | 9 +++++++-- dlls/ntdll/unix/socket.c | 20 ++++++++------------ dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 626a0957644..643daa5ab3f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4681,10 +4681,9 @@ static NTSTATUS wait_async( HANDLE handle, BOOL alertable ) } /* callback for irp async I/O completion */ -static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS irp_completion( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_irp *async = user; - ULONG information = 0; if (status == STATUS_ALERTED) { @@ -4693,20 +4692,15 @@ static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = virtual_locked_server_call( req ); - information = reply->size; + *info = reply->size; } SERVER_END_REQ; } - if (status != STATUS_PENDING) - { - io->u.Status = status; - io->Information = information; - release_fileio( &async->io ); - } + if (status != STATUS_PENDING) release_fileio( &async->io ); return status; } -static NTSTATUS async_read_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) +static NTSTATUS async_read_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_fileio_read *fileio = user; int fd, needs_close, result; @@ -4750,14 +4744,13 @@ static NTSTATUS async_read_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS sta } if (status != STATUS_PENDING) { - iosb->u.Status = status; - iosb->Information = fileio->already; + *info = fileio->already; release_fileio( &fileio->io ); } return status; } -static NTSTATUS async_write_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) +static NTSTATUS async_write_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_fileio_write *fileio = user; int result, fd, needs_close; @@ -4797,8 +4790,7 @@ static NTSTATUS async_write_proc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st } if (status != STATUS_PENDING) { - iosb->u.Status = status; - iosb->Information = fileio->already; + *info = fileio->already; release_fileio( &fileio->io ); } return status; @@ -6064,7 +6056,7 @@ NTSTATUS WINAPI NtUnlockFile( HANDLE handle, IO_STATUS_BLOCK *io_status, LARGE_I } -static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) +static NTSTATUS read_changes_apc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_fileio_read_changes *fileio = user; int size = 0; @@ -6133,8 +6125,7 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st if (status != STATUS_PENDING) { - iosb->u.Status = status; - iosb->Information = size; + *info = size; release_fileio( &fileio->io ); } return status; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1d82e806e17..c2efd36ca6f 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -379,11 +379,16 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); + ULONG_PTR info = 0; result->type = call->type; - result->async_io.status = user->callback( user, iosb, call->async_io.status ); + result->async_io.status = user->callback( user, &info, call->async_io.status ); if (result->async_io.status != STATUS_PENDING) - result->async_io.total = iosb->Information; + { + result->async_io.total = info; + iosb->Status = result->async_io.status; + iosb->Information = info; + } break; } case APC_VIRTUAL_ALLOC: diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e5abb3828c3..34796dbfd3d 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -543,7 +543,7 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz return status; } -static NTSTATUS async_recv_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_recv_ioctl *async = user; ULONG_PTR information = 0; @@ -566,8 +566,7 @@ static NTSTATUS async_recv_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS statu } if (status != STATUS_PENDING) { - io->Status = status; - io->Information = information; + *info = information; release_fileio( &async->io ); } return status; @@ -684,7 +683,7 @@ static ULONG_PTR fill_poll_output( struct async_poll_ioctl *async, NTSTATUS stat return offsetof( struct afd_poll_params, sockets[count] ); } -static NTSTATUS async_poll_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_poll_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_poll_ioctl *async = user; ULONG_PTR information = 0; @@ -704,8 +703,7 @@ static NTSTATUS async_poll_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { - io->Status = status; - io->Information = information; + *info = information; free( async->input ); release_fileio( &async->io ); } @@ -868,7 +866,7 @@ static NTSTATUS try_send( int fd, struct async_send_ioctl *async ) return STATUS_SUCCESS; } -static NTSTATUS async_send_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_send_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_send_ioctl *async = user; int fd, needs_close; @@ -890,8 +888,7 @@ static NTSTATUS async_send_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS statu } if (status != STATUS_PENDING) { - io->Status = status; - io->Information = async->sent_len; + *info = async->sent_len; release_fileio( &async->io ); } return status; @@ -1033,7 +1030,7 @@ static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_io return STATUS_SUCCESS; } -static NTSTATUS async_transmit_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +static NTSTATUS async_transmit_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { int sock_fd, file_fd = -1, sock_needs_close = FALSE, file_needs_close = FALSE; struct async_transmit_ioctl *async = user; @@ -1062,8 +1059,7 @@ static NTSTATUS async_transmit_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS s } if (status != STATUS_PENDING) { - io->Status = status; - io->Information = async->head_cursor + async->file_cursor + async->tail_cursor; + *info = async->head_cursor + async->file_cursor + async->tail_cursor; release_fileio( &async->io ); } return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3dae2e56258..e7320dbc1af 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -69,7 +69,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; } -typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); +typedef NTSTATUS async_callback_t( void *user, ULONG_PTR *info, NTSTATUS status ); struct async_fileio {

1 0

Alexandre Julliard : ntdll: Add a helper function to open a file object.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: f690266c1186593d1b17d84b89799e779e7483bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f690266c1186593d1b17d84b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:10 2021 +0200 ntdll: Add a helper function to open a file object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 643daa5ab3f..a655aa94715 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1844,6 +1844,27 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * } +static NTSTATUS server_open_file_object( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + ULONG sharing, ULONG options ) +{ + NTSTATUS status; + + SERVER_START_REQ( open_file_object ) + { + req->access = access; + req->attributes = attr->Attributes; + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); + req->sharing = sharing; + req->options = options; + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + status = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return status; +} + + /* retrieve device/inode number for all the drives */ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) { @@ -1970,8 +1991,8 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni init_unicode_string( &string, MOUNTMGR_DEVICE_NAME ); InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); - status = NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); + status = server_open_file_object( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); if (status) return status; status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, @@ -3747,18 +3768,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU if (io->u.Status == STATUS_BAD_DEVICE_TYPE) { - SERVER_START_REQ( open_file_object ) - { - req->access = access; - req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr->RootDirectory ); - req->sharing = sharing; - req->options = options; - wine_server_add_data( req, new_attr.ObjectName->Buffer, new_attr.ObjectName->Length ); - io->u.Status = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; + io->u.Status = server_open_file_object( handle, access, &new_attr, sharing, options ); if (io->u.Status == STATUS_SUCCESS) io->Information = FILE_OPENED; free( nt_name.Buffer ); return io->u.Status;

1 0

Alexandre Julliard : ntdll: Avoid calling NtOpenFile() from the Unix side.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 76f949577aac88bbde4e9e7b904587f5bc8c808d URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f949577aac88bbde4e9e7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:23 2021 +0200 ntdll: Avoid calling NtOpenFile() from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 9 +++++---- dlls/ntdll/unix/process.c | 15 ++++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 077c0058c83..b405624d7fb 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -162,7 +162,6 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) 's','o','r','t','i','n','g','\\',0}; NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; - IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; UNICODE_STRING valueW; WCHAR buffer[ARRAY_SIZE(sortdirW) + 16]; @@ -179,10 +178,12 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); - if (status == STATUS_NO_SUCH_FILE) - /* try to open file in system dir */ - status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + free( path ); + if (status != STATUS_NO_SUCH_FILE) return status; + if ((status = nt_to_unix_file_name( &attr, &path, FILE_OPEN ))) return status; + status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, + FILE_OPEN, FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); free( path ); return status; } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 90bf01d76fd..b85132af131 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -353,21 +353,26 @@ static WCHAR *get_nt_pathname( const UNICODE_STRING *str ) */ static int get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) { - UNICODE_STRING nt_name; + UNICODE_STRING nt_name, redir; OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle; int fd = -1; + char *unix_name; if (!(nt_name.Buffer = get_nt_pathname( &params->CurrentDirectory.DosPath ))) return -1; nt_name.Length = wcslen( nt_name.Buffer ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); - status = NtOpenFile( &handle, FILE_TRAVERSE | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + get_redirect( &attr, &redir ); + status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN ); free( nt_name.Buffer ); + free( redir.Buffer ); + if (status) return -1; + status = open_unix_file( &handle, unix_name, FILE_TRAVERSE | SYNCHRONIZE, &attr, 0, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + free( unix_name ); if (status) return -1; wine_server_handle_to_fd( handle, FILE_TRAVERSE, &fd, NULL ); NtClose( handle );

1 0

Alexandre Julliard : ntdll: Avoid calling NtCreateFile() from the Unix side.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 07f8b0c84ad499065ee30a6ac67e6a2d5fcb3e75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f8b0c84ad499065ee30a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:41 2021 +0200 ntdll: Avoid calling NtCreateFile() from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 18 +++++++++++++----- dlls/ntdll/unix/registry.c | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a655aa94715..977b0dfbd51 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3919,12 +3919,20 @@ NTSTATUS WINAPI NtDeleteFile( OBJECT_ATTRIBUTES *attr ) { HANDLE handle; NTSTATUS status; - IO_STATUS_BLOCK io; + char *unix_name; + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES new_attr = *attr; - status = NtCreateFile( &handle, GENERIC_READ | GENERIC_WRITE | DELETE, attr, &io, NULL, 0, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, - FILE_DELETE_ON_CLOSE, NULL, 0 ); - if (status == STATUS_SUCCESS) NtClose( handle ); + get_redirect( &new_attr, &nt_name ); + if (!(status = nt_to_unix_file_name( &new_attr, &unix_name, FILE_OPEN ))) + { + if (!(status = open_unix_file( &handle, unix_name, GENERIC_READ | GENERIC_WRITE | DELETE, &new_attr, + 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, + FILE_DELETE_ON_CLOSE, NULL, 0 ))) + NtClose( handle ); + free( unix_name ); + } + free( nt_name.Buffer ); return status; } diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 9a572d7f44e..915b99d2c7f 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -661,14 +661,23 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil { NTSTATUS ret; HANDLE key; - IO_STATUS_BLOCK io; data_size_t len; struct object_attributes *objattr; + char *unix_name; + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES new_attr = *file; TRACE("(%p,%p)\n", attr, file); - ret = NtCreateFile( &key, GENERIC_READ | SYNCHRONIZE, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, - FILE_OPEN, 0, NULL, 0); + get_redirect( &new_attr, &nt_name ); + if (!(ret = nt_to_unix_file_name( &new_attr, &unix_name, FILE_OPEN ))) + { + ret = open_unix_file( &key, unix_name, GENERIC_READ | SYNCHRONIZE, + &new_attr, 0, 0, FILE_OPEN, 0, NULL, 0 ); + free( unix_name ); + } + free( nt_name.Buffer ); + if (ret) return ret; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;

1 0

Alexandre Julliard : ntdll: Avoid calling NtReadFile() from the Unix side.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 3f9d49809d4560c6739597d85d72316e207a0d10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f9d49809d4560c6739597d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 8 16:49:53 2021 +0200 ntdll: Avoid calling NtReadFile() from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index b85132af131..77fb81fe404 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -144,7 +144,7 @@ static char **build_argv( const UNICODE_STRING *cmdline, int reserved ) /*********************************************************************** * get_so_file_info */ -static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) +static BOOL get_so_file_info( int fd, pe_image_info_t *info ) { union { @@ -185,12 +185,9 @@ static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) IMAGE_DOS_HEADER mz; } header; - IO_STATUS_BLOCK io; - LARGE_INTEGER offset; + off_t pos; - offset.QuadPart = 0; - if (NtReadFile( handle, 0, NULL, NULL, &io, &header, sizeof(header), &offset, 0 )) return FALSE; - if (io.Information != sizeof(header)) return FALSE; + if (pread( fd, &header, sizeof(header), 0 ) != sizeof(header)) return FALSE; if (!memcmp( header.elf.magic, "\177ELF", 4 )) { @@ -213,20 +210,19 @@ static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) if (header.elf.type != 3 /* ET_DYN */) return FALSE; if (header.elf.class == 2 /* ELFCLASS64 */) { - offset.QuadPart = header.elf64.phoff; + pos = header.elf64.phoff; phnum = header.elf64.phnum; } else { - offset.QuadPart = header.elf.phoff; + pos = header.elf.phoff; phnum = header.elf.phnum; } while (phnum--) { - if (NtReadFile( handle, 0, NULL, NULL, &io, &type, sizeof(type), &offset, 0 )) return FALSE; - if (io.Information < sizeof(type)) return FALSE; + if (pread( fd, &type, sizeof(type), pos ) != sizeof(type)) return FALSE; if (type == 3 /* PT_INTERP */) return FALSE; - offset.QuadPart += (header.elf.class == 2) ? 56 : 32; + pos += (header.elf.class == 2) ? 56 : 32; } return TRUE; } @@ -290,7 +286,13 @@ static NTSTATUS get_pe_file_info( OBJECT_ATTRIBUTES *attr, HANDLE *handle, pe_im } else if (status == STATUS_INVALID_IMAGE_NOT_MZ) { - if (get_so_file_info( *handle, info )) return STATUS_SUCCESS; + int unix_fd, needs_close; + + if (!server_get_unix_fd( *handle, FILE_READ_DATA, &unix_fd, &needs_close, NULL, NULL )) + { + if (get_so_file_info( unix_fd, info )) status = STATUS_SUCCESS; + if (needs_close) close( unix_fd ); + } } return status; }

1 0

Zebediah Figura : wined3d: Move the uploads array in wined3d_deferred_context_record_command_list().
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 3f60840cdcdb601ff4c7c05865eafe506a3d7944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f60840cdcdb601ff4c7c058… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 11:40:05 2021 -0500 wined3d: Move the uploads array in wined3d_deferred_context_record_command_list(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51416 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f7e5009df46..089946cd83d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3698,30 +3698,24 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device object->device = deferred->c.device; if (!(object->data = heap_alloc(deferred->data_size))) - { - heap_free(object); - return E_OUTOFMEMORY; - } + goto out_free_list; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); if (!(object->resources = heap_alloc(deferred->resource_count * sizeof(*object->resources)))) - { - heap_free(object->data); - heap_free(object); - return E_OUTOFMEMORY; - } + goto out_free_data; object->resource_count = deferred->resource_count; memcpy(object->resources, deferred->resources, deferred->resource_count * sizeof(*object->resources)); /* Transfer our references to the resources to the command list. */ + if (!(object->uploads = heap_alloc(deferred->upload_count * sizeof(*object->uploads)))) + goto out_free_resources; + object->upload_count = deferred->upload_count; + memcpy(object->uploads, deferred->uploads, deferred->upload_count * sizeof(*object->uploads)); + /* Transfer our references to the resources to the command list. */ + if (!(object->command_lists = heap_alloc(deferred->command_list_count * sizeof(*object->command_lists)))) - { - heap_free(object->resources); - heap_free(object->data); - heap_free(object); - return E_OUTOFMEMORY; - } + goto out_free_uploads; object->command_list_count = deferred->command_list_count; memcpy(object->command_lists, deferred->command_lists, deferred->command_list_count * sizeof(*object->command_lists)); @@ -3729,6 +3723,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->data_size = 0; deferred->resource_count = 0; + deferred->upload_count = 0; deferred->command_list_count = 0; /* This is in fact recorded into a subsequent command list. */ @@ -3741,4 +3736,14 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device *list = object; return S_OK; + +out_free_uploads: + heap_free(object->uploads); +out_free_resources: + heap_free(object->resources); +out_free_data: + heap_free(object->data); +out_free_list: + heap_free(object); + return E_OUTOFMEMORY; }

1 0

Zebediah Figura : wined3d: Fix some memory leaks when destroying command lists.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: bc8dcae118dc7340db9105bb6a3310e9127c127c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc8dcae118dc7340db9105bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 11:40:06 2021 -0500 wined3d: Fix some memory leaks when destroying command lists. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 089946cd83d..3062becb153 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -66,6 +66,8 @@ static void wined3d_command_list_destroy_object(void *object) for (i = 0; i < list->upload_count; ++i) heap_free(list->uploads[i].sysmem); + heap_free(list->command_lists); + heap_free(list->uploads); heap_free(list->resources); heap_free(list->data); heap_free(list); @@ -95,6 +97,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) wined3d_resource_decref(list->resources[i]); + for (i = 0; i < list->upload_count; ++i) + wined3d_resource_decref(list->uploads[i].resource); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); }

1 0

Zebediah Figura : wined3d: Fix some memory leaks when destroying deferred contexts.
by Alexandre Julliard 08 Jul '21

08 Jul '21

Module: wine Branch: master Commit: 82be8b676c8e588551c5b04a7f1996ee98655c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82be8b676c8e588551c5b04a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 7 11:40:07 2021 -0500 wined3d: Fix some memory leaks when destroying deferred contexts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3062becb153..3593e5bfb48 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3674,13 +3674,18 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte for (i = 0; i < deferred->resource_count; ++i) wined3d_resource_decref(deferred->resources[i]); + heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) { wined3d_resource_decref(deferred->uploads[i].resource); heap_free(deferred->uploads[i].sysmem); } - heap_free(deferred->resources); + heap_free(deferred->uploads); + + for (i = 0; i < deferred->command_list_count; ++i) + wined3d_command_list_decref(deferred->command_lists[i]); + heap_free(deferred->command_lists); wined3d_state_destroy(deferred->c.state); heap_free(deferred->data);

1 0