beerpsi
/
segatools
forked from Dniel97/segatools
1
0
Fork 0
Code Pull Requests Activity

chu2to3: fixed docker compilation, bugfixes

This commit is contained in:
Dniel97 2023-12-25 15:03:44 +01:00
parent 16bbd87c73
commit b38dea23ac
Signed by untrusted user: Dniel97
GPG Key ID: 6180B3C768FB2E08
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chuniio/chu2to3.c
View File

@ -80,7 +80,7 @@ bool shmem_create()
if (g_hMapFile == NULL)
{
dprintf("shmem_create : Could not create file mapping object (%d).\n",
dprintf("shmem_create : Could not create file mapping object (%ld).\n",
GetLastError());
return 0;
}
@ -92,7 +92,7 @@ bool shmem_create()
if (g_pBuf == NULL)
{
dprintf("shmem_create : Could not map view of file (%d).\n",
dprintf("shmem_create : Could not map view of file (%ld).\n",
GetLastError());
CloseHandle(g_hMapFile);
@ -112,7 +112,7 @@ bool shmem_load()
if (g_hMapFile == NULL)
{
dprintf("shmem_load : Could not open file mapping object (%d).\n", GetLastError());
dprintf("shmem_load : Could not open file mapping object (%ld).\n", GetLastError());
return 0;
}
@ -124,7 +124,7 @@ bool shmem_load()
if (g_pBuf == NULL)
{
dprintf("shmem_load : Could not map view of file (%d).\n", GetLastError());
dprintf("shmem_load : Could not map view of file (%ld).\n", GetLastError());
CloseHandle(g_hMapFile);
return 0;
}
@ -148,6 +148,7 @@ static unsigned int __stdcall jvs_poll_thread_proc(void *ctx)
while (1) {
_chuni_io_jvs_read_coin_counter(&g_shared_data.coin_counter);
g_shared_data.opbtn = 0;
g_shared_data.beams = 0;
_chuni_io_jvs_poll(&g_shared_data.opbtn, &g_shared_data.beams);
SHMEM_WRITE(&g_shared_data, sizeof(shared_data_t));
Sleep(1);
@ -156,7 +157,7 @@ static unsigned int __stdcall jvs_poll_thread_proc(void *ctx)
return 0;
}
uint16_t chu2to3_load_dll(wchar_t *dllname)
uint16_t chu2to3_load_dll(const wchar_t *dllname)
{
#if defined(ENV64BIT)
/* x64 must just open the shmem and do nothing else */
@ -175,7 +176,7 @@ uint16_t chu2to3_load_dll(wchar_t *dllname)
/* this is the first function called so let's setup the chuniio forwarding */
hinstLib = LoadLibraryW(dllname);
if (hinstLib == NULL) {
dprintf("ERROR: unable to load %S (error %d)\n",dllname, GetLastError());
dprintf("ERROR: unable to load %S (error %ld)\n",dllname, GetLastError());
return -1;
}

2
chuniio/chu2to3.h
View File

@ -23,4 +23,4 @@ void chu2to3_io_slider_stop(void);
void chu2to3_io_slider_set_leds(const uint8_t *rgb);
HRESULT chu2to3_io_led_init(void);
void chu2to3_io_led_set_colors(uint8_t board, uint8_t *rgb);
uint16_t chu2to3_load_dll(wchar_t *dllname);
uint16_t chu2to3_load_dll(const wchar_t *dllname);

2
chuniio/chuniio.c
View File

@ -22,7 +22,7 @@ static struct chuni_io_config chuni_io_cfg;
uint16_t chuni_io_get_api_version(void)
{
return 0x0101;
return 0x0102;
}
HRESULT chuni_io_jvs_init(void)

1
chusanhook/chuni-dll.c
View File

@ -3,6 +3,7 @@
#include <assert.h>
#include <stdlib.h>
#include "chuniio/chu2to3.h"
#include "chusanhook/chuni-dll.h"
#include "util/dll-bind.h"