Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [INITPKI] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=089221f4e905c7bc4a0d3… commit 089221f4e905c7bc4a0d341ec74adf2c9e066561 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:35:54 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:35:54 2019 +0100 [INITPKI] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/initpki/main.c | 1 - media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/initpki/main.c b/dll/win32/initpki/main.c index c5def6c2219..b7260f37ee0 100644 --- a/dll/win32/initpki/main.c +++ b/dll/win32/initpki/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5195ec8a194..cbeb18fd511 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -81,7 +81,7 @@ dll/win32/imagehlp # Synced to WineStaging-4.18 dll/win32/imm32 # Synced to WineStaging-4.18 dll/win32/inetcomm # Synced to WineStaging-4.18 dll/win32/inetmib1 # Synced to WineStaging-4.18 -dll/win32/initpki # Synced to WineStaging-3.3 +dll/win32/initpki # Synced to WineStaging-4.18 dll/win32/inseng # Synced to WineStaging-3.3 dll/win32/iphlpapi # Out of sync dll/win32/itircl # Synced to WineStaging-3.3

1 0

[reactos] 01/01: [INETMIB1] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c94266177e30b4716874… commit 1c94266177e30b47168747fb4ea65edf906da907 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:35:29 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:35:29 2019 +0100 [INETMIB1] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/inetmib1/main.c | 9 ++++----- media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dll/win32/inetmib1/main.c b/dll/win32/inetmib1/main.c index 2f7b9cadfe6..6345573350e 100644 --- a/dll/win32/inetmib1/main.c +++ b/dll/win32/inetmib1/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <assert.h> #include <stdarg.h> #include <stdlib.h> @@ -319,7 +318,7 @@ static DWORD oidToIpAddr(AsnObjectIdentifier *oid) } typedef void (*oidToKeyFunc)(AsnObjectIdentifier *oid, void *dst); -typedef int (*compareFunc)(const void *key, const void *value); +typedef int (__cdecl *compareFunc)(const void *key, const void *value); /* Finds the first value in the table that matches key. Returns its 1-based * index if found, or 0 if not found. @@ -770,7 +769,7 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int compareIpAddrRow(const void *a, const void *b) +static int __cdecl compareIpAddrRow(const void *a, const void *b) { const MIB_IPADDRROW *key = a, *value = b; @@ -863,7 +862,7 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) row->dwForwardDest = oidToIpAddr(oid); } -static int compareIpForwardRow(const void *a, const void *b) +static int __cdecl compareIpForwardRow(const void *a, const void *b) { const MIB_IPFORWARDROW *key = a, *value = b; @@ -1221,7 +1220,7 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) row->dwLocalPort = oid->ids[4]; } -static int compareUdpRow(const void *a, const void *b) +static int __cdecl compareUdpRow(const void *a, const void *b) { const MIB_UDPROW *key = a, *value = b; int ret; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6ba03be6384..5195ec8a194 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -80,7 +80,7 @@ dll/win32/imaadp32.acm # Synced to WineStaging-4.0 dll/win32/imagehlp # Synced to WineStaging-4.18 dll/win32/imm32 # Synced to WineStaging-4.18 dll/win32/inetcomm # Synced to WineStaging-4.18 -dll/win32/inetmib1 # Synced to WineStaging-3.17 +dll/win32/inetmib1 # Synced to WineStaging-4.18 dll/win32/initpki # Synced to WineStaging-3.3 dll/win32/inseng # Synced to WineStaging-3.3 dll/win32/iphlpapi # Out of sync

1 0

[reactos] 01/01: [INETCOMM] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae07dd64af7fa10f9ce9b… commit ae07dd64af7fa10f9ce9b540aed16ea9698b84ca Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:35:04 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:35:04 2019 +0100 [INETCOMM] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/inetcomm/mimeintl.c | 3 +-- dll/win32/inetcomm/mimeole.c | 14 +++++++------- dll/win32/inetcomm/precomp.h | 1 - dll/win32/inetcomm/protocol.c | 19 +++++++++---------- media/doc/README.WINE | 2 +- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dll/win32/inetcomm/mimeintl.c b/dll/win32/inetcomm/mimeintl.c index 07d3ae5f038..ec7d34028eb 100644 --- a/dll/win32/inetcomm/mimeintl.c +++ b/dll/win32/inetcomm/mimeintl.c @@ -34,7 +34,6 @@ #include "mlang.h" #include "wine/list.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "inetcomm_private.h" @@ -415,7 +414,7 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE break; case VT_LPWSTR: cpiSource = CP_UNICODE; - src_len = strlenW(pIn->u.pwszVal) * sizeof(WCHAR); + src_len = lstrlenW(pIn->u.pwszVal) * sizeof(WCHAR); break; default: return E_INVALIDARG; diff --git a/dll/win32/inetcomm/mimeole.c b/dll/win32/inetcomm/mimeole.c index 47061490bd7..d69c40c8464 100644 --- a/dll/win32/inetcomm/mimeole.c +++ b/dll/win32/inetcomm/mimeole.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" +#include "wine/winternl.h" #include "winuser.h" #include "objbase.h" #include "ole2.h" @@ -39,7 +40,6 @@ #include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "inetcomm_private.h" @@ -768,13 +768,13 @@ static void init_content_encoding(MimeBody *body, header_t *header) { const char *encoding = header->value.u.pszVal; - if(!strcasecmp(encoding, "base64")) + if(!_strnicmp(encoding, "base64", -1)) body->encoding = IET_BASE64; - else if(!strcasecmp(encoding, "quoted-printable")) + else if(!_strnicmp(encoding, "quoted-printable", -1)) body->encoding = IET_QP; - else if(!strcasecmp(encoding, "7bit")) + else if(!_strnicmp(encoding, "7bit", -1)) body->encoding = IET_7BIT; - else if(!strcasecmp(encoding, "8bit")) + else if(!_strnicmp(encoding, "8bit", -1)) body->encoding = IET_8BIT; else FIXME("unknown encoding %s\n", debugstr_a(encoding)); @@ -3715,13 +3715,13 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx 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)); if(!mhtml_url) return E_OUTOFMEMORY; 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); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); diff --git a/dll/win32/inetcomm/precomp.h b/dll/win32/inetcomm/precomp.h index 04946eedd38..657c4e1f6be 100644 --- a/dll/win32/inetcomm/precomp.h +++ b/dll/win32/inetcomm/precomp.h @@ -17,7 +17,6 @@ #include <mimeole.h> #include <wine/list.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "inetcomm_private.h" diff --git a/dll/win32/inetcomm/protocol.c b/dll/win32/inetcomm/protocol.c index c6a59fee7c3..25b364ec16d 100644 --- a/dll/win32/inetcomm/protocol.c +++ b/dll/win32/inetcomm/protocol.c @@ -26,7 +26,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); @@ -70,7 +69,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); if(ret) memcpy(ret, str, size); @@ -83,20 +82,20 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; - if(strncmpiW(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) + if(_wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) return E_FAIL; r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); - p = strchrW(r->mhtml, '!'); + 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(!strncmpW(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) + if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) p += ARRAY_SIZE(mhtml_separatorW); else p++; }else { - r->mhtml_len = strlenW(r->mhtml); + r->mhtml_len = lstrlenW(r->mhtml); } r->location = p; @@ -142,7 +141,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag if(FAILED(hres)) return report_result(protocol, hres); - found = !strcmpW(protocol->location, value.u.pwszVal); + found = !lstrcmpW(protocol->location, value.u.pwszVal); PropVariantClear(&value); }while(!found); }else { @@ -670,14 +669,14 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(FAILED(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"); return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } len += url.mhtml_len; if(*pwzRelativeUrl) - len += strlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); + len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); if(len >= cchResult) { *pcchResult = 0; return E_FAIL; @@ -690,7 +689,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(*pwzRelativeUrl) { memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); p += ARRAY_SIZE(mhtml_separatorW); - strcpyW(p, pwzRelativeUrl); + lstrcpyW(p, pwzRelativeUrl); }else { *p = 0; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 88ca6391395..6ba03be6384 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -79,7 +79,7 @@ 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/imm32 # Synced to WineStaging-4.18 -dll/win32/inetcomm # Synced to WineStaging-4.0 +dll/win32/inetcomm # Synced to WineStaging-4.18 dll/win32/inetmib1 # Synced to WineStaging-3.17 dll/win32/initpki # Synced to WineStaging-3.3 dll/win32/inseng # Synced to WineStaging-3.3

