Revert: fallback capnhook to 4633c51d58

ilufang's ERROR_IO_PENDING make serial device has serious delays and missing
before we fix it in capnhook, we need fallback it in segatools

Makefile

@@ -5,8 +5,6 @@ V               ?= @
 BUILD_DIR := build
 BUILD_DIR_32 := $(BUILD_DIR)/build32
 BUILD_DIR_64 := $(BUILD_DIR)/build64
-BUILD_DIR_GAMES_32 := $(BUILD_DIR_32)/games
-BUILD_DIR_GAMES_64 := $(BUILD_DIR_64)/games
 BUILD_DIR_ZIP := $(BUILD_DIR)/zip
 
 DOC_DIR := doc

Package.mk

@@ -3,7 +3,7 @@ $(BUILD_DIR_ZIP)/chuni.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/chuni
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/chuni/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_32)/chunihook/chunihook.dll \
+		$(BUILD_DIR_32)/chunihook/chunihook.dll \
 		$(DIST_DIR)/chuni/segatools.ini \
 		$(DIST_DIR)/chuni/launch.bat \
 		$(BUILD_DIR_ZIP)/chuni
@@ -18,7 +18,7 @@ $(BUILD_DIR_ZIP)/cxb.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cxb
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cxb/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_32)/cxbhook/cxbhook.dll \
+		$(BUILD_DIR_32)/cxbhook/cxbhook.dll \
 		$(DIST_DIR)/cxb/segatools.ini \
 		$(DIST_DIR)/cxb/launch.bat \
 		$(BUILD_DIR_ZIP)/cxb
@@ -33,7 +33,7 @@ $(BUILD_DIR_ZIP)/diva.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/diva
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/diva/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/divahook/divahook.dll \
+		$(BUILD_DIR_64)/divahook/divahook.dll \
 		$(DIST_DIR)/diva/segatools.ini \
 		$(DIST_DIR)/diva/launch.bat \
 		$(BUILD_DIR_ZIP)/diva
@@ -48,7 +48,7 @@ $(BUILD_DIR_ZIP)/carol.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/carol
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/carol/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_32)/carolhook/carolhook.dll \
+		$(BUILD_DIR_32)/carolhook/carolhook.dll \
 		$(DIST_DIR)/carol/segatools.ini \
 		$(DIST_DIR)/carol/launch.bat \
 		$(BUILD_DIR_ZIP)/carol
@@ -63,7 +63,7 @@ $(BUILD_DIR_ZIP)/idz.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idz
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idz/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/idzhook/idzhook.dll \
+		$(BUILD_DIR_64)/idzhook/idzhook.dll \
 		$(DIST_DIR)/idz/segatools.ini \
 		$(DIST_DIR)/idz/launch.bat \
     	$(BUILD_DIR_ZIP)/idz
@@ -78,7 +78,7 @@ $(BUILD_DIR_ZIP)/fgo.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/fgo
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/fgo/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/fgohook/fgohook.dll \
+		$(BUILD_DIR_64)/fgohook/fgohook.dll \
 		$(DIST_DIR)/fgo/segatools.ini \
 		$(DIST_DIR)/fgo/launch.bat \
     	$(BUILD_DIR_ZIP)/fgo
@@ -93,7 +93,7 @@ $(BUILD_DIR_ZIP)/idac.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idac
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idac/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/idachook/idachook.dll \
+		$(BUILD_DIR_64)/idachook/idachook.dll \
 		$(DIST_DIR)/idac/segatools.ini \
 		$(DIST_DIR)/idac/config_hook.json \
 		$(DIST_DIR)/idac/launch.bat \
@@ -109,7 +109,7 @@ $(BUILD_DIR_ZIP)/swdc.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/swdc
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/swdc/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/swdchook/swdchook.dll \
+		$(BUILD_DIR_64)/swdchook/swdchook.dll \
 		$(DIST_DIR)/swdc/segatools.ini \
 		$(DIST_DIR)/swdc/config_hook.json \
 		$(DIST_DIR)/swdc/launch.bat \
