[ros-diffs] [akhaldi] 60169: [FUSION] * Sync with Wine 1.7.1.

Author: akhaldi
Date: Mon Sep 16 15:15:20 2013
New Revision: 60169

URL: http://svn.reactos.org/svn/reactos?rev=60169&view=rev
Log:
[FUSION]
* Sync with Wine 1.7.1.

Modified:
    trunk/reactos/dll/win32/fusion/CMakeLists.txt
    trunk/reactos/dll/win32/fusion/assembly.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/fusion/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/CMakeLists.txt	[iso-8859-1] Mon Sep 16 15:15:20 2013
@@ -10,13 +10,12 @@
     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)

Modified: trunk/reactos/dll/win32/fusion/assembly.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.…
==============================================================================
--- trunk/reactos/dll/win32/fusion/assembly.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/assembly.c	[iso-8859-1] Mon Sep 16 15:15:20 2013
@@ -599,8 +599,7 @@
         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;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Sep 16 15:15:20 2013
@@ -72,7 +72,7 @@
 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