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
309914f3
Commit
309914f3
authored
Jul 08, 2011
by
Christian Inci
Committed by
Alexandre Julliard
Jul 09, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Fix return behaviour when the device key doesn't exist.
parent
94e057dd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
devinst.c
dlls/setupapi/devinst.c
+6
-1
devinst.c
dlls/setupapi/tests/devinst.c
+0
-1
No files found.
dlls/setupapi/devinst.c
View file @
309914f3
...
@@ -3728,8 +3728,13 @@ static HKEY SETUPDI_OpenDrvKey(struct DeviceInfo *devInfo, REGSAM samDesired)
...
@@ -3728,8 +3728,13 @@ static HKEY SETUPDI_OpenDrvKey(struct DeviceInfo *devInfo, REGSAM samDesired)
WCHAR
devId
[
10
];
WCHAR
devId
[
10
];
sprintfW
(
devId
,
fmt
,
devInfo
->
devId
);
sprintfW
(
devId
,
fmt
,
devInfo
->
devId
);
RegOpenKeyExW
(
classKey
,
devId
,
0
,
samDesired
,
&
key
);
l
=
RegOpenKeyExW
(
classKey
,
devId
,
0
,
samDesired
,
&
key
);
RegCloseKey
(
classKey
);
RegCloseKey
(
classKey
);
if
(
l
)
{
SetLastError
(
ERROR_KEY_DOES_NOT_EXIST
);
return
INVALID_HANDLE_VALUE
;
}
}
}
return
key
;
return
key
;
}
}
...
...
dlls/setupapi/tests/devinst.c
View file @
309914f3
...
@@ -974,7 +974,6 @@ static void testDevRegKey(void)
...
@@ -974,7 +974,6 @@ static void testDevRegKey(void)
key
=
pSetupDiOpenDevRegKey
(
set
,
&
devInfo
,
DICS_FLAG_GLOBAL
,
0
,
key
=
pSetupDiOpenDevRegKey
(
set
,
&
devInfo
,
DICS_FLAG_GLOBAL
,
0
,
DIREG_DRV
,
0
);
DIREG_DRV
,
0
);
/* The software key isn't created by default */
/* The software key isn't created by default */
todo_wine
ok
(
key
==
INVALID_HANDLE_VALUE
&&
ok
(
key
==
INVALID_HANDLE_VALUE
&&
GetLastError
()
==
ERROR_KEY_DOES_NOT_EXIST
,
GetLastError
()
==
ERROR_KEY_DOES_NOT_EXIST
,
"Expected ERROR_KEY_DOES_NOT_EXIST, got %08x
\n
"
,
GetLastError
());
"Expected ERROR_KEY_DOES_NOT_EXIST, got %08x
\n
"
,
GetLastError
());
...
...
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