Vincent Povirk : mscoree: Implement ICLRMetaHost_GetVersionFromFile.
Alexandre Julliard
julliard at winehq.org
Tue Oct 5 12:03:06 CDT 2010
Module: wine
Branch: master
Commit: 3f211a5126ae29c817fa0ca1e298b8097d754c37
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f211a5126ae29c817fa0ca1e298b8097d754c37
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Wed Sep 22 15:27:52 2010 -0500
mscoree: Implement ICLRMetaHost_GetVersionFromFile.
---
dlls/mscoree/Makefile.in | 3 +-
dlls/mscoree/assembly.c | 246 ++++++++++++++++++++++++++++++++++++++++
dlls/mscoree/metahost.c | 31 +++++-
dlls/mscoree/mscoree_private.h | 6 +
4 files changed, 283 insertions(+), 3 deletions(-)
diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in
index 6346aa9..dfbd58a 100644
--- a/dlls/mscoree/Makefile.in
+++ b/dlls/mscoree/Makefile.in
@@ -1,7 +1,8 @@
MODULE = mscoree.dll
-IMPORTS = uuid shell32 advapi32
+IMPORTS = dbghelp uuid shell32 advapi32
C_SRCS = \
+ assembly.c \
corruntimehost.c \
metahost.c \
mscoree_main.c
diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c
new file mode 100644
index 0000000..b4b72d4
--- /dev/null
+++ b/dlls/mscoree/assembly.c
@@ -0,0 +1,246 @@
+/*
+ * assembly parser
+ *
+ * Copyright 2008 James Hawkins
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winver.h"
+#include "dbghelp.h"
+#include "ole2.h"
+#include "corhdr.h"
+#include "mscoree_private.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+typedef struct
+{
+ ULONG Signature;
+ USHORT MajorVersion;
+ USHORT MinorVersion;
+ ULONG Reserved;
+ ULONG VersionLength;
+ LPSTR Version;
+ BYTE Flags;
+ WORD Streams;
+} METADATAHDR;
+
+typedef struct
+{
+ DWORD Offset;
+ DWORD Size;
+} METADATASTREAMHDR;
+
+typedef struct tagCLRTABLE
+{
+ INT rows;
+ DWORD offset;
+} CLRTABLE;
+
+struct tagASSEMBLY
+{
+ LPWSTR path;
+
+ HANDLE hfile;
+ HANDLE hmap;
+ BYTE *data;
+
+ IMAGE_NT_HEADERS *nthdr;
+ IMAGE_COR20_HEADER *corhdr;
+
+ METADATAHDR *metadatahdr;
+};
+
+static inline LPWSTR strdupW(LPCWSTR src)
+{
+ LPWSTR dest;
+
+ if (!src)
+ return NULL;
+
+ dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
+ if (dest)
+ lstrcpyW(dest, src);
+
+ return dest;
+}
+
+static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz)
+{
+ METADATAHDR *metadatahdr;
+ BYTE *ptr, *dest;
+ DWORD size, ofs;
+ ULONG rva;
+
+ rva = assembly->corhdr->MetaData.VirtualAddress;
+ ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL);
+ if (!ptr)
+ return E_FAIL;
+
+ metadatahdr = (METADATAHDR *)ptr;
+
+ assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR));
+ if (!assembly->metadatahdr)
+ return E_OUTOFMEMORY;
+
+ size = FIELD_OFFSET(METADATAHDR, Version);
+ memcpy(assembly->metadatahdr, metadatahdr, size);
+
+ assembly->metadatahdr->Version = (LPSTR)&metadatahdr->Version;
+
+ ofs = FIELD_OFFSET(METADATAHDR, Flags);
+ ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1;
+ dest = (BYTE *)assembly->metadatahdr + ofs;
+ memcpy(dest, ptr, sizeof(METADATAHDR) - ofs);
+
+ *hdrsz = sizeof(METADATAHDR) - sizeof(LPSTR) + metadatahdr->VersionLength + 1;
+
+ return S_OK;
+}
+
+static HRESULT parse_clr_metadata(ASSEMBLY *assembly)
+{
+ HRESULT hr;
+ DWORD hdrsz;
+
+ hr = parse_metadata_header(assembly, &hdrsz);
+ if (FAILED(hr))
+ return hr;
+
+ return S_OK;
+}
+
+static HRESULT parse_pe_header(ASSEMBLY *assembly)
+{
+ IMAGE_DATA_DIRECTORY *datadirs;
+
+ assembly->nthdr = ImageNtHeader(assembly->data);
+ if (!assembly->nthdr)
+ return E_FAIL;
+
+ if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC)
+ {
+ IMAGE_OPTIONAL_HEADER64 *opthdr =
+ (IMAGE_OPTIONAL_HEADER64 *)&assembly->nthdr->OptionalHeader;
+ datadirs = opthdr->DataDirectory;
+ }
+ else
+ {
+ IMAGE_OPTIONAL_HEADER32 *opthdr =
+ (IMAGE_OPTIONAL_HEADER32 *)&assembly->nthdr->OptionalHeader;
+ datadirs = opthdr->DataDirectory;
+ }
+
+ if (!datadirs)
+ return E_FAIL;
+
+ if (!datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress ||
+ !datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size)
+ {
+ return E_FAIL;
+ }
+
+ assembly->corhdr = ImageRvaToVa(assembly->nthdr, assembly->data,
+ datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress, NULL);
+ if (!assembly->corhdr)
+ return E_FAIL;
+
+ return S_OK;
+}
+
+HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file)
+{
+ ASSEMBLY *assembly;
+ HRESULT hr;
+
+ *out = NULL;
+
+ assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY));
+ if (!assembly)
+ return E_OUTOFMEMORY;
+
+ assembly->path = strdupW(file);
+ if (!assembly->path)
+ {
+ hr = E_OUTOFMEMORY;
+ goto failed;
+ }
+
+ assembly->hfile = CreateFileW(file, GENERIC_READ, FILE_SHARE_READ,
+ NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ if (assembly->hfile == INVALID_HANDLE_VALUE)
+ {
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ goto failed;
+ }
+
+ assembly->hmap = CreateFileMappingW(assembly->hfile, NULL, PAGE_READONLY,
+ 0, 0, NULL);
+ if (!assembly->hmap)
+ {
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ goto failed;
+ }
+
+ assembly->data = MapViewOfFile(assembly->hmap, FILE_MAP_READ, 0, 0, 0);
+ if (!assembly->data)
+ {
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ goto failed;
+ }
+
+ hr = parse_pe_header(assembly);
+ if (FAILED(hr)) goto failed;
+
+ hr = parse_clr_metadata(assembly);
+ if (FAILED(hr)) goto failed;
+
+ *out = assembly;
+ return S_OK;
+
+failed:
+ assembly_release(assembly);
+ return hr;
+}
+
+HRESULT assembly_release(ASSEMBLY *assembly)
+{
+ if (!assembly)
+ return S_OK;
+
+ HeapFree(GetProcessHeap(), 0, assembly->metadatahdr);
+ HeapFree(GetProcessHeap(), 0, assembly->path);
+ UnmapViewOfFile(assembly->data);
+ CloseHandle(assembly->hmap);
+ CloseHandle(assembly->hfile);
+ HeapFree(GetProcessHeap(), 0, assembly);
+
+ return S_OK;
+}
+
+HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version)
+{
+ *version = assembly->metadatahdr->Version;
+
+ return S_OK;
+}
diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c
index a6de737..619743f 100644
--- a/dlls/mscoree/metahost.c
+++ b/dlls/mscoree/metahost.c
@@ -86,9 +86,36 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface,
static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface,
LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer)
{
- FIXME("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer);
+ ASSEMBLY *assembly;
+ HRESULT hr;
+ LPSTR version;
+ ULONG buffer_size=*pcchBuffer;
- return E_NOTIMPL;
+ TRACE("%s %p %p\n", debugstr_w(pwzFilePath), pwzBuffer, pcchBuffer);
+
+ hr = assembly_create(&assembly, pwzFilePath);
+
+ if (SUCCEEDED(hr))
+ {
+ hr = assembly_get_runtime_version(assembly, &version);
+
+ if (SUCCEEDED(hr))
+ {
+ *pcchBuffer = MultiByteToWideChar(CP_UTF8, 0, version, -1, NULL, 0);
+
+ if (pwzBuffer)
+ {
+ if (buffer_size >= *pcchBuffer)
+ MultiByteToWideChar(CP_UTF8, 0, version, -1, pwzBuffer, buffer_size);
+ else
+ hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ }
+ }
+
+ assembly_release(assembly);
+ }
+
+ return hr;
}
static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface,
diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h
index dda9bc0..5c80848 100644
--- a/dlls/mscoree/mscoree_private.h
+++ b/dlls/mscoree/mscoree_private.h
@@ -24,6 +24,12 @@ extern IUnknown* create_corruntimehost(void);
extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj);
+typedef struct tagASSEMBLY ASSEMBLY;
+
+HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file);
+HRESULT assembly_release(ASSEMBLY *assembly);
+HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version);
+
/* Mono 2.6 embedding */
typedef struct _MonoDomain MonoDomain;
typedef struct _MonoAssembly MonoAssembly;
More information about the wine-cvs
mailing list