1 0

[reactos] 01/01: [IMM32_WINETEST] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=908d437d9de0a5abdc1c2… commit 908d437d9de0a5abdc1c23c7a70d778e93ec9f87 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:34:39 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:34:39 2019 +0100 [IMM32_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/imm32/imm32.c | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/modules/rostests/winetests/imm32/imm32.c b/modules/rostests/winetests/imm32/imm32.c index ee1aeb39654..040a43fc058 100644 --- a/modules/rostests/winetests/imm32/imm32.c +++ b/modules/rostests/winetests/imm32/imm32.c @@ -448,6 +448,43 @@ static void test_ImmGetCompositionString(void) ok(len*sizeof(WCHAR)==wlen,"GCS_COMPATTR(W) not returning correct count\n"); len = ImmGetCompositionStringA(imc, GCS_COMPATTR, NULL, 0); ok(len==alen,"GCS_COMPATTR(A) not returning correct count\n"); + + /* Get strings with exactly matching buffer sizes. */ + memset(wstring, 0x1a, sizeof(wstring)); + memset(cstring, 0x1a, sizeof(cstring)); + + len = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, alen); + ok(len == alen, "Unexpected length %d.\n", len); + ok(cstring[alen] == 0x1a, "Unexpected buffer contents.\n"); + + len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, wlen); + ok(len == wlen, "Unexpected length %d.\n", len); + ok(wstring[wlen/sizeof(WCHAR)] == 0x1a1a, "Unexpected buffer contents.\n"); + + /* Get strings with exactly smaller buffer sizes. */ + memset(wstring, 0x1a, sizeof(wstring)); + memset(cstring, 0x1a, sizeof(cstring)); + + /* Returns 0 but still fills buffer. */ + len = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, alen - 1); + ok(!len, "Unexpected length %d.\n", len); + ok(cstring[0] == 'w', "Unexpected buffer contents %s.\n", cstring); + + len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, wlen - 1); + ok(len == wlen - 1, "Unexpected length %d.\n", len); + ok(!memcmp(wstring, string, wlen - 1), "Unexpected buffer contents.\n"); + + /* Get the size of the required output buffer. */ + memset(wstring, 0x1a, sizeof(wstring)); + memset(cstring, 0x1a, sizeof(cstring)); + + len = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 0); + ok(len == alen, "Unexpected length %d.\n", len); + ok(cstring[0] == 0x1a, "Unexpected buffer contents %s.\n", cstring); + + len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 0); + ok(len == wlen, "Unexpected length %d.\n", len); + ok(wstring[0] == 0x1a1a, "Unexpected buffer contents.\n"); } else win_skip("Composition string isn't available\n");

1 0

