system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 20:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

advapi32/tests: Better account for starting and stopping services.

Browse source 
The START_PENDING and STOP_PENDING services don't always have a
process id. Also trace unusual service states so we can identify which
ones behave in unexpected ways.

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460
This commit is contained in:
Francois Gouget 2023-03-16 18:46:18 +01:00 committed by Alexandre Julliard
parent eecb285841
commit 7b3f804606
1 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
dlls/advapi32/tests/service.c
View file

@ -1420,10 +1420,30 @@ static void test_enum_svc(void)
*/
if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS))
{
if (status.dwCurrentState == SERVICE_STOPPED)
servicecountinactive--;
else
switch (status.dwCurrentState)
{
case SERVICE_START_PENDING:
case SERVICE_STOP_PENDING:
case SERVICE_PAUSE_PENDING:
case SERVICE_PAUSED:
case SERVICE_CONTINUE_PENDING:
trace("Got state %lx for service %s\n", status.dwCurrentState,
services[i].lpServiceName);
/* fall through */
case SERVICE_RUNNING:
servicecountactive--;
break;
case SERVICE_STOPPED:
servicecountinactive--;
break;
default:
ok(0, "Got unknown state %lx for service %s\n",
status.dwCurrentState, services[i].lpServiceName);
break;
}
}
}
HeapFree(GetProcessHeap(), 0, services);
@ -1739,21 +1759,45 @@ static void test_enum_svc(void)
if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS))
{
if (status.dwCurrentState != SERVICE_STOPPED)
switch (status.dwCurrentState)
{
case SERVICE_START_PENDING:
case SERVICE_STOP_PENDING:
trace("Got state %lx (pid=%04lx) for service %s\n",
status.dwCurrentState, status.dwProcessId,
exservices[i].lpServiceName);
/* There may or may not be a process id */
servicecountactive--;
break;
case SERVICE_PAUSE_PENDING:
case SERVICE_PAUSED:
case SERVICE_CONTINUE_PENDING:
trace("Got state %lx (pid=%04lx) for service %s\n",
status.dwCurrentState, status.dwProcessId,
exservices[i].lpServiceName);
/* fall through */
case SERVICE_RUNNING:
/* We expect a process id for every running service */
ok(status.dwProcessId > 0, "Expected a process id for this running service (%s)\n",
exservices[i].lpServiceName);
servicecountactive--;
}
else
{
break;
case SERVICE_STOPPED:
/* We shouldn't have a process id for inactive services */
ok(status.dwProcessId == 0, "Service %s state %lu shouldn't have an associated process id\n",
exservices[i].lpServiceName, status.dwCurrentState);
servicecountinactive--;
break;
default:
ok(0, "Got unknown state %lx (pid=%04lx) for service %s\n",
status.dwCurrentState, status.dwProcessId,
exservices[i].lpServiceName);
break;
}
}
}