diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-03 21:56:15 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-03 21:56:15 +0300 |
| commit | 6b943f52fbc81fe76726848f17518d6e3ab104e8 (patch) | |
| tree | 1489177b3e29c2c0378493f1ec18261c25d08edf | |
| parent | 40648808bb181f9b5c7c9d3b7537e6a9bd9b75bb (diff) | |
Microsoft, you stupid bastards
| -rw-r--r-- | include/m_chat_int.h | 4 | ||||
| -rw-r--r-- | libs/win32/mir_app.lib | bin | 105296 -> 105828 bytes | |||
| -rw-r--r-- | libs/win64/mir_app.lib | bin | 100732 -> 101278 bytes | |||
| -rw-r--r-- | plugins/Scriver/src/msgs.h | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgs.h | 3 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 |
7 files changed, 9 insertions, 4 deletions
diff --git a/include/m_chat_int.h b/include/m_chat_int.h index bdef1e766f..ca39f96763 100644 --- a/include/m_chat_int.h +++ b/include/m_chat_int.h @@ -416,6 +416,7 @@ EXTERN_C MIR_APP_DLL(CHAT_MANAGER*) Chat_GetInterface(CHAT_MANAGER_INITDATA *pDa class MIR_APP_EXPORT CSrmmBaseDialog : public CDlgBase
{
+
protected:
CSrmmBaseDialog(HINSTANCE hInst, int idDialog);
@@ -427,6 +428,9 @@ protected: public:
MCONTACT m_hContact;
+
+ __inline void* operator new(size_t size){ return calloc(1, size); }
+ __inline void operator delete(void* p) { free(p); }
};
#endif // M_CHAT_INT_H__
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 2dee6ec097..01af618b2c 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex e88ebfb466..53dc7ef50d 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h index 3374631830..a9a0e996dd 100644 --- a/plugins/Scriver/src/msgs.h +++ b/plugins/Scriver/src/msgs.h @@ -100,7 +100,7 @@ struct CommonWindowData TCmdList *cmdList, *cmdListCurrent;
};
-class CSrmmWindow : public CSrmmBaseDialog, public MZeroedObject, public CommonWindowData
+class CSrmmWindow : public CSrmmBaseDialog, public CommonWindowData
{
CCtrlEdit m_log, m_message;
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index a8603e4d0e..3ed0aa45df 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -374,9 +374,6 @@ public: char *m_enteredText;
public:
- __forceinline void* operator new(size_t size) { return calloc(1, size); }
- __forceinline void operator delete(void* p) { free(p); }
-
CTabBaseDlg(TNewWindowData*, int);
virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 1c77b71474..1c3331b386 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -405,3 +405,5 @@ ProtoGetAvatarMimeType @401 ??4CSrmmBaseDialog@@QAEAAV0@ABV0@@Z @406 NONAME
??_7CSrmmBaseDialog@@6B@ @407 NONAME
?DlgProc@CSrmmBaseDialog@@MAEHIIJ@Z @408 NONAME
+??2CSrmmBaseDialog@@SAPAXI@Z @409 NONAME
+??3CSrmmBaseDialog@@SAXPAX@Z @410 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index fee7aec60a..7d21ef797f 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -405,3 +405,5 @@ ProtoGetAvatarMimeType @401 ??4CSrmmBaseDialog@@QEAAAEAV0@AEBV0@@Z @406 NONAME
??_7CSrmmBaseDialog@@6B@ @407 NONAME
?DlgProc@CSrmmBaseDialog@@MEAA_JI_K_J@Z @408 NONAME
+??2CSrmmBaseDialog@@SAPEAX_K@Z @409 NONAME
+??3CSrmmBaseDialog@@SAXPEAX@Z @410 NONAME
|