Skip to content

Commit 5a7959e

Browse files
author
sourcehold
committed
refactor: partially revert #58 by excluding math functions
1 parent d186b91 commit 5a7959e

3 files changed

Lines changed: 32 additions & 124 deletions

File tree

‎src/OpenSHC/OS.func.hpp‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -31,46 +31,6 @@ namespace OS_Func {
3131
Address::SHC_3BB0A8C1_0x0047C5D0, &OpenSHC::OS::isEqualGUID)
3232
isEqualGUID;
3333

34-
MACRO_FUNCTION_RESOLVER(
35-
int(__cdecl*)(double _X), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057ECF1, &OpenSHC::OS::__isnan)
36-
__isnan;
37-
38-
MACRO_FUNCTION_RESOLVER(
39-
int(__cdecl*)(float10 param), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057ED20, &OpenSHC::OS::__ftol2)
40-
__ftol2;
41-
42-
MACRO_FUNCTION_RESOLVER(void(__cdecl*)(float10 param_1), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057EE10,
43-
&OpenSHC::OS::math_atan_FUN_0057ee10)
44-
math_atan_FUN_0057ee10;
45-
46-
MACRO_FUNCTION_RESOLVER(float10(__cdecl*)(float10 floatIn, uint eaxIn, int param_3, int param_4), REIMPLEMENTED_CRT,
47-
Address::SHC_3BB0A8C1_0x0057EE68, &OpenSHC::OS::math_atan_FUN_0057ee68)
48-
math_atan_FUN_0057ee68;
49-
50-
MACRO_FUNCTION_RESOLVER(float10(__cdecl*)(float10 param_1), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057EEF0,
51-
&OpenSHC::OS::math_sqrt_FUN_0057eef0)
52-
math_sqrt_FUN_0057eef0;
53-
54-
MACRO_FUNCTION_RESOLVER(float10(__cdecl*)(int param_1, uint param_2, float10 param_3), REIMPLEMENTED_CRT,
55-
Address::SHC_3BB0A8C1_0x0057EF0D, &OpenSHC::OS::math_sqrt_FUN_0057ef0d)
56-
math_sqrt_FUN_0057ef0d;
57-
58-
MACRO_FUNCTION_RESOLVER(void(__cdecl*)(float10 param_1), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057EFF0,
59-
&OpenSHC::OS::math_tan_1_FUN_0057eff0)
60-
math_tan_1_FUN_0057eff0;
61-
62-
MACRO_FUNCTION_RESOLVER(float10(__cdecl*)(int param_1, int param_2), REIMPLEMENTED_CRT,
63-
Address::SHC_3BB0A8C1_0x0057F048, &OpenSHC::OS::math_FUN_0057f048)
64-
math_FUN_0057f048;
65-
66-
MACRO_FUNCTION_RESOLVER(float10(__fastcall*)(float10 param_1), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057F120,
67-
&OpenSHC::OS::math_cos)
68-
math_cos;
69-
70-
MACRO_FUNCTION_RESOLVER(float10(__fastcall*)(float10 param_1), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057F250,
71-
&OpenSHC::OS::math_sin)
72-
math_sin;
73-
7434
MACRO_FUNCTION_RESOLVER(tm*(__cdecl*)(__time32_t * _Time), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0057F5FE,
7535
&OpenSHC::OS::__localtime64)
7636
__localtime64;
@@ -194,16 +154,6 @@ namespace OS_Func {
194154
REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0058277E, &OpenSHC::OS::_ucrt_lseek)
195155
_ucrt_lseek;
196156

