[ros-diffs] [cwittich] 68647: [FUSION] Use different base addresses for the fusion dlls to prevent relocations. Brought to you by Amine! CORE-9992

Author: cwittich
Date: Sun Aug  9 09:27:30 2015
New Revision: 68647
URL: http://svn.reactos.org/svn/reactos?rev=68647&view=rev
Log:
[FUSION] Use different base addresses for the fusion dlls to prevent relocations. Brought
to you by Amine! CORE-9992
Added:
    trunk/reactos/dll/win32/fusion/fusion_1_1/   (with props)
    trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt   (with props)
    trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec   (with props)
    trunk/reactos/dll/win32/fusion/fusion_2_0/   (with props)
    trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt   (with props)
    trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec   (with props)
Modified:
    trunk/reactos/cmake/baseaddress.cmake
    trunk/reactos/dll/win32/fusion/CMakeLists.txt
Modified: trunk/reactos/cmake/baseaddress.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re…
==============================================================================
--- trunk/reactos/cmake/baseaddress.cmake       [iso-8859-1] (original)
+++ trunk/reactos/cmake/baseaddress.cmake       [iso-8859-1] Sun Aug  9 09:27:30 2015
@@ -318,3 +318,6 @@
 set(baseaddress_wdmaud.drv           0x6fad0000)
 set(baseaddress_wined3dcfg           0x6faa0000)
 set(baseaddress_winemp3.acm          0x6fa20000)
+set(baseaddress_fusion               0x6fa10000)
+set(baseaddress_fusion_1_1           0x6f9f0000)
+set(baseaddress_fusion_2_0           0x6f9c0000)
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] Sun Aug  9 09:27:30
2015
@@ -12,8 +12,10 @@
     fusionpriv.h
     ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c)
+add_library(fusion_lib OBJECT ${SOURCE})
+
 add_library(fusion SHARED
-    ${SOURCE}
+    $<TARGET_OBJECTS:fusion_lib>
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
@@ -22,6 +24,7 @@
 add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
 add_pch(fusion fusionpriv.h SOURCE)
 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/v2.0.50727 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all)
+
+add_subdirectory(fusion_1_1)
+add_subdirectory(fusion_2_0)
Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/
------------------------------------------------------------------------------
--- bugtraq:logregex    (added)
+++ bugtraq:logregex    Sun Aug  9 09:27:30 2015
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/
------------------------------------------------------------------------------
    tsvn:logminsize = 10
Added: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_1_…
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt    (added)
+++ trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt    [iso-8859-1] Sun Aug  9
09:27:30 2015
@@ -0,0 +1,14 @@
+
+set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
+spec2def(fusion.dll fusion.spec)
+
+add_library(fusion_1_1 SHARED
+    $<TARGET_OBJECTS:fusion_lib>
+    ${fusion_folder}/version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
+
+set_module_type(fusion_1_1 win32dll)
+target_link_libraries(fusion_1_1 uuid wine)
+set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion")
+add_importlibs(fusion_1_1 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
+add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR
all)
Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native
Added: trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_1_…
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec       (added)
+++ trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec       [iso-8859-1] Sun Aug  9
09:27:30 2015
@@ -0,0 +1,17 @@
+@ stub CopyPDBs
+@ stdcall ClearDownloadCache()
+@ stdcall CreateApplicationContext(ptr ptr)
+@ stdcall CreateAssemblyCache(ptr long)
+@ stdcall CreateAssemblyEnum(ptr ptr ptr long ptr)
+@ stdcall CreateAssemblyNameObject(ptr wstr long ptr)
+@ stub CreateHistoryReader
+@ stdcall CreateInstallReferenceEnum(ptr ptr long ptr)
+@ stdcall GetCachePath(long wstr ptr)
+@ stub GetHistoryFileDirectory
+@ stdcall InitializeFusion()
+@ stub InstallCustomAssembly
+@ stub InstallCustomModule
+@ stub LookupHistoryAssembly
+@ stub NukeDownloadedCache
+@ stub PreBindAssembly
+@ stub PreBindAssemblyEx
Propchange: trunk/reactos/dll/win32/fusion/fusion_1_1/fusion.spec
------------------------------------------------------------------------------
    svn:eol-style = native
Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/
------------------------------------------------------------------------------
--- bugtraq:logregex    (added)
+++ bugtraq:logregex    Sun Aug  9 09:27:30 2015
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/
------------------------------------------------------------------------------
    tsvn:logminsize = 10
Added: trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_2_…
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt    (added)
+++ trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt    [iso-8859-1] Sun Aug  9
09:27:30 2015
@@ -0,0 +1,14 @@
+
+set(fusion_folder "${CMAKE_CURRENT_SOURCE_DIR}/..")
+spec2def(fusion.dll fusion.spec)
+
+add_library(fusion_2_0 SHARED
+    $<TARGET_OBJECTS:fusion_lib>
+    ${fusion_folder}/version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
+
+set_module_type(fusion_2_0 win32dll)
+target_link_libraries(fusion_2_0 uuid wine)
+set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion")
+add_importlibs(fusion_2_0 advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
+add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR
all)
Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native
Added: trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_2_…
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec       (added)
+++ trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec       [iso-8859-1] Sun Aug  9
09:27:30 2015
@@ -0,0 +1,17 @@
+@ stub CopyPDBs
+@ stdcall ClearDownloadCache()
+@ stdcall CreateApplicationContext(ptr ptr)
+@ stdcall CreateAssemblyCache(ptr long)
+@ stdcall CreateAssemblyEnum(ptr ptr ptr long ptr)
+@ stdcall CreateAssemblyNameObject(ptr wstr long ptr)
+@ stub CreateHistoryReader
+@ stdcall CreateInstallReferenceEnum(ptr ptr long ptr)
+@ stdcall GetCachePath(long wstr ptr)
+@ stub GetHistoryFileDirectory
+@ stdcall InitializeFusion()
+@ stub InstallCustomAssembly
+@ stub InstallCustomModule
+@ stub LookupHistoryAssembly
+@ stub NukeDownloadedCache
+@ stub PreBindAssembly
+@ stub PreBindAssemblyEx
Propchange: trunk/reactos/dll/win32/fusion/fusion_2_0/fusion.spec
------------------------------------------------------------------------------
    svn:eol-style = native