diff --git a/build64.bat b/build64.bat index 0ca68da..00a298a 100644 --- a/build64.bat +++ b/build64.bat @@ -2,6 +2,7 @@ cd /d %~dp0 REM Edit this with the right path to vcvarsall.bat. call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 +call "C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Auxiliary\Build\vcvarsall.bat" x64 meson setup build64 --buildtype=release meson configure build64 ninja -C build64 diff --git a/meson.build b/meson.build index c9582b1..6dcd1b6 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'TAL_CardReader', 'c', - version : '0.2.0' + version : '0.3.0' ) inc = include_directories('.') diff --git a/src/cardreader_plugin/dllmain.c b/src/cardreader_plugin/dllmain.c index 555a9a6..bbc6ce4 100644 --- a/src/cardreader_plugin/dllmain.c +++ b/src/cardreader_plugin/dllmain.c @@ -17,6 +17,10 @@ static bool HasCard = false; bool usingSmartCard = false; int readCooldown = 200; +typedef(QRCALL_proc)(char id[21]); +QRCALL_proc *QRCALL; +HANDLE bnusio_dll; + typedef void (*callbackTouch)(i32, i32, u8[168], u64); callbackTouch touchCallback; u64 touchData; @@ -77,7 +81,7 @@ static unsigned int __stdcall reader_poll_thread_proc(void *ctx) { printWarning("%s (%s): Read card %02X%02X%02X%02X%02X%02X%02X%02X\n", __func__, module, UID[0], UID[1], UID[2], UID[3], UID[4], UID[5], UID[6], UID[7]); - if (waitingForTouch) // Check if game is waiting for a card. + if (waitingForTouch || QRCALL) // Check if game is waiting for a card or a qr code. { // Properly format the AccessID u64 ReversedAccessID; @@ -153,6 +157,17 @@ void reader_runner_stop() void Init() { + bnusio_dll = LoadLibrary(".\\bnusio.dll"); /*Explicit Load*/ + if (bnusio_dll) + { + printWarning("%s (%s): Got bnusio !\n", __func__, module); + QRCALL = GetProcAddress(bnusio_dll, "qr_call"); + if (QRCALL) + printWarning("%s (%s): Got QRCALL, using QR emulator !\n", __func__, module); + else + printWarning("%s (%s): Couldn't find QRCALL, using card emulator !\n", __func__, module); + } + printWarning("%s (%s): Starting HID Service...\n", __func__, module); // Read config @@ -199,9 +214,15 @@ void Update() // Insert card in game printInfo("%s (%s): Inserting Card %s, with ChipID %s\n", __func__, module, AccessID, ChipID); - memcpy(cardData + 0x2C, ChipID, 33); - memcpy(cardData + 0x50, AccessID, 21); - touchCallback(0, 0, cardData, touchData); + + if (QRCALL) + QRCALL(AccessID); // For CHN + else + { + memcpy(cardData + 0x2C, ChipID, 33); + memcpy(cardData + 0x50, AccessID, 21); + touchCallback(0, 0, cardData, touchData); + } HasCard = false; }