diff --git a/patches/ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch b/patches/ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch index 3559cf8c..a12192d0 100644 --- a/patches/ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch +++ b/patches/ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch @@ -1,4 +1,4 @@ -From 1b29dfe82eab39b3fc91bfadb82c2822abcef859 Mon Sep 17 00:00:00 2001 +From 866f4f12b34e5dfdf24da8074c5d9d4aa7a7f77a Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Wed, 20 Aug 2014 11:26:48 -0600 Subject: ntdll: Perform the Unix-style hidden file check within the unified @@ -11,10 +11,10 @@ Subject: ntdll: Perform the Unix-style hidden file check within the unified 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c -index 94b6d77..9bb0e13 100644 +index 41e7115..3975612 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c -@@ -1214,15 +1214,15 @@ void DIR_init_options(void) +@@ -1209,17 +1209,17 @@ static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **contex * * Check if the specified file should be hidden based on its name and the show dot files option. */ @@ -24,6 +24,8 @@ index 94b6d77..9bb0e13 100644 - WCHAR *p, *end; + char *p, *end; + RtlRunOnceExecuteOnce( &init_once, init_options, NULL, NULL ); + if (show_dot_files) return FALSE; - end = p = name->Buffer + name->Length/sizeof(WCHAR); @@ -35,7 +37,7 @@ index 94b6d77..9bb0e13 100644 if (p == end || *p != '.') return FALSE; /* make sure it isn't '.' or '..' */ if (p + 1 == end) return FALSE; -@@ -1437,9 +1437,6 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK +@@ -1434,9 +1434,6 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK TRACE( "ignoring file %s\n", long_name ); return NULL; } @@ -46,10 +48,10 @@ index 94b6d77..9bb0e13 100644 if (io->Information + total_len > max_length) { diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 0b4754e..cfd967e 100644 +index 0b33acd..24c66bc 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c -@@ -213,6 +213,10 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr ) +@@ -218,6 +218,10 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr ) if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; } *attr |= get_file_attributes( st ); @@ -60,7 +62,7 @@ index 0b4754e..cfd967e 100644 len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 ); if (len == -1) return ret; *attr |= get_file_xattr( hexattr, len ); -@@ -2997,8 +3001,6 @@ NTSTATUS WINAPI SYSCALL(NtQueryFullAttributesFile)( const OBJECT_ATTRIBUTES *att +@@ -2996,8 +3000,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, info->AllocationSize = std.AllocationSize; info->EndOfFile = std.EndOfFile; info->FileAttributes = basic.FileAttributes; @@ -69,7 +71,7 @@ index 0b4754e..cfd967e 100644 } RtlFreeAnsiString( &unix_name ); } -@@ -3027,11 +3029,7 @@ NTSTATUS WINAPI SYSCALL(NtQueryAttributesFile)( const OBJECT_ATTRIBUTES *attr, F +@@ -3025,11 +3027,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) status = STATUS_INVALID_INFO_CLASS; else @@ -82,12 +84,12 @@ index 0b4754e..cfd967e 100644 } else WARN("%s not found (%x)\n", debugstr_us(attr->ObjectName), status ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 5ba1308..e46ba22 100644 +index 5e4c39e..345edb4 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -155,7 +155,7 @@ extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr, +@@ -152,7 +152,7 @@ extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr, + FILE_INFORMATION_CLASS class ) DECLSPEC_HIDDEN; extern NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) DECLSPEC_HIDDEN; - extern void DIR_init_options(void) DECLSPEC_HIDDEN; extern void DIR_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) DECLSPEC_HIDDEN; -extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ) DECLSPEC_HIDDEN; +extern BOOL DIR_is_hidden_file( const char *name ) DECLSPEC_HIDDEN; @@ -95,5 +97,5 @@ index 5ba1308..e46ba22 100644 extern NTSTATUS DIR_get_unix_cwd( char **cwd ) DECLSPEC_HIDDEN; extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ) DECLSPEC_HIDDEN; -- -2.6.1 +2.8.0 diff --git a/patches/ntdll-DOS_Attributes/definition b/patches/ntdll-DOS_Attributes/definition index 11321d9f..830a6e92 100644 --- a/patches/ntdll-DOS_Attributes/definition +++ b/patches/ntdll-DOS_Attributes/definition @@ -1,3 +1,3 @@ Fixes: [9158] Support for DOS hidden/system file attributes -Depends: ntdll-Syscall_Wrappers +# Depends: ntdll-Syscall_Wrappers Category: stable diff --git a/patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch b/patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch index 47ff18fa..dd6b4d7f 100644 --- a/patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch +++ b/patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch @@ -1,4 +1,4 @@ -From 9b3593fa8fd314cfed362318927450d9d14359e0 Mon Sep 17 00:00:00 2001 +From deef0e7d7fc154c8c10a07b5471775a639ac8596 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 6 Jun 2015 07:03:33 +0800 Subject: ntdll: Improve stub of NtQueryEaFile. @@ -10,15 +10,15 @@ Based on a patch by Qian Hong. 2 files changed, 98 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index f75463a..d1a7c4c 100644 +index b3bd9d6..d949388 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c -@@ -3324,14 +3324,25 @@ NTSTATUS WINAPI SYSCALL(NtQueryVolumeInformationFile)( HANDLE handle, PIO_STATUS +@@ -3319,14 +3319,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io + * Success: 0. Atrributes read into buffer * Failure: An NTSTATUS error code describing the error. */ - DEFINE_SYSCALL_ENTRYPOINT( NtQueryEaFile, 9 ); --NTSTATUS WINAPI SYSCALL(NtQueryEaFile)( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, -+NTSTATUS WINAPI SYSCALL(NtQueryEaFile)( HANDLE handle, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, +-NTSTATUS WINAPI NtQueryEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, ++NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, BOOLEAN single_entry, PVOID ea_list, ULONG ea_list_len, PULONG ea_index, BOOLEAN restart ) { @@ -44,7 +44,7 @@ index f75463a..d1a7c4c 100644 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c -index b8f1847..55e34ad 100644 +index 649b6b4..fcbf8df 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -79,6 +79,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV @@ -55,7 +55,7 @@ index b8f1847..55e34ad 100644 static inline BOOL is_signaled( HANDLE obj ) { -@@ -4192,6 +4193,86 @@ static void test_read_write(void) +@@ -4159,6 +4160,86 @@ static void test_read_write(void) CloseHandle(hfile); } @@ -142,7 +142,7 @@ index b8f1847..55e34ad 100644 START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); -@@ -4228,6 +4309,7 @@ START_TEST(file) +@@ -4195,6 +4276,7 @@ START_TEST(file) pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile"); @@ -150,12 +150,12 @@ index b8f1847..55e34ad 100644 test_read_write(); test_NtCreateFile(); -@@ -4249,4 +4331,5 @@ START_TEST(file) +@@ -4216,4 +4298,5 @@ START_TEST(file) test_file_disposition_information(); test_query_volume_information_file(); test_query_attribute_information_file(); + test_query_ea(); } -- -2.6.1 +2.8.0 diff --git a/patches/ntdll-NtQueryEaFile/definition b/patches/ntdll-NtQueryEaFile/definition index b0d69328..a8078de3 100644 --- a/patches/ntdll-NtQueryEaFile/definition +++ b/patches/ntdll-NtQueryEaFile/definition @@ -1,2 +1,2 @@ Fixes: Improve stub for NtQueryEaFile -Depends: ntdll-Syscall_Wrappers +# Depends: ntdll-Syscall_Wrappers diff --git a/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch b/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch index 5693e923..3623d580 100644 --- a/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch +++ b/patches/ntdll-NtQuerySection/0001-ntdll-Implement-NtQuerySection.patch @@ -1,23 +1,23 @@ -From d27ca5000c0fc51c6df0ec6751372f98704508dd Mon Sep 17 00:00:00 2001 +From 11aafdc465774d1b89836aa681f4af8b2bc85407 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 16 Oct 2014 23:24:37 +0200 Subject: ntdll: Implement NtQuerySection. (try 2) Some small modifications by Sebastian Lackner --- - dlls/ntdll/nt.c | 20 -------- + dlls/ntdll/nt.c | 19 -------- dlls/ntdll/ntdll.spec | 4 +- - dlls/ntdll/virtual.c | 96 +++++++++++++++++++++++++++++++++++++ + dlls/ntdll/virtual.c | 95 +++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- server/mapping.c | 42 ++++++++++++++++ server/protocol.def | 7 +++ - 6 files changed, 148 insertions(+), 23 deletions(-) + 6 files changed, 147 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index 02166e8..3ee5a52 100644 +index 47d7b31..f4d77a4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c -@@ -656,26 +656,6 @@ NTSTATUS WINAPI SYSCALL(NtPrivilegeCheck)( +@@ -646,25 +646,6 @@ NTSTATUS WINAPI NtPrivilegeCheck( } /* @@ -27,8 +27,7 @@ index 02166e8..3ee5a52 100644 -/****************************************************************************** - * NtQuerySection [NTDLL.@] - */ --DEFINE_SYSCALL_ENTRYPOINT( NtQuerySection, 5 ); --NTSTATUS WINAPI SYSCALL(NtQuerySection)( +-NTSTATUS WINAPI NtQuerySection( - IN HANDLE SectionHandle, - IN SECTION_INFORMATION_CLASS SectionInformationClass, - OUT PVOID SectionInformation, @@ -45,10 +44,10 @@ index 02166e8..3ee5a52 100644 */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index d3cd489..44bffc5 100644 +index 0a68144..c69934f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -267,7 +267,7 @@ +@@ -269,7 +269,7 @@ @ stdcall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess # @ stub NtQueryQuotaInformationFile @@ -57,7 +56,7 @@ index d3cd489..44bffc5 100644 @ stdcall NtQuerySecurityObject (long long long long long) @ stdcall NtQuerySemaphore (long long ptr long ptr) @ stdcall NtQuerySymbolicLinkObject(long ptr ptr) -@@ -1188,7 +1188,7 @@ +@@ -1190,7 +1190,7 @@ @ stdcall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess # @ stub ZwQueryQuotaInformationFile @@ -67,18 +66,17 @@ index d3cd489..44bffc5 100644 @ stdcall ZwQuerySemaphore(long long ptr long ptr) NtQuerySemaphore @ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) NtQuerySymbolicLinkObject diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 16a5a1b..5a8d85c 100644 +index 5c43d26..4f0e711 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c -@@ -2525,6 +2525,102 @@ NTSTATUS WINAPI SYSCALL(NtOpenSection)( HANDLE *handle, ACCESS_MASK access, cons +@@ -2517,6 +2517,101 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ /*********************************************************************** + * NtQuerySection (NTDLL.@) + */ -+DEFINE_SYSCALL_ENTRYPOINT( NtQuerySection, 5 ); -+NTSTATUS WINAPI SYSCALL(NtQuerySection)( HANDLE handle, SECTION_INFORMATION_CLASS info_class, -+ PVOID buffer, ULONG len, PULONG ret_len ) ++NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS info_class, ++ PVOID buffer, ULONG len, PULONG ret_len ) +{ + HANDLE dup_mapping, shared_file; + unsigned protect; @@ -174,7 +172,7 @@ index 16a5a1b..5a8d85c 100644 * ZwMapViewOfSection (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 1319ada..eb4aad2 100644 +index b688a3f..0c94d8e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1351,7 +1351,7 @@ @@ -290,5 +288,5 @@ index a5a45eb..fdc07a3 100644 obj_handle_t shared_file; /* shared mapping file handle */ @END -- -2.7.1 +2.8.0 diff --git a/patches/ntdll-NtQuerySection/definition b/patches/ntdll-NtQuerySection/definition index 28339a15..61652583 100644 --- a/patches/ntdll-NtQuerySection/definition +++ b/patches/ntdll-NtQuerySection/definition @@ -1,2 +1,2 @@ Fixes: [37338] Support for NtQuerySection -Depends: ntdll-Syscall_Wrappers +# Depends: ntdll-Syscall_Wrappers diff --git a/patches/ntdll-Syscall_Wrappers/definition b/patches/ntdll-Syscall_Wrappers/definition index 003fdabd..303ef86e 100644 --- a/patches/ntdll-Syscall_Wrappers/definition +++ b/patches/ntdll-Syscall_Wrappers/definition @@ -1 +1,2 @@ -Fixes: [39403] Use wrapper functions for syscalls to appease Chromium sandbox (32-bit) +# Fixes: [39403] Use wrapper functions for syscalls to appease Chromium sandbox (32-bit) +Disabled: true diff --git a/patches/ntdll-SystemRoot_Symlink/0001-ntdll-Add-special-handling-for-SystemRoot-to-satisfy.patch b/patches/ntdll-SystemRoot_Symlink/0001-ntdll-Add-special-handling-for-SystemRoot-to-satisfy.patch index bdb53ac9..54738529 100644 --- a/patches/ntdll-SystemRoot_Symlink/0001-ntdll-Add-special-handling-for-SystemRoot-to-satisfy.patch +++ b/patches/ntdll-SystemRoot_Symlink/0001-ntdll-Add-special-handling-for-SystemRoot-to-satisfy.patch @@ -1,4 +1,4 @@ -From c3a457db84cd6c95bbce802329840befdbe9057f Mon Sep 17 00:00:00 2001 +From bb213b463267c035887fbda1e5227da68705db39 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 17 Aug 2015 06:17:33 +0200 Subject: ntdll: Add special handling for \SystemRoot to satisfy MSYS2 @@ -9,7 +9,7 @@ Subject: ntdll: Add special handling for \SystemRoot to satisfy MSYS2 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c -index a45de9c..0c3f69e 100644 +index 35c3672..9a2539c 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -39,6 +39,7 @@ @@ -20,15 +20,15 @@ index a45de9c..0c3f69e 100644 WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -@@ -615,6 +616,7 @@ DEFINE_SYSCALL_ENTRYPOINT( NtOpenSymbolicLinkObject, 3 ); - NTSTATUS WINAPI SYSCALL(NtOpenSymbolicLinkObject)( HANDLE *handle, ACCESS_MASK access, +@@ -606,6 +607,7 @@ NTSTATUS WINAPI NtQueryDirectoryObject(HANDLE handle, PDIRECTORY_BASIC_INFORMATI + NTSTATUS WINAPI NtOpenSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr) { + static const WCHAR SystemRootW[] = {'\\','S','y','s','t','e','m','R','o','o','t'}; NTSTATUS ret; TRACE("(%p,0x%08x,%s)\n", handle, access, debugstr_ObjectAttributes(attr)); -@@ -622,6 +624,16 @@ NTSTATUS WINAPI SYSCALL(NtOpenSymbolicLinkObject)( HANDLE *handle, ACCESS_MASK a +@@ -613,6 +615,16 @@ NTSTATUS WINAPI NtOpenSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, if (!handle) return STATUS_ACCESS_VIOLATION; if ((ret = validate_open_object_attributes( attr ))) return ret; @@ -46,5 +46,5 @@ index a45de9c..0c3f69e 100644 { req->access = access; -- -2.7.0 +2.8.0 diff --git a/patches/ntdll-SystemRoot_Symlink/definition b/patches/ntdll-SystemRoot_Symlink/definition index 4ab537d3..7fd9a56c 100644 --- a/patches/ntdll-SystemRoot_Symlink/definition +++ b/patches/ntdll-SystemRoot_Symlink/definition @@ -1,3 +1,3 @@ Fixes: Fix detection of case-insensitive systems in MSYS2 Depends: ntdll-Exception -Depends: ntdll-Syscall_Wrappers +# Depends: ntdll-Syscall_Wrappers diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b758e7c6..66716a89 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -231,7 +231,6 @@ patch_enable_all () enable_ntdll_Stack_Guard_Page="$1" enable_ntdll_Stack_Overflow="$1" enable_ntdll_Status_Mapping="$1" - enable_ntdll_Syscall_Wrappers="$1" enable_ntdll_SystemInterruptInformation="$1" enable_ntdll_SystemRecommendedSharedDataAlignment="$1" enable_ntdll_SystemRoot_Symlink="$1" @@ -862,9 +861,6 @@ patch_enable () ntdll-Status_Mapping) enable_ntdll_Status_Mapping="$2" ;; - ntdll-Syscall_Wrappers) - enable_ntdll_Syscall_Wrappers="$2" - ;; ntdll-SystemInterruptInformation) enable_ntdll_SystemInterruptInformation="$2" ;; @@ -2130,11 +2126,7 @@ if test "$enable_ntdll_SystemRoot_Symlink" -eq 1; then if test "$enable_ntdll_Exception" -gt 1; then abort "Patchset ntdll-Exception disabled, but ntdll-SystemRoot_Symlink depends on that." fi - if test "$enable_ntdll_Syscall_Wrappers" -gt 1; then - abort "Patchset ntdll-Syscall_Wrappers disabled, but ntdll-SystemRoot_Symlink depends on that." - fi enable_ntdll_Exception=1 - enable_ntdll_Syscall_Wrappers=1 fi if test "$enable_ntdll_RtlIpStringToAddress_Tests" -eq 1; then @@ -2151,13 +2143,6 @@ if test "$enable_ntdll_Purist_Mode" -eq 1; then enable_ntdll_DllRedirects=1 fi -if test "$enable_ntdll_NtQuerySection" -eq 1; then - if test "$enable_ntdll_Syscall_Wrappers" -gt 1; then - abort "Patchset ntdll-Syscall_Wrappers disabled, but ntdll-NtQuerySection depends on that." - fi - enable_ntdll_Syscall_Wrappers=1 -fi - if test "$enable_ntdll_Junction_Points" -eq 1; then if test "$enable_ntdll_Fix_Free" -gt 1; then abort "Patchset ntdll-Fix_Free disabled, but ntdll-Junction_Points depends on that." @@ -2169,13 +2154,6 @@ if test "$enable_ntdll_Junction_Points" -eq 1; then enable_ntdll_NtQueryEaFile=1 fi -if test "$enable_ntdll_NtQueryEaFile" -eq 1; then - if test "$enable_ntdll_Syscall_Wrappers" -gt 1; then - abort "Patchset ntdll-Syscall_Wrappers disabled, but ntdll-NtQueryEaFile depends on that." - fi - enable_ntdll_Syscall_Wrappers=1 -fi - if test "$enable_ntdll_DllRedirects" -eq 1; then if test "$enable_ntdll_DllOverrides_WOW64" -gt 1; then abort "Patchset ntdll-DllOverrides_WOW64 disabled, but ntdll-DllRedirects depends on that." @@ -2187,13 +2165,6 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then enable_ntdll_Loader_Machine_Type=1 fi -if test "$enable_ntdll_DOS_Attributes" -eq 1; then - if test "$enable_ntdll_Syscall_Wrappers" -gt 1; then - abort "Patchset ntdll-Syscall_Wrappers disabled, but ntdll-DOS_Attributes depends on that." - fi - enable_ntdll_Syscall_Wrappers=1 -fi - if test "$enable_ntdll_CLI_Images" -eq 1; then if test "$enable_mscoree_CorValidateImage" -gt 1; then abort "Patchset mscoree-CorValidateImage disabled, but ntdll-CLI_Images depends on that." @@ -4586,38 +4557,8 @@ if test "$enable_ntdll_CLI_Images" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-Syscall_Wrappers -# | -# | This patchset fixes the following Wine bugs: -# | * [#39403] Use wrapper functions for syscalls to appease Chromium sandbox (32-bit) -# | -# | Modified files: -# | * dlls/ntdll/atom.c, dlls/ntdll/directory.c, dlls/ntdll/env.c, dlls/ntdll/error.c, dlls/ntdll/file.c, dlls/ntdll/loader.c, -# | dlls/ntdll/nt.c, dlls/ntdll/ntdll_misc.h, dlls/ntdll/om.c, dlls/ntdll/process.c, dlls/ntdll/reg.c, -# | dlls/ntdll/resource.c, dlls/ntdll/sec.c, dlls/ntdll/server.c, dlls/ntdll/signal_arm.c, dlls/ntdll/signal_arm64.c, -# | dlls/ntdll/signal_i386.c, dlls/ntdll/signal_powerpc.c, dlls/ntdll/signal_x86_64.c, dlls/ntdll/sync.c, -# | dlls/ntdll/thread.c, dlls/ntdll/time.c, dlls/ntdll/virtual.c, tools/winegcc/winegcc.c -# | -if test "$enable_ntdll_Syscall_Wrappers" -eq 1; then - patch_apply ntdll-Syscall_Wrappers/0001-winegcc-Pass-read_only_relocs-suppress-to-the-linker.patch - patch_apply ntdll-Syscall_Wrappers/0002-ntdll-Use-wrapper-functions-for-syscalls.patch - patch_apply ntdll-Syscall_Wrappers/0003-ntdll-APCs-should-call-the-implementation-instead-of.patch - patch_apply ntdll-Syscall_Wrappers/0004-ntdll-Syscalls-should-not-call-Nt-Ex-thunk-wrappers.patch - patch_apply ntdll-Syscall_Wrappers/0005-ntdll-Run-directory-initialization-function-early-du.patch - ( - echo '+ { "Sebastian Lackner", "winegcc: Pass '\''-read_only_relocs suppress'\'' to the linker on OSX.", 1 },'; - echo '+ { "Sebastian Lackner", "ntdll: Use wrapper functions for syscalls.", 1 },'; - echo '+ { "Sebastian Lackner", "ntdll: APCs should call the implementation instead of the syscall thunk.", 1 },'; - echo '+ { "Sebastian Lackner", "ntdll: Syscalls should not call Nt*Ex thunk wrappers.", 1 },'; - echo '+ { "Sebastian Lackner", "ntdll: Run directory initialization function early during the process startup.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-DOS_Attributes # | -# | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-Syscall_Wrappers -# | # | This patchset fixes the following Wine bugs: # | * [#9158] Support for DOS hidden/system file attributes # | @@ -4848,9 +4789,6 @@ fi # Patchset ntdll-NtQueryEaFile # | -# | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-Syscall_Wrappers -# | # | Modified files: # | * dlls/ntdll/file.c, dlls/ntdll/tests/file.c # | @@ -4864,7 +4802,7 @@ fi # Patchset ntdll-Junction_Points # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-Fix_Free, ntdll-Syscall_Wrappers, ntdll-NtQueryEaFile +# | * ntdll-Fix_Free, ntdll-NtQueryEaFile # | # | This patchset fixes the following Wine bugs: # | * [#12401] Support for Junction Points @@ -4906,9 +4844,6 @@ fi # Patchset ntdll-NtQuerySection # | -# | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-Syscall_Wrappers -# | # | This patchset fixes the following Wine bugs: # | * [#37338] Support for NtQuerySection # | @@ -5137,7 +5072,7 @@ fi # Patchset ntdll-SystemRoot_Symlink # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-Exception, ntdll-Syscall_Wrappers +# | * ntdll-Exception # | # | Modified files: # | * dlls/ntdll/om.c @@ -5850,7 +5785,7 @@ fi # Patchset server-Stored_ACLs # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-Syscall_Wrappers, ntdll-DOS_Attributes, server-File_Permissions +# | * ntdll-DOS_Attributes, server-File_Permissions # | # | This patchset fixes the following Wine bugs: # | * [#33576] Support for stored file ACLs @@ -5881,7 +5816,7 @@ fi # Patchset server-Inherited_ACLs # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-Syscall_Wrappers, ntdll-DOS_Attributes, server-File_Permissions, server-Stored_ACLs +# | * ntdll-DOS_Attributes, server-File_Permissions, server-Stored_ACLs # | # | Modified files: # | * dlls/advapi32/tests/security.c, server/file.c