[1/5] fusion: Assembly version must be taken from the metadata, not the file version.
Hans Leidekker
hans at meelstraat.net
Fri Feb 13 02:12:41 CST 2009
Office 2007 SP1 installer depends on this.
-Hans
diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c
index 7be541c..2373d0f 100644
--- a/dlls/fusion/assembly.c
+++ b/dlls/fusion/assembly.c
@@ -793,45 +793,27 @@ HRESULT assembly_get_path(ASSEMBLY *assembly, LPSTR *path)
HRESULT assembly_get_version(ASSEMBLY *assembly, LPSTR *version)
{
- LPSTR verdata;
- VS_FIXEDFILEINFO *ffi;
- HRESULT hr = S_OK;
- DWORD size;
+ ASSEMBLYTABLE *asmtbl;
+ LONG offset;
- size = GetFileVersionInfoSizeA(assembly->path, NULL);
- if (!size)
- return HRESULT_FROM_WIN32(GetLastError());
+ *version = NULL;
- verdata = HeapAlloc(GetProcessHeap(), 0, size);
- if (!verdata)
- return E_OUTOFMEMORY;
-
- if (!GetFileVersionInfoA(assembly->path, 0, size, verdata))
- {
- hr = HRESULT_FROM_WIN32(GetLastError());
- goto done;
- }
+ offset = assembly->tables[TableFromToken(mdtAssembly)].offset;
+ if (offset == -1)
+ return E_FAIL;
- if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, &size))
- {
- hr = HRESULT_FROM_WIN32(GetLastError());
- goto done;
- }
+ asmtbl = assembly_data_offset(assembly, offset);
+ if (!asmtbl)
+ return E_FAIL;
- *version = HeapAlloc(GetProcessHeap(), 0, MAX_PATH);
+ *version = HeapAlloc(GetProcessHeap(), 0, sizeof("%u.%u.%u.%u") + 4 * strlen("65535"));
if (!*version)
- {
- hr = E_OUTOFMEMORY;
- goto done;
- }
+ return E_OUTOFMEMORY;
- sprintf(*version, "%d.%d.%d.%d", HIWORD(ffi->dwFileVersionMS),
- LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS),
- LOWORD(ffi->dwFileVersionLS));
+ sprintf(*version, "%u.%u.%u.%u", asmtbl->MajorVersion, asmtbl->MinorVersion,
+ asmtbl->BuildNumber, asmtbl->RevisionNumber);
-done:
- HeapFree(GetProcessHeap(), 0, verdata);
- return hr;
+ return S_OK;
}
HRESULT assembly_get_architecture(ASSEMBLY *assembly, DWORD fixme)
More information about the wine-patches
mailing list