Cool_Tools/bemanitools
1
0
Fork 0
mirror of https://github.com/djhackersdev/bemanitools.git synced 2024-11-30 17:24:30 +01:00
Code Releases Activity

Nearly complete USB memory support

Browse Source
This commit is contained in:
QCDLZCLW3K 2022-05-14 08:01:11 +09:00
parent 4be866e69e
commit 852d770629
10 changed files with 296 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/ddr/ddr-11-us.conf vendored
View File

@ -16,5 +16,8 @@ ddrhookx.use_com4_emu=true
# SD cabinet mode
ddrhookx.standard_def=false
# Specify path for USB memory data
ddrhookx.usbmem_path=usbmem
# Run the game windowed
gfx.windowed=false
gfx.windowed=true

5
dist/ddr/ddr-11.conf vendored
View File

@ -16,5 +16,8 @@ ddrhookx.use_com4_emu=true
# SD cabinet mode
ddrhookx.standard_def=false
# Specify path for USB memory data
ddrhookx.usbmem_path=usbmem
# Run the game windowed
gfx.windowed=false
gfx.windowed=true

261
src/main/ddrhook-util/usbmem.c
View File

@ -14,15 +14,20 @@
#include "hook/iohook.h"
#include "util/crc.h"
#include "util/iobuf.h"
#include "util/log.h"
#include "util/fs.h"
#include "util/str.h"
#define USBMEM_BUF_SIZE 128
#define USBMEM_DEVICE_COUNT 2
#define USBMEM_COMMAND_BUF_SIZE 128
#define USBMEM_DATA_BUF_SIZE (1024 + 5)
static HANDLE usbmem_fd;
static char usbmem_response[USBMEM_BUF_SIZE];
static char usbmem_response[USBMEM_DATA_BUF_SIZE];
static bool usbmem_pending;
static size_t usbmem_response_length;
static HRESULT usbmem_open(struct irp *irp);
static HRESULT usbmem_close(struct irp *irp);
@ -30,7 +35,45 @@ static HRESULT usbmem_write(struct irp *irp);
static HRESULT usbmem_read(struct irp *irp);
static HRESULT usbmem_ioctl(struct irp *irp);
void usbmem_init(void)
typedef enum {
USBMEM_FILE_TYPE_NONE = 0,
USBMEM_FILE_TYPE_READ,
USBMEM_FILE_TYPE_WRITE,
} USBMEM_FILE_TYPE;
struct USBMEM_STATE {
bool connected;
bool opened;
USBMEM_FILE_TYPE file_type;
char path[MAX_PATH];
char filename[MAX_PATH];
uint8_t *buffer;
size_t buffer_len;
size_t buffer_index;
int buffer_frame;
};
static char usb_data_path[MAX_PATH];
static int target_device_id;
static struct USBMEM_STATE usbmem_state[USBMEM_DEVICE_COUNT];
static void usbmem_reset_file_state(int port)
{
if (usbmem_state[port].buffer) {
free(usbmem_state[port].buffer);
usbmem_state[port].buffer = NULL;
}
usbmem_state[port].buffer_len = 0;
usbmem_state[port].buffer_index = 0;
usbmem_state[port].buffer_frame = 0;
usbmem_state[port].file_type = USBMEM_FILE_TYPE_NONE;
}
void usbmem_init(const char *path)
{
log_assert(usbmem_fd == NULL);
@ -41,6 +84,25 @@ void usbmem_init(void)
if (hr != S_OK) {
log_fatal("Opening nul fd failed: %08lx", hr);
}
GetFullPathNameA(path, sizeof(usb_data_path), usb_data_path, NULL);
log_misc("USB memory data path: %s", usb_data_path);
target_device_id = -1;
for (int i = 0; i < USBMEM_DEVICE_COUNT; i++) {
char subpath[MAX_PATH];
snprintf(subpath, sizeof(subpath), "%s\\p%d", usb_data_path, i + 1);
if (!path_exists(subpath)) {
path_mkdir(subpath);
}
usbmem_state[i].connected = false;
usbmem_state[i].opened = false;
memset(usbmem_state[i].path, 0, sizeof(usbmem_state[i].path));
memset(usbmem_state[i].filename, 0, sizeof(usbmem_state[i].filename));
usbmem_reset_file_state(i);
}
}
void usbmem_fini(void)
@ -101,36 +163,191 @@ static HRESULT usbmem_close(struct irp *irp)
static HRESULT usbmem_write(struct irp *irp)
{
struct const_iobuf *src;
char request[USBMEM_BUF_SIZE];
char request[USBMEM_COMMAND_BUF_SIZE];
uint32_t nbytes;
log_assert(irp != NULL);
log_assert(irp->write.bytes != NULL);
src = &irp->write;
nbytes = src->nbytes > USBMEM_BUF_SIZE ? USBMEM_BUF_SIZE : src->nbytes;
nbytes = src->nbytes > USBMEM_COMMAND_BUF_SIZE ? USBMEM_COMMAND_BUF_SIZE : src->nbytes;
memcpy(request, src->bytes, nbytes);
request[nbytes - 1] = '\0'; /* This is always a CR. */
if (!usbmem_pending && target_device_id >= 0 && target_device_id < USBMEM_DEVICE_COUNT && usbmem_state[target_device_id].file_type == USBMEM_FILE_TYPE_READ) {
memset(usbmem_response, 0, sizeof(usbmem_response));
log_misc("Read progress %08x/%08x bytes", usbmem_state[target_device_id].buffer_index, usbmem_state[target_device_id].buffer_len);
if (usbmem_state[target_device_id].buffer_index < usbmem_state[target_device_id].buffer_len) {
usbmem_response_length = sizeof(usbmem_response);
usbmem_response[0] = 0x02; // 1 = 0x80 buffer, 2 = 0x400 buffer
usbmem_response[1] = usbmem_state[target_device_id].buffer_frame;
usbmem_response[2] = ~usbmem_response[1];
if (usbmem_state[target_device_id].buffer_frame == 0) {
snprintf(usbmem_response + 4, sizeof(usbmem_response) - 5, "%d ", usbmem_state[target_device_id].buffer_len);
} else {
size_t len = sizeof(usbmem_response) - 5;
if (usbmem_state[target_device_id].buffer_index + len > usbmem_state[target_device_id].buffer_len)
len = usbmem_state[target_device_id].buffer_len - usbmem_state[target_device_id].buffer_index;
memcpy(usbmem_response + 3, usbmem_state[target_device_id].buffer + usbmem_state[target_device_id].buffer_index, len);
usbmem_state[target_device_id].buffer_index += len;
}
usbmem_state[target_device_id].buffer_frame++;
uint16_t crc = crc16_msb(usbmem_response + 3, sizeof(usbmem_response) - 5, 0);
usbmem_response[sizeof(usbmem_response) - 2] = crc >> 8;
usbmem_response[sizeof(usbmem_response) - 1] = crc & 0xff;
} else {
usbmem_response_length = 1;
usbmem_response[0] = 0x04; // End
}
} else if (strlen(request) > 0) {
log_misc(">%s", request);
if (strlen(request) > 0) {
// Try to detect device ID
// The only commands without a device ID are "sver", "start", and "init".
char target_device_val = request[strlen(request) - 1];
char *target_device_id_ptr = strstr(request, " ");
if (target_device_id_ptr != NULL) {
target_device_val = *(target_device_id_ptr - 1);
}
// Counterintuitively, b is P1 and a is P2
if (target_device_val == 'a' || target_device_val == 'b') {
target_device_id = target_device_val - 'a';
}
if (str_eq(request, "sver")) {
str_cpy(
usbmem_response,
sizeof(usbmem_response),
"done GQHDXJAA DJHACKRS");
} else if (
str_eq(request, "on_a") || str_eq(request, "on_b") ||
str_eq(request, "offa") || str_eq(request, "offb")) {
} else if (str_eq(request, "init") || str_eq(request, "start")) {
str_cpy(usbmem_response, sizeof(usbmem_response), "done");
} else if (
strncmp(request, "lma ", 4) == 0 ||
strncmp(request, "lmb ", 4) == 0) {
} else if (target_device_id < 0 || target_device_id >= USBMEM_DEVICE_COUNT) {
str_cpy(usbmem_response, sizeof(usbmem_response), "fail");
} else if (str_eq(request, "on_a") || str_eq(request, "on_b")) {
usbmem_state[target_device_id].connected = true;
usbmem_reset_file_state(target_device_id);
str_cpy(usbmem_response, sizeof(usbmem_response), "done");
} else if (str_eq(request, "offa") || str_eq(request, "offb")) {
usbmem_state[target_device_id].connected = false;
usbmem_reset_file_state(target_device_id);
str_cpy(usbmem_response, sizeof(usbmem_response), "done");
} else if (str_eq(request, "opna") || str_eq(request, "opnb")) {
char temp[MAX_PATH];
snprintf(temp, sizeof(temp), "%s\\p%d", usb_data_path, 2 - (request[3] - 'a'));
usbmem_state[target_device_id].opened = false;
if (usbmem_state[target_device_id].connected != true || !path_exists(temp)) {
str_cpy(usbmem_response, sizeof(usbmem_response), "not connected");
} else {
usbmem_state[target_device_id].opened = true;
str_cpy(usbmem_response, sizeof(usbmem_response), "done");
}
} else if (str_eq(request, "clsa") || str_eq(request, "clsb")) {
if (usbmem_state[target_device_id].connected != true) {
str_cpy(usbmem_response, sizeof(usbmem_response), "not connected");
} else if (usbmem_state[target_device_id].opened != true) {
str_cpy(usbmem_response, sizeof(usbmem_response), "already");
} else {
str_cpy(usbmem_response, sizeof(usbmem_response), "done");
}
usbmem_state[target_device_id].opened = false;
usbmem_reset_file_state(target_device_id);
} else if (strncmp(request, "cda ", 4) == 0 || strncmp(request, "cdb ", 4) == 0) {
char *path = request + 4;
int path_target_device_id = -1;
if (path[0] == 'a' || path[0] == 'b') {
path_target_device_id = path[0] - 'a';
}
if (usbmem_state[target_device_id].connected != true || usbmem_state[target_device_id].opened != true) {
str_cpy(usbmem_response, sizeof(usbmem_response), "not connected");
} else if (path_target_device_id == -1 || path_target_device_id != target_device_id) {
// Don't allow access to another drive
str_cpy(usbmem_response, sizeof(usbmem_response), "illegal");
} else if (path[1] == ':') {
// Absolute path
char temp[MAX_PATH];
snprintf(temp, sizeof(temp), "%s\\p%d\\%s", usb_data_path, 2 - target_device_id, path + 3);
if (!path_exists(temp)) {
log_warning("Couldn't find path %s\n", temp);
str_cpy(usbmem_response, sizeof(usbmem_response), "not exist");
} else {
log_misc("Changing path to %s\n", temp);
str_cpy(usbmem_state[target_device_id].path, sizeof(usbmem_state[target_device_id].path), temp);
str_cpy(usbmem_response, sizeof(usbmem_response), "done");
}
} else {
str_cpy(usbmem_response, sizeof(usbmem_response), "illegal");
}
} else if (strncmp(request, "rda ", 4) == 0 || strncmp(request, "rdb ", 4) == 0) {
usbmem_reset_file_state(target_device_id);
if (usbmem_state[target_device_id].connected != true || usbmem_state[target_device_id].opened != true) {
str_cpy(usbmem_response, sizeof(usbmem_response), "not connected");
} else {
char temp[MAX_PATH] = {0};
char *filename = request + 4;
snprintf(temp, sizeof(temp), "%s\\%s", usbmem_state[target_device_id].path, filename);
if (usbmem_state[target_device_id].buffer) {
free(usbmem_state[target_device_id].buffer);
usbmem_state[target_device_id].buffer = NULL;
}
usbmem_state[target_device_id].file_type = USBMEM_FILE_TYPE_NONE;
usbmem_state[target_device_id].buffer_len = 0;
usbmem_state[target_device_id].buffer_index = 0;
usbmem_state[target_device_id].buffer_frame = 0;
memset(usbmem_state[target_device_id].filename, 0, sizeof(usbmem_state[target_device_id].filename));
if (!path_exists(temp)) {
log_warning("Couldn't find file %s\n", temp);
str_cpy(usbmem_response, sizeof(usbmem_response), "not exist");
} else {
bool loaded = file_load(temp, (void**)&usbmem_state[target_device_id].buffer,
&usbmem_state[target_device_id].buffer_len, false);
if (loaded) {
log_misc("Reading file %s\n", temp);
usbmem_state[target_device_id].file_type = USBMEM_FILE_TYPE_READ;
str_cpy(usbmem_state[target_device_id].filename, sizeof(usbmem_state[target_device_id].filename), filename);
str_cpy(usbmem_response, sizeof(usbmem_response), "start");
} else {
log_warning("Couldn't read file %s\n", temp);
str_cpy(usbmem_response, sizeof(usbmem_response), "fail");
}
}
}
} else if (strncmp(request, "wra ", 4) == 0 || strncmp(request, "wrb ", 4) == 0) {
// Open file for writing
usbmem_reset_file_state(target_device_id);
str_cpy(usbmem_response, sizeof(usbmem_response), "not supported");
} else if (strncmp(request, "wha ", 4) == 0 || strncmp(request, "whb ", 4) == 0) {
// Something relating to writing?
str_cpy(usbmem_response, sizeof(usbmem_response), "not supported");
} else if (strncmp(request, "lma ", 4) == 0 || strncmp(request, "lmb ", 4) == 0) {
// What is "lm"?
str_cpy(usbmem_response, sizeof(usbmem_response), "done");
} else {
str_cpy(usbmem_response, sizeof(usbmem_response), "not connected");
str_cpy(usbmem_response, sizeof(usbmem_response), "fail");
}
str_cat(usbmem_response, sizeof(usbmem_response), "\r>");
usbmem_response_length = strlen(usbmem_response);
}
usbmem_pending = true;
@ -142,27 +359,27 @@ static HRESULT usbmem_write(struct irp *irp)
static HRESULT usbmem_read(struct irp *irp)
{
struct iobuf *dest;
uint32_t rlength;
log_assert(irp != NULL);
log_assert(irp->read.bytes != NULL);
dest = &irp->read;
if (usbmem_pending) {
if (strlen(usbmem_response) > 0) {
if (usbmem_pending && usbmem_response_length != USBMEM_DATA_BUF_SIZE) {
log_misc("%s", usbmem_response);
}
str_cat(usbmem_response, sizeof(usbmem_response), "\r>");
usbmem_pending = false;
if (usbmem_pending && usbmem_response_length == 0) {
str_cpy(usbmem_response, sizeof(usbmem_response), "\r>");
usbmem_response_length = strlen(usbmem_response);
}
rlength = strlen(usbmem_response);
memcpy(dest->bytes, usbmem_response, rlength);
memset(usbmem_response, 0, USBMEM_BUF_SIZE);
dest->pos = usbmem_response_length;
memcpy(dest->bytes, usbmem_response, usbmem_response_length);
dest->pos = rlength;
usbmem_pending = false;
usbmem_response_length = 0;
memset(usbmem_response, 0, sizeof(usbmem_response));
return S_OK;
}

2
src/main/ddrhook-util/usbmem.h
View File

@ -1,7 +1,7 @@
#ifndef HOOK_USBMEM_H
#define HOOK_USBMEM_H
void usbmem_init(void);
void usbmem_init(const char *path);
void usbmem_fini(void);
HRESULT usbmem_dispatch_irp(struct irp *irp);

12
src/main/ddrhook/dllmain.c
View File

@ -40,6 +40,7 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *param)
bool com4;
bool ok;
int i;
char usbmem_data_path[MAX_PATH] = "usbmem";
log_info("--- Begin ddrhook dll_entry_init ---");
@ -67,6 +68,15 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *param)
Windows COM4 port instead. */
com4 = false;
break;
case 'm':
/* Specify a USB memory path */
if (i + 1 < argc) {
strcpy(usbmem_data_path, argv[i+1]);
i++; // Move forward one to skip the path parameter
}
break;
}
}
@ -88,7 +98,7 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *param)
master_insert_hooks(NULL);
p3io_ddr_init();
extio_init();
usbmem_init();
usbmem_init(usbmem_data_path);
spike_init();
com4_init();

