ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inetcomm: Build with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-06 09:01:34 +02:00
parent 700910be7c
commit afc721f0f1
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/inetcomm/Makefile.in
View File

@ -2,6 +2,8 @@ MODULE = inetcomm.dll
IMPORTLIB = inetcomm IMPORTLIB = inetcomm
IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
imaptransport.c \ imaptransport.c \
inetcomm_main.c \ inetcomm_main.c \

3
dlls/inetcomm/mimeintl.c
View File

@ -34,7 +34,6 @@
#include "mlang.h" #include "mlang.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "inetcomm_private.h" #include "inetcomm_private.h"
@ -415,7 +414,7 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE
break; break;
case VT_LPWSTR: case VT_LPWSTR:
cpiSource = CP_UNICODE; cpiSource = CP_UNICODE;
src_len = strlenW(pIn->u.pwszVal) * sizeof(WCHAR); src_len = lstrlenW(pIn->u.pwszVal) * sizeof(WCHAR);
break; break;
default: default:
return E_INVALIDARG; return E_INVALIDARG;

5
dlls/inetcomm/mimeole.c
View File

@ -37,7 +37,6 @@
#include "wine/heap.h" #include "wine/heap.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "inetcomm_private.h" #include "inetcomm_private.h"
@ -3713,13 +3712,13 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx
TRACE("display name %s\n", debugstr_w(display_name)); TRACE("display name %s\n", debugstr_w(display_name));
len = strlenW(display_name); len = lstrlenW(display_name);
mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW)); mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW));
if(!mhtml_url) if(!mhtml_url)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW));
strcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); lstrcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name);
HeapFree(GetProcessHeap(), 0, display_name); HeapFree(GetProcessHeap(), 0, display_name);
hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new);

19
dlls/inetcomm/protocol.c
View File

@ -26,7 +26,6 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/heap.h" #include "wine/heap.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
@ -70,7 +69,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
if(str) { if(str) {
DWORD size; DWORD size;
size = (strlenW(str)+1)*sizeof(WCHAR); size = (lstrlenW(str)+1)*sizeof(WCHAR);
ret = heap_alloc(size); ret = heap_alloc(size);
if(ret) if(ret)
memcpy(ret, str, size); memcpy(ret, str, size);
@ -83,20 +82,20 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r)
{ {
const WCHAR *p; const WCHAR *p;
if(strncmpiW(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) if(wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW)))
return E_FAIL; return E_FAIL;
r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); r->mhtml = url + ARRAY_SIZE(mhtml_prefixW);
p = strchrW(r->mhtml, '!'); p = wcschr(r->mhtml, '!');
if(p) { if(p) {
r->mhtml_len = p - r->mhtml; r->mhtml_len = p - r->mhtml;
/* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */
if(!strncmpW(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW)))
p += ARRAY_SIZE(mhtml_separatorW); p += ARRAY_SIZE(mhtml_separatorW);
else else
p++; p++;
}else { }else {
r->mhtml_len = strlenW(r->mhtml); r->mhtml_len = lstrlenW(r->mhtml);
} }
r->location = p; r->location = p;
@ -142,7 +141,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag
if(FAILED(hres)) if(FAILED(hres))
return report_result(protocol, hres); return report_result(protocol, hres);
found = !strcmpW(protocol->location, value.u.pwszVal); found = !lstrcmpW(protocol->location, value.u.pwszVal);
PropVariantClear(&value); PropVariantClear(&value);
}while(!found); }while(!found);
}else { }else {
@ -670,14 +669,14 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) {
FIXME("Relative URL is mhtml protocol\n"); FIXME("Relative URL is mhtml protocol\n");
return INET_E_USE_DEFAULT_PROTOCOLHANDLER; return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
} }
len += url.mhtml_len; len += url.mhtml_len;
if(*pwzRelativeUrl) if(*pwzRelativeUrl)
len += strlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW);
if(len >= cchResult) { if(len >= cchResult) {
*pcchResult = 0; *pcchResult = 0;
return E_FAIL; return E_FAIL;
@ -690,7 +689,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
if(*pwzRelativeUrl) { if(*pwzRelativeUrl) {
memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW));
p += ARRAY_SIZE(mhtml_separatorW); p += ARRAY_SIZE(mhtml_separatorW);
strcpyW(p, pwzRelativeUrl); lstrcpyW(p, pwzRelativeUrl);
}else { }else {
*p = 0; *p = 0;
} }