@@ -125,7 +125,7 @@ $(BUILD_DIR_ZIP)/mercury.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mercury
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mercury/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/mercuryhook/mercuryhook.dll \
+		$(BUILD_DIR_64)/mercuryhook/mercuryhook.dll \
 		$(DIST_DIR)/mercury/segatools.ini \
 		$(DIST_DIR)/mercury/launch.bat \
     	$(BUILD_DIR_ZIP)/mercury
@@ -143,9 +143,9 @@ $(BUILD_DIR_ZIP)/chusan.zip:
 		$(DIST_DIR)/chusan/config_hook.json \
 		$(DIST_DIR)/chusan/launch.bat \
 		$(BUILD_DIR_ZIP)/chusan
-	$(V)cp $(BUILD_DIR_GAMES_32)/chusanhook/chusanhook.dll \
+	$(V)cp $(BUILD_DIR_32)/chusanhook/chusanhook.dll \
 		$(BUILD_DIR_ZIP)/chusan/chusanhook_x86.dll
-	$(V)cp $(BUILD_DIR_GAMES_64)/chusanhook/chusanhook.dll \
+	$(V)cp $(BUILD_DIR_64)/chusanhook/chusanhook.dll \
 		$(BUILD_DIR_ZIP)/chusan/chusanhook_x64.dll
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
 		$(BUILD_DIR_ZIP)/chusan/inject_x86.exe
@@ -162,7 +162,7 @@ $(BUILD_DIR_ZIP)/mu3.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mu3
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mu3/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/mu3hook/mu3hook.dll \
+		$(BUILD_DIR_64)/mu3hook/mu3hook.dll \
 		$(DIST_DIR)/mu3/segatools.ini \
 		$(DIST_DIR)/mu3/launch.bat \
     	$(BUILD_DIR_ZIP)/mu3
@@ -177,7 +177,7 @@ $(BUILD_DIR_ZIP)/mai2.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mai2
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mai2/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/mai2hook/mai2hook.dll \
+		$(BUILD_DIR_64)/mai2hook/mai2hook.dll \
 		$(DIST_DIR)/mai2/segatools.ini \
 		$(DIST_DIR)/mai2/launch.bat \
     	$(BUILD_DIR_ZIP)/mai2
@@ -192,7 +192,7 @@ $(BUILD_DIR_ZIP)/cm.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cm
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cm/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/cmhook/cmhook.dll \
+		$(BUILD_DIR_64)/cmhook/cmhook.dll \
 		$(DIST_DIR)/cm/config_hook.json \
 		$(DIST_DIR)/cm/segatools.ini \
 		$(DIST_DIR)/cm/launch.bat \
@@ -208,7 +208,7 @@ $(BUILD_DIR_ZIP)/tokyo.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/tokyo
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/tokyo/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/tokyohook/tokyohook.dll \
+		$(BUILD_DIR_64)/tokyohook/tokyohook.dll \
 		$(DIST_DIR)/tokyo/config_hook.json \
 		$(DIST_DIR)/tokyo/segatools.ini \
 		$(DIST_DIR)/tokyo/launch.bat \
@@ -226,9 +226,9 @@ $(BUILD_DIR_ZIP)/kemono.zip:
 	$(V)cp $(DIST_DIR)/kemono/segatools.ini \
 		$(DIST_DIR)/kemono/launch.bat \
 		$(BUILD_DIR_ZIP)/kemono
-	$(V)cp $(BUILD_DIR_GAMES_32)/kemonohook/kemonohook.dll \
+	$(V)cp $(BUILD_DIR_32)/kemonohook/kemonohook.dll \
 		$(BUILD_DIR_ZIP)/kemono/kemonohook_x86.dll
-	$(V)cp $(BUILD_DIR_GAMES_64)/kemonohook/kemonohook.dll \
+	$(V)cp $(BUILD_DIR_64)/kemonohook/kemonohook.dll \
 		$(BUILD_DIR_ZIP)/kemono/kemonohook_x64.dll
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
 		$(BUILD_DIR_ZIP)/kemono/inject_x86.exe
