Game-Decompilation/TR2X
1
0
Fork 0
mirror of https://github.com/LostArtefacts/TR2X.git synced 2024-12-02 19:06:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

port GameWindowCalculateSizeFromClientByZero

Browse Source
This commit is contained in:
Marcin Kurczewski 2024-06-09 14:12:31 +02:00
parent f08ba1d74b
commit 084f73a6c7
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
6 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/progress.svg
View File

@ -69,10 +69,10 @@
</g>
<g transform="translate(0 116)">
<text x="0" y="7.50">Tomb2.exe progress according to the physical function order:</text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">40.97% (499)</tspan> · <tspan class="known">56.57% (689)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.46% (30)</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">41.05% (500)</tspan> · <tspan class="known">56.49% (688)</tspan> · <tspan class="todo">0% (0)</tspan> · <tspan class="unused">2.46% (30)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="306.04" height="6" x="0" y="0" class="decompiled"/>
<rect width="422.56" height="6" x="306.04" y="0" class="known"/>
<rect width="306.65" height="6" x="0" y="0" class="decompiled"/>
<rect width="421.95" height="6" x="306.65" y="0" class="known"/>
<rect width="18.40" height="6" x="728.60" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -899,7 +899,7 @@
<rect width="12" height="12" x="300" y="240" class="decompiled"><title>bool __cdecl DDrawCreate(LPGUID lpGUID);</title></rect>
<rect width="12" height="12" x="315" y="240" class="decompiled"><title>void __cdecl DDrawRelease(void);</title></rect>
<rect width="12" height="12" x="330" y="240" class="decompiled"><title>void __cdecl GameWindowCalculateSizeFromClient(int32_t *width, int32_t *height);</title></rect>
<rect width="12" height="12" x="345" y="240" class="known"><title>void __cdecl GameWindowCalculateSizeFromClientByZero(int32_t *width, int32_t *height);</title></rect>
<rect width="12" height="12" x="345" y="240" class="decompiled"><title>void __cdecl GameWindowCalculateSizeFromClientByZero(int32_t *width, int32_t *height);</title></rect>
<rect width="12" height="12" x="360" y="240" class="decompiled"><title>void __cdecl WinVidSetMinWindowSize(int32_t width, int32_t height);</title></rect>
<rect width="12" height="12" x="375" y="240" class="decompiled"><title>void __cdecl WinVidClearMinWindowSize(void);</title></rect>
<rect width="12" height="12" x="390" y="240" class="decompiled"><title>void __cdecl WinVidSetMaxWindowSize(int32_t width, int32_t height);</title></rect>
@ -1298,10 +1298,10 @@
</g>
<g transform="translate(0 546)">
<text x="0" y="7.50">Tomb2.exe progress according to the function sizes:</text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">38.02%</tspan> · <tspan class="known">61.65%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">38.05%</tspan> · <tspan class="known">61.62%</tspan> · <tspan class="todo">0%</tspan> · <tspan class="unused">0.33%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="284.02" height="6" x="0" y="0" class="decompiled"/>
<rect width="460.54" height="6" x="284.02" y="0" class="known"/>
<rect width="284.25" height="6" x="0" y="0" class="decompiled"/>
<rect width="460.31" height="6" x="284.25" y="0" class="known"/>
<rect width="2.44" height="6" x="744.56" y="0" class="unused"/>
</g>
<g transform="translate(0 31)">
@ -1997,7 +1997,7 @@
<rect width="6.63" height="6.22" x="608.29" y="226.42" class="known"><title>void __cdecl DrawUnclippedItem(ITEM_INFO *item);</title></rect>
<rect width="6.63" height="6.22" x="617.93" y="226.42" class="known"><title>bool __cdecl PlayFMV(const char *file_name);</title></rect>
<rect width="6.54" height="6.22" x="627.56" y="226.42" class="decompiled"><title>void __cdecl Direct3DRelease(void);</title></rect>
<rect width="6.54" height="6.22" x="637.10" y="226.42" class="known"><title>void __cdecl GameWindowCalculateSizeFromClientByZero(int32_t *width, int32_t *height);</title></rect>
<rect width="6.54" height="6.22" x="637.10" y="226.42" class="decompiled"><title>void __cdecl GameWindowCalculateSizeFromClientByZero(int32_t *width, int32_t *height);</title></rect>
<rect width="6.54" height="6.22" x="646.65" y="226.42" class="known"><title>bool __cdecl WinVidRegisterGameWindowClass(void);</title></rect>
<rect width="6.54" height="6.22" x="656.19" y="226.42" class="known"><title>int32_t __cdecl CreateTexturePage(int32_t width, int32_t height, bool alpha);</title></rect>
<rect width="6.45" height="6.22" x="665.73" y="226.42" class="decompiled"><title>void __cdecl Lara_Col_SwanDive(ITEM_INFO *item, COLL_INFO *coll);</title></rect>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 360 KiB

