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
845156cc
Commit
845156cc
authored
Jul 08, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Introduce IOCTL_CONDRV_GET_RENDERER_EVENTS ioctl.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1320b15d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
2 deletions
+63
-2
condrv.h
include/wine/condrv.h
+3
-0
console.c
server/console.c
+60
-2
No files found.
include/wine/condrv.h
View file @
845156cc
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
#define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS)
#define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS)
#define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES)
#define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES)
/* console renderer ioctls */
#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES)
/* IOCTL_CONDRV_GET_INPUT_INFO result */
/* IOCTL_CONDRV_GET_INPUT_INFO result */
struct
condrv_input_info
struct
condrv_input_info
{
{
...
...
server/console.c
View file @
845156cc
...
@@ -116,6 +116,7 @@ struct console_input_events
...
@@ -116,6 +116,7 @@ struct console_input_events
int
num_alloc
;
/* number of allocated events */
int
num_alloc
;
/* number of allocated events */
int
num_used
;
/* number of actually used events */
int
num_used
;
/* number of actually used events */
struct
console_renderer_event
*
events
;
struct
console_renderer_event
*
events
;
struct
async_queue
read_q
;
/* read queue */
};
};
static
const
struct
object_ops
console_input_events_ops
=
static
const
struct
object_ops
console_input_events_ops
=
...
@@ -141,6 +142,8 @@ static const struct object_ops console_input_events_ops =
...
@@ -141,6 +142,8 @@ static const struct object_ops console_input_events_ops =
console_input_events_destroy
/* destroy */
console_input_events_destroy
/* destroy */
};
};
static
int
console_input_events_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
);
static
const
struct
fd_ops
console_input_events_fd_ops
=
static
const
struct
fd_ops
console_input_events_fd_ops
=
{
{
default_fd_get_poll_events
,
/* get_poll_events */
default_fd_get_poll_events
,
/* get_poll_events */
...
@@ -151,7 +154,7 @@ static const struct fd_ops console_input_events_fd_ops =
...
@@ -151,7 +154,7 @@ static const struct fd_ops console_input_events_fd_ops =
no_fd_flush
,
/* flush */
no_fd_flush
,
/* flush */
no_fd_get_file_info
,
/* get_file_info */
no_fd_get_file_info
,
/* get_file_info */
no_fd_get_volume_info
,
/* get_volume_info */
no_fd_get_volume_info
,
/* get_volume_info */
default_fd_ioctl
,
/* ioctl */
console_input_events_ioctl
,
/* ioctl */
default_fd_queue_async
,
/* queue_async */
default_fd_queue_async
,
/* queue_async */
default_fd_reselect_async
/* reselect_async */
default_fd_reselect_async
/* reselect_async */
};
};
...
@@ -300,6 +303,7 @@ static void console_input_events_destroy( struct object *obj )
...
@@ -300,6 +303,7 @@ static void console_input_events_destroy( struct object *obj )
{
{
struct
console_input_events
*
evts
=
(
struct
console_input_events
*
)
obj
;
struct
console_input_events
*
evts
=
(
struct
console_input_events
*
)
obj
;
assert
(
obj
->
ops
==
&
console_input_events_ops
);
assert
(
obj
->
ops
==
&
console_input_events_ops
);
free_async_queue
(
&
evts
->
read_q
);
if
(
evts
->
fd
)
release_object
(
evts
->
fd
);
if
(
evts
->
fd
)
release_object
(
evts
->
fd
);
free
(
evts
->
events
);
free
(
evts
->
events
);
}
}
...
@@ -319,12 +323,42 @@ static struct fd *console_input_events_get_fd( struct object* obj )
...
@@ -319,12 +323,42 @@ static struct fd *console_input_events_get_fd( struct object* obj )
return
(
struct
fd
*
)
grab_object
(
evts
->
fd
);
return
(
struct
fd
*
)
grab_object
(
evts
->
fd
);
}
}
/* retrieves events from the console's renderer events list */
static
int
get_renderer_events
(
struct
console_input_events
*
evts
,
struct
async
*
async
)
{
struct
iosb
*
iosb
=
async_get_iosb
(
async
);
data_size_t
num
;
num
=
min
(
iosb
->
out_size
/
sizeof
(
evts
->
events
[
0
]),
evts
->
num_used
);
if
(
num
&&
!
(
iosb
->
out_data
=
malloc
(
num
*
sizeof
(
evts
->
events
[
0
]
))))
{
async_terminate
(
async
,
STATUS_NO_MEMORY
);
release_object
(
iosb
);
return
0
;
}
iosb
->
status
=
STATUS_SUCCESS
;
iosb
->
out_size
=
iosb
->
result
=
num
*
sizeof
(
evts
->
events
[
0
]);
if
(
num
)
memcpy
(
iosb
->
out_data
,
evts
->
events
,
iosb
->
result
);
release_object
(
iosb
);
async_terminate
(
async
,
STATUS_ALERTED
);
if
(
num
&&
num
<
evts
->
num_used
)
{
memmove
(
&
evts
->
events
[
0
],
&
evts
->
events
[
num
],
(
evts
->
num_used
-
num
)
*
sizeof
(
evts
->
events
[
0
])
);
}
evts
->
num_used
-=
num
;
return
1
;
}
/* add an event to the console's renderer events list */
/* add an event to the console's renderer events list */
static
void
console_input_events_append
(
struct
console_input
*
console
,
static
void
console_input_events_append
(
struct
console_input
*
console
,
struct
console_renderer_event
*
evt
)
struct
console_renderer_event
*
evt
)
{
{
struct
console_input_events
*
evts
;
struct
console_input_events
*
evts
;
int
collapsed
=
FALSE
;
int
collapsed
=
FALSE
;
struct
async
*
async
;
if
(
!
(
evts
=
console
->
evt
))
return
;
if
(
!
(
evts
=
console
->
evt
))
return
;
/* to be done even when evt has been generated by the renderer ? */
/* to be done even when evt has been generated by the renderer ? */
...
@@ -357,7 +391,12 @@ static void console_input_events_append( struct console_input* console,
...
@@ -357,7 +391,12 @@ static void console_input_events_append( struct console_input* console,
}
}
evts
->
events
[
evts
->
num_used
++
]
=
*
evt
;
evts
->
events
[
evts
->
num_used
++
]
=
*
evt
;
}
}
wake_up
(
&
evts
->
obj
,
0
);
while
(
evts
->
num_used
&&
(
async
=
find_pending_async
(
&
evts
->
read_q
)))
{
get_renderer_events
(
evts
,
async
);
release_object
(
async
);
}
if
(
evts
->
num_used
)
wake_up
(
&
evts
->
obj
,
0
);
}
}
/* retrieves events from the console's renderer events list */
/* retrieves events from the console's renderer events list */
...
@@ -382,6 +421,7 @@ static struct console_input_events *create_console_input_events(void)
...
@@ -382,6 +421,7 @@ static struct console_input_events *create_console_input_events(void)
if
(
!
(
evt
=
alloc_object
(
&
console_input_events_ops
)))
return
NULL
;
if
(
!
(
evt
=
alloc_object
(
&
console_input_events_ops
)))
return
NULL
;
evt
->
num_alloc
=
evt
->
num_used
=
0
;
evt
->
num_alloc
=
evt
->
num_used
=
0
;
evt
->
events
=
NULL
;
evt
->
events
=
NULL
;
init_async_queue
(
&
evt
->
read_q
);
if
(
!
(
evt
->
fd
=
alloc_pseudo_fd
(
&
console_input_events_fd_ops
,
&
evt
->
obj
,
0
)))
if
(
!
(
evt
->
fd
=
alloc_pseudo_fd
(
&
console_input_events_fd_ops
,
&
evt
->
obj
,
0
)))
{
{
release_object
(
evt
);
release_object
(
evt
);
...
@@ -1600,6 +1640,24 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async
...
@@ -1600,6 +1640,24 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async
}
}
}
}
static
int
console_input_events_ioctl
(
struct
fd
*
fd
,
ioctl_code_t
code
,
struct
async
*
async
)
{
struct
console_input_events
*
evts
=
get_fd_user
(
fd
);
switch
(
code
)
{
case
IOCTL_CONDRV_GET_RENDERER_EVENTS
:
set_error
(
STATUS_PENDING
);
if
(
evts
->
num_used
)
return
get_renderer_events
(
evts
,
async
);
queue_async
(
&
evts
->
read_q
,
async
);
return
1
;
default:
set_error
(
STATUS_INVALID_HANDLE
);
return
0
;
}
}
static
struct
object_type
*
console_device_get_type
(
struct
object
*
obj
)
static
struct
object_type
*
console_device_get_type
(
struct
object
*
obj
)
{
{
static
const
WCHAR
name
[]
=
{
'D'
,
'e'
,
'v'
,
'i'
,
'c'
,
'e'
};
static
const
WCHAR
name
[]
=
{
'D'
,
'e'
,
'v'
,
'i'
,
'c'
,
'e'
};
...
...
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