diff --git a/reactos/dll/win32/inetcomm/CMakeLists.txt b/reactos/dll/win32/inetcomm/CMakeLists.txt
index 0e0a1c7d589..0e93af8e56b 100644
--- a/reactos/dll/win32/inetcomm/CMakeLists.txt
+++ b/reactos/dll/win32/inetcomm/CMakeLists.txt
@@ -6,6 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(inetcomm.dll inetcomm.spec)
 
 list(APPEND SOURCE
@@ -15,8 +16,8 @@ list(APPEND SOURCE
     mimeintl.c
     mimeole.c
     pop3transport.c
-    regsvr.c
     smtptransport.c
+    inetcomm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/inetcomm_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def)
 
diff --git a/reactos/dll/win32/inetcomm/inetcomm.idl b/reactos/dll/win32/inetcomm/inetcomm.idl
new file mode 100644
index 00000000000..1fba558df5a
--- /dev/null
+++ b/reactos/dll/win32/inetcomm/inetcomm.idl
@@ -0,0 +1,124 @@
+/*
+ * COM Classes for inetcomm
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+[
+    helpstring("CLSID_IMimeBody"),
+    threading(both),
+    uuid(fd853cdb-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IMimeBody { interface IMimeBody; }
+
+[
+    helpstring("CLSID_IMimeAllocator"),
+    threading(both),
+    uuid(fd853cdd-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IMimeAllocator { interface IMimeAllocator; }
+
+[
+    helpstring("CLSID_IMimeSecurity"),
+    threading(both),
+    uuid(fd853cde-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IMimeSecurity { interface IMimeSecurity; }
+
+[
+    helpstring("CLSID_IVirtualStream"),
+    threading(both),
+    uuid(fd853cdf-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IVirtualStream { interface IVirtualStream; }
+
+[
+    helpstring("CLSID_IMimeMessage"),
+    threading(both),
+    uuid(fd853ce3-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IMimeMessage { interface IMimeMessage; }
+
+[
+    helpstring("CLSID_ISMTPTransport"),
+    threading(both),
+    uuid(fd853ce6-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass ISMTPTransport { interface ISMTPTransport; }
+
+[
+    helpstring("CLSID_IPOP3Transport"),
+    threading(both),
+    uuid(fd853ce7-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IPOP3Transport { interface IPOP3Transport; }
+
+[
+    helpstring("CLSID_INNTPTransport"),
+    threading(both),
+    uuid(fd853ce8-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass INNTPTransport { interface INNTPTransport; }
+
+[
+    helpstring("CLSID_IRASTransport"),
+    threading(both),
+    uuid(fd853ce9-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IRASTransport { interface IRASTransport; }
+
+[
+    helpstring("CLSID_IRangeList"),
+    threading(both),
+    uuid(fd853cea-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IRangeList { interface IRangeList; }
+
+[
+    helpstring("CLSID_IIMAPTransport"),
+    threading(both),
+    uuid(fd853ceb-7f86-11d0-8252-00c04fd85ab4)
+]
+coclass IIMAPTransport { interface IIMAPTransport; }
+
+[
+    helpstring("CLSID_IHTTPMailTransport"),
+    threading(both),
+    uuid(5a580c11-e5eb-11d1-a86e-0000f8084f96)
+]
+coclass IHTTPMailTransport { interface IHTTPMailTransport; }
+
+[
+    helpstring("CLSID_ISMTPTransport2"),
+    threading(both),
+    uuid(0df2c7ec-3435-11d0-81d0-00c04fd85ab4)
+]
+coclass ISMTPTransport2 { interface ISMTPTransport2; }
+
+[
+    helpstring("CLSID_IPropFindRequest"),
+    threading(both),
+    uuid(bb847b8a-054a-11d2-a894-0000f8084f96)
+]
+coclass IPropFindRequest { interface IPropFindRequest; }
+
+[
+    helpstring("CLSID_IPropPatchRequest"),
+    threading(both),
+    uuid(ea678830-235d-11d2-a8b6-0000f8084f96)
+]
+coclass IPropPatchRequest { interface IPropPatchRequest; }
diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild
index 3de70d54a5f..e7fefbca667 100644
--- a/reactos/dll/win32/inetcomm/inetcomm.rbuild
+++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild
@@ -14,8 +14,8 @@
 	<file>mimeintl.c</file>
 	<file>mimeole.c</file>
 	<file>pop3transport.c</file>
-	<file>regsvr.c</file>
 	<file>smtptransport.c</file>
+	<file>inetcomm.rc</file>
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ole32</library>
diff --git a/reactos/dll/win32/inetcomm/inetcomm.rc b/reactos/dll/win32/inetcomm/inetcomm.rc
new file mode 100644
index 00000000000..37729d27cf8
--- /dev/null
+++ b/reactos/dll/win32/inetcomm/inetcomm.rc
@@ -0,0 +1 @@
+1 WINE_REGISTRY inetcomm.rgs
diff --git a/reactos/dll/win32/inetcomm/inetcomm.rgs b/reactos/dll/win32/inetcomm/inetcomm.rgs
new file mode 100644
index 00000000000..ea6da6c3331
--- /dev/null
+++ b/reactos/dll/win32/inetcomm/inetcomm.rgs
@@ -0,0 +1,69 @@
+HKCR
+{
+    NoRemove Interface
+    {
+    }
+    NoRemove CLSID
+    {
+        '{FD853CDB-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeBody'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CDD-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeAllocator'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CDE-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeSecurity'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CDF-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IVirtualStream'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CE3-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IMimeMessage'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CE6-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_ISMTPTransport'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CE7-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IPOP3Transport'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CE8-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_INNTPTransport'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CE9-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IRASTransport'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CEA-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IRangeList'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{FD853CEB-7F86-11D0-8252-00C04FD85AB4}' = s 'CLSID_IIMAPTransport'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{5A580C11-E5EB-11D1-A86E-0000F8084F96}' = s 'CLSID_IHTTPMailTransport'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{0DF2C7EC-3435-11D0-81D0-00C04FD85AB4}' = s 'CLSID_ISMTPTransport2'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{BB847B8A-054A-11D2-A894-0000F8084F96}' = s 'CLSID_IPropFindRequest'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+        '{EA678830-235D-11D2-A8B6-0000F8084F96}' = s 'CLSID_IPropPatchRequest'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
+        }
+    }
+}
diff --git a/reactos/dll/win32/inetcomm/inetcomm_main.c b/reactos/dll/win32/inetcomm/inetcomm_main.c
index dac1a5c069d..8f5eca6ecc1 100644
--- a/reactos/dll/win32/inetcomm/inetcomm_main.c
+++ b/reactos/dll/win32/inetcomm/inetcomm_main.c
@@ -27,6 +27,9 @@
 #include "winnt.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "ocidl.h"
+#include "rpcproxy.h"
+#include "initguid.h"
 #include "mimeole.h"
 
 #include "inetcomm_private.h"
@@ -35,6 +38,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
 
+static HINSTANCE instance;
+
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     static IMimeInternational *international;
@@ -47,6 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
         return FALSE;
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hinstDLL);
+        instance = hinstDLL;
         if (!InternetTransport_RegisterClass(hinstDLL))
             return FALSE;
         MimeInternational_Construct(&international);
@@ -66,13 +72,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  */
 typedef struct
 {
-    const struct IClassFactoryVtbl *lpVtbl;
+    IClassFactory IClassFactory_iface;
     HRESULT (*create_object)(IUnknown *, void **);
 } cf;
 
 static inline cf *impl_from_IClassFactory( IClassFactory *iface )
 {
-    return (cf *)((char*)iface - FIELD_OFFSET(cf, lpVtbl));
+    return CONTAINING_RECORD(iface, cf, IClassFactory_iface);
 }
 
 static HRESULT WINAPI cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj )
