From a788cc5902dda036c81b6e0ee25b742cf62d3a1b Mon Sep 17 00:00:00 2001 From: sje Date: Mon, 19 Mar 2007 00:33:39 +0000 Subject: implemented new GUID/interface API git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@127 4f64403b-2f21-0410-a795-97e2b3489a10 --- yapp/YAPP.mdsp | 22 +++++++++++----------- yapp/popups2.cpp | 23 ++++++++++++++++------- yapp/version.h | 6 +++--- 3 files changed, 30 insertions(+), 21 deletions(-) (limited to 'yapp') diff --git a/yapp/YAPP.mdsp b/yapp/YAPP.mdsp index e290cac..371d009 100644 --- a/yapp/YAPP.mdsp +++ b/yapp/YAPP.mdsp @@ -110,15 +110,15 @@ extraResourceOptions= 1=popups2.rc 2=version.rc [History] -common.h,2413 -popup_history.cpp,2330 -popwin.cpp,590 -resource.rc,23 -version.rc,24 -resource.h,2162 -popups2.rc,830 -popups2.cpp,1520 -..\..\include\m_plugins.h,0 +message_pump.cpp,938 ..\..\include\newpluginapi.h,1183 -message_pump.cpp,945 -version.h,175 +..\..\include\m_plugins.h,0 +popups2.cpp,1520 +popups2.rc,830 +resource.h,2162 +version.rc,24 +resource.rc,23 +popwin.cpp,583 +popup_history.cpp,2330 +common.h,2413 +version.h,150 diff --git a/yapp/popups2.cpp b/yapp/popups2.cpp index aebb041..b31c503 100644 --- a/yapp/popups2.cpp +++ b/yapp/popups2.cpp @@ -32,13 +32,9 @@ COLORREF colFirstLine = RGB(255, 0, 0), colSecondLine = 0, colTime = RGB(0, 0, 2 // hooked here so it's in the main thread HANDLE hAvChangeEvent = 0; -PLUGININFO pluginInfo={ +PLUGININFOEX pluginInfo={ sizeof(PLUGININFO), -#ifndef _UNICODE - __PLUGIN_NAME " (ANSI)", -#else __PLUGIN_NAME, -#endif PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESC, __AUTHOR, @@ -46,7 +42,13 @@ PLUGININFO pluginInfo={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, //not transient - 0 //doesn't replace anything built-in + 0, //doesn't replace anything built-in + +#ifndef _UNICODE + { 0xefd15f16, 0x7ae4, 0x40d7, { 0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 } } // {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5} +#else + { 0x563780ef, 0xac7e, 0x40ba, { 0xa8, 0xa, 0xd, 0xcd, 0x4f, 0xd2, 0xf, 0x9 } } // {563780EF-AC7E-40ba-A80A-0DCD4FD20F09} +#endif }; PLUGINLINK *pluginLink = 0; @@ -58,11 +60,18 @@ extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LP return TRUE; } -extern "C" POPUPS2_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) +extern "C" POPUPS2_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { return &pluginInfo; } +static const MUUID interfaces[] = {MIID_POPUPS, MIID_LAST}; +__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) +{ + return interfaces; +} + + int ReloadFont(WPARAM wParam, LPARAM lParam) { if(ServiceExists(MS_FONT_GETW)) { diff --git a/yapp/version.h b/yapp/version.h index 77854c7..e780dde 100644 --- a/yapp/version.h +++ b/yapp/version.h @@ -2,9 +2,9 @@ #define __VERSION_H_INCLUDED #define __MAJOR_VERSION 0 -#define __MINOR_VERSION 2 -#define __RELEASE_NUM 2 -#define __BUILD_NUM 1 +#define __MINOR_VERSION 3 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 0 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM #define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -- cgit v1.2.3