wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Paul Gofman : xmllite: Avoid out of bounds access in readerinput_get_utf8_convlen().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 82d69d8ba92243242171e6be30c4d18543fe2c0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=82d69d8ba92243242171e6be… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 15 12:50:10 2021 +0300 xmllite: Avoid out of bounds access in readerinput_get_utf8_convlen(). And consequently in readerinput_shrinkraw(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 13d841eb94d..a5a75c29887 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -844,6 +844,8 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; + if (!buffer->written) + return MX_E_INPUTEND; return hr; } @@ -929,6 +931,8 @@ static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) encoded_buffer *buffer = &readerinput->buffer->encoded; int len = buffer->written; + assert(len); + /* complete single byte char */ if (!(buffer->data[len-1] & 0x80)) return len; @@ -966,6 +970,7 @@ static void readerinput_shrinkraw(xmlreaderinput *readerinput, int len) if (len == -1) len = readerinput_get_convlen(readerinput); + assert(len >= 0); memmove(buffer->data, buffer->data + buffer->cur + (buffer->written - len), len); /* everything below cur is lost too */ buffer->written -= len + buffer->cur; @@ -1068,7 +1073,9 @@ static HRESULT reader_more(xmlreader *reader) WCHAR *ptr; /* get some raw data from stream first */ - hr = readerinput_growraw(readerinput); + if (FAILED(hr = readerinput_growraw(readerinput))) + return hr; + len = readerinput_get_convlen(readerinput); prev_len = dest->written / sizeof(WCHAR);

1 0

Alexandre Julliard : ntdll/tests: Add some file system redirection tests.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: a0b77d71513dd0bb007545d517d874654b57e54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b77d71513dd0bb007545d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 12:58:48 2021 +0200 ntdll/tests: Add some file system redirection tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 105 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index d21a2e64f8e..6a423174664 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -841,6 +841,40 @@ done: pRtlFreeUnicodeString(&ntdirname); } +static NTSTATUS get_file_id( FILE_INTERNAL_INFORMATION *info, const WCHAR *root, const WCHAR *name ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; + + InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL ); + if (root) + { + RtlInitUnicodeString( &nameW, root ); + status = pNtOpenFile( &attr.RootDirectory, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE ); + if (status) return status; + } + if (name) + { + RtlInitUnicodeString( &nameW, name ); + status = pNtOpenFile( &handle, FILE_GENERIC_READ, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ); + if (attr.RootDirectory) NtClose( attr.RootDirectory ); + } + else handle = attr.RootDirectory; + + if (!status) + { + status = pNtQueryInformationFile( handle, &io, info, sizeof(*info), FileInternalInformation ); + NtClose( handle ); + } + return status; +} + static void test_redirection(void) { ULONG old, cur; @@ -908,6 +942,72 @@ static void test_redirection(void) ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); if (tls64) ok( *tls64 == FALSE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); + if (tls64) + { + static const struct + { + const WCHAR *root, *name; + NTSTATUS expect; + BOOL redirected; + NTSTATUS alt; + } tests[] = + { + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, TRUE }, + { NULL, L"\\??\\C:\\\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE, STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\??\\C:\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS, TRUE, STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\windows\\system32", L"kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\windows\\system32", NULL, STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\windows\\system32", L"drivers\\ndis.sys", STATUS_OBJECT_NAME_NOT_FOUND, FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\??\\C:\\windows\\system32", L"drivers\\etc\\hosts", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\??\\C:\\windows\\system32\\drivers", NULL, STATUS_SUCCESS, TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"\\??\\C:\\windows\\system32\\drivers\\etc", L"hosts", STATUS_SUCCESS, FALSE }, + { NULL, L"\\DosDevices\\C:\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\DosDevices\\C:\\windows\\system32", L"kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\DosDevices\\C:\\windows\\system32", NULL, STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\system32", L"drivers\\ndis.sys", STATUS_OBJECT_NAME_NOT_FOUND, FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\DosDevices\\C:\\windows\\system32", L"drivers\\etc\\hosts", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\system32\\drivers", NULL, STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\system32\\drivers\\etc", NULL, STATUS_SUCCESS, FALSE }, + { NULL, L"\\??\\C:\\windows\\sysnative\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\??\\C:\\", L"windows\\sysnative\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\??\\C:\\windows", L"sysnative\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\??\\C:\\windows\\sysnative", L"kernel32.dll" , STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\windows\\sysnative", NULL, STATUS_SUCCESS, FALSE }, + { NULL, L"\\DosDevices\\C:\\windows\\sysnative\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\DosDevices\\C:\\", L"windows\\sysnative\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\DosDevices\\C:\\windows", L"sysnative\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\sysnative", L"kernel32.dll" , STATUS_OBJECT_NAME_NOT_FOUND }, + { L"\\DosDevices\\C:\\windows\\sysnative", NULL, STATUS_OBJECT_NAME_NOT_FOUND }, + }; + FILE_INTERNAL_INFORMATION info, info_redir; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + pRtlWow64EnableFsRedirection( FALSE ); + status = get_file_id( &info, tests[i].root, tests[i].name ); + ok( !status || status == tests[i].expect || (tests[i].alt && status == tests[i].alt), + "%u: got %x / %x for %s + %s without redirect\n", i, status, tests[i].expect, + debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); + if (status) memset( &info, 0xcc, sizeof(info) ); + pRtlWow64EnableFsRedirection( TRUE ); + status = get_file_id( &info_redir, tests[i].root, tests[i].name ); + ok( status == tests[i].expect || (tests[i].alt && status == tests[i].alt), + "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); + if (!status) + { + BOOL redirected = memcmp( &info_redir, &info, sizeof(info) ); + ok( !redirected == !tests[i].redirected, + "%u: was %sredirected for %s + %s\n", i, redirected ? "" : "not ", + debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); + } + } + } pRtlWow64EnableFsRedirectionEx( old, &cur ); } @@ -915,11 +1015,6 @@ START_TEST(directory) { WCHAR sysdir[MAX_PATH]; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - if (!hntdll) - { - skip("not running on NT, skipping test\n"); - return; - } pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile");

