RomanRom2/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-10 19:35:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(d3d): fix calling conventions

Browse Source
This commit is contained in:
VDm 2025-05-03 15:54:49 +04:00
parent 1cc668be95
commit bd0e59a795
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gx/d3d/CGxDeviceD3d.cpp
View File

@ -225,11 +225,13 @@ int32_t CGxDeviceD3d::ILoadD3dLib(HINSTANCE& d3dLib, LPDIRECT3D9& d3d) {
d3dLib = LoadLibrary(TEXT("d3d9.dll")); d3dLib = LoadLibrary(TEXT("d3d9.dll"));
typedef LPDIRECT3D9 (WINAPI *DIRECT3DCREATE9)(UINT SDKVersion);
if (d3dLib) { if (d3dLib) {
auto d3dCreateProc = GetProcAddress(d3dLib, "Direct3DCreate9"); auto d3dCreateProc = reinterpret_cast<DIRECT3DCREATE9>(GetProcAddress(d3dLib, "Direct3DCreate9"));
if (d3dCreateProc) { if (d3dCreateProc) {
d3d = reinterpret_cast<LPDIRECT3D9>(d3dCreateProc()); d3d = d3dCreateProc(D3D_SDK_VERSION);
if (d3d) { if (d3d) {
return 1; return 1;
@ -258,7 +260,7 @@ void CGxDeviceD3d::IUnloadD3dLib(HINSTANCE& d3dLib, LPDIRECT3D9& d3d) {
} }
} }
LRESULT CGxDeviceD3d::WindowProcD3d(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LRESULT CALLBACK CGxDeviceD3d::WindowProcD3d(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
auto device = reinterpret_cast<CGxDeviceD3d*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); auto device = reinterpret_cast<CGxDeviceD3d*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
switch (uMsg) { switch (uMsg) {

2
src/gx/d3d/CGxDeviceD3d.hpp
View File

@ -218,7 +218,7 @@ class CGxDeviceD3d : public CGxDevice {
// Static functions // Static functions
static int32_t ILoadD3dLib(HINSTANCE& d3dLib, LPDIRECT3D9& d3d); static int32_t ILoadD3dLib(HINSTANCE& d3dLib, LPDIRECT3D9& d3d);
static void IUnloadD3dLib(HINSTANCE& d3dLib, LPDIRECT3D9& d3d); static void IUnloadD3dLib(HINSTANCE& d3dLib, LPDIRECT3D9& d3d);
static LRESULT WindowProcD3d(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK WindowProcD3d(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
// Member variables // Member variables
HWND m_hwnd = nullptr; HWND m_hwnd = nullptr;