mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-03 04:13:31 +00:00
[SXS]
* Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60413
This commit is contained in:
@@ -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 @@ list(APPEND SOURCE
|
||||
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)
|
||||
|
||||
@@ -73,7 +73,7 @@ static HRESULT WINAPI cache_QueryInterface(
|
||||
if (IsEqualIID(riid, &IID_IUnknown) ||
|
||||
IsEqualIID(riid, &IID_IAssemblyCache))
|
||||
{
|
||||
IUnknown_AddRef( iface );
|
||||
IAssemblyCache_AddRef( iface );
|
||||
*obj = cache;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ static HRESULT WINAPI name_QueryInterface(
|
||||
if (IsEqualIID( riid, &IID_IUnknown ) ||
|
||||
IsEqualIID( riid, &IID_IAssemblyName ))
|
||||
{
|
||||
IUnknown_AddRef( iface );
|
||||
IAssemblyName_AddRef( iface );
|
||||
*obj = name;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ reactos/dll/win32/spoolss # Synced to Wine-1.7.1
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user