[INETCOMM] Sync with Wine 3.0. CORE-14225

[reactos.git] / dll / win32 / inetcomm / smtptransport.c

diff --git a/dll/win32/inetcomm/smtptransport.c b/dll/win32/inetcomm/smtptransport.c
index 42a6927..b3b60f3 100644 (file)
--- a/dll/win32/inetcomm/smtptransport.c
+++ b/dll/win32/inetcomm/smtptransport.c
@@ -20,27 +20,8 @@
  *
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnt.h"
-//#include "winuser.h"
-#include <objbase.h>
-#include <mimeole.h>
-#include <wine/debug.h>
-
 #include "inetcomm_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
-
 typedef struct
 {
     InternetTransport InetTransport;
@@ -63,13 +44,7 @@ static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszRespons
     pResponse->rIxpResult.pszResponse = pszResponse;
     pResponse->rIxpResult.dwSocketError = 0;
     pResponse->rIxpResult.uiServerError = strtol(pszResponse, &pszResponse, 10);
-    if (*pszResponse == '-')
-    {
-        pResponse->fDone = FALSE;
-        pszResponse++;
-    }
-    else
-        pResponse->fDone = TRUE;
+    pResponse->fDone = (*pszResponse != '-');
 
     switch (pResponse->rIxpResult.uiServerError)
     {
@@ -536,7 +511,7 @@ static HRESULT WINAPI SMTPTransport_QueryInterface(ISMTPTransport2 *iface, REFII
         IsEqualIID(riid, &IID_ISMTPTransport2))
     {
         *ppv = iface;
-        IUnknown_AddRef(iface);
+        ISMTPTransport2_AddRef(iface);
         return S_OK;
     }
     *ppv = NULL;
@@ -993,7 +968,7 @@ static HRESULT WINAPI SMTPTransportCF_QueryInterface(LPCLASSFACTORY iface,
     if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory))
     {
         *ppv = iface;
-        IUnknown_AddRef(iface);
+        IClassFactory_AddRef(iface);
         return S_OK;
     }
     return E_NOINTERFACE;