Skip to content

Remove some Windows specific formatters #78434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AaronRobinsonMSFT merged 9 commits into from
Nov 17, 2022
Merged

Remove some Windows specific formatters #78434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b201ca7
Remove remaining Windows printf modifiers
AaronRobinsonMSFT Nov 4, 2022
7f0cc06
Merge remote-tracking branch 'upstream/main' into remove_win_formatters
AaronRobinsonMSFT Nov 5, 2022
1d21c46
Merge remote-tracking branch 'upstream/main' into remove_win_formatters
AaronRobinsonMSFT Nov 15, 2022
f581d53
mono - Remove Microsoft specific printf specifier.
AaronRobinsonMSFT Nov 15, 2022
1358ca6
Remove some uses of %S.
AaronRobinsonMSFT Nov 16, 2022
6a7d204
Missed signature updates.
AaronRobinsonMSFT Nov 16, 2022
5384252
Review feedback
AaronRobinsonMSFT Nov 16, 2022
a7bdad3
Feedback
AaronRobinsonMSFT Nov 16, 2022
c435b59
Apply suggestions from code review
AaronRobinsonMSFT Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/debug/daccess/enummem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2050,7 +2050,7 @@ ClrDataAccess::EnumMemoryRegions(IN ICLRDataEnumMemoryRegionsCallback* callback,
fprintf(fp, "Total = %g msec\n"
"ReadVirtual = %g msec\n"
"StackWalk = %g msec; Find: %g msec\n"
"Find = %g msec; Hash = %g msec; Calls = %I64u; Hits = %I64u; Not found = %I64u\n\n=====\n",
"Find = %g msec; Hash = %g msec; Calls = %llu; Hits = %llu; Not found = %llu\n\n=====\n",
(float) (1000*g_nTotalTime/nClockFrequency.QuadPart),
(float) (1000*g_nReadVirtualTotalTime/nClockFrequency.QuadPart),
(float) (1000*g_nStackTotalTime/nClockFrequency.QuadPart), (float) (1000*g_nFindStackTotalTime/nClockFrequency.QuadPart),
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/debug/di/process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12296,7 +12296,7 @@ Reaction CordbProcess::Triage1stChanceNonSpecial(CordbUnmanagedThread * pUnmanag
(addrType == IDacDbiInterface::kAddressRuntimeManagedCode) ||
(addrType == IDacDbiInterface::kAddressRuntimeUnmanagedCode));

STRESS_LOG2(LF_CORDB, LL_INFO1000, "W32ET::W32EL: IsCorCode(0x%I64p)=%d\n", address, fIsCorCode);
STRESS_LOG2(LF_CORDB, LL_INFO1000, "W32ET::W32EL: IsCorCode(0x%p)=%d\n", address, fIsCorCode);


if (fIsCorCode)
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/gc/handletable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,14 +1120,14 @@ void DEBUG_LogScanningStatistics(HandleTable *pTable, uint32_t level)
// dump the generation number and the number of blocks scanned
LOG((LF_GC, level, "--------------------------------------------------------------\n"));
LOG((LF_GC, level, " Condemned Generation = %d\n", i));
LOG((LF_GC, level, " Blocks Scanned = %I64u\n", totalBlocksScanned));
LOG((LF_GC, level, " Blocks Scanned = %llu\n", totalBlocksScanned));

// if we scanned any blocks in this generation then dump some interesting numbers
if (totalBlocksScanned)
{
LOG((LF_GC, level, " Blocks Examined = %I64u\n", pTable->_DEBUG_TotalBlocksScannedNonTrivially[i]));
LOG((LF_GC, level, " Slots Scanned = %I64u\n", pTable->_DEBUG_TotalHandleSlotsScanned [i]));
LOG((LF_GC, level, " Handles Scanned = %I64u\n", pTable->_DEBUG_TotalHandlesActuallyScanned [i]));
LOG((LF_GC, level, " Blocks Examined = %llu\n", pTable->_DEBUG_TotalBlocksScannedNonTrivially[i]));
LOG((LF_GC, level, " Slots Scanned = %llu\n", pTable->_DEBUG_TotalHandleSlotsScanned [i]));
LOG((LF_GC, level, " Handles Scanned = %llu\n", pTable->_DEBUG_TotalHandlesActuallyScanned [i]));

double blocksScanned = (double) totalBlocksScanned;
double blocksExamined = (double) pTable->_DEBUG_TotalBlocksScannedNonTrivially[i];
Expand Down
78 changes: 39 additions & 39 deletions src/coreclr/gcinfo/gcinfoencoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,45 +384,45 @@ void GcInfoSize::Log(DWORD level, const char * header)
LogSpew(LF_GCINFO, level, header);

LogSpew(LF_GCINFO, level, "---COUNTS---\n");
LogSpew(LF_GCINFO, level, "NumMethods: %Iu\n", NumMethods);
LogSpew(LF_GCINFO, level, "NumCallSites: %Iu\n", NumCallSites);
LogSpew(LF_GCINFO, level, "NumRanges: %Iu\n", NumRanges);
LogSpew(LF_GCINFO, level, "NumRegs: %Iu\n", NumRegs);
LogSpew(LF_GCINFO, level, "NumStack: %Iu\n", NumStack);
LogSpew(LF_GCINFO, level, "NumUntracked: %Iu\n", NumUntracked);
LogSpew(LF_GCINFO, level, "NumTransitions: %Iu\n", NumTransitions);
LogSpew(LF_GCINFO, level, "SizeOfCode: %Iu\n", SizeOfCode);
LogSpew(LF_GCINFO, level, "EncInfoSize: %Iu\n", EncInfoSize);
LogSpew(LF_GCINFO, level, "NumMethods: %zu\n", NumMethods);
LogSpew(LF_GCINFO, level, "NumCallSites: %zu\n", NumCallSites);
LogSpew(LF_GCINFO, level, "NumRanges: %zu\n", NumRanges);
LogSpew(LF_GCINFO, level, "NumRegs: %zu\n", NumRegs);
LogSpew(LF_GCINFO, level, "NumStack: %zu\n", NumStack);
LogSpew(LF_GCINFO, level, "NumUntracked: %zu\n", NumUntracked);
LogSpew(LF_GCINFO, level, "NumTransitions: %zu\n", NumTransitions);
LogSpew(LF_GCINFO, level, "SizeOfCode: %zu\n", SizeOfCode);
LogSpew(LF_GCINFO, level, "EncInfoSize: %zu\n", EncInfoSize);

LogSpew(LF_GCINFO, level, "---SIZES(bits)---\n");
LogSpew(LF_GCINFO, level, "Total: %Iu\n", TotalSize);
LogSpew(LF_GCINFO, level, "UntrackedSlot: %Iu\n", UntrackedSlotSize);
LogSpew(LF_GCINFO, level, "NumUntracked: %Iu\n", NumUntrackedSize);
LogSpew(LF_GCINFO, level, "Flags: %Iu\n", FlagsSize);
LogSpew(LF_GCINFO, level, "CodeLength: %Iu\n", CodeLengthSize);
LogSpew(LF_GCINFO, level, "Prolog/Epilog: %Iu\n", ProEpilogSize);
LogSpew(LF_GCINFO, level, "SecObj: %Iu\n", SecObjSize);
LogSpew(LF_GCINFO, level, "GsCookie: %Iu\n", GsCookieSize);
LogSpew(LF_GCINFO, level, "PspSym: %Iu\n", PspSymSize);
LogSpew(LF_GCINFO, level, "GenericsCtx: %Iu\n", GenericsCtxSize);
LogSpew(LF_GCINFO, level, "StackBase: %Iu\n", StackBaseSize);
LogSpew(LF_GCINFO, level, "FixedArea: %Iu\n", FixedAreaSize);
LogSpew(LF_GCINFO, level, "ReversePInvokeFrame: %Iu\n", ReversePInvokeFrameSize);
LogSpew(LF_GCINFO, level, "NumCallSites: %Iu\n", NumCallSitesSize);
LogSpew(LF_GCINFO, level, "NumRanges: %Iu\n", NumRangesSize);
LogSpew(LF_GCINFO, level, "CallSiteOffsets: %Iu\n", CallSitePosSize);
LogSpew(LF_GCINFO, level, "Ranges: %Iu\n", RangeSize);
LogSpew(LF_GCINFO, level, "NumRegs: %Iu\n", NumRegsSize);
LogSpew(LF_GCINFO, level, "NumStack: %Iu\n", NumStackSize);
LogSpew(LF_GCINFO, level, "RegSlots: %Iu\n", RegSlotSize);
LogSpew(LF_GCINFO, level, "StackSlots: %Iu\n", StackSlotSize);
LogSpew(LF_GCINFO, level, "CallSiteStates: %Iu\n", CallSiteStateSize);
LogSpew(LF_GCINFO, level, "EhOffsets: %Iu\n", EhPosSize);
LogSpew(LF_GCINFO, level, "EhStates: %Iu\n", EhStateSize);
LogSpew(LF_GCINFO, level, "ChunkPointers: %Iu\n", ChunkPtrSize);
LogSpew(LF_GCINFO, level, "ChunkMasks: %Iu\n", ChunkMaskSize);
LogSpew(LF_GCINFO, level, "ChunkFinalStates: %Iu\n", ChunkFinalStateSize);
LogSpew(LF_GCINFO, level, "Transitions: %Iu\n", ChunkTransitionSize);
LogSpew(LF_GCINFO, level, "Total: %zu\n", TotalSize);
LogSpew(LF_GCINFO, level, "UntrackedSlot: %zu\n", UntrackedSlotSize);
LogSpew(LF_GCINFO, level, "NumUntracked: %zu\n", NumUntrackedSize);
LogSpew(LF_GCINFO, level, "Flags: %zu\n", FlagsSize);
LogSpew(LF_GCINFO, level, "CodeLength: %zu\n", CodeLengthSize);
LogSpew(LF_GCINFO, level, "Prolog/Epilog: %zu\n", ProEpilogSize);
LogSpew(LF_GCINFO, level, "SecObj: %zu\n", SecObjSize);
LogSpew(LF_GCINFO, level, "GsCookie: %zu\n", GsCookieSize);
LogSpew(LF_GCINFO, level, "PspSym: %zu\n", PspSymSize);
LogSpew(LF_GCINFO, level, "GenericsCtx: %zu\n", GenericsCtxSize);
LogSpew(LF_GCINFO, level, "StackBase: %zu\n", StackBaseSize);
LogSpew(LF_GCINFO, level, "FixedArea: %zu\n", FixedAreaSize);
LogSpew(LF_GCINFO, level, "ReversePInvokeFrame: %zu\n", ReversePInvokeFrameSize);
LogSpew(LF_GCINFO, level, "NumCallSites: %zu\n", NumCallSitesSize);
LogSpew(LF_GCINFO, level, "NumRanges: %zu\n", NumRangesSize);
LogSpew(LF_GCINFO, level, "CallSiteOffsets: %zu\n", CallSitePosSize);
LogSpew(LF_GCINFO, level, "Ranges: %zu\n", RangeSize);
LogSpew(LF_GCINFO, level, "NumRegs: %zu\n", NumRegsSize);
LogSpew(LF_GCINFO, level, "NumStack: %zu\n", NumStackSize);
LogSpew(LF_GCINFO, level, "RegSlots: %zu\n", RegSlotSize);
LogSpew(LF_GCINFO, level, "StackSlots: %zu\n", StackSlotSize);
LogSpew(LF_GCINFO, level, "CallSiteStates: %zu\n", CallSiteStateSize);
LogSpew(LF_GCINFO, level, "EhOffsets: %zu\n", EhPosSize);
LogSpew(LF_GCINFO, level, "EhStates: %zu\n", EhStateSize);
LogSpew(LF_GCINFO, level, "ChunkPointers: %zu\n", ChunkPtrSize);
LogSpew(LF_GCINFO, level, "ChunkMasks: %zu\n", ChunkMaskSize);
LogSpew(LF_GCINFO, level, "ChunkFinalStates: %zu\n", ChunkFinalStateSize);
LogSpew(LF_GCINFO, level, "Transitions: %zu\n", ChunkTransitionSize);
}
}

Expand Down Expand Up @@ -2266,8 +2266,8 @@ lExitSuccess:;
m_CurrentMethodSize.Log(LL_INFO100, "=== PartiallyInterruptible method breakdown ===\r\n");
g_PiGcInfoSize.Log(LL_INFO10, "=== PartiallyInterruptible global breakdown ===\r\n");
}
LogSpew(LF_GCINFO, LL_INFO10, "Total SlimHeaders: %Iu\n", g_NumSlimHeaders);
LogSpew(LF_GCINFO, LL_INFO10, "NumMethods: %Iu\n", g_NumFatHeaders);
LogSpew(LF_GCINFO, LL_INFO10, "Total SlimHeaders: %zu\n", g_NumSlimHeaders);
LogSpew(LF_GCINFO, LL_INFO10, "NumMethods: %zu\n", g_NumFatHeaders);
#endif
}

Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/ilasm/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ extern "C" int _cdecl wmain(int argc, _In_ WCHAR **argv)
#endif
{
printf("\n.NET IL Assembler version " CLR_PRODUCT_VERSION);
printf("\n%S\n\n", VER_LEGALCOPYRIGHT_LOGO_STR_L);
printf("\n%s\n\n", VER_LEGALCOPYRIGHT_LOGO_STR);
goto PrintUsageAndExit;

ErrorExit:
Expand Down Expand Up @@ -391,7 +391,7 @@ extern "C" int _cdecl wmain(int argc, _In_ WCHAR **argv)
pAsm->m_wzResourceFile = pStr;
}
else
printf("Multiple resource files not allowed. Option %ls skipped\n",argv[i]);
printf("Multiple resource files not allowed. Last RES option skipped\n");
}
else if (!_stricmp(szOpt, "KEY"))
{
Expand Down Expand Up @@ -665,7 +665,7 @@ extern "C" int _cdecl wmain(int argc, _In_ WCHAR **argv)
if(bLogo)
{
printf("\n.NET IL Assembler. Version " CLR_PRODUCT_VERSION);
printf("\n%S", VER_LEGALCOPYRIGHT_LOGO_STR_L);
printf("\n%s", VER_LEGALCOPYRIGHT_LOGO_STR);
}

pAsm->SetDLL(IsDLL);
Expand Down Expand Up @@ -848,14 +848,14 @@ extern "C" int _cdecl wmain(int argc, _In_ WCHAR **argv)
wcscpy_s(pc+1,4,W("PDB"));

#ifdef TARGET_WINDOWS
_wremove(wzOutputFilename);
_wremove(wzOutputFilename);
#else
MAKE_UTF8PTR_FROMWIDE_NOTHROW(szOutputFilename, wzOutputFilename);
if (szOutputFilename != NULL)
{
remove(szOutputFilename);
}
#endif
#endif
}
if (exitval == 0)
{
Expand Down
14 changes: 7 additions & 7 deletions src/coreclr/ildasm/dasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1890,7 +1890,7 @@ BYTE* PrettyPrintCABlobValue(PCCOR_SIGNATURE &typePtr,
for(n=0; n < numElements; n++)
{
if(n) appendStr(out," ");
sprintf_s(str,64,"%I64d",GET_UNALIGNED_VAL64(dataPtr));
sprintf_s(str,64,"%lld",GET_UNALIGNED_VAL64(dataPtr));
appendStr(out,str);
dataPtr +=8;
}
Expand All @@ -1902,7 +1902,7 @@ BYTE* PrettyPrintCABlobValue(PCCOR_SIGNATURE &typePtr,
for(n=0; n < numElements; n++)
{
if(n) appendStr(out," ");
sprintf_s(str,64,"%I64d",(ULONGLONG)GET_UNALIGNED_VAL64(dataPtr));
sprintf_s(str,64,"%lld",(ULONGLONG)GET_UNALIGNED_VAL64(dataPtr));
appendStr(out,str);
dataPtr +=8;
}
Expand Down Expand Up @@ -1938,7 +1938,7 @@ BYTE* PrettyPrintCABlobValue(PCCOR_SIGNATURE &typePtr,
// Must compare as underlying bytes, not floating point otherwise optimizer will
// try to enregister and compare 80-bit precision number with 64-bit precision number!!!!
if((*(ULONGLONG*)&df != (ULONGLONG)GET_UNALIGNED_VAL64(dataPtr))||IsSpecialNumber(str))
sprintf_s(str, 64, "0x%I64X",(ULONGLONG)GET_UNALIGNED_VAL64(dataPtr));
sprintf_s(str, 64, "0x%llX",(ULONGLONG)GET_UNALIGNED_VAL64(dataPtr));
appendStr(out,str);
dataPtr +=8;
}
Expand Down Expand Up @@ -2597,10 +2597,10 @@ void DumpDefaultValue(mdToken tok, __inout __nullterminated char* szString, void
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr),"(%s)", KEYWORD((char *)(MDDV.m_byteValue ? "true" : "false")));
break;
case ELEMENT_TYPE_I8:
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," = %s(0x%I64X)",KEYWORD("int64"),MDDV.m_ullValue);
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," = %s(0x%llX)",KEYWORD("int64"),MDDV.m_ullValue);
break;
case ELEMENT_TYPE_U8:
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," = %s(0x%I64X)",KEYWORD("uint64"),MDDV.m_ullValue);
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," = %s(0x%llX)",KEYWORD("uint64"),MDDV.m_ullValue);
break;
case ELEMENT_TYPE_R4:
{
Expand All @@ -2627,7 +2627,7 @@ void DumpDefaultValue(mdToken tok, __inout __nullterminated char* szString, void
if((*(ULONGLONG*)&df == MDDV.m_ullValue)&&!IsSpecialNumber(szf))
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," = %s(%s)",KEYWORD("float64"),szf);
else
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), " = %s(0x%I64X) // %s",KEYWORD("float64"),MDDV.m_ullValue,szf);
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), " = %s(0x%llX) // %s",KEYWORD("float64"),MDDV.m_ullValue,szf);
}
break;

