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
afba7d9d
Commit
afba7d9d
authored
May 22, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
May 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Call DIF_DESTROYPRIVATEDATA when deleting a device.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fce26e60
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
devinst.c
dlls/setupapi/devinst.c
+5
-0
devinst.c
dlls/setupapi/tests/devinst.c
+4
-4
No files found.
dlls/setupapi/devinst.c
View file @
afba7d9d
...
...
@@ -724,6 +724,11 @@ static void remove_device(struct device *device)
static
void
delete_device
(
struct
device
*
device
)
{
struct
device_iface
*
iface
,
*
next
;
SP_DEVINFO_DATA
device_data
;
device_data
.
cbSize
=
sizeof
(
device_data
);
copy_device_data
(
&
device_data
,
device
);
SetupDiCallClassInstaller
(
DIF_DESTROYPRIVATEDATA
,
device
->
set
,
&
device_data
);
if
(
device
->
phantom
)
remove_device
(
device
);
...
...
dlls/setupapi/tests/devinst.c
View file @
afba7d9d
...
...
@@ -2420,8 +2420,8 @@ static void test_class_installer(void)
SetupDiDestroyDeviceInfoList
(
set
);
todo_wine
ok
(
*
coinst_callback_count
==
1
,
"Got %d callbacks.
\n
"
,
*
coinst_callback_count
);
todo_wine
ok
(
*
coinst_last_message
==
DIF_DESTROYPRIVATEDATA
,
"Got unexpected message %#x.
\n
"
,
*
coinst_last_message
);
ok
(
*
coinst_callback_count
==
1
,
"Got %d callbacks.
\n
"
,
*
coinst_callback_count
);
ok
(
*
coinst_last_message
==
DIF_DESTROYPRIVATEDATA
,
"Got unexpected message %#x.
\n
"
,
*
coinst_last_message
);
*
coinst_callback_count
=
0
;
/* Test returning an error. */
...
...
@@ -2498,8 +2498,8 @@ static void test_class_installer(void)
SetupDiDestroyDeviceInfoList
(
set
);
todo_wine
ok
(
*
coinst_callback_count
==
1
,
"Got %d callbacks.
\n
"
,
*
coinst_callback_count
);
todo_wine
ok
(
*
coinst_last_message
==
DIF_DESTROYPRIVATEDATA
,
"Got unexpected message %#x.
\n
"
,
*
coinst_last_message
);
ok
(
*
coinst_callback_count
==
1
,
"Got %d callbacks.
\n
"
,
*
coinst_callback_count
);
ok
(
*
coinst_last_message
==
DIF_DESTROYPRIVATEDATA
,
"Got unexpected message %#x.
\n
"
,
*
coinst_last_message
);
*
coinst_callback_count
=
0
;
res
=
RegDeleteKeyA
(
class_key
,
""
);
...
...
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