Changeset 4777 for pjproject/branches/projects/winphone/pjlib/src/pj/ioqueue_select.c

Timestamp:

Mar 5, 2014 6:48:59 AM (10 years ago)

Author:

riza

Message:

Re #1704:

• Fix duplicate code on os_winphone.h
• Change the use of PJ_WIN32_WINPHONE to follow the code convention
• Fix incorrect link of the Thread library
• Handle exception raised from select() API. However the break window will still be shown when debugging on Visual Studio. To disable it, from Debug>Exceptions>Win32 Exceptions> unmark the "An invalid handle was specified” exception.

File:

• pjproject/branches/projects/winphone/pjlib/src/pj/ioqueue_select.c (modified) (1 diff)

pjproject/branches/projects/winphone/pjlib/src/pj/ioqueue_select.c

@@ -880 +880 @@
     pj_lock_release(ioqueue->lock);
 
+#if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
+    count = 0;
+    __try {    
+#endif
+
     count = pj_sock_select(ioqueue->nfds+1, &rfdset, &wfdset, &xfdset, 
                            timeout);
+
+#if defined(PJ_WIN32_WINPHONE) && PJ_WIN32_WINPHONE
+    /* Ignore Invalid Handle Exception raised by select().*/
+    } __except(GetExceptionCode() == STATUS_INVALID_HANDLE?
+               EXCEPTION_CONTINUE_EXECUTION:EXCEPTION_CONTINUE_SEARCH) {
+    }
+#endif
     
     if (count == 0)