[reactos] 01/01: [IMM32] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ece2deded59249b1d769… commit 9ece2deded59249b1d769e0896a1937721190c61 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:34:15 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:34:15 2019 +0100 [IMM32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/imm32/imm.c | 102 ++++++++++++++++++++++++++++++-------------------- media/doc/README.WINE | 2 +- 2 files changed, 63 insertions(+), 41 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 4255e980787..86dfa2e4837 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -33,7 +33,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -119,8 +118,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; -#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) -#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) +static inline BOOL is_himc_ime_unicode(const InputContextData *data) +{ + return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE); +} + +static inline BOOL is_kbd_ime_unicode(const ImmHkl *hkl) +{ + return !!(hkl->imeInfo.fdwProperty & IME_PROP_UNICODE); +} static BOOL IMM_DestroyContext(HIMC hIMC); static InputContextData* get_imc_data(HIMC hIMC); @@ -311,8 +317,8 @@ static HMODULE load_graphics_driver(void) if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0; + lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); @@ -1202,52 +1208,70 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) /* Helpers for the GetCompositionString functions */ -static INT CopyCompStringIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE target, INT tlen, - BOOL unicode ) +/* Source encoding is defined by context, source length is always given in respective characters. Destination buffer + length is always in bytes. */ +static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *src, INT src_len, void *dst, + INT dst_len, BOOL unicode) { - INT rc; + int char_size = unicode ? sizeof(WCHAR) : sizeof(char); + INT ret; - if (is_himc_ime_unicode(data) && !unicode) - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)source, slen, (LPSTR)target, tlen, NULL, NULL); - else if (!is_himc_ime_unicode(data) && unicode) - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)source, slen, (LPWSTR)target, tlen) * sizeof(WCHAR); + if (is_himc_ime_unicode(data) ^ unicode) + { + if (unicode) + ret = MultiByteToWideChar(CP_ACP, 0, src, src_len, dst, dst_len / sizeof(WCHAR)); + else + ret = WideCharToMultiByte(CP_ACP, 0, src, src_len, dst, dst_len, NULL, NULL); + ret *= char_size; + } else { - int dlen = (unicode)?sizeof(WCHAR):sizeof(CHAR); - memcpy( target, source, min(slen,tlen)*dlen); - rc = slen*dlen; + if (dst_len) + { + ret = min(src_len * char_size, dst_len); + memcpy(dst, src, ret); + } + else + ret = src_len * char_size; } - return rc; + return ret; } -static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, - LPBYTE target, INT tlen, BOOL unicode ) +/* Composition string encoding is defined by context, returned attributes correspond to string, converted according to + passed mode. String length is in characters, attributes are in byte arrays. */ +static INT CopyCompAttrIMEtoClient(const InputContextData *data, const BYTE *src, INT src_len, const void *comp_string, + INT str_len, BYTE *dst, INT dst_len, BOOL unicode) { + union + { + const void *str; + const WCHAR *strW; + const char *strA; + } string; INT rc; + string.str = comp_string; + if (is_himc_ime_unicode(data) && !unicode) { - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, sslen, NULL, 0, NULL, NULL); - if (tlen) + rc = WideCharToMultiByte(CP_ACP, 0, string.strW, str_len, NULL, 0, NULL, NULL); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0, k = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { int len; - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)ssource + i, 1, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, string.strW + i, 1, NULL, 0, NULL, NULL); for (; len > 0; --len) { dst[j++] = src[k]; - if (j >= tlen) + if (j >= dst_len) goto end; } ++k; @@ -1258,23 +1282,21 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else if (!is_himc_ime_unicode(data) && unicode) { - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, sslen, NULL, 0); - if (tlen) + rc = MultiByteToWideChar(CP_ACP, 0, string.strA, str_len, NULL, 0); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { - if (IsDBCSLeadByte(((LPSTR)ssource)[i])) + if (IsDBCSLeadByte(string.strA[i])) continue; dst[j++] = src[i]; - if (j >= tlen) + if (j >= dst_len) break; } rc = j; @@ -1282,8 +1304,8 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else { - memcpy( target, source, min(slen,tlen)); - rc = slen; + memcpy(dst, src, min(src_len, dst_len)); + rc = src_len; } return rc; @@ -1623,7 +1645,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME)) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 7f08673178d..88ca6391395 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -78,7 +78,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/imm32 # Synced to WineStaging-4.0 +dll/win32/imm32 # Synced to WineStaging-4.18 dll/win32/inetcomm # Synced to WineStaging-4.0 dll/win32/inetmib1 # Synced to WineStaging-3.17 dll/win32/initpki # Synced to WineStaging-3.3

1 0

[reactos] 01/01: [IMAGEHLP_WINETEST] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ff06a373c829439f6a73… commit 1ff06a373c829439f6a73b29bc1461dffb72d625 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:33:48 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:33:48 2019 +0100 [IMAGEHLP_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/imagehlp/image.c | 21 +-- modules/rostests/winetests/imagehlp/integrity.c | 167 +++++------------------- 2 files changed, 42 insertions(+), 146 deletions(-) diff --git a/modules/rostests/winetests/imagehlp/image.c b/modules/rostests/winetests/imagehlp/image.c index 9fb1032356f..a81b4d6bcf0 100644 --- a/modules/rostests/winetests/imagehlp/image.c +++ b/modules/rostests/winetests/imagehlp/image.c @@ -33,9 +33,9 @@ static HMODULE hImageHlp; static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); -static DWORD (WINAPI* pGetImageUnusedHeaderBytes)(PLOADED_IMAGE, LPDWORD); -static PLOADED_IMAGE (WINAPI* pImageLoad)(PCSTR, PCSTR); -static BOOL (WINAPI* pImageUnload)(PLOADED_IMAGE); +static DWORD (WINAPI *pGetImageUnusedHeaderBytes)(PLOADED_IMAGE, LPDWORD); +static PLOADED_IMAGE (WINAPI *pImageLoad)(PCSTR, PCSTR); +static BOOL (WINAPI *pImageUnload)(PLOADED_IMAGE); /* minimal PE file image */ @@ -436,14 +436,9 @@ static void test_image_load(void) DWORD ret, count; HANDLE file; - if (!pImageLoad || !pImageUnload) + if (!pImageLoad || !pImageUnload || !pGetImageUnusedHeaderBytes) { - win_skip("ImageLoad or ImageUnload function is not available\n"); - return; - } - if (!pGetImageUnusedHeaderBytes) - { - win_skip("GetImageUnusedHeaderBytes function is not available\n"); + win_skip("ImageLoad functions are not available\n"); return; } @@ -496,11 +491,9 @@ static void test_image_load(void) "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); ok(img->fDOSImage == 0, "unexpected fDOSImage, got %d instead of 0\n", img->fDOSImage); - todo_wine - ok(img->fReadOnly == 1 || broken(!img->fReadOnly) /* <= WinXP */, + todo_wine ok(img->fReadOnly == 1 || broken(!img->fReadOnly) /* <= WinXP */, "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); - todo_wine - ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, + todo_wine ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, "unexpected Version, got %d instead of 1\n", img->Version); ok(img->SizeOfImage == 0x600, "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); diff --git a/modules/rostests/winetests/imagehlp/integrity.c b/modules/rostests/winetests/imagehlp/integrity.c index 913c396aa14..3b85c6a3a29 100644 --- a/modules/rostests/winetests/imagehlp/integrity.c +++ b/modules/rostests/winetests/imagehlp/integrity.c @@ -28,7 +28,7 @@ #include "imagehlp.h" #include "psapi.h" -static HMODULE hImageHlp, hPsapi; +static HMODULE hImageHlp, hPsapi, hNtdll; static char test_dll_path[MAX_PATH]; static BOOL (WINAPI *pImageAddCertificate)(HANDLE, LPWIN_CERTIFICATE, PDWORD); @@ -38,7 +38,9 @@ static BOOL (WINAPI *pImageGetCertificateHeader)(HANDLE, DWORD, LPWIN_CERTIFICAT static BOOL (WINAPI *pImageRemoveCertificate)(HANDLE, DWORD); static PIMAGE_NT_HEADERS (WINAPI *pCheckSumMappedFile)(PVOID, DWORD, PDWORD, PDWORD); -static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD cb); +static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); + +static PIMAGE_NT_HEADERS (WINAPI *pRtlImageNtHeader)(PVOID); static const char test_cert_data[] = {0x30,0x82,0x02,0xE1,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02 @@ -264,43 +266,11 @@ static void test_remove_certificate(int index) CloseHandle(hFile); } -static DWORD _get_checksum_offset(PVOID base, PIMAGE_NT_HEADERS *nt_header, DWORD *checksum) -{ - IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)base; - PIMAGE_NT_HEADERS32 Header32; - PIMAGE_NT_HEADERS64 Header64; - - if (dos->e_magic != IMAGE_DOS_SIGNATURE) - return 0; - - Header32 = (IMAGE_NT_HEADERS32 *)((char *)dos + dos->e_lfanew); - if (Header32->Signature != IMAGE_NT_SIGNATURE) - return 0; - - *nt_header = (PIMAGE_NT_HEADERS)Header32; - - if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) - { - *checksum = Header32->OptionalHeader.CheckSum; - return (char *)&Header32->OptionalHeader.CheckSum - (char *)base; - } - else if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - Header64 = (IMAGE_NT_HEADERS64 *)Header32; - *checksum = Header64->OptionalHeader.CheckSum; - return (char *)&Header64->OptionalHeader.CheckSum - (char *)base; - } - - return 0; -} - static void test_pe_checksum(void) { - DWORD checksum_orig, checksum_new, checksum_off, checksum_correct; + DWORD checksum_orig, checksum_new, checksum_correct; PIMAGE_NT_HEADERS nt_header; PIMAGE_NT_HEADERS ret; - HMODULE quartz_data; - char* quartz_base; MODULEINFO modinfo; char buffer[20]; BOOL ret_bool; @@ -312,60 +282,47 @@ static void test_pe_checksum(void) } SetLastError(0xdeadbeef); - checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(NULL, 0, &checksum_orig, &checksum_new); ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); - ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0, "Expected 0, got %x\n", checksum_new); + ok(((GetLastError() == ERROR_INVALID_PARAMETER)||(GetLastError() == 0xdeadbeef)), + "Expected 0xdeadbeef (XP) or ERROR_INVALID_PARAMETER (Vista+), got %x\n", GetLastError()); SetLastError(0xdeadbeef); - checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile((void *)0xdeadbeef, 0, &checksum_orig, &checksum_new); ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); - ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0, "Expected 0, got %x\n", checksum_new); - - if (0) - { - /* crashes on Windows */ - checksum_orig = checksum_new = 0xdeadbeef; - pCheckSumMappedFile(0, 0x1000, &checksum_orig, &checksum_new); - pCheckSumMappedFile((void *)0xdeadbeef, 0x1000, NULL, NULL); - } + ok(((GetLastError() == ERROR_INVALID_PARAMETER)||(GetLastError() == 0xdeadbeef)), + "Expected 0xdeadbeef (XP) or ERROR_INVALID_PARAMETER (Vista+), got %x\n", GetLastError()); /* basic checksum tests */ memset(buffer, 0x11, sizeof(buffer)); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(buffer, sizeof(buffer), &checksum_orig, &checksum_new); ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0xaabe, "Expected 0xaabe, got %x\n", checksum_new); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0xaabe, "Expected 0xaabe, got %x\n", checksum_new); memset(buffer, 0x22, sizeof(buffer)); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(buffer, sizeof(buffer), &checksum_orig, &checksum_new); ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0x5569, "Expected 0x5569, got %x\n", checksum_new); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0x5569, "Expected 0x5569, got %x\n", checksum_new); memset(buffer, 0x22, sizeof(buffer)); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(buffer, 10, &checksum_orig, &checksum_new); ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0xaab4, "Expected 0xaab4, got %x\n", checksum_new); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0xaab4, "Expected 0xaab4, got %x\n", checksum_new); memset(buffer, 0x22, sizeof(buffer)); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(buffer, 11, &checksum_orig, &checksum_new); ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0xaad7, "Expected 0xaad7, got %x\n", checksum_new); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0xaad7, "Expected 0xaad7, got %x\n", checksum_new); /* test checksum of PE module */ - memset(buffer, 0x22, sizeof(buffer)); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(test_pe_executable, sizeof(test_pe_executable), &checksum_orig, &checksum_new); @@ -383,12 +340,6 @@ static void test_pe_checksum(void) &modinfo, sizeof(modinfo)); ok(ret_bool, "GetModuleInformation failed, error: %x\n", GetLastError()); - if (0) - { - /* crashes on Windows */ - pCheckSumMappedFile(modinfo.lpBaseOfDll, modinfo.SizeOfImage, NULL, NULL); - } - SetLastError(0xdeadbeef); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, modinfo.SizeOfImage, &checksum_orig, &checksum_new); @@ -403,82 +354,38 @@ static void test_pe_checksum(void) &checksum_orig, &checksum_new); ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); - ok(checksum_orig == 0, "Expected 0xdeadbeef, got %x\n", checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_off = _get_checksum_offset(modinfo.lpBaseOfDll, &nt_header, &checksum_correct); - ok(checksum_off != 0, "Failed to get checksum offset\n"); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, checksum_off, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + nt_header = pRtlImageNtHeader( modinfo.lpBaseOfDll ); + checksum_correct = nt_header->OptionalHeader.CheckSum; checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, (char *)nt_header - (char *)modinfo.lpBaseOfDll, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); + ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, sizeof(IMAGE_DOS_HEADER), &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); + ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, 0, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); + ok((checksum_orig == 0xdeadbeef) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); + ok((checksum_new == 0xdeadbeef) || (checksum_new != 0 && checksum_new != 0xdeadbeef), "Got unexpected value %x\n", checksum_new); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile((char *)modinfo.lpBaseOfDll + 1, 0, &checksum_orig, &checksum_new); ok(ret == NULL, "Expected NULL, got %p\n", ret); - ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); - ok(checksum_new == 0, "Expected 0, got %x\n", checksum_new); - - quartz_data = LoadLibraryExA("quartz.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); - if (!quartz_data) - { - skip("Failed to load quartz as datafile, skipping tests\n"); - return; - } - - quartz_base = (char *)((DWORD_PTR)quartz_data & ~1); - checksum_off = _get_checksum_offset(quartz_base, &nt_header, &checksum_correct); - ok(checksum_off != 0, "Failed to get checksum offset\n"); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, checksum_off, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, (char *)nt_header - quartz_base, - &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, sizeof(IMAGE_DOS_HEADER), &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - checksum_orig = checksum_new = 0xdeadbeef; - ret = pCheckSumMappedFile(quartz_base, 0, &checksum_orig, &checksum_new); - ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); - ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); - todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - - FreeLibrary(quartz_data); + ok((checksum_orig == 0) || (checksum_orig == 0xdeadbeef), "Expected 0, got %x\n", checksum_orig); + ok((checksum_new == 0) || (checksum_new == 0xdeadbeef), "Expected 0, got %x\n", checksum_new); } START_TEST(integrity) @@ -500,15 +407,6 @@ START_TEST(integrity) } file_size_orig = get_file_size(); - /* - * Align file_size_orig to an 8-byte boundary. This avoids tests failures where - * the original dll is not correctly aligned (but when written to it will be). - */ - if (file_size_orig % 8 != 0) - { - skip("We need to align to an 8-byte boundary\n"); - file_size_orig = (file_size_orig + 7) & ~7; - } pImageAddCertificate = (void *) GetProcAddress(hImageHlp, "ImageAddCertificate"); pImageEnumerateCertificates = (void *) GetProcAddress(hImageHlp, "ImageEnumerateCertificates"); @@ -521,6 +419,10 @@ START_TEST(integrity) if (hPsapi) pGetModuleInformation = (void *) GetProcAddress(hPsapi, "GetModuleInformation"); + hNtdll = LoadLibraryA("ntdll.dll"); + if (hNtdll) + pRtlImageNtHeader = (void *) GetProcAddress(hNtdll, "RtlImageNtHeader"); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); test_get_certificate(test_cert_data, first); test_remove_certificate(first); @@ -549,6 +451,7 @@ START_TEST(integrity) test_pe_checksum(); if (hPsapi) FreeLibrary(hPsapi); + if (hNtdll) FreeLibrary(hNtdll); FreeLibrary(hImageHlp); DeleteFileA(test_dll_path); }