19
src/main/ddrhookx/config-ddrhookx.c
View File

@ -8,9 +8,11 @@
#define DDRHOOKX_CONFIG_DDRHOOKX_USE_COM4_EMU_KEY "ddrhookx.use_com4_emu"
#define DDRHOOKX_CONFIG_DDRHOOKX_STANDARD_DEF_KEY "ddrhookx.standard_def"
#define DDRHOOKX_CONFIG_DDRHOOKX_USBMEM_PATH "ddrhookx.usbmem_path"
#define DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_USE_COM4_EMU_VALUE true
#define DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_STANDARD_DEF_VALUE false
#define DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_USBMEM_PATH "usbmem"
void ddrhookx_config_ddrhookx_init(struct cconfig *config)
{
@ -24,6 +26,11 @@ void ddrhookx_config_ddrhookx_init(struct cconfig *config)
DDRHOOKX_CONFIG_DDRHOOKX_STANDARD_DEF_KEY,
DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_STANDARD_DEF_VALUE,
"SD cabinet mode");
cconfig_util_set_str(
config,
DDRHOOKX_CONFIG_DDRHOOKX_USBMEM_PATH,
DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_USBMEM_PATH,
"Specify path for USB memory data");
}
void ddrhookx_config_ddrhookx_get(
@ -51,4 +58,16 @@ void ddrhookx_config_ddrhookx_get(
DDRHOOKX_CONFIG_DDRHOOKX_STANDARD_DEF_KEY,
DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_STANDARD_DEF_VALUE);
}
if (!cconfig_util_get_str(
config,
DDRHOOKX_CONFIG_DDRHOOKX_USBMEM_PATH,
config_ddrhookx->usbmem_path,
sizeof(config_ddrhookx->usbmem_path) - 1,
DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_USBMEM_PATH)) {
log_warning(
"Invalid value for key '%s' specified, fallback "
"to default '%s'",
DDRHOOKX_CONFIG_DDRHOOKX_USBMEM_PATH,
DDRHOOKX_CONFIG_DDRHOOKX_DEFAULT_USBMEM_PATH);
}
}

