ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[INETCOMM] Sync with Wine 10.0. CORE-20614

Browse Source
This commit is contained in:
Amine Khaldi
2026-06-03 23:45:14 +01:00
parent fe5b75083e
commit e9b001db62
14 changed files with 280 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/win32/inetcomm/CMakeLists.txt
+3 -2
View File
@@ -22,8 +22,9 @@ add_library(inetcomm MODULE
${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def)
set_module_type(inetcomm win32dll)
target_link_libraries(inetcomm uuid wine)
add_importlibs(inetcomm ole32 oleaut32 ws2_32 user32 propsys urlmon msvcrt kernel32 ntdll)
add_idl_reg_scripts(inetcomm registry inetcomm.idl)
target_link_libraries(inetcomm oldnames uuid wine wine_dll_register wine_dll_canunload)
add_importlibs(inetcomm ole32 oleaut32 ws2_32 user32 propsys urlmon msvcrt kernel32_vista kernel32 ntdll)
add_pch(inetcomm precomp.h "${PCH_SKIP_SOURCE}")
add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all)
set_wine_module_FIXME(inetcomm) # CORE-5743: No ARRAY_SIZE and CONST_VTABLE
dll/win32/inetcomm/imaptransport.c
+22 -22
View File
@@ -191,35 +191,35 @@ static HRESULT WINAPI IMAPTransport_Capability(IIMAPTransport *iface,
static HRESULT WINAPI IMAPTransport_Select(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_Examine(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_Create(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_Delete(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR lpszMailboxName, LPSTR lpszNewMailboxName)
{
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxName), debugstr_a(lpszNewMailboxName));
return E_NOTIMPL;
}
@@ -227,21 +227,21 @@ static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam,
static HRESULT WINAPI IMAPTransport_Subscribe(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_Unsubscribe(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
{
FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern)
{
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern));
return E_NOTIMPL;
}
@@ -249,7 +249,7 @@ static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, L
static HRESULT WINAPI IMAPTransport_Lsub(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern)
{
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern));
return E_NOTIMPL;
}
@@ -258,7 +258,7 @@ static HRESULT WINAPI IMAPTransport_Append(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName,
LPSTR lpszMessageFlags, FILETIME ftMessageDateTime, LPSTREAM lpstmMessageToSave)
{
FIXME("(%ld, %ld, %p, %s, %s, %p): stub\n", wParam, lParam, pCBHandler,
FIXME("(%Id, %Id, %p, %s, %s, %p): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszMailboxName), debugstr_a(lpszMessageFlags), lpstmMessageToSave);
return E_NOTIMPL;
}
@@ -266,14 +266,14 @@ static HRESULT WINAPI IMAPTransport_Append(IIMAPTransport *iface,
static HRESULT WINAPI IMAPTransport_Close(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
{
FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler);
FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_Expunge(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
{
FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler);
FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
return E_NOTIMPL;
}
@@ -281,7 +281,7 @@ static HRESULT WINAPI IMAPTransport_Search(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszSearchCriteria,
boolean bReturnUIDs, IRangeList *pMsgRange, boolean bUIDRangeList)
{
FIXME("(%ld, %ld, %p, %s, %d, %p, %d): stub\n", wParam, lParam, pCBHandler,
FIXME("(%Id, %Id, %p, %s, %d, %p, %d): stub\n", wParam, lParam, pCBHandler,
debugstr_a(lpszSearchCriteria), bReturnUIDs, pMsgRange, bUIDRangeList);
return E_NOTIMPL;
}
@@ -289,7 +289,7 @@ static HRESULT WINAPI IMAPTransport_Search(IIMAPTransport *iface,
static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDMsgRange, LPSTR lpszFetchArgs)
{
FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
bUIDMsgRange, debugstr_a(lpszFetchArgs));
return E_NOTIMPL;
}
@@ -297,7 +297,7 @@ static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam,
static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszStoreArgs)
{
FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
bUIDRangeList, debugstr_a(lpszStoreArgs));
return E_NOTIMPL;
}
@@ -305,7 +305,7 @@ static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam,
static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszMailboxName)
{
FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
bUIDRangeList, debugstr_a(lpszMailboxName));
return E_NOTIMPL;
}
@@ -313,33 +313,33 @@ static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, L
static HRESULT WINAPI IMAPTransport_Noop(IIMAPTransport *iface,
WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
{
FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler);
FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_ResizeMsgSeqNumTable(IIMAPTransport *iface, DWORD dwSizeOfMbox)
{
FIXME("(%u): stub\n", dwSizeOfMbox);
FIXME("(%lu): stub\n", dwSizeOfMbox);
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_UpdateSeqNumToUID(IIMAPTransport *iface,
DWORD dwMsgSeqNum, DWORD dwUID)
{
FIXME("(%u, %u): stub\n", dwMsgSeqNum, dwUID);
FIXME("(%lu, %lu): stub\n", dwMsgSeqNum, dwUID);
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_RemoveSequenceNum(IIMAPTransport *iface, DWORD dwDeletedMsgSeqNum)
{
FIXME("(%u): stub\n", dwDeletedMsgSeqNum);
FIXME("(%lu): stub\n", dwDeletedMsgSeqNum);
return E_NOTIMPL;
}
static HRESULT WINAPI IMAPTransport_MsgSeqNumToUID(IIMAPTransport *iface, DWORD dwMsgSeqNum,
DWORD *pdwUID)
{
FIXME("(%u, %p): stub\n", dwMsgSeqNum, pdwUID);
FIXME("(%lu, %p): stub\n", dwMsgSeqNum, pdwUID);
return E_NOTIMPL;
}
@@ -371,7 +371,7 @@ static HRESULT WINAPI IMAPTransport_SetDefaultCBHandler(IIMAPTransport *iface, I
static HRESULT WINAPI IMAPTransport_Status(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
IIMAPCallback *pCBHandler, LPSTR pszMailboxName, LPSTR pszStatusCmdArgs)
{
FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
debugstr_a(pszMailboxName), debugstr_a(pszStatusCmdArgs));
return E_NOTIMPL;
}
dll/win32/inetcomm/inetcomm.rc
-2
View File
@@ -18,5 +18,3 @@
/* @makedep: inetcomm.rgs */
1 WINE_REGISTRY inetcomm.rgs
2 WINE_REGISTRY inetcomm_r.rgs
dll/win32/inetcomm/inetcomm_main.c
+1 -32
View File
@@ -38,23 +38,16 @@
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
static HINSTANCE instance;
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
static IMimeInternational *international;
TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{
#ifndef __REACTOS__
case DLL_WINE_PREATTACH:
return FALSE;
#endif
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL);
instance = hinstDLL;
if (!InternetTransport_RegisterClass(hinstDLL))
return FALSE;
MimeInternational_Construct(&international);
@@ -212,27 +205,3 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
return IClassFactory_QueryInterface( cf, iid, ppv );
}
/***********************************************************************
* DllCanUnloadNow (INETCOMM.@)
*/
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 );
}
dll/win32/inetcomm/inetcomm_private.h
+23 -23
View File
@@ -52,36 +52,36 @@ struct InternetTransport
HWND hwnd;
};
HRESULT InternetTransport_Init(InternetTransport *This) DECLSPEC_HIDDEN;
HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer) DECLSPEC_HIDDEN;
HRESULT InternetTransport_Init(InternetTransport *This);
HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer);
HRESULT InternetTransport_InetServerFromAccount(InternetTransport *This,
IImnAccount *pAccount, LPINETSERVER pInetServer) DECLSPEC_HIDDEN;
IImnAccount *pAccount, LPINETSERVER pInetServer);
HRESULT InternetTransport_Connect(InternetTransport *This,
LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging) DECLSPEC_HIDDEN;
HRESULT InternetTransport_HandsOffCallback(InternetTransport *This) DECLSPEC_HIDDEN;
HRESULT InternetTransport_DropConnection(InternetTransport *This) DECLSPEC_HIDDEN;
LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging);
HRESULT InternetTransport_HandsOffCallback(InternetTransport *This);
HRESULT InternetTransport_DropConnection(InternetTransport *This);
HRESULT InternetTransport_GetStatus(InternetTransport *This,
IXPSTATUS *pCurrentStatus) DECLSPEC_HIDDEN;
HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status) DECLSPEC_HIDDEN;
IXPSTATUS *pCurrentStatus);
HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status);
HRESULT InternetTransport_ReadLine(InternetTransport *This,
INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN;
INETXPORT_COMPLETION_FUNCTION fnCompletion);
HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData,
int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN;
int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion);
HRESULT InternetTransport_DoCommand(InternetTransport *This,
LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN;
LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion);
BOOL InternetTransport_RegisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN;
void InternetTransport_UnregisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN;
BOOL InternetTransport_RegisterClass(HINSTANCE hInstance);
void InternetTransport_UnregisterClass(HINSTANCE hInstance);
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 MimeHtmlProtocol_create(IUnknown *outer, void **obj) 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 MimeHtmlProtocol_create(IUnknown *outer, void **obj);
HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDDEN;
HRESULT MimeInternational_Construct(IMimeInternational **internat);
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;
HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv);
HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv);
HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv);
dll/win32/inetcomm/inetcomm_r.rgs
-73
View File
@@ -1,73 +0,0 @@
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' }
}
'{05300401-BCBC-11D0-85E3-00C04FD85AB4}' = s 'MHTML Asynchronous Pluggable Protocol Handler'
{
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
}
}
}
dll/win32/inetcomm/internettransport.c
+1 -1
View File
@@ -35,7 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
static const WCHAR wszClassName[] = {'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0};
static const WCHAR wszClassName[] = L"ThorConnWndClass";
#define IX_READ (WM_USER + 0)
#define IX_READLINE (WM_USER + 1)
dll/win32/inetcomm/mimeintl.c
+15 -16
View File
@@ -19,7 +19,6 @@
*/
#define COBJMACROS
#define NONAMELESSUNION
#include <stdarg.h>
#include <stdio.h>
@@ -166,7 +165,7 @@ static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface,
HRESULT hr;
MIMECPINFO mlang_cp_info;
TRACE("(%p)->(%d, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset);
TRACE("(%p)->(%ld, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset);
*phCharset = NULL;
@@ -315,7 +314,7 @@ static HRESULT WINAPI MimeInternat_CanConvertCodePages(IMimeInternational *iface
HRESULT hr;
IMultiLanguage *ml;
TRACE("(%p)->(%d, %d)\n", iface, cpiSource, cpiDest);
TRACE("(%p)->(%ld, %ld)\n", iface, cpiSource, cpiDest);
/* Could call mlang.IsConvertINetStringAvailable() to avoid the COM overhead if need be. */
@@ -354,7 +353,7 @@ static HRESULT WINAPI MimeInternat_ConvertBuffer(IMimeInternational *iface, CODE
HRESULT hr;
IMultiLanguage *ml;
TRACE("(%p)->(%d, %d, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead);
TRACE("(%p)->(%ld, %ld, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead);
*pcbRead = 0;
pOut->cbSize = 0;
@@ -404,17 +403,17 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE
int src_len;
IMultiLanguage *ml;
TRACE("(%p)->(%d, %d, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut);
TRACE("(%p)->(%ld, %ld, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut);
switch(pIn->vt)
{
case VT_LPSTR:
if(cpiSource == CP_UNICODE) cpiSource = GetACP();
src_len = strlen(pIn->u.pszVal);
src_len = strlen(pIn->pszVal);
break;
case VT_LPWSTR:
cpiSource = CP_UNICODE;
src_len = lstrlenW(pIn->u.pwszVal) * sizeof(WCHAR);
src_len = lstrlenW(pIn->pwszVal) * sizeof(WCHAR);
break;
default:
return E_INVALIDARG;
@@ -426,37 +425,37 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE
DWORD mode = 0;
UINT in_size = src_len, out_size;
hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size,
hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->pszVal, &in_size,
NULL, &out_size);
if(hr == S_OK) /* S_FALSE means the conversion could not be performed */
{
out_size += (cpiDest == CP_UNICODE) ? sizeof(WCHAR) : sizeof(char);
pOut->u.pszVal = CoTaskMemAlloc(out_size);
if(!pOut->u.pszVal)
pOut->pszVal = CoTaskMemAlloc(out_size);
if(!pOut->pszVal)
hr = E_OUTOFMEMORY;
else
{
mode = 0;
in_size = src_len;
hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size,
(BYTE*)pOut->u.pszVal, &out_size);
hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->pszVal, &in_size,
(BYTE*)pOut->pszVal, &out_size);
if(hr == S_OK)
{
if(cpiDest == CP_UNICODE)
{
pOut->u.pwszVal[out_size / sizeof(WCHAR)] = 0;
pOut->pwszVal[out_size / sizeof(WCHAR)] = 0;
pOut->vt = VT_LPWSTR;
}
else
{
pOut->u.pszVal[out_size] = '\0';
pOut->pszVal[out_size] = '\0';
pOut->vt = VT_LPSTR;
}
}
else
CoTaskMemFree(pOut->u.pszVal);
CoTaskMemFree(pOut->pszVal);
}
}
IMultiLanguage_Release(ml);
@@ -527,7 +526,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat)
global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat));
global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl;
global_internat->refs = 0;
InitializeCriticalSection(&global_internat->cs);
InitializeCriticalSectionEx(&global_internat->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
global_internat->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": global_internat.cs");
list_init(&global_internat->charsets);
dll/win32/inetcomm/mimeole.c
+144 -163
View File
File diff suppressed because it is too large Load Diff
dll/win32/inetcomm/pop3transport.c
+23 -24
View File
@@ -19,7 +19,6 @@
*/
#define COBJMACROS
#define NONAMELESSUNION
#include <stdarg.h>
#include <stdio.h>
@@ -96,7 +95,7 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
if ((p = strchr(This->ptr, ' ')))
{
while (*p == ' ') p++;
sscanf(p, "%u", &uidl->dwPopId);
sscanf(p, "%lu", &uidl->dwPopId);
if ((p = strchr(p, ' ')))
{
while (*p == ' ') p++;
@@ -117,7 +116,7 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
This->state = STATE_DONE;
return S_OK;
}
sscanf(This->response, "%u", &uidl->dwPopId);
sscanf(This->response, "%lu", &uidl->dwPopId);
if ((p = strchr(This->response, ' ')))
{
while (*p == ' ') p++;
@@ -145,7 +144,7 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat)
if ((p = strchr(This->ptr, ' ')))
{
while (*p == ' ') p++;
sscanf(p, "%u %u", &stat->cMessages, &stat->cbMessages);
sscanf(p, "%lu %lu", &stat->cMessages, &stat->cbMessages);
This->valid_info = TRUE;
This->state = STATE_DONE;
return S_OK;
@@ -172,7 +171,7 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
if ((p = strchr(This->ptr, ' ')))
{
while (*p == ' ') p++;
sscanf(p, "%u %u", &list->dwPopId, &list->cbSize);
sscanf(p, "%lu %lu", &list->dwPopId, &list->cbSize);
This->valid_info = TRUE;
}
This->state = STATE_DONE;
@@ -188,11 +187,11 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
This->state = STATE_DONE;
return S_OK;
}
sscanf(This->response, "%u", &list->dwPopId);
sscanf(This->response, "%lu", &list->dwPopId);
if ((p = strchr(This->response, ' ')))
{
while (*p == ' ') p++;
sscanf(p, "%u", &list->cbSize);
sscanf(p, "%lu", &list->cbSize);
This->valid_info = TRUE;
return S_OK;
}
@@ -331,12 +330,12 @@ static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszRespons
{
switch (This->command)
{
case POP3_UIDL: hr = parse_uidl_response(This, &pResponse->u.rUidlInfo); break;
case POP3_STAT: hr = parse_stat_response(This, &pResponse->u.rStatInfo); break;
case POP3_LIST: hr = parse_list_response(This, &pResponse->u.rListInfo); break;
case POP3_DELE: hr = parse_dele_response(This, &pResponse->u.dwPopId); break;
case POP3_RETR: hr = parse_retr_response(This, &pResponse->u.rRetrInfo); break;
case POP3_TOP: hr = parse_top_response(This, &pResponse->u.rTopInfo); break;
case POP3_UIDL: hr = parse_uidl_response(This, &pResponse->rUidlInfo); break;
case POP3_STAT: hr = parse_stat_response(This, &pResponse->rStatInfo); break;
case POP3_LIST: hr = parse_list_response(This, &pResponse->rListInfo); break;
case POP3_DELE: hr = parse_dele_response(This, &pResponse->dwPopId); break;
case POP3_RETR: hr = parse_retr_response(This, &pResponse->rRetrInfo); break;
case POP3_TOP: hr = parse_top_response(This, &pResponse->rTopInfo); break;
default:
This->state = STATE_DONE;
break;
@@ -858,7 +857,7 @@ static HRESULT WINAPI POP3Transport_InitNew(IPOP3Transport *iface,
static HRESULT WINAPI POP3Transport_MarkItem(IPOP3Transport *iface, POP3MARKTYPE marktype,
DWORD dwPopId, boolean fMarked)
{
FIXME("(%u, %u, %d)\n", marktype, dwPopId, fMarked);
FIXME("(%u, %lu, %d)\n", marktype, dwPopId, fMarked);
return E_NOTIMPL;
}
@@ -917,13 +916,13 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas
static HRESULT WINAPI POP3Transport_CommandLIST(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{
static const char list[] = "LIST %u\r\n";
static const char list[] = "LIST %lu\r\n";
static char list_all[] = "LIST\r\n";
POP3Transport *This = (POP3Transport *)iface;
char *command;
int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId);
TRACE("(%u, %lu)\n", cmdtype, dwPopId);
if (dwPopId)
{
@@ -944,12 +943,12 @@ static HRESULT WINAPI POP3Transport_CommandLIST(
static HRESULT WINAPI POP3Transport_CommandTOP(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines)
{
static const char top[] = "TOP %u %u\r\n";
static const char top[] = "TOP %lu %lu\r\n";
POP3Transport *This = (POP3Transport *)iface;
char *command;
int len;
TRACE("(%u, %u, %u)\n", cmdtype, dwPopId, cPreviewLines);
TRACE("(%u, %lu, %lu)\n", cmdtype, dwPopId, cPreviewLines);
len = sizeof(top) + 20 + 2; /* 2 * "4294967296" + "\r\n" */
if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
@@ -1016,13 +1015,13 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface)
static HRESULT WINAPI POP3Transport_CommandUIDL(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{
static const char uidl[] = "UIDL %u\r\n";
static const char uidl[] = "UIDL %lu\r\n";
static char uidl_all[] = "UIDL\r\n";
POP3Transport *This = (POP3Transport *)iface;
char *command;
int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId);
TRACE("(%u, %lu)\n", cmdtype, dwPopId);
if (dwPopId)
{
@@ -1043,12 +1042,12 @@ static HRESULT WINAPI POP3Transport_CommandUIDL(
static HRESULT WINAPI POP3Transport_CommandDELE(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{
static const char dele[] = "DELE %u\r\n";
static const char dele[] = "DELE %lu\r\n";
POP3Transport *This = (POP3Transport *)iface;
char *command;
int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId);
TRACE("(%u, %lu)\n", cmdtype, dwPopId);
len = sizeof(dele) + 10 + 2; /* "4294967296" + "\r\n" */
if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
@@ -1065,12 +1064,12 @@ static HRESULT WINAPI POP3Transport_CommandDELE(
static HRESULT WINAPI POP3Transport_CommandRETR(
IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
{
static const char retr[] = "RETR %u\r\n";
static const char retr[] = "RETR %lu\r\n";
POP3Transport *This = (POP3Transport *)iface;
char *command;
int len;
TRACE("(%u, %u)\n", cmdtype, dwPopId);
TRACE("(%u, %lu)\n", cmdtype, dwPopId);
len = sizeof(retr) + 10 + 2; /* "4294967296" + "\r\n" */
if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
dll/win32/inetcomm/precomp.h
+1 -1
View File
@@ -9,10 +9,10 @@
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#include <windef.h>
#include <winbase.h>
#include <winreg.h>
#include <ole2.h>
#include <mimeole.h>
dll/win32/inetcomm/protocol.c
+42 -61
View File
@@ -17,7 +17,6 @@
*/
#define COBJMACROS
#define NONAMELESSUNION
#include <assert.h>
@@ -25,7 +24,6 @@
#include "inetcomm_private.h"
#include "wine/debug.h"
#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
@@ -59,39 +57,23 @@ typedef struct {
WCHAR url[1];
} MimeHtmlBinding;
static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'};
static const WCHAR mhtml_separatorW[] = {'!','x','-','u','s','c',':'};
static inline LPWSTR heap_strdupW(LPCWSTR str)
{
LPWSTR ret = NULL;
if(str) {
DWORD size;
size = (lstrlenW(str)+1)*sizeof(WCHAR);
ret = heap_alloc(size);
if(ret)
memcpy(ret, str, size);
}
return ret;
}
static const WCHAR mhtml_prefixW[] = L"mhtml:";
static const WCHAR mhtml_separatorW[] = L"!x-usc:";
static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r)
{
const WCHAR *p;
if(_wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW)))
if(wcsnicmp(url, mhtml_prefixW, lstrlenW(mhtml_prefixW)))
return E_FAIL;
r->mhtml = url + ARRAY_SIZE(mhtml_prefixW);
r->mhtml = url + lstrlenW(mhtml_prefixW);
p = wcschr(r->mhtml, '!');
if(p) {
r->mhtml_len = p - r->mhtml;
/* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */
if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW)))
p += ARRAY_SIZE(mhtml_separatorW);
if(!wcsncmp(p, mhtml_separatorW, lstrlenW(mhtml_separatorW)))
p += lstrlenW(mhtml_separatorW);
else
p++;
}else {
@@ -141,7 +123,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag
if(FAILED(hres))
return report_result(protocol, hres);
found = !lstrcmpW(protocol->location, value.u.pwszVal);
found = !lstrcmpW(protocol->location, value.pwszVal);
PropVariantClear(&value);
}while(!found);
}else {
@@ -159,7 +141,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag
value.vt = VT_LPWSTR;
hres = IMimeBody_GetProp(mime_body, "content-type", 0, &value);
if(SUCCEEDED(hres)) {
hres = IInternetProtocolSink_ReportProgress(protocol->sink, BINDSTATUS_MIMETYPEAVAILABLE, value.u.pwszVal);
hres = IInternetProtocolSink_ReportProgress(protocol->sink, BINDSTATUS_MIMETYPEAVAILABLE, value.pwszVal);
PropVariantClear(&value);
}
@@ -230,7 +212,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@@ -240,14 +222,14 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) {
if(This->protocol)
IInternetProtocol_Release(&This->protocol->IInternetProtocol_iface);
if(This->stream)
IStream_Release(This->stream);
heap_free(This);
free(This);
}
return ref;
@@ -258,7 +240,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
{
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
TRACE("(%p)->(%x %p)\n", This, dwReserved, pib);
TRACE("(%p)->(%lx %p)\n", This, dwReserved, pib);
assert(!This->stream);
return CreateStreamOnHGlobal(NULL, TRUE, &This->stream);
@@ -278,7 +260,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
TRACE("(%p)->(%u/%u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText));
TRACE("(%p)->(%lu/%lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText));
return S_OK;
}
@@ -287,7 +269,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
IMimeMessage *mime_message = NULL;
TRACE("(%p)->(%x %s)\n", This, hresult, debugstr_w(szError));
TRACE("(%p)->(%lx %s)\n", This, hresult, debugstr_w(szError));
if(SUCCEEDED(hresult)) {
hresult = load_mime_message(This->stream, &mime_message);
@@ -333,7 +315,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
assert(pstgmed->tymed == TYMED_ISTREAM);
while(1) {
hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read);
hres = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read);
if(FAILED(hres))
return hres;
if(!read)
@@ -402,7 +384,7 @@ static ULONG WINAPI MimeHtmlProtocol_AddRef(IUnknown *iface)
MimeHtmlProtocol *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@@ -412,15 +394,15 @@ static ULONG WINAPI MimeHtmlProtocol_Release(IUnknown *iface)
MimeHtmlProtocol *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%x\n", This, ref);
TRACE("(%p) ref=%lx\n", This, ref);
if(!ref) {
if(This->sink)
IInternetProtocolSink_Release(This->sink);
if(This->stream)
IStream_Release(This->stream);
heap_free(This->location);
heap_free(This);
free(This->location);
free(This);
}
return ref;
@@ -469,26 +451,26 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH
IMoniker *mon;
HRESULT hres;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved);
TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved);
hres = parse_mhtml_url(szUrl, &url);
if(FAILED(hres))
return hres;
if(url.location && !(This->location = heap_strdupW(url.location)))
if(url.location && !(This->location = wcsdup(url.location)))
return E_OUTOFMEMORY;
hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo);
if(FAILED(hres)) {
WARN("GetBindInfo failed: %08x\n", hres);
WARN("GetBindInfo failed: %08lx\n", hres);
return hres;
}
if((bindf & (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE)) != (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE))
FIXME("unsupported bindf %x\n", bindf);
FIXME("unsupported bindf %lx\n", bindf);
IInternetProtocolSink_AddRef(This->sink = pOIProtSink);
binding = heap_alloc(FIELD_OFFSET(MimeHtmlBinding, url[url.mhtml_len+1]));
binding = malloc(FIELD_OFFSET(MimeHtmlBinding, url[url.mhtml_len+1]));
if(!binding)
return E_OUTOFMEMORY;
memcpy(binding->url, url.mhtml, url.mhtml_len*sizeof(WCHAR));
@@ -496,7 +478,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH
hres = CreateURLMoniker(NULL, binding->url, &mon);
if(FAILED(hres)) {
heap_free(binding);
free(binding);
return hres;
}
@@ -538,14 +520,14 @@ static HRESULT WINAPI MimeHtmlProtocol_Continue(IInternetProtocol *iface, PROTOC
static HRESULT WINAPI MimeHtmlProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return E_NOTIMPL;
}
static HRESULT WINAPI MimeHtmlProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK;
}
@@ -569,7 +551,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Read(IInternetProtocol *iface, void* pv,
ULONG read = 0;
HRESULT hres;
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
hres = IStream_Read(This->stream, pv, cb, &read);
if(pcbRead)
@@ -584,14 +566,14 @@ static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTE
DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
static HRESULT WINAPI MimeHtmlProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d)\n", This, dwOptions);
FIXME("(%p)->(%ld)\n", This, dwOptions);
return S_OK;
}
@@ -646,7 +628,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_ParseUrl(IInternetProtocolInfo *iface
DWORD* pcchResult, DWORD dwReserved)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
FIXME("(%p)->(%s %d %x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction,
FIXME("(%p)->(%s %d %lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), ParseAction,
dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
return INET_E_DEFAULT_ACTION;
}
@@ -656,12 +638,12 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
DWORD cchResult, DWORD* pcchResult, DWORD dwReserved)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
size_t len = ARRAY_SIZE(mhtml_prefixW);
size_t len = lstrlenW(mhtml_prefixW);
mhtml_url_t url;
WCHAR *p;
HRESULT hres;
TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl),
TRACE("(%p)->(%s %s %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzBaseUrl),
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
pcchResult, dwReserved);
@@ -669,27 +651,26 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
if(FAILED(hres))
return hres;
if(!_wcsnicmp(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) {
if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, len)) {
FIXME("Relative URL is mhtml protocol\n");
return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
}
len += url.mhtml_len;
if(*pwzRelativeUrl)
len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW);
len += lstrlenW(pwzRelativeUrl) + lstrlenW(mhtml_separatorW);
if(len >= cchResult) {
*pcchResult = 0;
return E_FAIL;
}
memcpy(pwzResult, mhtml_prefixW, sizeof(mhtml_prefixW));
p = pwzResult + ARRAY_SIZE(mhtml_prefixW);
lstrcpyW(pwzResult, mhtml_prefixW);
p = pwzResult + lstrlenW(mhtml_prefixW);
memcpy(p, url.mhtml, url.mhtml_len*sizeof(WCHAR));
p += url.mhtml_len;
if(*pwzRelativeUrl) {
memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW));
p += ARRAY_SIZE(mhtml_separatorW);
lstrcpyW(p, pwzRelativeUrl);
lstrcpyW(p, mhtml_separatorW);
lstrcatW(p, pwzRelativeUrl);
}else {
*p = 0;
}
@@ -702,7 +683,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CompareUrl(IInternetProtocolInfo *ifa
LPCWSTR pwzUrl2, DWORD dwCompareFlags)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
FIXME("(%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
FIXME("(%p)->(%s %s %08lx)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
return E_NOTIMPL;
}
@@ -711,7 +692,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInfo(IInternetProtocolInfo *ifac
DWORD dwReserved)
{
MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
FIXME("(%p)->(%s %08x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
cbBuffer, pcbBuf, dwReserved);
return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
}
@@ -730,7 +711,7 @@ HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj)
{
MimeHtmlProtocol *protocol;
protocol = heap_alloc(sizeof(*protocol));
protocol = malloc(sizeof(*protocol));
if(!protocol)
return E_OUTOFMEMORY;
dll/win32/inetcomm/smtptransport.c
+4 -4
View File
@@ -478,7 +478,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char
for (; This->ulCurrentAddressIndex < This->pending_message.rAddressList.cAddress; This->ulCurrentAddressIndex++)
{
TRACE("address[%d]: %s\n", This->ulCurrentAddressIndex,
TRACE("address[%ld]: %s\n", This->ulCurrentAddressIndex,
This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail);
if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
@@ -685,13 +685,13 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface,
{
if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_FROM)
{
TRACE("address[%d]: ADDR_FROM, %s\n", i,
TRACE("address[%ld]: ADDR_FROM, %s\n", i,
pMessage->rAddressList.prgAddress[i].szEmail);
pszFromAddress = pMessage->rAddressList.prgAddress[i].szEmail;
}
else if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
{
TRACE("address[%d]: ADDR_TO, %s\n", i,
TRACE("address[%ld]: ADDR_TO, %s\n", i,
pMessage->rAddressList.prgAddress[i].szEmail);
}
}
@@ -891,7 +891,7 @@ static HRESULT WINAPI SMTPTransport_CommandDOT(ISMTPTransport2 *iface)
static HRESULT WINAPI SMTPTransport_SendDataStream(ISMTPTransport2 *iface,
IStream *pStream, ULONG cbSize)
{
FIXME("(%p, %d)\n", pStream, cbSize);
FIXME("(%p, %ld)\n", pStream, cbSize);
return E_NOTIMPL;
}
media/doc/WINESYNC.txt
+1 -1
View File
@@ -91,7 +91,7 @@ dll/win32/iccvid # Synced to WineStaging-4.0
dll/win32/ieframe # Synced to WineStaging-4.18
dll/win32/imaadp32.acm # Synced to WineStaging-4.0
dll/win32/imagehlp # Synced to WineStaging-4.18
dll/win32/inetcomm # Synced to WineStaging-4.18
dll/win32/inetcomm # Synced to Wine-10.0
dll/win32/inetmib1 # Synced to WineStaging-4.18
dll/win32/initpki # Synced to WineStaging-4.18
dll/win32/inseng # Synced to WineStaging-4.18