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
cafcf644
Commit
cafcf644
authored
Aug 11, 2016
by
Sebastian Lackner
Committed by
Alexandre Julliard
Aug 11, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
services: Remove service_terminate function.
Signed-off-by:
Sebastian Lackner
<
sebastian@fds-team.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5137bfd4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
19 deletions
+4
-19
rpc.c
programs/services/rpc.c
+2
-1
services.c
programs/services/services.c
+2
-17
services.h
programs/services/services.h
+0
-1
No files found.
programs/services/rpc.c
View file @
cafcf644
...
...
@@ -1137,7 +1137,8 @@ DWORD __cdecl svcctl_ControlService(
if
(
result
==
ERROR_SUCCESS
&&
service
->
service_entry
->
force_shutdown
)
{
result
=
ERROR_SERVICE_CANNOT_ACCEPT_CTRL
;
service_terminate
(
service
->
service_entry
);
if
((
process
=
service
->
service_entry
->
process
))
process_terminate
(
process
);
}
if
(
result
!=
ERROR_SUCCESS
)
...
...
programs/services/services.c
View file @
cafcf644
...
...
@@ -787,7 +787,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p
if
(
!
r
)
{
err
=
GetLastError
();
service_terminate
(
service_entry
);
process_terminate
(
process
);
return
err
;
}
...
...
@@ -915,7 +915,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *
if
(
err
==
ERROR_SUCCESS
)
ReleaseMutex
(
process
->
control_mutex
);
else
service_terminate
(
service
);
process_terminate
(
process
);
}
scmdatabase_unlock_startup
(
service
->
db
);
...
...
@@ -925,21 +925,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *
return
err
;
}
void
service_terminate
(
struct
service_entry
*
service
)
{
struct
process_entry
*
process
;
service_lock
(
service
);
if
((
process
=
service
->
process
))
{
TerminateProcess
(
process
->
process
,
0
);
release_process
(
process
);
service
->
process
=
NULL
;
}
service
->
status
.
dwCurrentState
=
SERVICE_STOPPED
;
service_unlock
(
service
);
}
void
process_terminate
(
struct
process_entry
*
process
)
{
struct
scmdatabase
*
db
=
process
->
db
;
...
...
programs/services/services.h
View file @
cafcf644
...
...
@@ -88,7 +88,6 @@ void release_service(struct service_entry *service);
void
service_lock
(
struct
service_entry
*
service
);
void
service_unlock
(
struct
service_entry
*
service
);
DWORD
service_start
(
struct
service_entry
*
service
,
DWORD
service_argc
,
LPCWSTR
*
service_argv
);
void
service_terminate
(
struct
service_entry
*
service
);
/* Process functions */
...
...
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