@@ -135,11 +141,11 @@ static const struct IClassFactoryVtbl cf_vtbl =
     cf_LockServer
 };
 
-static cf mime_body_cf      = { &cf_vtbl, MimeBody_create };
-static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create };
-static cf mime_message_cf   = { &cf_vtbl, MimeMessage_create };
-static cf mime_security_cf  = { &cf_vtbl, MimeSecurity_create };
-static cf virtual_stream_cf = { &cf_vtbl, VirtualStream_create };
+static cf mime_body_cf      = { { &cf_vtbl }, MimeBody_create };
+static cf mime_allocator_cf = { { &cf_vtbl }, MimeAllocator_create };
+static cf mime_message_cf   = { { &cf_vtbl }, MimeMessage_create };
+static cf mime_security_cf  = { { &cf_vtbl }, MimeSecurity_create };
+static cf virtual_stream_cf = { { &cf_vtbl }, VirtualStream_create };
 
 /***********************************************************************
  *              DllGetClassObject (INETCOMM.@)
@@ -164,23 +170,23 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 
     if ( IsEqualCLSID( rclsid, &CLSID_IMimeSecurity ))
     {
-        cf = (IClassFactory*) &mime_security_cf.lpVtbl;
+        cf = &mime_security_cf.IClassFactory_iface;
     }
     else if( IsEqualCLSID( rclsid, &CLSID_IMimeMessage ))
     {
-        cf = (IClassFactory*) &mime_message_cf.lpVtbl;
+        cf = &mime_message_cf.IClassFactory_iface;
     }
     else if( IsEqualCLSID( rclsid, &CLSID_IMimeBody ))
     {
-        cf = (IClassFactory*) &mime_body_cf.lpVtbl;
+        cf = &mime_body_cf.IClassFactory_iface;
     }
     else if( IsEqualCLSID( rclsid, &CLSID_IMimeAllocator ))
     {
-        cf = (IClassFactory*) &mime_allocator_cf.lpVtbl;
+        cf = &mime_allocator_cf.IClassFactory_iface;
     }
     else if( IsEqualCLSID( rclsid, &CLSID_IVirtualStream ))
     {
-        cf = (IClassFactory*) &virtual_stream_cf.lpVtbl;
+        cf = &virtual_stream_cf.IClassFactory_iface;
     }
 
     if ( !cf )
@@ -199,3 +205,19 @@ HRESULT WINAPI DllCanUnloadNow(void)
 {
     return S_FALSE;
 }
+
+/***********************************************************************
+ *		DllRegisterServer (INETCOMM.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( instance );
+}
+
+/***********************************************************************
+ *		DllUnregisterServer (INETCOMM.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return __wine_unregister_resources( instance );
+}
diff --git a/reactos/dll/win32/inetcomm/inetcomm_private.h b/reactos/dll/win32/inetcomm/inetcomm_private.h
index 533c92658df..55aaf47dc25 100644
--- a/reactos/dll/win32/inetcomm/inetcomm_private.h
+++ b/reactos/dll/win32/inetcomm/inetcomm_private.h
@@ -50,35 +50,35 @@ struct InternetTransport
     HWND hwnd;
 };
 
-HRESULT InternetTransport_Init(InternetTransport *This);
-HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer);
+HRESULT InternetTransport_Init(InternetTransport *This) DECLSPEC_HIDDEN;
+HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer) DECLSPEC_HIDDEN;
 HRESULT InternetTransport_InetServerFromAccount(InternetTransport *This,
-    IImnAccount *pAccount, LPINETSERVER pInetServer);
+    IImnAccount *pAccount, LPINETSERVER pInetServer) DECLSPEC_HIDDEN;
 HRESULT InternetTransport_Connect(InternetTransport *This,
-    LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging);
-HRESULT InternetTransport_HandsOffCallback(InternetTransport *This);
-HRESULT InternetTransport_DropConnection(InternetTransport *This);
+    LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging) DECLSPEC_HIDDEN;
+HRESULT InternetTransport_HandsOffCallback(InternetTransport *This) DECLSPEC_HIDDEN;
+HRESULT InternetTransport_DropConnection(InternetTransport *This) DECLSPEC_HIDDEN;
 HRESULT InternetTransport_GetStatus(InternetTransport *This,
-    IXPSTATUS *pCurrentStatus);
-HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status);
+    IXPSTATUS *pCurrentStatus) DECLSPEC_HIDDEN;
+HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status) DECLSPEC_HIDDEN;
 HRESULT InternetTransport_ReadLine(InternetTransport *This,
-    INETXPORT_COMPLETION_FUNCTION fnCompletion);
+    INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN;
 HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData,
-    int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion);
+    int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN;
 HRESULT InternetTransport_DoCommand(InternetTransport *This,
-    LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion);
+    LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN;
 
-BOOL InternetTransport_RegisterClass(HINSTANCE hInstance);
-void InternetTransport_UnregisterClass(HINSTANCE hInstance);
+BOOL InternetTransport_RegisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN;
+void InternetTransport_UnregisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN;
 
-HRESULT MimeBody_create(IUnknown *outer, void **obj);
-HRESULT MimeAllocator_create(IUnknown *outer, void **obj);
-HRESULT MimeMessage_create(IUnknown *outer, void **obj);
-HRESULT MimeSecurity_create(IUnknown *outer, void **obj);
-HRESULT VirtualStream_create(IUnknown *outer, void **obj);
+HRESULT MimeBody_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
+HRESULT MimeAllocator_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
+HRESULT MimeMessage_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
+HRESULT MimeSecurity_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
+HRESULT VirtualStream_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
 
-HRESULT MimeInternational_Construct(IMimeInternational **internat);
+HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDDEN;
 
-HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv);
-HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv);
-HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv);
+HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
+HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
+HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
diff --git a/reactos/dll/win32/inetcomm/mimeintl.c b/reactos/dll/win32/inetcomm/mimeintl.c
index 97b482ed3c7..07d3ae5f038 100644
--- a/reactos/dll/win32/inetcomm/mimeintl.c
+++ b/reactos/dll/win32/inetcomm/mimeintl.c
@@ -49,18 +49,18 @@ typedef struct
 
 typedef struct
 {
-    const IMimeInternationalVtbl *lpVtbl;
+    IMimeInternational IMimeInternational_iface;
     LONG refs;
     CRITICAL_SECTION cs;
 
     struct list charsets;
     LONG next_charset_handle;
     HCHARSET default_charset;
-} internat;
+} internat_impl;
 
-static inline internat *impl_from_IMimeInternational( IMimeInternational *iface )
+static inline internat_impl *impl_from_IMimeInternational(IMimeInternational *iface)
 {
-    return (internat *)((char*)iface - FIELD_OFFSET(internat, lpVtbl));
+    return CONTAINING_RECORD(iface, internat_impl, IMimeInternational_iface);
 }
 
 static inline HRESULT get_mlang(IMultiLanguage **ml)
@@ -85,13 +85,13 @@ static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, RE
 
 static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface )
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     return InterlockedIncrement(&This->refs);
 }
 
 static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface )
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     ULONG refs;
 
     refs = InterlockedDecrement(&This->refs);
@@ -104,6 +104,8 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface )
             list_remove(&charset->entry);
             HeapFree(GetProcessHeap(), 0, charset);
         }
+        This->cs.DebugInfo->Spare[0] = 0;
+        DeleteCriticalSection(&This->cs);
         HeapFree(GetProcessHeap(), 0, This);
     }
 
@@ -112,7 +114,7 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface )
 
 static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
 
     TRACE("(%p)->(%p)\n", iface, hCharset);
 
@@ -126,7 +128,7 @@ static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface,
 
 static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     HRESULT hr = S_OK;
 
     TRACE("(%p)->(%p)\n", iface, phCharset);
@@ -238,7 +240,7 @@ static HCHARSET add_charset(struct list *list, MIMECSETINFO *mlang_info, HCHARSE
 static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset,
                                                LPHCHARSET phCharset)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     HRESULT hr = MIME_E_NOT_FOUND;
     charset_entry *charset;
 
@@ -278,7 +280,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR
 static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset,
                                                   LPINETCSETINFO pCsetInfo)
 {
-    internat *This = impl_from_IMimeInternational( iface );
+    internat_impl *This = impl_from_IMimeInternational( iface );
     HRESULT hr = MIME_E_INVALID_HANDLE;
     charset_entry *charset;
 
@@ -519,20 +521,21 @@ static IMimeInternationalVtbl mime_internat_vtbl =
     MimeInternat_Rfc1522Encode
 };
 
-static internat *global_internat;
+static internat_impl *global_internat;
 
 HRESULT MimeInternational_Construct(IMimeInternational **internat)
 {
     global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat));
-    global_internat->lpVtbl = &mime_internat_vtbl;
+    global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl;
     global_internat->refs = 0;
     InitializeCriticalSection(&global_internat->cs);
+    global_internat->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": global_internat.cs");
 
     list_init(&global_internat->charsets);
     global_internat->next_charset_handle = 0;
     global_internat->default_charset = NULL;
 
-    *internat = (IMimeInternational*)&global_internat->lpVtbl;
+    *internat = &global_internat->IMimeInternational_iface;
 
     IMimeInternational_AddRef(*internat);
     return S_OK;
@@ -542,7 +545,7 @@ HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat)
 {
     TRACE("(%p)\n", internat);
 
-    *internat = (IMimeInternational *)&global_internat->lpVtbl;
+    *internat = &global_internat->IMimeInternational_iface;
     IMimeInternational_AddRef(*internat);
     return S_OK;
 }
diff --git a/reactos/dll/win32/inetcomm/mimeole.c b/reactos/dll/win32/inetcomm/mimeole.c
index f297c2973b4..8a1e3d4d266 100644
--- a/reactos/dll/win32/inetcomm/mimeole.c
+++ b/reactos/dll/win32/inetcomm/mimeole.c
@@ -2134,7 +2134,8 @@ static HRESULT WINAPI MimeMessage_IsContentType(
 {
     HRESULT hr;
     IMimeBody *mime_body;
-    TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, pszPriType, pszSubType);
+    TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, debugstr_a(pszPriType),
+          debugstr_a(pszSubType));
 
     hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body);
     if(FAILED(hr)) return hr;
diff --git a/reactos/dll/win32/inetcomm/pop3transport.c b/reactos/dll/win32/inetcomm/pop3transport.c
index b0e31df6449..af7d1bf91c5 100644
--- a/reactos/dll/win32/inetcomm/pop3transport.c
+++ b/reactos/dll/win32/inetcomm/pop3transport.c
@@ -63,7 +63,6 @@ static HRESULT parse_response(POP3Transport *This)
     switch (This->state)
     {
     case STATE_NONE:
-    {
         if (strlen(This->response) < 3)
         {
             WARN("parse error\n");
@@ -78,7 +77,7 @@ static HRESULT parse_response(POP3Transport *This)
         }
         This->state = STATE_DONE;
         return S_FALSE;
-    }
+
     default: return S_OK;
     }
 }
@@ -92,7 +91,6 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
     switch (This->state)
     {
     case STATE_OK:
-    {
         if (This->type == POP3CMD_GET_POPID)
         {
             if ((p = strchr(This->ptr, ' ')))
@@ -111,9 +109,8 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
         }
         This->state = STATE_MULTILINE;
         return S_OK;
-    }
+
     case STATE_MULTILINE:
-    {
         if (This->response[0] == '.' && !This->response[1])
         {
             This->valid_info = FALSE;
@@ -128,14 +125,12 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
             This->valid_info = TRUE;
             return S_OK;
         }
-    }
+
     default:
-    {
         WARN("parse error\n");
         This->state = STATE_DONE;
         return S_FALSE;
     }
-    }
 }
 
 static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat)
@@ -147,7 +142,6 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat)
     switch (This->state)
     {
     case STATE_OK:
-    {
         if ((p = strchr(This->ptr, ' ')))
         {
             while (*p == ' ') p++;
@@ -156,14 +150,12 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat)
             This->state = STATE_DONE;
             return S_OK;
         }
-    }
+
     default:
-    {
         WARN("parse error\n");
         This->state = STATE_DONE;
         return S_FALSE;
     }
-    }
 }
 
 static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
@@ -175,7 +167,6 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
     switch (This->state)
     {
     case STATE_OK:
-    {
         if (This->type == POP3CMD_GET_POPID)
         {
             if ((p = strchr(This->ptr, ' ')))
@@ -189,9 +180,8 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
         }
         This->state = STATE_MULTILINE;
         return S_OK;
-    }
+
     case STATE_MULTILINE:
-    {
         if (This->response[0] == '.' && !This->response[1])
         {
             This->valid_info = FALSE;
@@ -206,14 +196,12 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
             This->valid_info = TRUE;
             return S_OK;
         }
-    }
+
     default:
-    {
         WARN("parse error\n");
         This->state = STATE_DONE;
         return S_FALSE;
     }
-    }
 }
 
 static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId)
@@ -221,18 +209,15 @@ static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId)
     switch (This->state)
     {
     case STATE_OK:
-    {
         *dwPopId = 0; /* FIXME */
         This->state = STATE_DONE;
         return S_OK;
-    }
+
     default:
-    {
         WARN("parse error\n");
         This->state = STATE_DONE;
         return S_FALSE;
     }
-    }
 }
 
 static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr)
@@ -240,7 +225,6 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr)
     switch (This->state)
     {
     case STATE_OK:
-    {
         retr->fHeader = FALSE;
         retr->fBody = FALSE;
         retr->dwPopId = This->msgid;
@@ -251,7 +235,7 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr)
         This->state = STATE_MULTILINE;
         This->valid_info = FALSE;
         return S_OK;
-    }
+
     case STATE_MULTILINE:
     {
         int len;
@@ -273,13 +257,12 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr)
         This->valid_info = TRUE;
         return S_OK;
     }
+
     default:
-    {
         WARN("parse error\n");
         This->state = STATE_DONE;
         return S_FALSE;
     }
-    }
 }
 
 static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top)
@@ -287,7 +270,6 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top)
     switch (This->state)
     {
     case STATE_OK:
-    {
         top->fHeader = FALSE;
         top->fBody = FALSE;
         top->dwPopId = This->msgid;
@@ -299,7 +281,7 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top)
         This->state = STATE_MULTILINE;
         This->valid_info = FALSE;
         return S_OK;
-    }
+
     case STATE_MULTILINE:
     {
         int len;
@@ -321,13 +303,12 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top)
         This->valid_info = TRUE;
         return S_OK;
     }
