Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d4339869
Commit
d4339869
authored
Apr 12, 2023
by
Torge Matthies
Committed by
Alexandre Julliard
May 02, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Only infer hidden attribute from file name if xattr is not present.
Signed-off-by:
Torge Matthies
<
tmatthies@codeweavers.com
>
parent
a8b6966a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
file.c
dlls/ntdll/tests/file.c
+1
-1
file.c
dlls/ntdll/unix/file.c
+2
-3
No files found.
dlls/ntdll/tests/file.c
View file @
d4339869
...
@@ -4107,7 +4107,7 @@ static void test_dotfile_file_attributes(void)
...
@@ -4107,7 +4107,7 @@ static void test_dotfile_file_attributes(void)
status
=
nt_get_file_attrs
(
filename
,
&
attrs
);
status
=
nt_get_file_attrs
(
filename
,
&
attrs
);
ok
(
status
==
STATUS_SUCCESS
,
"got %#lx
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"got %#lx
\n
"
,
status
);
ok
(
attrs
&
FILE_ATTRIBUTE_SYSTEM
,
"got attributes %#lx
\n
"
,
attrs
);
ok
(
attrs
&
FILE_ATTRIBUTE_SYSTEM
,
"got attributes %#lx
\n
"
,
attrs
);
todo_wine
ok
(
!
(
attrs
&
FILE_ATTRIBUTE_HIDDEN
),
"got attributes %#lx
\n
"
,
attrs
);
ok
(
!
(
attrs
&
FILE_ATTRIBUTE_HIDDEN
),
"got attributes %#lx
\n
"
,
attrs
);
status
=
pNtQueryInformationFile
(
h
,
&
io
,
&
info
,
sizeof
(
info
),
FileBasicInformation
);
status
=
pNtQueryInformationFile
(
h
,
&
io
,
&
info
,
sizeof
(
info
),
FileBasicInformation
);
ok
(
status
==
STATUS_SUCCESS
,
"got %#lx
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"got %#lx
\n
"
,
status
);
...
...
dlls/ntdll/unix/file.c
View file @
d4339869
...
@@ -1681,14 +1681,13 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
...
@@ -1681,14 +1681,13 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
}
}
*
attr
|=
get_file_attributes
(
st
);
*
attr
|=
get_file_attributes
(
st
);
if
(
is_hidden_file
(
path
))
*
attr
|=
FILE_ATTRIBUTE_HIDDEN
;
attr_len
=
xattr_get
(
path
,
SAMBA_XATTR_DOS_ATTRIB
,
attr_data
,
sizeof
(
attr_data
)
-
1
);
attr_len
=
xattr_get
(
path
,
SAMBA_XATTR_DOS_ATTRIB
,
attr_data
,
sizeof
(
attr_data
)
-
1
);
if
(
attr_len
!=
-
1
)
if
(
attr_len
!=
-
1
)
*
attr
|=
parse_samba_dos_attrib_data
(
attr_data
,
attr_len
);
*
attr
|=
parse_samba_dos_attrib_data
(
attr_data
,
attr_len
);
else
else
{
{
if
(
is_hidden_file
(
path
))
*
attr
|=
FILE_ATTRIBUTE_HIDDEN
;
if
(
errno
==
ENOTSUP
)
return
ret
;
if
(
errno
==
ENOTSUP
)
return
ret
;
#ifdef ENODATA
#ifdef ENODATA
if
(
errno
==
ENODATA
)
return
ret
;
if
(
errno
==
ENODATA
)
return
ret
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment