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

Michael Stefaniuc : secur32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: baf4cb39585000371ceb591d318d1a100e794c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf4cb39585000371ceb591d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:32 2018 +0200 secur32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 8 ++++---- dlls/secur32/schannel_gnutls.c | 2 +- dlls/secur32/schannel_macosx.c | 4 ++-- dlls/secur32/secur32.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f0d271e..6d50c97 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -195,7 +195,7 @@ static void read_config(void) if(res == ERROR_SUCCESS) { DWORD type, size, value; - for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_config_keys); i++) { strcpyW(subkey_name, protocol_config_keys[i].key_name); strcatW(subkey_name, clientW); res = RegOpenKeyExW(protocols_key, subkey_name, 0, KEY_READ, &key); @@ -229,7 +229,7 @@ static void read_config(void) } }else { /* No config, enable all known protocols. */ - for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_config_keys); i++) { if(protocol_config_keys[i].enabled) enabled |= protocol_config_keys[i].prot_client_flag; if(protocol_config_keys[i].disabled_by_default) @@ -986,7 +986,7 @@ static void *get_alg_name(ALG_ID id, BOOL wide) }; unsigned i; - for (i = 0; i < sizeof(alg_name_map)/sizeof(alg_name_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(alg_name_map); i++) if (alg_name_map[i].alg_id == id) return wide ? (void*)alg_name_map[i].nameW : (void*)alg_name_map[i].name; @@ -1545,7 +1545,7 @@ void SECUR32_initSchannelSP(void) goto fail; } - SECUR32_addPackages(provider, sizeof(info) / sizeof(info[0]), NULL, info); + SECUR32_addPackages(provider, ARRAY_SIZE(info), NULL, info); return; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bc3bbaf..05e922d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -177,7 +177,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre } p = priority + strlen(priority); - for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { *p++ = ':'; *p++ = (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) ? '+' : '-'; strcpy(p, protocol_priority_flags[i].gnutls_flag); diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index a2f4261..bd080dc 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -429,7 +429,7 @@ static const struct cipher_suite cipher_suites[] = { static const struct cipher_suite* get_cipher_suite(SSLCipherSuite cipher_suite) { int i; - for (i = 0; i < sizeof(cipher_suites)/sizeof(cipher_suites[0]); i++) + for (i = 0; i < ARRAY_SIZE(cipher_suites); i++) { if (cipher_suites[i].suite == cipher_suite) return &cipher_suites[i]; @@ -767,7 +767,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } - for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { if(!(protocol_priority_flags[i].enable_flag & supported_protocols)) continue; diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 9240c10..ec189fd 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -995,7 +995,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( case NameSamCompatible: { WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD size = sizeof(name)/sizeof(name[0]); + DWORD size = ARRAY_SIZE(name); if (GetComputerNameW(name, &size)) { DWORD len = domainInfo->Name.Length + size + 3; @@ -1038,7 +1038,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( DWORD len, size; WCHAR *suffix; - size = sizeof(name) / sizeof(name[0]); + size = ARRAY_SIZE(name); if (!GetComputerNameW(name, &size)) { status = FALSE;

1 0

Michael Stefaniuc : sxs: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 6c6af6412c3247b9b44eead279cbed1ae2751dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6af6412c3247b9b44eead2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:33 2018 +0200 sxs: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/cache.c | 18 +++++++++--------- dlls/sxs/name.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 791a6ed..3cc26f2 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -103,7 +103,7 @@ static unsigned int build_sxs_path( WCHAR *path ) unsigned int len = GetWindowsDirectoryW( path, MAX_PATH ); memcpy( path + len, winsxsW, sizeof(winsxsW) ); - return len + sizeof(winsxsW) / sizeof(winsxsW[0]) - 1; + return len + ARRAY_SIZE(winsxsW) - 1; } static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const WCHAR *token, @@ -111,7 +111,7 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W { static const WCHAR fmtW[] = {'%','s','_','%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; - unsigned int buflen = sizeof(fmtW) / sizeof(fmtW[0]); + unsigned int buflen = ARRAY_SIZE(fmtW); WCHAR *ret, *p; buflen += strlenW( arch ); @@ -133,7 +133,7 @@ static WCHAR *build_manifest_path( const WCHAR *arch, const WCHAR *name, const W unsigned int len; if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; - len += sizeof(fmtW) / sizeof(fmtW[0]); + len += ARRAY_SIZE(fmtW); len += build_sxs_path( sxsdir ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { @@ -150,7 +150,7 @@ static WCHAR *build_policy_name( const WCHAR *arch, const WCHAR *name, const WCH { static const WCHAR fmtW[] = {'%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; - unsigned int buflen = sizeof(fmtW) / sizeof(fmtW[0]); + unsigned int buflen = ARRAY_SIZE(fmtW); WCHAR *ret, *p; buflen += strlenW( arch ); @@ -171,7 +171,7 @@ static WCHAR *build_policy_path( const WCHAR *arch, const WCHAR *name, const WCH unsigned int len; if (!(path = build_policy_name( arch, name, token, &len ))) return NULL; - len += sizeof(fmtW) / sizeof(fmtW[0]); + len += ARRAY_SIZE(fmtW); len += build_sxs_path( sxsdir ); len += strlenW( version ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) @@ -501,9 +501,9 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const if (!(fullname = build_policy_name( arch, name, token, &len ))) return NULL; len += build_sxs_path( sxsdir ); - len += sizeof(policiesW) / sizeof(policiesW[0]) - 1; + len += ARRAY_SIZE(policiesW) - 1; len += strlenW( version ); - len += sizeof(suffixW) / sizeof(suffixW[0]) - 1; + len += ARRAY_SIZE(suffixW) - 1; if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, fullname ); @@ -572,8 +572,8 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con if (!(fullname = build_assembly_name( arch, name, token, version, &len ))) return NULL; len += build_sxs_path( sxsdir ); - len += sizeof(manifestsW) / sizeof(manifestsW[0]) - 1; - len += sizeof(suffixW) / sizeof(suffixW[0]) - 1; + len += ARRAY_SIZE(manifestsW) - 1; + len += ARRAY_SIZE(suffixW) - 1; if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, fullname ); diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 74aece2..e109014 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -329,25 +329,25 @@ static HRESULT parse_displayname( struct name *name, const WCHAR *displayname ) while (*q && *q != '=') q++; if (!*q) return E_INVALIDARG; len = q - p; - if (len == sizeof(archW)/sizeof(archW[0]) - 1 && !memcmp( p, archW, len * sizeof(WCHAR) )) + if (len == ARRAY_SIZE(archW) - 1 && !memcmp( p, archW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->arch = parse_value( p, &len ))) return E_INVALIDARG; q += len; } - else if (len == sizeof(tokenW)/sizeof(tokenW[0]) - 1 && !memcmp( p, tokenW, len * sizeof(WCHAR) )) + else if (len == ARRAY_SIZE(tokenW) - 1 && !memcmp( p, tokenW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->token = parse_value( p, &len ))) return E_INVALIDARG; q += len; } - else if (len == sizeof(typeW)/sizeof(typeW[0]) - 1 && !memcmp( p, typeW, len * sizeof(WCHAR) )) + else if (len == ARRAY_SIZE(typeW) - 1 && !memcmp( p, typeW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->type = parse_value( p, &len ))) return E_INVALIDARG; q += len; } - else if (len == sizeof(versionW)/sizeof(versionW[0]) - 1 && !memcmp( p, versionW, len * sizeof(WCHAR) )) + else if (len == ARRAY_SIZE(versionW) - 1 && !memcmp( p, versionW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->version = parse_value( p, &len ))) return E_INVALIDARG;

1 0

Michael Stefaniuc : wintrust: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: c77defede1c199187b0deb642f1f3f2d95121800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c77defede1c199187b0deb64… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:37 2018 +0200 wintrust: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/asn.c | 73 ++++++++++++++++++++++--------------------------- dlls/wintrust/softpub.c | 6 ++-- 2 files changed, 34 insertions(+), 45 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 6406ba3..46525f0 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -673,8 +673,8 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( items[1].pvStructInfo = &algo->Parameters; else items[1].pvStructInfo = &nullBlob; - ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); return ret; } @@ -688,8 +688,8 @@ static BOOL WINAPI CRYPT_AsnEncodeAttributeTypeValue(DWORD dwCertEncodingType, { &typeValue->Value, CRYPT_CopyEncodedBlob, 0 }, }; - return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } struct SPCDigest @@ -708,8 +708,8 @@ static BOOL WINAPI CRYPT_AsnEncodeSPCDigest(DWORD dwCertEncodingType, { &digest->Digest, CRYPT_CopyEncodedBlob, 0 }, }; - return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, @@ -729,8 +729,8 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, { &data->DigestAlgorithm, CRYPT_AsnEncodeSPCDigest, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -996,8 +996,8 @@ BOOL WINAPI WVTAsn1CatMemberInfoEncode(DWORD dwCertEncodingType, { &info->dwCertVersion, CRYPT_AsnEncodeInt, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -1025,8 +1025,8 @@ BOOL WINAPI WVTAsn1CatNameValueEncode(DWORD dwCertEncodingType, { &value->Value, CRYPT_AsnEncodeOctets, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -1084,8 +1084,8 @@ BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoEncode(DWORD dwCertEncodingType, { &criteria->fMeetsCriteria, CRYPT_AsnEncodeBool, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -1808,9 +1808,8 @@ BOOL WINAPI WVTAsn1SpcPeImageDataDecode(DWORD dwCertEncodingType, offsetof(SPC_PE_IMAGE_DATA, pFile), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -1995,9 +1994,8 @@ static BOOL WINAPI CRYPT_AsnDecodeAttributeTypeValue(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, + return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, typeValue ? typeValue->pszObjId : NULL); } @@ -2019,9 +2017,8 @@ static BOOL WINAPI CRYPT_AsnDecodeAlgorithmId(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, algo ? algo->pszObjId : NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, algo ? algo->pszObjId : NULL); if (ret && pvStructInfo) { TRACE("pszObjId is %p (%s)\n", algo->pszObjId, @@ -2048,9 +2045,8 @@ static BOOL WINAPI CRYPT_AsnDecodeSPCDigest(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, + return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, digest ? digest->DigestAlgorithm.pszObjId : NULL); } @@ -2076,9 +2072,8 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentDecode(DWORD dwCertEncodingType, offsetof(SPC_INDIRECT_DATA_CONTENT, DigestAlgorithm.pszObjId), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2174,9 +2169,8 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, offsetof(SPC_SP_OPUS_INFO, pPublisherInfo), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2256,9 +2250,8 @@ BOOL WINAPI WVTAsn1CatMemberInfoDecode(DWORD dwCertEncodingType, FALSE, FALSE, 0, 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2292,9 +2285,8 @@ BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, offsetof(CAT_NAMEVALUE, Value.pbData), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2367,9 +2359,8 @@ BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoDecode(DWORD dwCertEncodingType, fMeetsCriteria), FALSE, FALSE, 0, 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4e8582e..d65d2b6 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -522,11 +522,9 @@ static LPCSTR filetime_to_str(const FILETIME *time) if (!time) return NULL; - GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(time, &sysTime); - GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, - sizeof(date) / sizeof(date[0])); + GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, ARRAY_SIZE(date)); return date; }

1 0

Michael Stefaniuc : wbemdisp: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: be4cb86b751ced2bdc7788b8365ff17d9a74728a URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4cb86b751ced2bdc7788b8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:35 2018 +0200 wbemdisp: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 4 ++-- dlls/wbemdisp/main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index cdc0ab4..1c7f56a 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1641,7 +1641,7 @@ static HRESULT WINAPI services_DeleteAsync( static BSTR build_query_string( const WCHAR *class ) { static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - UINT len = strlenW(class) + sizeof(selectW) / sizeof(selectW[0]); + UINT len = strlenW(class) + ARRAY_SIZE(selectW); BSTR ret; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; @@ -2074,7 +2074,7 @@ static BSTR build_resource_string( BSTR server, BSTR namespace ) if (server && *server) len_server = strlenW( server ); else len_server = 1; if (namespace && *namespace) len_namespace = strlenW( namespace ); - else len_namespace = sizeof(defaultW) / sizeof(defaultW[0]) - 1; + else len_namespace = ARRAY_SIZE(defaultW) - 1; if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 9d9b0ad..aff4d50 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -374,7 +374,7 @@ static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindC ULONG *pchEaten, IMoniker **ppmkOut) { static const WCHAR prefixW[] = {'w','i','n','m','g','m','t','s',':',0}; - const DWORD prefix_len = sizeof(prefixW) / sizeof(prefixW[0]) - 1; + const DWORD prefix_len = ARRAY_SIZE(prefixW) - 1; ISWbemLocator *locator = NULL; ISWbemServices *services = NULL; ISWbemObject *obj = NULL;

1 0

Mathew Hodson : msvcp90: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: a1fb71c562c720c75070195b222afc7df5af8da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1fb71c562c720c75070195b… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Wed Jul 18 22:04:17 2018 -0400 msvcp90: Use the ARRAY_SIZE() macro. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b9fd9d0..a1bec86 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -391,7 +391,7 @@ unsigned short __cdecl wctype(const char *property) }; unsigned int i; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + for(i = 0; i < ARRAY_SIZE(properties); i++) if(!strcmp(property, properties[i].name)) return properties[i].mask; @@ -2440,7 +2440,7 @@ void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4* TRACE("(%p %lu)\n", this, idx); - if(idx < sizeof(exceptions)/sizeof(exceptions[0])) + if(idx < ARRAY_SIZE(exceptions)) throw_exception(exceptions[idx].type, exceptions[idx].msg); } #endif @@ -2463,7 +2463,7 @@ const char* __cdecl _Syserror_map(int err) TRACE("(%d)\n", err); - for(i=0; i<sizeof(syserror_map)/sizeof(syserror_map[0]); i++) + for(i = 0; i < ARRAY_SIZE(syserror_map); i++) { if(syserror_map[i].err == err) return syserror_map[i].str;

1 0

Józef Kucia : wined3d: Add GPU information for AMD Radeon RX Vega.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 00abf4222db0fcad92fe5a5af8dbfbb47ff848c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00abf4222db0fcad92fe5a5a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 22:45:00 2018 +0200 wined3d: Add GPU information for AMD Radeon RX Vega. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bb8d5af..68b2a11 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1441,6 +1441,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a25c296..97badbe 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,6 +2296,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_R9_FURY = 0x7300, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, + CARD_AMD_RADEON_RX_VEGA = 0x687f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Józef Kucia : wined3d: Add GPU information for Intel HD Graphics 630.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 5757c2c8c63bc0175556cdb5cf0655ad0e9c94ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5757c2c8c63bc0175556cdb5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 22:45:01 2018 +0200 wined3d: Add GPU information for Intel HD Graphics 630. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68b2a11..7d9a5e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1517,6 +1517,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97badbe..ece41eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2497,6 +2497,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD630 = 0x5912, }; struct wined3d_fbo_ops

1 0

Daniel Lehman : msvcr110: Create current scheduler in _CurrentScheduler:: _Id.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: wine Branch: master Commit: 05f9db7b95ca0919c579957549e2d8dbaa468cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f9db7b95ca0919c5799575… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 18 07:15:45 2018 -0700 msvcr110: Create current scheduler in _CurrentScheduler::_Id. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 15 +++++++++++++++ dlls/msvcrt/scheduler.c | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 4b0043b..dcee5c1 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -35,6 +35,8 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); +static unsigned int (CDECL *p_CurrentScheduler_Id)(void); +static unsigned int (CDECL *p__CurrentScheduler__Id)(void); static BOOL init(void) { @@ -50,12 +52,15 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); + p__CurrentScheduler__Id = (void*)GetProcAddress(module, "?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); return TRUE; } static void test_CurrentScheduler(void) { + unsigned int id; unsigned int ncpus; unsigned int expect; SYSTEM_INFO si; @@ -63,13 +68,23 @@ static void test_CurrentScheduler(void) expect = ~0; ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); ok(ncpus == expect, "expected %x, got %x\n", expect, ncpus); + id = p_CurrentScheduler_Id(); + ok(id == expect, "expected %u, got %u\n", expect, id); GetSystemInfo(&si); expect = si.dwNumberOfProcessors; + /* these _CurrentScheduler calls trigger scheduler creation + if either is commented out, the following CurrentScheduler (no _) tests will still work */ ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); + id = p__CurrentScheduler__Id(); ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(id == 0, "expected 0, got %u\n", id); + + /* these CurrentScheduler tests assume scheduler is created */ ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + id = p_CurrentScheduler_Id(); + ok(id == 0, "expected 0, got %u\n", id); } static void test_setlocale(void) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 6269c98..c6c0fa7 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1071,6 +1071,7 @@ unsigned int __cdecl _CurrentScheduler__GetNumberOfVirtualProcessors(void) unsigned int __cdecl _CurrentScheduler__Id(void) { TRACE("()\n"); + get_current_scheduler(); return CurrentScheduler_Id(); }

1 0

Francois Gouget : testbot: Split the log and report line category detection.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: tools Branch: master Commit: 31bd8278b3f2b45e5520c8590489e5babf94866f URL: https://source.winehq.org/git/tools.git/?a=commit;h=31bd8278b3f2b45e5520c85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 19 12:10:41 2018 +0200 testbot: Split the log and report line category detection. This avoids false positives for cases such as lines containing 'error:' in test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 8 ++- testbot/lib/WineTestBot/LogUtils.pm | 105 +++++++++++++++++++++++------------- testbot/web/JobDetails.pl | 12 +++-- 3 files changed, 82 insertions(+), 43 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f1cb74e..e2c823a 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -300,7 +300,9 @@ EOF { $CurrentDll = $1; } - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); if ($Category eq "error") { if ($PrintedDll ne $CurrentDll) @@ -488,7 +490,9 @@ EOF { foreach my $Line (<$LogFile>) { - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); $MessagesFromLog .= $Line if ($Category eq "error"); } close($LogFile); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index cabd183..e6f9a27 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,8 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogLineCategory +our @EXPORT = qw(GetLogFileNames GetLogLabel + GetLogLineCategory GetReportLineCategory ParseTaskLog ParseWineTestReport); use File::Basename; @@ -80,6 +81,59 @@ sub ParseTaskLog($$) } +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a Wine +diagnostic line, a TestBot error, etc. + +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if (# Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /^make: [*]{3} No rule to make target / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + # Typical perl errors + $Line =~ /^Use of uninitialized value/) + { + return "error"; + } + if ($Line =~ /:winediag:/) + { + return "diag"; + } + if ($Line =~ /^BotError:/ or + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) + { + return "boterror"; + } + if (# Build messages + $Line =~ /^\+ \S/ or + $Line =~ /^(?:Build|Reconfig|Task): ok/) + { + return "info"; + } + + return "none"; +} + + # # WineTest report parser # @@ -383,23 +437,21 @@ sub ParseWineTestReport($$$$) } -# -# Log querying and formatting -# - =pod =over 12 -=item C<GetLogLineCategory()> +=item C<GetReportLineCategory()> + +Identifies the category of the given test report line: an error message, +a todo, just an informational message or none of these. -Identifies the category of the given log line: an error message, a todo, just -an informational message or none of these. The category can then be used to -decide whether to hide the line or, on the contrary, highlight it. +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. =back =cut -sub GetLogLineCategory($) +sub GetReportLineCategory($) { my ($Line) = @_; @@ -416,35 +468,11 @@ sub GetLogLineCategory($) $Line =~ /Fatal: test .* does not exist/ or $Line =~ / done $258$/ or $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: / or - # Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or - # Typical perl errors - $Line =~ /^Use of uninitialized value/) + $Line =~ /^Unhandled exception: /) { return "error"; } - if ($Line =~ /:winediag:/) - { - return "diag"; - } - if ($Line =~ /^BotError:/ or - $Line =~ /^X Error of failed request: / or - $Line =~ / opcode of failed request: /) - { - return "boterror"; - } - if ($Line =~ /^\+ \S/ or - $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or - # Build messages - $Line =~ /^(?:Build|Reconfig|Task): ok/) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) { return "info"; } @@ -452,6 +480,11 @@ sub GetLogLineCategory($) return "none"; } + +# +# Log querying and formatting +# + =pod =over 12 diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3fcec5d..ee4e539 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -245,11 +245,13 @@ highlighted to make the log more readable. =back =cut -sub GetHtmlLine($$$) +sub GetHtmlLine($$$$) { - my ($self, $FullLog, $Line) = @_; + my ($self, $LogName, $FullLog, $Line) = @_; - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); return undef if ($Category !~ /error/ and !$FullLog); my $Html = $self->escapeHTML($Line); @@ -403,7 +405,7 @@ sub GenerateBody($) $HasLogEntries = 1; chomp $Line; $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); - my $Html = $self->GetHtmlLine($MoreInfo->{Full}, $Line); + my $Html = $self->GetHtmlLine($LogName, $MoreInfo->{Full}, $Line); next if (!defined $Html); if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) @@ -476,7 +478,7 @@ sub GenerateBody($) print "<pre><code>"; $ErrFirst = 0; } - print $self->GetHtmlLine(1, $Line), "\n"; + print $self->GetHtmlLine($ErrName, 1, $Line), "\n"; } close($ErrFile);

1 0

Józef Kucia : include: Add more definitions for D3D12 features.
by Alexandre Julliard 19 Jul '18

19 Jul '18

Module: vkd3d Branch: master Commit: 6b4b2a35cc8edc7f78f358810f69e96cb589dbe3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b4b2a35cc8edc7f78f3588… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:39 2018 +0200 include: Add more definitions for D3D12 features. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec7df56..a0c09ef 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1516,14 +1516,38 @@ typedef struct D3D12_FEATURE_DATA_FEATURE_LEVELS D3D_FEATURE_LEVEL MaxSupportedFeatureLevel; } D3D12_FEATURE_DATA_FEATURE_LEVELS; +typedef struct D3D12_FEATURE_DATA_ROOT_SIGNATURE +{ + D3D_ROOT_SIGNATURE_VERSION HighestVersion; +} D3D12_FEATURE_DATA_ROOT_SIGNATURE; + +typedef enum D3D_SHADER_MODEL +{ + D3D_SHADER_MODEL_5_1 = 0x51, + D3D_SHADER_MODEL_6_0 = 0x60, +} D3D_SHADER_MODEL; + +typedef struct D3D12_FEATURE_DATA_SHADER_MODEL +{ + D3D_SHADER_MODEL HighestShaderModel; +} D3D12_FEATURE_DATA_SHADER_MODEL; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, D3D12_FEATURE_ARCHITECTURE = 1, D3D12_FEATURE_FEATURE_LEVELS = 2, D3D12_FEATURE_FORMAT_SUPPORT = 3, - D3D12_FEATURE_FORMAT_INFO = 4, - D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 5, + D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS = 4, + D3D12_FEATURE_FORMAT_INFO = 5, + D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6, + D3D12_FEATURE_SHADER_MODEL = 7, + D3D12_FEATURE_D3D12_OPTIONS1 = 8, + D3D12_FEATURE_ROOT_SIGNATURE = 12, + D3D12_FEATURE_ARCHITECTURE1 = 16, + D3D12_FEATURE_D3D12_OPTIONS2 = 18, + D3D12_FEATURE_SHADER_CACHE = 19, + D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0