+
     default:
-    {
         WARN("parse error\n");
         This->state = STATE_DONE;
         return S_FALSE;
     }
-    }
 }
 
 static void init_parser(POP3Transport *This, POP3COMMAND command, POP3CMDTYPE type)
diff --git a/reactos/dll/win32/inetcomm/regsvr.c b/reactos/dll/win32/inetcomm/regsvr.c
deleted file mode 100644
index 993e9ae9032..00000000000
--- a/reactos/dll/win32/inetcomm/regsvr.c
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- *	self-registerable dll functions for inetcomm.dll
- *
- * Copyright (C) 2003 John K. Hohm
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-#include <stdarg.h>
-#include <string.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "winerror.h"
-#include "objbase.h"
-#include "ocidl.h"
-
-#include "initguid.h"
-#include "mimeole.h"
-#include "inetcomm_private.h"
-
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
-
-/*
- * Near the bottom of this file are the exported DllRegisterServer and
- * DllUnregisterServer, which make all this worthwhile.
- */
-
-/***********************************************************************
- *		interface for self-registering
- */
-struct regsvr_interface
-{
-    IID const *iid;		/* NULL for end of list */
-    LPCSTR name;		/* can be NULL to omit */
-    IID const *base_iid;	/* can be NULL to omit */
-    int num_methods;		/* can be <0 to omit */
-    CLSID const *ps_clsid;	/* can be NULL to omit */
-    CLSID const *ps_clsid32;	/* can be NULL to omit */
-};
-
-static HRESULT register_interfaces(struct regsvr_interface const *list);
-static HRESULT unregister_interfaces(struct regsvr_interface const *list);
-
-struct regsvr_coclass
-{
-    CLSID const *clsid;		/* NULL for end of list */
-    LPCSTR name;		/* can be NULL to omit */
-    LPCSTR ips;			/* can be NULL to omit */
-    LPCSTR ips32;		/* can be NULL to omit */
-    LPCSTR ips32_tmodel;	/* can be NULL to omit */
-    LPCSTR clsid_str;		/* can be NULL to omit */
-    LPCSTR progid;		/* can be NULL to omit */
-};
-
-static HRESULT register_coclasses(struct regsvr_coclass const *list);
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
-
-/***********************************************************************
- *		static string constants
- */
-static WCHAR const interface_keyname[10] = {
-    'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 };
-static WCHAR const base_ifa_keyname[14] = {
-    'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c',
-    'e', 0 };
-static WCHAR const num_methods_keyname[11] = {
-    'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 };
-static WCHAR const ps_clsid_keyname[15] = {
-    'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
-    'i', 'd', 0 };
-static WCHAR const ps_clsid32_keyname[17] = {
-    'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
-    'i', 'd', '3', '2', 0 };
-static WCHAR const clsid_keyname[6] = {
-    'C', 'L', 'S', 'I', 'D', 0 };
-static WCHAR const ips_keyname[13] = {
-    'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
-    0 };
-static WCHAR const ips32_keyname[15] = {
-    'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
-    '3', '2', 0 };
-static WCHAR const progid_keyname[7] = {
-    'P', 'r', 'o', 'g', 'I', 'D', 0 };
-static char const tmodel_valuename[] = "ThreadingModel";
-
-/***********************************************************************
- *		static helper functions
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid);
-static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
-				   WCHAR const *value);
-static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
-				   char const *value);
-
-/***********************************************************************
- *		register_interfaces
- */
-static HRESULT register_interfaces(struct regsvr_interface const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY interface_key;
-
-    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &interface_key, NULL);
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->iid; ++list) {
-	WCHAR buf[39];
-	HKEY iid_key;
-
-	StringFromGUID2(list->iid, buf, 39);
-	res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0,
-			      KEY_READ | KEY_WRITE, NULL, &iid_key, NULL);
-	if (res != ERROR_SUCCESS) goto error_close_interface_key;
-
-	if (list->name) {
-	    res = RegSetValueExA(iid_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)(list->name),
-				 strlen(list->name) + 1);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->base_iid) {
-	    res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (0 <= list->num_methods) {
-	    static WCHAR const fmt[3] = { '%', 'd', 0 };
-	    HKEY key;
-
-	    res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,
-				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-
-	    sprintfW(buf, fmt, list->num_methods);
-	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)buf,
-				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
-	    RegCloseKey(key);
-
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->ps_clsid) {
-	    res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->ps_clsid32) {
-	    res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-    error_close_iid_key:
-	RegCloseKey(iid_key);
-    }
-
-error_close_interface_key:
-    RegCloseKey(interface_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		unregister_interfaces
- */
-static HRESULT unregister_interfaces(struct regsvr_interface const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY interface_key;
-
-    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
-			KEY_READ | KEY_WRITE, &interface_key);
-    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->iid; ++list) {
-	WCHAR buf[39];
-
-	StringFromGUID2(list->iid, buf, 39);
-        res = RegDeleteTreeW(interface_key, buf);
-        if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-    }
-
-    RegCloseKey(interface_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		register_coclasses
- */
-static HRESULT register_coclasses(struct regsvr_coclass const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY coclass_key;
-
-    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
-	WCHAR buf[39];
-	HKEY clsid_key;
-
-	StringFromGUID2(list->clsid, buf, 39);
-	res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
-			      KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
-	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
-	if (list->name) {
-	    res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)(list->name),
-				 strlen(list->name) + 1);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->ips) {
-	    res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->ips32) {
-	    HKEY ips32_key;
-
-	    res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
-				  KEY_READ | KEY_WRITE, NULL,
-				  &ips32_key, NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)list->ips32,
-				 lstrlenA(list->ips32) + 1);
-	    if (res == ERROR_SUCCESS && list->ips32_tmodel)
-		res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
-				     (CONST BYTE*)list->ips32_tmodel,
-				     strlen(list->ips32_tmodel) + 1);
-	    RegCloseKey(ips32_key);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->clsid_str) {
-	    res = register_key_defvalueA(clsid_key, clsid_keyname,
-					 list->clsid_str);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->progid) {
-	    HKEY progid_key;
-
-	    res = register_key_defvalueA(clsid_key, progid_keyname,
-					 list->progid);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0,
-				  NULL, 0, KEY_READ | KEY_WRITE, NULL,
-				  &progid_key, NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = register_key_defvalueW(progid_key, clsid_keyname, buf);
-	    RegCloseKey(progid_key);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-    error_close_clsid_key:
-	RegCloseKey(clsid_key);
-    }
-
-error_close_coclass_key:
-    RegCloseKey(coclass_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		unregister_coclasses
- */
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY coclass_key;
-
-    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
-			KEY_READ | KEY_WRITE, &coclass_key);
-    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
-	WCHAR buf[39];
-
-	StringFromGUID2(list->clsid, buf, 39);
-        res = RegDeleteTreeW(coclass_key, buf);
-        if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
-	if (list->progid) {
-            res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
-            if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-	}
-    }
-
-error_close_coclass_key:
-    RegCloseKey(coclass_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		regsvr_key_guid
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid)
-{
-    WCHAR buf[39];
-
-    StringFromGUID2(guid, buf, 39);
-    return register_key_defvalueW(base, name, buf);
-}
-
-/***********************************************************************
- *		regsvr_key_defvalueW
- */
-static LONG register_key_defvalueW(
-    HKEY base,
-    WCHAR const *name,
-    WCHAR const *value)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegCreateKeyExW(base, name, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-    res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
-			 (lstrlenW(value) + 1) * sizeof(WCHAR));
-    RegCloseKey(key);
-    return res;
-}
-
-/***********************************************************************
- *		regsvr_key_defvalueA
- */
-static LONG register_key_defvalueA(
-    HKEY base,
-    WCHAR const *name,
-    char const *value)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegCreateKeyExW(base, name, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-    res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
-			 lstrlenA(value) + 1);
-    RegCloseKey(key);
-    return res;
-}
-
-/***********************************************************************
- *		coclass list
- */
-static struct regsvr_coclass const coclass_list[] = {
-    {   &CLSID_IHTTPMailTransport,
-	"CLSID_IHTTPMailTransport",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_IPropFindRequest,
-	"CLSID_IPropFindRequest",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_IPropPatchRequest,
-	"CLSID_IPropPatchRequest",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_ISMTPTransport,
-	"CLSID_ISMTPTransport",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_ISMTPTransport2,
-    "CLSID_ISMTPTransport2",
-    NULL,
-    "inetcomm.dll",
-    "Both"
-    },
-    {   &CLSID_IPOP3Transport,
-	"CLSID_IPOP3Transport",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_INNTPTransport,
-	"CLSID_INNTPTransport",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_IRASTransport,
-	"CLSID_IRASTransport",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_IRangeList,
-	"CLSID_IRangeList",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_IIMAPTransport,
-	"CLSID_IIMAPTransport",
-	NULL,
-	"inetcomm.dll",
-	"Both"
-    },
-    {   &CLSID_IMimeBody,
-        "CLSID_IMimeBody",
-        NULL,
-        "inetcomm.dll",
-        "Both"
-    },
-    {   &CLSID_IMimeAllocator,
-        "CLSID_IMimeAllocator",
-        NULL,
-        "inetcomm.dll",
-        "Both"
-    },
-    {   &CLSID_IMimeMessage,
-        "CLSID_IMimeMessage",
-        NULL,
-        "inetcomm.dll",
-        "Both"
-    },
-    {   &CLSID_IMimeSecurity,
-        "CLSID_IMimeSecurity",
-        NULL,
-        "inetcomm.dll",
-        "Both"
-    },
-    {   &CLSID_IVirtualStream,
-        "CLSID_IVirtualStream",
-        NULL,
-        "inetcomm.dll",
-        "Both"
-    },
-    { NULL }			/* list terminator */
-};
-
-/***********************************************************************
- *		interface list
- */
-static struct regsvr_interface const interface_list[] = {
-    { NULL }			/* list terminator */
-};
-
-/***********************************************************************
- *		DllRegisterServer (INETCOMM.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
-    HRESULT hr;
-
-    TRACE("\n");
-
-    hr = register_coclasses(coclass_list);
-    if (SUCCEEDED(hr))
-	hr = register_interfaces(interface_list);
-    return hr;
-}
-
-/***********************************************************************
- *		DllUnregisterServer (INETCOMM.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
-    HRESULT hr;
-
-    TRACE("\n");
-
-    hr = unregister_coclasses(coclass_list);
-    if (SUCCEEDED(hr))
-	hr = unregister_interfaces(interface_list);
-    return hr;
-}
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 32ca11c41b5..dd021e88a42 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -71,7 +71,7 @@ reactos/dll/win32/icmp            # Synced to Wine-0_9_10
 reactos/dll/win32/imaadp32.acm    # Synced to Wine-1.3.37
 reactos/dll/win32/imagehlp        # Autosync
 reactos/dll/win32/imm32           # Autosync
-reactos/dll/win32/inetcomm        # Autosync
+reactos/dll/win32/inetcomm        # Synced to Wine-1.3.37
 reactos/dll/win32/inetmib1        # Autosync
 reactos/dll/win32/initpki         # Autosync
 reactos/dll/win32/inseng          # Synced to Wine-1.3.37