2
docs/progress.txt
View File

@ -3011,7 +3011,7 @@ typedef struct {
0x00444BD0 0x0054 +R bool __cdecl DDrawCreate(LPGUID lpGUID);
0x00444C30 0x0033 +R void __cdecl DDrawRelease(void);
0x00444C70 0x0073 +R void __cdecl GameWindowCalculateSizeFromClient(int32_t *width, int32_t *height);
0x00444CF0 0x006A -R void __cdecl GameWindowCalculateSizeFromClientByZero(int32_t *width, int32_t *height);
0x00444CF0 0x006A +R void __cdecl GameWindowCalculateSizeFromClientByZero(int32_t *width, int32_t *height);
0x00444D60 0x0041 +R void __cdecl WinVidSetMinWindowSize(int32_t width, int32_t height);
0x00444DB0 0x0008 +R void __cdecl WinVidClearMinWindowSize(void);
0x00444DC0 0x0041 +R void __cdecl WinVidSetMaxWindowSize(int32_t width, int32_t height);

11
src/decomp/decomp.c
View File

@ -2162,3 +2162,14 @@ void __cdecl GameWindowCalculateSizeFromClient(
*width = rect.right - rect.left;
*height = rect.bottom - rect.top;
}
void __cdecl GameWindowCalculateSizeFromClientByZero(
int *const width, int *const height)
{
RECT rect = { 0, 0, 0, 0 };
const DWORD style = GetWindowLong(g_GameWindowHandle, GWL_STYLE);
const DWORD styleEx = GetWindowLong(g_GameWindowHandle, GWL_EXSTYLE);
AdjustWindowRectEx(&rect, style, FALSE, styleEx);
*width += rect.left - rect.right;
*height += rect.top - rect.bottom;
}

1
src/decomp/decomp.h
View File

@ -103,3 +103,4 @@ bool __cdecl Direct3DInit(void);
bool __cdecl DDrawCreate(LPGUID lpGUID);
void __cdecl DDrawRelease(void);
void __cdecl GameWindowCalculateSizeFromClient(int *width, int *height);
void __cdecl GameWindowCalculateSizeFromClientByZero(int *width, int *height);

1
src/global/funcs.h
View File

@ -443,7 +443,6 @@
#define ControlLavaBlob ((void __cdecl (*)(int16_t fx_num))0x00442F40)
#define GiantYetiControl ((void __cdecl (*)(int16_t item_num))0x00443050)
#define YetiControl ((void __cdecl (*)(int16_t item_num))0x00443350)
#define GameWindowCalculateSizeFromClientByZero ((void __cdecl (*)(int32_t *width, int32_t *height))0x00444CF0)
#define CompareVideoModes ((bool __thiscall (*)(const DISPLAY_MODE *mode1, const DISPLAY_MODE *mode2))0x004459A0)
#define WinVidGetDisplayModes ((bool __cdecl (*)(void))0x004459F0)
#define EnumDisplayModesCallback ((HRESULT __stdcall (*)(LPDDSDESC lpDDSurfaceDesc, LPVOID lpContext))0x00445A50)

1
src/inject_exec.c
View File

@ -148,6 +148,7 @@ static void Inject_Decomp(const bool enable)
INJECT(enable, 0x00444BD0, DDrawCreate);
INJECT(enable, 0x00444C30, DDrawRelease);
INJECT(enable, 0x00444C70, GameWindowCalculateSizeFromClient);
INJECT(enable, 0x00444CF0, GameWindowCalculateSizeFromClientByZero);
}
static void Inject_Background(const bool enable)