From 2d2166ed2a83bc8ce315f4e7f29c7ab71439a7e4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 3 Jan 2020 15:25:13 +0300 Subject: CTimer::GetEventId() shall return UINT_PTR as well --- include/m_gui.h | 2 +- libs/win32/mir_core.lib | Bin 461678 -> 461678 bytes libs/win64/mir_core.lib | Bin 466486 -> 466490 bytes src/mir_core/src/mir_core.def | 2 +- src/mir_core/src/mir_core64.def | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/m_gui.h b/include/m_gui.h index cf69e00560..817c08e8c1 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -487,7 +487,7 @@ class MIR_CORE_EXPORT CTimer public: CTimer(CDlgBase* wnd, UINT_PTR idEvent); - __forceinline int GetEventId() const { return m_idEvent; } + __forceinline UINT_PTR GetEventId() const { return m_idEvent; } virtual BOOL OnTimer(); diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib index 09da2b9514..14fc52674b 100644 Binary files a/libs/win32/mir_core.lib and b/libs/win32/mir_core.lib differ diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib index e61ea64958..6cf66cde34 100644 Binary files a/libs/win64/mir_core.lib and b/libs/win64/mir_core.lib differ diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 070cdf2e8c..1b22df32d6 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -968,7 +968,7 @@ CallFunctionSync @1170 ??_7CProgress@@6B@ @1178 NONAME ??_7CTimer@@6B@ @1179 NONAME ?FindTimer@CDlgBase@@AAEPAVCTimer@@H@Z @1180 NONAME -?GetEventId@CTimer@@QBEHXZ @1181 NONAME +?GetEventId@CTimer@@QBEIXZ @1181 NONAME ?Move@CProgress@@QAEGG@Z @1182 NONAME ?OnTimer@CDlgBase@@MAEXPAVCTimer@@@Z @1183 NONAME ?OnTimer@CTimer@@UAEHXZ @1184 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 1cc34ebb73..26b80a6021 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -968,7 +968,7 @@ CallFunctionSync @1170 ??_7CProgress@@6B@ @1178 NONAME ??_7CTimer@@6B@ @1179 NONAME ?FindTimer@CDlgBase@@AEAAPEAVCTimer@@H@Z @1180 NONAME -?GetEventId@CTimer@@QEBAHXZ @1181 NONAME +?GetEventId@CTimer@@QEBA_KXZ @1181 NONAME ?Move@CProgress@@QEAAGG@Z @1182 NONAME ?OnTimer@CDlgBase@@MEAAXPEAVCTimer@@@Z @1183 NONAME ?OnTimer@CTimer@@UEAAHXZ @1184 NONAME -- cgit v1.2.3