Merge branch 'develop'

common/platform/config.c

@@ -23,8 +23,6 @@
 #include "platform/platform.h"
 #include "platform/vfs.h"
 #include "platform/system.h"
-#include "platform/openssl.h"
-
 
 void platform_config_load(struct platform_config *cfg, const wchar_t *filename)
 {
@@ -43,7 +41,6 @@ void platform_config_load(struct platform_config *cfg, const wchar_t *filename)
     nusec_config_load(&cfg->nusec, filename);
     vfs_config_load(&cfg->vfs, filename);
     system_config_load(&cfg->system, filename);
-    openssl_config_load(&cfg->openssl, filename);
 }
 
 void amvideo_config_load(struct amvideo_config *cfg, const wchar_t *filename)
@@ -365,12 +362,3 @@ void epay_config_load(struct epay_config *cfg, const wchar_t *filename)
     cfg->enable = GetPrivateProfileIntW(L"epay", L"enable", 1, filename);
     cfg->hook = GetPrivateProfileIntW(L"epay", L"hook", 1, filename);
 }
-
-void openssl_config_load(struct openssl_config *cfg, const wchar_t *filename)
-{
-    assert(cfg != NULL);
-    assert(filename != NULL);
-
-    cfg->enable = GetPrivateProfileIntW(L"openssl", L"enable", 1, filename);
-    cfg->override = GetPrivateProfileIntW(L"openssl", L"override", 0, filename);
-}

common/platform/config.h

@@ -19,7 +19,6 @@
 #include "platform/platform.h"
 #include "platform/vfs.h"
 #include "platform/system.h"
-#include "platform/openssl.h"
 
 void platform_config_load(
         struct platform_config *cfg,
@@ -37,4 +36,3 @@ void nusec_config_load(struct nusec_config *cfg, const wchar_t *filename);
 void pcbid_config_load(struct pcbid_config *cfg, const wchar_t *filename);
 void vfs_config_load(struct vfs_config *cfg, const wchar_t *filename);
 void system_config_load(struct system_config *cfg, const wchar_t *filename);
-void openssl_config_load(struct openssl_config *cfg, const wchar_t *filename);

common/platform/meson.build

@@ -38,7 +38,5 @@ platform_lib = static_library(
         'vfs.h',
         'system.c',
         'system.h',
-        'openssl.c',
-        'openssl.h'
     ],
 )

common/platform/openssl.c

@@ -1,116 +0,0 @@
-#include <windows.h>
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <intrin.h>
-
-#include "hook/table.h"
-
-#include "hooklib/config.h"
-
-#include "platform/openssl.h"
-
-#include "util/dprintf.h"
-
-/* API hooks */
-
-static char * __cdecl hook_getenv(const char *name);
-
-/* Link pointers */
-
-static char * (__cdecl *next_getenv)(const char *name);
-
-static bool openssl_hook_initted;
-static struct openssl_config openssl_config;
-
-static const struct hook_symbol openssl_hooks[] = {
-    {
-        .name  = "getenv",
-        .patch = hook_getenv,
-        .link  = (void **) &next_getenv
-    },
-};
-
-static int check_intel_sha_extension() {
-    int n_ids;
-    int is_intel;
-    char vendor[0x20] = {0};
-    int cpui[4] = {0};
-
-    /* OpenSSL 1.0.2 beta to 1.0.2k contain bugs that crash "AM Daemon" due to
-      bad SHA values on processors with the SHA extensions, such as Intel 10th 
-      gen CPUs or higher.
-
-      Credits: kagaminehaku */
-
-    __cpuid(cpui, 0);
-    n_ids = cpui[0];
-
-    *((int *) vendor) = cpui[1];
-    *((int *) (vendor + 4)) = cpui[3];
-    *((int *) (vendor + 8)) = cpui[2];
-
-    /* Check that the CPU vendor is Intel */
-    is_intel = (strcmp(vendor, "GenuineIntel") == 0);
-
-    if (is_intel && n_ids >= 7) {
-        __cpuidex(cpui, 7, 0);
-
-        /* SHA extensions supported */
-        return (cpui[1] & (1 << 29)) != 0;
-    }
-
-    return 0;
-}
-
-HRESULT openssl_hook_init(const struct openssl_config *cfg)
-{
-    assert(cfg != NULL);
-
-    if (!cfg->enable) {
-        return S_FALSE;
-    }
-
-    if (openssl_hook_initted) {
-        return S_FALSE;
-    }
-
-    if (cfg->override) {
-        dprintf("OpenSSL: hook enabled.\n");
-    } else if (check_intel_sha_extension()) {
-        dprintf("OpenSSL: Intel CPU SHA extension detected, hook enabled.\n");
-    } else {
-        return S_FALSE;
-    }
-
-    openssl_hook_initted = true;
-
-    memcpy(&openssl_config, cfg, sizeof(*cfg));
-    hook_table_apply(
-        NULL,
-        "msvcr110.dll",
-        openssl_hooks,
-        _countof(openssl_hooks)
-    );
-
-    return S_OK;
-}
-
-static char * __cdecl hook_getenv(const char *name)
-{
-    /* Overrides OpenSSL's Intel CPU identification. This disables the OpenSSL
-       code check for SHA extensions. */
-    if (name && strcmp(name, "OPENSSL_ia32cap") == 0) {
-        static char override[] = "~0x20000000";
-
-        dprintf("OpenSSL: Overriding OPENSSL_ia32cap -> %s\n", override);
-        
-        return override;
-    }
-
-    char *real_val = next_getenv(name);
-
-    return real_val;
-}

