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

[PATCH 3/3] d3d11/tests: Add test for unorm/snorm immediate constants.
by Józef Kucia 09 Jul '18

09 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ee8d465cb4e4..be7c90768c98 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18542,10 +18542,13 @@ static void test_uav_store_immediate_constant(void) { D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; ID3D11UnorderedAccessView *uav; ID3D11DeviceContext *context; struct resource_readback rb; + ID3D11Texture2D *texture; ID3D11ComputeShader *cs; + unsigned int uint_data; ID3D11Device *device; ID3D11Buffer *buffer; float float_data; @@ -18588,6 +18591,42 @@ static void test_uav_store_immediate_constant(void) 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, }; + static const DWORD cs_store_unorm_code[] = + { +#if 0 + RWTexture2D<unorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = 0.5f; + } +#endif + 0x43425844, 0x3623f1de, 0xe847109e, 0x8e3da13f, 0xb6787b06, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00001111, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const DWORD cs_store_snorm_code[] = + { +#if 0 + RWTexture2D<snorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = -0.5f; + } +#endif + 0x43425844, 0xce5397fc, 0x7464bc06, 0xc79aa56c, 0x881bd7ef, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00002222, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0xbf000000, 0xbf000000, 0xbf000000, 0xbf000000, 0x0100003e, + }; static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; static const unsigned int zero[4] = {0}; @@ -18635,7 +18674,57 @@ static void test_uav_store_immediate_constant(void) ok(float_data == 1.0f, "Got unexpected value %.8e.\n", float_data); release_resource_readback(&rb); + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_unorm_code, sizeof(cs_store_unorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0x80808080, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + + ID3D11Texture2D_Release(texture); + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_SNORM; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_snorm_code, sizeof(cs_store_snorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0xc0c0c0c0, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + ID3D11Buffer_Release(buffer); + ID3D11Texture2D_Release(texture); ID3D11ComputeShader_Release(cs); ID3D11UnorderedAccessView_Release(uav); release_test_context(&test_context); -- 2.16.4

3 2

[PATCH 2/3] wined3d: Fix snorm/unorm immediate values for UAV writes.
by Józef Kucia 09 Jul '18

09 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index af50c8b17a26..1e922c80dff7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3094,6 +3094,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_SCALAR: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); @@ -3117,6 +3119,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_VEC4: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { -- 2.16.4

2 1

[PATCH 1/3] dxgi: Avoid possible NULL pointer access in d3d11_swapchain_SetFullscreenState().
by Józef Kucia 09 Jul '18

09 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb91eec9d9a1..ae7bde73995c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -252,12 +252,11 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; - } - else - { - IDXGIOutput_Release(target); + return S_OK; } + if (target) + IDXGIOutput_Release(target); return hr; } -- 2.16.4

2 1

[PATCH] d3d9: expand rectangles in debug strings
by Rafał Mużyło 09 Jul '18

09 Jul '18

Most debug lines - except these three - expand the rectangles; so this puts things simply in sync with the rest. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

2 1

[PATCH] credui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/credui/credui_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index a4df9fe433..bf9f7d186e 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -206,7 +206,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * SetWindowPos(params->hwndBalloonTip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORD, wszText, sizeof(wszText)/sizeof(wszText[0]))) + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORD, wszText, ARRAY_SIZE(wszText))) { ERR("failed to load IDS_INCORRECTPASSWORD\n"); return; @@ -223,7 +223,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * toolinfo.lpReserved = NULL; SendMessageW(params->hwndBalloonTip, TTM_ADDTOOLW, 0, (LPARAM)&toolinfo); - if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKON, wszText, sizeof(wszText)/sizeof(wszText[0]))) + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKON, wszText, ARRAY_SIZE(wszText))) { ERR("failed to load IDS_CAPSLOCKON\n"); return; @@ -251,7 +251,7 @@ static void CredDialogShowIncorrectPasswordBalloon(HWND hwndDlg, struct cred_dia if (params->fBalloonTipActive) return; - if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORDTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORDTITLE, wszTitle, ARRAY_SIZE(wszTitle))) { ERR("failed to load IDS_INCORRECTPASSWORDTITLE\n"); return; @@ -289,7 +289,7 @@ static void CredDialogShowCapsLockBalloon(HWND hwndDlg, struct cred_dialog_param if (params->fBalloonTipActive) return; - if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKONTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKONTITLE, wszTitle, ARRAY_SIZE(wszTitle))) { ERR("failed to load IDS_IDSCAPSLOCKONTITLE\n"); return; @@ -383,8 +383,8 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) { WCHAR format[256]; WCHAR message[256]; - LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(message, sizeof(message)/sizeof(message[0]), format, params->pszTargetName); + LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, ARRAY_SIZE(format)); + snprintfW(message, ARRAY_SIZE(message), format, params->pszTargetName); SetDlgItemTextW(hwndDlg, IDC_MESSAGE, message); } SetWindowTextW(hwndUsername, params->pszUsername); @@ -408,8 +408,8 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) { WCHAR format[256]; WCHAR title[256]; - LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(title, sizeof(title)/sizeof(title[0]), format, params->pszTargetName); + LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, ARRAY_SIZE(format)); + snprintfW(title, ARRAY_SIZE(title), format, params->pszTargetName); SetWindowTextW(hwndDlg, title); } @@ -867,8 +867,8 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; WCHAR username[CREDUI_MAX_USERNAME_LENGTH + 1] = {0}; WCHAR password[CREDUI_MAX_PASSWORD_LENGTH + 1] = {0}; - DWORD len_username = sizeof(username) / sizeof(username[0]); - DWORD len_password = sizeof(password) / sizeof(password[0]); + DWORD len_username = ARRAY_SIZE(username); + DWORD len_password = ARRAY_SIZE(password); DWORD ret, flags; CREDUI_INFOW *cred_info = info; SEC_WINNT_AUTH_IDENTITY_W *id = input_id; -- 2.14.4

