Author: akhaldi
Date: Wed Apr 30 12:50:57 2014
New Revision: 63071
URL:
http://svn.reactos.org/svn/reactos?rev=63071&view=rev
Log:
[PDH_WINETEST]
* Sync with Wine 1.7.17.
CORE-8080
Modified:
trunk/rostests/winetests/pdh/CMakeLists.txt
trunk/rostests/winetests/pdh/pdh.c
Modified: trunk/rostests/winetests/pdh/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/CMakeLists.…
==============================================================================
--- trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] Wed Apr 30 12:50:57 2014
@@ -1,5 +1,8 @@
add_executable(pdh_winetest pdh.c testlist.c)
set_module_type(pdh_winetest win32cui)
-add_importlibs(pdh_winetest pdh msvcrt kernel32 ntdll)
+add_importlibs(pdh_winetest pdh msvcrt kernel32)
+if(MSVC)
+ add_importlibs(pdh_winetest ntdll)
+endif()
add_cd_file(TARGET pdh_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/pdh/pdh.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/pdh.c?rev=6…
==============================================================================
--- trunk/rostests/winetests/pdh/pdh.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/pdh/pdh.c [iso-8859-1] Wed Apr 30 12:50:57 2014
@@ -63,7 +63,7 @@
static void init_function_ptrs( void )
{
- pdh = GetModuleHandle( "pdh" );
+ pdh = GetModuleHandleA( "pdh" );
GETFUNCPTR( PdhAddEnglishCounterA )
GETFUNCPTR( PdhAddEnglishCounterW )
GETFUNCPTR( PdhCollectQueryDataWithTime )