Changeset 4777 for pjproject/branches/projects/winphone/third_party/threademulation/src/ThreadEmulation.cpp

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/third_party/threademulation/src/ThreadEmulation.cpp (modified) (11 diffs)

pjproject/branches/projects/winphone/third_party/threademulation/src/ThreadEmulation.cpp

@@ -6 +6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 
-//#include "ThreadEmulation.h"
 #include "../include/ThreadEmulation.h"
 
@@ -20 +19 @@
 using namespace Windows::System::Threading;
 
-
-#ifdef __cplusplus
-namespace ThreadEmulation
-{
-#endif
+//namespace ThreadEmulation
+//{
     // Stored data for CREATE_SUSPENDED and ResumeThread.
     struct PendingThreadInfo
@@ -84 +80 @@
     }
 
-    _Use_decl_annotations_ HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES unusedThreadAttributes, SIZE_T unusedStackSize, LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD unusedThreadId)
+
+    _Use_decl_annotations_ HANDLE WINAPI CreateThreadRT(LPSECURITY_ATTRIBUTES unusedThreadAttributes, SIZE_T unusedStackSize, LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD unusedThreadId)
     {
         // Validate parameters.
@@ -143 +140 @@
     }
 
-    _Use_decl_annotations_ DWORD WINAPI ResumeThread(HANDLE hThread)
+
+    _Use_decl_annotations_ DWORD WINAPI ResumeThreadRT(HANDLE hThread)
     {
         lock_guard<mutex> lock(pendingThreadsLock);
@@ -176 +174 @@
 
 
-    _Use_decl_annotations_ BOOL WINAPI SetThreadPriority(HANDLE hThread, int nPriority)
+    _Use_decl_annotations_ BOOL WINAPI SetThreadPriorityRT(HANDLE hThread, int nPriority)
     {
         lock_guard<mutex> lock(pendingThreadsLock);
@@ -197 +195 @@
 
 
-    _Use_decl_annotations_ VOID WINAPI Sleep(DWORD dwMilliseconds)
+    _Use_decl_annotations_ VOID WINAPI SleepRT(DWORD dwMilliseconds)
     {
         static HANDLE singletonEvent = nullptr;
@@ -226 +224 @@
 
 
-    DWORD WINAPI TlsAlloc()
+    DWORD WINAPI TlsAllocRT()
     {
         lock_guard<mutex> lock(tlsAllocationLock);
@@ -243 +241 @@
 
 
-    _Use_decl_annotations_ BOOL WINAPI TlsFree(DWORD dwTlsIndex)
+    _Use_decl_annotations_ BOOL WINAPI TlsFreeRT(DWORD dwTlsIndex)
     {
         lock_guard<mutex> lock(tlsAllocationLock);
@@ -273 +271 @@
 
 
-    _Use_decl_annotations_ LPVOID WINAPI TlsGetValue(DWORD dwTlsIndex)
+    _Use_decl_annotations_ LPVOID WINAPI TlsGetValueRT(DWORD dwTlsIndex)
     {
         ThreadLocalData* threadData = currentThreadData;
@@ -290 +288 @@
 
 
-    _Use_decl_annotations_ BOOL WINAPI TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue)
+    _Use_decl_annotations_ BOOL WINAPI TlsSetValueRT(DWORD dwTlsIndex, LPVOID lpTlsValue)
     {
         ThreadLocalData* threadData = currentThreadData;
@@ -355 +353 @@
         }
     }
-#ifdef __cplusplus
-}
-#endif
+//}