Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-27 05:29:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync fusion with wine 1.1.11

Browse source 
svn path=/trunk/; revision=38386
This commit is contained in:
Christoph von Wittich 2008-12-27 13:08:23 +00:00
parent c5aa8b9f1f
commit 6e140c6069
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/fusion/assembly.c
View file

@ -502,7 +502,7 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset)
ULONG currofs; ULONG currofs;
currofs = offset; currofs = offset;
assembly->tableshdr = (METADATATABLESHDR *)assembly_data_offset(assembly, currofs); assembly->tableshdr = assembly_data_offset(assembly, currofs);
if (!assembly->tableshdr) if (!assembly->tableshdr)
return E_FAIL; return E_FAIL;
@ -514,7 +514,7 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset)
sizeof(DWORD) : sizeof(WORD); sizeof(DWORD) : sizeof(WORD);
currofs += sizeof(METADATATABLESHDR); currofs += sizeof(METADATATABLESHDR);
assembly->numrows = (DWORD *)assembly_data_offset(assembly, currofs); assembly->numrows = assembly_data_offset(assembly, currofs);
if (!assembly->numrows) if (!assembly->numrows)
return E_FAIL; return E_FAIL;
@ -628,9 +628,9 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly)
return hr; return hr;
} }
else if (!lstrcmpA(stream, "#Strings") || !lstrcmpA(stream, "Strings")) else if (!lstrcmpA(stream, "#Strings") || !lstrcmpA(stream, "Strings"))
assembly->strings = (BYTE *)assembly_data_offset(assembly, ofs); assembly->strings = assembly_data_offset(assembly, ofs);
else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob"))
assembly->blobs = (BYTE *)assembly_data_offset(assembly, ofs); assembly->blobs = assembly_data_offset(assembly, ofs);
ptr += lstrlenA(stream) + 1; ptr += lstrlenA(stream) + 1;
ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */
@ -883,7 +883,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token)
if (offset == -1) if (offset == -1)
return E_FAIL; return E_FAIL;
asmtbl = (ASSEMBLYTABLE *)assembly_data_offset(assembly, offset); asmtbl = assembly_data_offset(assembly, offset);
if (!asmtbl) if (!asmtbl)
return E_FAIL; return E_FAIL;