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

Merge branch 'master' of github.com:FreeRDP/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2014-05-26 12:43:43 -04:00
commit a75a38c884
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winpr/libwinpr/pipe/pipe.h
View File

@ -43,10 +43,6 @@ struct winpr_named_pipe
{
WINPR_HANDLE_DEF();
WINPR_NAMED_PIPE* pBaseNamedPipe;
DWORD dwRefCount;
int clientfd;
int serverfd;
@ -65,6 +61,10 @@ struct winpr_named_pipe
LPOVERLAPPED lpOverlapped;
fnRemoveBaseNamedPipeFromList pfnRemoveBaseNamedPipeFromList;
WINPR_NAMED_PIPE* pBaseNamedPipe;
DWORD dwRefCount;
};
#endif

5
winpr/libwinpr/synch/event.c
View File

@ -271,8 +271,11 @@ int GetEventFileDescriptor(HANDLE hEvent)
if (Type == HANDLE_TYPE_NAMED_PIPE)
{
WINPR_NAMED_PIPE *named = (WINPR_NAMED_PIPE *)hEvent;
if (named->ServerMode)
if (named->ServerMode) {
return named->serverfd;
} else {
return named->clientfd;
}
}
return event->pipe_fd[0];