common/platform/openssl.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <windows.h>
-
-#include <stdbool.h>
-
-struct openssl_config {
-    bool enable;
-    bool override;
-};
-
-HRESULT openssl_hook_init(const struct openssl_config *cfg);

common/platform/platform.c

@@ -14,7 +14,6 @@
 #include "platform/platform.h"
 #include "platform/vfs.h"
 #include "platform/system.h"
-#include "platform/openssl.h"
 
 HRESULT platform_hook_init(
         const struct platform_config *cfg,
@@ -95,11 +94,5 @@ HRESULT platform_hook_init(
         return hr;
     }
 
-    hr = openssl_hook_init(&cfg->openssl);
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
     return S_OK;
 }

common/platform/platform.h

@@ -14,7 +14,6 @@
 #include "platform/pcbid.h"
 #include "platform/vfs.h"
 #include "platform/system.h"
-#include "platform/openssl.h"
 
 struct platform_config {
     struct amvideo_config amvideo;
@@ -29,7 +28,6 @@ struct platform_config {
     struct nusec_config nusec;
     struct vfs_config vfs;
     struct system_config system;
-    struct openssl_config openssl;
 };
 
 HRESULT platform_hook_init(

dist/apm3/launch.bat

@@ -17,10 +17,8 @@ if exist %tmp%\SequenceSetting.json (
 :BEGIN
 pushd %~dp0
 
-set DOORSTOP_DISABLE=TRUE
 qprocess amdaemon.exe > NUL
 IF %ERRORLEVEL% NEQ 0 start /min "AM Daemon" inject -d -k apm3hook.dll amdaemon.exe -c daemon_config\common.json daemon_config\server.json config_hook.json
-set DOORSTOP_DISABLE=
 
 REM Add "-screen-fullscreen 0 -popupWindow" if you want to run in windowed mode
 inject -d -k apm3hook.dll APMV3System -logFile output_log.txt

dist/idac/segatools.ini

@@ -235,9 +235,6 @@ viewChg=2
 ; This is not possible on most devices, so we set the left and right button again.
 left=7
 right=8
-; Additional mapping for up and down buttons in DPad.
-up=4
-down=3
 ; Button mappings for the simulated six-speed shifter.
 shiftDn=6
 shiftUp=5

doc/config/common.md

@@ -663,21 +663,4 @@ Enables the Thinca emulation. This will allow you to enable E-Money on compatibl
 
 Default: `1`
 
-Enables hooking of respective Thinca DLL functions to emulate the existence of E-Money. This cannot be used with a real E-Money server.
-
-## `[openssl]`
-
-Configure the OpenSSL SHA extension bug hook.
-
-### `enable`
-
-Default: `1`
-
-Enables the OpenSSL hook to fix the SHA extension bug on Intel CPUs.
-
-### `override`
-
-Default: `0`
-
-Enables the override to always hook the OpenSSL env variable. By default the
-hook is only applied to Intel CPUs with the SHA extension present.
+Enables hooking of respective Thinca DLL functions to emulate the existence of E-Money. This cannot be used with a real E-Money server.

games/idacio/config.c

@@ -60,8 +60,6 @@ void idac_di_config_load(struct idac_di_config *cfg, const wchar_t *filename)
     cfg->view_chg = GetPrivateProfileIntW(L"dinput", L"viewChg", 0, filename);
     cfg->left = GetPrivateProfileIntW(L"dinput", L"left", 0, filename);
     cfg->right = GetPrivateProfileIntW(L"dinput", L"right", 0, filename);
-    cfg->up = GetPrivateProfileIntW(L"dinput", L"up", 0, filename);
-    cfg->down = GetPrivateProfileIntW(L"dinput", L"down", 0, filename);
     cfg->shift_dn = GetPrivateProfileIntW(L"dinput", L"shiftDn", 0, filename);
     cfg->shift_up = GetPrivateProfileIntW(L"dinput", L"shiftUp", 0, filename);
 

games/idacio/config.h

@@ -18,8 +18,6 @@ struct idac_di_config {
     uint8_t view_chg;
     uint8_t left;
     uint8_t right;
-    uint8_t up;
-    uint8_t down; 
     uint8_t shift_dn;
     uint8_t shift_up;
     uint8_t gear[6];

games/idacio/di.c

@@ -71,8 +71,6 @@ static uint8_t idac_di_view_chg;
 static uint8_t idac_di_start;
 static uint8_t idac_di_left;
 static uint8_t idac_di_right;
-static uint8_t idac_di_up;
-static uint8_t idac_di_down;
 static uint8_t idac_di_gear[6];
 static bool idac_di_use_pedals;
 static bool idac_di_reverse_brake_axis;
@@ -249,16 +247,6 @@ static HRESULT idac_di_config_apply(const struct idac_di_config *cfg)
         return E_INVALIDARG;
     }
 
-    if (cfg->up > 32) {
-        dprintf("Wheel: Invalid up button: %i\n", cfg->up);
-        return E_INVALIDARG;
-    }
-
-    if (cfg->down > 32) {
-        dprintf("Wheel: Invalid down button: %i\n", cfg->down);
-        return E_INVALIDARG;
-    }
-
     if (cfg->shift_dn > 32) {
         dprintf("Wheel: Invalid shift down button: %i\n", cfg->shift_dn);
 
@@ -294,8 +282,6 @@ static HRESULT idac_di_config_apply(const struct idac_di_config *cfg)
     dprintf("Wheel: View Change button  : %i\n", cfg->view_chg);
     dprintf("Wheel: Left button . . . . : %i\n", cfg->left);
     dprintf("Wheel: Right button  . . . : %i\n", cfg->right);
-    dprintf("Wheel: Up button . . . . . : %i\n", cfg->up);
-    dprintf("Wheel: Down button  . . .  : %i\n", cfg->down);
     dprintf("Wheel: Shift Down button . : %i\n", cfg->shift_dn);
     dprintf("Wheel: Shift Up button . . : %i\n", cfg->shift_up);
     dprintf("Wheel: Reverse Brake Axis  : %i\n", cfg->reverse_brake_axis);
@@ -331,8 +317,6 @@ static HRESULT idac_di_config_apply(const struct idac_di_config *cfg)
     idac_di_view_chg = cfg->view_chg;
     idac_di_left = cfg->left;
     idac_di_right = cfg->right;
-    idac_di_up = cfg->up;
-    idac_di_down = cfg->down;
     idac_di_shift_dn = cfg->shift_dn;
     idac_di_shift_up = cfg->shift_up;
     idac_di_reverse_brake_axis = cfg->reverse_brake_axis;
@@ -496,14 +480,6 @@ static void idac_di_get_buttons(uint8_t *gamebtn_out)
         gamebtn |= IDAC_IO_GAMEBTN_RIGHT;
     }
 
-    if (idac_di_up && state.st.rgbButtons[idac_di_up - 1]) {
-        gamebtn |= IDAC_IO_GAMEBTN_UP;
-    }
-
-    if (idac_di_down && state.st.rgbButtons[idac_di_down - 1]) {
-        gamebtn |= IDAC_IO_GAMEBTN_DOWN;
-    }
-
     *gamebtn_out = gamebtn;
 }
 

games/swdcio/xi.c

@@ -179,7 +179,7 @@ static int16_t calculate_norm_steering(int16_t axis, uint16_t deadzone, bool lin
 
         // optionally normalize the magnitude with respect to its expected range
         // giving a magnitude value of 0.0 to 1.0
-        norm_magnitude = (magnitude / (max_stick_value - deadzone));
+        norm_magnitude = (int16_t)(magnitude / (max_stick_value - deadzone));
     } else // if the controller is in the deadzone zero out the magnitude
     {
         magnitude = 0.0;

subprojects/capnhook.wrap

@@ -1,4 +1,4 @@
 [wrap-git]
 directory = capnhook
 url = https://gitea.tendokyu.moe/TeamTofuShop/capnhook
-revision = 252465b23f51f36206e614190496663425f4ee5d
+revision = dafd0aa336ab80ba87a82370a9dc95a3389ef5e5