October 2008 - Wine-commits

Hans Leidekker : inetcomm: Implement IPOP3Transport::Disconnect.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 4707548adcd65ddb966f0aac1cc136d708d1aa6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4707548adcd65ddb966f0aac1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 31 13:52:51 2008 +0100 inetcomm: Implement IPOP3Transport::Disconnect. --- dlls/inetcomm/pop3transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 36c7190..1cc8aa9 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -359,8 +359,8 @@ static HRESULT WINAPI POP3Transport_HandsOffCallback(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_Disconnect(IPOP3Transport *iface) { - FIXME("()\n"); - return E_NOTIMPL; + TRACE("()\n"); + return IPOP3Transport_CommandQUIT(iface); } static HRESULT WINAPI POP3Transport_DropConnection(IPOP3Transport *iface)

1 0

Hans Leidekker : inetcomm: Add an implementation of IPOP3Transport:: CommandSTAT.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: f136c22b614e18c4d93d6ec751398fe1d6575b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f136c22b614e18c4d93d6ec75… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 31 13:52:31 2008 +0100 inetcomm: Add an implementation of IPOP3Transport::CommandSTAT. --- dlls/inetcomm/pop3transport.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 09a60bc..a26a3b9 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -97,6 +97,32 @@ static void POP3Transport_CallbackRecvLISTResp(IInternetTransport *iface, char * InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessLISTResp); } +static void POP3Transport_CallbackProcessSTATResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvSTATResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessSTATResp); +} + static void POP3Transport_CallbackProcessPASSResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { POP3Transport *This = (POP3Transport *)iface; @@ -407,8 +433,14 @@ static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) { - FIXME("()\n"); - return E_NOTIMPL; + static char stat[] = "STAT\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + + This->command = POP3_STAT; + InternetTransport_DoCommand(&This->InetTransport, stat, POP3Transport_CallbackRecvSTATResp); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface)

1 0

Hans Leidekker : inetcomm: Add an implementation of IPOP3Transport:: CommandUIDL.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 0fce856d4a7068c8eba9c948a2a0b0d7077c6b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fce856d4a7068c8eba9c948a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 31 13:52:43 2008 +0100 inetcomm: Add an implementation of IPOP3Transport::CommandUIDL. --- dlls/inetcomm/pop3transport.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index a26a3b9..36c7190 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -97,6 +97,32 @@ static void POP3Transport_CallbackRecvLISTResp(IInternetTransport *iface, char * InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessLISTResp); } +static void POP3Transport_CallbackProcessUIDLResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvUIDLResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessUIDLResp); +} + static void POP3Transport_CallbackProcessSTATResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { POP3Transport *This = (POP3Transport *)iface; @@ -458,8 +484,14 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) static HRESULT WINAPI POP3Transport_CommandUIDL( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - FIXME("(%u, %u)\n", cmdtype, dwPopId); - return E_NOTIMPL; + static char uidl[] = "UIDL\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("(%u, %u)\n", cmdtype, dwPopId); + + This->command = POP3_UIDL; + InternetTransport_DoCommand(&This->InetTransport, uidl, POP3Transport_CallbackRecvUIDLResp); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandDELE(

1 0

Hans Leidekker : inetcomm: Add an implementation of IPOP3Transport:: CommandQUIT.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: d810887b05b7ef205a77f4442742986a453a679a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d810887b05b7ef205a77f4442… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 31 13:52:20 2008 +0100 inetcomm: Add an implementation of IPOP3Transport::CommandQUIT. --- dlls/inetcomm/pop3transport.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 29f1978..09a60bc 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -185,6 +185,33 @@ static void POP3Transport_CallbackSendUSERCmd(IInternetTransport *iface, char *p HeapFree(GetProcessHeap(), 0, command); } +static void POP3Transport_CallbackProcessQUITResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("%s\n", debugstr_an(pBuffer, cbBuffer)); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + InternetTransport_DropConnection(&This->InetTransport); +} + +static void POP3Transport_CallbackRecvQUITResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessQUITResponse); +} + static HRESULT WINAPI POP3Transport_QueryInterface(IPOP3Transport *iface, REFIID riid, void **ppv) { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); @@ -369,8 +396,13 @@ static HRESULT WINAPI POP3Transport_CommandTOP( static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) { - FIXME("()\n"); - return E_NOTIMPL; + static char command[] = "QUIT\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("()\n"); + + This->command = POP3_QUIT; + return InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvQUITResp); } static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface)

1 0

Hans Leidekker : inetcomm: Add an implementation of IPOP3Transport:: CommandLIST.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 9b8e2e20d58f87f586e8b8cfb02eb2184402cd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8e2e20d58f87f586e8b8cfb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 31 13:52:11 2008 +0100 inetcomm: Add an implementation of IPOP3Transport::CommandLIST. --- dlls/inetcomm/pop3transport.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 3a030a1..29f1978 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -71,6 +71,32 @@ static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszRespons return S_OK; } +static void POP3Transport_CallbackProcessLISTResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvLISTResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessLISTResp); +} + static void POP3Transport_CallbackProcessPASSResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { POP3Transport *This = (POP3Transport *)iface; @@ -324,8 +350,14 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas static HRESULT WINAPI POP3Transport_CommandLIST( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - FIXME("(%u, %u)\n", cmdtype, dwPopId); - return E_NOTIMPL; + static char list[] = "LIST\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("(%u, %u)\n", cmdtype, dwPopId); + + This->command = POP3_LIST; + InternetTransport_DoCommand(&This->InetTransport, list, POP3Transport_CallbackRecvLISTResp); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandTOP(

1 0

Hans Leidekker : inetcomm: Add an implementation of the pop3 USER and PASS commands.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 567b8cb3bf3b99a13cc6032154ba2905a307276b URL: http://source.winehq.org/git/wine.git/?a=commit;h=567b8cb3bf3b99a13cc603215… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 31 13:51:59 2008 +0100 inetcomm: Add an implementation of the pop3 USER and PASS commands. --- dlls/inetcomm/pop3transport.c | 125 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 123 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 6537430..3a030a1 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -39,8 +39,126 @@ typedef struct { InternetTransport InetTransport; ULONG refs; + INETSERVER server; + POP3COMMAND command; } POP3Transport; +static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszResponse, POP3RESPONSE *pResponse) +{ + TRACE("response: %s\n", debugstr_a(pszResponse)); + + pResponse->command = This->command; + pResponse->fDone = TRUE; /* FIXME */ + + if (!memcmp(pszResponse, "+OK", 3)) + pResponse->rIxpResult.hrResult = S_OK; + else + pResponse->rIxpResult.hrResult = S_FALSE; + + pResponse->rIxpResult.pszResponse = pszResponse; + pResponse->rIxpResult.uiServerError = 0; + pResponse->rIxpResult.hrServerError = pResponse->rIxpResult.hrResult; + pResponse->rIxpResult.dwSocketError = 0; + pResponse->pTransport = (IPOP3Transport *)&This->InetTransport.u.vtblPOP3; + pResponse->fValidInfo = FALSE; /* FIXME */ + + if (This->InetTransport.pCallback && This->InetTransport.fCommandLogging) + { + ITransportCallback_OnCommand(This->InetTransport.pCallback, CMD_RESP, + pResponse->rIxpResult.pszResponse, pResponse->rIxpResult.hrServerError, + (IInternetTransport *)&This->InetTransport.u.vtbl); + } + return S_OK; +} + +static void POP3Transport_CallbackProcessPASSResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + InternetTransport_ChangeStatus(&This->InetTransport, IXP_AUTHORIZED); + InternetTransport_ChangeStatus(&This->InetTransport, IXP_CONNECTED); + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvPASSResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessPASSResp); +} + +static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + static char pass[] = "PASS "; + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + char *command; + int len; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + + len = sizeof(pass) + strlen(This->server.szPassword) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, pass); + strcat(command, This->server.szPassword); + strcat(command, "\r\n"); + + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); + HeapFree(GetProcessHeap(), 0, command); +} + +static void POP3Transport_CallbackRecvUSERResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessUSERResp); +} + +static void POP3Transport_CallbackSendUSERCmd(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + static char user[] = "USER "; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("\n"); + + len = sizeof(user) + strlen(This->server.szUserName) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, user); + strcat(command, This->server.szUserName); + strcat(command, "\r\n"); + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); + + HeapFree(GetProcessHeap(), 0, command); +} + static HRESULT WINAPI POP3Transport_QueryInterface(IPOP3Transport *iface, REFIID riid, void **ppv) { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); @@ -118,9 +236,12 @@ static HRESULT WINAPI POP3Transport_Connect(IPOP3Transport *iface, TRACE("(%p, %s, %s)\n", pInetServer, fAuthenticate ? "TRUE" : "FALSE", fCommandLogging ? "TRUE" : "FALSE"); hr = InternetTransport_Connect(&This->InetTransport, pInetServer, fAuthenticate, fCommandLogging); + if (FAILED(hr)) + return hr; - FIXME("continue state machine here\n"); - return hr; + This->command = POP3_USER; + This->server = *pInetServer; + return InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackSendUSERCmd); } static HRESULT WINAPI POP3Transport_HandsOffCallback(IPOP3Transport *iface)

1 0

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: CommandRSET.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: 7b0bbc4dd62541e2313c63c7d4086baca1c211ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0bbc4dd62541e2313c63c7d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:51:47 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandRSET. --- dlls/inetcomm/smtptransport.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index 014fd8b..9e0a278 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -833,8 +833,12 @@ static HRESULT WINAPI SMTPTransport_CommandQUIT(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandRSET(ISMTPTransport2 *iface) { - FIXME("()\n"); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + + return InternetTransport_DoCommand(&This->InetTransport, "RSET\n", + SMTPTransport_CallbackReadResponseDoNothing); } static HRESULT WINAPI SMTPTransport_CommandDATA(ISMTPTransport2 *iface)

1 0

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: CommandAUTH.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: a48b5387cf8ebe12f0981159b532d97a184c59d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48b5387cf8ebe12f0981159b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:51:35 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandAUTH. --- dlls/inetcomm/smtptransport.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index c5b8c53..014fd8b 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -796,8 +796,28 @@ static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, LPSTR pszAuthType) { - FIXME("(%s)\n", pszAuthType); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "AUTH %s\n"; + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszAuthType); + HRESULT hr; + + TRACE("(%s)\n", pszAuthType); + + if (!pszAuthType) + return E_INVALIDARG; + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, pszAuthType); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadResponseDoNothing); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; } static HRESULT WINAPI SMTPTransport_CommandQUIT(ISMTPTransport2 *iface)

