diff options
| -rw-r--r-- | metacontacts/MetaContacts.mdsp | 1 | ||||
| -rw-r--r-- | metacontacts/MetaContacts_8.sln | 4 | ||||
| -rw-r--r-- | metacontacts/MetaContacts_8.vcproj | 13 | ||||
| -rw-r--r-- | metacontacts/meta_main.c | 4 | ||||
| -rw-r--r-- | metacontacts/meta_services.c | 23 | ||||
| -rw-r--r-- | metacontacts/metacontacts.h | 2 | ||||
| -rw-r--r-- | metacontacts/version.h | 2 |
7 files changed, 28 insertions, 21 deletions
diff --git a/metacontacts/MetaContacts.mdsp b/metacontacts/MetaContacts.mdsp index d7f19bf..07f645d 100644 --- a/metacontacts/MetaContacts.mdsp +++ b/metacontacts/MetaContacts.mdsp @@ -100,3 +100,4 @@ extraResourceOptions= [Other]
[History]
meta_options.c,25271
+version.h,0
diff --git a/metacontacts/MetaContacts_8.sln b/metacontacts/MetaContacts_8.sln index 27d9c7b..6054a51 100644 --- a/metacontacts/MetaContacts_8.sln +++ b/metacontacts/MetaContacts_8.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaContacts", "MetaContacts_8.vcproj", "{8B5D2F98-8F24-4F26-8E8B-00857F37530E}"
EndProject
Global
diff --git a/metacontacts/MetaContacts_8.vcproj b/metacontacts/MetaContacts_8.vcproj index 21b1e3e..bbd2de5 100644 --- a/metacontacts/MetaContacts_8.vcproj +++ b/metacontacts/MetaContacts_8.vcproj @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="MetaContacts"
ProjectGUID="{8B5D2F98-8F24-4F26-8E8B-00857F37530E}"
RootNamespace="MetaContacts"
Keyword="MFCProj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -82,6 +83,8 @@ SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/MetaContacts.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)/$(TargetName).lib"
/>
<Tool
@@ -103,9 +106,6 @@ Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -178,6 +178,8 @@ GenerateManifest="false"
ProgramDatabaseFile=".\Release/MetaContacts.pdb"
BaseAddress="0x22010000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)/$(TargetName).lib"
/>
<Tool
@@ -199,9 +201,6 @@ Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/metacontacts/meta_main.c b/metacontacts/meta_main.c index e3a507e..c3342dd 100644 --- a/metacontacts/meta_main.c +++ b/metacontacts/meta_main.c @@ -243,14 +243,14 @@ int __declspec(dllexport)Load(PLUGINLINK *link) }
ZeroMemory(&pd,sizeof(pd));
- pd.cbSize=sizeof(pd);
+ pd.cbSize=PROTOCOLDESCRIPTOR_V3_SIZE;//sizeof(pd);
pd.szName=META_FILTER;
pd.type=PROTOTYPE_FILTER;
CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);
ZeroMemory(&pd,sizeof(pd));
- pd.cbSize=sizeof(pd);
+ pd.cbSize=PROTOCOLDESCRIPTOR_V3_SIZE;//sizeof(pd);
pd.szName=META_PROTO;
pd.type = PROTOTYPE_PROTOCOL;
diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c index cf42ef2..d61eea6 100644 --- a/metacontacts/meta_services.c +++ b/metacontacts/meta_services.c @@ -1686,31 +1686,38 @@ int Meta_FileSend(WPARAM wParam, LPARAM lParam) {
// This is a simple contact
// (this should normally not happen, since linked contacts do not appear on the list.)
+ //PUShowMessage("meta has no default", SM_NOTIFY);
return 0;
}
else
{
HANDLE most_online;
//DBEVENTINFO dbei;
- char szServiceName[100];
+ //char szServiceName[100];
most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_FILESEND);
- if(!most_online)
+ if(!most_online) {
+ //PUShowMessage("no most online for ft", SM_NOTIFY);
return 0;
+ }
proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0);
//Meta_CopyContactNick(ccs->hContact, most_online, proto);
if(proto) {
- ccs->hContact = most_online;
+ //ccs->hContact = most_online;
//Meta_SetNick(proto);
- _snprintf(szServiceName, sizeof(szServiceName), "%s%s", proto, PSS_FILE);
- if (ServiceExists(szServiceName)) {
- return (int)(CallContactService(ccs->hContact, PSS_FILE, ccs->wParam, ccs->lParam));
- }
- }
+ // don't check for existence of service - 'accounts' based protos don't have them!
+ //_snprintf(szServiceName, sizeof(szServiceName), "%s%s", proto, PSS_FILE);
+ //if (ServiceExists(szServiceName)) {
+ // PUShowMessage("sending to subcontact", SM_NOTIFY);
+ return (int)(CallContactService(most_online, PSS_FILE, ccs->wParam, ccs->lParam));
+ //} else
+ // PUShowMessage("no service", SM_NOTIFY);
+ } //else
+ //PUShowMessage("no proto for subcontact", SM_NOTIFY);
}
return 0; // fail
}
diff --git a/metacontacts/metacontacts.h b/metacontacts/metacontacts.h index ba0d207..9cf64bc 100644 --- a/metacontacts/metacontacts.h +++ b/metacontacts/metacontacts.h @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _WIN32_WINNT 0x0400
#define _WIN32_IE 0x0300
-#define MIRANDA_VER 0x0600
+#define MIRANDA_VER 0x0800
#include <windows.h>
#include <winsock.h>
diff --git a/metacontacts/version.h b/metacontacts/version.h index ecfffcf..e563bc6 100644 --- a/metacontacts/version.h +++ b/metacontacts/version.h @@ -5,7 +5,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 14
#define __RELEASE_NUM 0
-#define __BUILD_NUM 8
+#define __BUILD_NUM 9
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
|