From 4a966be3c32e745b2567e51c27766942f798f77d Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 26 Jul 2015 12:33:08 +0000 Subject: common projects git-svn-id: http://svn.miranda-ng.org/main/trunk@14724 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/chat/log.cpp | 2 +- plugins/Scriver/src/chat/main.cpp | 2 +- plugins/Scriver/src/chat/manager.cpp | 2 +- plugins/Scriver/src/chat/options.cpp | 2 +- plugins/Scriver/src/chat/tools.cpp | 2 +- plugins/Scriver/src/chat/window.cpp | 2 +- plugins/Scriver/src/cmdlist.cpp | 2 +- plugins/Scriver/src/commonheaders.h | 132 ----------------------------------- plugins/Scriver/src/globals.cpp | 2 +- plugins/Scriver/src/infobar.cpp | 2 +- plugins/Scriver/src/input.cpp | 2 +- plugins/Scriver/src/msgdialog.cpp | 2 +- plugins/Scriver/src/msglog.cpp | 2 +- plugins/Scriver/src/msgoptions.cpp | 2 +- plugins/Scriver/src/msgs.cpp | 2 +- plugins/Scriver/src/msgtimedout.cpp | 2 +- plugins/Scriver/src/msgwindow.cpp | 2 +- plugins/Scriver/src/richutil.cpp | 2 +- plugins/Scriver/src/sendqueue.cpp | 2 +- plugins/Scriver/src/srmm.cpp | 2 +- plugins/Scriver/src/statusicon.cpp | 2 +- plugins/Scriver/src/stdafx.cpp | 18 ----- plugins/Scriver/src/stdafx.cxx | 18 +++++ plugins/Scriver/src/stdafx.h | 130 ++++++++++++++++++++++++++++++++++ plugins/Scriver/src/utils.cpp | 2 +- 25 files changed, 169 insertions(+), 171 deletions(-) delete mode 100644 plugins/Scriver/src/commonheaders.h delete mode 100644 plugins/Scriver/src/stdafx.cpp create mode 100644 plugins/Scriver/src/stdafx.cxx create mode 100644 plugins/Scriver/src/stdafx.h (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp index e58c506e78..eddb393f97 100644 --- a/plugins/Scriver/src/chat/log.cpp +++ b/plugins/Scriver/src/chat/log.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../commonheaders.h" +#include "../stdafx.h" #ifndef EM_GETSCROLLPOS #define EM_GETSCROLLPOS (WM_USER+221) diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp index f3aba794c7..27644f6e03 100644 --- a/plugins/Scriver/src/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../commonheaders.h" +#include "../stdafx.h" // globals CHAT_MANAGER *pci, saveCI; diff --git a/plugins/Scriver/src/chat/manager.cpp b/plugins/Scriver/src/chat/manager.cpp index 7f12c8c9e6..823547751c 100644 --- a/plugins/Scriver/src/chat/manager.cpp +++ b/plugins/Scriver/src/chat/manager.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../commonheaders.h" +#include "../stdafx.h" HWND SM_FindWindowByContact(MCONTACT hContact) { diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 57dccf89b9..446e0d1fa7 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../commonheaders.h" +#include "../stdafx.h" #define UM_CHECKSTATECHANGE (WM_USER+100) diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp index 43aa5c669f..1eb9907c3a 100644 --- a/plugins/Scriver/src/chat/tools.cpp +++ b/plugins/Scriver/src/chat/tools.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../commonheaders.h" +#include "../stdafx.h" TCHAR* my_strstri(const TCHAR* s1, const TCHAR* s2) { diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index 895f2b7765..ef5dc2eceb 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../commonheaders.h" +#include "../stdafx.h" static ToolbarButton toolbarButtons[] = { { LPGENT("Bold"), IDC_CHAT_BOLD, 0, 4, 24 }, diff --git a/plugins/Scriver/src/cmdlist.cpp b/plugins/Scriver/src/cmdlist.cpp index 29731070cc..16dbfa3b06 100644 --- a/plugins/Scriver/src/cmdlist.cpp +++ b/plugins/Scriver/src/cmdlist.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" TCmdList* tcmdlist_append(TCmdList *list, char *data, int maxSize, BOOL temporary) { diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h deleted file mode 100644 index 390ef07fd0..0000000000 --- a/plugins/Scriver/src/commonheaders.h +++ /dev/null @@ -1,132 +0,0 @@ -/* -Scriver - -Copyright (c) 2000-12 Miranda ICQ/IM project, - -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef SRMM_COMMONHEADERS_H -#define SRMM_COMMONHEADERS_H - -#define _CRT_SECURE_NO_WARNINGS - -#define COMPILE_MULTIMON_STUBS - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "resource.h" -#include "Version.h" -#include "infobar.h" -#include "cmdlist.h" -#include "sendqueue.h" -#include "msgs.h" -#include "globals.h" -#include "msgwindow.h" -#include "utils.h" -#include "input.h" -#include "richutil.h" -#include "statusicon.h" -#include "chat/chat.h" - -#ifndef IMF_AUTOFONTSIZEADJUST -#define IMF_AUTOFONTSIZEADJUST 0x0010 -#endif -#ifndef IMF_AUTOKEYBOARD -#define IMF_AUTOKEYBOARD 0x0001 -#endif -#ifndef SES_EXTENDBACKCOLOR -#define SES_EXTENDBACKCOLOR 4 -#endif -#ifndef ST_NEWCHARS -#define ST_NEWCHARS 4 -#endif -#ifndef CFM_WEIGHT -#define CFM_WEIGHT 0x00400000 -#endif - -extern HWND SM_FindWindowByContact(MCONTACT hContact); -extern HINSTANCE g_hInst; -extern void ChangeStatusIcons(); -extern void LoadInfobarFonts(); -extern HCURSOR hDragCursor; -extern ITaskbarList3 *pTaskbarInterface; -extern GlobalMessageData g_dat; -extern HMENU g_hMenu; -extern HANDLE hHookWinPopup, hHookWinWrite; -extern HCURSOR hCurSplitNS, hCurSplitWE; - -extern CREOleCallback reOleCallback; -extern CREOleCallback2 reOleCallback2; - -#define SPLITTER_HEIGHT 4 -#define TOOLBAR_HEIGHT 24 -#define INFO_BAR_HEIGHT 54 -#define INFO_BAR_INNER_HEIGHT (INFO_BAR_HEIGHT - 3) -#define INFO_BAR_AVATAR_HEIGHT INFO_BAR_INNER_HEIGHT -#define BOTTOM_RIGHT_AVATAR_HEIGHT 64 -#define INFO_BAR_COLOR COLOR_INACTIVEBORDER - -int Chat_Load(); -int Chat_Unload(); -int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam); -int OptInitialise(WPARAM wParam, LPARAM lParam); -int FontServiceFontsChanged(WPARAM wParam, LPARAM lParam); -int StatusIconPressed(WPARAM wParam, LPARAM lParam); - -#endif diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index d7ebe89278..20520f937c 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" GlobalMessageData g_dat; diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp index 5ffc65d91c..27056201bd 100644 --- a/plugins/Scriver/src/infobar.cpp +++ b/plugins/Scriver/src/infobar.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" void SetupInfobar(InfobarWindowData* idat) { diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp index d1ec8952fe..5801cbbdd5 100644 --- a/plugins/Scriver/src/input.cpp +++ b/plugins/Scriver/src/input.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" extern HANDLE hHookWinPopup; diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 5691a9d3c8..3ac1b73d06 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #define VALID_AVATAR(x) (x==PA_FORMAT_PNG||x==PA_FORMAT_JPEG||x==PA_FORMAT_ICON||x==PA_FORMAT_BMP||x==PA_FORMAT_GIF) diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index 82c42d91de..32e98e5996 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #define LOGICON_MSG_IN 0 #define LOGICON_MSG_OUT 1 diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 7b56f8f3d2..39cb044c5a 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index c7f27360e0..aefb07949f 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" HCURSOR hCurSplitNS, hCurSplitWE, hCurHyperlinkHand, hDragCursor; HANDLE hHookWinEvt, hHookWinPopup, hHookWinWrite; diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp index 0238bc5806..b7e8ae4ebb 100644 --- a/plugins/Scriver/src/msgtimedout.cpp +++ b/plugins/Scriver/src/msgtimedout.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp index c95aa5b503..74e66c8331 100644 --- a/plugins/Scriver/src/msgwindow.cpp +++ b/plugins/Scriver/src/msgwindow.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #define SB_CHAR_WIDTH 40 #define SB_SENDING_WIDTH 25 diff --git a/plugins/Scriver/src/richutil.cpp b/plugins/Scriver/src/richutil.cpp index 7a338492ee..702e875320 100644 --- a/plugins/Scriver/src/richutil.cpp +++ b/plugins/Scriver/src/richutil.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" /* To initialize this library, call: diff --git a/plugins/Scriver/src/sendqueue.cpp b/plugins/Scriver/src/sendqueue.cpp index 49bc01553e..d96cb670e3 100644 --- a/plugins/Scriver/src/sendqueue.cpp +++ b/plugins/Scriver/src/sendqueue.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" static MessageSendQueueItem *global_sendQueue = NULL; static mir_cs queueMutex; diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp index 371dccf22e..7a4c33c2a4 100644 --- a/plugins/Scriver/src/srmm.cpp +++ b/plugins/Scriver/src/srmm.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" int OnLoadModule(void); int OnUnloadModule(void); diff --git a/plugins/Scriver/src/statusicon.cpp b/plugins/Scriver/src/statusicon.cpp index 83d8dfeff2..e280fc7165 100644 --- a/plugins/Scriver/src/statusicon.cpp +++ b/plugins/Scriver/src/statusicon.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" HANDLE hHookIconPressedEvt; diff --git a/plugins/Scriver/src/stdafx.cpp b/plugins/Scriver/src/stdafx.cpp deleted file mode 100644 index 048b14e9d2..0000000000 --- a/plugins/Scriver/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "commonheaders.h" \ No newline at end of file diff --git a/plugins/Scriver/src/stdafx.cxx b/plugins/Scriver/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/Scriver/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h new file mode 100644 index 0000000000..fb97bf8bd3 --- /dev/null +++ b/plugins/Scriver/src/stdafx.h @@ -0,0 +1,130 @@ +/* +Scriver + +Copyright (c) 2000-12 Miranda ICQ/IM project, + +all portions of this codebase are copyrighted to the people +listed in contributors.txt. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#ifndef SRMM_COMMONHEADERS_H +#define SRMM_COMMONHEADERS_H + +#define COMPILE_MULTIMON_STUBS + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "resource.h" +#include "Version.h" +#include "infobar.h" +#include "cmdlist.h" +#include "sendqueue.h" +#include "msgs.h" +#include "globals.h" +#include "msgwindow.h" +#include "utils.h" +#include "input.h" +#include "richutil.h" +#include "statusicon.h" +#include "chat/chat.h" + +#ifndef IMF_AUTOFONTSIZEADJUST +#define IMF_AUTOFONTSIZEADJUST 0x0010 +#endif +#ifndef IMF_AUTOKEYBOARD +#define IMF_AUTOKEYBOARD 0x0001 +#endif +#ifndef SES_EXTENDBACKCOLOR +#define SES_EXTENDBACKCOLOR 4 +#endif +#ifndef ST_NEWCHARS +#define ST_NEWCHARS 4 +#endif +#ifndef CFM_WEIGHT +#define CFM_WEIGHT 0x00400000 +#endif + +extern HWND SM_FindWindowByContact(MCONTACT hContact); +extern HINSTANCE g_hInst; +extern void ChangeStatusIcons(); +extern void LoadInfobarFonts(); +extern HCURSOR hDragCursor; +extern ITaskbarList3 *pTaskbarInterface; +extern GlobalMessageData g_dat; +extern HMENU g_hMenu; +extern HANDLE hHookWinPopup, hHookWinWrite; +extern HCURSOR hCurSplitNS, hCurSplitWE; + +extern CREOleCallback reOleCallback; +extern CREOleCallback2 reOleCallback2; + +#define SPLITTER_HEIGHT 4 +#define TOOLBAR_HEIGHT 24 +#define INFO_BAR_HEIGHT 54 +#define INFO_BAR_INNER_HEIGHT (INFO_BAR_HEIGHT - 3) +#define INFO_BAR_AVATAR_HEIGHT INFO_BAR_INNER_HEIGHT +#define BOTTOM_RIGHT_AVATAR_HEIGHT 64 +#define INFO_BAR_COLOR COLOR_INACTIVEBORDER + +int Chat_Load(); +int Chat_Unload(); +int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam); +int OptInitialise(WPARAM wParam, LPARAM lParam); +int FontServiceFontsChanged(WPARAM wParam, LPARAM lParam); +int StatusIconPressed(WPARAM wParam, LPARAM lParam); + +#endif diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index e5ed4b3a45..c064d623c7 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #ifndef TTI_NONE #define TTI_NONE 0 -- cgit v1.2.3