[ros-diffs] [akhaldi] 61184: [PROPSYS] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sun Dec  1 16:16:11 2013
New Revision: 61184

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

Modified:
    trunk/reactos/dll/win32/propsys/CMakeLists.txt
    trunk/reactos/dll/win32/propsys/propsys_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/propsys/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/propsys/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/CMakeLists.txt	[iso-8859-1] Sun Dec  1 16:16:11 2013
@@ -1,20 +1,17 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
 spec2def(propsys.dll propsys.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     propstore.c
     propsys_main.c
     propvar.c
-    propsys.rc
     ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/propsys.def)
 
-add_library(propsys SHARED ${SOURCE})
+add_library(propsys SHARED ${SOURCE} propsys.rc)
 set_module_type(propsys win32dll)
 target_link_libraries(propsys uuid wine)
 add_importlibs(propsys ole32 oleaut32 msvcrt kernel32 ntdll)
-add_dependencies(propsys psdk)
 add_cd_file(TARGET propsys DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/propsys/propsys_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propsys_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propsys_main.c	[iso-8859-1] Sun Dec  1 16:16:11 2013
@@ -54,10 +54,6 @@
             propsys_hInstance = hinstDLL;
             DisableThreadLibraryCalls(hinstDLL);
             break;
-        case DLL_PROCESS_DETACH:
-            break;
-        default:
-            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] Sun Dec  1 16:16:11 2013
@@ -156,7 +156,7 @@
 reactos/dll/win32/pidgen           # Synced to Wine-1.7.1
 reactos/dll/win32/powrprof         # Forked at Wine-1.0rc5
 reactos/dll/win32/printui          # Synced to Wine-1.7.1
-reactos/dll/win32/propsys          # Synced to Wine-1.5.26
+reactos/dll/win32/propsys          # Synced to Wine-1.7.1
 reactos/dll/win32/pstorec          # Synced to Wine-1.7.1
 reactos/dll/win32/qmgr             # Synced to Wine-1.7.1
 reactos/dll/win32/qmgrprxy         # Synced to Wine-1.7.1