1 0

[reactos] 01/01: [IMAGEHLP] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bee818a28ab9c355aa256… commit bee818a28ab9c355aa256b9b349e1673f8b96886 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:33:24 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:33:24 2019 +0100 [IMAGEHLP] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/imagehlp/access.c | 18 ++----- dll/win32/imagehlp/imagehlp_main.c | 21 -------- dll/win32/imagehlp/modify.c | 98 +++++++++++--------------------------- media/doc/README.WINE | 2 +- 4 files changed, 34 insertions(+), 105 deletions(-) diff --git a/dll/win32/imagehlp/access.c b/dll/win32/imagehlp/access.c index 897f2d553b4..29315f172ab 100644 --- a/dll/win32/imagehlp/access.c +++ b/dll/win32/imagehlp/access.c @@ -33,9 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** * Data */ -LIST_ENTRY image_list = { &image_list, &image_list }; +static LIST_ENTRY image_list = { &image_list, &image_list }; -DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; /*********************************************************************** * GetImageConfigInformation (IMAGEHLP.@) @@ -74,12 +73,12 @@ PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) TRACE("(%s, %s)\n", dll_name, dll_path); - image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); + image = HeapAlloc(GetProcessHeap(), 0, sizeof(*image)); if (!image) return NULL; if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) { - HeapFree(IMAGEHLP_hHeap, 0, image); + HeapFree(GetProcessHeap(), 0, image); return NULL; } @@ -99,14 +98,7 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) LIST_ENTRY *entry, *mark; PLOADED_IMAGE image; - FIXME("(%p)\n", loaded_image); - - if (!loaded_image) - { - /* No image loaded or null pointer */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + TRACE("(%p)\n", loaded_image); /* FIXME: do we really need to check this? */ mark = &image_list; @@ -128,7 +120,7 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) entry->Flink->Blink = entry->Blink; UnMapAndLoad(loaded_image); - HeapFree(IMAGEHLP_hHeap, 0, loaded_image); + HeapFree(GetProcessHeap(), 0, loaded_image); return TRUE; } diff --git a/dll/win32/imagehlp/imagehlp_main.c b/dll/win32/imagehlp/imagehlp_main.c index e505126381d..183b744dab0 100644 --- a/dll/win32/imagehlp/imagehlp_main.c +++ b/dll/win32/imagehlp/imagehlp_main.c @@ -25,27 +25,6 @@ #include "imagehlp.h" #include "wine/debug.h" -/**********************************************************************/ -DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; - -/*********************************************************************** - * DllMain (IMAGEHLP.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0); - break; - case DLL_PROCESS_DETACH: - if (lpvReserved) break; - HeapDestroy(IMAGEHLP_hHeap); - break; - } - return TRUE; -} /*********************************************************************** * MarkImageAsRunFromSwap (IMAGEHLP.@) diff --git a/dll/win32/imagehlp/modify.c b/dll/win32/imagehlp/modify.c index ee68a4ef850..66ab07e745b 100644 --- a/dll/win32/imagehlp/modify.c +++ b/dll/win32/imagehlp/modify.c @@ -25,7 +25,6 @@ #include "winternl.h" #include "winerror.h" #include "wine/debug.h" -#include "wine/exception.h" #include "imagehlp.h" WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); @@ -159,25 +158,26 @@ BOOL WINAPI BindImageEx( /*********************************************************************** * CheckSum (internal) */ -static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD ByteCount) +static WORD CalcCheckSum( + DWORD StartValue, LPVOID BaseAddress, DWORD WordCount) { - LPWORD Ptr; - DWORD Sum, i; - - Sum = StartValue; - Ptr = (LPWORD)BaseAddress; - for (i = ByteCount; i > 1; i -= 2) - { - Sum += *Ptr; - if (HIWORD(Sum) != 0) - Sum = LOWORD(Sum) + HIWORD(Sum); - Ptr++; - } - - if (i == 1) - Sum += *(BYTE *)Ptr; - - return (WORD)(LOWORD(Sum) + HIWORD(Sum)); + LPWORD Ptr; + DWORD Sum; + DWORD i; + + Sum = StartValue; + Ptr = (LPWORD)BaseAddress; + for (i = 0; i < WordCount; i++) + { + Sum += *Ptr; + if (HIWORD(Sum) != 0) + { + Sum = LOWORD(Sum) + HIWORD(Sum); + } + Ptr++; + } + + return (WORD)(LOWORD(Sum) + HIWORD(Sum)); } @@ -188,60 +188,19 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( LPVOID BaseAddress, DWORD FileLength, LPDWORD HeaderSum, LPDWORD CheckSum) { - IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *) BaseAddress; - PIMAGE_NT_HEADERS32 Header32; - PIMAGE_NT_HEADERS64 Header64; - PIMAGE_NT_HEADERS ret = NULL; - DWORD *ChecksumFile; + PIMAGE_NT_HEADERS header; DWORD CalcSum; - DWORD HdrSum = 0; + DWORD HdrSum; - TRACE("(%p, %d, %p, %p)\n", - BaseAddress, FileLength, HeaderSum, CheckSum - ); + TRACE("(%p, %d, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum); - CalcSum = (DWORD)CalcCheckSum(0, BaseAddress, FileLength); + CalcSum = CalcCheckSum(0, BaseAddress, (FileLength + 1) / sizeof(WORD)); + header = RtlImageNtHeader(BaseAddress); - __TRY - { - if (dos->e_magic != IMAGE_DOS_SIGNATURE) -#ifdef __REACTOS__ - _SEH2_LEAVE; -#else - break; -#endif + if (!header) + return NULL; - Header32 = (IMAGE_NT_HEADERS32 *)((char *)dos + dos->e_lfanew); - if (Header32->Signature != IMAGE_NT_SIGNATURE) -#ifdef __REACTOS__ - _SEH2_LEAVE; -#else - break; -#endif - - ret = (PIMAGE_NT_HEADERS)Header32; - - if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) - ChecksumFile = &Header32->OptionalHeader.CheckSum; - else if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - Header64 = (IMAGE_NT_HEADERS64 *)Header32; - ChecksumFile = &Header64->OptionalHeader.CheckSum; - } - else -#ifdef __REACTOS__ - _SEH2_LEAVE; -#else - break; -#endif - - HdrSum = *ChecksumFile; - } - __EXCEPT_PAGE_FAULT - { - /* nothing */ - } - __ENDTRY + *HeaderSum = HdrSum = header->OptionalHeader.CheckSum; /* Subtract image checksum from calculated checksum. */ /* fix low word of checksum */ @@ -268,9 +227,8 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( CalcSum += FileLength; *CheckSum = CalcSum; - *HeaderSum = HdrSum; - return ret; + return header; } /*********************************************************************** diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 21b3751e007..7f08673178d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -77,7 +77,7 @@ dll/win32/httpapi # Synced to WineStaging-4.18 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-3.3 +dll/win32/imagehlp # Synced to WineStaging-4.18 dll/win32/imm32 # Synced to WineStaging-4.0 dll/win32/inetcomm # Synced to WineStaging-4.0 dll/win32/inetmib1 # Synced to WineStaging-3.17