@@ -240,22 +240,6 @@ $(BUILD_DIR_ZIP)/kemono.zip:
 	for x in exe dll; do strip $(BUILD_DIR_ZIP)/kemono/*.$$x; done
 	$(V)cd $(BUILD_DIR_ZIP)/kemono ; zip -r ../kemono.zip *
 
-$(BUILD_DIR_ZIP)/apm3.zip:
-	$(V)echo ... $@
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/apm3
-	$(V)mkdir -p $(BUILD_DIR_ZIP)/apm3/DEVICE
-	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_GAMES_64)/apm3hook/apm3hook.dll \
-		$(DIST_DIR)/apm3/segatools.ini \
-		$(DIST_DIR)/apm3/launch.bat \
-		$(DIST_DIR)/apm3/config_hook.json \
-    	$(BUILD_DIR_ZIP)/apm3
-	$(V)cp pki/billing.pub \
-		pki/ca.crt \
-    	$(BUILD_DIR_ZIP)/apm3/DEVICE
-	$(V)strip $(BUILD_DIR_ZIP)/apm3/*.{exe,dll}
-	$(V)cd $(BUILD_DIR_ZIP)/apm3 ; zip -r ../apm3.zip *
-
 $(BUILD_DIR_ZIP)/doc.zip: \
 		$(DOC_DIR)/config \
 		$(DOC_DIR)/chunihook.md \
@@ -281,7 +265,6 @@ $(BUILD_DIR_ZIP)/segatools.zip: \
 		$(BUILD_DIR_ZIP)/tokyo.zip \
 		$(BUILD_DIR_ZIP)/fgo.zip \
 		$(BUILD_DIR_ZIP)/kemono.zip \
-		$(BUILD_DIR_ZIP)/apm3.zip \
 		CHANGELOG.md \
 		README.md \
 

README.md

@@ -1,6 +1,6 @@
 # Segatools
 
-Version: `2025-07-27`
+Version: `2024-09-30`
 
 Loaders and hardware emulators for SEGA games that run on the Nu and ALLS platforms.
 
@@ -32,8 +32,6 @@ Loaders and hardware emulators for SEGA games that run on the Nu and ALLS platfo
   * starting from WACCA
 * Kemono Friends
   * Kemono Friends 3: Planet Tours
-* ALL.Net P-ras MULTI Version 3
-  * starting from ALL.Net P-ras MULTI Version 3 1.01
 
 ## End-users
 

board/config.c

@@ -75,15 +75,6 @@ void aime_config_load(struct aime_config *cfg, const wchar_t *filename)
     cfg->port_no = GetPrivateProfileIntW(L"aime", L"portNo", 0, filename);
     cfg->high_baudrate = GetPrivateProfileIntW(L"aime", L"highBaud", 1, filename);
     cfg->gen = GetPrivateProfileIntW(L"aime", L"gen", 0, filename);
-    cfg->proxy_flag = GetPrivateProfileIntW(L"aime", L"proxyFlag", 2, filename);
-
-    GetPrivateProfileStringW(
-            L"aime",
-            L"authdataPath",
-            L"DEVICE\\authdata.bin",
-            cfg->authdata_path,
-            _countof(cfg->authdata_path),
-            filename);
 }
 
 void io4_config_load(struct io4_config *cfg, const wchar_t *filename)

board/sg-nfc-cmd.h

@@ -5,21 +5,21 @@
 #pragma pack(push, 1)
 
 enum {
-    SG_NFC_CMD_GET_FW_VERSION           = 0x30,
-    SG_NFC_CMD_GET_HW_VERSION           = 0x32,
-    SG_NFC_CMD_RADIO_ON                 = 0x40,
-    SG_NFC_CMD_RADIO_OFF                = 0x41,
-    SG_NFC_CMD_POLL                     = 0x42,
-    SG_NFC_CMD_MIFARE_SELECT_TAG        = 0x43,
-    SG_NFC_CMD_MIFARE_SET_KEY_AIME      = 0x50,
-    SG_NFC_CMD_MIFARE_AUTHENTICATE_AIME = 0x51,
-    SG_NFC_CMD_MIFARE_READ_BLOCK        = 0x52,
-    SG_NFC_CMD_MIFARE_SET_KEY_BANA      = 0x54,
-    SG_NFC_CMD_MIFARE_AUTHENTICATE_BANA = 0x55,
-    SG_NFC_CMD_TO_UPDATE_MODE           = 0x60,
-    SG_NFC_CMD_SEND_HEX_DATA            = 0x61,
-    SG_NFC_CMD_RESET                    = 0x62,
-    SG_NFC_CMD_FELICA_ENCAP             = 0x71,
+    SG_NFC_CMD_GET_FW_VERSION        = 0x30,
+    SG_NFC_CMD_GET_HW_VERSION        = 0x32,
+    SG_NFC_CMD_RADIO_ON              = 0x40,
+    SG_NFC_CMD_RADIO_OFF             = 0x41,
+    SG_NFC_CMD_POLL                  = 0x42,
+    SG_NFC_CMD_MIFARE_SELECT_TAG     = 0x43,
+    SG_NFC_CMD_MIFARE_SET_KEY_AIME   = 0x50,
+    SG_NFC_CMD_MIFARE_AUTHENTICATE_A = 0x51,
+    SG_NFC_CMD_MIFARE_READ_BLOCK     = 0x52,
+    SG_NFC_CMD_MIFARE_SET_KEY_BANA   = 0x54,
+    SG_NFC_CMD_MIFARE_AUTHENTICATE_B = 0x55,
+    SG_NFC_CMD_TO_UPDATE_MODE        = 0x60,
+    SG_NFC_CMD_SEND_HEX_DATA         = 0x61,
+    SG_NFC_CMD_RESET                 = 0x62,
+    SG_NFC_CMD_FELICA_ENCAP          = 0x71,
 };
 
 struct sg_nfc_res_get_fw_version {

board/sg-nfc.c

@@ -2,7 +2,6 @@
 
 #include <assert.h>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -17,7 +16,6 @@
 
 #include "util/dprintf.h"
 #include "util/dump.h"
-#include "util/slurp.h"
 
 static HRESULT sg_nfc_dispatch(
         void *ctx,
@@ -89,8 +87,6 @@ void sg_nfc_init(
         uint8_t addr,
         const struct sg_nfc_ops *ops,
         unsigned int gen,
-        unsigned int proxy_flag,
-        const wchar_t* authdata_path,
         void *ops_ctx)
 {
     assert(nfc != NULL);
@@ -100,8 +96,6 @@ void sg_nfc_init(
     nfc->ops_ctx = ops_ctx;
     nfc->addr = addr;
     nfc->gen = gen;
-    nfc->proxy_flag = proxy_flag;
-    nfc->authdata_path = authdata_path;
 }
 
 #ifdef NDEBUG
@@ -195,8 +189,8 @@ static HRESULT sg_nfc_dispatch(
                 &req->felica_encap,
                 &res->felica_encap);
 
-    case SG_NFC_CMD_MIFARE_AUTHENTICATE_AIME:
-    case SG_NFC_CMD_MIFARE_AUTHENTICATE_BANA:
+    case SG_NFC_CMD_MIFARE_AUTHENTICATE_A:
+    case SG_NFC_CMD_MIFARE_AUTHENTICATE_B:
     case SG_NFC_CMD_SEND_HEX_DATA:
         return sg_nfc_cmd_send_hex_data(nfc, &req->simple, &res->simple);
 
@@ -321,7 +315,6 @@ static HRESULT sg_nfc_poll_aime(
 
     mifare->type = 0x10;
     mifare->id_len = sizeof(mifare->uid);
-    // mifare->uid = _byteswap_ulong(0x8FBECBFF);
     mifare->uid = _byteswap_ulong(0x01020304);
 
     /* Initialize MIFARE IC emulator */
