muuid standardization

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

4 files changed, 159 insertions, 8 deletions

diff --git a/plugins/SecureIM/secureim_11.vcxproj.filters b/plugins/SecureIM/secureim_11.vcxproj.filters
index 62b3db57fd..1c91709e99 100644
--- a/plugins/SecureIM/secureim_11.vcxproj.filters
+++ b/plugins/SecureIM/secureim_11.vcxproj.filters
@@ -5,13 +5,167 @@
       <UniqueIdentifier>{d6176538-1c22-41e7-b82c-e4c9344fd47f}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{87772876-2b10-44eb-a948-de3a36aa73a4}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{bbfa3038-7ce3-4eed-a147-91ba647d3b67}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="res\resource_icons.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="res\version_icons.rc">

+    <ResourceCompile Include="res\version.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="src\commonheaders.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\crypt_check.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\crypt_dll.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\crypt_icons.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\crypt_lists.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\crypt_metacontacts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\crypt_misc.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\crypt_popups.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\dbevent.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\gettime.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\images.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\language.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\loadicons.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\loadlib.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\main.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\mmi.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\popupOptions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\rtfconv.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\splitmsg.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svcs_clist.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svcs_menu.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svcs_proto.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svcs_rsa.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svcs_srmm.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\commonheaders.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\crypt.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\cryptopp.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\dbevent.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\gettime.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\images.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\language.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\loadicons.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\loadlib.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\mmi.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\options.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\popupOptions.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\rtfconv.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\secureim.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\splitmsg.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svcs_clist.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svcs_menu.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svcs_proto.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svcs_rsa.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svcs_srmm.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/SecureIM/src/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp
index 7567ec2522..fa384b3492 100644
--- a/plugins/SecureIM/src/commonheaders.cpp
+++ b/plugins/SecureIM/src/commonheaders.cpp
@@ -34,8 +34,9 @@ PLUGININFOEX pluginInfoEx = {
 		"Johell@ifrance.com, baloo@bk.ru",

 		"© 2003 Johell, © 2005-09 Baloo",

 		"http://miranda-ng.org/",

-		0,

-		MIID_SECUREIM

+		UNICODE_AWARE,

+		//1B2A39E5-E2F6-494D-958D-1808FD110DD5

+		{0x1B2A39E5, 0xE2F6, 0x494D, {0x95, 0x8D, 0x18, 0x08, 0xFD, 0x11, 0x0D, 0xD5}}

 };

 

 LPSTR myDBGetString(HANDLE hContact,const char *szModule,const char *szSetting)

diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h
index 8328d39e83..886e0ed9cc 100644
--- a/plugins/SecureIM/src/commonheaders.h
+++ b/plugins/SecureIM/src/commonheaders.h
@@ -132,8 +132,6 @@ extern int  TEMP_SIZE;
 extern HINSTANCE g_hInst, g_hIconInst;

 extern PLUGININFOEX pluginInfoEx;

 

-#define MIID_SECUREIM	{0x1B2A39E5, 0xE2F6, 0x494D, { 0x95, 0x8D, 0x18, 0x08, 0xFD, 0x11, 0x0D, 0xD5 }} //1B2A39E5-E2F6-494D-958D-1808FD110DD5

-

 #define PREF_METANODB	0x2000	//!< Flag to indicate message should not be added to db by filter when sending

 #define PREF_SIMNOMETA	0x4000	//!< Flag to indicate message should not be inspected by filter on metacontact

 

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 12eb96ed0e..a1f8a91f02 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -11,8 +11,6 @@ BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD dwReason, LPVOID) {
 	return TRUE;

 }

 

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_SECUREIM, MIID_LAST};

-

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return &pluginInfoEx;