April 2020 - Wine-devel - list.winehq.org

[PATCH 4/5] msvcp90: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Jacek Caban 24 Apr '20

24 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp90/exception.c | 8 ++------ dlls/msvcp90/ios.c | 8 ++------ dlls/msvcp90/locale.c | 8 ++------ dlls/msvcp90/misc.c | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-)

2 1

[PATCH 3/5] msvcp60: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Jacek Caban 24 Apr '20

24 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp60/ios.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

2 1

[PATCH 2/5] msvcirt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Jacek Caban 24 Apr '20

24 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

2 1

[PATCH 1/5] wine/asm.h: Introduce __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Jacek Caban 24 Apr '20

24 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/asm.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)

2 1

[PATCH 1/5] amstream/tests: Remove some no longer necessary callbacks.
by Zebediah Figura 24 Apr '20

24 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 4b7320500c..073e372c94 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2394,11 +2394,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_cleanup_stream = testfilter_cleanup_stream, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *requested) { @@ -2418,8 +2413,6 @@ static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = testsource_DecideBufferSize, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, -- 2.26.2

2 5

[PATCH 1/2] ntdll: Stub SystemModuleInformation and SystemModuleInformationEx.
by Andrew Wesie 24 Apr '20

24 Apr '20

Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/ntdll/nt.c | 61 +++++++++++++++++++++++++++++++++++++++++++--- include/winternl.h | 9 +++++++ 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6c95517e79..174543bb89 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2546,6 +2546,16 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; } +static void fake_ntoskrnl_system_module( SYSTEM_MODULE* sm ) +{ + static char ntoskrnl_path[] = "\\SystemRoot\\system32\\ntoskrnl.exe"; + char *sep; + memset(sm, 0, sizeof(*sm)); /* FIXME */ + strcpy((char *)sm->Name, ntoskrnl_path); + sep = strrchr((char *)sm->Name, '\\'); + sm->NameOffset = sep == NULL ? 0 : sep - (char *)sm->Name + 1; +} + /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -2869,9 +2879,54 @@ NTSTATUS WINAPI NtQuerySystemInformation( } break; case SystemModuleInformation: - /* FIXME: should be system-wide */ - if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; - else ret = LdrQueryProcessModuleInformation( SystemInformation, Length, &len ); + /* Whether this returns user modules depends on the Windows version. */ + len = FIELD_OFFSET( SYSTEM_MODULE_INFORMATION, Modules[1] ); + if (Length < len) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + } + else if (!SystemInformation) + { + ret = STATUS_ACCESS_VIOLATION; + } + else + { + SYSTEM_MODULE_INFORMATION *smi = SystemInformation; + FIXME("info_class SystemModuleInformation stub!\n"); + + smi->ModulesCount = 1; + fake_ntoskrnl_system_module(&smi->Modules[0]); + ret = STATUS_SUCCESS; + } + break; + case SystemModuleInformationEx: + /* Whether this returns user modules depends on the Windows version. */ + /* Length is sizeof(SYSTEM_MODULE_INFORMATION_EX) * (1 + number modules) */ + len = sizeof(SYSTEM_MODULE_INFORMATION_EX) * 2; + if (Length < len) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + } + else if (!SystemInformation) + { + ret = STATUS_ACCESS_VIOLATION; + } + else + { + SYSTEM_MODULE_INFORMATION_EX *p = SystemInformation; + FIXME("info_class SystemModuleInformationEx stub!\n"); + + p->NextOffset = sizeof(*p); + fake_ntoskrnl_system_module(&p->BaseInfo); + p->ImageCheckSum = 0; /* FIXME */ + p->TimeDateStamp = 0; + p->DefaultBase = NULL; + p++; + + /* Terminating entry has NextOffset == 0 */ + memset(p, 0, sizeof(*p)); + ret = STATUS_SUCCESS; + } break; case SystemHandleInformation: { diff --git a/include/winternl.h b/include/winternl.h index f36419da78..8740d532b3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2418,6 +2418,15 @@ typedef struct _SYSTEM_MODULE_INFORMATION SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +typedef struct _SYSTEM_MODULE_INFORMATION_EX +{ + USHORT NextOffset; + SYSTEM_MODULE BaseInfo; + ULONG ImageCheckSum; + ULONG TimeDateStamp; + void *DefaultBase; +} SYSTEM_MODULE_INFORMATION_EX, *PSYSTEM_MODULE_INFORMATION_EX; + #define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 #define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 #define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004 -- 2.24.2 (Apple Git-127)

2 4

[PATCH staging 0/4] Improve ntdll-WRITECOPY patchset.
by Andrew Wesie 24 Apr '20

24 Apr '20

Correctly fixing bug 48665 requires keeping track of which pages of a PAGE_WRITECOPY mapping have been modified. Thankfully, there is already a patchset in wine-staging that adds support for PAGE_WRITECOPY, but unfortunately it is disabled by default because it has some bugs. This series fixes the bugs I observed and adds an additional bit to keep track of whether the WRITECOPY pages have been modified. This can be used by QueryWorkingSetEx to properly report a page as shared or not. I suggest that these patches are first applied to wine-staging to shake out any other bugs in the patchset, since it had been disabled by default and these patches will unconditionally enable it for x86 and x64. Provided that no regressions are observed, we can consider whether it should go into upstream. I suspect performance regressions are also possible. Andrew Wesie (4): ntdll: Track if a WRITECOPY page has been modified. ntdll: Support WRITECOPY on x64. ntdll: Always enable WRITECOPY support. ntdll: Report unmodified WRITECOPY pages as shared. dlls/ntdll/signal_x86_64.c | 40 ++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 51 +++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 26 deletions(-) -- 2.24.2 (Apple Git-127)

2 8

[PATCH v2 1/2] ntdll/tests: Test that ptids are multiples of four.
by Rémi Bernon 24 Apr '20

24 Apr '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 8dc8bad645f6..91408e213310 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -401,13 +401,21 @@ static void test_query_process(void) if (!is_nt) { + DWORD_PTR tid; DWORD j; + + todo_wine_if(last_pid & 3) + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for ( j = 0; j < spi->dwThreadCount; j++) { k++; ok ( spi->ti[j].ClientId.UniqueProcess == spi->UniqueProcessId, "The owning pid of the thread (%p) doesn't equal the pid (%p) of the process\n", spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); + + tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; + todo_wine_if(tid & 3) + ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } } -- 2.26.1

2 3

[PATCH v2 3/3] ntdll: Use case sensitive search for \??\unix file names only.
by Paul Gofman 24 Apr '20

24 Apr '20

Files names are case insensitive on NTFS by default regardless of the OBJ_CASE_INSENSITIVE object attribute. 'Planet Zoo' which calls NtCreateFile() directly and does not specify the attribute depends on that. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix ntdll.spec file for changed wine_nt_to_unix_file_name(). dlls/kernel32/path.c | 4 ++-- dlls/ntdll/directory.c | 8 ++++---- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 4 ++-- dlls/ntdll/tests/file.c | 2 +- include/winternl.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 93759592c4..587ed59229 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -714,7 +714,7 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) return FALSE; } - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); + status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN ); RtlFreeUnicodeString( &nt_name ); if (!set_ntstatus( status )) { @@ -793,7 +793,7 @@ char * CDECL wine_get_unix_file_name( LPCWSTR dosW ) NTSTATUS status; if (!RtlDosPathNameToNtPathName_U( dosW, &nt_name, NULL, NULL )) return NULL; - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN_IF, FALSE ); + status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN_IF ); RtlFreeUnicodeString( &nt_name ); if (status && status != STATUS_NO_SUCH_FILE) { diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0df6c1ce42..e92570acda 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2672,7 +2672,6 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * char *unix_name; int name_len, unix_len; NTSTATUS status; - BOOLEAN check_case = !(attr->Attributes & OBJ_CASE_INSENSITIVE); if (!attr->ObjectName->Buffer && attr->ObjectName->Length) return STATUS_ACCESS_VIOLATION; @@ -2682,7 +2681,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * if (!attr->ObjectName->Buffer) return STATUS_OBJECT_PATH_SYNTAX_BAD; - return wine_nt_to_unix_file_name( attr->ObjectName, unix_name_ret, disposition, check_case ); + return wine_nt_to_unix_file_name( attr->ObjectName, unix_name_ret, disposition ); } name = attr->ObjectName->Buffer; @@ -2712,7 +2711,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) { status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, - disposition, check_case ); + disposition, FALSE ); if (fchdir( old_cwd ) == -1) chdir( "/" ); } else status = FILE_GetNtStatus(); @@ -2749,7 +2748,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * * returned, but the unix name is still filled in properly. */ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, - UINT disposition, BOOLEAN check_case ) + UINT disposition ) { static const WCHAR unixW[] = {'u','n','i','x'}; static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 }; @@ -2761,6 +2760,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI char *unix_name; int pos, ret, name_len, unix_len, prefix_len; WCHAR prefix[MAX_DIR_ENTRY_LEN + 1]; + BOOLEAN check_case = FALSE; BOOLEAN is_unix = FALSE; name = nameW->Buffer; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5705dd38d0..cc5d07a285 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2967,7 +2967,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, if (!so_name) { - if (wine_nt_to_unix_file_name( nt_name, &unix_name, FILE_OPEN, FALSE )) + if (wine_nt_to_unix_file_name( nt_name, &unix_name, FILE_OPEN )) return STATUS_DLL_NOT_FOUND; /* remove .so extension from Windows name */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 320f4d8ffd..4e66572133 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1586,7 +1586,7 @@ @ cdecl __wine_set_signal_handler(long ptr) # Filesystem -@ cdecl wine_nt_to_unix_file_name(ptr ptr long long) +@ cdecl wine_nt_to_unix_file_name(ptr ptr long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) # User shared data diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 28aa671f47..1202f61589 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1457,7 +1457,7 @@ static char *get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) if (!RtlDosPathNameToNtPathName_U( params->CurrentDirectory.DosPath.Buffer, &nt_name, NULL, NULL )) return NULL; - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN_IF, FALSE ); + status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN_IF ); RtlFreeUnicodeString( &nt_name ); if (status && status != STATUS_NO_SUCH_FILE) return NULL; return unix_name.Buffer; @@ -1478,7 +1478,7 @@ static NTSTATUS fork_and_exec( UNICODE_STRING *path, const RTL_USER_PROCESS_PARA ANSI_STRING unix_name; NTSTATUS status; - status = wine_nt_to_unix_file_name( path, &unix_name, FILE_OPEN, FALSE ); + status = wine_nt_to_unix_file_name( path, &unix_name, FILE_OPEN ); if (status) return status; #ifdef HAVE_PIPE2 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4243a7631c..f42f6173fb 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -369,7 +369,7 @@ static void open_file_test(void) attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &nameW; - attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, diff --git a/include/winternl.h b/include/winternl.h index f36419da78..c7653cd2a1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3129,7 +3129,7 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); /* Wine internal functions */ NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, - UINT disposition, BOOLEAN check_case ); + UINT disposition ); NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ); -- 2.25.3

1 0

[PATCH 1/3] wineusb: Quiet down unhandled minor function debug message
by Andrew Eikum 24 Apr '20

24 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- These three patches quiet down Wine dumping these ERRs and FIXMEs on every launch and exit when I have some USB device plugged in. dlls/wineusb.sys/wineusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 55bd84ea30..d5ebe7693d 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -274,7 +274,7 @@ static NTSTATUS fdo_pnp(IRP *irp) } default: - FIXME("Unhandled minor function %#x.\n", stack->MinorFunction); + TRACE("Unhandled minor function %#x.\n", stack->MinorFunction); } IoSkipCurrentIrpStackLocation(irp); @@ -382,7 +382,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) break; default: - FIXME("Unhandled minor function %#x.\n", stack->MinorFunction); + TRACE("Unhandled minor function %#x.\n", stack->MinorFunction); } irp->IoStatus.Status = ret; -- 2.26.2

2 2