From d15ac078344461faee80f676b49d2194387b9862 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 21 Mar 2017 18:03:28 +0300 Subject: less useless crap exported from mir_core --- include/m_gui.h | 3 +++ libs/win32/mir_core.lib | Bin 321158 -> 313082 bytes libs/win64/mir_core.lib | Bin 322430 -> 313980 bytes src/mir_core/src/mir_core.def | 35 ----------------------------------- src/mir_core/src/mir_core64.def | 35 ----------------------------------- 5 files changed, 3 insertions(+), 70 deletions(-) diff --git a/include/m_gui.h b/include/m_gui.h index 00a89a34c3..31e33c0994 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -484,6 +484,9 @@ class MIR_CORE_EXPORT CCtrlBase { friend class CDlgBase; + __forceinline CCtrlBase(const CCtrlBase&) {} + __forceinline CCtrlBase& operator=(const CCtrlBase&) { return *this; } + __forceinline CCtrlBase(HWND hwnd) : m_hwnd(hwnd) {} public: diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib index 450d75409a..add93e2be3 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 b17a8bd370..8cc4c97045 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 7c3fe59af1..21756d429f 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -475,32 +475,19 @@ mir_wstrcmpi @280 ?c_str@?$CMSimpleStringT@D@@QBEPBDXZ @539 NONAME ?c_str@?$CMSimpleStringT@_W@@QBEPB_WXZ @540 NONAME ?EndModal@CDlgBase@@QAEXH@Z @541 NONAME -??0CCtrlBase@@QAE@ABV0@@Z @609 NONAME ??0CCtrlBase@@QAE@PAVCDlgBase@@H@Z @610 NONAME -??0CCtrlButton@@QAE@ABV0@@Z @611 NONAME ??0CCtrlButton@@QAE@PAVCDlgBase@@H@Z @612 NONAME -??0CCtrlCheck@@QAE@ABV0@@Z @613 NONAME ??0CCtrlCheck@@QAE@PAVCDlgBase@@H@Z @614 NONAME -??0CCtrlClc@@QAE@ABV0@@Z @615 NONAME ??0CCtrlClc@@QAE@PAVCDlgBase@@H@Z @616 NONAME -??0CCtrlCombo@@QAE@ABV0@@Z @617 NONAME ??0CCtrlCombo@@QAE@PAVCDlgBase@@H@Z @618 NONAME -??0CCtrlData@@QAE@ABV0@@Z @619 NONAME ??0CCtrlData@@QAE@PAVCDlgBase@@H@Z @620 NONAME -??0CCtrlEdit@@QAE@ABV0@@Z @621 NONAME ??0CCtrlEdit@@QAE@PAVCDlgBase@@H@Z @622 NONAME -??0CCtrlHyperlink@@QAE@ABV0@@Z @623 NONAME ??0CCtrlHyperlink@@QAE@PAVCDlgBase@@HPBD@Z @624 NONAME -??0CCtrlListBox@@QAE@ABV0@@Z @625 NONAME ??0CCtrlListBox@@QAE@PAVCDlgBase@@H@Z @626 NONAME -??0CCtrlListView@@QAE@ABV0@@Z @627 NONAME ??0CCtrlListView@@QAE@PAVCDlgBase@@H@Z @628 NONAME -??0CCtrlMButton@@QAE@ABV0@@Z @629 NONAME ??0CCtrlMButton@@QAE@PAVCDlgBase@@HHPBD@Z @630 NONAME ??0CCtrlMButton@@QAE@PAVCDlgBase@@HPAUHICON__@@PBD@Z @631 NONAME -??0CCtrlPages@@QAE@ABV0@@Z @632 NONAME ??0CCtrlPages@@QAE@PAVCDlgBase@@H@Z @633 NONAME -??0CCtrlTreeView@@QAE@ABV0@@Z @634 NONAME ??0CCtrlTreeView@@QAE@PAVCDlgBase@@H@Z @635 NONAME ??0CDataLink@@QAE@ABV0@@Z @636 NONAME ??0CDataLink@@QAE@E@Z @637 NONAME @@ -525,22 +512,6 @@ mir_wstrcmpi @280 ??1CDataLink@@UAE@XZ @658 NONAME ??1CDbLink@@UAE@XZ @659 NONAME ??1CDlgBase@@UAE@XZ @660 NONAME -??4CCtrlBase@@QAEAAV0@ABV0@@Z @662 NONAME -??4CCtrlButton@@QAEAAV0@ABV0@@Z @663 NONAME -??4CCtrlCheck@@QAEAAV0@ABV0@@Z @664 NONAME -??4CCtrlClc@@QAEAAV0@ABV0@@Z @665 NONAME -??4CCtrlCombo@@QAEAAV0@ABV0@@Z @666 NONAME -??4CCtrlData@@QAEAAV0@ABV0@@Z @667 NONAME -??4CCtrlEdit@@QAEAAV0@ABV0@@Z @668 NONAME -??4CCtrlHyperlink@@QAEAAV0@ABV0@@Z @669 NONAME -??4CCtrlListBox@@QAEAAV0@ABV0@@Z @670 NONAME -??4CCtrlListView@@QAEAAV0@ABV0@@Z @671 NONAME -??4CCtrlMButton@@QAEAAV0@ABV0@@Z @672 NONAME -??4CCtrlPages@@QAEAAV0@ABV0@@Z @673 NONAME -??4CCtrlTreeView@@QAEAAV0@ABV0@@Z @674 NONAME -??4CDataLink@@QAEAAV0@ABV0@@Z @675 NONAME -??4CDbLink@@QAEAAV0@ABV0@@Z @676 NONAME -??4CDlgBase@@QAEAAV0@ABV0@@Z @677 NONAME ??_7CCtrlBase@@6B@ @679 NONAME ??_7CCtrlButton@@6B@ @680 NONAME ??_7CCtrlCheck@@6B@ @681 NONAME @@ -1002,21 +973,17 @@ db_get_contact_count @1158 db_is_contact @1159 db_set_safety_mode @1160 db_delete_module @1161 -??0CCtrlSpin@@QAE@ABV0@@Z @1162 NONAME ??0CCtrlSpin@@QAE@PAVCDlgBase@@H@Z @1163 NONAME ??1CCtrlSpin@@UAE@XZ @1164 NONAME -??4CCtrlSpin@@QAEAAV0@ABV0@@Z @1165 NONAME ??_7CCtrlSpin@@6B@ @1166 NONAME ?SetMaxLength@CCtrlEdit@@QAEXI@Z @1167 NONAME ?SetRange@CCtrlSpin@@QAEXGG@Z @1168 NONAME db_get_current @1169 CallFunctionSync @1170 -??0CProgress@@QAE@ABV0@@Z @1171 NONAME ??0CProgress@@QAE@PAVCDlgBase@@H@Z @1172 NONAME ??0CTimer@@QAE@ABV0@@Z @1173 NONAME ??0CTimer@@QAE@PAVCDlgBase@@H@Z @1174 NONAME ??1CProgress@@UAE@XZ @1175 NONAME -??4CProgress@@QAEAAV0@ABV0@@Z @1176 NONAME ??4CTimer@@QAEAAV0@ABV0@@Z @1177 NONAME ??_7CProgress@@6B@ @1178 NONAME ??_7CTimer@@6B@ @1179 NONAME @@ -1056,10 +1023,8 @@ CallFunctionSync @1170 ?length@MBinBuffer@@QBEIXZ @1213 NONAME ?remove@MBinBuffer@@QAEXI@Z @1214 NONAME ??ACDlgBase@@QAEPAVCCtrlBase@@H@Z @1215 NONAME -??0CSplitter@@QAE@ABV0@@Z @1216 NONAME ??0CSplitter@@QAE@PAVCDlgBase@@H@Z @1217 NONAME ??1CSplitter@@UAE@XZ @1218 NONAME -??4CSplitter@@QAEAAV0@ABV0@@Z @1219 NONAME ??_7CSplitter@@6B@ @1220 NONAME ?CustomWndProc@CSplitter@@MAEJIIJ@Z @1221 NONAME ?GetPos@CSplitter@@QBEHXZ @1222 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index baacfbe55c..fb6e9ff634 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -475,32 +475,19 @@ mir_wstrcmpi @280 ?c_str@?$CMSimpleStringT@D@@QEBAPEBDXZ @539 NONAME ?c_str@?$CMSimpleStringT@_W@@QEBAPEB_WXZ @540 NONAME ?EndModal@CDlgBase@@QEAAX_J@Z @541 NONAME -??0CCtrlBase@@QEAA@AEBV0@@Z @609 NONAME ??0CCtrlBase@@QEAA@PEAVCDlgBase@@H@Z @610 NONAME -??0CCtrlButton@@QEAA@AEBV0@@Z @611 NONAME ??0CCtrlButton@@QEAA@PEAVCDlgBase@@H@Z @612 NONAME -??0CCtrlCheck@@QEAA@AEBV0@@Z @613 NONAME ??0CCtrlCheck@@QEAA@PEAVCDlgBase@@H@Z @614 NONAME -??0CCtrlClc@@QEAA@AEBV0@@Z @615 NONAME ??0CCtrlClc@@QEAA@PEAVCDlgBase@@H@Z @616 NONAME -??0CCtrlCombo@@QEAA@AEBV0@@Z @617 NONAME ??0CCtrlCombo@@QEAA@PEAVCDlgBase@@H@Z @618 NONAME -??0CCtrlData@@QEAA@AEBV0@@Z @619 NONAME ??0CCtrlData@@QEAA@PEAVCDlgBase@@H@Z @620 NONAME -??0CCtrlEdit@@QEAA@AEBV0@@Z @621 NONAME ??0CCtrlEdit@@QEAA@PEAVCDlgBase@@H@Z @622 NONAME -??0CCtrlHyperlink@@QEAA@AEBV0@@Z @623 NONAME ??0CCtrlHyperlink@@QEAA@PEAVCDlgBase@@HPEBD@Z @624 NONAME -??0CCtrlListBox@@QEAA@AEBV0@@Z @625 NONAME ??0CCtrlListBox@@QEAA@PEAVCDlgBase@@H@Z @626 NONAME -??0CCtrlListView@@QEAA@AEBV0@@Z @627 NONAME ??0CCtrlListView@@QEAA@PEAVCDlgBase@@H@Z @628 NONAME -??0CCtrlMButton@@QEAA@AEBV0@@Z @629 NONAME ??0CCtrlMButton@@QEAA@PEAVCDlgBase@@HHPEBD@Z @630 NONAME ??0CCtrlMButton@@QEAA@PEAVCDlgBase@@HPEAUHICON__@@PEBD@Z @631 NONAME -??0CCtrlPages@@QEAA@AEBV0@@Z @632 NONAME ??0CCtrlPages@@QEAA@PEAVCDlgBase@@H@Z @633 NONAME -??0CCtrlTreeView@@QEAA@AEBV0@@Z @634 NONAME ??0CCtrlTreeView@@QEAA@PEAVCDlgBase@@H@Z @635 NONAME ??0CDataLink@@QEAA@AEBV0@@Z @636 NONAME ??0CDataLink@@QEAA@E@Z @637 NONAME @@ -525,22 +512,6 @@ mir_wstrcmpi @280 ??1CDataLink@@UEAA@XZ @658 NONAME ??1CDbLink@@UEAA@XZ @659 NONAME ??1CDlgBase@@UEAA@XZ @660 NONAME -??4CCtrlBase@@QEAAAEAV0@AEBV0@@Z @662 NONAME -??4CCtrlButton@@QEAAAEAV0@AEBV0@@Z @663 NONAME -??4CCtrlCheck@@QEAAAEAV0@AEBV0@@Z @664 NONAME -??4CCtrlClc@@QEAAAEAV0@AEBV0@@Z @665 NONAME -??4CCtrlCombo@@QEAAAEAV0@AEBV0@@Z @666 NONAME -??4CCtrlData@@QEAAAEAV0@AEBV0@@Z @667 NONAME -??4CCtrlEdit@@QEAAAEAV0@AEBV0@@Z @668 NONAME -??4CCtrlHyperlink@@QEAAAEAV0@AEBV0@@Z @669 NONAME -??4CCtrlListBox@@QEAAAEAV0@AEBV0@@Z @670 NONAME -??4CCtrlListView@@QEAAAEAV0@AEBV0@@Z @671 NONAME -??4CCtrlMButton@@QEAAAEAV0@AEBV0@@Z @672 NONAME -??4CCtrlPages@@QEAAAEAV0@AEBV0@@Z @673 NONAME -??4CCtrlTreeView@@QEAAAEAV0@AEBV0@@Z @674 NONAME -??4CDataLink@@QEAAAEAV0@AEBV0@@Z @675 NONAME -??4CDbLink@@QEAAAEAV0@AEBV0@@Z @676 NONAME -??4CDlgBase@@QEAAAEAV0@AEBV0@@Z @677 NONAME ??_7CCtrlBase@@6B@ @679 NONAME ??_7CCtrlButton@@6B@ @680 NONAME ??_7CCtrlCheck@@6B@ @681 NONAME @@ -1002,21 +973,17 @@ db_get_contact_count @1158 db_is_contact @1159 db_set_safety_mode @1160 db_delete_module @1161 -??0CCtrlSpin@@QEAA@AEBV0@@Z @1162 NONAME ??0CCtrlSpin@@QEAA@PEAVCDlgBase@@H@Z @1163 NONAME ??1CCtrlSpin@@UEAA@XZ @1164 NONAME -??4CCtrlSpin@@QEAAAEAV0@AEBV0@@Z @1165 NONAME ??_7CCtrlSpin@@6B@ @1166 NONAME ?SetMaxLength@CCtrlEdit@@QEAAXI@Z @1167 NONAME ?SetRange@CCtrlSpin@@QEAAXGG@Z @1168 NONAME db_get_current @1169 CallFunctionSync @1170 -??0CProgress@@QEAA@AEBV0@@Z @1171 NONAME ??0CProgress@@QEAA@PEAVCDlgBase@@H@Z @1172 NONAME ??0CTimer@@QEAA@AEBV0@@Z @1173 NONAME ??0CTimer@@QEAA@PEAVCDlgBase@@H@Z @1174 NONAME ??1CProgress@@UEAA@XZ @1175 NONAME -??4CProgress@@QEAAAEAV0@AEBV0@@Z @1176 NONAME ??4CTimer@@QEAAAEAV0@AEBV0@@Z @1177 NONAME ??_7CProgress@@6B@ @1178 NONAME ??_7CTimer@@6B@ @1179 NONAME @@ -1056,10 +1023,8 @@ CallFunctionSync @1170 ?length@MBinBuffer@@QEBA_KXZ @1213 NONAME ?remove@MBinBuffer@@QEAAX_K@Z @1214 NONAME ??ACDlgBase@@QEAAPEAVCCtrlBase@@H@Z @1215 NONAME -??0CSplitter@@QEAA@AEBV0@@Z @1216 NONAME ??0CSplitter@@QEAA@PEAVCDlgBase@@H@Z @1217 NONAME ??1CSplitter@@UEAA@XZ @1218 NONAME -??4CSplitter@@QEAAAEAV0@AEBV0@@Z @1219 NONAME ??_7CSplitter@@6B@ @1220 NONAME ?CustomWndProc@CSplitter@@MEAA_JI_K_J@Z @1221 NONAME ?GetPos@CSplitter@@QEBAHXZ @1222 NONAME -- cgit v1.2.3