Reactos

[INETCOMM] Sync with Wine Staging 4.18. CORE-16441

+18 -21
+1 -2
dll/win32/inetcomm/mimeintl.c
··· 34 34 #include "mlang.h" 35 35 36 36 #include "wine/list.h" 37 - #include "wine/unicode.h" 38 37 #include "wine/debug.h" 39 38 40 39 #include "inetcomm_private.h" ··· 415 414 break; 416 415 case VT_LPWSTR: 417 416 cpiSource = CP_UNICODE; 418 - src_len = strlenW(pIn->u.pwszVal) * sizeof(WCHAR); 417 + src_len = lstrlenW(pIn->u.pwszVal) * sizeof(WCHAR); 419 418 break; 420 419 default: 421 420 return E_INVALIDARG;
+7 -7
dll/win32/inetcomm/mimeole.c
··· 27 27 28 28 #include "windef.h" 29 29 #include "winbase.h" 30 + #include "wine/winternl.h" 30 31 #include "winuser.h" 31 32 #include "objbase.h" 32 33 #include "ole2.h" ··· 39 40 #include "wine/heap.h" 40 41 #include "wine/list.h" 41 42 #include "wine/debug.h" 42 - #include "wine/unicode.h" 43 43 44 44 #include "inetcomm_private.h" 45 45 ··· 768 768 { 769 769 const char *encoding = header->value.u.pszVal; 770 770 771 - if(!strcasecmp(encoding, "base64")) 771 + if(!_strnicmp(encoding, "base64", -1)) 772 772 body->encoding = IET_BASE64; 773 - else if(!strcasecmp(encoding, "quoted-printable")) 773 + else if(!_strnicmp(encoding, "quoted-printable", -1)) 774 774 body->encoding = IET_QP; 775 - else if(!strcasecmp(encoding, "7bit")) 775 + else if(!_strnicmp(encoding, "7bit", -1)) 776 776 body->encoding = IET_7BIT; 777 - else if(!strcasecmp(encoding, "8bit")) 777 + else if(!_strnicmp(encoding, "8bit", -1)) 778 778 body->encoding = IET_8BIT; 779 779 else 780 780 FIXME("unknown encoding %s\n", debugstr_a(encoding)); ··· 3715 3715 3716 3716 TRACE("display name %s\n", debugstr_w(display_name)); 3717 3717 3718 - len = strlenW(display_name); 3718 + len = lstrlenW(display_name); 3719 3719 mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW)); 3720 3720 if(!mhtml_url) 3721 3721 return E_OUTOFMEMORY; 3722 3722 3723 3723 memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); 3724 - strcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); 3724 + lstrcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); 3725 3725 HeapFree(GetProcessHeap(), 0, display_name); 3726 3726 3727 3727 hres = CreateURLMoniker(NULL, mhtml_url, moniker_new);
-1
dll/win32/inetcomm/precomp.h
··· 17 17 #include <mimeole.h> 18 18 19 19 #include <wine/list.h> 20 - #include <wine/unicode.h> 21 20 #include <wine/debug.h> 22 21 23 22 #include "inetcomm_private.h"
+9 -10
dll/win32/inetcomm/protocol.c
··· 26 26 27 27 #include "wine/debug.h" 28 28 #include "wine/heap.h" 29 - #include "wine/unicode.h" 30 29 31 30 WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); 32 31 ··· 70 69 if(str) { 71 70 DWORD size; 72 71 73 - size = (strlenW(str)+1)*sizeof(WCHAR); 72 + size = (lstrlenW(str)+1)*sizeof(WCHAR); 74 73 ret = heap_alloc(size); 75 74 if(ret) 76 75 memcpy(ret, str, size); ··· 83 82 { 84 83 const WCHAR *p; 85 84 86 - if(strncmpiW(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) 85 + if(_wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) 87 86 return E_FAIL; 88 87 89 88 r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); 90 - p = strchrW(r->mhtml, '!'); 89 + p = wcschr(r->mhtml, '!'); 91 90 if(p) { 92 91 r->mhtml_len = p - r->mhtml; 93 92 /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ 94 - if(!strncmpW(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) 93 + if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) 95 94 p += ARRAY_SIZE(mhtml_separatorW); 96 95 else 97 96 p++; 98 97 }else { 99 - r->mhtml_len = strlenW(r->mhtml); 98 + r->mhtml_len = lstrlenW(r->mhtml); 100 99 } 101 100 102 101 r->location = p; ··· 142 141 if(FAILED(hres)) 143 142 return report_result(protocol, hres); 144 143 145 - found = !strcmpW(protocol->location, value.u.pwszVal); 144 + found = !lstrcmpW(protocol->location, value.u.pwszVal); 146 145 PropVariantClear(&value); 147 146 }while(!found); 148 147 }else { ··· 670 669 if(FAILED(hres)) 671 670 return hres; 672 671 673 - if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { 672 + if(!_wcsnicmp(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { 674 673 FIXME("Relative URL is mhtml protocol\n"); 675 674 return INET_E_USE_DEFAULT_PROTOCOLHANDLER; 676 675 } 677 676 678 677 len += url.mhtml_len; 679 678 if(*pwzRelativeUrl) 680 - len += strlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); 679 + len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); 681 680 if(len >= cchResult) { 682 681 *pcchResult = 0; 683 682 return E_FAIL; ··· 690 689 if(*pwzRelativeUrl) { 691 690 memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); 692 691 p += ARRAY_SIZE(mhtml_separatorW); 693 - strcpyW(p, pwzRelativeUrl); 692 + lstrcpyW(p, pwzRelativeUrl); 694 693 }else { 695 694 *p = 0; 696 695 }
+1 -1
media/doc/README.WINE
··· 79 79 dll/win32/imaadp32.acm # Synced to WineStaging-4.0 80 80 dll/win32/imagehlp # Synced to WineStaging-4.18 81 81 dll/win32/imm32 # Synced to WineStaging-4.18 82 - dll/win32/inetcomm # Synced to WineStaging-4.0 82 + dll/win32/inetcomm # Synced to WineStaging-4.18 83 83 dll/win32/inetmib1 # Synced to WineStaging-3.17 84 84 dll/win32/initpki # Synced to WineStaging-3.3 85 85 dll/win32/inseng # Synced to WineStaging-3.3