[ros-diffs] [akhaldi] 60248: [LOADPERF] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Fri Sep 20 13:28:20 2013
New Revision: 60248

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

Modified:
    trunk/reactos/dll/win32/loadperf/CMakeLists.txt
    trunk/reactos/dll/win32/loadperf/loadperf_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/loadperf/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/CMakeLis...
==============================================================================
--- trunk/reactos/dll/win32/loadperf/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/loadperf/CMakeLists.txt	[iso-8859-1] Fri Sep 20 13:28:20 2013
@@ -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)
-

Modified: trunk/reactos/dll/win32/loadperf/loadperf_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadperf...
==============================================================================
--- trunk/reactos/dll/win32/loadperf/loadperf_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/loadperf/loadperf_main.c	[iso-8859-1] Fri Sep 20 13:28:20 2013
@@ -44,8 +44,6 @@
         return FALSE; /* prefer native version */
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hinstDLL);
-        break;
-    case DLL_PROCESS_DETACH:
         break;
     }

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri Sep 20 13:28:20 2013
@@ -92,7 +92,7 @@
 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