197-
MACRO_FUNCTION_RESOLVER(longlong(__stdcall*)(long dividend_lowOrder, long dividend_highOrder, long divisor_lowOrder,
198-
long divisor_highOrder),
199-
REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x00582C30, &OpenSHC::OS::__alldiv)
200-
__alldiv;
201-
202-
MACRO_FUNCTION_RESOLVER(ulonglong(__stdcall*)(ulong factor1_lowOrder, ulong factor1_highOrder,
203-
ulong factor2_lowOrder, ulong factor2_highOrder),
204-
REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x00582CE0, &OpenSHC::OS::__allmul)
205-
__allmul;
206-
207157
MACRO_FUNCTION_RESOLVER(
208158
undefined4(__stdcall*)(), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x005834A0, &OpenSHC::OS::__alloca_probe)
209159
__alloca_probe;
@@ -216,18 +166,5 @@ namespace OS_Func {
216166
void(__cdecl*)(int _Code), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x00583D55, &OpenSHC::OS::_exit)
217167
_exit;
218168

219-
MACRO_FUNCTION_RESOLVER(uint(__cdecl*)(undefined4 param_1, uint param_2), REIMPLEMENTED_CRT,
220-
Address::SHC_3BB0A8C1_0x00588628, &OpenSHC::OS::math_FUN_00588628)
221-
math_FUN_00588628;
222-
223-
MACRO_FUNCTION_RESOLVER(float10(__fastcall*)(float10 param_1, char* param_2, int param_3, undefined4 param_4,
224-
undefined4 param_5, undefined4 param_6, undefined4 param_7),
225-
REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x0058864B, &OpenSHC::OS::math_FUN_0058864b)
226-
math_FUN_0058864b;
227-
228-
MACRO_FUNCTION_RESOLVER(
229-
float10(__fastcall*)(), REIMPLEMENTED_CRT, Address::SHC_3BB0A8C1_0x005887AE, &OpenSHC::OS::math_FUN_005887ae)
230-
math_FUN_005887ae;
231-
232169
} // namespace OS_Func
233170
} // namespace OpenSHC

‎src/OpenSHC/OS.hpp‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,6 @@ namespace OS {
2626

2727
BOOLEnum __cdecl isEqualGUID(GUID* param_1, GUID* param_2);
2828

29-
int __cdecl __isnan(double _X);
30-
31-
int __cdecl __ftol2(float10 param);
32-
33-
void __cdecl math_atan_FUN_0057ee10(float10 param_1);
34-
35-
float10 __cdecl math_atan_FUN_0057ee68(float10 floatIn, uint eaxIn, int param_3, int param_4);
36-
37-
float10 __cdecl math_sqrt_FUN_0057eef0(float10 param_1);
38-
39-
float10 __cdecl math_sqrt_FUN_0057ef0d(int param_1, uint param_2, float10 param_3);
40-
41-
void __cdecl math_tan_1_FUN_0057eff0(float10 param_1);
42-
43-
float10 __cdecl math_FUN_0057f048(int param_1, int param_2);
44-
45-
float10 __fastcall math_cos(float10 param_1);
46-
47-
float10 __fastcall math_sin(float10 param_1);
48-
4929
tm* __cdecl __localtime64(__time32_t* _Time);
5030

5131
__time64_t __cdecl __time64(__time64_t* _Time);
@@ -108,24 +88,11 @@ namespace OS {
10888

10989
int __cdecl _ucrt_lseek(int fileDescriptor, long lDistanceToMove, DWORD moveMethod);
11090

111-
longlong __stdcall __alldiv(
112-
long dividend_lowOrder, long dividend_highOrder, long divisor_lowOrder, long divisor_highOrder);
113-
114-
ulonglong __stdcall __allmul(
115-
ulong factor1_lowOrder, ulong factor1_highOrder, ulong factor2_lowOrder, ulong factor2_highOrder);
116-
11791
undefined4 __stdcall __alloca_probe();
11892

11993
int __cdecl __strnicmp(char* _Str1, char* _Str2, size_t _MaxCount);
12094

12195
void __cdecl _exit(int _Code);
12296

123-
uint __cdecl math_FUN_00588628(undefined4 param_1, uint param_2);
124-
125-
float10 __fastcall math_FUN_0058864b(float10 param_1, char* param_2, int param_3, undefined4 param_4,
126-
undefined4 param_5, undefined4 param_6, undefined4 param_7);
127-
128-
float10 __fastcall math_FUN_005887ae();
129-
13097
} // namespace OS
13198
} // namespace OpenSHC