1 0

[reactos] 01/01: [IEFRAME] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3cabdbf31f6e046aae4f… commit c3cabdbf31f6e046aae4f4aa845b4b866c43fbb8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:32:59 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:32:59 2019 +0100 [IEFRAME] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/ieframe/dochost.c | 5 ++-- dll/win32/ieframe/ie.c | 55 ++++++++++++++++++++++++++++++++-------- dll/win32/ieframe/ieframe.h | 6 ++--- dll/win32/ieframe/ieframe_main.c | 2 -- dll/win32/ieframe/iexplore.c | 14 +++++----- dll/win32/ieframe/intshcut.c | 12 ++++----- dll/win32/ieframe/navigate.c | 13 +++++++--- dll/win32/ieframe/shellbrowser.c | 3 --- media/doc/README.WINE | 2 +- 9 files changed, 73 insertions(+), 39 deletions(-) diff --git a/dll/win32/ieframe/dochost.c b/dll/win32/ieframe/dochost.c index d22ad3d18cd..61c8234952d 100644 --- a/dll/win32/ieframe/dochost.c +++ b/dll/win32/ieframe/dochost.c @@ -136,7 +136,6 @@ static void notif_complete(DocHost *This, DISPID dispid) TRACE("%d <<<\n", dispid); SysFreeString(V_BSTR(&url)); - This->busy = VARIANT_FALSE; } static void object_available(DocHost *This) @@ -428,7 +427,7 @@ static void update_travellog(DocHost *This) static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; - if(This->url && !strncmpiW(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { + if(This->url && !_wcsnicmp(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { TRACE("Skipping about URL\n"); return; } @@ -681,6 +680,8 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, return E_NOTIMPL; return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); case OLECMDID_SETDOWNLOADSTATE: + if(pvaIn && V_VT(pvaIn) == VT_I4) + This->busy = V_I4(pvaIn) ? VARIANT_TRUE : VARIANT_FALSE; if(This->olecmd) return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); diff --git a/dll/win32/ieframe/ie.c b/dll/win32/ieframe/ie.c index d7e3aa150cc..5d9545e95d6 100644 --- a/dll/win32/ieframe/ie.c +++ b/dll/win32/ieframe/ie.c @@ -103,16 +103,29 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) static HRESULT WINAPI InternetExplorer_GetTypeInfoCount(IWebBrowser2 *iface, UINT *pctinfo) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI InternetExplorer_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, LCID lcid, LPTYPEINFO *ppTInfo) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(typeinfo); + *ppTInfo = typeinfo; + return S_OK; } static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, @@ -120,9 +133,17 @@ static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID LCID lcid, DISPID *rgDispId) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); } static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispIdMember, @@ -131,9 +152,18 @@ static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispId EXCEPINFO *pExepInfo, UINT *puArgErr) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - return E_NOTIMPL; + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_Invoke(typeinfo, &This->IWebBrowser2_iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExepInfo, puArgErr); } static HRESULT WINAPI InternetExplorer_GoBack(IWebBrowser2 *iface) @@ -318,8 +348,11 @@ static HRESULT WINAPI InternetExplorer_get_LocationURL(IWebBrowser2 *iface, BSTR static HRESULT WINAPI InternetExplorer_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pBool); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pBool); + + *pBool = This->doc_host.busy; + return S_OK; } static HRESULT WINAPI InternetExplorer_Quit(IWebBrowser2 *iface) diff --git a/dll/win32/ieframe/ieframe.h b/dll/win32/ieframe/ieframe.h index fc56da9e46d..4e45918f78f 100644 --- a/dll/win32/ieframe/ieframe.h +++ b/dll/win32/ieframe/ieframe.h @@ -29,6 +29,7 @@ #include "wingdi.h" #include "winuser.h" #ifdef __REACTOS__ +#include <winnls.h> #include <wincon.h> #endif @@ -42,7 +43,6 @@ #include "shdeprecated.h" #include "docobjectservice.h" -#include "wine/unicode.h" #include "wine/heap.h" #include "wine/list.h" @@ -347,7 +347,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); if(ret) memcpy(ret, str, size); @@ -358,7 +358,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) static inline LPWSTR co_strdupW(LPCWSTR str) { - WCHAR *ret = CoTaskMemAlloc((strlenW(str) + 1)*sizeof(WCHAR)); + WCHAR *ret = CoTaskMemAlloc((lstrlenW(str) + 1)*sizeof(WCHAR)); if (ret) lstrcpyW(ret, str); return ret; diff --git a/dll/win32/ieframe/ieframe_main.c b/dll/win32/ieframe/ieframe_main.c index e207ce05751..5abe502f1e4 100644 --- a/dll/win32/ieframe/ieframe_main.c +++ b/dll/win32/ieframe/ieframe_main.c @@ -187,8 +187,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: ieframe_instance = hInstDLL; register_iewindow_class(); diff --git a/dll/win32/ieframe/iexplore.c b/dll/win32/ieframe/iexplore.c index 1a444b8406a..d544e4643c9 100644 --- a/dll/win32/ieframe/iexplore.c +++ b/dll/win32/ieframe/iexplore.c @@ -970,7 +970,7 @@ static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline) VARIANT var_url; int cmdlen; - cmdlen = strlenW(cmdline); + cmdlen = lstrlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; @@ -1001,18 +1001,18 @@ static HDDEDATA open_dde_url(WCHAR *dde_url) url = dde_url; if(*url == '"') { url++; - url_end = strchrW(url, '"'); + url_end = wcschr(url, '"'); if(!url_end) { FIXME("missing string terminator\n"); return 0; } *url_end = 0; }else { - url_end = strchrW(url, ','); + url_end = wcschr(url, ','); if(url_end) *url_end = 0; else - url_end = url + strlenW(url); + url_end = url + lstrlenW(url); } LIST_FOR_EACH_ENTRY(iter, &ie_list, InternetExplorer, entry) { @@ -1162,11 +1162,11 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++; - if (!strncmpiW(cmdline, embeddingW, length)) + if (!_wcsnicmp(cmdline, embeddingW, length)) embedding = TRUE; - else if (!strncmpiW(cmdline, nohomeW, length)) + else if (!_wcsnicmp(cmdline, nohomeW, length)) nohome = TRUE; - else if (!strncmpiW(cmdline, startmanagerW, length)) + else if (!_wcsnicmp(cmdline, startmanagerW, length)) manager = TRUE; else break; diff --git a/dll/win32/ieframe/intshcut.c b/dll/win32/ieframe/intshcut.c index 8bf8ae87029..33584100a71 100644 --- a/dll/win32/ieframe/intshcut.c +++ b/dll/win32/ieframe/intshcut.c @@ -94,15 +94,15 @@ static BOOL run_winemenubuilder( const WCHAR *args ) void *redir; GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( menubuilder )); - strcatW( app, menubuilder ); + lstrcatW( app, menubuilder ); - len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); + len = (lstrlenW( app ) + lstrlenW( args ) + 1) * sizeof(WCHAR); buffer = heap_alloc( len ); if( !buffer ) return FALSE; - strcpyW( buffer, app ); - strcatW( buffer, args ); + lstrcpyW( buffer, app ); + lstrcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); @@ -136,7 +136,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) if( !buffer ) return FALSE; - sprintfW( buffer, szFormat, szLink ); + swprintf( buffer, szFormat, szLink ); ret = run_winemenubuilder( buffer ); heap_free( buffer ); return ret; @@ -521,7 +521,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam int iconindex; PROPSPEC ps; PROPVARIANT pv; - iconindex = strtolW(iconindexstring, NULL, 10); + iconindex = wcstol(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; ps.u.propid = PID_IS_ICONINDEX; pv.vt = VT_I4; diff --git a/dll/win32/ieframe/navigate.c b/dll/win32/ieframe/navigate.c index 96fb0830053..513444af73f 100644 --- a/dll/win32/ieframe/navigate.c +++ b/dll/win32/ieframe/navigate.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ +#include <wchar.h> +#endif + #define NONAMELESSUNION #include "ieframe.h" @@ -111,7 +115,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR fmt[0] = 0; /* the format string must have one "%s" for the str */ LoadStringW(ieframe_instance, IDS_STATUSFMT_FIRST + statuscode, fmt, IDS_STATUSFMT_MAXLEN); - snprintfW(buffer, ARRAY_SIZE(buffer), fmt, str); + swprintf(buffer, fmt, str); } V_VT(&arg) = VT_BSTR; @@ -150,6 +154,7 @@ void notify_download_state(DocHost *dochost, BOOL is_downloading) { DISPPARAMS dwl_dp = {NULL}; TRACE("(%x)\n", is_downloading); + dochost->busy = is_downloading ? VARIANT_TRUE : VARIANT_FALSE; call_sink(dochost->cps.wbe2, is_downloading ? DISPID_DOWNLOADBEGIN : DISPID_DOWNLOADCOMPLETE, &dwl_dp); } @@ -465,7 +470,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, dwReserved, pszAdditionalHeaders); if(This->headers) { - int size = (strlenW(This->headers)+1)*sizeof(WCHAR); + int size = (lstrlenW(This->headers)+1)*sizeof(WCHAR); *pszAdditionalHeaders = CoTaskMemAlloc(size); memcpy(*pszAdditionalHeaders, This->headers, size); } @@ -583,8 +588,6 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = params; - This->busy = VARIANT_TRUE; - V_VT(params) = VT_BOOL|VT_BYREF; V_BOOLREF(params) = cancel; @@ -888,6 +891,8 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo } notify_download_state(This, TRUE); + This->busy = VARIANT_FALSE; + on_commandstate_change(This, CSC_NAVIGATEBACK, FALSE); on_commandstate_change(This, CSC_NAVIGATEFORWARD, FALSE); diff --git a/dll/win32/ieframe/shellbrowser.c b/dll/win32/ieframe/shellbrowser.c index 78e0e85a799..375f9caa1b1 100644 --- a/dll/win32/ieframe/shellbrowser.c +++ b/dll/win32/ieframe/shellbrowser.c @@ -786,7 +786,6 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( SysFreeString(url); - This->doc_host->busy = VARIANT_FALSE; IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; } @@ -850,8 +849,6 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( TRACE("<<<\n"); SysFreeString(url); - if(This->doc_host) - This->doc_host->busy = VARIANT_FALSE; IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 03b75aed8c2..21b3751e007 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -75,7 +75,7 @@ dll/win32/hlink # Synced to WineStaging-4.18 dll/win32/hnetcfg # Synced to WineStaging-4.18 dll/win32/httpapi # Synced to WineStaging-4.18 dll/win32/iccvid # Synced to WineStaging-4.0 -dll/win32/ieframe # 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-3.3 dll/win32/imm32 # Synced to WineStaging-4.0

