From e943bf4e82a56b05f86338a2abd5f6403ad8609e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 16 Sep 2013 15:15:20 +0000
Subject: [PATCH] [FUSION] * Sync with Wine 1.7.1.

svn path=/trunk/; revision=60169
---
 reactos/dll/win32/fusion/CMakeLists.txt | 5 ++---
 reactos/dll/win32/fusion/assembly.c     | 3 +--
 reactos/media/doc/README.WINE           | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/reactos/dll/win32/fusion/CMakeLists.txt b/reactos/dll/win32/fusion/CMakeLists.txt
index 7e19b1e14e1..da8a57209d0 100644
--- a/reactos/dll/win32/fusion/CMakeLists.txt
+++ b/reactos/dll/win32/fusion/CMakeLists.txt
@@ -10,13 +10,12 @@ list(APPEND SOURCE
     asmname.c
     assembly.c
     fusion.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
-add_library(fusion SHARED ${SOURCE})
+add_library(fusion SHARED ${SOURCE} version.rc)
 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_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)
diff --git a/reactos/dll/win32/fusion/assembly.c b/reactos/dll/win32/fusion/assembly.c
index f429ecc5085..514efb0089d 100644
--- a/reactos/dll/win32/fusion/assembly.c
+++ b/reactos/dll/win32/fusion/assembly.c
@@ -599,8 +599,7 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly)
         else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob"))
             assembly->blobs = assembly_data_offset(assembly, ofs);
 
-        ptr += lstrlenA(stream) + 1;
-        ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */
+        ptr += ((lstrlenA(stream) + 1) + 3) & ~3; /* align on DWORD boundary */
     }
 
     return S_OK;
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 56c8b451707..ee5e5112cad 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -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/dwmapi          # 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/hhctrl.ocx      # Synced to Wine-1.5.26
 reactos/dll/win32/hlink           # Synced to Wine-1.5.4