diff --git a/reactos/dll/win32/wuapi/CMakeLists.txt b/reactos/dll/win32/wuapi/CMakeLists.txt index d7bfa48efa2..7e1b29df9d2 100644 --- a/reactos/dll/win32/wuapi/CMakeLists.txt +++ b/reactos/dll/win32/wuapi/CMakeLists.txt @@ -1,17 +1,9 @@ -add_typelib(wuapi_tlb.idl) - add_definitions( -D__WINESRC__ -DCOM_NO_WINDOWS_H) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine) - - +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wuapi.dll wuapi.spec) list(APPEND SOURCE @@ -22,18 +14,13 @@ list(APPEND SOURCE session.c systeminfo.c updates.c - wuapi.rc ${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) - -add_library(wuapi SHARED ${SOURCE}) - +add_library(wuapi SHARED ${SOURCE} wuapi.rc) set_module_type(wuapi win32dll) target_link_libraries(wuapi uuid wine wuguid) -add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) - -# wuapi_tlb.tlb needs stdole2.tlb -add_dependencies(wuapi stdole2) - +add_importlibs(wuapi msvcrt kernel32 ntdll) +add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/wuapi/main.c b/reactos/dll/win32/wuapi/main.c index b0cbca8ff14..aa4b0cd0301 100644 --- a/reactos/dll/win32/wuapi/main.c +++ b/reactos/dll/win32/wuapi/main.c @@ -132,8 +132,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) instance = hinst; DisableThreadLibraryCalls( hinst ); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 679d40e611a..8e4393fcb69 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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/wmi # 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_2 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19