From bd1275ef4082546639301ea5a36fc65cb8cb1712 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 1 Dec 2013 16:16:11 +0000 Subject: [PATCH] [PROPSYS] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=61184 --- reactos/dll/win32/propsys/CMakeLists.txt | 5 +---- reactos/dll/win32/propsys/propsys_main.c | 4 ---- reactos/media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/propsys/CMakeLists.txt b/reactos/dll/win32/propsys/CMakeLists.txt index 14f3ab39362..ea600c2caab 100644 --- a/reactos/dll/win32/propsys/CMakeLists.txt +++ b/reactos/dll/win32/propsys/CMakeLists.txt @@ -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) diff --git a/reactos/dll/win32/propsys/propsys_main.c b/reactos/dll/win32/propsys/propsys_main.c index c3294caad9c..118a489d6a5 100644 --- a/reactos/dll/win32/propsys/propsys_main.c +++ b/reactos/dll/win32/propsys/propsys_main.c @@ -54,10 +54,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) propsys_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index cd6eee66a21..1064685ba0f 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -156,7 +156,7 @@ reactos/dll/win32/pdh # Synced to Wine-1.7.1 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