‎src/precomp/addresses-SHC-3BB0A8C1.hpp‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72572,47 +72572,47 @@ enum {
7257272572
// type: function
7257372573
SHC_3BB0A8C1_0x0057ECD3 = 0x0057ECD3,
7257472574
// label: __isnan
72575-
// location: OpenSHC/OS
72575+
// location: HoldStrong_lib
7257672576
// type: function
7257772577
SHC_3BB0A8C1_0x0057ECF1 = 0x0057ECF1,
7257872578
// label: __ftol2
72579-
// location: OpenSHC/OS
72579+
// location: HoldStrong_lib
7258072580
// type: function
7258172581
SHC_3BB0A8C1_0x0057ED20 = 0x0057ED20,
7258272582
// type: function
7258372583
SHC_3BB0A8C1_0x0057ED56 = 0x0057ED56,
72584-
// label: math_atan_FUN_0057ee10
72585-
// location: OpenSHC/OS
72584+
// label: _math_atan_FUN_0057ee10
72585+
// location: HoldStrong_lib
7258672586
// type: function
7258772587
SHC_3BB0A8C1_0x0057EE10 = 0x0057EE10,
72588-
// label: math_atan_FUN_0057ee68
72589-
// location: OpenSHC/OS
72588+
// label: _math_atan_FUN_0057ee68
72589+
// location: HoldStrong_lib
7259072590
// type: function
7259172591
SHC_3BB0A8C1_0x0057EE68 = 0x0057EE68,
7259272592
// type: function
7259372593
SHC_3BB0A8C1_0x0057EECB = 0x0057EECB,
72594-
// label: math_sqrt_FUN_0057eef0
72595-
// location: OpenSHC/OS
72594+
// label: _math_sqrt_FUN_0057eef0
72595+
// location: HoldStrong_lib
7259672596
// type: function
7259772597
SHC_3BB0A8C1_0x0057EEF0 = 0x0057EEF0,
72598-
// label: math_sqrt_FUN_0057ef0d
72599-
// location: OpenSHC/OS
72598+
// label: _math_sqrt_FUN_0057ef0d
72599+
// location: HoldStrong_lib
7260072600
// type: function
7260172601
SHC_3BB0A8C1_0x0057EF0D = 0x0057EF0D,
72602-
// label: math_tan_1_FUN_0057eff0
72603-
// location: OpenSHC/OS
72602+
// label: _math_tan_1_FUN_0057eff0
72603+
// location: HoldStrong_lib
7260472604
// type: function
7260572605
SHC_3BB0A8C1_0x0057EFF0 = 0x0057EFF0,
7260672606
// label: FUN_0057f03f
7260772607
// location: HoldStrong_lib
7260872608
// type: function
7260972609
SHC_3BB0A8C1_0x0057F03F = 0x0057F03F,
72610-
// label: math_FUN_0057f048
72611-
// location: OpenSHC/OS
72610+
// label: _math_FUN_0057f048
72611+
// location: HoldStrong_lib
7261272612
// type: function
7261372613
SHC_3BB0A8C1_0x0057F048 = 0x0057F048,
72614-
// label: math_cos
72615-
// location: OpenSHC/OS
72614+
// label: _math_cos
72615+
// location: HoldStrong_lib
7261672616
// type: function
7261772617
SHC_3BB0A8C1_0x0057F120 = 0x0057F120,
7261872618
// label: FUN_0057f16f
@@ -72623,8 +72623,8 @@ enum {
7262372623
// location: HoldStrong_lib
7262472624
// type: function
7262572625
SHC_3BB0A8C1_0x0057F178 = 0x0057F178,
72626-
// label: math_sin
72627-
// location: OpenSHC/OS
72626+
// label: _math_sin
72627+
// location: HoldStrong_lib
7262872628
// type: function
7262972629
SHC_3BB0A8C1_0x0057F250 = 0x0057F250,
7263072630
// type: function
@@ -73236,11 +73236,11 @@ enum {
7323673236
// type: function
7323773237
SHC_3BB0A8C1_0x00582BC3 = 0x00582BC3,
7323873238
// label: __alldiv
73239-
// location: OpenSHC/OS
73239+
// location: HoldStrong_lib
7324073240
// type: function
7324173241
SHC_3BB0A8C1_0x00582C30 = 0x00582C30,
7324273242
// label: __allmul
73243-
// location: OpenSHC/OS
73243+
// location: HoldStrong_lib
7324473244
// type: function
7324573245
SHC_3BB0A8C1_0x00582CE0 = 0x00582CE0,
7324673246
// label: FUN_00582d14
@@ -73561,7 +73561,8 @@ enum {
7356173561
// type: function
7356273562
SHC_3BB0A8C1_0x0058457D = 0x0058457D,
7356373563
// label: ___init_ctype
73564-
// location:
73564+
// location: HoldStrong_lib
73565+
// type: function
7356573566
SHC_3BB0A8C1_0x005845A6 = 0x005845A6,
7356673567
// label: ____lc_codepage_func
7356773568
// location: HoldStrong_lib
@@ -73977,14 +73978,14 @@ enum {
7397773978
// location: HoldStrong_lib
7397873979
// type: function
7397973980
SHC_3BB0A8C1_0x005885E5 = 0x005885E5,
73980-
// label: math_FUN_00588628
73981-
// location: OpenSHC/OS
73981+
// label: _math_FUN_00588628
73982+
// location: HoldStrong_lib
7398273983
// type: function
7398373984
SHC_3BB0A8C1_0x00588628 = 0x00588628,
7398473985
// type: function
7398573986
SHC_3BB0A8C1_0x0058863E = 0x0058863E,
73986-
// label: math_FUN_0058864b
73987-
// location: OpenSHC/OS
73987+
// label: _math_FUN_0058864b
73988+
// location: HoldStrong_lib
7398873989
// type: function
7398973990
SHC_3BB0A8C1_0x0058864B = 0x0058864B,
7399073991
// label: __startOneArgErrorHandling
@@ -73995,8 +73996,8 @@ enum {
7399573996
// location: HoldStrong_lib
7399673997
// type: function
7399773998
SHC_3BB0A8C1_0x00588790 = 0x00588790,
73998-
// label: math_FUN_005887ae
73999-
// location: OpenSHC/OS
73999+
// label: _math_FUN_005887ae
74000+
// location: HoldStrong_lib
7400074001
// type: function
7400174002
SHC_3BB0A8C1_0x005887AE = 0x005887AE,
7400274003
// label: FUN_005889f0
@@ -74889,7 +74890,8 @@ enum {
7488974890
// type: function
7489074891
SHC_3BB0A8C1_0x00591C99 = 0x00591C99,
7489174892
// label: ___init_time
74892-
// location:
74893+
// location: HoldStrong_lib
74894+
// type: function
7489374895
SHC_3BB0A8C1_0x00591E29 = 0x00591E29,
7489474896
// label: ___free_lconv_num
7489574897
// location: HoldStrong_lib
@@ -95093,6 +95095,8 @@ enum {
9509395095
// label: DAT_TacticalPowersHelpTextDisplayBool
9509495096
// location:
9509595097
SHC_3BB0A8C1_0x00ED3128 = 0x00ED3128,
95098+
// type: /float
95099+
SHC_3BB0A8C1_0x00ED312C = 0x00ED312C,
9509695100
// type: /dword
9509795101
SHC_3BB0A8C1_0x00ED3138 = 0x00ED3138,
9509895102
// type: OpenSHC/WindowsHelper/Enums/BOOLEnum

0 commit comments

Comments
 (0)