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
382b2072
Commit
382b2072
authored
Nov 20, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Properly handle NtQueryInformationFile on console handles.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
74ec9773
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
2 deletions
+36
-2
console.c
dlls/kernel32/tests/console.c
+28
-0
console.c
server/console.c
+8
-2
No files found.
dlls/kernel32/tests/console.c
View file @
382b2072
...
@@ -3942,6 +3942,33 @@ static void test_console_title(void)
...
@@ -3942,6 +3942,33 @@ static void test_console_title(void)
}
}
}
}
static
void
test_file_info
(
HANDLE
input
,
HANDLE
output
)
{
FILE_STANDARD_INFORMATION
std_info
;
LARGE_INTEGER
size
;
IO_STATUS_BLOCK
io
;
NTSTATUS
status
;
BOOL
ret
;
if
(
skip_nt
)
return
;
status
=
NtQueryInformationFile
(
input
,
&
io
,
&
std_info
,
sizeof
(
std_info
),
FileStandardInformation
);
ok
(
status
==
STATUS_INVALID_DEVICE_REQUEST
,
"NtQueryInformationFile returned: %#x
\n
"
,
status
);
status
=
NtQueryInformationFile
(
output
,
&
io
,
&
std_info
,
sizeof
(
std_info
),
FileStandardInformation
);
ok
(
status
==
STATUS_INVALID_DEVICE_REQUEST
,
"NtQueryInformationFile returned: %#x
\n
"
,
status
);
ret
=
GetFileSizeEx
(
input
,
&
size
);
todo_wine
ok
(
!
ret
&&
GetLastError
()
==
ERROR_INVALID_FUNCTION
,
"GetFileSizeEx returned %x(%u)
\n
"
,
ret
,
GetLastError
());
ret
=
GetFileSizeEx
(
output
,
&
size
);
todo_wine
ok
(
!
ret
&&
GetLastError
()
==
ERROR_INVALID_FUNCTION
,
"GetFileSizeEx returned %x(%u)
\n
"
,
ret
,
GetLastError
());
}
static
void
test_AttachConsole_child
(
DWORD
console_pid
)
static
void
test_AttachConsole_child
(
DWORD
console_pid
)
{
{
HANDLE
pipe_in
,
pipe_out
;
HANDLE
pipe_in
,
pipe_out
;
...
@@ -4479,6 +4506,7 @@ START_TEST(console)
...
@@ -4479,6 +4506,7 @@ START_TEST(console)
}
}
test_GetConsoleScreenBufferInfoEx
(
hConOut
);
test_GetConsoleScreenBufferInfoEx
(
hConOut
);
test_SetConsoleScreenBufferInfoEx
(
hConOut
);
test_SetConsoleScreenBufferInfoEx
(
hConOut
);
test_file_info
(
hConIn
,
hConOut
);
test_console_title
();
test_console_title
();
if
(
!
test_current
)
if
(
!
test_current
)
{
{
...
...
server/console.c
View file @
382b2072
...
@@ -98,6 +98,7 @@ static const struct object_ops console_input_ops =
...
@@ -98,6 +98,7 @@ static const struct object_ops console_input_ops =
};
};
static
enum
server_fd_type
console_get_fd_type
(
struct
fd
*
fd
);
static
enum
server_fd_type
console_get_fd_type
(
struct
fd
*
fd
);
static
void
console_get_file_info
(
struct
fd
*
fd
,
obj_handle_t
handle
,
unsigned
int
info_class
);
static
int
console_input_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
);
static
int
console_input_read
(
struct
fd
*
fd
,
struct
async
*
async
,
file_pos_t
pos
);
static
int
console_input_flush
(
struct
fd
*
fd
,
struct
async
*
async
);
static
int
console_input_flush
(
struct
fd
*
fd
,
struct
async
*
async
);
static
int
console_input_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
);
static
int
console_input_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
);
...
@@ -110,7 +111,7 @@ static const struct fd_ops console_input_fd_ops =
...
@@ -110,7 +111,7 @@ static const struct fd_ops console_input_fd_ops =
console_input_read
,
/* read */
console_input_read
,
/* read */
no_fd_write
,
/* write */
no_fd_write
,
/* write */
console_input_flush
,
/* flush */
console_input_flush
,
/* flush */
no_fd_get_file_info
,
/* get_file_info */
console_get_file_info
,
/* get_file_info */
no_fd_get_volume_info
,
/* get_volume_info */
no_fd_get_volume_info
,
/* get_volume_info */
console_input_ioctl
,
/* ioctl */
console_input_ioctl
,
/* ioctl */
default_fd_queue_async
,
/* queue_async */
default_fd_queue_async
,
/* queue_async */
...
@@ -248,7 +249,7 @@ static const struct fd_ops screen_buffer_fd_ops =
...
@@ -248,7 +249,7 @@ static const struct fd_ops screen_buffer_fd_ops =
no_fd_read
,
/* read */
no_fd_read
,
/* read */
screen_buffer_write
,
/* write */
screen_buffer_write
,
/* write */
no_fd_flush
,
/* flush */
no_fd_flush
,
/* flush */
no_fd_get_file_info
,
/* get_file_info */
console_get_file_info
,
/* get_file_info */
no_fd_get_volume_info
,
/* get_volume_info */
no_fd_get_volume_info
,
/* get_volume_info */
screen_buffer_ioctl
,
/* ioctl */
screen_buffer_ioctl
,
/* ioctl */
default_fd_queue_async
,
/* queue_async */
default_fd_queue_async
,
/* queue_async */
...
@@ -420,6 +421,11 @@ static enum server_fd_type console_get_fd_type( struct fd *fd )
...
@@ -420,6 +421,11 @@ static enum server_fd_type console_get_fd_type( struct fd *fd )
return
FD_TYPE_CHAR
;
return
FD_TYPE_CHAR
;
}
}
static
void
console_get_file_info
(
struct
fd
*
fd
,
obj_handle_t
handle
,
unsigned
int
info_class
)
{
set_error
(
STATUS_INVALID_DEVICE_REQUEST
);
}
static
struct
object
*
create_console_input
(
void
)
static
struct
object
*
create_console_input
(
void
)
{
{
struct
console_input
*
console_input
;
struct
console_input
*
console_input
;
...
...
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