[eterhack 2/4] winemapi: Address can contain SMTP: (eterbug #6747).

Alexander Morozov amorozov на etersoft.ru
Пт Янв 14 17:58:55 MSK 2011


---
 dlls/winemapi/sendmail.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c
index 44c1d00..e4629bb 100644
--- a/dlls/winemapi/sendmail.c
+++ b/dlls/winemapi/sendmail.c
@@ -66,6 +66,7 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam,
     const char *address, *subject, *body;
     static const char format[] =
         "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\"";
+    static const char smtp[] = "smtp:";
     char *mailto = NULL, *escape = NULL;
     char empty_string[] = "";
     HRESULT res;
@@ -86,6 +87,8 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam,
         }
 
         address = message->lpRecips[i].lpszAddress;
+        if (!strncasecmp(address, smtp, sizeof(smtp) - 1))
+            address += sizeof(smtp) - 1;
 
         if (address)
         {
@@ -169,6 +172,8 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam,
     for (i = 0; i < message->nRecipCount; i++)
     {
         address = message->lpRecips[i].lpszAddress;
+        if (!strncasecmp(address, smtp, sizeof(smtp) - 1))
+            address += sizeof(smtp) - 1;
 
         if (address)
         {
-- 
1.7.3.4


------------e8Ehp0EWD5AyIg6qya9bPo
Content-Disposition: attachment; filename=0001-winemapi-Implement-MAPIResolveName-eterbug-6747.txt
Content-Type: text/plain; name=0001-winemapi-Implement-MAPIResolveName-eterbug-6747.txt
Content-Transfer-Encoding: 7bit



Подробная информация о списке рассылки Wine-patches