1 0

Alexandre Julliard : ntdll: Get rid of the rebuild_nt_name() helper.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 4e6da5942eef617e576df0f74a3617e1bc1aca27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6da5942eef617e576df0f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 15:02:19 2021 +0200 ntdll: Get rid of the rebuild_nt_name() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 5c68218f09d..b4d834b7855 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2963,29 +2963,6 @@ static NTSTATUS find_drive_rootA( LPCSTR *ppath, unsigned int len, int *drive_re } -/****************************************************************************** - * rebuild_nt_name - */ -static void rebuild_nt_name( const UNICODE_STRING *nameW, DWORD prefix_len, - const char *unix_name, UNICODE_STRING *nt_name ) -{ - WCHAR *buf; - DWORD len; - - while (*unix_name == '/') unix_name++; - nt_name->MaximumLength = (prefix_len + strlen(unix_name) + 2) * sizeof(WCHAR); - if (!(buf = malloc( nt_name->MaximumLength ))) return; - nt_name->Buffer = buf; - memcpy( buf, nameW->Buffer, prefix_len * sizeof(WCHAR) ); - if (prefix_len && buf[prefix_len - 1] != '\\') buf[prefix_len++] = '\\'; - buf += prefix_len; - len = ntdll_umbstowcs( unix_name, strlen(unix_name), buf, strlen(unix_name) ); - for (; len; len--, buf++) if (*buf == '/') *buf = '\\'; - *buf = 0; - nt_name->Length = (buf - nt_name->Buffer) * sizeof(WCHAR); -} - - /****************************************************************************** * find_file_id * @@ -3110,7 +3087,15 @@ done: { TRACE( "%s -> %s\n", wine_dbgstr_longlong(file_id), debugstr_a(unix_name) ); *unix_name_ret = unix_name; - if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); + + nt_name->MaximumLength = (strlen(unix_name) + 1) * sizeof(WCHAR); + if ((nt_name->Buffer = malloc( nt_name->MaximumLength ))) + { + DWORD i, len = ntdll_umbstowcs( unix_name, strlen(unix_name), nt_name->Buffer, strlen(unix_name) ); + nt_name->Buffer[len] = 0; + nt_name->Length = len * sizeof(WCHAR); + for (i = 0; i < len; i++) if (nt_name->Buffer[i] == '/') nt_name->Buffer[i] = '\\'; + } } else {

1 0

Alexandre Julliard : ntdll: Reimplement file system redirection using NT pathname comparisons.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 7ef35b33936682c01f1c825b7d1b07567a691c12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef35b33936682c01f1c825b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 12:58:22 2021 +0200 ntdll: Reimplement file system redirection using NT pathname comparisons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 11 +- dlls/ntdll/unix/file.c | 362 ++++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 19 ++- dlls/ntdll/unix/process.c | 22 ++- dlls/ntdll/unix/unix_private.h | 7 +- 5 files changed, 239 insertions(+), 182 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef35b33936682c01f1c…

1 0

Alexandre Julliard : ntdll: Move create_startup_info() to env.c.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 8e7c6422e5a196b0e9acfaa4ca05b73468ec5a9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7c6422e5a196b0e9acfaa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 14:44:50 2021 +0200 ntdll: Move create_startup_info() to env.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 68 ----------------------------------------- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 70 insertions(+), 68 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 01d4f3ea418..33f96c65a7c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1897,6 +1897,23 @@ static inline WCHAR *get_dos_path( WCHAR *nt_path ) return nt_path; } +static inline const WCHAR *get_params_string( const RTL_USER_PROCESS_PARAMETERS *params, + const UNICODE_STRING *str ) +{ + if (params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED) return str->Buffer; + return (const WCHAR *)((const char *)params + (UINT_PTR)str->Buffer); +} + +static inline DWORD append_string( void **ptr, const RTL_USER_PROCESS_PARAMETERS *params, + const UNICODE_STRING *str ) +{ + const WCHAR *buffer = get_params_string( params, str ); + memcpy( *ptr, buffer, str->Length ); + *ptr = (WCHAR *)*ptr + str->Length / sizeof(WCHAR); + return str->Length; +} + + /************************************************************************* * build_initial_params * @@ -2113,6 +2130,58 @@ void init_startup_info(void) } +/*********************************************************************** + * create_startup_info + */ +void *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) +{ + startup_info_t *info; + DWORD size; + void *ptr; + + size = sizeof(*info); + size += params->CurrentDirectory.DosPath.Length; + size += params->DllPath.Length; + size += params->ImagePathName.Length; + size += params->CommandLine.Length; + size += params->WindowTitle.Length; + size += params->Desktop.Length; + size += params->ShellInfo.Length; + size += params->RuntimeInfo.Length; + size = (size + 1) & ~1; + *info_size = size; + + if (!(info = calloc( size, 1 ))) return NULL; + + info->debug_flags = params->DebugFlags; + info->console_flags = params->ConsoleFlags; + info->console = wine_server_obj_handle( params->ConsoleHandle ); + info->hstdin = wine_server_obj_handle( params->hStdInput ); + info->hstdout = wine_server_obj_handle( params->hStdOutput ); + info->hstderr = wine_server_obj_handle( params->hStdError ); + info->x = params->dwX; + info->y = params->dwY; + info->xsize = params->dwXSize; + info->ysize = params->dwYSize; + info->xchars = params->dwXCountChars; + info->ychars = params->dwYCountChars; + info->attribute = params->dwFillAttribute; + info->flags = params->dwFlags; + info->show = params->wShowWindow; + + ptr = info + 1; + info->curdir_len = append_string( &ptr, params, &params->CurrentDirectory.DosPath ); + info->dllpath_len = append_string( &ptr, params, &params->DllPath ); + info->imagepath_len = append_string( &ptr, params, &params->ImagePathName ); + info->cmdline_len = append_string( &ptr, params, &params->CommandLine ); + info->title_len = append_string( &ptr, params, &params->WindowTitle ); + info->desktop_len = append_string( &ptr, params, &params->Desktop ); + info->shellinfo_len = append_string( &ptr, params, &params->ShellInfo ); + info->runtime_len = append_string( &ptr, params, &params->RuntimeInfo ); + return info; +} + + /************************************************************************** * NtGetNlsSectionPtr (NTDLL.@) */ diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 8d50f5a006d..bd3bba7ca8f 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -156,74 +156,6 @@ static char **build_argv( const UNICODE_STRING *cmdline, int reserved ) } -static inline const WCHAR *get_params_string( const RTL_USER_PROCESS_PARAMETERS *params, - const UNICODE_STRING *str ) -{ - if (params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED) return str->Buffer; - return (const WCHAR *)((const char *)params + (UINT_PTR)str->Buffer); -} - -static inline DWORD append_string( void **ptr, const RTL_USER_PROCESS_PARAMETERS *params, - const UNICODE_STRING *str ) -{ - const WCHAR *buffer = get_params_string( params, str ); - memcpy( *ptr, buffer, str->Length ); - *ptr = (WCHAR *)*ptr + str->Length / sizeof(WCHAR); - return str->Length; -} - -/*********************************************************************** - * create_startup_info - */ -static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) -{ - startup_info_t *info; - DWORD size; - void *ptr; - - size = sizeof(*info); - size += params->CurrentDirectory.DosPath.Length; - size += params->DllPath.Length; - size += params->ImagePathName.Length; - size += params->CommandLine.Length; - size += params->WindowTitle.Length; - size += params->Desktop.Length; - size += params->ShellInfo.Length; - size += params->RuntimeInfo.Length; - size = (size + 1) & ~1; - *info_size = size; - - if (!(info = calloc( size, 1 ))) return NULL; - - info->debug_flags = params->DebugFlags; - info->console_flags = params->ConsoleFlags; - info->console = wine_server_obj_handle( params->ConsoleHandle ); - info->hstdin = wine_server_obj_handle( params->hStdInput ); - info->hstdout = wine_server_obj_handle( params->hStdOutput ); - info->hstderr = wine_server_obj_handle( params->hStdError ); - info->x = params->dwX; - info->y = params->dwY; - info->xsize = params->dwXSize; - info->ysize = params->dwYSize; - info->xchars = params->dwXCountChars; - info->ychars = params->dwYCountChars; - info->attribute = params->dwFillAttribute; - info->flags = params->dwFlags; - info->show = params->wShowWindow; - - ptr = info + 1; - info->curdir_len = append_string( &ptr, params, &params->CurrentDirectory.DosPath ); - info->dllpath_len = append_string( &ptr, params, &params->DllPath ); - info->imagepath_len = append_string( &ptr, params, &params->ImagePathName ); - info->cmdline_len = append_string( &ptr, params, &params->CommandLine ); - info->title_len = append_string( &ptr, params, &params->WindowTitle ); - info->desktop_len = append_string( &ptr, params, &params->Desktop ); - info->shellinfo_len = append_string( &ptr, params, &params->ShellInfo ); - info->runtime_len = append_string( &ptr, params, &params->RuntimeInfo ); - return info; -} - - /*********************************************************************** * get_so_file_info */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 4c50307fc6b..e1732b0017a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -141,6 +141,7 @@ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HIDDEN; extern void init_startup_info(void) DECLSPEC_HIDDEN; +extern void *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) DECLSPEC_HIDDEN; extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) DECLSPEC_HIDDEN; extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wine.inf: Fix the Tcpip database path.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: a7a1e2643afd93de4fc123a9113834da59aed43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a1e2643afd93de4fc123a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 17:28:13 2021 +0200 wine.inf: Fix the Tcpip database path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50318 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d16fe78dac..50156644d5f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3922,7 +3922,7 @@ ErrorControl=1 HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" -HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",2,"%11%\drivers" +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",,"%12%\etc" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16

