Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FUSION]

Browse source 
* Sync with Wine 1.7.1.

svn path=/trunk/; revision=60169
This commit is contained in:
Amine Khaldi 2013-09-16 15:15:20 +00:00
parent 9b7d4ccbd0
commit e943bf4e82
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/fusion/CMakeLists.txt
View file

@ -10,13 +10,12 @@ list(APPEND SOURCE
asmname.c asmname.c
assembly.c assembly.c
fusion.c fusion.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/fusion.def) ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
add_library(fusion SHARED ${SOURCE}) add_library(fusion SHARED ${SOURCE} version.rc)
set_module_type(fusion win32dll) set_module_type(fusion win32dll)
target_link_libraries(fusion wine uuid) target_link_libraries(fusion wine)
add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all)
add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)

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

@ -599,8 +599,7 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly)
else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob"))
assembly->blobs = assembly_data_offset(assembly, ofs); assembly->blobs = assembly_data_offset(assembly, ofs);
ptr += lstrlenA(stream) + 1; ptr += ((lstrlenA(stream) + 1) + 3) & ~3; /* align on DWORD boundary */
ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */
} }
return S_OK; return S_OK;

2
reactos/media/doc/README.WINE
View file

@ -72,7 +72,7 @@ reactos/dll/win32/dbghelp # Synced to Wine-1.7.1
reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 reactos/dll/win32/dciman32 # Synced to Wine-1.7.1
reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 reactos/dll/win32/dwmapi # Synced to Wine-1.7.1
reactos/dll/win32/faultrep # Synced to Wine-1.7.1 reactos/dll/win32/faultrep # Synced to Wine-1.7.1
reactos/dll/win32/fusion # Synced to Wine-1.5.26 reactos/dll/win32/fusion # Synced to Wine-1.7.1
reactos/dll/win32/gdiplus # Synced to Wine-1.5.26 reactos/dll/win32/gdiplus # Synced to Wine-1.5.26
reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26
reactos/dll/win32/hlink # Synced to Wine-1.5.4 reactos/dll/win32/hlink # Synced to Wine-1.5.4