summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/delphi/interfaces.inc8
-rw-r--r--include/newpluginapi.h8
-rw-r--r--plugins/Folders/src/folders.cpp16
-rw-r--r--plugins/Popup/src/main.cpp7
-rw-r--r--plugins/TipperYM/src/tipper.cpp8
-rw-r--r--plugins/VersionInfo/src/main.cpp8
-rw-r--r--plugins/WhenWasIt/src/WhenWasIt.cpp11
-rw-r--r--plugins/WhenWasIt/src/commonheaders.h1
-rw-r--r--plugins/YAPP/src/yapp.cpp13
-rw-r--r--plugins/YAPP/src/yapp.h12
-rw-r--r--plugins/YAPP/yapp_11.vcxproj1
-rw-r--r--plugins/YAPP/yapp_11.vcxproj.filters3
12 files changed, 21 insertions, 75 deletions
diff --git a/include/delphi/interfaces.inc b/include/delphi/interfaces.inc
index 09004fff94..3c92063080 100644
--- a/include/delphi/interfaces.inc
+++ b/include/delphi/interfaces.inc
@@ -38,14 +38,6 @@ const MIID_TESTPLUGIN :MUUID='{53B974F4-3C74-4DBA-8FC2-6F92FE013B8C}';
const MIID_EXTRAICONSSERVICE:MUUID='{62D80749-F169-4592-B44D-3DD6DE9D50C5}';
// Common plugin interfaces (non-core plugins)
-const MIID_VERSIONINFO :MUUID='{CFEB6325-334E-4052-A645-562193DFCC77}';
-const MIID_FOLDERS :MUUID='{CFEBEC29-39EF-4B62-AD38-9A652CA324ED}';
-const MIID_BIRTHDAYNOTIFY:MUUID='{CFBA5784-3701-4D83-816A-199C00D4A67A}';
-const MIID_EXCHANGE :MUUID='{CFD79A89-9959-4E65-B076-413F98FE0D15}';
-const MIID_MIRPY :MUUID='{CFF91A5C-1786-41C1-8886-094B14281F15}';
-const MIID_SERVICESLIST :MUUID='{CF4BDF02-5D27-4241-99E5-1951AAB0C454}';
-const MIID_TOOLTIPS :MUUID='{BCBDA043-2716-4404-B0FA-3D2D93819E03}';
-const MIID_POPUPS :MUUID='{33299069-1919-4FF8-B131-1D072178A766}';
const MIID_LOGWINDOW :MUUID='{C53AFB90-FA44-4304-BC9D-6A841C3905F5}';
const MIID_EVENTNOTIFY :MUUID='{F3D7EC5A-F7EF-45DD-8CA5-B0F6BA18647B}';
const MIID_SRCONTACTS :MUUID='{7CA6050E-BAF7-42D2-B936-0DB9DF572B95}';
diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index 93e8d472f7..c240e2c8ff 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -72,14 +72,6 @@ typedef struct _MUUID {
#define MIID_TESTPLUGIN {0x53b974f4, 0x3c74, 0x4dba, {0x8f, 0xc2, 0x6f, 0x92, 0xfe, 0x01, 0x3b, 0x8c}}
/* Common plugin interfaces (non-core plugins) */
-#define MIID_VERSIONINFO {0xcfeb6325, 0x334e, 0x4052, {0xa6, 0x45, 0x56, 0x21, 0x93, 0xdf, 0xcc, 0x77}}
-#define MIID_FOLDERS {0xcfebec29, 0x39ef, 0x4b62, {0xad, 0x38, 0x9a, 0x65, 0x2c, 0xa3, 0x24, 0xed}}
-#define MIID_BIRTHDAYNOTIFY {0xcfba5784, 0x3701, 0x4d83, {0x81, 0x6a, 0x19, 0x9c, 0x00, 0xd4, 0xa6, 0x7a}}
-#define MIID_EXCHANGE {0xcfd79a89, 0x9959, 0x4e65, {0xb0, 0x76, 0x41, 0x3f, 0x98, 0xfe, 0x0d, 0x15}}
-#define MIID_MIRPY {0xcff91a5c, 0x1786, 0x41c1, {0x88, 0x86, 0x09, 0x4b, 0x14, 0x28, 0x1f, 0x15}}
-#define MIID_SERVICESLIST {0xcf4bdf02, 0x5d27, 0x4241, {0x99, 0xe5, 0x19, 0x51, 0xaa, 0xb0, 0xc4, 0x54}}
-#define MIID_TOOLTIPS {0xbcbda043, 0x2716, 0x4404, {0xb0, 0xfa, 0x3d, 0x2d, 0x93, 0x81, 0x9e, 0x03}}
-#define MIID_POPUPS {0x33299069, 0x1919, 0x4ff8, {0xb1, 0x31, 0x1d, 0x07, 0x21, 0x78, 0xa7, 0x66}}
#define MIID_LOGWINDOW {0xc53afb90, 0xfa44, 0x4304, {0xbc, 0x9d, 0x6a, 0x84, 0x1c, 0x39, 0x05, 0xf5}}
#define MIID_EVENTNOTIFY {0xF3D7EC5A, 0xF7EF, 0x45DD, {0x8C, 0xA5, 0xB0, 0xF6, 0xBA, 0x18, 0x64, 0x7B}}
#define MIID_SRCONTACTS {0x7CA6050E, 0xBAF7, 0x42D2, {0xB9, 0x36, 0x0D, 0xB9, 0xDF, 0x57, 0x2B, 0x95}}
diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp
index 3dfa8e4b89..586510ae28 100644
--- a/plugins/Folders/src/folders.cpp
+++ b/plugins/Folders/src/folders.cpp
@@ -43,8 +43,8 @@ PLUGININFOEX pluginInfo = {
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
- {0x2f129563, 0x2c7d, 0x4a9a, {0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7}}
- //{2f129563-2c7d-4a9a-b948-97dfcc0afdd7}
+ // {2f129563-2c7d-4a9a-b948-97dfcc0afdd7}
+ {0x2f129563, 0x2c7d, 0x4a9a, {0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7}}
};
extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
@@ -52,9 +52,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda
return &pluginInfo;
}
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_FOLDERS, MIID_LAST};
-
-extern "C" int __declspec(dllexport) Load(void)
+extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
@@ -64,20 +62,16 @@ extern "C" int __declspec(dllexport) Load(void)
return 0;
}
-extern "C" int __declspec(dllexport) Unload()
+extern "C" __declspec(dllexport) int Unload()
{
-// DestroyServiceFunction(MS_HISTORY_SHOWCONTACTHISTORY);
DestroyServices();
DestroyEvents();
UnhookEvents();
return 0;
}
-bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
hInstance = hinstDLL;
- if (fdwReason == DLL_PROCESS_ATTACH)
- DisableThreadLibraryCalls(hinstDLL);
-
return TRUE;
}
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 543a904445..12e2c88c9f 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -376,9 +376,9 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam)
//=== DllMain =====
//DLL entry point, Required to store the instance handle
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- hInst=hinstDLL;
+ hInst = hinstDLL;
return TRUE;
}
@@ -393,9 +393,6 @@ MIRAPI PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
return &pluginInfoEx;
}
-//Miranda PluginInterfaces
-MIRAPI const MUUID MirandaInterfaces[] = { MIID_POPUPS, MIID_LAST };
-
//ME_SYSTEM_OKTOEXIT event
//called before the app goes into shutdown routine to make sure everyone is happy to exit
static int OkToExit(WPARAM wParam, LPARAM lParam)
diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp
index 33895c7035..a661c24705 100644
--- a/plugins/TipperYM/src/tipper.cpp
+++ b/plugins/TipperYM/src/tipper.cpp
@@ -57,14 +57,14 @@ PLUGININFOEX pluginInfoEx =
"yaho@miranda-easy.net",
"© 2005-2007 Scott Ellis, 2007-2011 Jan Holub",
"http://miranda-ng.org/",
- UNICODE_AWARE, //doesn't replace anything built-in
- { 0x8392df1d, 0x9090, 0x4f8e, { 0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00 } } // {8392DF1D-9090-4f8e-9DF6-2FE058EDD800}
+ UNICODE_AWARE,
+ // {8392DF1D-9090-4f8e-9DF6-2FE058EDD800}
+ {0x8392df1d, 0x9090, 0x4f8e, {0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00}}
};
extern "C" bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
hInst = hinstDLL;
- DisableThreadLibraryCalls(hInst);
return TRUE;
}
@@ -73,8 +73,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
return &pluginInfoEx;
}
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_TOOLTIPS, MIID_LAST};
-
int ReloadFont(WPARAM wParam, LPARAM lParam)
{
LOGFONT logFont;
diff --git a/plugins/VersionInfo/src/main.cpp b/plugins/VersionInfo/src/main.cpp
index 4427ca5827..5068fceece 100644
--- a/plugins/VersionInfo/src/main.cpp
+++ b/plugins/VersionInfo/src/main.cpp
@@ -59,13 +59,11 @@ PLUGININFOEX pluginInfo={
{0x2f174488, 0x489c, 0x4fe1, {0x94, 0x0d, 0x59, 0x6c, 0xf0, 0xf3, 0x5e, 0x65}}
};
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_VERSIONINFO, MIID_SERVICEMODE, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_SERVICEMODE, MIID_LAST};
-bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- hInst=hinstDLL;
- if (fdwReason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls(hinstDLL);
- EnglishLocale = MAKELCID(MAKELANGID(0x09, 0x01), SORT_DEFAULT); //create our english locale and use it everywhere it's needed
+ hInst = hinstDLL;
return TRUE;
}
diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp
index 07d7ce0548..093c4b33c0 100644
--- a/plugins/WhenWasIt/src/WhenWasIt.cpp
+++ b/plugins/WhenWasIt/src/WhenWasIt.cpp
@@ -39,7 +39,7 @@ PLUGININFOEX pluginInfo = {
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
- //{2ff96c84-b0b5-470e-bbf9-907b9f3f5d2f}
+ // {2ff96c84-b0b5-470e-bbf9-907b9f3f5d2f}
{0x2ff96c84, 0xb0b5, 0x470e, {0xbb, 0xf9, 0x90, 0x7b, 0x9f, 0x3f, 0x5d, 0x2f}}
};
@@ -48,10 +48,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda
return &pluginInfo;
}
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_BIRTHDAYNOTIFY, MIID_LAST};
-
-#include <commctrl.h>
-
extern "C" int __declspec(dllexport) Load(void)
{
Log("%s", "Entering function " __FUNCTION__);
@@ -103,11 +99,8 @@ extern "C" int __declspec(dllexport) Unload()
return 0;
}
-bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
hInstance = hinstDLL;
- if (fdwReason == DLL_PROCESS_ATTACH)
- DisableThreadLibraryCalls(hinstDLL);
-
return TRUE;
}
diff --git a/plugins/WhenWasIt/src/commonheaders.h b/plugins/WhenWasIt/src/commonheaders.h
index 9576d787c1..a4d54b019b 100644
--- a/plugins/WhenWasIt/src/commonheaders.h
+++ b/plugins/WhenWasIt/src/commonheaders.h
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h>
#include <time.h>
#include <math.h>
+#include <commctrl.h>
#include <newpluginapi.h>
#include <m_database.h>
diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp
index 9b94400299..b9aacd198b 100644
--- a/plugins/YAPP/src/yapp.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -2,7 +2,6 @@
//
#include "common.h"
-#include "yapp.h"
#include "version.h"
#include "message_pump.h"
#include "options.h"
@@ -37,23 +36,21 @@ PLUGININFOEX pluginInfo={
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
- { 0xefd15f16, 0x7ae4, 0x40d7, { 0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 } } // {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5}
+ // {EFD15F16-7AE4-40d7-A8E3-A411ED747BD5}
+ {0xefd15f16, 0x7ae4, 0x40d7, {0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5 }}
};
extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
{
hInst = hModule;
- DisableThreadLibraryCalls(hInst);
return TRUE;
}
-extern "C" YAPP_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_POPUPS, MIID_LAST};
-
int ReloadFont(WPARAM wParam, LPARAM lParam)
{
LOGFONT log_font;
@@ -172,7 +169,7 @@ int PreShutdown(WPARAM wParam, LPARAM lParam)
return 0;
}
-extern "C" int YAPP_API Load(void) {
+extern "C" int __declspec(dllexport) Load(void) {
mir_getLP(&pluginInfo);
@@ -186,7 +183,7 @@ extern "C" int YAPP_API Load(void) {
return 0;
}
-extern "C" int YAPP_API Unload()
+extern "C" int __declspec(dllexport) Unload()
{
DeinitNotify();
DeleteObject(hFontFirstLine);
diff --git a/plugins/YAPP/src/yapp.h b/plugins/YAPP/src/yapp.h
deleted file mode 100644
index de86e26295..0000000000
--- a/plugins/YAPP/src/yapp.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the POPUPS2_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// POPUPS2_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-#ifdef YAPP_EXPORTS
-#define YAPP_API __declspec(dllexport)
-#else
-#define YAPP_API __declspec(dllimport)
-#endif
-
diff --git a/plugins/YAPP/yapp_11.vcxproj b/plugins/YAPP/yapp_11.vcxproj
index 77151538a1..c083bada83 100644
--- a/plugins/YAPP/yapp_11.vcxproj
+++ b/plugins/YAPP/yapp_11.vcxproj
@@ -202,7 +202,6 @@
<ClInclude Include="src\notify.h" />
<ClInclude Include="src\options.h" />
<ClInclude Include="src\yapp_history.h" />
- <ClInclude Include="src\yapp.h" />
<ClInclude Include="src\popwin.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\services.h" />
diff --git a/plugins/YAPP/yapp_11.vcxproj.filters b/plugins/YAPP/yapp_11.vcxproj.filters
index e1420633dc..872e1a2ec4 100644
--- a/plugins/YAPP/yapp_11.vcxproj.filters
+++ b/plugins/YAPP/yapp_11.vcxproj.filters
@@ -59,9 +59,6 @@
<ClInclude Include="src\yapp_history.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\yapp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\popwin.h">
<Filter>Header Files</Filter>
</ClInclude>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:22:31 +0000