@@ -389,62 +382,18 @@ static HRESULT sg_nfc_cmd_mifare_read_block(
 
     sg_nfc_dprintf(nfc, "Read uid %08x block %i\n", uid, req->payload.block_no);
 
-    if (req->payload.block_no > 14) {
+    if (req->payload.block_no > 3) {
         sg_nfc_dprintf(nfc, "MIFARE block number out of range\n");
 
         return E_FAIL;
-    } else if (req->payload.block_no >= 5){ // emoney auth encrypted
-
-        sg_res_init(&res->res, &req->req, sizeof(res->block));
-
-        char* auth;
-        long size = wslurp(nfc->authdata_path, &auth, false);
-        if (size < 0){
-            sg_nfc_dprintf(nfc, "Failed to read %ls: %lx!\n", nfc->authdata_path, GetLastError());
-            return E_FAIL;
-        }
-
-        int offset = 0;
-        if (req->payload.block_no == 6){
-            offset = 16;
-        } else if (req->payload.block_no == 8){
-            offset = 32;
-        } else if (req->payload.block_no == 9){
-            offset = 48;
-        } else if (req->payload.block_no == 10){
-            offset = 64;
-        } else if (req->payload.block_no == 12){
-            offset = 82;
-        } else if (req->payload.block_no == 13){
-            offset = 98;
-        } else if (req->payload.block_no == 14){
-            offset = 114;
-        }
-
-        for (int i = 0; i < 16 && offset + i < size; i++){
-            res->block[i] = auth[offset + i];
-        }
-
-        free(auth);
-
-    } else if (req->payload.block_no == 4){ // emoney auth plain
-
-        sg_res_init(&res->res, &req->req, sizeof(res->block));
-
-        res->block[0] = 0x54; // header
-        res->block[1] = 0x43;
-        res->block[2] = nfc->proxy_flag; // 2 or 3 depending on game (useProxy in env.json)
-        res->block[3] = 0x01; // unknown flag
-
-    } else { // read all other blocks normally
-
-        sg_res_init(&res->res, &req->req, sizeof(res->block));
-
-        memcpy( res->block,
-                nfc->mifare.sectors[0].blocks[req->payload.block_no].bytes,
-                sizeof(res->block));
     }
 
+    sg_res_init(&res->res, &req->req, sizeof(res->block));
+
+    memcpy( res->block,
+            nfc->mifare.sectors[0].blocks[req->payload.block_no].bytes,
+            sizeof(res->block));
+
     return S_OK;
 }
 

board/sg-nfc.h

@@ -23,10 +23,8 @@ struct sg_nfc {
     void *ops_ctx;
     uint8_t addr;
     unsigned int gen;
-    unsigned int proxy_flag;
     struct felica felica;
     struct mifare mifare;
-    const wchar_t* authdata_path;
 };
 
 void sg_nfc_init(
@@ -34,8 +32,6 @@ void sg_nfc_init(
         uint8_t addr,
         const struct sg_nfc_ops *ops,
         unsigned int gen,
-        unsigned int proxy_flag,
-        const wchar_t* authdata_path,
         void *ops_ctx);
 
 void sg_nfc_transact(

board/sg-reader.c

@@ -81,7 +81,7 @@ HRESULT sg_reader_hook_init(
         return E_INVALIDARG;
     }
 
-    sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, gen, cfg->proxy_flag, cfg->authdata_path, NULL);
+    sg_nfc_init(&sg_reader_nfc, 0x00, &sg_reader_nfc_ops, gen, NULL);
     sg_led_init(&sg_reader_led, 0x08, &sg_reader_led_ops, gen, NULL);
 
     InitializeCriticalSection(&sg_reader_lock);

board/sg-reader.h

@@ -12,8 +12,6 @@ struct aime_config {
     unsigned int port_no;
     bool high_baudrate;
     unsigned int gen;
-    unsigned int proxy_flag;
-    wchar_t authdata_path[MAX_PATH];
 };
 
 HRESULT sg_reader_hook_init(