Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WUAPI]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60436
This commit is contained in:
Amine Khaldi 2013-09-28 15:35:15 +00:00
parent 9f25936919
commit 0bc7798f2b
3 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
reactos/dll/win32/wuapi/CMakeLists.txt
View file

@ -1,17 +1,9 @@
add_typelib(wuapi_tlb.idl)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-DCOM_NO_WINDOWS_H) -DCOM_NO_WINDOWS_H)
remove_definitions(-D_WIN32_WINNT=0x502) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(wuapi.dll wuapi.spec) spec2def(wuapi.dll wuapi.spec)
list(APPEND SOURCE list(APPEND SOURCE
@ -22,18 +14,13 @@ list(APPEND SOURCE
session.c session.c
systeminfo.c systeminfo.c
updates.c updates.c
wuapi.rc
${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
add_typelib(wuapi_tlb.idl)
set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb) set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb)
add_library(wuapi SHARED ${SOURCE} wuapi.rc)
add_library(wuapi SHARED ${SOURCE})
set_module_type(wuapi win32dll) set_module_type(wuapi win32dll)
target_link_libraries(wuapi uuid wine wuguid) target_link_libraries(wuapi uuid wine wuguid)
add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) add_importlibs(wuapi msvcrt kernel32 ntdll)
add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb
# wuapi_tlb.tlb needs stdole2.tlb
add_dependencies(wuapi stdole2)
add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all) add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/wuapi/main.c
View file

@ -132,8 +132,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv )
instance = hinst; instance = hinst;
DisableThreadLibraryCalls( hinst ); DisableThreadLibraryCalls( hinst );
break; break;
case DLL_PROCESS_DETACH:
break;
} }
return TRUE; return TRUE;
} }

2
reactos/media/doc/README.WINE
View file

@ -211,7 +211,7 @@ reactos/dll/win32/wintrust # Synced to Wine-1.7.1
reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1
reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1
reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1
reactos/dll/win32/wuapi # Synced to Wine-1.5.19 reactos/dll/win32/wuapi # Synced to Wine-1.7.1
reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19
reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19
reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19