[MERGE chakra-core#896] cross platform: fixes output message for ch

digitalinfinity · digitalinfinity · commit 2c52a049e8f2 · 2016-05-02T14:41:10.000-07:00
Merge pull request chakra-core#896 from obastemur:fix_ch_text
diff --git a/bin/ch/ChakraRtInterface.cpp b/bin/ch/ChakraRtInterface.cpp
@@ -35,7 +35,7 @@ void UnloadChakraCore(HINSTANCE module)
 
 void* GetChakraCoreSymbol(HINSTANCE module, const char* symbol)
 {
-    return GetProcAddress(module, symbol);
+    return reinterpret_cast<void*>(GetProcAddress(module, symbol));
 }
 
 /*static*/
diff --git a/bin/ch/ch.cpp b/bin/ch/ch.cpp
@@ -7,7 +7,11 @@
 
 unsigned int MessageBase::s_messageCount = 0;
 
+#ifdef _WIN32
 LPCWSTR hostName = _u("ch.exe");
+#else
+LPCWSTR hostName = _u("ch");
+#endif
 
 extern "C"
 HRESULT __stdcall OnChakraCoreLoadedEntry(TestHooks& testHooks)
@@ -121,17 +125,17 @@ int HostExceptionFilter(int exceptionCode, _EXCEPTION_POINTERS *ep)
 
 void __stdcall PrintUsageFormat()
 {
-    wprintf(_u("\nUsage: ch.exe [flaglist] filename\n"));
+    wprintf(_u("\nUsage: %s [flaglist] <source file>\n"), hostName);
 }
 
 void __stdcall PrintUsage()
 {
-#ifndef DEBUG
-    wprintf(_u("\nUsage: ch.exe filename")
-            _u("\n[flaglist] is not supported for Release mode\n"));
+#if !defined(DEBUG) || !defined(_WIN32)
+    wprintf(_u("\nUsage: %s <source file> %s"), hostName,
+            _u("\n[flaglist] is only supported for debug builds on Windows\n"));
 #else
     PrintUsageFormat();
-    wprintf(_u("Try 'ch.exe -?' for help\n"));
+    wprintf(_u("Try '%s -?' for help\n"), hostName);
 #endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void UnloadChakraCore(HINSTANCE module)`
`35`	`35`
`36`	`36`	`void* GetChakraCoreSymbol(HINSTANCE module, const char* symbol)`
`37`	`37`	`{`
`38`		`- return GetProcAddress(module, symbol);`
	`38`	`+ return reinterpret_cast<void*>(GetProcAddress(module, symbol));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/static/`