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
b682102d
Commit
b682102d
authored
Nov 16, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Set SPDRP_CONFIGFLAGS in SetupDiInstallDevice().
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=53387
parent
3a254079
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
ntoskrnl.c
dlls/ntoskrnl.exe/tests/ntoskrnl.c
+3
-6
devinst.c
dlls/setupapi/devinst.c
+5
-0
No files found.
dlls/ntoskrnl.exe/tests/ntoskrnl.c
View file @
b682102d
...
@@ -1820,12 +1820,9 @@ static void test_pnp_driver(struct testsign_context *ctx)
...
@@ -1820,12 +1820,9 @@ static void test_pnp_driver(struct testsign_context *ctx)
ret
=
SetupDiGetDeviceRegistryPropertyA
(
set
,
&
device
,
SPDRP_CONFIGFLAGS
,
ret
=
SetupDiGetDeviceRegistryPropertyA
(
set
,
&
device
,
SPDRP_CONFIGFLAGS
,
&
type
,
(
BYTE
*
)
&
dword
,
sizeof
(
dword
),
NULL
);
&
type
,
(
BYTE
*
)
&
dword
,
sizeof
(
dword
),
NULL
);
todo_wine
ok
(
ret
,
"got error %#lx
\n
"
,
GetLastError
());
ok
(
ret
,
"got error %#lx
\n
"
,
GetLastError
());
if
(
ret
)
ok
(
!
dword
,
"got flags %#lx
\n
"
,
dword
);
{
ok
(
type
==
REG_DWORD
,
"got type %lu
\n
"
,
type
);
ok
(
!
dword
,
"got flags %#lx
\n
"
,
dword
);
ok
(
type
==
REG_DWORD
,
"got type %lu
\n
"
,
type
);
}
/* Tests. */
/* Tests. */
...
...
dlls/setupapi/devinst.c
View file @
b682102d
...
@@ -5163,6 +5163,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
...
@@ -5163,6 +5163,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
static
const
WCHAR
addserviceW
[]
=
{
'A'
,
'd'
,
'd'
,
'S'
,
'e'
,
'r'
,
'v'
,
'i'
,
'c'
,
'e'
,
0
};
static
const
WCHAR
addserviceW
[]
=
{
'A'
,
'd'
,
'd'
,
'S'
,
'e'
,
'r'
,
'v'
,
'i'
,
'c'
,
'e'
,
0
};
static
const
WCHAR
rootW
[]
=
{
'r'
,
'o'
,
'o'
,
't'
,
'\\'
,
0
};
static
const
WCHAR
rootW
[]
=
{
'r'
,
'o'
,
'o'
,
't'
,
'\\'
,
0
};
WCHAR
section_ext
[
LINE_LEN
],
subsection
[
LINE_LEN
],
inf_path
[
MAX_PATH
],
*
extptr
,
*
filepart
;
WCHAR
section_ext
[
LINE_LEN
],
subsection
[
LINE_LEN
],
inf_path
[
MAX_PATH
],
*
extptr
,
*
filepart
;
static
const
DWORD
config_flags
=
0
;
UINT
install_flags
=
SPINST_ALL
;
UINT
install_flags
=
SPINST_ALL
;
HKEY
driver_key
,
device_key
;
HKEY
driver_key
,
device_key
;
SC_HANDLE
manager
,
service
;
SC_HANDLE
manager
,
service
;
...
@@ -5210,6 +5211,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
...
@@ -5210,6 +5211,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
return
FALSE
;
return
FALSE
;
}
}
if
(
!
SETUPDI_SetDeviceRegistryPropertyW
(
device
,
SPDRP_CONFIGFLAGS
,
(
BYTE
*
)
&
config_flags
,
sizeof
(
config_flags
)))
ERR
(
"Failed to set config flags, error %#lx.
\n
"
,
GetLastError
());
if
(
device
->
params
.
Flags
&
DI_NOFILECOPY
)
if
(
device
->
params
.
Flags
&
DI_NOFILECOPY
)
install_flags
&=
~
SPINST_FILES
;
install_flags
&=
~
SPINST_FILES
;
...
...
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