diff options
-rw-r--r-- | plugins/AddContactPlus/res/Version.rc | 1 | ||||
-rw-r--r-- | plugins/Alarms/res/Version.rc | 1 | ||||
-rw-r--r-- | plugins/AssocMgr/res/version.rc | 1 | ||||
-rw-r--r-- | plugins/AuthState/res/version.rc | 1 | ||||
-rw-r--r-- | plugins/AutoRun/res/Version.rc | 1 | ||||
-rw-r--r-- | plugins/AutoShutdown/res/version.rc | 1 | ||||
-rw-r--r-- | plugins/AvatarHistory/res/Version.rc | 1 | ||||
-rw-r--r-- | plugins/BASS_interface/res/Version.rc | 4 | ||||
-rw-r--r-- | plugins/BASS_interface/src/Bass_interface.h | 2 | ||||
-rw-r--r-- | plugins/BASS_interface/src/Main.cpp | 9 | ||||
-rw-r--r-- | plugins/BASS_interface/src/Version.h | 1 | ||||
-rw-r--r-- | plugins/BasicHistory/res/version.rc | 1 | ||||
-rw-r--r-- | plugins/Boltun/Boltun_10.vcxproj | 8 | ||||
-rw-r--r-- | plugins/Boltun/Boltun_10.vcxproj.filters | 24 | ||||
-rw-r--r-- | plugins/Boltun/src/boltun.cpp | 19 | ||||
-rw-r--r-- | plugins/Boltun/src/boltun.h | 2 |
16 files changed, 35 insertions, 42 deletions
diff --git a/plugins/AddContactPlus/res/Version.rc b/plugins/AddContactPlus/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AddContactPlus/res/Version.rc +++ b/plugins/AddContactPlus/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/Alarms/res/Version.rc b/plugins/Alarms/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/Alarms/res/Version.rc +++ b/plugins/Alarms/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/AssocMgr/res/version.rc b/plugins/AssocMgr/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AssocMgr/res/version.rc +++ b/plugins/AssocMgr/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/AuthState/res/version.rc b/plugins/AuthState/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AuthState/res/version.rc +++ b/plugins/AuthState/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/AutoRun/res/Version.rc b/plugins/AutoRun/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AutoRun/res/Version.rc +++ b/plugins/AutoRun/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/AutoShutdown/res/version.rc b/plugins/AutoShutdown/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AutoShutdown/res/version.rc +++ b/plugins/AutoShutdown/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/AvatarHistory/res/Version.rc b/plugins/AvatarHistory/res/Version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/AvatarHistory/res/Version.rc +++ b/plugins/AvatarHistory/res/Version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/BASS_interface/res/Version.rc b/plugins/BASS_interface/res/Version.rc index d741488c4f..5bfbab4754 100644 --- a/plugins/BASS_interface/res/Version.rc +++ b/plugins/BASS_interface/res/Version.rc @@ -7,10 +7,6 @@ #include "afxres.h"
#include "..\src\version.h"
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#endif //_WIN32
-
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
PRODUCTVERSION __FILEVERSION_STRING
diff --git a/plugins/BASS_interface/src/Bass_interface.h b/plugins/BASS_interface/src/Bass_interface.h index 1058037bea..61c3f367fd 100644 --- a/plugins/BASS_interface/src/Bass_interface.h +++ b/plugins/BASS_interface/src/Bass_interface.h @@ -34,8 +34,6 @@ Copyright (C) 2010, 2011 tico-tico #define LOADBASSFUNCTION(f) (*((void**)&f)=(void*)GetProcAddress(hBass,#f))
-#define MIID_BASSINT {0x2f07ea05, 0x05b5, 0x4ff0, { 0x87, 0x5d, 0xc5, 0x90, 0xda, 0x2d, 0xda, 0xc1 }} //2f07ea05-05b5-4ff0-875d-c590da2ddac1
-
#define ModuleName "Bass Interface"
#define OPT_VOLUME "Volume"
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 828babac15..e34d9da35f 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -7,7 +7,7 @@ Copyright (C) 2010, 2011 tico-tico HINSTANCE hInst;
int hLangpack;
-PLUGININFOEX pluginInfo={
+PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
@@ -17,16 +17,17 @@ PLUGININFOEX pluginInfo={ __COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
- MIID_BASSINT
+ //2f07ea05-05b5-4ff0-875d-c590da2ddac1
+ {0x2f07ea05, 0x05b5, 0x4ff0, {0x87, 0x5d, 0xc5, 0x90, 0xda, 0x2d, 0xda, 0xc1}}
};
static HANDLE hService;
static HANDLE hTBButton;
static HINSTANCE hBass = NULL;
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- hInst=hinstDLL;
+ hInst = hinstDLL;
return TRUE;
}
diff --git a/plugins/BASS_interface/src/Version.h b/plugins/BASS_interface/src/Version.h index 0735651c7d..817ecd1662 100644 --- a/plugins/BASS_interface/src/Version.h +++ b/plugins/BASS_interface/src/Version.h @@ -10,7 +10,6 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x)
#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
-
#define __PLUGIN_NAME "BASS_interface"
#define __INTERNAL_NAME "BASS_interface"
#define __FILENAME "BASS_interface.dll"
diff --git a/plugins/BasicHistory/res/version.rc b/plugins/BasicHistory/res/version.rc index cee33c8390..5bfbab4754 100644 --- a/plugins/BasicHistory/res/version.rc +++ b/plugins/BasicHistory/res/version.rc @@ -4,6 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
diff --git a/plugins/Boltun/Boltun_10.vcxproj b/plugins/Boltun/Boltun_10.vcxproj index 0c709d94c4..4bc1e66885 100644 --- a/plugins/Boltun/Boltun_10.vcxproj +++ b/plugins/Boltun/Boltun_10.vcxproj @@ -187,18 +187,14 @@ <ClInclude Include="src\Engine\UnrecentChooser.h" />
<ClInclude Include="src\Engine\ValueChooser.h" />
<ClInclude Include="src\Engine\WordsList.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\boltun.ico" />
- <None Include="res\smiles.dat" />
<None Include="src\Engine\boltun.mindw" />
- <None Include="docs\lang_pack.txt" />
- <None Include="docs\mind.txt" />
- <None Include="docs\readme.txt" />
- <None Include="docs\TODO.txt" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\boltun.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Boltun/Boltun_10.vcxproj.filters b/plugins/Boltun/Boltun_10.vcxproj.filters index 7c9835f7e1..b7d0de0d5f 100644 --- a/plugins/Boltun/Boltun_10.vcxproj.filters +++ b/plugins/Boltun/Boltun_10.vcxproj.filters @@ -86,25 +86,21 @@ <ClInclude Include="src\Engine\WordsList.h">
<Filter>Header Files\Engine</Filter>
</ClInclude>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="res\boltun.ico">
+ <ResourceCompile Include="res\boltun.rc">
<Filter>Resource Files</Filter>
- </None>
- <None Include="res\smiles.dat">
+ </ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
<Filter>Resource Files</Filter>
- </None>
- <None Include="docs\lang_pack.txt" />
- <None Include="docs\mind.txt" />
- <None Include="docs\readme.txt" />
- <None Include="docs\TODO.txt" />
- <None Include="src\Engine\boltun.mindw">
- <Filter>Source Files</Filter>
- </None>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="res\boltun.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
+ <None Include="src\Engine\boltun.mindw">
+ <Filter>Source Files\Enigne</Filter>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index e19e207c29..25968b15a7 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -37,6 +37,7 @@ #include "resource.h"
#include "resource.h"
+#include "version.h"
#include "boltun.h"
#include "config.h"
@@ -57,18 +58,18 @@ BOOL blInit = FALSE; UINT pTimer = 0;
TCHAR *path;
-PLUGININFOEX pluginInfo={
+PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
- BOLTUN_NAME,
- PLUGIN_MAKE_VERSION(0,0,3,0),
- PLUGIN_DESCRIPTION,
- "Alexander S. Kiselev, Valentin Pavlyuchenko",
- "Valentin.Pavlyuchenko@gmail.com",
- "© 2003-2008 Alexander S. Kiselev A.K.A. KAS, Valentin Pavlyuchenko",
- "http://miranda-ng.org/",
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
// {488C5C84-56DA-434F-96F1-B18900DEF760}
- { 0x488c5c84, 0x56da, 0x434f, { 0x96, 0xf1, 0xb1, 0x89, 0x0, 0xde, 0xf7, 0x60 } }
+ {0x488c5c84, 0x56da, 0x434f, {0x96, 0xf1, 0xb1, 0x89, 0x0, 0xde, 0xf7, 0x60}}
};
static HANDLE hEventDbEventAdded;
diff --git a/plugins/Boltun/src/boltun.h b/plugins/Boltun/src/boltun.h index 914869387c..dc0cdcdb22 100644 --- a/plugins/Boltun/src/boltun.h +++ b/plugins/Boltun/src/boltun.h @@ -50,8 +50,6 @@ //Plugin name
#define BOLTUN_NAME "Boltun"
-#define PLUGIN_DESCRIPTION "Boltun, the chat bot in the russian language."
-
#define MIND_FILE_DESC _T("Mind Files")
#define ALL_FILES_DESC _T("All Files")
|