- PLUGININFO structure removed at all;

- Options_AddPage & UserInfo_AddPage replaced MS_OPT_ADDPAGE & MS_USERINFO_ADDPAGE services respectively
- total internal redesign of options' translation
- code reformatting

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

4 files changed, 9 insertions, 10 deletions

diff --git a/plugins/Svc_crshdmp/crshdmp.cpp b/plugins/Svc_crshdmp/crshdmp.cpp
index fb71d68807..919171c7f0 100644
--- a/plugins/Svc_crshdmp/crshdmp.cpp
+++ b/plugins/Svc_crshdmp/crshdmp.cpp
@@ -207,7 +207,7 @@ int OptionsInit(WPARAM wParam, LPARAM)
 	odp.pszGroup    = LPGEN("Services");

 	odp.flags       = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc  = DlgProcOptions;

-	CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp );

+	Options_AddPage(wParam, &odp);

 

 	return 0;

 }

diff --git a/plugins/Svc_crshdmp/dumper.cpp b/plugins/Svc_crshdmp/dumper.cpp
index bce015016b..bae091a023 100644
--- a/plugins/Svc_crshdmp/dumper.cpp
+++ b/plugins/Svc_crshdmp/dumper.cpp
@@ -231,13 +231,13 @@ static void GetPluginsString(bkstring& buffer, unsigned& flags)
 			continue;

 		}

 

-		PLUGININFO* pi = GetMirInfo(hModule);

+		PLUGININFOEX* pi = GetMirInfo(hModule);

 		if (pi != NULL)

 		{

 			TCHAR timebuf[30] = TEXT("");

 			GetLastWriteTime(&FindFileData.ftLastWriteTime, timebuf, 30);

 

-			bool ep = (size_t)pi->cbSize > sizeof(PLUGININFO);

+			bool ep = (size_t)pi->cbSize > sizeof(PLUGININFOEX);

 			const TCHAR *unica = (ep && ((PLUGININFOEX*)pi)->flags & 1) ? TEXT("|Unicode aware|") : TEXT("");

 

 			ListItem* lst = new ListItem;

@@ -702,7 +702,7 @@ void CreateCrashReport(HANDLE hDumpFile, PEXCEPTION_POINTERS exc_ptr, const TCHA
 		if (crashpos != 0)

 		{

 			HMODULE hModule = (HMODULE)Module.BaseOfImage;

-			PLUGININFO *pi = GetMirInfo(hModule);

+			PLUGININFOEX *pi = GetMirInfo(hModule);

 			if (pi != NULL)

 			{

 

diff --git a/plugins/Svc_crshdmp/utils.cpp b/plugins/Svc_crshdmp/utils.cpp
index e60893ecf5..d4dced7d70 100644
--- a/plugins/Svc_crshdmp/utils.cpp
+++ b/plugins/Svc_crshdmp/utils.cpp
@@ -360,14 +360,13 @@ void GetLastWriteTime(LPCTSTR fileName, LPTSTR lpszString, DWORD dwSize)
 	GetLastWriteTime(&FindFileData.ftLastWriteTime, lpszString, dwSize);

 }

 

+typedef PLUGININFOEX * (__cdecl * Miranda_Plugin_Info) (DWORD mirandaVersion);

 

-typedef PLUGININFO * (__cdecl * Miranda_Plugin_Info) (DWORD mirandaVersion);

-

-PLUGININFO* GetMirInfo(HMODULE hModule)

+PLUGININFOEX* GetMirInfo(HMODULE hModule)

 {

 	Miranda_Plugin_Info bpi = (Miranda_Plugin_Info)GetProcAddress(hModule, "MirandaPluginInfoEx");

-	if (bpi == NULL) bpi = (Miranda_Plugin_Info)GetProcAddress(hModule, "MirandaPluginInfo");

-	if (bpi == NULL) return NULL;

+	if (bpi == NULL)

+		return NULL;

 

 	return bpi(mirandaVersion);

 }

diff --git a/plugins/Svc_crshdmp/utils.h b/plugins/Svc_crshdmp/utils.h
index 6c03552db7..9089f57571 100644
--- a/plugins/Svc_crshdmp/utils.h
+++ b/plugins/Svc_crshdmp/utils.h
@@ -147,7 +147,7 @@ void StoreStringToClip(bkstring& buffer);
 void ShowMessage(int type, const TCHAR* format, ...);

 bool IsPluginEnabled(TCHAR* filename);

 

-PLUGININFO* GetMirInfo(HMODULE hModule);

+PLUGININFOEX* GetMirInfo(HMODULE hModule);

 const PLUGININFOEX* GetPluginInfoEx(void);

 

 void CreateMiniDump   (HANDLE hDumpFile, PEXCEPTION_POINTERS exc_ptr);