fixed vi info in command line

git-svn-id: http://svn.miranda-ng.org/main/trunk@10957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 28 insertions, 21 deletions

diff --git a/plugins/CmdLine/src/commonheaders.h b/plugins/CmdLine/src/commonheaders.h
index becf33539c..ec60fefd5f 100644
--- a/plugins/CmdLine/src/commonheaders.h
+++ b/plugins/CmdLine/src/commonheaders.h
@@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_message.h"

 #include "m_ignore.h"

 

-#include "m_versioninfo.h"

+#include "m_crashdumper.h"

 #include "m_statusplugins.h"

 

 #include "version.h"

diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index 3b03a87982..8c62e69617 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -1734,10 +1734,10 @@ void HandleVersionCommand(PCommand command, TArgument *argv, int argc, PReply re
 	if (argc == 2)

 	{

 		reply->code = MIMRES_SUCCESS;

-		if (ServiceExists(MS_VERSIONINFO_GETINFO))

+		if (ServiceExists(MS_CRASHDUMPER_GETINFO))

 		{

 			char *data;

-			CallService(MS_VERSIONINFO_GETINFO, (WPARAM) FALSE, (LPARAM) &data);

+			CallService(MS_CRASHDUMPER_GETINFO, (WPARAM)FALSE, (LPARAM)&data);

 			mir_snprintf(reply->message, reply->cMessage, data);

 			mir_free(data);

 		}

diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index 8c195c3276..19938264d7 100644
--- a/plugins/CrashDumper/src/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
@@ -128,6 +128,20 @@ INT_PTR ViewVersionInfo(WPARAM wParam, LPARAM)
 	return 0;

 }

 

+INT_PTR GetVersionInfo(WPARAM wParam, LPARAM lParam)

+{

+	int result = 1; //failure

+	if (lParam != NULL) {

+		CMString buffer;

+		PrintVersionInfo(buffer, (unsigned int)wParam);

+		char **retData = (char **)lParam;

+		*retData = mir_utf8encodeT(buffer.c_str());

+		if (*retData)

+			result = 0; //success

+	}

+	return result;

+}

+

 INT_PTR OpenUrl(WPARAM wParam, LPARAM)

 {

 	switch (wParam) {

@@ -349,6 +363,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	CreateServiceFunction(MS_CRASHDUMPER_STORETOFILE, StoreVersionInfoToFile);

 	CreateServiceFunction(MS_CRASHDUMPER_STORETOCLIP, StoreVersionInfoToClipboard);

 	CreateServiceFunction(MS_CRASHDUMPER_VIEWINFO, ViewVersionInfo);

+	CreateServiceFunction(MS_CRASHDUMPER_GETINFO, GetVersionInfo);

 	CreateServiceFunction(MS_CRASHDUMPER_UPLOAD, UploadVersionInfo);

 	CreateServiceFunction(MS_CRASHDUMPER_URL, OpenUrl);

 	CreateServiceFunction(MS_SERVICEMODE_LAUNCH, ServiceModeLaunch);

diff --git a/plugins/CrashDumper/src/utils.h b/plugins/CrashDumper/src/utils.h
index c538506f2e..43a6938f78 100644
--- a/plugins/CrashDumper/src/utils.h
+++ b/plugins/CrashDumper/src/utils.h
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #define MS_CRASHDUMPER_STORETOFILE "CrashDmp/StoreVerInfoToFile"

 #define MS_CRASHDUMPER_STORETOCLIP "CrashDmp/StoreVerInfoToClip"

-#define MS_CRASHDUMPER_GETINFO     "Versioninfo/GetInfo"

+#define MS_CRASHDUMPER_GETINFO     "CrashDmp/GetInfo"

 #define MS_CRASHDUMPER_VIEWINFO    "CrashDmp/ViewInfo"

 #define MS_CRASHDUMPER_UPLOAD      "CrashDmp/UploadInfo"

 #define MS_CRASHDUMPER_URL         "CrashDmp/StartUrl"

diff --git a/plugins/ExternalAPI/m_versioninfo.h b/plugins/ExternalAPI/m_crashdumper.h
index 3c5ffddcc0..50abf0f125 100644
--- a/plugins/ExternalAPI/m_versioninfo.h
+++ b/plugins/ExternalAPI/m_crashdumper.h
@@ -1,12 +1,11 @@
 /*

-Version information plugin for Miranda IM

-

-Copyright © 2002-2006 Luca Santarelli, Cristian Libotean

+Miranda Crash Dumper Plugin

+Copyright (C) 2008 - 2012 Boris Krasnovskiy All Rights Reserved

 

 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.

+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

@@ -14,18 +13,11 @@ 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.

+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#ifndef M_VERSIONINFO_H

-#define M_VERSIONINFO_H

-

-/*Brings up the versioninfo post as configured in the options

-wParam - not used

-lParam - not used

-*/

-#define MS_VERSIONINFO_MENU_COMMAND "VersionInfo/MenuCommand"

+#ifndef M_CRASHDUMPER_H

+#define M_CRASHDUMPER_H

 

 /*Returns a string containing the versioninfo post

 wParam - (BOOL) suppress forum style formatting. If true the post won't have forum style formatting even if the option is checked in miranda's options.

@@ -43,6 +35,6 @@ how to use:
 }

 

 */

-#define MS_VERSIONINFO_GETINFO "Versioninfo/GetInfo"

+#define MS_CRASHDUMPER_GETINFO "CrashDmp/GetInfo"

 

-#endif //M_VERSIONINFO_H

+#endif //M_CRASHDUMPER_H