diff --git a/src/coreclr/ildasm/dasm.cpp b/src/coreclr/ildasm/dasm.cpp index 2a151638dfa180..697ae524bb1a84 100644 --- a/src/coreclr/ildasm/dasm.cpp +++ b/src/coreclr/ildasm/dasm.cpp @@ -5460,9 +5460,9 @@ void DumpMetadataHeader(const char *szName, IMAGE_DATA_DIRECTORY *pDir, void* GU printLine(GUICookie,szStr); sprintf_s(szString,SZSTRING_SIZE,"// 0x%02x Rid", pMDSH->Rid); printLine(GUICookie,szStr); - sprintf_s(szString,SZSTRING_SIZE,"// 0x%016I64x MaskValid", (ULONGLONG)GET_UNALIGNED_VAL64(&(pMDSH->MaskValid))); + sprintf_s(szString,SZSTRING_SIZE,"// 0x%016" PRIx64 " MaskValid", (uint64_t)GET_UNALIGNED_VAL64(&(pMDSH->MaskValid))); printLine(GUICookie,szStr); - sprintf_s(szString,SZSTRING_SIZE,"// 0x%016I64x Sorted", (ULONGLONG)GET_UNALIGNED_VAL64(&(pMDSH->Sorted))); + sprintf_s(szString,SZSTRING_SIZE,"// 0x%016" PRIx64 " Sorted", (uint64_t)GET_UNALIGNED_VAL64(&(pMDSH->Sorted))); printLine(GUICookie,szStr); } } @@ -5680,7 +5680,7 @@ void DumpHeader(IMAGE_COR20_HEADER *CORHeader, void* GUICookie) dwEntryPointSize = 12; sprintf_s(szString,SZSTRING_SIZE,"// Base of code: 0x%08x", VAL32(pOptHeader->BaseOfCode)); printLine(GUICookie,szStr); - sprintf_s(szString,SZSTRING_SIZE,"// Image base: 0x%016I64x", VAL64(pOptHeader->ImageBase)); + sprintf_s(szString,SZSTRING_SIZE,"// Image base: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->ImageBase)); printLine(GUICookie,szStr); sprintf_s(szString,SZSTRING_SIZE,"// Section alignment: 0x%08x", VAL32(pOptHeader->SectionAlignment)); printLine(GUICookie,szStr); @@ -5708,13 +5708,13 @@ void DumpHeader(IMAGE_COR20_HEADER *CORHeader, void* GUICookie) printLine(GUICookie,szStr); sprintf_s(szString,SZSTRING_SIZE,"// DLL characteristics: 0x%04x", VAL16(pOptHeader->DllCharacteristics)); printLine(GUICookie,szStr); - sprintf_s(szString,SZSTRING_SIZE,"// Size of stack reserve: 0x%016I64x", VAL64(pOptHeader->SizeOfStackReserve)); + sprintf_s(szString,SZSTRING_SIZE,"// Size of stack reserve: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfStackReserve)); printLine(GUICookie,szStr); - sprintf_s(szString,SZSTRING_SIZE,"// Size of stack commit: 0x%016I64x", VAL64(pOptHeader->SizeOfStackCommit)); + sprintf_s(szString,SZSTRING_SIZE,"// Size of stack commit: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfStackCommit)); printLine(GUICookie,szStr); - sprintf_s(szString,SZSTRING_SIZE,"// Size of heap reserve: 0x%016I64x", VAL64(pOptHeader->SizeOfHeapReserve)); + sprintf_s(szString,SZSTRING_SIZE,"// Size of heap reserve: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfHeapReserve)); printLine(GUICookie,szStr); - sprintf_s(szString,SZSTRING_SIZE,"// Size of heap commit: 0x%016I64x", VAL64(pOptHeader->SizeOfHeapCommit)); + sprintf_s(szString,SZSTRING_SIZE,"// Size of heap commit: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfHeapCommit)); printLine(GUICookie,szStr); sprintf_s(szString,SZSTRING_SIZE,"// Loader flags: 0x%08x", VAL32(pOptHeader->LoaderFlags)); printLine(GUICookie,szStr); @@ -6747,12 +6747,12 @@ void DumpVtable(void* GUICookie) pNTHeader64 = g_pPELoader->ntHeaders64(); pOptHeader64 = &pNTHeader64->OptionalHeader; - sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016I64x", g_szAsmCodeIndent,KEYWORD(".imagebase"),VAL64(pOptHeader64->ImageBase)); + sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016" PRIx64, g_szAsmCodeIndent,KEYWORD(".imagebase"),(uint64_t)VAL64(pOptHeader64->ImageBase)); printLine(GUICookie,szString); j = VAL16(pOptHeader64->Subsystem); sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%08x", g_szAsmCodeIndent,KEYWORD(".file alignment"),VAL32(pOptHeader64->FileAlignment)); printLine(GUICookie,szString); - sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016I64x", g_szAsmCodeIndent,KEYWORD(".stackreserve"),VAL64(pOptHeader64->SizeOfStackReserve)); + sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016" PRIx64, g_szAsmCodeIndent,KEYWORD(".stackreserve"),(uint64_t)VAL64(pOptHeader64->SizeOfStackReserve)); printLine(GUICookie,szString); } szptr = &szString[0]; @@ -6867,7 +6867,7 @@ void DumpVtable(void* GUICookie) } else { - szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," %016I64X", VAL64(*(uint64_t *)pSlot)); + szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," %016" PRIX64, (uint64_t)VAL64(*(uint64_t *)pSlot)); pSlot += sizeof(uint64_t); } if (g_prVTableRef == NULL) diff --git a/src/coreclr/tools/metainfo/mdinfo.cpp b/src/coreclr/tools/metainfo/mdinfo.cpp index ced1b33e0903b7..738e5123d18cca 100644 --- a/src/coreclr/tools/metainfo/mdinfo.cpp +++ b/src/coreclr/tools/metainfo/mdinfo.cpp @@ -3948,10 +3948,10 @@ void MDInfo::DumpRaw(int iDump, bool bunused) const MD *pMd; pMd = (const MD *)pbMd; - VWriteLine("Metadata header: %d.%d, heaps: 0x%02x, rid: 0x%02x, valid: 0x%016I64x, sorted: 0x%016I64x", + VWriteLine("Metadata header: %d.%d, heaps: 0x%02x, rid: 0x%02x, valid: 0x%016" PRIx64 ", sorted: 0x%016" PRIx64, pMd->m_major, pMd->m_minor, pMd->m_heaps, pMd->m_rid, - (ULONGLONG)GET_UNALIGNED_VAL64(&(pMd->m_maskvalid)), - (ULONGLONG)GET_UNALIGNED_VAL64(&(pMd->m_sorted))); + (uint64_t)GET_UNALIGNED_VAL64(&(pMd->m_maskvalid)), + (uint64_t)GET_UNALIGNED_VAL64(&(pMd->m_sorted))); if (m_DumpFilter & dumpMoreHex) {