From d41cb4808c648d458be7615d6a72003e3614538d Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 24 Apr 2015 21:10:03 +0000 Subject: AssocMgr - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AssocMgr/src/assoclist.cpp | 2 +- plugins/AssocMgr/src/common.h | 46 -------------------------------------- plugins/AssocMgr/src/dde.cpp | 2 +- plugins/AssocMgr/src/main.cpp | 6 ++--- plugins/AssocMgr/src/reg.cpp | 2 +- plugins/AssocMgr/src/stdafx.cpp | 18 --------------- plugins/AssocMgr/src/stdafx.cxx | 18 +++++++++++++++ plugins/AssocMgr/src/stdafx.h | 44 ++++++++++++++++++++++++++++++++++++ plugins/AssocMgr/src/test.cpp | 2 +- plugins/AssocMgr/src/utils.cpp | 2 +- 10 files changed, 70 insertions(+), 72 deletions(-) delete mode 100644 plugins/AssocMgr/src/common.h delete mode 100644 plugins/AssocMgr/src/stdafx.cpp create mode 100644 plugins/AssocMgr/src/stdafx.cxx create mode 100644 plugins/AssocMgr/src/stdafx.h (limited to 'plugins/AssocMgr/src') diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index cc343e2f45..b941acf106 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softw Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" /* Options */ extern HINSTANCE hInst; diff --git a/plugins/AssocMgr/src/common.h b/plugins/AssocMgr/src/common.h deleted file mode 100644 index c7ea172927..0000000000 --- a/plugins/AssocMgr/src/common.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - -'File Association Manager'-Plugin for Miranda IM - -Copyright (C) 2005-2007 H. Herkenrath - -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 (AssocMgr-License.txt); if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#define _CRT_SECURE_NO_WARNINGS -#define _WIN32_WINNT 0x0600 -#include /* for SHChangeNotify() */ -#include -#include -#include - -#include -#include -#include -#include -#include -#include "win2k.h" - -#define ASSOCMGR_NOHELPERFUNCTIONS - -#include "m_assocmgr.h" - -#include "utils.h" -#include "reg.h" -#include "assoclist.h" -#include "dde.h" -#include "test.h" -#include "resource.h" -#include "version.h" diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp index 5ffc17add7..5fb674b22a 100644 --- a/plugins/AssocMgr/src/dde.cpp +++ b/plugins/AssocMgr/src/dde.cpp @@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" /* Conversation */ extern HINSTANCE hInst; diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp index fcf1d3543e..4d57f89a76 100644 --- a/plugins/AssocMgr/src/main.cpp +++ b/plugins/AssocMgr/src/main.cpp @@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" HINSTANCE hInst; static HANDLE hHookModulesLoaded; @@ -39,7 +39,7 @@ PLUGININFOEX pluginInfo = { {0x52685cd7, 0xec7, 0x44c1, {0xa1, 0xa6, 0x38, 0x16, 0x12, 0x41, 0x82, 0x2}} }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; @@ -82,7 +82,7 @@ static int AssocMgrModulesLoaded(WPARAM,LPARAM) return 0; } -extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp index 0dcb9eae85..5ebba3dea9 100644 --- a/plugins/AssocMgr/src/reg.cpp +++ b/plugins/AssocMgr/src/reg.cpp @@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" extern HINSTANCE hInst; diff --git a/plugins/AssocMgr/src/stdafx.cpp b/plugins/AssocMgr/src/stdafx.cpp deleted file mode 100644 index c5fe5abaad..0000000000 --- a/plugins/AssocMgr/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 "common.h" \ No newline at end of file diff --git a/plugins/AssocMgr/src/stdafx.cxx b/plugins/AssocMgr/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/AssocMgr/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/AssocMgr/src/stdafx.h b/plugins/AssocMgr/src/stdafx.h new file mode 100644 index 0000000000..89cf724b45 --- /dev/null +++ b/plugins/AssocMgr/src/stdafx.h @@ -0,0 +1,44 @@ +/* + +'File Association Manager'-Plugin for Miranda IM + +Copyright (C) 2005-2007 H. Herkenrath + +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 (AssocMgr-License.txt); if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include /* for SHChangeNotify() */ +#include +#include +#include + +#include +#include +#include +#include +#include +#include "win2k.h" + +#define ASSOCMGR_NOHELPERFUNCTIONS + +#include "m_assocmgr.h" + +#include "utils.h" +#include "reg.h" +#include "assoclist.h" +#include "dde.h" +#include "test.h" +#include "resource.h" +#include "version.h" diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index 70642bd272..f5c404fcc1 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // -- Includes -#include "common.h" +#include "stdafx.h" /* #define AIM_SUPPORT_TEST diff --git a/plugins/AssocMgr/src/utils.cpp b/plugins/AssocMgr/src/utils.cpp index d1d5dad270..5c6d08da24 100644 --- a/plugins/AssocMgr/src/utils.cpp +++ b/plugins/AssocMgr/src/utils.cpp @@ -19,7 +19,7 @@ along with this program (AssocMgr-License.txt); if not, write to the Free Softwa Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" /************************* String Conv ****************************/ -- cgit v1.2.3