1 0

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: CommandHELO.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: d9c4f5fc50eaca69448ff11a5605f56887044179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c4f5fc50eaca69448ff11a5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:51:25 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandHELO. --- dlls/inetcomm/smtptransport.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index ee467c6..c5b8c53 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -771,8 +771,26 @@ static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) { - FIXME("()\n"); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "HELO %s\n"; + const char szHostname[] = "localhost"; /* FIXME */ + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); + HRESULT hr; + + TRACE("()\n"); + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, szHostname); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadResponseDoNothing); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; } static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface,

1 0

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: CommandEHLO.
by Alexandre Julliard 31 Oct '08

31 Oct '08

Module: wine Branch: master Commit: c445e4f68e6c3a39f4082337605aba6183458bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c445e4f68e6c3a39f40823376… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:51:14 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandEHLO. --- dlls/inetcomm/smtptransport.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index 42db262..ee467c6 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -110,6 +110,19 @@ static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszRespons return S_OK; } +static void SMTPTransport_CallbackDoNothing(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + TRACE("\n"); +} + +static void SMTPTransport_CallbackReadResponseDoNothing(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackDoNothing); +} + static void SMTPTransport_CallbackProcessMAILResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) { SMTPTransport *This = (SMTPTransport *)iface; @@ -734,8 +747,26 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) { - FIXME("\n"); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "EHLO %s\n"; + const char szHostname[] = "localhost"; /* FIXME */ + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); + HRESULT hr; + + TRACE("\n"); + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, szHostname); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadResponseDoNothing); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; } static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface)

1 0