Expand Down Expand Up @@ -3743,7 +3743,7 @@ BOOL DumpMethod(mdToken FuncToken, const char *pszClassName, DWORD dwEntryPointT
sprintf_s(pszArgname[j].name,16,"A_%d",g_fThisIsInstanceMethod ? j+1 : j);
}
}// end for( along the argnames)
sprintf_s(szArgPrefix,MAX_PREFIX_SIZE,"@%Id0",(size_t)pszArgname);
sprintf_s(szArgPrefix,MAX_PREFIX_SIZE,"@%zd0",(size_t)pszArgname);
} //end if (ulArgs)
g_pImport->EnumClose(&hArgEnum);
}
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/ildasm/dasm.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ END

STRINGTABLE DISCARDABLE
BEGIN
IDS_USAGE_40 L" /ALL Combination of /HEADER, /BYTES, /TOKENS\n\n"
IDS_USAGE_41 L"\nOption key is '-' or '/', options are recognized by first 3 characters\n\n"
IDS_USAGE_42 L"Example: ildasm /tok /byt myfile.exe /out=myfile.il\n\n"
IDS_USAGE_43 L"\n\nPress any key to close the console window..."
Expand Down Expand Up @@ -203,8 +202,6 @@ END

STRINGTABLE DISCARDABLE
BEGIN
IDS_E_MULTIPLEINPUT L"MULTIPLE INPUT FILES SPECIFIED\n\n"
IDS_E_INVALIDOPTION L"INVALID COMMAND LINE OPTION: %s\n\n"
IDS_W_CREATEDW32RES L"WARNING: Created Win32 resource file %s"
IDS_E_CORRUPTW32RES L"ERROR: Corrupt Win32 resources"
IDS_E_CANTOPENW32RES L"ERROR: Unable to open file %s"
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/ildasm/dis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ BOOL Disassemble(IMDInternalImport *pImport, BYTE *ILHeader, void *GUICookie, md
LoadScope(pRootScope,&daScope,&ulScopes);
qsort(&daScope[0],ulScopes,sizeof(LexScope),cmpLexScope);
OpenScope(pRootScope,pszLVname,ulVars);
sprintf_s(szVarPrefix,MAX_PREFIX_SIZE,"@%Id0",(size_t)pszLVname);
sprintf_s(szVarPrefix,MAX_PREFIX_SIZE,"@%zd0",(size_t)pszLVname);

#ifndef SHOW_LEXICAL_SCOPES
for(unsigned jjj = 0; jjj < ulScopes; jjj++)
Expand Down Expand Up @@ -1540,7 +1540,7 @@ BOOL Disassemble(IMDInternalImport *pImport, BYTE *ILHeader, void *GUICookie, md
PadTheString;
}

szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), "%-10s 0x%I64x", pszInstrName, v);
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), "%-10s 0x%llx", pszInstrName, v);
PC += 8;
break;
}
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/ildasm/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@
#define IDS_E_MDIIMPORT 456
#define IDS_E_NOMANIFEST 457

