[PATCH] mscoree: Accept old framework build in exe metadata.

Vincent Povirk vincent at codeweavers.com
Sat May 4 13:25:58 CDT 2019


Wine-Bug: 27185.
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
---
 dlls/mscoree/metahost.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c
index b268acc449..c7407273cf 100644
--- a/dlls/mscoree/metahost.c
+++ b/dlls/mscoree/metahost.c
@@ -1723,11 +1723,35 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file,
 
     if (exefile && !version)
     {
+        DWORD major, minor, build;
+
         hr = CLRMetaHost_GetVersionFromFile(0, exefile, local_version, &local_version_size);
 
         version = local_version;
 
         if (FAILED(hr)) return hr;
+
+        /* When running an executable, specifically when getting the version number from
+         * the exe, native accepts a matching major.minor with build <= expected build. */
+        if (!parse_runtime_version(version, &major, &minor, &build))
+        {
+            ERR("Cannot parse %s\n", debugstr_w(version));
+            return CLR_E_SHIM_RUNTIME;
+        }
+
+        if (legacy)
+            i = 3;
+        else
+            i = NUM_RUNTIMES;
+
+        while (i--)
+        {
+            if (runtimes[i].major == major && runtimes[i].minor == minor && runtimes[i].build >= build)
+            {
+                return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface,
+                        &IID_ICLRRuntimeInfo, (void **)result);
+            }
+        }
     }
 
     if (version)
-- 
2.17.1




More information about the wine-patches mailing list