Module: wine Branch: master Commit: 2ed8056a2bfb0ed835bac33d4121a38795cd023f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed8056a2bfb0ed835bac33d41...
Author: Hans Leidekker hans@codeweavers.com Date: Mon May 21 11:24:21 2012 +0200
fusion: Add a helper to retrieve the runtime version for an assembly.
---
dlls/fusion/assembly.c | 8 +++++++- dlls/fusion/fusionpriv.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index a3abc4e..418d3b1 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -567,7 +567,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size);
- /* we don't care about the version string */ + assembly->metadatahdr->Version = (LPSTR)&metadatahdr->Version;
ofs = FIELD_OFFSET(METADATAHDR, Flags); ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1; @@ -901,3 +901,9 @@ done:
return hr; } + +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) +{ + *version = assembly->metadatahdr->Version; + return S_OK; +} diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 8d51f5d..a262d72 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -435,6 +435,7 @@ HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDE HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; BYTE assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN;
extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN;