You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 0c27d244f76ad90301c5db09d738b3a0389bcdac.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 06a8dec23dc20dae5ffe9288b7b85301b8118c0f Mon Sep 17 00:00:00 2001
|
||||
From 48d00ccab7205412a743438ae16fb209de9ff523 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Sat, 28 Mar 2020 13:17:25 -0500
|
||||
Subject: [PATCH] ntdll: Avoid fstatat().
|
||||
@@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: Avoid fstatat().
|
||||
3 files changed, 20 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
|
||||
index 993a661015..a37b287a5a 100644
|
||||
index d18df38f626..eb33c7f541a 100644
|
||||
--- a/dlls/ntdll/directory.c
|
||||
+++ b/dlls/ntdll/directory.c
|
||||
@@ -219,14 +219,13 @@ static const BOOL is_case_sensitive = FALSE;
|
||||
@@ -217,14 +217,13 @@ static const BOOL is_case_sensitive = FALSE;
|
||||
|
||||
static struct file_identity windir;
|
||||
|
||||
@@ -30,10 +30,10 @@ index 993a661015..a37b287a5a 100644
|
||||
|
||||
/* check if a given Unicode char is OK in a DOS short name */
|
||||
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
|
||||
index bd27d5a434..5173c203a2 100644
|
||||
index 9997a5e1cda..5d02f2fb181 100644
|
||||
--- a/dlls/ntdll/file.c
|
||||
+++ b/dlls/ntdll/file.c
|
||||
@@ -139,8 +139,24 @@ static inline ULONG get_file_attributes( const struct stat *st )
|
||||
@@ -138,8 +138,24 @@ static inline ULONG get_file_attributes( const struct stat *st )
|
||||
static BOOL fd_is_mount_point( int fd, const struct stat *st )
|
||||
{
|
||||
struct stat parent;
|
||||
@@ -61,17 +61,17 @@ index bd27d5a434..5173c203a2 100644
|
||||
|
||||
/* get the stat info and file attributes for a file (by file descriptor) */
|
||||
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|
||||
index 20feabf56b..2d98e5eab6 100644
|
||||
index 76e8ec284e8..b32de1d60e5 100644
|
||||
--- a/dlls/ntdll/ntdll_misc.h
|
||||
+++ b/dlls/ntdll/ntdll_misc.h
|
||||
@@ -169,6 +169,7 @@ extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES]
|
||||
@@ -190,6 +190,7 @@ extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES]
|
||||
extern NTSTATUS file_id_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, ANSI_STRING *unix_name_ret ) DECLSPEC_HIDDEN;
|
||||
extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING *unix_name_ret,
|
||||
UINT disposition ) DECLSPEC_HIDDEN;
|
||||
+extern RTL_CRITICAL_SECTION dir_section DECLSPEC_HIDDEN;
|
||||
|
||||
/* virtual memory */
|
||||
extern NTSTATUS virtual_alloc_aligned( PVOID *ret, unsigned short zero_bits_64, SIZE_T *size_ptr,
|
||||
extern NTSTATUS virtual_alloc( PVOID *ret, unsigned short zero_bits_64, SIZE_T *size_ptr,
|
||||
--
|
||||
2.25.2
|
||||
2.26.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user