[ros-diffs] [akhaldi] 60413: [SXS] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Sep 28 15:05:24 2013
New Revision: 60413

URL: http://svn.reactos.org/svn/reactos?rev=60413&view=rev
Log:
[SXS]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/sxs/CMakeLists.txt
    trunk/reactos/dll/win32/sxs/cache.c
    trunk/reactos/dll/win32/sxs/name.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/CMakeLists.tx...
==============================================================================
--- trunk/reactos/dll/win32/sxs/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/CMakeLists.txt	[iso-8859-1] Sat Sep 28 15:05:24 2013
@@ -1,7 +1,6 @@

include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
 spec2def(sxs.dll sxs.spec ADD_IMPORTLIB)

list(APPEND SOURCE
@@ -14,6 +13,5 @@
 add_library(sxs SHARED ${SOURCE})
 set_module_type(sxs win32dll)
 target_link_libraries(sxs wine)
-add_importlibs(sxs msvcrt oleaut32 ole32 kernel32 ntdll)
-add_dependencies(sxs psdk)
+add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/sxs/cache.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/cache.c?rev=6...
==============================================================================
--- trunk/reactos/dll/win32/sxs/cache.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/cache.c	[iso-8859-1] Sat Sep 28 15:05:24 2013
@@ -73,7 +73,7 @@
     if (IsEqualIID(riid, &IID_IUnknown) ||
         IsEqualIID(riid, &IID_IAssemblyCache))
     {
-        IUnknown_AddRef( iface );
+        IAssemblyCache_AddRef( iface );
         *obj = cache;
         return S_OK;
     }

Modified: trunk/reactos/dll/win32/sxs/name.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/name.c?rev=60...
==============================================================================
--- trunk/reactos/dll/win32/sxs/name.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/name.c	[iso-8859-1] Sat Sep 28 15:05:24 2013
@@ -72,7 +72,7 @@
     if (IsEqualIID( riid, &IID_IUnknown ) ||
         IsEqualIID( riid, &IID_IAssemblyName ))
     {
-        IUnknown_AddRef( iface );
+        IAssemblyName_AddRef( iface );
         *obj = name;
         return S_OK;
     }

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Sep 28 15:05:24 2013
@@ -185,7 +185,7 @@
 reactos/dll/win32/stdole2.tlb     # Synced to Wine-1.5.19
 reactos/dll/win32/stdole32.tlb    # Synced to Wine-1.5.19
 reactos/dll/win32/sti             # Synced to Wine-1.7.1
-reactos/dll/win32/sxs             # Synced to Wine-1.5.4
+reactos/dll/win32/sxs             # Synced to Wine-1.7.1
 reactos/dll/win32/tapi32          # Autosync
 reactos/dll/win32/traffic         # Synced to Wine-1.5.19
 reactos/dll/win32/twain_32        # Out of sync