Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INETCOMM] Sync with Wine Staging 4.0. CORE-15682

Browse source
This commit is contained in:
Amine Khaldi 2019-01-26 13:10:33 +01:00
parent c0deab6d9d
commit 4973a53fc3
3 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dll/win32/inetcomm/mimeole.c
View file

@ -822,16 +822,21 @@ static void empty_param_list(struct list *list)
} }
} }
static void free_header(header_t *header)
{
list_remove(&header->entry);
PropVariantClear(&header->value);
empty_param_list(&header->params);
heap_free(header);
}
static void empty_header_list(struct list *list) static void empty_header_list(struct list *list)
{ {
header_t *header, *cursor2; header_t *header, *cursor2;
LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry)
{ {
list_remove(&header->entry); free_header(header);
PropVariantClear(&header->value);
empty_param_list(&header->params);
HeapFree(GetProcessHeap(), 0, header);
} }
} }
@ -1235,8 +1240,7 @@ static HRESULT WINAPI MimeBody_DeleteProp(
if(found) if(found)
{ {
list_remove(&cursor->entry); free_header(cursor);
HeapFree(GetProcessHeap(), 0, cursor);
return S_OK; return S_OK;
} }
} }

20
dll/win32/inetcomm/smtptransport.c
View file

@ -281,7 +281,7 @@ static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBu
HRESULT hr; HRESULT hr;
const char *pszHello; const char *pszHello;
char *pszCommand; char *pszCommand;
const char szHostName[] = "localhost"; /* FIXME */ static const char szHostName[] = "localhost"; /* FIXME */
TRACE("\n"); TRACE("\n");
@ -483,7 +483,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char
if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
{ {
const char szCommandFormat[] = "RCPT TO: <%s>\n"; static const char szCommandFormat[] = "RCPT TO: <%s>\n";
char *szCommand; char *szCommand;
int len = sizeof(szCommandFormat) - 2 /* "%s" */ + int len = sizeof(szCommandFormat) - 2 /* "%s" */ +
strlen(This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); strlen(This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail);
@ -659,10 +659,10 @@ static HRESULT WINAPI SMTPTransport_InitNew(ISMTPTransport2 *iface,
static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface,
LPSMTPMESSAGE pMessage) LPSMTPMESSAGE pMessage)
{ {
static const char szCommandFormat[] = "MAIL FROM: <%s>\n";
SMTPTransport *This = (SMTPTransport *)iface; SMTPTransport *This = (SMTPTransport *)iface;
ULONG i, size; ULONG i, size;
LPSTR pszFromAddress = NULL; LPSTR pszFromAddress = NULL;
const char szCommandFormat[] = "MAIL FROM: <%s>\n";
char *szCommand; char *szCommand;
int len; int len;
HRESULT hr; HRESULT hr;
@ -723,8 +723,8 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface,
static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom) static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom)
{ {
static const char szCommandFormat[] = "MAIL FROM: <%s>\n";
SMTPTransport *This = (SMTPTransport *)iface; SMTPTransport *This = (SMTPTransport *)iface;
const char szCommandFormat[] = "MAIL FROM: <%s>\n";
char *szCommand; char *szCommand;
int len; int len;
HRESULT hr; HRESULT hr;
@ -750,8 +750,8 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps
static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo) static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo)
{ {
static const char szCommandFormat[] = "RCPT TO: <%s>\n";
SMTPTransport *This = (SMTPTransport *)iface; SMTPTransport *This = (SMTPTransport *)iface;
const char szCommandFormat[] = "RCPT TO: <%s>\n";
char *szCommand; char *szCommand;
int len; int len;
HRESULT hr; HRESULT hr;
@ -777,9 +777,9 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps
static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface)
{ {
static const char szCommandFormat[] = "EHLO %s\n";
static const char szHostname[] = "localhost"; /* FIXME */
SMTPTransport *This = (SMTPTransport *)iface; SMTPTransport *This = (SMTPTransport *)iface;
const char szCommandFormat[] = "EHLO %s\n";
const char szHostname[] = "localhost"; /* FIXME */
char *szCommand; char *szCommand;
int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname);
HRESULT hr; HRESULT hr;
@ -801,9 +801,9 @@ static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface)
static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface)
{ {
static const char szCommandFormat[] = "HELO %s\n";
static const char szHostname[] = "localhost"; /* FIXME */
SMTPTransport *This = (SMTPTransport *)iface; SMTPTransport *This = (SMTPTransport *)iface;
const char szCommandFormat[] = "HELO %s\n";
const char szHostname[] = "localhost"; /* FIXME */
char *szCommand; char *szCommand;
int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname);
HRESULT hr; HRESULT hr;
@ -826,8 +826,8 @@ static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface)
static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface,
LPSTR pszAuthType) LPSTR pszAuthType)
{ {
static const char szCommandFormat[] = "AUTH %s\n";
SMTPTransport *This = (SMTPTransport *)iface; SMTPTransport *This = (SMTPTransport *)iface;
const char szCommandFormat[] = "AUTH %s\n";
char *szCommand; char *szCommand;
int len; int len;
HRESULT hr; HRESULT hr;

2
media/doc/README.WINE
View file

@ -78,7 +78,7 @@ reactos/dll/win32/ieframe # Synced to WineStaging-4.0
reactos/dll/win32/imaadp32.acm # Synced to WineStaging-4.0 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-4.0
reactos/dll/win32/imagehlp # Synced to WineStaging-3.3 reactos/dll/win32/imagehlp # Synced to WineStaging-3.3
reactos/dll/win32/imm32 # Synced to WineStaging-4.0 reactos/dll/win32/imm32 # Synced to WineStaging-4.0
reactos/dll/win32/inetcomm # Synced to WineStaging-3.17 reactos/dll/win32/inetcomm # Synced to WineStaging-4.0
reactos/dll/win32/inetmib1 # Synced to WineStaging-3.17 reactos/dll/win32/inetmib1 # Synced to WineStaging-3.17
reactos/dll/win32/initpki # Synced to WineStaging-3.3 reactos/dll/win32/initpki # Synced to WineStaging-3.3
reactos/dll/win32/inseng # Synced to WineStaging-3.3 reactos/dll/win32/inseng # Synced to WineStaging-3.3