From fa043865c03f6c3a033c0576e4f2be980d27f4fa Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 12 Dec 2024 23:19:59 +0300 Subject: fix for mir_app headers --- include/m_netlib.h | 2 +- libs/win32/mir_app.lib | Bin 301918 -> 301828 bytes libs/win64/mir_app.lib | Bin 301976 -> 301886 bytes protocols/Steam/src/steam_server.cpp | 2 +- src/mir_app/src/mir_app.def | 2 +- src/mir_app/src/mir_app64.def | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/m_netlib.h b/include/m_netlib.h index f3ad40b937..abdd1f3fa1 100644 --- a/include/m_netlib.h +++ b/include/m_netlib.h @@ -770,7 +770,7 @@ public: MWebSocket(); ~MWebSocket(); - __forceinline HNETLIBCONN getConn() const { return m_hConn; } + __forceinline HANDLE getConn() const { return m_hConn; } // packet processor virtual void process(const uint8_t *buf, size_t cbLen) = 0; diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index bdc5bf8228..4f97a541b3 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 73b02b71ee..989e2ffc19 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/protocols/Steam/src/steam_server.cpp b/protocols/Steam/src/steam_server.cpp index 25ba12f7b6..c2b43e5b88 100644 --- a/protocols/Steam/src/steam_server.cpp +++ b/protocols/Steam/src/steam_server.cpp @@ -112,7 +112,7 @@ void CSteamProto::ProcessMulti(const uint8_t *buf, size_t cbLen) while ((int)cbLen > 0) { uint32_t cbPacketLen = *(uint32_t *)buf; buf += sizeof(uint32_t); cbLen -= sizeof(uint32_t); - Netlib_Dump(m_ws->getConn(), buf, cbLen, false, 0); + Netlib_Dump(HNETLIBCONN(m_ws->getConn()), buf, cbLen, false, 0); ProcessMessage(buf, cbPacketLen); buf += cbPacketLen; cbLen -= cbPacketLen; } diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 79f9bc8db3..e2028a26c0 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -995,4 +995,4 @@ Proto_CanDeleteHistory @1118 NONAME ?RemakeLog@CSrmmBaseDialog@@UAEXXZ @1126 NONAME ?ProcessToolbarHotkey@CSrmmBaseDialog@@AAEXH@Z @1127 NONAME ?iHistoryMode@Srmm@@3V?$CMOption@E@@A @1128 NONAME -?getConn@MWebSocket@@QBEPAUNetlibConnection@@XZ @1129 NONAME +?getConn@MWebSocket@@QBEPAXXZ @1129 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index b729a44eb9..3151bf23b8 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -995,4 +995,4 @@ Proto_CanDeleteHistory @1118 NONAME ?RemakeLog@CSrmmBaseDialog@@UEAAXXZ @1126 NONAME ?ProcessToolbarHotkey@CSrmmBaseDialog@@AEAAX_J@Z @1127 NONAME ?iHistoryMode@Srmm@@3V?$CMOption@E@@A @1128 NONAME -?getConn@MWebSocket@@QEBAPEAUNetlibConnection@@XZ @1129 NONAME +?getConn@MWebSocket@@QEBAPEAXXZ @1129 NONAME -- cgit v1.2.3