1 0

[PATCH] netapi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/netapi32/nbt.c | 8 +++----- dlls/netapi32/netapi32.c | 12 ++++++------ dlls/netapi32/netbios.c | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 207bd66425..4816630334 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1095,8 +1095,7 @@ static UCHAR NetBTSend(void *adapt, void *sess, PNCB ncb) wsaBufs[1].len = ncb->ncb_length; wsaBufs[1].buf = (char*)ncb->ncb_buffer; - r = WSASend(session->fd, wsaBufs, sizeof(wsaBufs) / sizeof(wsaBufs[0]), - &bytesSent, 0, NULL, NULL); + r = WSASend(session->fd, wsaBufs, ARRAY_SIZE(wsaBufs), &bytesSent, 0, NULL, NULL); if (r == SOCKET_ERROR) { NetBIOSHangupSession(ncb); @@ -1523,10 +1522,9 @@ void NetBTInit(void) char nsString[16]; DWORD size, ndx; - for (ndx = 0; ndx < sizeof(nsValueNames) / sizeof(nsValueNames[0]); - ndx++) + for (ndx = 0; ndx < ARRAY_SIZE(nsValueNames); ndx++) { - size = sizeof(nsString) / sizeof(char); + size = ARRAY_SIZE(nsString); if (RegQueryValueExA(hKey, nsValueNames[ndx], NULL, NULL, (LPBYTE)nsString, &size) == ERROR_SUCCESS) { diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index ff57c223b4..afeada6f1e 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -923,7 +923,7 @@ static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *buf static BOOL NETAPI_IsLocalComputer( LMCSTR name ) { WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD size = sizeof(buf) / sizeof(buf[0]); + DWORD size = ARRAY_SIZE(buf); BOOL ret; if (!name || !name[0]) return TRUE; @@ -2360,7 +2360,7 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, { NET_API_STATUS status; WCHAR user[UNLEN + 1]; - DWORD size, len = sizeof(user)/sizeof(user[0]); + DWORD size, len = ARRAY_SIZE(user); TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); @@ -3477,8 +3477,8 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu TRACE("(%s %p %p)\n", debugstr_w(http_path), buf, buflen); while (*p && *p != ':') { p++; len++; }; - if (len == sizeof(httpW)/sizeof(httpW[0]) && !memicmpW( http_path, httpW, len )) ssl = FALSE; - else if (len == sizeof(httpsW)/sizeof(httpsW[0]) && !memicmpW( http_path, httpsW, len )) ssl = TRUE; + if (len == ARRAY_SIZE(httpW) && !memicmpW( http_path, httpW, len )) ssl = FALSE; + else if (len == ARRAY_SIZE(httpsW) && !memicmpW( http_path, httpsW, len )) ssl = TRUE; else return ERROR_INVALID_PARAMETER; if (p[0] != ':' || p[1] != '/' || p[2] != '/') return ERROR_INVALID_PARAMETER; @@ -3506,7 +3506,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu len = len_server + 2; /* \\ */ if (ssl) len += 4; /* @SSL */ if (port) len += len_port + 1 /* @ */; - len += sizeof(davrootW)/sizeof(davrootW[0]); + len += ARRAY_SIZE(davrootW); len += len_path + 1; /* nul */ if (*buflen < len) @@ -3531,7 +3531,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu buf += len_port; } memcpy( buf, davrootW, sizeof(davrootW) ); - buf += sizeof(davrootW)/sizeof(davrootW[0]); + buf += ARRAY_SIZE(davrootW); for (i = 0; i < len_path; i++) { if (path[i] == '/') *buf++ = '\\'; diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index e16c5dcc4f..0d2bb0e012 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -135,7 +135,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, NetBIOSTransport *transport) TRACE(": transport 0x%08x, p %p\n", id, transport); if (!transport) ret = FALSE; - else if (gNumTransports >= sizeof(gTransports) / sizeof(gTransports[0])) + else if (gNumTransports >= ARRAY_SIZE(gTransports)) { FIXME("Too many transports %d\n", gNumTransports + 1); ret = FALSE; -- 2.14.4

1 0

[PATCH] oleview: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/oleview/details.c | 16 +++++++--------- programs/oleview/interface.c | 10 ++++------ programs/oleview/oleview.c | 21 ++++++++++----------- programs/oleview/tree.c | 25 +++++++++++-------------- programs/oleview/typelib.c | 16 +++++++--------- 5 files changed, 39 insertions(+), 49 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index fda9b7ce12..2ea5e293a2 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -51,7 +51,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad while(TRUE) { - lenName = sizeof(wszName)/sizeof(WCHAR); + lenName = ARRAY_SIZE(wszName); lenData = sizeof(wszData); retEnum = RegEnumValueW(hKey, i, wszName, &lenName, @@ -120,7 +120,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad { i++; - if(RegEnumKeyW(hKey, i, wszName, sizeof(wszName)/sizeof(WCHAR)) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, wszName, ARRAY_SIZE(wszName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, wszName, &hCurKey) != ERROR_SUCCESS) continue; @@ -296,14 +296,12 @@ void RefreshDetails(HTREEITEM item) memset(&tci, 0, sizeof(TCITEMW)); tci.mask = TCIF_TEXT; tci.pszText = wszBuf; - tci.cchTextMax = sizeof(wszBuf)/sizeof(wszBuf[0]); + tci.cchTextMax = ARRAY_SIZE(wszBuf); - LoadStringW(globals.hMainInst, IDS_TAB_IMPL, - wszBuf, sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_TAB_IMPL, wszBuf, ARRAY_SIZE(wszBuf)); SendMessageW(details.hTab, TCM_INSERTITEMW, 1, (LPARAM)&tci); - LoadStringW(globals.hMainInst, IDS_TAB_ACTIV, - wszBuf, sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_TAB_ACTIV, wszBuf, ARRAY_SIZE(wszBuf)); SendMessageW(details.hTab, TCM_INSERTITEMW, 2, (LPARAM)&tci); } } @@ -331,13 +329,13 @@ static void CreateTabCtrl(HWND hWnd) memset(&tci, 0, sizeof(TCITEMW)); tci.mask = TCIF_TEXT; tci.pszText = buffer; - tci.cchTextMax = sizeof(buffer)/sizeof(buffer[0]); + tci.cchTextMax = ARRAY_SIZE(buffer); details.hTab = CreateWindowW(WC_TABCONTROLW, NULL, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0, hWnd, (HMENU)TAB_WINDOW, globals.hMainInst, NULL); ShowWindow(details.hTab, SW_HIDE); - LoadStringW(globals.hMainInst, IDS_TAB_REG, buffer, sizeof(buffer)/sizeof(buffer[0])); + LoadStringW(globals.hMainInst, IDS_TAB_REG, buffer, ARRAY_SIZE(buffer)); SendMessageW(details.hTab, TCM_INSERTITEMW, 0, (LPARAM)&tci); details.hReg = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, NULL, diff --git a/programs/oleview/interface.c b/programs/oleview/interface.c index fbbd478b16..88007d127e 100644 --- a/programs/oleview/interface.c +++ b/programs/oleview/interface.c @@ -96,10 +96,9 @@ static INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, hRes = IPersistStream_IsDirty((IPersistStream *)unk); IUnknown_Release(unk); if(hRes == S_OK) - LoadStringW(globals.hMainInst, IDS_FALSE, wszBuf, - sizeof(wszBuf)/sizeof(wszBuf[0])); - else LoadStringW(globals.hMainInst, IDS_TRUE, wszBuf, - sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_FALSE, wszBuf, ARRAY_SIZE(wszBuf)); + else + LoadStringW(globals.hMainInst, IDS_TRUE, wszBuf, ARRAY_SIZE(wszBuf)); hObject = GetDlgItem(hDlgWnd, IDC_ISDIRTY); SetWindowTextW(hObject, wszBuf); return TRUE; @@ -107,8 +106,7 @@ static INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, unk = GetInterface(); IPersistStream_GetSizeMax((IPersistStream *)unk, &size); IUnknown_Release(unk); - LoadStringW(globals.hMainInst, IDS_BYTES, wszBuf, - sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_BYTES, wszBuf, ARRAY_SIZE(wszBuf)); wsprintfW(wszSize, wszFormat, U(size).LowPart, wszBuf); hObject = GetDlgItem(hDlgWnd, IDC_GETSIZEMAX); SetWindowTextW(hObject, wszSize); diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 43f3a2ec06..ca4710ee04 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -286,8 +286,7 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) switch(wParam) { case IDM_ABOUT: - LoadStringW(globals.hMainInst, IDS_ABOUT, wszAbout, - sizeof(wszAbout)/sizeof(wszAbout[0])); + LoadStringW(globals.hMainInst, IDS_ABOUT, wszAbout, ARRAY_SIZE(wszAbout)); ShellAboutW(hWnd, wszAbout, NULL, NULL); break; case IDM_COPYCLSID: @@ -380,7 +379,7 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) PROCESS_INFORMATION pi; WCHAR app[MAX_PATH]; - GetWindowsDirectoryW( app, MAX_PATH - sizeof(wszRegEdit)/sizeof(WCHAR) ); + GetWindowsDirectoryW(app, MAX_PATH - ARRAY_SIZE(wszRegEdit)); lstrcatW( app, wszRegEdit ); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); @@ -416,9 +415,9 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) static WCHAR wszName[MAX_LOAD_STRING]; WCHAR filter_typelib[MAX_LOAD_STRING], filter_all[MAX_LOAD_STRING], filter[MAX_PATH]; - LoadStringW(globals.hMainInst, IDS_OPEN, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); - LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_TYPELIB, filter_typelib, sizeof(filter_typelib)/sizeof(WCHAR)); - LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR)); + LoadStringW(globals.hMainInst, IDS_OPEN, wszTitle, ARRAY_SIZE(wszTitle)); + LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_TYPELIB, filter_typelib, ARRAY_SIZE(filter_typelib)); + LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_ALL, filter_all, ARRAY_SIZE(filter_all)); wsprintfW( filter, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); InitOpenFileName(hWnd, &ofn, filter, wszTitle, wszName); if(GetOpenFileNameW(&ofn)) CreateTypeLibWindow(globals.hMainInst, wszName); @@ -441,8 +440,8 @@ static void UpdateStatusBar(int itemID) { WCHAR info[MAX_LOAD_STRING]; - if(!LoadStringW(globals.hMainInst, itemID, info, sizeof(info)/sizeof(info[0]))) - LoadStringW(globals.hMainInst, IDS_READY, info, sizeof(info)/sizeof(info[0])); + if(!LoadStringW(globals.hMainInst, itemID, info, ARRAY_SIZE(info))) + LoadStringW(globals.hMainInst, IDS_READY, info, ARRAY_SIZE(info)); SendMessageW(globals.hStatusBar, SB_SETTEXTW, 0, (LPARAM)info); } @@ -491,7 +490,7 @@ static BOOL InitApplication(HINSTANCE hInst) WNDCLASSW wc; WCHAR wszAppName[MAX_LOAD_STRING]; - LoadStringW(hInst, IDS_APPNAME, wszAppName, sizeof(wszAppName)/sizeof(wszAppName[0])); + LoadStringW(hInst, IDS_APPNAME, wszAppName, ARRAY_SIZE(wszAppName)); memset(&wc, 0, sizeof(WNDCLASSW)); wc.lpfnWndProc = WndProc; @@ -524,8 +523,8 @@ static BOOL InitInstance(HINSTANCE hInst, int nCmdShow) {5, IDM_VIEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0} }; - LoadStringW(hInst, IDS_APPNAME, wszAppName, sizeof(wszAppName)/sizeof(wszAppName[0])); - LoadStringW(hInst, IDS_APPTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(hInst, IDS_APPNAME, wszAppName, ARRAY_SIZE(wszAppName)); + LoadStringW(hInst, IDS_APPTITLE, wszTitle, ARRAY_SIZE(wszTitle)); hWnd = CreateWindowW(wszAppName, wszTitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInst, NULL); diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 2a4ca6590c..1530c951ba 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -108,10 +108,8 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) if(FAILED(hRes)) { - LoadStringW(globals.hMainInst, IDS_CGCOFAIL, wszMessage, - sizeof(wszMessage)/sizeof(wszMessage[0])); - LoadStringW(globals.hMainInst, IDS_ABOUT, wszTitle, - sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(globals.hMainInst, IDS_CGCOFAIL, wszMessage, ARRAY_SIZE(wszMessage)); + LoadStringW(globals.hMainInst, IDS_ABOUT, wszTitle, ARRAY_SIZE(wszTitle)); #define CASE_ERR(i) case i: \ MultiByteToWideChar(CP_ACP, 0, #i, -1, wszFlagName, MAX_LOAD_STRING); \ @@ -130,7 +128,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) CASE_ERR(CO_E_APPDIDNTREG); CASE_ERR(CLASS_E_CLASSNOTAVAILABLE); default: - LoadStringW(globals.hMainInst, IDS_ERROR_UNKN, wszFlagName, sizeof(wszFlagName)/sizeof(wszFlagName[0])); + LoadStringW(globals.hMainInst, IDS_ERROR_UNKN, wszFlagName, ARRAY_SIZE(wszFlagName)); } wsprintfW(&wszMessage[lstrlenW(wszMessage)], wszFormat, @@ -273,7 +271,7 @@ static void AddCOMandAll(void) { i++; - if(RegEnumKeyW(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -302,7 +300,7 @@ static void AddCOMandAll(void) if(RegOpenKeyW(hCurKey, wszImplementedCategories, &hInfo) == ERROR_SUCCESS) { - if(RegEnumKeyW(hInfo, 0, wszComp, sizeof(wszComp)/sizeof(wszComp[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hInfo, 0, wszComp, ARRAY_SIZE(wszComp)) != ERROR_SUCCESS) break; RegCloseKey(hInfo); @@ -360,7 +358,7 @@ static void AddApplicationID(void) { i++; - if(RegEnumKeyW(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -405,7 +403,7 @@ static void AddTypeLib(void) { i++; - if(RegEnumKeyW(hKey, i, valParent, sizeof(valParent)/sizeof(valParent[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valParent, ARRAY_SIZE(valParent)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valParent, &hCurKey) != ERROR_SUCCESS) continue; @@ -414,7 +412,7 @@ static void AddTypeLib(void) { j++; - if(RegEnumKeyW(hCurKey, j, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hCurKey, j, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hCurKey, valName, &hInfoKey) != ERROR_SUCCESS) continue; @@ -423,8 +421,7 @@ static void AddTypeLib(void) if(RegQueryValueW(hInfoKey, NULL, buffer, &lenBuffer) == ERROR_SUCCESS && *buffer) { - LoadStringW(globals.hMainInst, IDS_TL_VER, wszVer, - sizeof(wszVer)/sizeof(wszVer[0])); + LoadStringW(globals.hMainInst, IDS_TL_VER, wszVer, ARRAY_SIZE(wszVer)); wsprintfW(&buffer[lstrlenW(buffer)], wszFormat, wszVer, valName); U(tvis).item.pszText = buffer; @@ -471,7 +468,7 @@ static void AddInterfaces(void) { i++; - if(RegEnumKeyW(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -518,7 +515,7 @@ static void AddComponentCategories(void) { i++; - if(RegEnumKeyW(hKey, i, keyName, sizeof(keyName)/sizeof(keyName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, keyName, ARRAY_SIZE(keyName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, keyName, &hCurKey) != ERROR_SUCCESS) continue; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index cbf6ab1f6d..4912a5fb00 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -104,8 +104,7 @@ static void ShowLastError(void) LPWSTR lpMsgBuf; WCHAR wszTitle[MAX_LOAD_STRING]; - LoadStringW(globals.hMainInst, IDS_TYPELIBTITLE, wszTitle, - sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(globals.hMainInst, IDS_TYPELIBTITLE, wszTitle, ARRAY_SIZE(wszTitle)); FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, (LPWSTR)&lpMsgBuf, 0, NULL); MessageBoxW(NULL, lpMsgBuf, wszTitle, MB_OK | MB_ICONERROR); @@ -737,7 +736,7 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent if(!cImplTypes) return 0; LoadStringW(globals.hMainInst, IDS_INHERITINTERFACES, wszInheritedInterfaces, - sizeof(wszInheritedInterfaces)/sizeof(wszInheritedInterfaces[0])); + ARRAY_SIZE(wszInheritedInterfaces)); U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; @@ -1200,12 +1199,11 @@ static int PopulateTree(void) WCHAR wszError[MAX_LOAD_STRING]; DWORD_PTR args[2]; - LoadStringW(globals.hMainInst, IDS_ERROR_LOADTYPELIB, - wszError, sizeof(wszError)/sizeof(wszError[0])); + LoadStringW(globals.hMainInst, IDS_ERROR_LOADTYPELIB, wszError, ARRAY_SIZE(wszError)); args[0] = (DWORD_PTR)typelib.wszFileName; args[1] = hRes; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - wszError, 0, 0, wszMessage, sizeof(wszMessage)/sizeof(*wszMessage), (__ms_va_list*)args); + wszError, 0, 0, wszMessage, ARRAY_SIZE(wszMessage), (__ms_va_list*)args); MessageBoxW(globals.hMainWnd, wszMessage, NULL, MB_OK|MB_ICONEXCLAMATION); return 1; } @@ -1535,8 +1533,8 @@ static void UpdateTypeLibStatusBar(int itemID) { WCHAR info[MAX_LOAD_STRING]; - if(!LoadStringW(globals.hMainInst, itemID, info, sizeof(info)/sizeof(info[0]))) - LoadStringW(globals.hMainInst, IDS_READY, info, sizeof(info)/sizeof(info[0])); + if(!LoadStringW(globals.hMainInst, itemID, info, ARRAY_SIZE(info))) + LoadStringW(globals.hMainInst, IDS_READY, info, ARRAY_SIZE(info)); SendMessageW(typelib.hStatusBar, SB_SETTEXTW, 0, (LPARAM)info); } @@ -1639,7 +1637,7 @@ BOOL TypeLibRegisterClassW(void) BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName) { WCHAR wszTitle[MAX_LOAD_STRING]; - LoadStringW(hInst, IDS_TYPELIBTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(hInst, IDS_TYPELIBTITLE, wszTitle, ARRAY_SIZE(wszTitle)); if(wszFileName) lstrcpyW(typelib.wszFileName, wszFileName); else -- 2.14.4

1 0

[PATCH] view: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/view/view.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 0adade7111..319152957e 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -214,12 +214,12 @@ static void UpdateWindowCaption(void) WCHAR szView[MAX_PATH]; static const WCHAR hyphenW[] = { ' ','-',' ',0 }; - LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); if (szFileTitle[0] != '\0') { lstrcpyW(szCaption, szFileTitle); - LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); lstrcatW(szCaption, hyphenW); lstrcatW(szCaption, szView); } @@ -260,10 +260,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM case IDM_OPEN: { WCHAR filename[MAX_PATH]; - if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR))) + if (FileOpen(hwnd, filename, ARRAY_SIZE(filename))) { szFileTitle[0] = 0; - GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); + GetFileTitleW(filename, szFileTitle, ARRAY_SIZE(szFileTitle)); DoOpenFile(filename); UpdateWindowCaption(); } @@ -323,7 +323,7 @@ static BOOL InitApplication(HINSTANCE hInstance) WNDCLASSEXW wc; /* Load the application description strings */ - LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, sizeof(szTitle)/sizeof(WCHAR)); + LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, ARRAY_SIZE(szTitle)); /* Fill in window class structure with parameters that describe the main window */ @@ -390,7 +390,7 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline[lstrlenW(cmdline) - 1] = 0; } szFileTitle[0] = 0; - GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); + GetFileTitleW(cmdline, szFileTitle, ARRAY_SIZE(szFileTitle)); DoOpenFile(cmdline); UpdateWindowCaption(); } -- 2.14.4

