[vlc-commits] win32: use CreateThread instead of _beginthreadex in winstore builds

2020-06-19 Thread Steve Lhomme 
vlc/vlc-3.0 | branch: master | Steve Lhomme  | Tue Apr 28 
11:05:19 2020 +0200| [b5dd37dd222a9ab5b12308c79e0f34cf72382d8a] | committer: 
Steve Lhomme

win32: use CreateThread instead of _beginthreadex in winstore builds

_beginthreadex is forbidden. We already used CreateThread in such builds via
winstorecompat.

Modify the code to avoid casting when not needed.

(cherry picked from commit f9bfd84b2eda703e8cbc41ef1543de9b924314fa) (rebased)

rebased:
- vlc_control_cancel has different parameters in this branch

Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b5dd37dd222a9ab5b12308c79e0f34cf72382d8a
---

 src/win32/thread.c | 23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/win32/thread.c b/src/win32/thread.c
index 5c6b71e349..289cc547dc 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -461,7 +461,13 @@ static void vlc_thread_destroy(vlc_thread_t th)
 free(th);
 }
 
-static unsigned __stdcall vlc_entry (void *p)
+static
+#if VLC_WINSTORE_APP
+DWORD
+#else // !VLC_WINSTORE_APP
+unsigned
+#endif // !VLC_WINSTORE_APP
+__stdcall vlc_entry (void *p)
 {
 struct vlc_thread *th = p;
 
@@ -489,11 +495,16 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool 
detached,
 th->wait.addr = NULL;
 InitializeCriticalSection(>wait.lock);
 
+HANDLE h;
+#if VLC_WINSTORE_APP
+h = CreateThread(NULL, 0, vlc_entry, th, 0, NULL);
+#else // !VLC_WINSTORE_APP
 /* When using the MSVCRT C library you have to use the _beginthreadex
  * function instead of CreateThread, otherwise you'll end up with
  * memory leaks and the signal functions not working (see Microsoft
  * Knowledge Base, article 104641) */
-uintptr_t h = _beginthreadex (NULL, 0, vlc_entry, th, 0, NULL);
+h = (HANDLE)(uintptr_t) _beginthreadex (NULL, 0, vlc_entry, th, 0, NULL);
+#endif // !VLC_WINSTORE_APP
 if (h == 0)
 {
 int err = errno;
@@ -503,11 +514,11 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool 
detached,
 
 if (detached)
 {
-CloseHandle((HANDLE)h);
+CloseHandle(h);
 th->id = NULL;
 }
 else
-th->id = (HANDLE)h;
+th->id = h;
 
 if (p_handle != NULL)
 *p_handle = th;
@@ -637,7 +648,11 @@ void vlc_testcancel (void)
 th->data = NULL; /* TODO: special value? */
 if (th->id == NULL) /* Detached thread */
 vlc_thread_destroy(th);
+#if VLC_WINSTORE_APP
+ExitThread(0);
+#else // !VLC_WINSTORE_APP
 _endthreadex(0);
+#endif // !VLC_WINSTORE_APP
 }
 
 void vlc_control_cancel (int cmd, ...)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] win32: use CreateThread instead of _beginthreadex in winstore builds

2020-05-18 Thread Steve Lhomme 
vlc | branch: master | Steve Lhomme  | Tue Apr 28 11:05:19 
2020 +0200| [f9bfd84b2eda703e8cbc41ef1543de9b924314fa] | committer: Steve Lhomme

win32: use CreateThread instead of _beginthreadex in winstore builds

_beginthreadex is forbidden. We already used CreateThread in such builds via
winstorecompat.

Modify the code to avoid casting when not needed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f9bfd84b2eda703e8cbc41ef1543de9b924314fa
---

 src/win32/thread.c | 23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/win32/thread.c b/src/win32/thread.c
index 61cd62ed35..2113f33d3f 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -345,7 +345,13 @@ static void vlc_thread_destroy(vlc_thread_t th)
 free(th);
 }
 
-static unsigned __stdcall vlc_entry (void *p)
+static
+#if VLC_WINSTORE_APP
+DWORD
+#else // !VLC_WINSTORE_APP
+unsigned
+#endif // !VLC_WINSTORE_APP
+__stdcall vlc_entry (void *p)
 {
 struct vlc_thread *th = p;
 
@@ -373,11 +379,16 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool 
detached,
 th->wait.addr = NULL;
 InitializeCriticalSection(>wait.lock);
 
+HANDLE h;
+#if VLC_WINSTORE_APP
+h = CreateThread(NULL, 0, vlc_entry, th, 0, NULL);
+#else // !VLC_WINSTORE_APP
 /* When using the MSVCRT C library you have to use the _beginthreadex
  * function instead of CreateThread, otherwise you'll end up with
  * memory leaks and the signal functions not working (see Microsoft
  * Knowledge Base, article 104641) */
-uintptr_t h = _beginthreadex (NULL, 0, vlc_entry, th, 0, NULL);
+h = (HANDLE)(uintptr_t) _beginthreadex (NULL, 0, vlc_entry, th, 0, NULL);
+#endif // !VLC_WINSTORE_APP
 if (h == 0)
 {
 int err = errno;
@@ -387,11 +398,11 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool 
detached,
 
 if (detached)
 {
-CloseHandle((HANDLE)h);
+CloseHandle(h);
 th->id = NULL;
 }
 else
-th->id = (HANDLE)h;
+th->id = h;
 
 if (p_handle != NULL)
 *p_handle = th;
@@ -515,7 +526,11 @@ void vlc_testcancel (void)
 th->data = NULL; /* TODO: special value? */
 if (th->id == NULL) /* Detached thread */
 vlc_thread_destroy(th);
+#if VLC_WINSTORE_APP
+ExitThread(0);
+#else // !VLC_WINSTORE_APP
 _endthreadex(0);
+#endif // !VLC_WINSTORE_APP
 }
 
 void vlc_control_cancel (vlc_cleanup_t *cleaner)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits