[PDH_WINETEST]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=63071

diff --git a/rostests/winetests/pdh/CMakeLists.txt b/rostests/winetests/pdh/CMakeLists.txt
index 8f07581..9deafba 100644 (file)
--- a/rostests/winetests/pdh/CMakeLists.txt
+++ b/rostests/winetests/pdh/CMakeLists.txt
@@ -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)

diff --git a/rostests/winetests/pdh/pdh.c b/rostests/winetests/pdh/pdh.c
index 9690020..f492d5a 100644 (file)
--- a/rostests/winetests/pdh/pdh.c
+++ b/rostests/winetests/pdh/pdh.c
@@ -63,7 +63,7 @@ static BOOL is_lang_english(void)
 
 static void init_function_ptrs( void )
 {
-    pdh = GetModuleHandle( "pdh" );
+    pdh = GetModuleHandleA( "pdh" );
     GETFUNCPTR( PdhAddEnglishCounterA )
     GETFUNCPTR( PdhAddEnglishCounterW )
     GETFUNCPTR( PdhCollectQueryDataWithTime )