Merge branch 'ports'

Conflicts:
	channels/serial/client/serial_tty.c

diff --cc .gitignore
Simple merge

diff --cc channels/serial/client/serial_main.c
index de78217,9c5cade..d4d9b07
--- 1/channels/serial/client/serial_main.c
--- 2/channels/serial/client/serial_main.c
+++ b/channels/serial/client/serial_main.c
@@@ -41,19 -42,21 +42,19 @@@
  #include <unistd.h>
  #endif
  
- #include "serial_tty.h"
- #include "serial_constants.h"
- 
+ #include <winpr/collections.h>
+ #include <winpr/comm.h>
  #include <winpr/crt.h>
- #include <winpr/wlog.h>
+ #include <winpr/stream.h>
  #include <winpr/synch.h>
  #include <winpr/thread.h>
- #include <winpr/stream.h>
- #include <winpr/collections.h>
+ /* #include <winpr/wlog.h> */
  
  #include <freerdp/freerdp.h>
 -#include <freerdp/utils/list.h>
  #include <freerdp/channels/rdpdr.h>
 -#include <freerdp/utils/svc_plugin.h>
  
+ #define MAX_IRP_THREADS       5
+ 
  typedef struct _SERIAL_DEVICE SERIAL_DEVICE;
  
  struct _SERIAL_DEVICE
@@@ -276,8 -439,8 +437,7 @@@ static void serial_process_irp(SERIAL_D
                        break;
  
                default:
 -                      DEBUG_WARN("MajorFunction 0x%X not supported", irp->MajorFunction);
                        irp->IoStatus = STATUS_NOT_SUPPORTED;
-                       irp->Complete(irp);
                        break;
        }
  }

diff --cc client/common/cmdline.c
index 34bbd0b,1adb558..f80ea18
--- 1/client/common/cmdline.c
--- 2/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@@ -400,7 -385,11 +400,10 @@@ int freerdp_client_add_device_channel(r
                if (count > 2)
                        serial->Path = _strdup(params[2]);
  
+               if (count > 3)
+                       serial->Driver = _strdup(params[3]);
+ 
                freerdp_device_collection_add(settings, (RDPDR_DEVICE*) serial);
 -              settings->DeviceRedirection = TRUE;
  
                return 1;
        }

diff --cc include/freerdp/settings.h
Simple merge

diff --cc libfreerdp/common/settings.c
Simple merge

diff --cc winpr/include/winpr/file.h
index 59979b6,b54c46e..80f8950
--- 1/winpr/include/winpr/file.h
--- 2/winpr/include/winpr/file.h
+++ b/winpr/include/winpr/file.h
@@@ -331,6 -344,6 +344,7 @@@ WINPR_API LPSTR FilePatternFindNextWild
  
  WINPR_API int UnixChangeFileMode(const char* filename, int flags);
  
++WINPR_API BOOL IsNamedPipeFileNameA(LPCSTR lpName);
  WINPR_API char* GetNamedPipeNameWithoutPrefixA(LPCSTR lpName);
  WINPR_API char* GetNamedPipeUnixDomainSocketBaseFilePathA(void);
  WINPR_API char* GetNamedPipeUnixDomainSocketFilePathA(LPCSTR lpName);

diff --cc winpr/libwinpr/file/file.c
Simple merge

diff --cc winpr/libwinpr/handle/handle.c
index a8b9d3f,57cf985..dd4deda
--- 1/winpr/libwinpr/handle/handle.c
--- 2/winpr/libwinpr/handle/handle.c
+++ b/winpr/libwinpr/handle/handle.c
@@@ -34,12 -38,59 +38,61 @@@
  #include <unistd.h>
  #endif
  
 +#include <assert.h>
 +
  #include "../handle/handle.h"
  
+ /* _HandleCreators is a NULL-terminated array with a maximun of HANDLE_CREATOR_MAX HANDLE_CREATOR */
+ #define HANDLE_CLOSE_CB_MAX 128
+ static HANDLE_CLOSE_CB **_HandleCloseCbs = NULL;
+ 
+ static pthread_once_t _HandleCloseCbsInitialized = PTHREAD_ONCE_INIT;
+ static void _HandleCloseCbsInit()
+ {
+       /* NB: error management to be done outside of this function */
+ 
+       assert(_HandleCloseCbs == NULL);
+ 
+       _HandleCloseCbs = (HANDLE_CLOSE_CB**)calloc(HANDLE_CLOSE_CB_MAX+1, sizeof(HANDLE_CLOSE_CB*));
+ 
+       assert(_HandleCloseCbs != NULL);
+ }
+ 
+ /**
+  * Returns TRUE on success, FALSE otherwise.
+  */
+ BOOL RegisterHandleCloseCb(HANDLE_CLOSE_CB *pHandleCloseCb)
+ {
+       int i;
+ 
+       if (pthread_once(&_HandleCloseCbsInitialized, _HandleCloseCbsInit) != 0)
+       {
+               return FALSE;
+       }
+ 
+       if (_HandleCloseCbs == NULL)
+       {
+               return FALSE;
+       }
+ 
+ 
+       for (i=0; i<HANDLE_CLOSE_CB_MAX; i++)
+       {
+               if (_HandleCloseCbs[i] == NULL)
+               {
+                       _HandleCloseCbs[i] = pHandleCloseCb;
+                       return TRUE;
+               }
+       }
+ 
+       return FALSE;
+ }
+ 
+ 
+ 
  BOOL CloseHandle(HANDLE hObject)
  {
+       int i;
        ULONG Type;
        PVOID Object;
  

diff --cc winpr/libwinpr/handle/handle.h
Simple merge