1 0

Alexandre Julliard : ws2_32: Install network database files.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 50c40b913a9ac99162f9729ab8a0869ebaae9917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c40b913a9ac99162f9729a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 15:51:05 2021 +0200 ws2_32: Install network database files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12076 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/hosts | 1 + dlls/ws2_32/networks | 1 + dlls/ws2_32/protocol | 21 ++++ dlls/ws2_32/services | 325 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/version.rc | 12 ++ loader/wine.inf.in | 15 ++- 6 files changed, 371 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50c40b913a9ac99162f9…

1 0

Rémi Bernon : hidclass.sys: Assign rawinput device handle in HID_LinkDevice.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: f4d5f7e88a28c8b3501602aa3bcc80447886a440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d5f7e88a28c8b3501602aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 9 13:11:34 2021 +0200 hidclass.sys: Assign rawinput device handle in HID_LinkDevice. The handles are just numeric values and not real object handles, they are used in the hDevice field of the RAWINPUTHEADER struct. They will also be used as an HID rawinput device array index on the server side. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 17 +++++++++++++++++ dlls/hidclass.sys/hid.h | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 6ca5e39e648..7d198b99b34 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -71,6 +71,17 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT return STATUS_SUCCESS; } +/* user32 reserves 1 & 2 for winemouse and winekeyboard, + * keep this in sync with user_private.h */ +#define WINE_MOUSE_HANDLE 1 +#define WINE_KEYBOARD_HANDLE 2 + +static UINT32 alloc_rawinput_handle(void) +{ + static LONG counter = WINE_KEYBOARD_HANDLE + 1; + return InterlockedIncrement(&counter); +} + NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; @@ -125,7 +136,13 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { if (!IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_MOUSE, NULL, &ext->mouse_link_name)) ext->is_mouse = TRUE; + ext->rawinput_handle = WINE_MOUSE_HANDLE; } + else if (ext->preparseData->caps.UsagePage == HID_USAGE_PAGE_GENERIC + && ext->preparseData->caps.Usage == HID_USAGE_GENERIC_KEYBOARD) + ext->rawinput_handle = WINE_KEYBOARD_HANDLE; + else + ext->rawinput_handle = alloc_rawinput_handle(); return STATUS_SUCCESS; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 889b8c625c0..41f3766a535 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -51,6 +51,7 @@ typedef struct _BASE_DEVICE_EXTENSION { struct ReportRingBuffer *ring_buffer; HANDLE halt_event; HANDLE thread; + UINT32 rawinput_handle; KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue;

