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

[PATCH] dnsapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 74b70967ae..19eecfded1 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -618,7 +618,7 @@ static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECOR goto exit; } - for (i = 0; i < sizeof(sections)/sizeof(sections[0]); i++) + for (i = 0; i < ARRAY_SIZE(sections); i++) { for (num = 0; num < ns_msg_count( msg, sections[i] ); num++) { @@ -771,7 +771,7 @@ static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format, PSTR buffer, PDWORD len ) { char name[256]; - DWORD size = sizeof(name)/sizeof(name[0]); + DWORD size = ARRAY_SIZE(name); if (!GetComputerNameExA( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST; @@ -790,7 +790,7 @@ static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDWORD len ) { WCHAR name[256]; - DWORD size = sizeof(name)/sizeof(name[0]); + DWORD size = ARRAY_SIZE(name); if (!GetComputerNameExW( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST; -- 2.14.4

1 0

[PATCH] evr: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/evr/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index ed5c9f4c79..313d518b76 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -154,13 +154,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) && !IsEqualGUID( &IID_IUnknown, riid)) return E_NOINTERFACE; - for (i = 0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; -- 2.14.4

1 0

[PATCH] fusion: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/fusion/asmcache.c | 8 ++++---- dlls/fusion/fusion.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 668aa8777e..deca5f4c37 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -117,14 +117,14 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version, if (!strcmp(version, "v4.0.30319")) { strcpyW(dir + len, dotnet); - len += sizeof(dotnet)/sizeof(WCHAR) -1; + len += ARRAY_SIZE(dotnet) - 1; strcpyW(dir + len, gac + 1); - len += sizeof(gac)/sizeof(WCHAR) - 2; + len += ARRAY_SIZE(gac) - 2; } else { strcpyW(dir + len, gac); - len += sizeof(gac)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(gac) - 1; } switch (architecture) { @@ -433,7 +433,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL; PEKIND architecture; char *clr_version; - DWORD i, count = 0, src_len, dst_len = sizeof(format_v40)/sizeof(format_v40[0]); + DWORD i, count = 0, src_len, dst_len = ARRAY_SIZE(format_v40); HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index b038b38092..a57d7e067c 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -144,9 +144,9 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, case ASM_CACHE_GAC: { strcpyW(path + len, assembly); - len += sizeof(assembly)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(assembly) - 1; strcpyW(path + len, gac); - len += sizeof(gac)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(gac) - 1; break; } case ASM_CACHE_DOWNLOAD: @@ -156,13 +156,13 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, } case ASM_CACHE_ROOT: strcpyW(path + len, assembly); - len += sizeof(assembly)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(assembly) - 1; break; case ASM_CACHE_ROOT_EX: strcpyW(path + len, dotnet); - len += sizeof(dotnet)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(dotnet) - 1; strcpyW(path + len, assembly); - len += sizeof(assembly)/sizeof(WCHAR) - 1; + len += ARRAY_SIZE(assembly) - 1; break; default: return E_INVALIDARG; -- 2.14.4

1 0

[PATCH] hhctrl.ocx: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hhctrl.ocx/chm.c | 12 ++++++------ dlls/hhctrl.ocx/help.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 8cf2539d71..01403368b0 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -483,12 +483,12 @@ LPCWSTR skip_schema(LPCWSTR url) static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - if(!strncmpiW(its_schema, url, sizeof(its_schema)/sizeof(WCHAR))) - return url+sizeof(its_schema)/sizeof(WCHAR); - if(!strncmpiW(msits_schema, url, sizeof(msits_schema)/sizeof(WCHAR))) - return url+sizeof(msits_schema)/sizeof(WCHAR); - if(!strncmpiW(mk_schema, url, sizeof(mk_schema)/sizeof(WCHAR))) - return url+sizeof(mk_schema)/sizeof(WCHAR); + if(!strncmpiW(its_schema, url, ARRAY_SIZE(its_schema))) + return url + ARRAY_SIZE(its_schema); + if(!strncmpiW(msits_schema, url, ARRAY_SIZE(msits_schema))) + return url + ARRAY_SIZE(msits_schema); + if(!strncmpiW(mk_schema, url, ARRAY_SIZE(mk_schema))) + return url + ARRAY_SIZE(mk_schema); return url; } diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index c7a2a7a9e2..75b28f2f57 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -241,7 +241,7 @@ static BOOL AppendFullPathURL(LPCWSTR file, LPWSTR buf, LPCWSTR index) TRACE("%s %p %s\n", debugstr_w(file), buf, debugstr_w(index)); - if(!GetFullPathNameW(file, sizeof(full_path)/sizeof(full_path[0]), full_path, NULL)) { + if (!GetFullPathNameW(file, ARRAY_SIZE(full_path), full_path, NULL)) { WARN("GetFullPathName failed: %u\n", GetLastError()); return FALSE; } @@ -1830,7 +1830,7 @@ HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) /* Set the invalid tab ID (-1) as the default value for all * of the tabs, this matches a failed TCM_INSERTITEM call. */ - for(i=0;i<sizeof(info->tabs)/sizeof(HHTab);i++) + for (i = 0; i < ARRAY_SIZE(info->tabs); i++) info->tabs[i].id = -1; OleInitialize(NULL); @@ -1867,7 +1867,7 @@ HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) */ static char find_html_symbol(const char *entity, int entity_len) { - int max = sizeof(html_encoded_symbols)/sizeof(html_encoded_symbols[0])-1; + int max = ARRAY_SIZE(html_encoded_symbols)-1; int min = 0, dir; while(min <= max) -- 2.14.4

1 0

[PATCH] inetcpl.cpl: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 9 ++++----- dlls/inetcpl.cpl/general.c | 4 ++-- dlls/inetcpl.cpl/security.c | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 707fb3c4f7..648cd3d002 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -273,13 +273,12 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) } TRACE("ProxyEnable set to %x\n", use_proxy); - proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, - proxy, sizeof(proxy)/sizeof(proxy[0])); + proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, proxy, ARRAY_SIZE(proxy)); if(proxy_len) { proxy[proxy_len++] = ':'; - port_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, - proxy+proxy_len, sizeof(proxy)/sizeof(proxy[0])-proxy_len); + port_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, proxy+proxy_len, + ARRAY_SIZE(proxy)-proxy_len); if(!port_len) { proxy[proxy_len++] = '8'; @@ -305,7 +304,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) use_pac_script = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT); pac_script_len = GetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, - pac_script, sizeof(pac_script)/sizeof(pac_script[0])); + pac_script, ARRAY_SIZE(pac_script)); if(!pac_script_len) use_pac_script = FALSE; if(use_pac_script) { diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index e0f473caf7..b9fbf1eb0a 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -263,10 +263,10 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) if (psn->hdr.code == PSN_APPLY) { *buffer = 0; - GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, sizeof(buffer)/sizeof(WCHAR)); + GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, ARRAY_SIZE(buffer)); TRACE("EDITTEXT has %s\n", debugstr_w(buffer)); - res = parse_url_from_outside(buffer, parsed, sizeof(parsed)/sizeof(WCHAR)); + res = parse_url_from_outside(buffer, parsed, ARRAY_SIZE(parsed)); TRACE("got %d with %s\n", res, debugstr_w(parsed)); if (res) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 543ada433d..e11caf1fc3 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -73,7 +73,7 @@ static DWORD url_templates[] = {URLTEMPLATE_CUSTOM, static DWORD index_from_urltemplate(URLTEMPLATE value) { - DWORD index = sizeof(url_templates) / sizeof(url_templates[0]); + DWORD index = ARRAY_SIZE(url_templates); while((index > 0) && (url_templates[index-1] != value)) index--; @@ -105,12 +105,12 @@ static void update_security_level(secdlg_data *sd, DWORD lv_index, DWORD tb_inde current_index = (tb_index > 0) ? tb_index : index_from_urltemplate(sd->levels[lv_index]); name[0] = 0; - LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, sizeof(name)/sizeof(name[0])); + LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, ARRAY_SIZE(name)); TRACE("new level #%d: %s\n", current_index, debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL), name); name[0] = 0; - LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, sizeof(name)/sizeof(name[0])); + LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, ARRAY_SIZE(name)); TRACE("new level info: %s\n", debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL_INFO), name); @@ -134,8 +134,8 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index) SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); - lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, ARRAY_SIZE(name)); + lstrcpynW(&name[len], za->szDisplayName, ARRAY_SIZE(name) - len - 1); TRACE("new title: %s\n", debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_GROUP), name); -- 2.14.4

