chusan, cm, mai2, mu3: Added dipSw support and highBaudrate AiMe

This commit is contained in:
Dniel97 2023-08-15 17:28:19 +02:00
parent 3dc2ec6e69
commit 608c9ac1a6
Signed by untrusted user: Dniel97
GPG Key ID: 6180B3C768FB2E08
14 changed files with 209 additions and 50 deletions

View File

@ -30,6 +30,7 @@ void aime_config_load(struct aime_config *cfg, const wchar_t *filename)
aime_dll_config_load(&cfg->dll, filename); aime_dll_config_load(&cfg->dll, filename);
cfg->enable = GetPrivateProfileIntW(L"aime", L"enable", 1, filename); cfg->enable = GetPrivateProfileIntW(L"aime", L"enable", 1, filename);
cfg->high_baudrate = GetPrivateProfileIntW(L"aime", L"highbaud", 1, filename);
} }
void io4_config_load(struct io4_config *cfg, const wchar_t *filename) void io4_config_load(struct io4_config *cfg, const wchar_t *filename)

View File

@ -70,6 +70,10 @@ HRESULT sg_reader_hook_init(
InitializeCriticalSection(&sg_reader_lock); InitializeCriticalSection(&sg_reader_lock);
if (!cfg->high_baudrate) {
sg_reader_uart.baud.BaudRate = 38400;
}
uart_init(&sg_reader_uart, port_no); uart_init(&sg_reader_uart, port_no);
sg_reader_uart.written.bytes = sg_reader_written_bytes; sg_reader_uart.written.bytes = sg_reader_written_bytes;
sg_reader_uart.written.nbytes = sizeof(sg_reader_written_bytes); sg_reader_uart.written.nbytes = sizeof(sg_reader_written_bytes);

View File

@ -9,6 +9,7 @@
struct aime_config { struct aime_config {
struct aime_dll_config dll; struct aime_dll_config dll;
bool enable; bool enable;
bool high_baudrate;
}; };
HRESULT sg_reader_hook_init( HRESULT sg_reader_hook_init(

View File

@ -36,6 +36,18 @@ enable=1
; that subnet must start with 192.168. ; that subnet must start with 192.168.
subnet=192.168.100.0 subnet=192.168.100.0
[gpio]
; ALLS DIP switches.
enable=1
; LAN Install: If multiple machines are present on the same LAN then set
; this to 1 on exactly one machine and set this to 0 on all others.
dipsw1=1
; Monitor type: 0 = 120FPS, 1 = 60FPS
dipsw2=1
; Aime reader hardware type: 0 = SP, 1 = CVT
dipsw3=1
[gfx] [gfx]
; Force the game to run windowed. ; Force the game to run windowed.
windowed=1 windowed=1

View File

@ -2,8 +2,8 @@
pushd %~dp0 pushd %~dp0
start /min inject_x64.exe -d -k chusanhook_x64.dll amdaemon.exe -f -c config_common.json config_server.json config_sp.json start /min inject_x64 -d -k chusanhook_x64.dll amdaemon.exe -f -c config_common.json config_server.json config_client.json config_cvt.json config_sp.json
inject_x86.exe -d -k chusanhook_x86.dll chusanApp.exe inject_x86 -d -k chusanhook_x86.dll chusanApp.exe
taskkill /f /im amdaemon.exe > nul 2>&1 taskkill /f /im amdaemon.exe > nul 2>&1
echo. echo.

15
dist/cm/segatools.ini vendored
View File

@ -8,11 +8,10 @@ option=
; NOTE: This has nothing to do with Windows %APPDATA%. ; NOTE: This has nothing to do with Windows %APPDATA%.
appdata= appdata=
[aime] [aime]
; Enable aime reader emulation. ; Enable aime reader emulation.
enable=1 enable=1
aimePath=C:\SEGA\DEVICE\aime.txt aimePath=DEVICE\aime.txt
felicaGen=0 felicaGen=0
[dns] [dns]
@ -32,6 +31,18 @@ enable=1
; that subnet must start with 192.168. ; that subnet must start with 192.168.
subnet=192.168.100.0 subnet=192.168.100.0
[gpio]
; ALLS DIP switches.
enable=1
; LAN Install: If multiple machines are present on the same LAN then set
; this to 1 on exactly one machine and set this to 0 on all others.
dipsw1=1
[touch]
; Enable/Disable WinTouch emulation
enable=0
; ----------------------------------------------------------------------------- ; -----------------------------------------------------------------------------
; Input settings ; Input settings
; ----------------------------------------------------------------------------- ; -----------------------------------------------------------------------------

4
dist/cm/start.bat vendored
View File

@ -2,8 +2,8 @@
pushd %~dp0 pushd %~dp0
start /min inject -d -k cmhook.dll amdaemon.exe -f -c config_server.json config_common.json start /min inject -d -k cmhook.dll amdaemon.exe -f -c config_common.json config_server.json config_client.json
inject.exe -d -k cmhook.dll CardMaker.exe -screen-fullscreen 0 -popupwindow -screen-width 1080 -screen-height 1920 inject -d -k cmhook.dll CardMaker.exe -screen-fullscreen 0 -popupwindow -screen-width 1080 -screen-height 1920
taskkill /f /im amdaemon.exe > nul 2>&1 taskkill /f /im amdaemon.exe > nul 2>&1

View File

@ -15,7 +15,7 @@ enable=1
[dns] [dns]
; Insert the hostname or IP address of the server you wish to use here. ; Insert the hostname or IP address of the server you wish to use here.
; Note that 127.0.0.1, localhost etc are specifically rejected. ; Note that 127.0.0.1, localhost etc are specifically rejected.
default= default=127.0.0.1
[netenv] [netenv]
; Simulate an ideal LAN environment. This may interfere with head-to-head play. ; Simulate an ideal LAN environment. This may interfere with head-to-head play.
@ -29,6 +29,14 @@ enable=1
; that subnet must start with 192.168. ; that subnet must start with 192.168.
subnet=192.168.100.0 subnet=192.168.100.0
[gpio]
; ALLS DIP switches.
enable=1
; LAN Install: If multiple machines are present on the same LAN then set
; this to 1 on exactly one machine and set this to 0 on all others.
dipsw1=1
; ----------------------------------------------------------------------------- ; -----------------------------------------------------------------------------
; Input settings ; Input settings
; ----------------------------------------------------------------------------- ; -----------------------------------------------------------------------------

View File

@ -1,25 +1,24 @@
[vfs] [vfs]
; Insert the path to the game AMFS directory here (contains ICF1 and ICF2) ; Insert the path to the game AMFS directory here (contains ICF1 and ICF2)
amfs= amfs=
; Insert the path to the game Option directory here (contains Axxx directories)
option=
; Create an empty directory somewhere and insert the path here. ; Create an empty directory somewhere and insert the path here.
; This directory may be shared between multiple SEGA games. ; This directory may be shared between multiple SEGA games.
; NOTE: This has nothing to do with Windows %APPDATA%. ; NOTE: This has nothing to do with Windows %APPDATA%.
appdata= appdata=
option=
[aime]
; Controls emulation of the Aime card reader assembly.
enable=1
aimePath=DEVICE\aime.txt
felicaGen=0
[dns] [dns]
; Insert the hostname or IP address of the server you wish to use here. ; Insert the hostname or IP address of the server you wish to use here.
; Note that 127.0.0.1, localhost etc are specifically rejected. ; Note that 127.0.0.1, localhost etc are specifically rejected.
default=127.0.0.1 default=127.0.0.1
[ds]
; Region code on the emulated AMEX board DS EEPROM.
; 1: Japan
; 4: Export (some UI elements in English)
;
; NOTE: Changing this setting causes a factory reset.
region=1
[netenv] [netenv]
; Simulate an ideal LAN environment. This may interfere with head-to-head play. ; Simulate an ideal LAN environment. This may interfere with head-to-head play.
; SEGA games are somewhat picky about their LAN environment, so leaving this ; SEGA games are somewhat picky about their LAN environment, so leaving this
@ -30,16 +29,33 @@ enable=1
; The /24 LAN subnet that the emulated keychip will tell the game to expect. ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
; If you disable netenv then you must set this to your LAN's IP subnet, and ; If you disable netenv then you must set this to your LAN's IP subnet, and
; that subnet must start with 192.168. ; that subnet must start with 192.168.
subnet=192.168.250.0 subnet=192.168.100.0
[gpio]
; ALLS DIP switches.
enable=1
; LAN Install: If multiple machines are present on the same LAN then set
; this to 1 on exactly one machine and set this to 0 on all others.
dipsw1=1
[gfx] [gfx]
enable=1 enable=1
; -----------------------------------------------------------------------------
; Input settings
; -----------------------------------------------------------------------------
; Keyboard bindings are specified as hexadecimal (prefixed with 0x) or decimal
; (not prefixed with 0x) virtual-key codes, a list of which can be found here:
;
; https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
;
; This is, admittedly, not the most user-friendly configuration method in the
; world. An improved solution will be provided later.
[io4] [io4]
; Input API selection for JVS input emulator. ; Input API selection for JVS input emulator.
; Set "1" to use a xinput gamepad and set "2" to use keyboard.
mode=2
; Test button virtual-key code. Default is the 1 key. ; Test button virtual-key code. Default is the 1 key.
test=0x31 test=0x31
; Service button virtual-key code. Default is the 2 key. ; Service button virtual-key code. Default is the 2 key.
@ -47,18 +63,20 @@ service=0x32
; Keyboard button to increment coin counter. Default is the 3 key. ; Keyboard button to increment coin counter. Default is the 3 key.
coin=0x33 coin=0x33
[dinput] ; Set "1" to enable mouse lever emulation, "0" to use XInput
LEFT_A=0x53 mouse=1
LEFT_B=0x44
LEFT_C=0x46 ; Keyboard input bindings
LEFT_MENU=0x51 left1=0x41 ; A
LEFT_SIDE=0x52 left2=0x53 ; S
RIGHT_A=0x4A left3=0x44 ; D
RIGHT_B=0x4B
RIGHT_C=0x4C leftSide=0x01 ; Mouse Left
RIGHT_MENU=0x50 rightSide=0x02 ; Mouse Right
RIGHT_SIDE=0x55
SLIDER_LEFT=0x54 right1=0x4A ; J
SLIDER_RIGHT=0x59 right1=0x4B ; K
;Change move speed of slider when use dinput right3=0x4C ; L
SLIDER_SPEED=1000
leftMenu=0x55 ; U
rightMenu=0x4F ; O

14
dist/mu3/start.bat vendored
View File

@ -1,15 +1,11 @@
@echo off @echo off
pushd %~dp0 pushd %~dp0
start /min inject -d -k mu3hook.dll amdaemon.exe -f -c config_common.json config_server.json config_client.json
inject -d -k mu3hook.dll mu3 -screen-fullscreen 0 -popupwindow -screen-width 1080 -screen-height 1920
taskkill /f /im amdaemon.exe > nul 2>&1 taskkill /f /im amdaemon.exe > nul 2>&1
REM USA echo.
REM start inject -d -k mercuryhook.dll amdaemon.exe -f -c config.json config_lan_install_client.json config_lan_install_server.json config_video_clone.json config_video_dual.json config_video_clone_flip.json config_video_dual_flip.json config_region_exp.json config_region_chn.json config_region_usa.json
REM JP
start inject -d -k mercuryhook.dll amdaemon.exe -f -c config.json config_lan_install_client.json config_lan_install_server.json config_video_clone.json config_video_dual.json config_video_clone_flip.json config_video_dual_flip.json config_region_exp.json config_region_chn.json config_region_jpn.json
inject -d -k mercuryhook.dll ../WindowsNoEditor/Mercury/Binaries/Win64/Mercury-Win64-Shipping.exe
taskkill /f /im amdaemon.exe > nul 2>&1
echo Game processes have terminated echo Game processes have terminated
pause

View File

@ -31,6 +31,13 @@ Default: `1`
Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime Enable Aime card reader assembly emulation. Disable to use a real SEGA Aime
reader (COM port number varies by game). reader (COM port number varies by game).
### `highbaud`
Default: `1`
Enables the high baudrate of the Aime card reader to be 115200 (instead of 38400).
This is required for some games (e.g. Chunithm) but not others (e.g. WACCA).
### `aimePath` ### `aimePath`
Default: `DEVICE\aime.txt` Default: `DEVICE\aime.txt`
@ -270,6 +277,33 @@ Default `1`
Enable JVS port emulation. Disable to use the JVS port on a real AMEX. Enable JVS port emulation. Disable to use the JVS port on a real AMEX.
## `[io4]`
Configure emulation of the IO4 board. Same settings also apply to `[io3]`.
### `enable`
Default `1`
Enable IO4 port emulation. Disable to use the IO4 port on a real ALLS.
### `test`
Default `0x31`
Test button virtual-key code. Default is the 1 key.
### `service`
Default `0x32`
Service button virtual-key code. Default is the 2 key.
### `coin`
Default `0x33`
Keyboard button to increment coin counter. Default is the 3 key.
## `[keychip]` ## `[keychip]`
Configure keychip emulation. Configure keychip emulation.

View File

@ -19,6 +19,12 @@ This means there can be some license issues if you do use this code in some othe
/* API hooks */ /* API hooks */
static LRESULT hook_wndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
static ATOM WINAPI hook_RegisterClassExA(
WNDCLASSEXA* wndClass
);
static int WINAPI hook_GetSystemMetrics( static int WINAPI hook_GetSystemMetrics(
int nIndex int nIndex
); );
@ -35,8 +41,14 @@ static BOOL WINAPI hook_GetTouchInputInfo(
int cbSize int cbSize
); );
static HCURSOR WINAPI hook_SetCursor(HCURSOR cursor);
/* Link pointers */ /* Link pointers */
static ATOM (WINAPI *next_RegisterClassExA)(
const WNDCLASSEXA* wndClass
);
static int (WINAPI *next_GetSystemMetrics)( static int (WINAPI *next_GetSystemMetrics)(
int nIndex int nIndex
); );
@ -53,10 +65,20 @@ static BOOL (WINAPI *next_GetTouchInputInfo)(
int cbSize int cbSize
); );
static HCURSOR(WINAPI *next_SetCursor)(HCURSOR cursor);
static bool touch_hook_initted; static bool touch_hook_initted;
static bool touch_held;
static HWND registered_hWnd;
static struct touch_screen_config touch_config; static struct touch_screen_config touch_config;
static WNDPROC orig_wndProc;
static const struct hook_symbol touch_hooks[] = { static const struct hook_symbol touch_hooks[] = {
{
.name = "RegisterClassExA",
.patch = hook_RegisterClassExA,
.link = (void**)&next_RegisterClassExA
},
{ {
.name = "GetSystemMetrics", .name = "GetSystemMetrics",
.patch = hook_GetSystemMetrics, .patch = hook_GetSystemMetrics,
@ -72,6 +94,11 @@ static const struct hook_symbol touch_hooks[] = {
.patch = hook_GetTouchInputInfo, .patch = hook_GetTouchInputInfo,
.link = (void **) &next_GetTouchInputInfo .link = (void **) &next_GetTouchInputInfo
}, },
{
.name = "SetCursor",
.patch = hook_SetCursor,
.link = (void **) &next_SetCursor
},
}; };
void touch_screen_hook_init(const struct touch_screen_config *cfg, HINSTANCE self) void touch_screen_hook_init(const struct touch_screen_config *cfg, HINSTANCE self)
@ -93,6 +120,34 @@ void touch_screen_hook_init(const struct touch_screen_config *cfg, HINSTANCE sel
dprintf("TOUCH: hook enabled.\n"); dprintf("TOUCH: hook enabled.\n");
} }
static HCURSOR WINAPI hook_SetCursor(HCURSOR cursor) {
if (cursor == 0 && touch_config.cursor)
return 0;
return next_SetCursor(cursor);
}
// remap mouse events to touch events
static LRESULT hook_wndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) {
if (hWnd == registered_hWnd && (Msg == WM_LBUTTONDOWN || Msg == WM_LBUTTONUP || (touch_held && Msg == WM_MOUSEMOVE))) {
orig_wndProc(hWnd, WM_TOUCH, 1, 1);
}
return orig_wndProc(hWnd, Msg, wParam, lParam);
}
static ATOM WINAPI hook_RegisterClassExA(
WNDCLASSEXA* wndClass
) {
if (wndClass->lpfnWndProc) {
orig_wndProc = wndClass->lpfnWndProc;
wndClass->lpfnWndProc = (WNDPROC) hook_wndProc;
}
return next_RegisterClassExA(wndClass);
}
// Spicetools misc/wintouchemu.cpp // Spicetools misc/wintouchemu.cpp
static int WINAPI hook_GetSystemMetrics( static int WINAPI hook_GetSystemMetrics(
@ -111,11 +166,11 @@ static BOOL WINAPI hook_RegisterTouchWindow(
ULONG ulFlags ULONG ulFlags
) )
{ {
registered_hWnd = hwnd;
return true; return true;
} }
// Converting mouse event to touch event // Converting mouse event to touch event
// Does not work at current stage
static BOOL WINAPI hook_GetTouchInputInfo( static BOOL WINAPI hook_GetTouchInputInfo(
HANDLE hTouchInput, HANDLE hTouchInput,
UINT cInputs, UINT cInputs,
@ -124,7 +179,15 @@ static BOOL WINAPI hook_GetTouchInputInfo(
) )
{ {
bool result = false; bool result = false;
int sw, sh, cw, ch;
RECT cRect;
sw = GetSystemMetrics(SM_CXSCREEN);
sh = GetSystemMetrics(SM_CYSCREEN);
GetClientRect(registered_hWnd, &cRect);
cw = cRect.right - cRect.left;
ch = cRect.bottom - cRect.top;
static bool mouse_state_old = false; static bool mouse_state_old = false;
for (UINT input = 0; input < cInputs; input++) { for (UINT input = 0; input < cInputs; input++) {
TOUCHINPUT *touch_input = &pInputs[input]; TOUCHINPUT *touch_input = &pInputs[input];
@ -143,8 +206,15 @@ static BOOL WINAPI hook_GetTouchInputInfo(
if (mouse_state || mouse_state_old) { if (mouse_state || mouse_state_old) {
POINT cursorPos; POINT cursorPos;
GetCursorPos(&cursorPos); GetCursorPos(&cursorPos);
if (touch_config.remap) {
ScreenToClient(registered_hWnd, &cursorPos);
cursorPos.x = (long)(cursorPos.x * ((double)sw / cw));
cursorPos.y = (long)(cursorPos.y * ((double)sh / ch));
}
result = true; result = true;
touch_input->x = cursorPos.x * 100; touch_input->x = cursorPos.x * 100;
touch_input->y = cursorPos.y * 100; touch_input->y = cursorPos.y * 100;
@ -153,10 +223,12 @@ static BOOL WINAPI hook_GetTouchInputInfo(
touch_input->dwFlags = 0; touch_input->dwFlags = 0;
if (mouse_state && !mouse_state_old) { if (mouse_state && !mouse_state_old) {
touch_input->dwFlags |= TOUCHEVENTF_DOWN; touch_input->dwFlags |= TOUCHEVENTF_DOWN;
touch_held = true;
} else if (mouse_state && mouse_state_old) { } else if (mouse_state && mouse_state_old) {
touch_input->dwFlags |= TOUCHEVENTF_MOVE; touch_input->dwFlags |= TOUCHEVENTF_MOVE;
} else if (!mouse_state && mouse_state_old) { } else if (!mouse_state && mouse_state_old) {
touch_input->dwFlags |= TOUCHEVENTF_UP; touch_input->dwFlags |= TOUCHEVENTF_UP;
touch_held = false;
} }
touch_input->dwMask = 0; touch_input->dwMask = 0;
touch_input->dwTime = 0; touch_input->dwTime = 0;

View File

@ -6,6 +6,8 @@
struct touch_screen_config { struct touch_screen_config {
bool enable; bool enable;
bool remap;
bool cursor;
}; };
/* Init is not thread safe because API hook init is not thread safe blah /* Init is not thread safe because API hook init is not thread safe blah