1 0

[reactos] 01/01: [HTTPAPI] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebcc4c61099db2e50d669… commit ebcc4c61099db2e50d669ee48df2a0d912143090 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:32:29 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:32:29 2019 +0100 [HTTPAPI] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/httpapi/CMakeLists.txt | 2 +- dll/win32/httpapi/httpapi.spec | 14 +- dll/win32/httpapi/httpapi_main.c | 592 +++++++++++++++++++++++++++++++++++++-- media/doc/README.WINE | 2 +- 4 files changed, 575 insertions(+), 35 deletions(-) diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt index 5836ccc5455..b53d70f2a2c 100644 --- a/dll/win32/httpapi/CMakeLists.txt +++ b/dll/win32/httpapi/CMakeLists.txt @@ -11,5 +11,5 @@ list(APPEND SOURCE add_library(httpapi MODULE ${SOURCE}) set_module_type(httpapi win32dll) target_link_libraries(httpapi wine) -add_importlibs(httpapi msvcrt kernel32 ntdll) +add_importlibs(httpapi advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET httpapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/httpapi/httpapi.spec b/dll/win32/httpapi/httpapi.spec index cdab28d9f86..e2f165c6880 100644 --- a/dll/win32/httpapi/httpapi.spec +++ b/dll/win32/httpapi/httpapi.spec @@ -1,12 +1,18 @@ @ stub HttpAddFragmentToCache @ stdcall HttpAddUrl(ptr wstr ptr) @ stub HttpAddUrlToConfigGroup +@ stdcall HttpAddUrlToUrlGroup(int64 wstr int64 long) @ stub HttpCancelHttpRequest @ stub HttpCreateAppPool @ stub HttpCreateConfigGroup @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) +@ stdcall HttpCreateRequestQueue(long wstr ptr long ptr) @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCreateUrlGroup(int64 ptr long) +@ stdcall HttpCloseRequestQueue(ptr) +@ stdcall HttpCloseServerSession(int64) +@ stdcall HttpCloseUrlGroup(int64) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept @@ -31,14 +37,15 @@ @ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) @ stub HttpReadFragmentFromCache @ stub HttpReceiveClientCertificate -@ stub HttpReceiveHttpRequest +@ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) @ stub HttpReceiveHttpResponse @ stub HttpReceiveRequestEntityBody @ stub HttpRemoveAllUrlsFromConfigGroup -@ stub HttpRemoveUrl +@ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup +@ stdcall HttpRemoveUrlFromUrlGroup(int64 wstr long) @ stub HttpSendHttpRequest -@ stub HttpSendHttpResponse +@ stdcall HttpSendHttpResponse(ptr int64 long ptr ptr ptr ptr long ptr ptr) @ stub HttpSendRequestEntityBody @ stub HttpSendResponseEntityBody @ stub HttpSetAppPoolInformation @@ -46,6 +53,7 @@ @ stub HttpSetControlChannelInformation @ stub HttpSetServerContextInformation @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) +@ stdcall HttpSetUrlGroupProperty(int64 long ptr long) @ stub HttpShutdownAppPool @ stub HttpShutdownFilter @ stdcall HttpTerminate(long ptr) diff --git a/dll/win32/httpapi/httpapi_main.c b/dll/win32/httpapi/httpapi_main.c index 1b35cd656ff..45fad4d3641 100644 --- a/dll/win32/httpapi/httpapi_main.c +++ b/dll/win32/httpapi/httpapi_main.c @@ -18,28 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "http.h" +#ifdef __REACTOS__ +#include <stdio.h> +#endif +#include "wine/http.h" +#include "winsvc.h" +#include "wine/winternl.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(httpapi); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) +static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; + +static WCHAR *heap_strdupW(const WCHAR *str) { - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; + int len = wcslen(str) + 1; + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + wcscpy(ret, str); + return ret; } /*********************************************************************** @@ -56,11 +54,41 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) * NO_ERROR if function succeeds, or error code if function fails * */ -ULONG WINAPI HttpInitialize( HTTPAPI_VERSION version, ULONG flags, PVOID reserved ) +ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved) { - FIXME( "({%d,%d}, 0x%x, %p): stub!\n", version.HttpApiMajorVersion, - version.HttpApiMinorVersion, flags, reserved ); - return NO_ERROR; + static const WCHAR httpW[] = {'h','t','t','p',0}; + SC_HANDLE manager, service; + + TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, + version.HttpApiMinorVersion, flags, reserved); + + if (flags & ~HTTP_INITIALIZE_SERVER) + { + FIXME("Unhandled flags %#x.\n", flags); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) + return GetLastError(); + + if (!(service = OpenServiceW(manager, httpW, SERVICE_START))) + { + ERR("Failed to open HTTP service, error %u.\n", GetLastError()); + CloseServiceHandle(manager); + return GetLastError(); + } + + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + ERR("Failed to start HTTP service, error %u.\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(manager); + return GetLastError(); + } + + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; } /*********************************************************************** @@ -169,26 +197,530 @@ ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID * NO_ERROR if function succeeds, or error code if function fails * */ -ULONG WINAPI HttpCreateHttpHandle( PHANDLE handle, ULONG reserved ) +ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) { - FIXME( "(%p, %d): stub!\n", handle, reserved); - return ERROR_CALL_NOT_IMPLEMENTED; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + + TRACE("handle %p, reserved %#x.\n", handle, reserved); + + if (!handle) + return ERROR_INVALID_PARAMETER; + + RtlInitUnicodeString(&string, device_nameW); + attr.ObjectName = &string; + return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, + FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); +} + +static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) +{ + struct http_add_url_params *params; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED ovl; + int len; + + len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); + if (!(params = heap_alloc(offsetof(struct http_add_url_params, url[len])))) + return ERROR_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, urlW, -1, params->url, len, NULL, NULL); + params->context = context; + + ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); + + if (!DeviceIoControl(queue, IOCTL_HTTP_ADD_URL, params, + offsetof(struct http_add_url_params, url[len]), NULL, 0, NULL, &ovl)) + ret = GetLastError(); + CloseHandle(ovl.hEvent); + heap_free(params); + return ret; } /*********************************************************************** * HttpAddUrl (HTTPAPI.@) */ -ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) +ULONG WINAPI HttpAddUrl(HANDLE queue, const WCHAR *url, void *reserved) +{ + TRACE("queue %p, url %s, reserved %p.\n", queue, debugstr_w(url), reserved); + + return add_url(queue, url, 0); +} + +static ULONG remove_url(HANDLE queue, const WCHAR *urlW) +{ + ULONG ret = ERROR_SUCCESS; + OVERLAPPED ovl = {0}; + char *url; + int len; + + len = WideCharToMultiByte(CP_ACP, 0, urlW, -1, NULL, 0, NULL, NULL); + if (!(url = heap_alloc(len))) + return ERROR_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, urlW, -1, url, len, NULL, NULL); + + ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); + + if (!DeviceIoControl(queue, IOCTL_HTTP_REMOVE_URL, url, len, NULL, 0, NULL, &ovl)) + ret = GetLastError(); + CloseHandle(ovl.hEvent); + heap_free(url); + return ret; +} + +/*********************************************************************** + * HttpRemoveUrl (HTTPAPI.@) + */ +ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) +{ + TRACE("queue %p, url %s.\n", queue, debugstr_w(url)); + + if (!queue) + return ERROR_INVALID_PARAMETER; + + return remove_url(queue, url); +} + +/*********************************************************************** + * HttpReceiveHttpRequest (HTTPAPI.@) + */ +ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, + HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) +{ + struct http_receive_request_params params = + { + .addr = (ULONG_PTR)request, + .id = id, + .flags = flags, + .bits = sizeof(void *) * 8, + }; + ULONG ret = ERROR_SUCCESS; + OVERLAPPED sync_ovl; + + TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n", + queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); + + if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY) + FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); + + if (size < sizeof(HTTP_REQUEST_V1)) + return ERROR_INSUFFICIENT_BUFFER; + + if (!ovl) + { + sync_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ovl = &sync_ovl; + } + + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_REQUEST, &params, sizeof(params), request, size, NULL, ovl)) + ret = GetLastError(); + + if (ovl == &sync_ovl) + { + ret = ERROR_SUCCESS; + if (!GetOverlappedResult(queue, ovl, ret_size, TRUE)) + ret = GetLastError(); + CloseHandle(sync_ovl.hEvent); + } + + return ret; +} + +static void format_date(char *buffer) +{ + static const char day_names[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + static const char month_names[12][4] = + {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + SYSTEMTIME date; + GetSystemTime(&date); + sprintf(buffer + strlen(buffer), "Date: %s, %02u %s %u %02u:%02u:%02u GMT\r\n", + day_names[date.wDayOfWeek], date.wDay, month_names[date.wMonth - 1], + date.wYear, date.wHour, date.wMinute, date.wSecond); +} + +/*********************************************************************** + * HttpSendHttpResponse (HTTPAPI.@) + */ +ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, + HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, + void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data) +{ + static const char *const header_names[] = + { + "Cache-Control", + "Connection", + "Date", + "Keep-Alive", + "Pragma", + "Trailer", + "Transfer-Encoding", + "Upgrade", + "Via", + "Warning", + "Allow", + "Content-Length", + "Content-Type", + "Content-Encoding", + "Content-Language", + "Content-Location", + "Content-MD5", + "Content-Range", + "Expires", + "Last-Modified", + "Accept-Ranges", + "Age", + "ETag", + "Location", + "Proxy-Authenticate", + "Retry-After", + "Server", + "Set-Cookie", + "Vary", + "WWW-Authenticate", + }; + + struct http_response *buffer; + OVERLAPPED dummy_ovl = {0}; + ULONG ret = ERROR_SUCCESS; + int len, body_len = 0; + char *p, dummy[12]; + USHORT i; + + TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n", + queue, wine_dbgstr_longlong(id), flags, response, cache_policy, + ret_size, reserved1, reserved2, ovl, log_data); + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + if (response->s.Flags) + FIXME("Unhandled response flags %#x.\n", response->s.Flags); + if (cache_policy) + WARN("Ignoring cache_policy.\n"); + if (log_data) + WARN("Ignoring log_data.\n"); + + len = 12 + sprintf(dummy, "%hu", response->s.StatusCode) + response->s.ReasonLength; + for (i = 0; i < response->s.EntityChunkCount; ++i) + { + if (response->s.pEntityChunks[i].DataChunkType != HttpDataChunkFromMemory) + { + FIXME("Unhandled data chunk type %u.\n", response->s.pEntityChunks[i].DataChunkType); + return ERROR_CALL_NOT_IMPLEMENTED; + } + body_len += response->s.pEntityChunks[i].FromMemory.BufferLength; + } + len += body_len; + for (i = 0; i < HttpHeaderResponseMaximum; ++i) + { + if (i == HttpHeaderDate) + len += 37; + else if (response->s.Headers.KnownHeaders[i].RawValueLength) + len += strlen(header_names[i]) + 2 + response->s.Headers.KnownHeaders[i].RawValueLength + 2; + else if (i == HttpHeaderContentLength) + { + char dummy[12]; + len += strlen(header_names[i]) + 2 + sprintf(dummy, "%d", body_len) + 2; + } + } + for (i = 0; i < response->s.Headers.UnknownHeaderCount; ++i) + { + len += response->s.Headers.pUnknownHeaders[i].NameLength + 2; + len += response->s.Headers.pUnknownHeaders[i].RawValueLength + 2; + } + len += 2; + + if (!(buffer = heap_alloc(offsetof(struct http_response, buffer[len])))) + return ERROR_OUTOFMEMORY; + buffer->id = id; + buffer->len = len; + sprintf(buffer->buffer, "HTTP/1.1 %u %.*s\r\n", response->s.StatusCode, + response->s.ReasonLength, response->s.pReason); + + for (i = 0; i < HttpHeaderResponseMaximum; ++i) + { + const HTTP_KNOWN_HEADER *header = &response->s.Headers.KnownHeaders[i]; + if (i == HttpHeaderDate) + format_date(buffer->buffer); + else if (header->RawValueLength) + sprintf(buffer->buffer + strlen(buffer->buffer), "%s: %.*s\r\n", + header_names[i], header->RawValueLength, header->pRawValue); + else if (i == HttpHeaderContentLength) + sprintf(buffer->buffer + strlen(buffer->buffer), "Content-Length: %d\r\n", body_len); + } + for (i = 0; i < response->s.Headers.UnknownHeaderCount; ++i) + { + const HTTP_UNKNOWN_HEADER *header = &response->s.Headers.pUnknownHeaders[i]; + sprintf(buffer->buffer + strlen(buffer->buffer), "%.*s: %.*s\r\n", header->NameLength, + header->pName, header->RawValueLength, header->pRawValue); + } + p = buffer->buffer + strlen(buffer->buffer); + /* Don't use strcat, because this might be the end of the buffer. */ + memcpy(p, "\r\n", 2); + p += 2; + for (i = 0; i < response->s.EntityChunkCount; ++i) + { + const HTTP_DATA_CHUNK *chunk = &response->s.pEntityChunks[i]; + memcpy(p, chunk->FromMemory.pBuffer, chunk->FromMemory.BufferLength); + p += chunk->FromMemory.BufferLength; + } + + if (!ovl) + ovl = &dummy_ovl; + + if (!DeviceIoControl(queue, IOCTL_HTTP_SEND_RESPONSE, buffer, + offsetof(struct http_response, buffer[len]), NULL, 0, NULL, ovl)) + ret = GetLastError(); + + heap_free(buffer); + return ret; +} + +struct url_group +{ + struct list entry, session_entry; + HANDLE queue; + WCHAR *url; + HTTP_URL_CONTEXT context; +}; + +static struct list url_groups = LIST_INIT(url_groups); + +static struct url_group *get_url_group(HTTP_URL_GROUP_ID id) { - FIXME( "(%p, %s, %p): stub!\n", handle, debugstr_w(url), reserved ); - return ERROR_CALL_NOT_IMPLEMENTED; + struct url_group *group; + LIST_FOR_EACH_ENTRY(group, &url_groups, struct url_group, entry) + { + if ((HTTP_URL_GROUP_ID)(ULONG_PTR)group == id) + return group; + } + return NULL; +} + +struct server_session +{ + struct list entry; + struct list groups; +}; + +static struct list server_sessions = LIST_INIT(server_sessions); + +static struct server_session *get_server_session(HTTP_SERVER_SESSION_ID id) +{ + struct server_session *session; + LIST_FOR_EACH_ENTRY(session, &server_sessions, struct server_session, entry) + { + if ((HTTP_SERVER_SESSION_ID)(ULONG_PTR)session == id) + return session; + } + return NULL; } /*********************************************************************** * HttpCreateServerSession (HTTPAPI.@) */ -ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved ) +ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved) +{ + struct server_session *session; + + TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion, + version.HttpApiMinorVersion, id, reserved); + + if (!id) + return ERROR_INVALID_PARAMETER; + + if ((version.HttpApiMajorVersion != 1 && version.HttpApiMajorVersion != 2) + || version.HttpApiMinorVersion) + return ERROR_REVISION_MISMATCH; + + if (!(session = heap_alloc(sizeof(*session)))) + return ERROR_OUTOFMEMORY; + + list_add_tail(&server_sessions, &session->entry); + list_init(&session->groups); + + *id = (ULONG_PTR)session; + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpCloseServerSession (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id) +{ + struct url_group *group, *group_next; + struct server_session *session; + + TRACE("id %s.\n", wine_dbgstr_longlong(id)); + + if (!(session = get_server_session(id))) + return ERROR_INVALID_PARAMETER; + + LIST_FOR_EACH_ENTRY_SAFE(group, group_next, &session->groups, struct url_group, session_entry) + { + HttpCloseUrlGroup((ULONG_PTR)group); + } + list_remove(&session->entry); + heap_free(session); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpCreateUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved) +{ + struct server_session *session; + struct url_group *group; + + TRACE("session_id %s, group_id %p, reserved %#x.\n", + wine_dbgstr_longlong(session_id), group_id, reserved); + + if (!(session = get_server_session(session_id))) + return ERROR_INVALID_PARAMETER; + + if (!(group = heap_alloc_zero(sizeof(*group)))) + return ERROR_OUTOFMEMORY; + list_add_tail(&url_groups, &group->entry); + list_add_tail(&session->groups, &group->session_entry); + + *group_id = (ULONG_PTR)group; + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpCloseUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id) +{ + struct url_group *group; + + TRACE("id %s.\n", wine_dbgstr_longlong(id)); + + if (!(group = get_url_group(id))) + return ERROR_INVALID_PARAMETER; + + list_remove(&group->session_entry); + list_remove(&group->entry); + heap_free(group); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpSetUrlGroupProperty (HTTPAPI.@) + */ +ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length) +{ + struct url_group *group = get_url_group(id); + const HTTP_BINDING_INFO *info = value; + + TRACE("id %s, property %u, value %p, length %u.\n", + wine_dbgstr_longlong(id), property, value, length); + + if (property != HttpServerBindingProperty) + { + FIXME("Unhandled property %u.\n", property); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + TRACE("Binding to queue %p.\n", info->RequestQueueHandle); + + group->queue = info->RequestQueueHandle; + + if (group->url) + add_url(group->queue, group->url, group->context); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpAddUrlToUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, + HTTP_URL_CONTEXT context, ULONG reserved) +{ + struct url_group *group = get_url_group(id); + + TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id), + debugstr_w(url), wine_dbgstr_longlong(context), reserved); + + if (group->url) + { + FIXME("Multiple URLs are not handled!\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + if (!(group->url = heap_strdupW(url))) + return ERROR_OUTOFMEMORY; + group->context = context; + + if (group->queue) + return add_url(group->queue, url, context); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpRemoveUrlFromUrlGroup (HTTPAPI.@) + */ +ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags) +{ + struct url_group *group = get_url_group(id); + + TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); + + if (!group->url) + return ERROR_FILE_NOT_FOUND; + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + heap_free(group->url); + group->url = NULL; + + if (group->queue) + return remove_url(group->queue, url); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * HttpCreateRequestQueue (HTTPAPI.@) + */ +ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, + SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + + TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n", + version.HttpApiMajorVersion, version.HttpApiMinorVersion, + debugstr_w(name), sa, flags, handle); + + if (name) + FIXME("Unhandled name %s.\n", debugstr_w(name)); + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + RtlInitUnicodeString(&string, device_nameW); + attr.ObjectName = &string; + if (sa && sa->bInheritHandle) + attr.Attributes |= OBJ_INHERIT; + attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; + return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, + FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); +} + +/*********************************************************************** + * HttpCloseRequestQueue (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) { - FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved ); - return ERROR_ACCESS_DENIED; + TRACE("handle %p.\n", handle); + if (!CloseHandle(handle)) + return GetLastError(); + return ERROR_SUCCESS; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d8d40757b98..03b75aed8c2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -73,7 +73,7 @@ dll/win32/gdiplus # Synced to WineStaging-4.0 dll/win32/hhctrl.ocx # Synced to WineStaging-4.18 dll/win32/hlink # Synced to WineStaging-4.18 dll/win32/hnetcfg # Synced to WineStaging-4.18 -dll/win32/httpapi # Synced to WineStaging-3.3 +dll/win32/httpapi # Synced to WineStaging-4.18 dll/win32/iccvid # Synced to WineStaging-4.0 dll/win32/ieframe # Synced to WineStaging-4.0 dll/win32/imaadp32.acm # Synced to WineStaging-4.0

