Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
81cda52d
Commit
81cda52d
authored
Nov 06, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntoskrnl.exe: BusRelations is also used when devices are removed.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ca683dca
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
6 deletions
+18
-6
pnp.c
dlls/ntoskrnl.exe/pnp.c
+15
-3
bus_iohid.c
dlls/winebus.sys/bus_iohid.c
+1
-1
bus_sdl.c
dlls/winebus.sys/bus_sdl.c
+1
-1
bus_udev.c
dlls/winebus.sys/bus_udev.c
+1
-1
No files found.
dlls/ntoskrnl.exe/pnp.c
View file @
81cda52d
...
...
@@ -435,6 +435,21 @@ static void handle_bus_relations( DEVICE_OBJECT *parent )
}
}
if
(
wine_parent
->
children
)
{
for
(
i
=
0
;
i
<
wine_parent
->
children
->
Count
;
++
i
)
{
DEVICE_OBJECT
*
child
=
wine_parent
->
children
->
Objects
[
i
];
if
(
!
device_in_list
(
relations
,
child
))
{
TRACE
(
"Removing device %p.
\n
"
,
child
);
remove_device
(
child
);
}
ObDereferenceObject
(
child
);
}
}
ExFreePool
(
wine_parent
->
children
);
wine_parent
->
children
=
relations
;
...
...
@@ -453,9 +468,6 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE
case
BusRelations
:
handle_bus_relations
(
device_object
);
break
;
case
RemovalRelations
:
remove_device
(
device_object
);
break
;
default:
FIXME
(
"Unhandled relation %#x.
\n
"
,
type
);
break
;
...
...
dlls/winebus.sys/bus_iohid.c
View file @
81cda52d
...
...
@@ -371,7 +371,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender,
device
=
bus_find_hid_device
(
&
iohid_vtbl
,
IOHIDDevice
);
if
(
device
)
{
IoInvalidateDeviceRelations
(
device
,
Removal
Relations
);
IoInvalidateDeviceRelations
(
bus_pdo
,
Bus
Relations
);
bus_remove_hid_device
(
device
);
}
}
...
...
dlls/winebus.sys/bus_sdl.c
View file @
81cda52d
...
...
@@ -902,7 +902,7 @@ static void try_remove_device(SDL_JoystickID id)
sdl_controller
=
private
->
sdl_controller
;
sdl_haptic
=
private
->
sdl_haptic
;
IoInvalidateDeviceRelations
(
device
,
Removal
Relations
);
IoInvalidateDeviceRelations
(
bus_pdo
,
Bus
Relations
);
bus_remove_hid_device
(
device
);
...
...
dlls/winebus.sys/bus_udev.c
View file @
81cda52d
...
...
@@ -1297,7 +1297,7 @@ static void try_remove_device(struct udev_device *dev)
#endif
if
(
!
device
)
return
;
IoInvalidateDeviceRelations
(
device
,
Removal
Relations
);
IoInvalidateDeviceRelations
(
bus_pdo
,
Bus
Relations
);
private
=
impl_from_DEVICE_OBJECT
(
device
);
...
...
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