1 0

[PATCH] cryptui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cryptui/main.c | 221 ++++++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 138 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a652239bb3..4ac37c96df 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -73,22 +73,18 @@ static void add_cert_columns(HWND hwnd) SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); GetWindowRect(lv, &rc); - LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, ARRAY_SIZE(buf)); column.mask = LVCF_WIDTH | LVCF_TEXT; column.cx = (rc.right - rc.left) * 29 / 100 - 2; column.pszText = buf; SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); - LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); column.cx = (rc.right - rc.left) * 16 / 100 - 2; - LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 2, (LPARAM)&column); column.cx = (rc.right - rc.left) * 23 / 100 - 1; - LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 3, (LPARAM)&column); } @@ -143,11 +139,9 @@ static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(&cert->pCertInfo->NotAfter, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, - sizeof(date) / sizeof(date[0])); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, ARRAY_SIZE(date)); item.pszText = date; item.iSubItem = 2; SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); @@ -222,12 +216,10 @@ static void initialize_purpose_selection(HWND hwnd) LPSTR usages; int index; - LoadStringW(hInstance, IDS_PURPOSE_ALL, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_PURPOSE_ALL, buf, ARRAY_SIZE(buf)); index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)PurposeFilterShowAll); - LoadStringW(hInstance, IDS_PURPOSE_ADVANCED, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_PURPOSE_ADVANCED, buf, ARRAY_SIZE(buf)); index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)PurposeFilterShowAdvanced); SendMessageW(cb, CB_SETCURSEL, 0, 0); @@ -500,12 +492,12 @@ static void show_cert_stores(HWND hwnd, DWORD dwFlags, struct CertMgrData *data) if (dwFlags & CRYPTUI_CERT_MGR_PUBLISHER_TAB) { storeList = publisherStoreList; - cStores = sizeof(publisherStoreList) / sizeof(publisherStoreList[0]); + cStores = ARRAY_SIZE(publisherStoreList); } else { storeList = defaultStoreList; - cStores = sizeof(defaultStoreList) / sizeof(defaultStoreList[0]); + cStores = ARRAY_SIZE(defaultStoreList); } if (dwFlags & CRYPTUI_CERT_MGR_SINGLE_TAB_FLAG) cStores = 1; @@ -942,8 +934,7 @@ static void cert_mgr_show_cert_usages(HWND hwnd, int index) { WCHAR buf[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_NONE, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_NONE, buf, ARRAY_SIZE(buf)); SendMessageW(text, WM_SETTEXT, 0, (LPARAM)buf); } } @@ -951,8 +942,7 @@ static void cert_mgr_show_cert_usages(HWND hwnd, int index) { WCHAR buf[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_ALL, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_ALL, buf, ARRAY_SIZE(buf)); SendMessageW(text, WM_SETTEXT, 0, (LPARAM)buf); } } @@ -979,12 +969,10 @@ static void cert_mgr_do_remove(HWND hwnd) pTitle = data->title; else { - LoadStringW(hInstance, IDS_CERT_MGR, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_CERT_MGR, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, warningID, warning, - sizeof(warning) / sizeof(warning[0])); + LoadStringW(hInstance, warningID, warning, ARRAY_SIZE(warning)); if (MessageBoxW(hwnd, warning, pTitle, MB_YESNO) == IDYES) { int selection = -1; @@ -1072,7 +1060,7 @@ static int cert_mgr_sort_by_text(HWND lv, int col, int index1, int index2) WCHAR buf1[MAX_STRING_LEN]; WCHAR buf2[MAX_STRING_LEN]; - item.cchTextMax = sizeof(buf1) / sizeof(buf1[0]); + item.cchTextMax = ARRAY_SIZE(buf1); item.mask = LVIF_TEXT; item.pszText = buf1; item.iItem = index1; @@ -1490,7 +1478,7 @@ static HCERTSTORE selected_item_to_store(HWND tree, HTREEITEM hItem) memset(&item, 0, sizeof(item)); item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT; item.hItem = hItem; - item.cchTextMax = sizeof(buf) / sizeof(buf[0]); + item.cchTextMax = ARRAY_SIZE(buf); item.pszText = buf; SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); if (item.lParam) @@ -1558,12 +1546,10 @@ static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = selectInfo->info->pwszTitle; else { - LoadStringW(hInstance, IDS_SELECT_STORE_TITLE, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_SELECT_STORE_TITLE, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_SELECT_STORE, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_SELECT_STORE, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONEXCLAMATION | MB_OK); } else @@ -1958,7 +1944,7 @@ static struct OIDToString oidMap[] = { static struct OIDToString *findSupportedOID(LPCSTR oid) { - int indexHigh = sizeof(oidMap) / sizeof(oidMap[0]) - 1, indexLow = 0; + int indexHigh = ARRAY_SIZE(oidMap) - 1, indexLow = 0; while (indexLow <= indexHigh) { @@ -2397,11 +2383,9 @@ static void add_date_string_to_control(HWND hwnd, const FILETIME *fileTime) WCHAR date[80]; SYSTEMTIME sysTime; - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(fileTime, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, - sizeof(date) / sizeof(date[0])); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, ARRAY_SIZE(date)); add_unformatted_text_to_control(hwnd, date, lstrlenW(date)); } @@ -2658,8 +2642,7 @@ static WCHAR *format_long_date(const FILETIME *fileTime) SYSTEMTIME sysTime; /* FIXME: format isn't quite right, want time too */ - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SLONGDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SLONGDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(fileTime, &sysTime); len = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, NULL, 0); if (len) @@ -2693,8 +2676,7 @@ static WCHAR *field_format_public_key(PCCERT_CONTEXT cert) { WCHAR fmt[MAX_STRING_LEN]; - if (LoadStringW(hInstance, IDS_FIELD_PUBLIC_KEY_FORMAT, fmt, - sizeof(fmt) / sizeof(fmt[0]))) + if (LoadStringW(hInstance, IDS_FIELD_PUBLIC_KEY_FORMAT, fmt, ARRAY_SIZE(fmt))) { DWORD len; @@ -2795,7 +2777,7 @@ static void add_string_id_and_value_to_list(HWND hwnd, struct detail_data *data, { WCHAR buf[MAX_STRING_LEN]; - LoadStringW(hInstance, id, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, id, buf, ARRAY_SIZE(buf)); add_field_and_value_to_list(hwnd, data, buf, value, create, param); } @@ -2838,7 +2820,7 @@ static void add_v1_fields(HWND hwnd, struct detail_data *data) /* The last item in v1_fields is the public key, which is not in the loop * because it's a special case. */ - for (i = 0; i < sizeof(v1_fields) / sizeof(v1_fields[0]) - 1; i++) + for (i = 0; i < ARRAY_SIZE(v1_fields) - 1; i++) add_v1_field(hwnd, data, &v1_fields[i]); if (cert->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData) add_v1_field(hwnd, data, &v1_fields[i]); @@ -2905,7 +2887,7 @@ static WCHAR *field_format_extension_hex_with_ascii(const CERT_EXTENSION *ext) { static const WCHAR pad[] = { ' ',' ',' ' }; - for (; j % 8; j++, ptr += sizeof(pad) / sizeof(pad[0])) + for (; j % 8; j++, ptr += ARRAY_SIZE(pad)) memcpy(ptr, pad, sizeof(pad)); } /* The last sprintfW included a space, so just insert one @@ -3026,7 +3008,7 @@ static void add_properties(HWND hwnd, struct detail_data *data) DWORD i; PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; - for (i = 0; i < sizeof(prop_id_map) / sizeof(prop_id_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(prop_id_map); i++) { DWORD cb; @@ -3089,12 +3071,11 @@ static void create_show_list(HWND hwnd, struct detail_data *data) WCHAR buf[MAX_STRING_LEN]; int i; - for (i = 0; i < sizeof(listItems) / sizeof(listItems[0]); i++) + for (i = 0; i < ARRAY_SIZE(listItems); i++) { int index; - LoadStringW(hInstance, listItems[i].id, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, listItems[i].id, buf, ARRAY_SIZE(buf)); index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)data); } @@ -3110,12 +3091,12 @@ static void create_listview_columns(HWND hwnd) SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); GetWindowRect(lv, &rc); - LoadStringW(hInstance, IDS_FIELD, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_FIELD, buf, ARRAY_SIZE(buf)); column.mask = LVCF_WIDTH | LVCF_TEXT; column.cx = (rc.right - rc.left) / 2 - 2; column.pszText = buf; SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); - LoadStringW(hInstance, IDS_VALUE, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_VALUE, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); } @@ -3123,7 +3104,7 @@ static void set_fields_selection(HWND hwnd, struct detail_data *data, int sel) { HWND list = GetDlgItem(hwnd, IDC_DETAIL_LIST); - if (sel >= 0 && sel < sizeof(listItems) / sizeof(listItems[0])) + if (sel >= 0 && sel < ARRAY_SIZE(listItems)) { SendMessageW(list, LVM_DELETEALLITEMS, 0, 0); listItems[sel].add(list, data); @@ -3247,8 +3228,8 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, switch (LOWORD(wp)) { case IDOK: - SendMessageA(GetDlgItem(hwnd, IDC_NEW_PURPOSE), WM_GETTEXT, - sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + SendMessageA(GetDlgItem(hwnd, IDC_NEW_PURPOSE), WM_GETTEXT, ARRAY_SIZE(buf), + (LPARAM)buf); if (!buf[0]) { /* An empty purpose is the same as cancelling */ @@ -3259,10 +3240,8 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, { WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_ERROR, error, - sizeof(error) / sizeof(error[0])); - LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_ERROR, error, ARRAY_SIZE(error)); + LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, ARRAY_SIZE(title)); MessageBoxW(hwnd, error, title, MB_ICONERROR | MB_OK); } else if (is_oid_in_list( @@ -3270,10 +3249,9 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, { WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_EXISTS, - error, sizeof(error) / sizeof(error[0])); - LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_EXISTS, error, + ARRAY_SIZE(error)); + LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, ARRAY_SIZE(title)); MessageBoxW(hwnd, error, title, MB_ICONEXCLAMATION | MB_OK); } else @@ -3532,11 +3510,9 @@ static void apply_general_changes(HWND hwnd) struct edit_cert_data *data = (struct edit_cert_data *)GetWindowLongPtrW(hwnd, DWLP_USER); - SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), WM_GETTEXT, - sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); set_cert_string_property(data->cert, CERT_FRIENDLY_NAME_PROP_ID, buf); - SendMessageW(GetDlgItem(hwnd, IDC_DESCRIPTION), WM_GETTEXT, - sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + SendMessageW(GetDlgItem(hwnd, IDC_DESCRIPTION), WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); set_cert_string_property(data->cert, CERT_DESCRIPTION_PROP_ID, buf); if (IsDlgButtonChecked(hwnd, IDC_ENABLE_ALL_PURPOSES)) { @@ -3829,7 +3805,7 @@ static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LVITEMW item; int res; - item.cchTextMax = sizeof(buf) / sizeof(buf[0]); + item.cchTextMax = ARRAY_SIZE(buf); item.mask = LVIF_TEXT; item.pszText = buf; item.iItem = nm->iItem; @@ -4695,12 +4671,10 @@ static void import_warning(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, pTitle = szTitle; else { - LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, warningID, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, warningID, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); } } @@ -4875,8 +4849,7 @@ static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, int height; data = (struct ImportWizData *)page->lParam; - LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, - sizeof(fontFace) / sizeof(fontFace[0])); + LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, ARRAY_SIZE(fontFace)); height = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72); data->titleFont = CreateFontW(height, 0, 0, 0, FW_BOLD, 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, @@ -4935,7 +4908,7 @@ static WCHAR *make_import_file_filter(DWORD dwFlags) int len, totalLen = 2; LPWSTR filter = NULL, str; - for (i = 0; i < sizeof(import_filters) / sizeof(import_filters[0]); i++) + for (i = 0; i < ARRAY_SIZE(import_filters); i++) { if (!import_filters[i].allowFlags || !dwFlags || (dwFlags & import_filters[i].allowFlags)) @@ -4950,7 +4923,7 @@ static WCHAR *make_import_file_filter(DWORD dwFlags) LPWSTR ptr; ptr = filter; - for (i = 0; i < sizeof(import_filters) / sizeof(import_filters[0]); i++) + for (i = 0; i < ARRAY_SIZE(import_filters); i++) { if (!import_filters[i].allowFlags || !dwFlags || (dwFlags & import_filters[i].allowFlags)) @@ -5012,12 +4985,10 @@ static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, ARRAY_SIZE(error)); FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, (LPWSTR) &msgBuf, 0, NULL); @@ -5127,7 +5098,7 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ofn.hwndOwner = hwnd; ofn.lpstrFilter = make_import_file_filter(data->dwFlags); ofn.lpstrFile = fileBuf; - ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); + ofn.nMaxFile = ARRAY_SIZE(fileBuf); fileBuf[0] = 0; if (GetOpenFileNameW(&ofn)) SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_FILENAME), WM_SETTEXT, @@ -5173,8 +5144,7 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_SPECIFY_STORE), !(data->dwFlags & CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE)); - LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, - storeTitle, sizeof(storeTitle) / sizeof(storeTitle[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, storeTitle, ARRAY_SIZE(storeTitle)); SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_STORE), WM_SETTEXT, 0, (LPARAM)storeTitle); } @@ -5242,8 +5212,8 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { WCHAR storeTitle[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, - storeTitle, sizeof(storeTitle) / sizeof(storeTitle[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, storeTitle, + ARRAY_SIZE(storeTitle)); SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_STORE), WM_SETTEXT, 0, (LPARAM)storeTitle); data->hDestCertStore = store; @@ -5266,22 +5236,18 @@ static void show_import_details(HWND lv, struct ImportWizData *data) item.mask = LVIF_TEXT; item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_STORE_SELECTION, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_STORE_SELECTION, text, ARRAY_SIZE(text)); item.pszText = text; SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; if (data->autoDest) - LoadStringW(hInstance, IDS_IMPORT_DEST_AUTOMATIC, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_AUTOMATIC, text, ARRAY_SIZE(text)); else - LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_CONTENT, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_CONTENT, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); switch (data->contentType) { @@ -5307,15 +5273,14 @@ static void show_import_details(HWND lv, struct ImportWizData *data) contentID = IDS_IMPORT_CONTENT_STORE; break; } - LoadStringW(hInstance, contentID, text, sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, contentID, text, ARRAY_SIZE(text)); item.iSubItem = 1; SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); if (data->fileName) { item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_FILE, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_FILE, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; item.pszText = data->fileName; @@ -5422,12 +5387,10 @@ static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_SUCCEEDED, message, - sizeof(message) / sizeof(message[0])); + LoadStringW(hInstance, IDS_IMPORT_SUCCEEDED, message, ARRAY_SIZE(message)); MessageBoxW(hwnd, message, pTitle, MB_OK); } else @@ -5617,8 +5580,7 @@ static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, int height; data = (struct ExportWizData *)page->lParam; - LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, - sizeof(fontFace) / sizeof(fontFace[0])); + LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, ARRAY_SIZE(fontFace)); height = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72); data->titleFont = CreateFontW(height, 0, 0, 0, FW_BOLD, 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, @@ -5733,8 +5695,7 @@ static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, { WCHAR error[MAX_STRING_LEN]; - LoadStringW(hInstance, errorID, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, errorID, error, ARRAY_SIZE(error)); SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE), WM_SETTEXT, 0, (LPARAM)error); EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_YES), FALSE); @@ -5948,12 +5909,10 @@ static void export_password_mismatch(HWND hwnd, const struct ExportWizData *data pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_EXPORT_PASSWORD_MISMATCH, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_EXPORT_PASSWORD_MISMATCH, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); SetFocus(GetDlgItem(hwnd, IDC_EXPORT_PASSWORD)); } @@ -6113,12 +6072,10 @@ static BOOL export_validate_filename(HWND hwnd, struct ExportWizData *data, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_EXPORT_FILE_EXISTS, warning, - sizeof(warning) / sizeof(warning[0])); + LoadStringW(hInstance, IDS_EXPORT_FILE_EXISTS, warning, ARRAY_SIZE(warning)); if (MessageBoxW(hwnd, warning, pTitle, MB_YESNO) == IDYES) forceCreate = TRUE; else @@ -6146,12 +6103,10 @@ static BOOL export_validate_filename(HWND hwnd, struct ExportWizData *data, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, ARRAY_SIZE(error)); FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, (LPWSTR) &msgBuf, 0, NULL); @@ -6300,12 +6255,10 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_EMPTY_FILE, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_IMPORT_EMPTY_FILE, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); ret = 1; @@ -6356,7 +6309,7 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data->contextInfo.dwExportFormat, data->exportInfo.dwSubjectChoice); ofn.lpstrFile = fileBuf; - ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); + ofn.nMaxFile = ARRAY_SIZE(fileBuf); fileBuf[0] = 0; if (GetSaveFileNameW(&ofn)) SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_FILENAME), WM_SETTEXT, @@ -6381,8 +6334,7 @@ static void show_export_details(HWND lv, const struct ExportWizData *data) { item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_FILE, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_FILE, text, ARRAY_SIZE(text)); item.pszText = text; SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; @@ -6403,32 +6355,27 @@ static void show_export_details(HWND lv, const struct ExportWizData *data) { item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_EXPORT_INCLUDE_CHAIN, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, IDS_EXPORT_INCLUDE_CHAIN, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); item.iSubItem = 1; - LoadStringW(hInstance, - data->contextInfo.fExportChain ? IDS_YES : IDS_NO, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, data->contextInfo.fExportChain ? IDS_YES : IDS_NO, text, + ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_EXPORT_KEYS, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, IDS_EXPORT_KEYS, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); item.iSubItem = 1; - LoadStringW(hInstance, - data->contextInfo.fExportPrivateKeys ? IDS_YES : IDS_NO, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, data->contextInfo.fExportPrivateKeys ? IDS_YES : IDS_NO, text, + ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } } item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_EXPORT_FORMAT, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_EXPORT_FORMAT, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; @@ -6459,7 +6406,7 @@ static void show_export_details(HWND lv, const struct ExportWizData *data) contentID = IDS_EXPORT_FILTER_CERT; } } - LoadStringW(hInstance, contentID, text, sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, contentID, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } @@ -6831,12 +6778,10 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, messageID, message, - sizeof(message) / sizeof(message[0])); + LoadStringW(hInstance, messageID, message, ARRAY_SIZE(message)); MessageBoxW(hwnd, message, pTitle, mbFlags); break; } -- 2.14.4

1 0

[PATCH 6/6 v2] ucrtbase: Implement quick_exit and _crt_at_quick_exit
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 12 +++++-- dlls/ucrtbase/tests/misc.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-)

1 0