1 0

Rémi Bernon : user32: Add RAWINPUT parameter to __wine_send_input.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 123c17aa92ebdf789c42dc72c082abea45639eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=123c17aa92ebdf789c42dc72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 9 13:11:33 2021 +0200 user32: Add RAWINPUT parameter to __wine_send_input. And send_hardware_message. This makes it possible to use __wine_send_input to send extended input data, such as HID device notifications and WM_INPUT messages carrying HID reports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 6 +++--- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 2 +- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 ++-- dlls/winemac.drv/ime.c | 4 ++-- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 8 ++++---- include/winuser.h | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 7cf7e53a6c8..805bfe3e9de 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -119,9 +119,9 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) * * Internal SendInput function to allow the graphics driver to inject real events. */ -BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) +BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ) { - NTSTATUS status = send_hardware_message( hwnd, input, 0 ); + NTSTATUS status = send_hardware_message( hwnd, input, rawinput, 0 ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } @@ -210,7 +210,7 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) update_mouse_coords( &input ); /* fallthrough */ case INPUT_KEYBOARD: - status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ); + status = send_hardware_message( 0, &input, NULL, SEND_HWMSG_INJECTED ); break; case INPUT_HARDWARE: SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index def59998a52..f87ef9fb3af 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3227,7 +3227,7 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO /*********************************************************************** * send_hardware_message */ -NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) +NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, UINT flags ) { struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; struct send_message_info info; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4ef75247d71..190ee74fd6c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -834,5 +834,5 @@ # All functions must be prefixed with '__wine_' (for internal functions) # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # -@ cdecl __wine_send_input(long ptr) +@ cdecl __wine_send_input(long ptr ptr) @ cdecl __wine_set_pixel_format(long long) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7761a1ceb4f..dfd52421e66 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -263,7 +263,7 @@ extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) DECLSPEC_HIDDEN; +extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, UINT flags ) DECLSPEC_HIDDEN; extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 1c8a1e4f68f..0a6ede0ec5f 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -680,7 +680,7 @@ static void send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD flags ) input.u.ki.time = 0; input.u.ki.dwExtraInfo = 0; - __wine_send_input( hwnd, &input ); + __wine_send_input( hwnd, &input, NULL ); } /*********************************************************************** diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 79bc471a984..1cb1bbbadc9 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -521,7 +521,7 @@ static int process_events( DWORD mask ) } SERVER_END_REQ; } - __wine_send_input( capture ? capture : event->data.motion.hwnd, &event->data.motion.input ); + __wine_send_input( capture ? capture : event->data.motion.hwnd, &event->data.motion.input, NULL ); } break; @@ -535,7 +535,7 @@ static int process_events( DWORD mask ) event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wScan ); update_keyboard_lock_state( event->data.kbd.input.u.ki.wVk, event->data.kbd.lock_state ); - __wine_send_input( 0, &event->data.kbd.input ); + __wine_send_input( 0, &event->data.kbd.input, NULL ); break; default: diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index dabe6654f98..f2368c10743 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1427,10 +1427,10 @@ void macdrv_im_set_text(const macdrv_event *event) { input.ki.wScan = chars[i]; input.ki.dwFlags = KEYEVENTF_UNICODE; - __wine_send_input(hwnd, &input); + __wine_send_input(hwnd, &input, NULL); input.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; - __wine_send_input(hwnd, &input); + __wine_send_input(hwnd, &input, NULL); } } diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 1b74300e93a..1ea15f59341 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -929,7 +929,7 @@ static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, DWORD fl input.ki.time = time; input.ki.dwExtraInfo = 0; - __wine_send_input(hwnd, &input); + __wine_send_input(hwnd, &input, NULL); } diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index dd6443fe1ba..d2278ae0e4c 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -165,7 +165,7 @@ static void send_mouse_input(HWND hwnd, macdrv_window cocoa_window, UINT flags, input.mi.time = time; input.mi.dwExtraInfo = 0; - __wine_send_input(top_level_hwnd, &input); + __wine_send_input(top_level_hwnd, &input, NULL); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 35a801fc895..01620c5e4a4 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1148,7 +1148,7 @@ static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD f input.u.ki.time = time; input.u.ki.dwExtraInfo = 0; - __wine_send_input( hwnd, &input ); + __wine_send_input( hwnd, &input, NULL ); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 94dece652b6..42bac332664 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -659,7 +659,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU sync_window_cursor( window ); last_cursor_change = input->u.mi.time; } - __wine_send_input( hwnd, input ); + __wine_send_input( hwnd, input, NULL ); return; } @@ -699,7 +699,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU SERVER_END_REQ; } - __wine_send_input( hwnd, input ); + __wine_send_input( hwnd, input, NULL ); } #ifdef SONAME_LIBXCURSOR @@ -1669,7 +1669,7 @@ void move_resize_window( HWND hwnd, int dir ) input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; input.u.mi.time = GetTickCount(); input.u.mi.dwExtraInfo = 0; - __wine_send_input( hwnd, &input ); + __wine_send_input( hwnd, &input, NULL ); } while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) @@ -1900,7 +1900,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); + __wine_send_input( 0, &input, NULL ); return TRUE; } diff --git a/include/winuser.h b/include/winuser.h index 53661f6c788..0b1571c0a95 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4406,7 +4406,7 @@ static inline BOOL WINAPI SetRectEmpty(LPRECT rect) WORD WINAPI SYSTEM_KillSystemTimer( WORD ); #ifdef __WINESRC__ -WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ); +WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); #endif #ifdef __cplusplus

1 0

David Torok : ntdll: Add NtCreateThread stub.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 11ae0ade89d2ec50b255ac666c81cfccee8e30ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ae0ade89d2ec50b255ac66… Author: David Torok <dt(a)zeroitlab.com> Date: Wed Apr 14 21:08:32 2021 +0200 ntdll: Add NtCreateThread stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50952 Signed-off-by: David Torok <dt(a)zeroitlab.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/thread.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 881b57eb80a..a93fa08c406 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -183,7 +183,7 @@ @ stdcall -syscall NtCreateSection(ptr long ptr ptr long long long) @ stdcall -syscall NtCreateSemaphore(ptr long ptr long long) @ stdcall -syscall NtCreateSymbolicLinkObject(ptr long ptr ptr) -@ stub NtCreateThread +@ stdcall -syscall NtCreateThread(ptr long ptr long ptr ptr ptr long) @ stdcall -syscall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall -syscall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken @@ -1191,7 +1191,7 @@ @ stdcall -private -syscall ZwCreateSection(ptr long ptr ptr long long long) NtCreateSection @ stdcall -private -syscall ZwCreateSemaphore(ptr long ptr long long) NtCreateSemaphore @ stdcall -private -syscall ZwCreateSymbolicLinkObject(ptr long ptr ptr) NtCreateSymbolicLinkObject -@ stub ZwCreateThread +@ stdcall -private -syscall ZwCreateThread(ptr long ptr long ptr ptr ptr long) NtCreateThread @ stdcall -private -syscall ZwCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) NtCreateThreadEx @ stdcall -private -syscall ZwCreateTimer(ptr long ptr long) NtCreateTimer @ stub ZwCreateToken diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 543a214e056..b1c64f6f7a8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -144,6 +144,16 @@ static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id, TEB } } +/*********************************************************************** + * NtCreateThread (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, CLIENT_ID *id, CONTEXT *ctx, INITIAL_TEB *teb, + BOOLEAN suspended ) +{ + FIXME( "%p %d %p %p %p %p %p %d, stub!\n", handle, access, attr, process, id, ctx, teb, suspended ); + return STATUS_NOT_IMPLEMENTED; +} /*********************************************************************** * NtCreateThreadEx (NTDLL.@)

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
87
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 April 2021