July 2018 - Wine-Devel - list.winehq.org

[PATCH] urlmon: Use ARRAY_SIZE() macro.
by Nikolay Sivov July 9, 2018

July 9, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/axinstall.c | 24 ++++++++++++------------ dlls/urlmon/binding.c | 2 +- dlls/urlmon/file.c | 2 +- dlls/urlmon/http.c | 4 ++-- dlls/urlmon/internet.c | 2 +- dlls/urlmon/mimefilter.c | 14 +++++++------- dlls/urlmon/sec_mgr.c | 8 ++++---- dlls/urlmon/session.c | 10 ++++------ dlls/urlmon/umon.c | 4 ++-- dlls/urlmon/uri.c | 18 +++++++++--------- 10 files changed, 43 insertions(+), 45 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index d2cf7e6d85..5eac00d46c 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -154,12 +154,12 @@ static void expand_command(install_ctx_t *ctx, const WCHAR *cmd, WCHAR *buf, siz memcpy(buf+len, prev_ptr, ptr-prev_ptr); len += ptr-prev_ptr; - if(!strncmpiW(ptr, expand_dirW, sizeof(expand_dirW)/sizeof(WCHAR))) { + if(!strncmpiW(ptr, expand_dirW, ARRAY_SIZE(expand_dirW))) { len2 = strlenW(ctx->tmp_dir); if(buf) memcpy(buf+len, ctx->tmp_dir, len2*sizeof(WCHAR)); len += len2; - ptr += sizeof(expand_dirW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(expand_dirW); }else { FIXME("Can't expand %s\n", debugstr_w(ptr)); if(buf) @@ -185,7 +185,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) static const WCHAR runW[] = {'r','u','n',0}; - len = GetPrivateProfileStringW(sect_name, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + len = GetPrivateProfileStringW(sect_name, NULL, NULL, buf, ARRAY_SIZE(buf), ctx->install_file); if(!len) return S_OK; @@ -194,7 +194,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) WCHAR *cmd; size_t size; - len = GetPrivateProfileStringW(sect_name, runW, NULL, val, sizeof(val)/sizeof(*val), ctx->install_file); + len = GetPrivateProfileStringW(sect_name, runW, NULL, val, ARRAY_SIZE(val), ctx->install_file); TRACE("Run %s\n", debugstr_w(val)); @@ -229,14 +229,14 @@ static HRESULT install_inf_file(install_ctx_t *ctx) static const WCHAR setup_hooksW[] = {'S','e','t','u','p',' ','H','o','o','k','s',0}; static const WCHAR add_codeW[] = {'A','d','d','.','C','o','d','e',0}; - len = GetPrivateProfileStringW(setup_hooksW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + len = GetPrivateProfileStringW(setup_hooksW, NULL, NULL, buf, ARRAY_SIZE(buf), ctx->install_file); if(len) { default_install = FALSE; for(key = buf; *key; key += strlenW(key)+1) { TRACE("[Setup Hooks] key: %s\n", debugstr_w(key)); - len = GetPrivateProfileStringW(setup_hooksW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + len = GetPrivateProfileStringW(setup_hooksW, key, NULL, sect_name, ARRAY_SIZE(sect_name), ctx->install_file); if(!len) { WARN("Could not get key value\n"); @@ -249,14 +249,14 @@ static HRESULT install_inf_file(install_ctx_t *ctx) } } - len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, ARRAY_SIZE(buf), ctx->install_file); if(len) { default_install = FALSE; for(key = buf; *key; key += strlenW(key)+1) { TRACE("[Add.Code] key: %s\n", debugstr_w(key)); - len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, ARRAY_SIZE(sect_name), ctx->install_file); if(!len) { WARN("Could not get key value\n"); @@ -290,7 +290,7 @@ static HRESULT install_cab_file(install_ctx_t *ctx) DWORD i; HRESULT hres; - GetTempPathW(sizeof(tmp_path)/sizeof(WCHAR), tmp_path); + GetTempPathW(ARRAY_SIZE(tmp_path), tmp_path); for(i=0; !res && i < 100; i++) { GetTempFileNameW(tmp_path, NULL, GetTickCount() + i*17037, tmp_dir); @@ -336,13 +336,13 @@ static void update_counter(install_ctx_t *ctx, HWND hwnd) HWND button_hwnd; KillTimer(hwnd, ctx->timer); - LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALL, text, sizeof(text)/sizeof(WCHAR)); + LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALL, text, ARRAY_SIZE(text)); button_hwnd = GetDlgItem(hwnd, ID_AXINSTALL_INSTALL_BTN); EnableWindow(button_hwnd, TRUE); }else { WCHAR buf[100]; - LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALLN, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(urlmon_instance, IDS_AXINSTALL_INSTALLN, buf, ARRAY_SIZE(buf)); sprintfW(text, buf, ctx->counter); } @@ -476,7 +476,7 @@ static void failure_msgbox(install_ctx_t *ctx, HRESULT hres) { WCHAR buf[1024], fmt[1024]; - LoadStringW(urlmon_instance, IDS_AXINSTALL_FAILURE, fmt, sizeof(fmt)/sizeof(WCHAR)); + LoadStringW(urlmon_instance, IDS_AXINSTALL_FAILURE, fmt, ARRAY_SIZE(fmt)); sprintfW(buf, fmt, hres); MessageBoxW(ctx->hwnd, buf, NULL, MB_OK); } diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index c2879b21c5..fdabdfcc81 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -202,7 +202,7 @@ static LPWSTR get_mime_clsid(LPCWSTR mime, CLSID *clsid) len = strlenW(mime)+1; key_name = heap_alloc(sizeof(mime_keyW) + len*sizeof(WCHAR)); memcpy(key_name, mime_keyW, sizeof(mime_keyW)); - strcpyW(key_name + sizeof(mime_keyW)/sizeof(WCHAR), mime); + strcpyW(key_name + ARRAY_SIZE(mime_keyW), mime); res = RegOpenKeyW(HKEY_CLASSES_ROOT, key_name, &hkey); heap_free(key_name); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 9e7f3cf184..11e6ecee90 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -304,7 +304,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); size = 0; - hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); + hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, ARRAY_SIZE(path), &size, 0); if(FAILED(hres)) { WARN("CoInternetParseIUri failed: %08x\n", hres); return report_result(pOIProtSink, hres, 0); diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 5fcbd54174..1762787d09 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -342,7 +342,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques CoTaskMemFree(rootdoc_url); } - num = sizeof(accept_mimes)/sizeof(accept_mimes[0])-1; + num = ARRAY_SIZE(accept_mimes) - 1; hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_ACCEPT_MIMES, accept_mimes, num, &num); if(hres == INET_E_USE_DEFAULT_SETTING) { static const WCHAR default_accept_mimeW[] = {'*','/','*',0}; @@ -428,7 +428,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques WARN("IServiceProvider_QueryService IID_IHttpNegotiate2 failed: %08x\n", hres); /* No goto done as per native */ }else { - len = sizeof(security_id)/sizeof(security_id[0]); + len = ARRAY_SIZE(security_id); hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, security_id, &len, 0); IHttpNegotiate2_Release(http_negotiate2); if (hres != S_OK) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 28aaa0b43c..7c997a03b0 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -588,7 +588,7 @@ static HRESULT load_process_feature(INTERNETFEATURELIST feature) BOOL check_hklm = FALSE; BOOL enabled; - if (!GetModuleFileNameW(NULL, module_name, sizeof(module_name)/sizeof(WCHAR))) { + if (!GetModuleFileNameW(NULL, module_name, ARRAY_SIZE(module_name))) { ERR("Failed to get module file name: %u\n", GetLastError()); return E_UNEXPECTED; } diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index e12c2b7196..7904bf90f4 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -547,12 +547,12 @@ static BOOL is_known_mime_type(const WCHAR *mime) { unsigned i; - for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i < ARRAY_SIZE(mime_filters_any_pos); i++) { if(!strcmpW(mime, mime_filters_any_pos[i].mime)) return TRUE; } - for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + for(i=0; i < ARRAY_SIZE(mime_filters); i++) { if(!strcmpW(mime, mime_filters[i].mime)) return TRUE; } @@ -585,7 +585,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p if(proposed_mime) { ret = proposed_mime; - for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i < ARRAY_SIZE(mime_filters_any_pos); i++) { if(!strcmpW(proposed_mime, mime_filters_any_pos[i].mime)) { any_pos_mime = i; for(len=size; len>0; len--) { @@ -598,8 +598,8 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p } } - if(i == sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos)) { - for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + if(i == ARRAY_SIZE(mime_filters_any_pos)) { + for(i=0; i < ARRAY_SIZE(mime_filters); i++) { if(!strcmpW(proposed_mime, mime_filters[i].mime)) { if(!mime_filters[i].filter(buf, size)) ret = NULL; @@ -613,7 +613,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p * are not looked for if none of them was proposed */ if(!proposed_mime || any_pos_mime!=-1) { for(len=size; !ret && len>0; len--) { - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i<ARRAY_SIZE(mime_filters_any_pos); i++) { if(mime_filters_any_pos[i].filter(buf+size-len, len)) { ret = mime_filters_any_pos[i].mime; break; @@ -635,7 +635,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p for(len=size; ret==app_octetstreamW && len>0; len--) { if(!is_text_plain_char(buf[size-len])) break; - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + for(i=0; i<ARRAY_SIZE(mime_filters_any_pos); i++) { if(mime_filters_any_pos[i].filter(buf+size-len, len)) { ret = text_plainW; break; diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index eab155d54b..5f62068127 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -547,7 +547,7 @@ static HRESULT map_security_uri_to_zone(IUri *uri, DWORD *zone) else path_start = path; - if((ptr = strchrW(path_start, ':')) && ptr-path_start+1 < sizeof(root)/sizeof(WCHAR)) { + if((ptr = strchrW(path_start, ':')) && ptr-path_start+1 < ARRAY_SIZE(root)) { UINT type; memcpy(root, path_start, (ptr-path_start+1)*sizeof(WCHAR)); @@ -645,7 +645,7 @@ static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { static const WCHAR wszFormat[] = {'%','s','%','u',0}; - WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+12]; + WCHAR key_name[ARRAY_SIZE(wszZonesKey) + 12]; DWORD res; wsprintfW(key_name, wszFormat, wszZonesKey, zone); @@ -1307,7 +1307,7 @@ static LPDWORD build_zonemap_from_reg(void) while (!res) { name[0] = '\0'; - len = sizeof(name) / sizeof(name[0]); + len = ARRAY_SIZE(name); res = RegEnumKeyExW(hkey, used, name, &len, NULL, NULL, NULL, NULL); if (!res) { @@ -2052,7 +2052,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION const WCHAR *tmp = ret_url; /* Check and see if a "//" is after the scheme name. */ - tmp += sizeof(fileW)/sizeof(WCHAR); + tmp += ARRAY_SIZE(fileW); if(*tmp != '/' || *(tmp+1) != '/') hres = E_INVALIDARG; } diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index dea1c9f121..34ff5448fb 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -86,7 +86,7 @@ static HRESULT get_protocol_cf(LPCWSTR schema, DWORD schema_len, CLSID *pclsid, wszKey = heap_alloc(sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); - memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); + memcpy(wszKey + ARRAY_SIZE(wszProtocolsKey), schema, (schema_len+1)*sizeof(WCHAR)); res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey); heap_free(wszKey); @@ -171,8 +171,7 @@ BOOL is_registered_protocol(LPCWSTR url) WCHAR schema[64]; HRESULT hres; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, ARRAY_SIZE(schema), &schema_len, 0); if(FAILED(hres)) return FALSE; @@ -188,8 +187,7 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR url) DWORD schema_len; HRESULT hres; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, ARRAY_SIZE(schema), &schema_len, 0); if(FAILED(hres) || !schema_len) return NULL; @@ -578,7 +576,7 @@ static void ensure_useragent(void) DWORD value_len; while(1) { - value_len = sizeof(buf)/sizeof(WCHAR); + value_len = ARRAY_SIZE(buf); res = RegEnumValueW(key, idx, buf, &value_len, NULL, NULL, NULL, NULL); if(res != ERROR_SUCCESS) break; diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 9e46319358..116f593348 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -627,7 +627,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker if (!szURL || !ppmk) return E_INVALIDARG; - if(dwFlags >= sizeof(create_flags_map)/sizeof(*create_flags_map)) { + if(dwFlags >= ARRAY_SIZE(create_flags_map)) { FIXME("Unsupported flags %x\n", dwFlags); return E_INVALIDARG; } @@ -680,7 +680,7 @@ HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker ** if (!pUri || !ppmk) return E_INVALIDARG; - if(dwFlags >= sizeof(create_flags_map)/sizeof(*create_flags_map)) { + if(dwFlags >= ARRAY_SIZE(create_flags_map)) { FIXME("Unsupported flags %x\n", dwFlags); return E_INVALIDARG; } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 8de3161a7b..92978dc53f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -365,7 +365,7 @@ static inline BOOL is_ascii(WCHAR c) static BOOL is_default_port(URL_SCHEME scheme, DWORD port) { DWORD i; - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(default_ports[i].scheme == scheme && default_ports[i].port) return TRUE; } @@ -556,7 +556,7 @@ void find_domain_name(const WCHAR *host, DWORD host_len, * Ex: edu.uk -> has no domain name. * foo.uk -> foo.uk as the domain name. */ - for(i = 0; i < sizeof(recognized_tlds)/sizeof(recognized_tlds[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(recognized_tlds); ++i) { if(!StrCmpNIW(host, recognized_tlds[i].tld_name, 3)) return; } @@ -584,7 +584,7 @@ void find_domain_name(const WCHAR *host, DWORD host_len, * www.google.foo.uk -> foo.uk as the domain name. */ if(last_tld - (sec_last_tld+1) == 3) { - for(i = 0; i < sizeof(recognized_tlds)/sizeof(recognized_tlds[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(recognized_tlds); ++i) { if(!StrCmpNIW(sec_last_tld+1, recognized_tlds[i].tld_name, 3)) { const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); @@ -1134,7 +1134,7 @@ static BOOL parse_scheme_type(parse_data *data) { if(data->scheme && data->scheme_len) { DWORD i; - for(i = 0; i < sizeof(recognized_schemes)/sizeof(recognized_schemes[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(recognized_schemes); ++i) { if(lstrlenW(recognized_schemes[i].scheme_name) == data->scheme_len) { /* Has to be a case insensitive compare. */ if(!StrCmpNIW(recognized_schemes[i].scheme_name, data->scheme, data->scheme_len)) { @@ -2728,7 +2728,7 @@ static BOOL canonicalize_port(const parse_data *data, Uri *uri, DWORD flags, BOO uri->port_offset = -1; /* Check if the scheme has a default port. */ - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(default_ports[i].scheme == data->scheme_type) { has_default_port = TRUE; default_port = default_ports[i].port; @@ -3154,7 +3154,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, uri->display_modifiers |= URI_DISPLAY_NO_ABSOLUTE_URI; /* Windows also sets the port for these (if they have one). */ - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(data->scheme_type == default_ports[i].scheme) { uri->has_port = TRUE; uri->port = default_ports[i].port; @@ -4121,7 +4121,7 @@ static DWORD generate_raw_uri(const parse_data *data, BSTR uri, DWORD flags) { DWORD i; BOOL is_default = FALSE; - for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + for(i = 0; i < ARRAY_SIZE(default_ports); ++i) { if(data->scheme_type == default_ports[i].scheme && data->port_value == default_ports[i].port) is_default = TRUE; @@ -7002,7 +7002,7 @@ static HRESULT parse_rootdocument(const Uri *uri, LPWSTR output, DWORD output_le memcpy(ptr, colon_slashesW, sizeof(colon_slashesW)); /* Add the authority. */ - ptr += sizeof(colon_slashesW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(colon_slashesW); memcpy(ptr, uri->canon_uri+uri->authority_start, uri->authority_len*sizeof(WCHAR)); /* Add the '/' after the authority. */ @@ -7066,7 +7066,7 @@ static HRESULT parse_path_from_url(const Uri *uri, LPWSTR output, DWORD output_l static const WCHAR slash_slashW[] = {'\\','\\'}; memcpy(ptr, slash_slashW, sizeof(slash_slashW)); - ptr += sizeof(slash_slashW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(slash_slashW); memcpy(ptr, uri->canon_uri+uri->host_start, uri->host_len*sizeof(WCHAR)); ptr += uri->host_len; } -- 2.18.0

2 1

[PATCH 1/3] ntdll: Only set owned bits in RTL_BITMAP
by janisozaur＠gmail.com July 9, 2018

July 9, 2018

From: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/ntdll/rtlbitmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 318f6fcbd4..c3e9385ec0 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -157,7 +157,8 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) USHORT initialWord = NTDLL_maskBits[ulCount] << (ulStart & 7); *lpOut++ |= (initialWord & 0xff); - *lpOut |= (initialWord >> 8); + if (lpOut < ((BYTE *)lpBits->Buffer) + (lpBits->SizeOfBitMap / 8)) + *lpOut |= (initialWord >> 8); return; } } @@ -218,7 +219,8 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) USHORT initialWord = ~(NTDLL_maskBits[ulCount] << (ulStart & 7)); *lpOut++ &= (initialWord & 0xff); - *lpOut &= (initialWord >> 8); + if (lpOut < ((BYTE *)lpBits->Buffer) + (lpBits->SizeOfBitMap / 8)) + *lpOut &= (initialWord >> 8); return; } } -- 2.17.1

2 3

[PATCH v2] msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.
by Piotr Caban July 9, 2018

July 9, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - update all specfiles .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-)

1 0

[website] German translation for vkd3d release 1.0 (try 2)
by Julian Rüger July 9, 2018

July 9, 2018

Signed-off-by: Julian Rüger <jr98(a)gmx.net> --- v2: Fixed a typo spotted by Florian Pelz.

1 0

[PATCH] ntdll/tests: Skip the map protect tests if we can't disable no-exec.
by Huw Davies July 9, 2018

July 9, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- When run as a stand-alone test most of the testbot VMs have the process execute flags bits MAP_EXECUTE_OPTION_DISBABLE and MAP_EXECUTE_OPTION_PERMANENT set. With the permanent bit set, it's not possible to turn off no-exec. It's unclear why, when run as part of winetest, this is not the case. Also note that this test doesn't run on 64-bit, as apparently the process execute flags are not supported on that platform. dlls/ntdll/tests/info.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4a2d9e6933..7d60b94f15 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1776,20 +1776,30 @@ static void test_mapprotection(void) NTSTATUS status; SIZE_T retlen, count; void (*f)(void); + BOOL reset_flags = FALSE; - if (!pNtClose) { - skip("No NtClose ... Win98\n"); - return; - } /* Switch to being a noexec unaware process */ status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof (oldflags), &flagsize); - if (status == STATUS_INVALID_PARAMETER) { - skip("Invalid Parameter on ProcessExecuteFlags query?\n"); + if (status == STATUS_INVALID_PARAMETER) + { + skip("Unable to query process execute flags on this platform\n"); return; } - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); - status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + trace("Process execute flags %08x\n", oldflags); + + if (oldflags & MEM_EXECUTE_OPTION_DISABLE) + { + if (oldflags & MEM_EXECUTE_OPTION_PERMANENT) + { + skip("Unable to turn off noexec\n"); + return; + } + + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + reset_flags = TRUE; + } size.u.LowPart = 0x2000; size.u.HighPart = 0; @@ -1832,8 +1842,8 @@ static void test_mapprotection(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); pNtClose (h); - /* Switch back */ - pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); + if (reset_flags) + pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); } static void test_queryvirtualmemory(void) -- 2.16.2

1 0

[PATCH v2] browseui: Implement IProgressDialog::SetAnimation.
by Alistair Leslie-Hughes July 9, 2018

July 9, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/browseui/browseui.rc | 2 +- dlls/browseui/progressdlg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 833b139413..4c612e93e3 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -32,7 +32,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_C CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, ACS_TRANSPARENT | ACS_AUTOPLAY, 12, 10, 236, 25 LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 09c1996a59..2de60e434e 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -403,7 +403,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId) { - FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId); + ProgressDialog *This = impl_from_IProgressDialog(iface); + + TRACE("(%p, %p, #%x)\n", iface, hInstance, uiResourceId); + + if (IS_INTRESOURCE(uiResourceId)) + { + if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId)) + WARN("Failed to load animation\n"); + } + return S_OK; } -- 2.18.0

2 1

[PATCH] ole32: Use the more common ARRAY_SIZE spelling
by Michael Stefaniuc July 9, 2018

July 9, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/compobj.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fb69a66746..3487cca572 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -70,8 +70,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - /**************************************************************************** * This section defines variables internal to the COM module. */ @@ -1477,7 +1475,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(&params->regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(&params->regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2356,7 +2354,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) - 1]; LONG res; HKEY key; @@ -2391,7 +2389,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; DWORD res; WCHAR buf[CHARS_IN_GUID]; - WCHAR keyname[ARRAYSIZE(szAppIdKey) + CHARS_IN_GUID]; + WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID]; DWORD size; HKEY hkey; DWORD type; @@ -2599,7 +2597,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) { static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; - WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)]; + WCHAR path[ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAY_SIZE(wszPSC)]; APARTMENT *apt; struct registered_psclsid *registered_psclsid; ACTCTX_SECTION_KEYED_DATA data; @@ -2642,8 +2640,8 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) /* Interface\\{string form of riid}\\ProxyStubClsid32 */ strcpyW(path, wszInterface); - StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); - strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); + StringFromGUID2(riid, path + ARRAY_SIZE(wszInterface) - 1, CHARS_IN_GUID); + strcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); hr = get_ps_clsid_from_registry(path, 0, pclsid); if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || @@ -2971,7 +2969,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_da else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -3829,7 +3827,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) if(IsEqualGUID(clsidNew, &CLSID_NULL)){ RegDeleteKeyW(hkey, wszTreatAs); }else{ - if(!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew))){ + if(!StringFromGUID2(clsidNew, szClsidNew, ARRAY_SIZE(szClsidNew))){ WARN("StringFromGUID2 failed\n"); res = E_FAIL; goto done; @@ -5087,7 +5085,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) regdata.u.hkey = hkey; regdata.hkey = TRUE; - if (COM_RegReadPath(&regdata, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(&regdata, dllpath, ARRAY_SIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32)) -- 2.14.4

2 1

[PATCH] browseui: Implement IProgressDialog::SetAnimation.
by Alistair Leslie-Hughes July 9, 2018

July 9, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/browseui/browseui.rc | 2 +- dlls/browseui/progressdlg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 833b139..4c612e9 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -32,7 +32,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_C CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, ACS_TRANSPARENT | ACS_AUTOPLAY, 12, 10, 236, 25 LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 09c1996..ed306de 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -403,7 +403,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId) { - FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId); + ProgressDialog *This = impl_from_IProgressDialog(iface); + + TRACE("(%p, %p, %d)\n", iface, hInstance, uiResourceId); + + if (uiResourceId & ~0xFFFF) + return S_OK; + + if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId)) + WARN("Failed to load animation\n"); + return S_OK; } -- 1.9.1

2 1

[PATCH 2/3] wsdapi: Implement generation of ProbeMatches message.
by Owen Rudge July 9, 2018

July 9, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 169 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] kernel32/tests: resource: Replicate muirct.exe behavior
by Jon Doron July 9, 2018

July 9, 2018

For some reason muirct.exe is aware of the opaque structure used by BeginUpdateResource, it access the filename field of the opaque structure during it's processing. MS documentation for the muirct utility: https://docs.microsoft.com/en-us/windows/desktop/intl/resource-utilities Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" --- dlls/kernel32/tests/resource.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 74066cfba3..6db9655833 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -24,6 +24,7 @@ #include "wine/test.h" static const char filename[] = "test_.exe"; +static const wchar_t filenameW[] = L"test_.exe"; static DWORD GLE; enum constants { @@ -463,6 +464,28 @@ static void test_find_resource(void) ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); } +static void test_muirct_compatiblity(void) +{ + HANDLE res = NULL; + PVOID res_data; + PWCHAR res_filename; + + res = BeginUpdateResourceW( (PWCHAR)filenameW, FALSE ); + ok( res != NULL, "BeginUpdateResourceW failed\n" ); + res_data = GlobalLock(res); + ok( res_data != NULL, "GlobalLock failed\n" ); +#ifdef _WIN64 + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x30) ); +#else + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x18) ); +#endif + ok( res_filename != NULL, "GlobalLock for res_filename failed\n" ); + ok( !lstrcmpW(res_filename, (PWCHAR)filenameW), "Filename fields do not match\n" ); + ok( GlobalUnlock( res_filename ), "GlobalUnlock res_filenamed failed\n" ); + ok( GlobalUnlock( res_data ), "GlobalUnlock res_data failed\n" ); + ok( EndUpdateResourceW( res, TRUE ), "EndUpdateResourceW failed\n"); +} + START_TEST(resource) { DWORD i; @@ -482,6 +505,7 @@ START_TEST(resource) { const struct _sec_variants *sec = &sec_variants[i]; build_exe( &sec->build ); + test_muirct_compatiblity(); update_resources_none(); check_exe( &sec->chk_none ); update_resources_delete(); -- 2.17.1

2 3