#define IDS_E_MULTIPLEINPUT 458
#define IDS_E_INVALIDOPTION 459
#define IDS_W_CREATEDW32RES 470
#define IDS_E_CORRUPTW32RES 471
#define IDS_E_CANTOPENW32RES 472
Expand Down
18 changes: 9 additions & 9 deletions src/coreclr/ildasm/windasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,22 @@ FILE* OpenOutput(_In_ __nullterminated const char* szFileName);
void PrintLogo()
{
printf(".NET IL Disassembler. Version " CLR_PRODUCT_VERSION);
printf("\n%S\n\n", VER_LEGALCOPYRIGHT_LOGO_STR_L);
printf("\n%s\n\n", VER_LEGALCOPYRIGHT_LOGO_STR);
}

void SyntaxCon()
{
DWORD l;

for(l=IDS_USAGE_01; l<= IDS_USAGE_23; l++) printf(RstrANSI(l));
for(l=IDS_USAGE_01; l<= IDS_USAGE_23; l++) printf("%s", RstrANSI(l));
if(g_fTDC)
{
for(l=IDS_USAGE_24; l<= IDS_USAGE_32; l++) printf(RstrANSI(l));
for(l=IDS_USAGE_34; l<= IDS_USAGE_36; l++) printf(RstrANSI(l));
for(l=IDS_USAGE_37; l<= IDS_USAGE_39; l++) printf(RstrANSI(l));
for(l=IDS_USAGE_24; l<= IDS_USAGE_32; l++) printf("%s", RstrANSI(l));
for(l=IDS_USAGE_34; l<= IDS_USAGE_36; l++) printf("%s", RstrANSI(l));
for(l=IDS_USAGE_37; l<= IDS_USAGE_39; l++) printf("%s", RstrANSI(l));
}
else printf(RstrANSI(IDS_USAGE_40));
for(l=IDS_USAGE_41; l<= IDS_USAGE_42; l++) printf(RstrANSI(l));
else printf(" /ALL Combination of /HEADER, /BYTES, /TOKENS\n\n");
for(l=IDS_USAGE_41; l<= IDS_USAGE_42; l++) printf("%s", RstrANSI(l));

}

