mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed thread handling.

Browse Source
This commit is contained in:
Armin Novak 2013-09-05 13:39:54 +02:00
parent c5a632d8f9
commit 2283a5ccdf
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/X11/xf_interface.c
View File

@ -17,6 +17,7 @@
* limitations under the License.
*/
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@ -93,7 +94,7 @@ void* xf_server_thread(void* param)
}
}
listener->Close(listener);
ExitThread(0);
return NULL;
}
@ -115,9 +116,13 @@ int freerdp_server_global_uninit()
int freerdp_server_start(xfServer* server)
{
assert(NULL != server);
server->thread = NULL;
if (server->listener->Open(server->listener, NULL, 3389))
{
server->thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) xf_server_thread, (void*) server, 0, NULL);
server->thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)
xf_server_thread, (void*) server, 0, NULL);
}
return 0;
@ -125,6 +130,17 @@ int freerdp_server_start(xfServer* server)
int freerdp_server_stop(xfServer* server)
{
if (server->thread)
{
/* ATTENTION: Terminate thread kills a thread, assure
* no resources are allocated during thread execution,
* as they will not be freed! */
TerminateThread(server->thread, 0);
WaitForSingleObject(server->thread, INFINITE);
CloseHandle(server->thread);
server->listener->Close(server->listener);
}
return 0;
}