lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 24.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2019-09-22 23:19:10 +02:00
parent b14f9eae6d
commit 5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libobs/util/threading-windows.c
View file

@ -30,7 +30,7 @@
#define __try
#endif
#ifndef __except
#define __except(x) if (0)
#define __except (x) if (0)
#endif
#endif
#endif
@ -43,7 +43,7 @@ int os_event_init(os_event_t **event, enum os_event_type type)
if (!handle)
return -1;
*event = (os_event_t*)handle;
*event = (os_event_t *)handle;
return 0;
}
@ -118,13 +118,13 @@ void os_event_reset(os_event_t *event)
ResetEvent((HANDLE)event);
}
int os_sem_init(os_sem_t **sem, int value)
int os_sem_init(os_sem_t **sem, int value)
{
HANDLE handle = CreateSemaphore(NULL, (LONG)value, 0x7FFFFFFF, NULL);
if (!handle)
return -1;
*sem = (os_sem_t*)handle;
*sem = (os_sem_t *)handle;
return 0;
}
@ -134,24 +134,26 @@ void os_sem_destroy(os_sem_t *sem)
CloseHandle((HANDLE)sem);
}
int os_sem_post(os_sem_t *sem)
int os_sem_post(os_sem_t *sem)
{
if (!sem) return -1;
if (!sem)
return -1;
return ReleaseSemaphore((HANDLE)sem, 1, NULL) ? 0 : -1;
}
int os_sem_wait(os_sem_t *sem)
int os_sem_wait(os_sem_t *sem)
{
DWORD ret;
if (!sem) return -1;
if (!sem)
return -1;
ret = WaitForSingleObject((HANDLE)sem, INFINITE);
return (ret == WAIT_OBJECT_0) ? 0 : -1;
}
#define VC_EXCEPTION 0x406D1388
#pragma pack(push,8)
#pragma pack(push, 8)
struct vs_threadname_info {
DWORD type; /* 0x1000 */
const char *name;
@ -175,16 +177,18 @@ void os_set_thread_name(const char *name)
info.flags = 0;
#ifdef NO_SEH_MINGW
__try1(EXCEPTION_EXECUTE_HANDLER) {
__try1(EXCEPTION_EXECUTE_HANDLER)
{
#else
__try {
#endif
RaiseException(VC_EXCEPTION, 0, THREADNAME_INFO_SIZE,
(ULONG_PTR*)&info);
(ULONG_PTR *)&info);
#ifdef NO_SEH_MINGW
} __except1 {
}
__except1{
#else
} __except(EXCEPTION_EXECUTE_HANDLER) {
} __except (EXCEPTION_EXECUTE_HANDLER) {
#endif
}
#endif