Expand Down Expand Up @@ -403,7 +403,7 @@ int ProcessOneArg(_In_ __nullterminated char* szArg, _Out_ char** ppszObjFileNam
else
{
PrintLogo();
printf(RstrANSI(IDS_E_INVALIDOPTION),szArg); //"INVALID COMMAND LINE OPTION: %s\n\n",szArg);
printf("INVALID COMMAND LINE OPTION: %s\n\n",szArg);
return -1;
}
}
Expand All @@ -412,7 +412,7 @@ int ProcessOneArg(_In_ __nullterminated char* szArg, _Out_ char** ppszObjFileNam
if(g_szInputFile[0])
{
PrintLogo();
printf(RstrANSI(IDS_E_MULTIPLEINPUT)); //"MULTIPLE INPUT FILES SPECIFIED\n\n");
printf("MULTIPLE INPUT FILES SPECIFIED\n\n");
return -1; // check if it was already specified
}
szArg = CheckForDQuotes(szArg);
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/inc/clrversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
#define VER_FILEVERSION_STR_L QUOTE_MACRO_L(RuntimeFileMajorVersion.RuntimeFileMinorVersion.RuntimeFileBuildVersion.RuntimeFileRevisionVersion)

#define VER_LEGALCOPYRIGHT_LOGO_STR "Copyright (c) Microsoft Corporation. All rights reserved."
#define VER_LEGALCOPYRIGHT_LOGO_STR_L L"Copyright (c) Microsoft Corporation. All rights reserved."
4 changes: 2 additions & 2 deletions src/coreclr/inc/formattype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ char* DumpMarshaling(IMDInternalImport* pImport,
buf.AppendASCII(" }) ");

char * tgt = szString + strlen(szString);
int sprintf_ret = sprintf_s(tgt, cchszString - (tgt - szString), "%S", buf.GetUnicode());
int sprintf_ret = sprintf_s(tgt, cchszString - (tgt - szString), "%s", buf.GetUTF8());
if (sprintf_ret == -1)
{
// Hit an error. Oh well, nothing to do...
Expand All @@ -1521,7 +1521,7 @@ char* DumpMarshaling(IMDInternalImport* pImport,
else
{
char * tgt = szString + strlen(szString);
int sprintf_ret = sprintf_s(tgt, cchszString - (tgt - szString), "%S", buf.GetUnicode());
int sprintf_ret = sprintf_s(tgt, cchszString - (tgt - szString), "%s", buf.GetUTF8());
if (sprintf_ret == -1)
{
// There was an error, possibly with converting the Unicode characters.
Expand Down
Loading