more coding PR feedback

src/coreclr/src/CMakeLists.txt

@@ -7,6 +7,7 @@ include_directories("classlibnative/bcltype")
 include_directories("classlibnative/cryptography")
 include_directories("classlibnative/inc")
 include_directories("${GENERATED_INCLUDE_DIR}")
+include_directories("hosts/inc")
 
 if(CLR_CMAKE_TARGET_WIN32 AND FEATURE_EVENT_TRACE)
     include_directories("${GENERATED_INCLUDE_DIR}/etw")

src/coreclr/src/dlls/mscoree/unixinterface.cpp

@@ -120,7 +120,7 @@ static void ConvertConfigPropertiesToUnicode(
     int propertyCount,
     LPCWSTR** propertyKeysWRef,
     LPCWSTR** propertyValuesWRef,
-    BundleProbe** bundleProbe,
+    BundleProbeFn** bundleProbe,
     PInvokeOverrideFn** pinvokeOverride,
     bool* hostPolicyEmbedded)
 {
@@ -139,7 +139,7 @@ static void ConvertConfigPropertiesToUnicode(
         {
             // If this application is a single-file bundle, the bundle-probe callback 
             // is passed in as the value of "BUNDLE_PROBE" property (encoded as a string).
-            *bundleProbe = (BundleProbe*)_wcstoui64(propertyValuesW[propertyIndex], nullptr, 0);
+            *bundleProbe = (BundleProbeFn*)_wcstoui64(propertyValuesW[propertyIndex], nullptr, 0);
         }
         else if (strcmp(propertyKeys[propertyIndex], "PINVOKE_OVERRIDE") == 0)
         {
@@ -193,7 +193,7 @@ int coreclr_initialize(
 
     LPCWSTR* propertyKeysW;
     LPCWSTR* propertyValuesW;
-    BundleProbe* bundleProbe = nullptr;
+    BundleProbeFn* bundleProbe = nullptr;
     bool hostPolicyEmbedded = false;
     PInvokeOverrideFn* pinvokeOverride = nullptr;
 

src/coreclr/src/hosts/inc/coreclrhost.h

@@ -14,6 +14,8 @@
 #define CORECLR_CALLING_CONVENTION
 #endif
 
+#include <stdint.h>
+
 // For each hosting API, we define a function prototype and a function pointer
 // The prototype is useful for implicit linking against the dynamic coreclr
 // library and the pointer for explicit dynamic loading (dlopen, LoadLibrary)
@@ -121,4 +123,11 @@ CORECLR_HOSTING_API(coreclr_execute_assembly,
 
 #undef CORECLR_HOSTING_API
 
+//
+// Callback types used by the hosts
+//
+typedef bool(BundleProbeFn)(const char* path, int64_t* offset, int64_t* size);
+typedef const void* (PInvokeOverrideFn)(const char* libraryName, const char* entrypointName);
+
+
 #endif // __CORECLR_HOST_H__

src/coreclr/src/inc/bundle.h

@@ -11,6 +11,7 @@
 #define _BUNDLE_H_
 
 #include <sstring.h>
+#include "coreclrhost.h"
 
 class Bundle;
 
@@ -34,12 +35,10 @@ struct BundleFileLocation
     bool IsValid() const { LIMITED_METHOD_CONTRACT; return Offset != 0; }
 };
 
-typedef bool(BundleProbe)(LPCSTR, INT64*, INT64*);
-
 class Bundle
 {
 public:
-    Bundle(LPCSTR bundlePath, BundleProbe *probe);
+    Bundle(LPCSTR bundlePath, BundleProbeFn *probe);
     BundleFileLocation Probe(const SString& path, bool pathIsBundleRelative = false) const;
 
     const SString &Path() const { LIMITED_METHOD_CONTRACT; return m_path; }
@@ -52,7 +51,7 @@ class Bundle
 private:
 
     SString m_path; // The path to single-file executable
-    BundleProbe *m_probe;
+    BundleProbeFn *m_probe;
 
     SString m_basePath; // The prefix to denote a path within the bundle
     COUNT_T m_basePathLength;

src/coreclr/src/inc/pinvokeoverride.h

@@ -10,7 +10,7 @@
 #ifndef _PINVOKEOVERRIDE_H_
 #define _PINVOKEOVERRIDE_H_
 
-typedef const void* (PInvokeOverrideFn)(const char* libraryName, const char* entrypointName);
+#include "coreclrhost.h"
 
 class PInvokeOverride
 {

src/coreclr/src/vm/bundle.cpp

@@ -30,7 +30,7 @@ const SString &BundleFileLocation::Path() const
     return Bundle::AppBundle->Path();
 }
 
-Bundle::Bundle(LPCSTR bundlePath, BundleProbe *probe)
+Bundle::Bundle(LPCSTR bundlePath, BundleProbeFn *probe)
 {
     STANDARD_VM_CONTRACT;
 

src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp

@@ -44,7 +44,6 @@ namespace
     }
 
 #if defined(NATIVE_LIBS_EMBEDDED)
-    extern "C" const void* GlobalizationResolveDllImport(const char* name);
     extern "C" const void* CompressionResolveDllImport(const char* name);
 
     // pinvoke_override: