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
a326c9ee
Commit
a326c9ee
authored
Mar 09, 2011
by
Austin English
Committed by
Alexandre Julliard
Mar 09, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Avoid shadowing a parameter.
parent
3631ee05
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
install.c
dlls/setupapi/install.c
+6
-6
No files found.
dlls/setupapi/install.c
View file @
a326c9ee
...
...
@@ -532,7 +532,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *
{
/* file is an executable, not a dll */
STARTUPINFOW
startup
;
PROCESS_INFORMATION
info
;
PROCESS_INFORMATION
process_
info
;
WCHAR
*
cmd_line
;
BOOL
res
;
static
const
WCHAR
format
[]
=
{
'"'
,
'%'
,
's'
,
'"'
,
' '
,
'%'
,
's'
,
0
};
...
...
@@ -546,7 +546,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *
memset
(
&
startup
,
0
,
sizeof
(
startup
)
);
startup
.
cb
=
sizeof
(
startup
);
TRACE
(
"executing %s
\n
"
,
debugstr_w
(
cmd_line
)
);
res
=
CreateProcessW
(
NULL
,
cmd_line
,
NULL
,
NULL
,
FALSE
,
0
,
NULL
,
NULL
,
&
startup
,
&
info
);
res
=
CreateProcessW
(
NULL
,
cmd_line
,
NULL
,
NULL
,
FALSE
,
0
,
NULL
,
NULL
,
&
startup
,
&
process_
info
);
HeapFree
(
GetProcessHeap
(),
0
,
cmd_line
);
if
(
!
res
)
{
...
...
@@ -554,16 +554,16 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *
status
.
Win32Error
=
GetLastError
();
goto
done
;
}
CloseHandle
(
info
.
hThread
);
CloseHandle
(
process_
info
.
hThread
);
if
(
WaitForSingleObject
(
info
.
hProcess
,
timeout
*
1000
)
==
WAIT_TIMEOUT
)
if
(
WaitForSingleObject
(
process_
info
.
hProcess
,
timeout
*
1000
)
==
WAIT_TIMEOUT
)
{
/* timed out, kill the process */
TerminateProcess
(
info
.
hProcess
,
1
);
TerminateProcess
(
process_
info
.
hProcess
,
1
);
status
.
FailureCode
=
SPREG_TIMEOUT
;
status
.
Win32Error
=
ERROR_TIMEOUT
;
}
CloseHandle
(
info
.
hProcess
);
CloseHandle
(
process_
info
.
hProcess
);
goto
done
;
}
...
...
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