1 0

[reactos] 01/01: [INCLUDE/WINE] Import http.h from Wine Staging 4.18. CORE-16441
by Amine Khaldi 02 Nov '19

02 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a703f6bde879ae49057e… commit 1a703f6bde879ae49057e4c1940b4e9070a0a9a7 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 2 18:32:04 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 2 18:32:04 2019 +0100 [INCLUDE/WINE] Import http.h from Wine Staging 4.18. CORE-16441 --- sdk/include/reactos/wine/http.h | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sdk/include/reactos/wine/http.h b/sdk/include/reactos/wine/http.h new file mode 100644 index 00000000000..eb75d8f60ef --- /dev/null +++ b/sdk/include/reactos/wine/http.h @@ -0,0 +1,52 @@ +/* + * Copyright 2019 Zebediah Figura + * + * 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 + */ + +#ifndef __WINE_WINE_HTTP_H +#define __WINE_WINE_HTTP_H + +#include <windef.h> +#include <http.h> +#include <winioctl.h> + +#define IOCTL_HTTP_ADD_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_REMOVE_URL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_RECEIVE_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, 0) +#define IOCTL_HTTP_SEND_RESPONSE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x803, METHOD_BUFFERED, 0) + +struct http_add_url_params +{ + HTTP_URL_CONTEXT context; + char url[1]; +}; + +struct http_receive_request_params +{ + ULONGLONG addr; /* user-mode buffer address */ + HTTP_REQUEST_ID id; + ULONG flags; + ULONG bits; +}; + +struct http_response +{ + HTTP_REQUEST_ID id; + int len; + char buffer[1]; +}; + +#endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019