80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2020-04-28 01:01:52 +02:00
parent 59822c6c0e 93dfb955dd
commit a34e5a7d84
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -0,0 +1,4 @@
contact_links:
- name: Question
url: https://discord.gg/QXK9XTv
about: Please ask and answer questions here.

2
src/include/86box/plat.h
View File

@@ -148,7 +148,7 @@ extern void thread_reset_event(event_t *arg);
extern int thread_wait_event(event_t *arg, int timeout); extern int thread_wait_event(event_t *arg, int timeout);
extern void thread_destroy_event(event_t *arg); extern void thread_destroy_event(event_t *arg);
extern mutex_t *thread_create_mutex(wchar_t *name); extern mutex_t *thread_create_mutex(void);
extern void thread_close_mutex(mutex_t *arg); extern void thread_close_mutex(mutex_t *arg);
extern int thread_wait_mutex(mutex_t *arg); extern int thread_wait_mutex(mutex_t *arg);
extern int thread_release_mutex(mutex_t *mutex); extern int thread_release_mutex(mutex_t *mutex);

2
src/network/network.c
View File

@@ -315,7 +315,7 @@ network_reset(void)
/* If no active card, we're done. */ /* If no active card, we're done. */
if ((network_type==NET_TYPE_NONE) || (network_card==0)) return; if ((network_type==NET_TYPE_NONE) || (network_card==0)) return;
network_mutex = thread_create_mutex(L"VARCem.NetMutex"); network_mutex = thread_create_mutex();
/* Initialize the platform module. */ /* Initialize the platform module. */
switch(network_type) { switch(network_type) {

2
src/video/vid_mga.c
View File

@@ -4997,7 +4997,7 @@ mystique_init(const device_t *info)
mystique->wake_fifo_thread = thread_create_event(); mystique->wake_fifo_thread = thread_create_event();
mystique->fifo_not_full_event = thread_create_event(); mystique->fifo_not_full_event = thread_create_event();
mystique->fifo_thread = thread_create(fifo_thread, mystique); mystique->fifo_thread = thread_create(fifo_thread, mystique);
mystique->dma.lock = thread_create_mutex(L"86Box.MGAMutex"); mystique->dma.lock = thread_create_mutex();
timer_add(&mystique->wake_timer, mystique_wake_timer, (void *)mystique, 0); timer_add(&mystique->wake_timer, mystique_wake_timer, (void *)mystique, 0);
timer_add(&mystique->softrap_pending_timer, mystique_softrap_pending_timer, (void *)mystique, 1); timer_add(&mystique->softrap_pending_timer, mystique_softrap_pending_timer, (void *)mystique, 1);

4
src/win/win_thread.c
View File

@@ -132,9 +132,9 @@ thread_destroy_event(event_t *arg)
mutex_t * mutex_t *
thread_create_mutex(wchar_t *name) thread_create_mutex(void)
{ {
return((mutex_t*)CreateMutex(NULL, FALSE, name)); return((mutex_t*)CreateMutex(NULL, FALSE, NULL));
} }

2
src/win/win_ui.c
View File

@@ -962,7 +962,7 @@ ui_init(int nCmdShow)
* Before we can create the Render window, we first have * Before we can create the Render window, we first have
* to prepare some other things that it depends on. * to prepare some other things that it depends on.
*/ */
ghMutex = CreateMutex(NULL, FALSE, L"86Box.BlitMutex"); ghMutex = CreateMutex(NULL, FALSE, NULL);
/* Create the Machine Rendering window. */ /* Create the Machine Rendering window. */
hwndRender = CreateWindow(L"STATIC", NULL, WS_CHILD|SS_BITMAP, hwndRender = CreateWindow(L"STATIC", NULL, WS_CHILD|SS_BITMAP,