1 0

[PATCH] krnl386.exe16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/int21.c | 6 +++--- dlls/krnl386.exe16/interrupts.c | 4 ++-- dlls/krnl386.exe16/relay.c | 4 ++-- dlls/krnl386.exe16/snoop.c | 4 ++-- dlls/krnl386.exe16/vxd.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f32b1a767c..f5b257b6d7 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -814,8 +814,8 @@ static HANDLE INT21_CreateMagicDeviceHandle( LPCWSTR name ) return 0; } memcpy( nameW.Buffer, prefixW, sizeof(prefixW) ); - MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + sizeof(prefixW)/sizeof(WCHAR), len ); - len += sizeof(prefixW) / sizeof(WCHAR); + MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + ARRAY_SIZE(prefixW), len ); + len += ARRAY_SIZE(prefixW); nameW.Buffer[len-1] = '/'; strcpyW( nameW.Buffer + len, name ); @@ -3264,7 +3264,7 @@ static BOOL INT21_NetworkFunc (CONTEXT *context) case 0x00: /* Get machine name. */ { WCHAR dstW[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD s = sizeof(dstW) / sizeof(WCHAR); + DWORD s = ARRAY_SIZE(dstW); int len; char *dst = CTX_SEG_OFF_TO_LIN (context,context->SegDs,context->Edx); diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index e1b01b7b3d..c4448c6d00 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -103,7 +103,7 @@ static void WINAPI DOSVM_DefaultHandler( CONTEXT *context ) */ static INTPROC DOSVM_GetBuiltinHandler( BYTE intnum ) { - if (intnum < sizeof(DOSVM_VectorsBuiltin)/sizeof(INTPROC)) { + if (intnum < ARRAY_SIZE(DOSVM_VectorsBuiltin)) { INTPROC proc = DOSVM_VectorsBuiltin[intnum]; if (proc) return proc; @@ -274,7 +274,7 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum ) else if (wine_ldt_is_system(context->SegCs)) { INTPROC proc; - if (intnum >= sizeof(DOSVM_VectorsBuiltin)/sizeof(INTPROC)) return FALSE; + if (intnum >= ARRAY_SIZE(DOSVM_VectorsBuiltin)) return FALSE; if (!(proc = DOSVM_VectorsBuiltin[intnum])) return FALSE; proc( context ); } diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index f1fbc57a0f..264ba2c589 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -345,7 +345,7 @@ static int relay_call_from_16_no_debug( void *entry_point, unsigned char *args16 int args32[20]; /* look for the ret instruction */ - for (j = 0; j < sizeof(call->ret)/sizeof(call->ret[0]); j++) + for (j = 0; j < ARRAY_SIZE(call->ret); j++) if (call->ret[j] == 0xca66 || call->ret[j] == 0xcb66) break; if (call->ret[j] == 0xcb66) /* cdecl */ @@ -449,7 +449,7 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte TRACE( "\1Call %s.%d: %s(", module, ordinal, func ); /* look for the ret instruction */ - for (j = 0; j < sizeof(call->ret)/sizeof(call->ret[0]); j++) + for (j = 0; j < ARRAY_SIZE(call->ret); j++) if (call->ret[j] == 0xca66 || call->ret[j] == 0xcb66) break; if (call->ret[j] == 0xcb66) /* cdecl */ diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 95a5154a4b..4496080dad 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -262,10 +262,10 @@ static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT *context) { return; /* oops */ } while (*rets) { - for (i=0;i<sizeof((*rets)->entry)/sizeof((*rets)->entry[0]);i++) + for (i=0;i<ARRAY_SIZE((*rets)->entry);i++) if (!(*rets)->entry[i].origreturn) break; - if (i!=sizeof((*rets)->entry)/sizeof((*rets)->entry[0])) + if (i!=ARRAY_SIZE((*rets)->entry)) break; rets = &((*rets)->next); } diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index dc14600f5d..e103b96bb9 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -129,8 +129,8 @@ static HANDLE open_vxd_handle( LPCWSTR name ) return 0; } memcpy( nameW.Buffer, prefixW, sizeof(prefixW) ); - MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + sizeof(prefixW)/sizeof(WCHAR), len ); - len += sizeof(prefixW) / sizeof(WCHAR); + MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + ARRAY_SIZE(prefixW), len ); + len += ARRAY_SIZE(prefixW); nameW.Buffer[len-1] = '/'; strcpyW( nameW.Buffer + len, name ); @@ -201,7 +201,7 @@ HANDLE __wine_vxd_open( LPCWSTR filenameW, DWORD access, SECURITY_ATTRIBUTES *sa /* normalize the filename */ - if (strlenW( filenameW ) >= sizeof(name)/sizeof(WCHAR) - 4 || + if (strlenW( filenameW ) >= ARRAY_SIZE(name) - 4 || strchrW( filenameW, '/' ) || strchrW( filenameW, '\\' )) { SetLastError( ERROR_FILE_NOT_FOUND ); -- 2.14.4

1 0

[PATCH] mapi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mapi32/sendmail.c | 8 ++++---- dlls/mapi32/util.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 9ebb220c03..407dd13041 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -542,8 +542,8 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, } /* Display an error message since we apparently have no mail clients */ - LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); - LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, ARRAY_SIZE(error_msg)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, ARRAY_SIZE(msg_title)); MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); @@ -701,8 +701,8 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, } /* Display an error message since we apparently have no mail clients */ - LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); - LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, ARRAY_SIZE(error_msg)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, ARRAY_SIZE(msg_title)); MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 13e4affc39..9c3b01944a 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -903,7 +903,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path char lcid_ver[20]; UINT i; - for (i = 0; i < sizeof(fmt)/sizeof(fmt[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmt); i++) { /* FIXME: what's the correct behaviour here? */ if (!qualifier || qualifier == lcid_ver) -- 2.14.4

1 0

[PATCH] hnetcfg/tests: Pass correct parameter to WNetGetUniversalNameW
by Fabian Maurer July 20, 2018

July 20, 2018

Currently a pointer to a local variable is passed, that causes severe stack corruption. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 4e90ceb8fd..208f5838b5 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -144,7 +144,7 @@ static void test_NetFwAuthorizedApplication(void) info = (UNIVERSAL_NAME_INFOW *)&netpath; sz = sizeof(netpath); - hr = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, &info, &sz); + hr = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, info, &sz); if (hr != NO_ERROR) { info->lpUniversalName = netpath + sizeof(*info)/sizeof(WCHAR); -- 2.18.0

1 1

[PATCH v2] cmd: Change parsing of the if command to avoid parsing the operators.
by Bernhard Übelacker July 20, 2018

July 20, 2018

Found while trying to look into #44236. A batch script is executed containing a line like this: if (%1)==(p) start /W " " "%SFDIR%WSFplot" wr2300.t35 3 This returns an error like this: Syntax error Can't recognize 'p' as an internal or external command, or batch script. It looks like native does handle the brackets differently when contained inside the condition part of the if command. Therefore this patch tries to skip the parsing in WCMD_ReadAndParseLine of that part. Therefore it moves most of the content of WCMD_if into a helper and calls that to estimate how long the condition part is. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44338 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- History: v0: Some comments in bug tracker by Vijay Kamuju. v1: https://www.winehq.org/pipermail/wine-devel/2018-January/121764.html (Received no comments.) v2: * Rebased to wine 3.13. * Removed --- in commit message making patchwatcher ignoring Signed-off-by line. --- programs/cmd/builtins.c | 79 ++++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 20 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++ programs/cmd/wcmd.h | 2 + programs/cmd/wcmdmain.c | 30 +++++++-- 5 files changed, 98 insertions(+), 37 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 088632f214..4dcf48fa3e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2824,25 +2824,9 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato return -1; } -/**************************************************************************** - * WCMD_if - * - * Batch file conditional. - * - * On entry, cmdlist will point to command containing the IF, and optionally - * the first command to execute (if brackets not found) - * If &&'s were found, this may be followed by a record flagged as isAmpersand - * If ('s were found, execute all within that bracket - * Command may optionally be followed by an ELSE - need to skip instructions - * in the else using the same logic - * - * FIXME: Much more syntax checking needed! - */ -void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) { - int negate; /* Negate condition */ - int test; /* Condition evaluation result */ - WCHAR condition[MAX_PATH], *command; + WCHAR condition[MAX_PATH]; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; static const WCHAR existW[] = {'e','x','i','s','t','\0'}; @@ -2850,36 +2834,36 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) static const WCHAR parmI[] = {'/','I','\0'}; int caseInsensitive = (strstrW(quals, parmI) != NULL); - negate = !lstrcmpiW(param1,notW); - strcpyW(condition, (negate ? param2 : param1)); + *negate = !lstrcmpiW(param1,notW); + strcpyW(condition, (*negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); + WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); WCHAR *endptr; long int param_int = strtolW(param, &endptr, 10); if (*endptr) goto syntax_err; - test = ((long int)errorlevel >= param_int); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + *test = ((long int)errorlevel >= param_int); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, existW)) { WIN32_FIND_DATAW fd; - HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); - test = (hff != INVALID_HANDLE_VALUE ); - if (test) FindClose(hff); + HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE), &fd); + *test = (hff != INVALID_HANDLE_VALUE ); + if (*test) FindClose(hff); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, defdW)) { - test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), + *test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE), NULL, 0) > 0); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else { /* comparison operation */ WCHAR leftOperand[MAXSTRING], rightOperand[MAXSTRING], operator[MAXSTRING]; WCHAR *paramStart; - strcpyW(leftOperand, WCMD_parameter(p, negate+caseInsensitive, &paramStart, TRUE, FALSE)); + strcpyW(leftOperand, WCMD_parameter(p, (*negate)+caseInsensitive, &paramStart, TRUE, FALSE)); if (!*leftOperand) goto syntax_err; @@ -2900,14 +2884,43 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) if (!*rightOperand) goto syntax_err; - test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); - if (test == -1) + *test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); + if (*test == -1) goto syntax_err; p = paramStart + strlenW(rightOperand); - WCMD_parameter(p, 0, &command, FALSE, FALSE); + WCMD_parameter(p, 0, command, FALSE, FALSE); } + return 1; + +syntax_err: + return -1; +} + +/**************************************************************************** + * WCMD_if + * + * Batch file conditional. + * + * On entry, cmdlist will point to command containing the IF, and optionally + * the first command to execute (if brackets not found) + * If &&'s were found, this may be followed by a record flagged as isAmpersand + * If ('s were found, execute all within that bracket + * Command may optionally be followed by an ELSE - need to skip instructions + * in the else using the same logic + * + * FIXME: Much more syntax checking needed! + */ +void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +{ + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *command; + + if (evaluate_if_condition(p, &command, &test, &negate) == -1) + goto syntax_err; + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b9e9b259a9..2b6e3f16d7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -908,6 +908,26 @@ if %elseIF% == 1 ( ) else ( echo else if seems to be broken ) +if ()==() ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if 1(==1( ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if )==) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if /i not (a)==(b) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3118359265..70dc81631c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -658,6 +658,10 @@ if seems not to detect /c as parameter else if seems to work else if seems to work else if seems to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8d6eb6b48e..619f65df92 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -154,6 +154,8 @@ static inline BOOL ends_with_backslash( const WCHAR *path ) return path[0] && path[strlenW(path) - 1] == '\\'; } +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate); + /* Data structure to hold context when executing batch files */ typedef struct _BATCH_CONTEXT { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8fe2d574e5..d137b152d5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1921,13 +1921,35 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this is only true in the command portion of the IF statement, but this - should suffice for now - FIXME: Silly syntax like "if 1(==1( ( - echo they equal - )" will be parsed wrong */ + should suffice for now. + To be able to handle ('s in the condition part take as much as evaluate_if_condition + would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, sizeof(ifCmd)/sizeof(ifCmd[0]), curPos)) { + static const WCHAR parmI[] = {'/','I','\0'}; + static const WCHAR notW[] = {'n','o','t','\0'}; + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *p, *command; + inIf = TRUE; + p = curPos+(sizeof(ifCmd)/sizeof(*ifCmd)); + while (*p == ' ' || *p == '\t') { + p++; + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) + p += strlenW(notW); + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) + p += strlenW(parmI); + } + + if (evaluate_if_condition(p, &command, &test, &negate) != -1) + { + int if_condition_len = command - curPos; + memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); + (*curLen)+=if_condition_len; + curPos+=if_condition_len; + } + } else if (WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), curPos)) { const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; inElse = TRUE; -- 2.18.0

1 0

[PATCH] wrc: Don't crash when parsing COMBOBOX element without style
by Fabian Maurer July 20, 2018

July 20, 2018

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- tools/wrc/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 0f73f906b6..8196e9f7fa 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control defaultstyle |= LBS_NOTIFY | WS_BORDER; break; case CT_COMBOBOX: - if (!(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) + if (!ctrl->gotstyle || !(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) defaultstyle |= CBS_SIMPLE; break; case CT_STATIC: -- 2.18.0

1 0