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

[PATCH] dplayx/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index f4e7301da7..ea6525fa38 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -767,7 +767,7 @@ static BOOL CALLBACK callback_providersA(GUID* guid, char *name, DWORD major, DW if (!prov) return TRUE; - if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + if (prov->call_count < ARRAY_SIZE(prov->guid_data)) { prov->guid_ptr[prov->call_count] = guid; prov->guid_data[prov->call_count] = *guid; @@ -786,7 +786,7 @@ static BOOL CALLBACK callback_providersW(GUID* guid, WCHAR *name, DWORD major, D if (!prov) return TRUE; - if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + if (prov->call_count < ARRAY_SIZE(prov->guid_data)) { prov->guid_ptr[prov->call_count] = guid; prov->guid_data[prov->call_count] = *guid; @@ -896,7 +896,7 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, { BOOL found = FALSE; int i; - for( i=0; i < sizeof(sps) / sizeof(sps[0]) && !found; i++ ) + for( i=0; i < ARRAY_SIZE(sps) && !found; i++ ) found = IsEqualGUID( sps[i], lpData ); ok( found, "Unknown Address type found %s\n", wine_dbgstr_guid(lpData) ); } -- 2.14.3

2 1

[PATCH] wscript/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wscript/tests/run.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 770fd8fd28..16d14ff79f 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -77,7 +77,7 @@ static HANDLE wscript_process; static int strcmp_wa(LPCWSTR strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -220,7 +220,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullName, ARRAY_SIZE(fullName)); if(res == 0) return E_FAIL; if(!(V_BSTR(pVarResult) = SysAllocString(fullName))) @@ -237,7 +237,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullPath, ARRAY_SIZE(fullPath)); if(res == 0) return E_FAIL; pos = mystrrchr(fullPath, '\\'); -- 2.14.3

1 0

[PATCH] cmd/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/batch.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 71966090e9..0c94d7e339 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,7 +25,7 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; static char drive[2]; -static const DWORD drive_len = sizeof(drive)/sizeof(drive[0]); +static const DWORD drive_len = ARRAY_SIZE(drive); static char path[MAX_PATH]; static DWORD path_len; static char shortpath[MAX_PATH]; @@ -469,8 +469,7 @@ START_TEST(batch) } else { path_len = 1; /* \ */ } - shortpath_len = GetShortPathNameA(path, shortpath, - sizeof(shortpath)/sizeof(shortpath[0])); + shortpath_len = GetShortPathNameA(path, shortpath, ARRAY_SIZE(shortpath)); argc = winetest_get_mainargs(&argv); if(argc > 2) -- 2.14.3

1 0

[PATCH] wmp/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmp/tests/media.c | 2 +- dlls/wmp/tests/oleobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 3fd74ad75a..218b80f1e6 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -77,7 +77,7 @@ static inline WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 41179dae5d..6dfaa1c9e1 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -79,7 +79,7 @@ static inline WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); -- 2.14.3

1 0

[PATCH] dpvoice/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpvoice/tests/voice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 7f0faa3454..2d77049a9b 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -428,11 +428,11 @@ static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDire "%s: expected ret=%x got ret=%x\n", name, DVERR_BUFFERTOOSMALL, ret); ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, "%s: got data_size=%u\n", name, data_size); - tests[sizeof(tests) / sizeof(tests[0]) - 3].data_size = data_size - 1; - tests[sizeof(tests) / sizeof(tests[0]) - 2].data_size = data_size; - tests[sizeof(tests) / sizeof(tests[0]) - 1].data_size = data_size + 1; + tests[ARRAY_SIZE(tests) - 3].data_size = data_size - 1; + tests[ARRAY_SIZE(tests) - 2].data_size = data_size; + tests[ARRAY_SIZE(tests) - 1].data_size = data_size + 1; - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for(i = 0; i < ARRAY_SIZE(tests); i++) { memset(data, 0x23, sizeof(data)); -- 2.14.3

1 0

[PATCH] dnsapi/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/tests/name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index 3e543554e7..f4d5b9e691 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -146,7 +146,7 @@ static void test_DnsValidateName_A( void ) status = DnsValidateName_A( NULL, DnsNameDomain ); ok( status == ERROR_INVALID_NAME, "succeeded unexpectedly\n" ); - for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_data); i++) { status = DnsValidateName_A( test_data[i].name, test_data[i].format ); ok( status == test_data[i].status || broken(status == test_data[i].status_broken), -- 2.14.3

1 0

[PATCH] crypt32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Just chain.c in this patch due to its size. dlls/crypt32/tests/chain.c | 349 ++++++++++++++++++++++----------------------- 1 file changed, 174 insertions(+), 175 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 0839fc7397..a6599b21ae 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3105,7 +3105,7 @@ static const CERT_TRUST_STATUS elementStatus0[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus0[] = { - { sizeof(elementStatus0) / sizeof(elementStatus0[0]), elementStatus0 }, + { ARRAY_SIZE(elementStatus0), elementStatus0 }, }; static CONST_DATA_BLOB chain1[] = { { sizeof(chain0_0), chain0_0 }, @@ -3118,7 +3118,7 @@ static const CERT_TRUST_STATUS elementStatus1[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus1[] = { - { sizeof(elementStatus1) / sizeof(elementStatus1[0]), elementStatus1 }, + { ARRAY_SIZE(elementStatus1), elementStatus1 }, }; static CONST_DATA_BLOB chain2[] = { { sizeof(chain2_0), chain2_0 }, @@ -3130,7 +3130,7 @@ static const CERT_TRUST_STATUS elementStatus2[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus2[] = { - { sizeof(elementStatus2) / sizeof(elementStatus2[0]), elementStatus2 }, + { ARRAY_SIZE(elementStatus2), elementStatus2 }, }; static CONST_DATA_BLOB chain3[] = { { sizeof(chain3_0), chain3_0 }, @@ -3142,7 +3142,7 @@ static const CERT_TRUST_STATUS elementStatus3[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus3[] = { - { sizeof(elementStatus3) / sizeof(elementStatus3[0]), elementStatus3 }, + { ARRAY_SIZE(elementStatus3), elementStatus3 }, }; static CONST_DATA_BLOB chain4[] = { { sizeof(chain4_0), chain4_0 }, @@ -3156,7 +3156,7 @@ static const CERT_TRUST_STATUS elementStatus4[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus4[] = { - { sizeof(elementStatus4) / sizeof(elementStatus4[0]), elementStatus4 }, + { ARRAY_SIZE(elementStatus4), elementStatus4 }, }; static CONST_DATA_BLOB chain5[] = { { sizeof(chain5_0), chain5_0 }, @@ -3169,7 +3169,7 @@ static const CERT_TRUST_STATUS elementStatus5[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus5[] = { - { sizeof(elementStatus5) / sizeof(elementStatus5[0]), elementStatus5 }, + { ARRAY_SIZE(elementStatus5), elementStatus5 }, }; static CONST_DATA_BLOB chain6[] = { { sizeof(chain0_0), chain0_0 }, @@ -3181,7 +3181,7 @@ static const CERT_TRUST_STATUS elementStatus6[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus6[] = { - { sizeof(elementStatus6) / sizeof(elementStatus6[0]), elementStatus6 }, + { ARRAY_SIZE(elementStatus6), elementStatus6 }, }; static CONST_DATA_BLOB chain7[] = { { sizeof(chain0_0), chain0_0 }, @@ -3193,7 +3193,7 @@ static const CERT_TRUST_STATUS elementStatus7[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus7[] = { - { sizeof(elementStatus7) / sizeof(elementStatus7[0]), elementStatus7 }, + { ARRAY_SIZE(elementStatus7), elementStatus7 }, }; static CONST_DATA_BLOB chain8[] = { { sizeof(chain8_0), chain8_0 }, @@ -3207,7 +3207,7 @@ static const CERT_TRUST_STATUS elementStatus8[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck simpleStatus8[] = { - { sizeof(elementStatus8) / sizeof(elementStatus8[0]), elementStatus8 }, + { ARRAY_SIZE(elementStatus8), elementStatus8 }, }; static CONST_DATA_BLOB chain9[] = { { sizeof(chain9_0), chain9_0 }, @@ -3220,7 +3220,7 @@ static const CERT_TRUST_STATUS elementStatus9[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus9[] = { - { sizeof(elementStatus9) / sizeof(elementStatus9[0]), elementStatus9 }, + { ARRAY_SIZE(elementStatus9), elementStatus9 }, }; static CONST_DATA_BLOB chain10[] = { { sizeof(chain0_0), chain0_0 }, @@ -3233,7 +3233,7 @@ static const CERT_TRUST_STATUS elementStatus10[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus10[] = { - { sizeof(elementStatus10) / sizeof(elementStatus10[0]), elementStatus10 }, + { ARRAY_SIZE(elementStatus10), elementStatus10 }, }; static CONST_DATA_BLOB chain11[] = { { sizeof(chain0_0), chain0_0 }, @@ -3250,7 +3250,7 @@ static const CERT_TRUST_STATUS elementStatus12[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus12[] = { - { sizeof(elementStatus12) / sizeof(elementStatus12[0]), elementStatus12 }, + { ARRAY_SIZE(elementStatus12), elementStatus12 }, }; static CONST_DATA_BLOB chain13[] = { { sizeof(chain0_0), chain0_0 }, @@ -3262,7 +3262,7 @@ static const CERT_TRUST_STATUS elementStatus13[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus13[] = { - { sizeof(elementStatus13) / sizeof(elementStatus13[0]), elementStatus13 }, + { ARRAY_SIZE(elementStatus13), elementStatus13 }, }; static CONST_DATA_BLOB chain14[] = { { sizeof(chain14_0), chain14_0 }, @@ -3274,7 +3274,7 @@ static const CERT_TRUST_STATUS elementStatus14[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus14[] = { - { sizeof(elementStatus14) / sizeof(elementStatus14[0]), elementStatus14 }, + { ARRAY_SIZE(elementStatus14), elementStatus14 }, }; static CONST_DATA_BLOB chain15[] = { { sizeof(chain15_0), chain15_0 }, @@ -3286,7 +3286,7 @@ static const CERT_TRUST_STATUS elementStatus15[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus15[] = { - { sizeof(elementStatus15) / sizeof(elementStatus15[0]), elementStatus15 }, + { ARRAY_SIZE(elementStatus15), elementStatus15 }, }; static CONST_DATA_BLOB chain16[] = { { sizeof(chain0_0), chain0_0 }, @@ -3299,7 +3299,7 @@ static const CERT_TRUST_STATUS elementStatus16[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus16[] = { - { sizeof(elementStatus16) / sizeof(elementStatus16[0]), elementStatus16 }, + { ARRAY_SIZE(elementStatus16), elementStatus16 }, }; static CONST_DATA_BLOB chain17[] = { { sizeof(chain0_0), chain0_0 }, @@ -3313,7 +3313,7 @@ static const CERT_TRUST_STATUS elementStatus17[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus17[] = { - { sizeof(elementStatus17) / sizeof(elementStatus17[0]), elementStatus17 }, + { ARRAY_SIZE(elementStatus17), elementStatus17 }, }; static CONST_DATA_BLOB chain18[] = { { sizeof(chain0_0), chain0_0 }, @@ -3327,7 +3327,7 @@ static const CERT_TRUST_STATUS elementStatus18[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus18[] = { - { sizeof(elementStatus18) / sizeof(elementStatus18[0]), elementStatus18 }, + { ARRAY_SIZE(elementStatus18), elementStatus18 }, }; static CONST_DATA_BLOB chain19[] = { { sizeof(chain19_0), chain19_0 }, @@ -3340,7 +3340,7 @@ static const CERT_TRUST_STATUS elementStatus19[] = { CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus19[] = { - { sizeof(elementStatus19) / sizeof(elementStatus19[0]), elementStatus19 }, + { ARRAY_SIZE(elementStatus19), elementStatus19 }, }; static CONST_DATA_BLOB chain20[] = { { sizeof(chain20_0), chain20_0 }, @@ -3352,7 +3352,7 @@ static const CERT_TRUST_STATUS elementStatus20[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus20[] = { - { sizeof(elementStatus20) / sizeof(elementStatus20[0]), elementStatus20 }, + { ARRAY_SIZE(elementStatus20), elementStatus20 }, }; static CONST_DATA_BLOB chain21[] = { { sizeof(chain21_0), chain21_0 }, @@ -3365,7 +3365,7 @@ static const CERT_TRUST_STATUS elementStatus21[] = { CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus21[] = { - { sizeof(elementStatus21) / sizeof(elementStatus21[0]), elementStatus21 }, + { ARRAY_SIZE(elementStatus21), elementStatus21 }, }; static CONST_DATA_BLOB chain22[] = { { sizeof(chain22_0), chain22_0 }, @@ -3377,7 +3377,7 @@ static const CERT_TRUST_STATUS elementStatus22[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus22[] = { - { sizeof(elementStatus22) / sizeof(elementStatus22[0]), elementStatus22 }, + { ARRAY_SIZE(elementStatus22), elementStatus22 }, }; static CONST_DATA_BLOB chain23[] = { { sizeof(chain23_0), chain23_0 }, @@ -3389,7 +3389,7 @@ static const CERT_TRUST_STATUS elementStatus23[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus23[] = { - { sizeof(elementStatus23) / sizeof(elementStatus23[0]), elementStatus23 }, + { ARRAY_SIZE(elementStatus23), elementStatus23 }, }; static CONST_DATA_BLOB chain24[] = { { sizeof(chain24_0), chain24_0 }, @@ -3401,7 +3401,7 @@ static const CERT_TRUST_STATUS elementStatus24[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus24[] = { - { sizeof(elementStatus24) / sizeof(elementStatus24[0]), elementStatus24 }, + { ARRAY_SIZE(elementStatus24), elementStatus24 }, }; static CONST_DATA_BLOB chain25[] = { { sizeof(chain25_0), chain25_0 }, @@ -3413,7 +3413,7 @@ static const CERT_TRUST_STATUS elementStatus25[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus25[] = { - { sizeof(elementStatus25) / sizeof(elementStatus25[0]), elementStatus25 }, + { ARRAY_SIZE(elementStatus25), elementStatus25 }, }; static CONST_DATA_BLOB chain26[] = { { sizeof(chain26_0), chain26_0 }, @@ -3425,7 +3425,7 @@ static const CERT_TRUST_STATUS elementStatus26[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus26[] = { - { sizeof(elementStatus26) / sizeof(elementStatus26[0]), elementStatus26 }, + { ARRAY_SIZE(elementStatus26), elementStatus26 }, }; static CONST_DATA_BLOB chain27[] = { { sizeof(chain27_0), chain27_0 }, @@ -3438,7 +3438,7 @@ static const CERT_TRUST_STATUS elementStatus27[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus27[] = { - { sizeof(elementStatus27) / sizeof(elementStatus27[0]), elementStatus27 }, + { ARRAY_SIZE(elementStatus27), elementStatus27 }, }; static const CERT_TRUST_STATUS elementStatus27Broken[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, @@ -3447,7 +3447,7 @@ static const CERT_TRUST_STATUS elementStatus27Broken[] = { CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus27Broken[] = { - { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), + { ARRAY_SIZE(elementStatus27Broken), elementStatus27Broken }, }; static CONST_DATA_BLOB chain28[] = { @@ -3460,7 +3460,7 @@ static const CERT_TRUST_STATUS elementStatus28[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus28[] = { - { sizeof(elementStatus28) / sizeof(elementStatus28[0]), elementStatus28 }, + { ARRAY_SIZE(elementStatus28), elementStatus28 }, }; static CONST_DATA_BLOB chain29[] = { { sizeof(chain0_0), chain0_0 }, @@ -3479,7 +3479,7 @@ static const CERT_TRUST_STATUS elementStatus30[] = { CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus30[] = { - { sizeof(elementStatus30) / sizeof(elementStatus30[0]), elementStatus30 }, + { ARRAY_SIZE(elementStatus30), elementStatus30 }, }; static CONST_DATA_BLOB chain31[] = { { sizeof(chain0_0), chain0_0 }, @@ -3493,7 +3493,7 @@ static const CERT_TRUST_STATUS selfSignedElementStatus[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; static const SimpleChainStatusCheck selfSignedSimpleStatus[] = { - { sizeof(selfSignedElementStatus) / sizeof(selfSignedElementStatus[0]), + { ARRAY_SIZE(selfSignedElementStatus), selfSignedElementStatus }, }; static CONST_DATA_BLOB googleChain[] = { @@ -3512,7 +3512,7 @@ static const CERT_TRUST_STATUS googleElementStatus[] = { CERT_TRUST_HAS_KEY_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_PREFERRED_ISSUER}, }; static const SimpleChainStatusCheck googleSimpleStatus[] = { - { sizeof(googleElementStatus) / sizeof(googleElementStatus[0]), + { ARRAY_SIZE(googleElementStatus), googleElementStatus }, }; static CONST_DATA_BLOB battlenetChain[] = { @@ -3535,7 +3535,7 @@ static const CERT_TRUST_STATUS opensslElementStatus[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED}, }; static const SimpleChainStatusCheck opensslSimpleStatus[] = { - { sizeof(opensslElementStatus) / sizeof(opensslElementStatus[0]), + { ARRAY_SIZE(opensslElementStatus), opensslElementStatus }, }; /* The OpenSSL chain may not have its root trusted, in which case the chain @@ -3550,7 +3550,7 @@ static const CERT_TRUST_STATUS incompleteOpensslElementStatus[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_KEY_MATCH_ISSUER }, }; static const SimpleChainStatusCheck incompleteOpensslSimpleStatus[] = { - { sizeof(incompleteOpensslElementStatus) / sizeof(incompleteOpensslElementStatus[0]), + { ARRAY_SIZE(incompleteOpensslElementStatus), incompleteOpensslElementStatus }, }; /* @@ -3570,7 +3570,7 @@ static const CERT_TRUST_STATUS stanfordElementStatus[] = { CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED}, }; static const SimpleChainStatusCheck stanfordSimpleStatus[] = { - { sizeof(stanfordElementStatus) / sizeof(stanfordElementStatus[0]), + { ARRAY_SIZE(stanfordElementStatus), stanfordElementStatus }, }; static ChainCheck chainCheck[] = { @@ -3579,23 +3579,23 @@ static ChainCheck chainCheck[] = { * Windows 98/NT4 also set CERT_TRUST_IS_NOT_TIME_NESTED on chains they * shouldn't, so ignore those too. */ - { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { { ARRAY_SIZE(chain0), chain0 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus0 }, 0, &oct2007 }, - { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, + { { ARRAY_SIZE(chain1), chain1 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_SIGNATURE_VALID | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus1 }, 0, &oct2007 }, - { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { { ARRAY_SIZE(chain2), chain2 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus2 }, 0, &oct2007 }, /* Earlier versions of Windows incorrectly don't set * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. */ - { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, + { { ARRAY_SIZE(chain3), chain3 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | @@ -3604,7 +3604,7 @@ static ChainCheck chainCheck[] = { /* Earlier versions of Windows incorrectly don't set * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. */ - { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, + { { ARRAY_SIZE(chain4), chain4 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | @@ -3615,22 +3615,22 @@ static ChainCheck chainCheck[] = { * Similarly, some older versions of Windows incorrectly set * CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, ignore that too. */ - { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, + { { ARRAY_SIZE(chain5), chain5 }, { { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus5 }, 0, &oct2007 }, - { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, + { { ARRAY_SIZE(chain6), chain6 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus6 }, 0, &oct2007 }, - { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, + { { ARRAY_SIZE(chain7), chain7 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus7 }, 0, &oct2007 }, /* Earlier versions of Windows incorrectly don't set * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. */ - { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { { ARRAY_SIZE(chain8), chain8 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | @@ -3639,50 +3639,50 @@ static ChainCheck chainCheck[] = { /* Earlier versions of Windows incorrectly don't set * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. */ - { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, + { { ARRAY_SIZE(chain9), chain9 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_PARTIAL_CHAIN | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, 1, simpleStatus9 }, 0, &oct2007 }, - { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, + { { ARRAY_SIZE(chain10), chain10 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0, &oct2007 }, - { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, + { { ARRAY_SIZE(chain11), chain11 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0, &oct2007 }, - { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { { ARRAY_SIZE(chain12), chain12 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_SIGNATURE_VALID, 0 }, 1, simpleStatus12 }, 0, &oct2007 }, - { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, + { { ARRAY_SIZE(chain13), chain13 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus13 }, 0, &oct2007 }, - { { sizeof(chain14) / sizeof(chain14[0]), chain14 }, + { { ARRAY_SIZE(chain14), chain14 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus14 }, 0, &oct2007 }, /* Earlier versions of crypt32 incorrectly do not complain that the end cert's * key usage is invalid, so ignore that error. */ - { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { { ARRAY_SIZE(chain15), chain15 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, 0 }, 1, simpleStatus15 }, 0, &oct2007 }, - { { sizeof(chain16) / sizeof(chain16[0]), chain16 }, + { { ARRAY_SIZE(chain16), chain16 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, 0 }, 1, simpleStatus16 }, 0, &oct2007 }, - { { sizeof(chain17) / sizeof(chain17[0]), chain17 }, + { { ARRAY_SIZE(chain17), chain17 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus17 }, 0, &oct2007 }, - { { sizeof(chain18) / sizeof(chain18[0]), chain18 }, + { { ARRAY_SIZE(chain18), chain18 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, 0 }, @@ -3693,7 +3693,7 @@ static ChainCheck chainCheck[] = { * They also do not set CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS, since they * incorrectly find a name constraint error. */ - { { sizeof(chain19) / sizeof(chain19[0]), chain19 }, + { { ARRAY_SIZE(chain19), chain19 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS @@ -3705,7 +3705,7 @@ static ChainCheck chainCheck[] = { * CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, though they should. So * ignore it (on Windows) but require it (on Wine.) */ - { { sizeof(chain20) / sizeof(chain20[0]), chain20 }, + { { ARRAY_SIZE(chain20), chain20 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, @@ -3714,7 +3714,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus20 }, 0, &oct2007 }, - { { sizeof(chain21) / sizeof(chain21[0]), chain21 }, + { { ARRAY_SIZE(chain21), chain21 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS @@ -3722,7 +3722,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus21 }, 0, &oct2007 }, - { { sizeof(chain22) / sizeof(chain22[0]), chain22 }, + { { ARRAY_SIZE(chain22), chain22 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, @@ -3731,7 +3731,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus22 }, 0, &oct2007 }, - { { sizeof(chain23) / sizeof(chain23[0]), chain23 }, + { { ARRAY_SIZE(chain23), chain23 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, @@ -3740,7 +3740,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus23 }, 0, &oct2007 }, - { { sizeof(chain24) / sizeof(chain24[0]), chain24 }, + { { ARRAY_SIZE(chain24), chain24 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, @@ -3749,7 +3749,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus24 }, 0, &oct2007 }, - { { sizeof(chain25) / sizeof(chain25[0]), chain25 }, + { { ARRAY_SIZE(chain25), chain25 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, @@ -3758,7 +3758,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus25 }, 0, &oct2007 }, - { { sizeof(chain26) / sizeof(chain26[0]), chain26 }, + { { ARRAY_SIZE(chain26), chain26 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, @@ -3768,7 +3768,7 @@ static ChainCheck chainCheck[] = { 1, simpleStatus26 }, 0, &oct2007 }, /* chain27 is handled separately elsewhere */ - { { sizeof(chain28) / sizeof(chain28[0]), chain28 }, + { { ARRAY_SIZE(chain28), chain28 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, @@ -3781,7 +3781,7 @@ static ChainCheck chainCheck[] = { /* Microsoft incorrectly ignores unknown/unsupported critical extensions on * older Windows versions, so ignore the error on Windows. */ - { { sizeof(chain30) / sizeof(chain30[0]), chain30 }, + { { ARRAY_SIZE(chain30), chain30 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | @@ -3792,7 +3792,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, 0 }, 1, simpleStatus30 }, 0, &oct2007 }, - { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { { ARRAY_SIZE(selfSignedChain), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, selfSignedSimpleStatus }, 0, &oct2007 }, @@ -3803,14 +3803,14 @@ static ChainCheck chainCheck[] = { * e.g. has always CERT_TRUST_HAS_NAME_MATCH_ISSUER flag * @see CRYPT_CheckSimpleChain */ - { { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { { ARRAY_SIZE(googleChain), googleChain }, { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, googleSimpleStatus }, TODO_INFO, &oct2016 }, /* The stanford chain may or may not have its root trusted, so ignore the error */ - { { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, + { { ARRAY_SIZE(stanfordChain), stanfordChain }, { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, stanfordSimpleStatus }, 0, &oct2016 }, @@ -3820,16 +3820,16 @@ static const CERT_TRUST_STATUS elementStatus8NoStore[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus8NoStore[] = { - { sizeof(elementStatus8NoStore) / sizeof(elementStatus8NoStore[0]), + { ARRAY_SIZE(elementStatus8NoStore), elementStatus8NoStore }, }; static ChainCheck chainCheckNoStore[] = { - { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { { ARRAY_SIZE(selfSignedChain), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, selfSignedSimpleStatus }, 0 }, - { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { { ARRAY_SIZE(chain8), chain8 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_PARTIAL_CHAIN, 0 }, 1, simpleStatus8NoStore }, @@ -3839,12 +3839,12 @@ static ChainCheck chainCheckNoStore[] = { /* The openssl chain may or may not have its root trusted, so ignore the error */ static ChainCheck opensslChainCheck = - { { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, + { { ARRAY_SIZE(opensslChain), opensslChain }, { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, opensslSimpleStatus }, 0 }; static ChainCheck incompleteOpensslChainCheck = - { { sizeof(incompleteOpensslChain) / sizeof(incompleteOpensslChain[0]), + { { ARRAY_SIZE(incompleteOpensslChain), incompleteOpensslChain }, { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_PARTIAL_CHAIN, 0 }, @@ -3857,7 +3857,7 @@ static ChainCheck incompleteOpensslChainCheck = * on the chain's error status. */ static ChainCheck chainCheckEmbeddedNull = { - { sizeof(chain27) / sizeof(chain27[0]), chain27 }, + { ARRAY_SIZE(chain27), chain27 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_NAME_CONSTRAINTS | @@ -3865,7 +3865,7 @@ static ChainCheck chainCheckEmbeddedNull = { 1, simpleStatus27 }, 0 }; static ChainCheck chainCheckEmbeddedNullBroken = { - { sizeof(chain27) / sizeof(chain27[0]), chain27 }, + { ARRAY_SIZE(chain27), chain27 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS | CERT_TRUST_HAS_PREFERRED_ISSUER }, @@ -4017,7 +4017,7 @@ static void testGetCertChain(void) CertCloseStore(store, 0); CertFreeCertificateContext(cert); - for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++) + for (i = 0; i < ARRAY_SIZE(chainCheck); i++) { chain = getChain(NULL, &chainCheck[i].certs, 0, TRUE, chainCheck[i].validfor, chainCheck[i].todo, i); @@ -4050,8 +4050,7 @@ static void testGetCertChain(void) 0); pCertFreeCertificateChain(chain); } - for (i = 0; i < sizeof(chainCheckNoStore) / sizeof(chainCheckNoStore[0]); - i++) + for (i = 0; i < ARRAY_SIZE(chainCheckNoStore); i++) { chain = getChain(NULL, &chainCheckNoStore[i].certs, 0, FALSE, &oct2007, chainCheckNoStore[i].todo, i); @@ -4204,45 +4203,45 @@ typedef struct _ChainPolicyCheck } ChainPolicyCheck; static const ChainPolicyCheck basePolicyCheck[] = { - { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { { ARRAY_SIZE(chain0), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, + { { ARRAY_SIZE(chain1), chain1 }, { 0, TRUST_E_CERT_SIGNATURE, 0, 0, NULL }, NULL, 0 }, - { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { { ARRAY_SIZE(chain2), chain2 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, + { { ARRAY_SIZE(chain3), chain3 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, + { { ARRAY_SIZE(chain4), chain4 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, + { { ARRAY_SIZE(chain5), chain5 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, + { { ARRAY_SIZE(chain6), chain6 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, + { { ARRAY_SIZE(chain7), chain7 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { { ARRAY_SIZE(chain8), chain8 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, + { { ARRAY_SIZE(chain9), chain9 }, { 0, CERT_E_CHAINING, 0, -1, NULL }, NULL, 0 }, - { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, + { { ARRAY_SIZE(chain10), chain10 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, + { { ARRAY_SIZE(chain11), chain11 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { { ARRAY_SIZE(chain12), chain12 }, { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, + { { ARRAY_SIZE(chain13), chain13 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain14) / sizeof(chain14[0]), chain14 }, + { { ARRAY_SIZE(chain14), chain14 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { { ARRAY_SIZE(chain15), chain15 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain16) / sizeof(chain16[0]), chain16 }, + { { ARRAY_SIZE(chain16), chain16 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain17) / sizeof(chain17[0]), chain17 }, + { { ARRAY_SIZE(chain17), chain17 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain18) / sizeof(chain18[0]), chain18 }, + { { ARRAY_SIZE(chain18), chain18 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { { ARRAY_SIZE(selfSignedChain), selfSignedChain }, { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; @@ -4254,75 +4253,75 @@ static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = { 0, CERT_E_VALIDITYPERIODNESTING, 0, 0, NULL }; static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { - { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { ARRAY_SIZE(chain2), chain2 }, { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS }; static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { - { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { ARRAY_SIZE(googleChain), googleChain }, { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS }; static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { - { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { ARRAY_SIZE(chain15), chain15 }, { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR }; static const ChainPolicyCheck invalidUsageBasePolicyCheck = { - { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { ARRAY_SIZE(chain15), chain15 }, { 0, CERT_E_WRONG_USAGE, 0, 1, NULL}, NULL, 0 }; static const ChainPolicyCheck sslPolicyCheck[] = { - { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { { ARRAY_SIZE(chain0), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, + { { ARRAY_SIZE(chain1), chain1 }, { 0, TRUST_E_CERT_SIGNATURE, 0, 0, NULL }, NULL, 0 }, - { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { { ARRAY_SIZE(chain2), chain2 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, + { { ARRAY_SIZE(chain3), chain3 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, + { { ARRAY_SIZE(chain4), chain4 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, + { { ARRAY_SIZE(chain5), chain5 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, + { { ARRAY_SIZE(chain6), chain6 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, + { { ARRAY_SIZE(chain7), chain7 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { { ARRAY_SIZE(chain8), chain8 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, + { { ARRAY_SIZE(chain9), chain9 }, { 0, CERT_E_UNTRUSTEDROOT, 0, -1, NULL }, NULL, 0 }, - { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, + { { ARRAY_SIZE(chain10), chain10 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, + { { ARRAY_SIZE(chain11), chain11 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { { ARRAY_SIZE(chain12), chain12 }, { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, + { { ARRAY_SIZE(chain13), chain13 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain14) / sizeof(chain14[0]), chain14 }, + { { ARRAY_SIZE(chain14), chain14 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { { ARRAY_SIZE(chain15), chain15 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain16) / sizeof(chain16[0]), chain16 }, + { { ARRAY_SIZE(chain16), chain16 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain17) / sizeof(chain17[0]), chain17 }, + { { ARRAY_SIZE(chain17), chain17 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain18) / sizeof(chain18[0]), chain18 }, + { { ARRAY_SIZE(chain18), chain18 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { { ARRAY_SIZE(selfSignedChain), selfSignedChain }, { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; static const ChainPolicyCheck ignoredUnknownCAPolicyCheck = { - { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { ARRAY_SIZE(chain0), chain0 }, { 0, CERT_E_EXPIRED, 0, 0, NULL }, NULL, 0 }; static const ChainPolicyCheck googlePolicyCheckWithMatchingNameExpired = { - { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { ARRAY_SIZE(googleChain), googleChain }, { 0, CERT_E_EXPIRED, 0, 0, NULL}, NULL, 0 }; @@ -4331,7 +4330,7 @@ static const CERT_CHAIN_POLICY_STATUS expiredStatus = { 0, CERT_E_EXPIRED, 0, 0, NULL }; static const ChainPolicyCheck googlePolicyCheckWithMatchingName = { - { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { ARRAY_SIZE(googleChain), googleChain }, { 0, 0, -1, -1, NULL}, &expiredStatus, 0 }; @@ -4340,95 +4339,95 @@ static const CERT_CHAIN_POLICY_STATUS untrustedRootStatus = { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }; static const ChainPolicyCheck opensslPolicyCheckWithMatchingName = { - { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, + { ARRAY_SIZE(opensslChain), opensslChain }, { 0, 0, -1, -1, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck opensslPolicyCheckWithoutMatchingName = { - { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, + { ARRAY_SIZE(opensslChain), opensslChain }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck winehqPolicyCheckWithMatchingName = { - { sizeof(chain29) / sizeof(chain29[0]), chain29 }, + { ARRAY_SIZE(chain29), chain29 }, { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck winehqPolicyCheckWithoutMatchingName = { - { sizeof(chain29) / sizeof(chain29[0]), chain29 }, + { ARRAY_SIZE(chain29), chain29 }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 }; static const ChainPolicyCheck stanfordPolicyCheckWithMatchingName = { - { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, + { ARRAY_SIZE(stanfordChain), stanfordChain }, { 0, 0, -1, -1, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck stanfordPolicyCheckWithoutMatchingName = { - { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, + { ARRAY_SIZE(stanfordChain), stanfordChain }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck nullTerminatedDomainComponentPolicyCheck = { - { sizeof(battlenetChain) / sizeof(battlenetChain[0]), battlenetChain }, + { ARRAY_SIZE(battlenetChain), battlenetChain }, { 0, 0, -1, -1, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck invalidExtensionPolicyCheck = { - { sizeof(chain30) / sizeof(chain30[0]), chain30 }, + { ARRAY_SIZE(chain30), chain30 }, { 0, CERT_E_CRITICAL, 0, 1, NULL}, &badDateNestingStatus, 0 }; static const ChainPolicyCheck fooPolicyCheckWithMatchingName = { - { sizeof(chain31) / sizeof(chain31[0]), chain31 }, + { ARRAY_SIZE(chain31), chain31 }, { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck fooPolicyCheckWithoutMatchingName = { - { sizeof(chain31) / sizeof(chain31[0]), chain31 }, + { ARRAY_SIZE(chain31), chain31 }, { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 }; static const ChainPolicyCheck authenticodePolicyCheck[] = { - { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { { ARRAY_SIZE(chain0), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, + { { ARRAY_SIZE(chain1), chain1 }, { 0, TRUST_E_CERT_SIGNATURE, 0, 0, NULL }, NULL, 0 }, - { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { { ARRAY_SIZE(chain2), chain2 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, + { { ARRAY_SIZE(chain3), chain3 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, + { { ARRAY_SIZE(chain4), chain4 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, + { { ARRAY_SIZE(chain5), chain5 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, + { { ARRAY_SIZE(chain6), chain6 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, + { { ARRAY_SIZE(chain7), chain7 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { { ARRAY_SIZE(chain8), chain8 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, + { { ARRAY_SIZE(chain9), chain9 }, { 0, CERT_E_CHAINING, 0, -1, NULL }, NULL, 0 }, - { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, + { { ARRAY_SIZE(chain10), chain10 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, + { { ARRAY_SIZE(chain11), chain11 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { { ARRAY_SIZE(chain12), chain12 }, { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, + { { ARRAY_SIZE(chain13), chain13 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain14) / sizeof(chain14[0]), chain14 }, + { { ARRAY_SIZE(chain14), chain14 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { { ARRAY_SIZE(chain15), chain15 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain16) / sizeof(chain16[0]), chain16 }, + { { ARRAY_SIZE(chain16), chain16 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain17) / sizeof(chain17[0]), chain17 }, + { { ARRAY_SIZE(chain17), chain17 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(chain18) / sizeof(chain18[0]), chain18 }, + { { ARRAY_SIZE(chain18), chain18 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, - { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { { ARRAY_SIZE(selfSignedChain), selfSignedChain }, { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; @@ -4440,45 +4439,45 @@ static const CERT_CHAIN_POLICY_STATUS chain4BrokenStatus = { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 2, NULL }; static const ChainPolicyCheck basicConstraintsPolicyCheck[] = { - { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { { ARRAY_SIZE(chain0), chain0 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, + { { ARRAY_SIZE(chain1), chain1 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { { ARRAY_SIZE(chain2), chain2 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, + { { ARRAY_SIZE(chain3), chain3 }, { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, + { { ARRAY_SIZE(chain4), chain4 }, { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, &chain4BrokenStatus, 0 }, - { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, + { { ARRAY_SIZE(chain5), chain5 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, + { { ARRAY_SIZE(chain6), chain6 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, + { { ARRAY_SIZE(chain7), chain7 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { { ARRAY_SIZE(chain8), chain8 }, { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, + { { ARRAY_SIZE(chain9), chain9 }, { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, NULL, 0 }, - { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, + { { ARRAY_SIZE(chain10), chain10 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, + { { ARRAY_SIZE(chain11), chain11 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { { ARRAY_SIZE(chain12), chain12 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, + { { ARRAY_SIZE(chain13), chain13 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain14) / sizeof(chain14[0]), chain14 }, + { { ARRAY_SIZE(chain14), chain14 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { { ARRAY_SIZE(chain15), chain15 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain16) / sizeof(chain16[0]), chain16 }, + { { ARRAY_SIZE(chain16), chain16 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain17) / sizeof(chain17[0]), chain17 }, + { { ARRAY_SIZE(chain17), chain17 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(chain18) / sizeof(chain18[0]), chain18 }, + { { ARRAY_SIZE(chain18), chain18 }, { 0, 0, -1, -1, NULL }, NULL, 0 }, - { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { { ARRAY_SIZE(selfSignedChain), selfSignedChain }, { 0, 0, -1, -1, NULL }, NULL, 0 }, }; @@ -4568,7 +4567,7 @@ static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, #define CHECK_CHAIN_POLICY_STATUS_ARRAY(policy, engine, array, date, para) \ do { \ DWORD i; \ - for (i = 0; i < sizeof(array) / sizeof(array)[0]; i++) \ + for (i = 0; i < ARRAY_SIZE(array); i++) \ checkChainPolicyStatus((policy), (engine), &(array)[i], \ #array, i, (date), (para)); \ } while(0) -- 2.14.3

1 0

[PATCH] bcrypt/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2a499711bd..6865e87ca8 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -145,7 +145,7 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0])); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -229,7 +229,7 @@ static void test_hash(const struct hash_test *test) NTSTATUS ret; ULONG len; - MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, sizeof(alg_name)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, ARRAY_SIZE(alg_name)); alg = NULL; ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, 0); @@ -349,7 +349,7 @@ static void test_hashes(void) }; unsigned i; - for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) + for(i = 0; i < ARRAY_SIZE(tests); i++) test_hash(tests+i); } -- 2.14.3

1 0

[PATCH] advapi32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 28, 2018

May 28, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 861fea0525..451bee92e9 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -120,7 +120,7 @@ static void test_lsa(void) UINT len; guidstrW[0] = '\0'; ConvertSidToStringSidA(dns_domain_info->Sid, &strsid); - StringFromGUID2(&dns_domain_info->DomainGuid, guidstrW, sizeof(guidstrW)/sizeof(WCHAR)); + StringFromGUID2(&dns_domain_info->DomainGuid, guidstrW, ARRAY_SIZE(guidstrW)); len = WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, NULL, 0, NULL, NULL ); guidstr = LocalAlloc( 0, len ); WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, guidstr, len, NULL, NULL ); -- 2.14.3

1 0

[PATCH] testbot: Fix handling of test unit deletion + helper dll patch
by Francois Gouget May 28, 2018

May 28, 2018

Take into account deleted test units when getting the full test unit list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 74599ba30..62784874c 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -199,12 +199,7 @@ sub GetPatchImpact($) # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); - if ($AllUnits) - { - # All test units are impacted indirectly and must be rerun - $TestInfo->{Units}->{$Base} = 1; - } - elsif ($TestInfo->{Files}->{$File} and + if (($AllUnits or $TestInfo->{Files}->{$File}) and $TestInfo->{Files}->{$File} ne "rm") { # Only new/modified test units are impacted -- 2.17.0

1 0