3
src/main/ddrhookx/config-ddrhookx.h
View File

@ -1,6 +1,8 @@
#ifndef DDRHOOKX_CONFIG_DDRHOOKX_H
#define DDRHOOKX_CONFIG_DDRHOOKX_H
#include <windows.h>
#include "cconfig/cconfig.h"
/**
@ -9,6 +11,7 @@
struct ddrhookx_config_ddrhookx {
bool use_com4_emu;
bool standard_def;
char usbmem_path[MAX_PATH];
};
/**

2
src/main/ddrhookx/dllmain.c
View File

@ -146,7 +146,7 @@ my_GetModuleFileNameA(HMODULE hModule, LPSTR lpFilename, DWORD nSize)
&security_rp_sign_key_black_ddrx,
&security_rp_sign_key_white_eamuse);
extio_init();
usbmem_init();
usbmem_init(config_ddrhookx.usbmem_path);
spike_init();
com4_init();

4
src/main/ddrhookx/filesystem.c
View File

@ -40,11 +40,11 @@ void get_launcher_path_parts(char **output_path, char **output_foldername) {
if (output_foldername != NULL)
*output_foldername = NULL;
if (GetModuleFileNameA(NULL, module_path, MAX_PATH) == 0)
if (GetModuleFileNameA(NULL, module_path, sizeof(module_path)) == 0)
return;
char *filename_ptr = NULL;
if (GetFullPathNameA(module_path, MAX_PATH, launcher_path, &filename_ptr) == 0)
if (GetFullPathNameA(module_path, sizeof(launcher_path), launcher_path, &filename_ptr) == 0)
return;
if (filename_ptr != NULL)

14
src/main/util/fs.c
View File

@ -172,18 +172,20 @@ FILE *fopen_appdata(const char *vendor, const char *filename, const char *mode)
bool path_mkdir(const char *path)
{
bool success;
char buf[MAX_PATH];
char *pos;
str_cpy(buf, lengthof(buf), path);
for (pos = path_next_element(buf); pos; pos = path_next_element(pos + 1)) {
char c = *pos;
*pos = '\0';
if (strlen(buf) != 2 || buf[1] != ':') {
CreateDirectory(buf, NULL);
if (strlen(buf) != 2 || (strlen(buf) >= 2 && buf[1] != ':')) {
success = CreateDirectory(buf, NULL);
if (GetLastError() != ERROR_ALREADY_EXISTS) {
if (!success && GetLastError() != ERROR_ALREADY_EXISTS) {
log_warning(
"%s: Cannot create directory: %#x",
buf,
@ -193,12 +195,12 @@ bool path_mkdir(const char *path)
}
}
*pos = '/';
*pos = c;
}
CreateDirectory(buf, NULL);
success = CreateDirectory(buf, NULL);
if (GetLastError() != ERROR_ALREADY_EXISTS) {
if (!success && GetLastError() != ERROR_ALREADY_EXISTS) {
log_warning(
"%s: Cannot create directory: %#x",
buf,