[ros-diffs] [akhaldi] 60436: [WUAPI] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Sep 28 15:35:15 2013
New Revision: 60436

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

Modified:
    trunk/reactos/dll/win32/wuapi/CMakeLists.txt
    trunk/reactos/dll/win32/wuapi/main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wuapi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/wuapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wuapi/CMakeLists.txt	[iso-8859-1] Sat Sep 28 15:35:15 2013
@@ -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 @@
     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)

Modified: trunk/reactos/dll/win32/wuapi/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/wuapi/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wuapi/main.c	[iso-8859-1] Sat Sep 28 15:35:15 2013
@@ -132,8 +132,6 @@
         instance = hinst;
         DisableThreadLibraryCalls( hinst );
         break;
-    case DLL_PROCESS_DETACH:
-        break;
     }
     return TRUE;
 }

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Sep 28 15:35:15 2013
@@ -211,7 +211,7 @@
 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