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
922bc932
Commit
922bc932
authored
Feb 24, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Handle error translation in SetupDiDeleteDevRegKey().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f703c7f2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
10 deletions
+8
-10
devinst.c
dlls/setupapi/devinst.c
+8
-10
No files found.
dlls/setupapi/devinst.c
View file @
922bc932
...
@@ -586,7 +586,7 @@ static HKEY create_driver_key(struct device *device)
...
@@ -586,7 +586,7 @@ static HKEY create_driver_key(struct device *device)
return
INVALID_HANDLE_VALUE
;
return
INVALID_HANDLE_VALUE
;
}
}
static
BOOL
delete_driver_key
(
struct
device
*
device
)
static
LONG
delete_driver_key
(
struct
device
*
device
)
{
{
HKEY
key
;
HKEY
key
;
LONG
l
;
LONG
l
;
...
@@ -597,8 +597,7 @@ static BOOL delete_driver_key(struct device *device)
...
@@ -597,8 +597,7 @@ static BOOL delete_driver_key(struct device *device)
RegCloseKey
(
key
);
RegCloseKey
(
key
);
}
}
SetLastError
(
l
);
return
l
;
return
!
l
;
}
}
struct
PropertyMapEntry
struct
PropertyMapEntry
...
@@ -3571,7 +3570,6 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
...
@@ -3571,7 +3570,6 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
DWORD
Scope
,
DWORD
HwProfile
,
DWORD
KeyType
)
DWORD
Scope
,
DWORD
HwProfile
,
DWORD
KeyType
)
{
{
struct
device
*
device
;
struct
device
*
device
;
BOOL
ret
=
FALSE
;
LONG
l
;
LONG
l
;
TRACE
(
"devinfo %p, device_data %p, scope %d, profile %d, type %d.
\n
"
,
TRACE
(
"devinfo %p, device_data %p, scope %d, profile %d, type %d.
\n
"
,
...
@@ -3601,21 +3599,21 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
...
@@ -3601,21 +3599,21 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
switch
(
KeyType
)
switch
(
KeyType
)
{
{
case
DIREG_DRV
:
case
DIREG_DRV
:
ret
=
delete_driver_key
(
device
);
l
=
delete_driver_key
(
device
);
break
;
break
;
case
DIREG_BOTH
:
case
DIREG_BOTH
:
if
(
!
(
ret
=
delete_driver_key
(
device
)))
if
(
(
l
=
delete_driver_key
(
device
)))
break
;
break
;
/* fall through */
/* fall through */
case
DIREG_DEV
:
case
DIREG_DEV
:
l
=
RegDeleteKeyW
(
device
->
key
,
DeviceParameters
);
l
=
RegDeleteKeyW
(
device
->
key
,
DeviceParameters
);
SetLastError
(
l
);
ret
=
!
l
;
break
;
break
;
default:
default:
WARN
(
"unknown KeyType %d
\n
"
,
KeyType
);
FIXME
(
"Unhandled type %#x.
\n
"
,
KeyType
);
l
=
ERROR_CALL_NOT_IMPLEMENTED
;
}
}
return
ret
;
SetLastError
(
l
);
return
!
l
;
}
}
/***********************************************************************
/***********************************************************************
...
...
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