Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-03-01 03:45:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] setupapi: Avoid shadowing a parameter.

Browse source 
wine commit id a326c9ee67d5a66b9634ae8e0850a99ba5fec26c by Austin English <austinenglish@gmail.com>
This commit is contained in:
winesync 2024-01-04 20:32:52 +01:00 committed by Hermès Bélusca-Maïto
parent c0f05cc264
commit 09e9a8c139
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dll/win32/setupapi/install.c
View file

@ -606,7 +606,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};
@ -620,7 +620,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)
{
@ -628,16 +628,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;
}

2
sdk/tools/winesync/setupapi.cfg
View file

@ -5,4 +5,4 @@ files:
dlls/setupapi/misc.c: dll/win32/setupapi/misc.c
dlls/setupapi/stubs.c: dll/win32/setupapi/stubs.c
tags:
wine: c66d27c55588b0ab3406ce4729348beec3aab536
wine: a326c9ee67d5a66b9634ae8e0850a99ba5fec26c