From 6d9055d64f0f0b18800dd05bfcf9d81c94f08fd7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 20 Sep 2013 13:28:20 +0000 Subject: [PATCH] [LOADPERF] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60248 --- reactos/dll/win32/loadperf/CMakeLists.txt | 11 +++++------ reactos/dll/win32/loadperf/loadperf_main.c | 2 -- reactos/media/doc/README.WINE | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/loadperf/CMakeLists.txt b/reactos/dll/win32/loadperf/CMakeLists.txt index 141a95c6759..043e09139d7 100644 --- a/reactos/dll/win32/loadperf/CMakeLists.txt +++ b/reactos/dll/win32/loadperf/CMakeLists.txt @@ -1,16 +1,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(loadperf.dll loadperf.spec ADD_IMPORTLIB) -add_library(loadperf SHARED - loadperf_main.c - stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) +list(APPEND SOURCE + loadperf_main.c + stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) +add_library(loadperf SHARED ${SOURCE}) set_module_type(loadperf win32dll) target_link_libraries(loadperf wine) add_importlibs(loadperf msvcrt kernel32 ntdll) add_cd_file(TARGET loadperf DESTINATION reactos/system32 FOR all) - diff --git a/reactos/dll/win32/loadperf/loadperf_main.c b/reactos/dll/win32/loadperf/loadperf_main.c index 2de6d04b674..17ecc1b0ee5 100644 --- a/reactos/dll/win32/loadperf/loadperf_main.c +++ b/reactos/dll/win32/loadperf/loadperf_main.c @@ -45,8 +45,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 3f0c1815ca2..30ebb1ea53a 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -92,7 +92,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to Wine-1.7.1 reactos/dll/win32/itss # Synced to Wine-1.7.1 reactos/dll/win32/jscript # Synced to Wine-1.7.1 -reactos/dll/win32/loadperf # Synced to Wine-1.5.19 +reactos/dll/win32/loadperf # Synced to Wine-1.7.1 reactos/dll/win32/localspl # Synced to Wine-1.5.26 reactos/dll/win32/localui # Synced to Wine-1.5.19 reactos/dll/win32/lz32 # Synced to Wine-1.5.19