[ros-diffs] [akhaldi] 60361: [PDH_WINETEST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 14:05:13 2013
New Revision: 60361

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

Modified:
    trunk/rostests/winetests/pdh/CMakeLists.txt
    trunk/rostests/winetests/pdh/pdh.c
    trunk/rostests/winetests/pdh/testlist.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] Thu Sep 26 14:05:13 2013
@@ -1,10 +1,5 @@
-
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
 
 add_executable(pdh_winetest pdh.c testlist.c)
-target_link_libraries(pdh_winetest wine)
 set_module_type(pdh_winetest win32cui)
 add_importlibs(pdh_winetest pdh msvcrt kernel32 ntdll)
 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] Thu Sep 26 14:05:13 2013
@@ -37,6 +37,30 @@
 
 #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func );
 
+
+/* Returns true if the user interface is in English. Note that this does not
+ * presume of the formatting of dates, numbers, etc.
+ */
+static BOOL is_lang_english(void)
+{
+    static HMODULE hkernel32 = NULL;
+    static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL;
+    static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL;
+
+    if (!hkernel32)
+    {
+        hkernel32 = GetModuleHandleA("kernel32.dll");
+        pGetThreadUILanguage = (void*)GetProcAddress(hkernel32,
"GetThreadUILanguage");
+        pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32,
"GetUserDefaultUILanguage");
+    }
+    if (pGetThreadUILanguage)
+        return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH;
+    if (pGetUserDefaultUILanguage)
+        return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH;
+
+    return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH;
+}
+
 static void init_function_ptrs( void )
 {
     pdh = GetModuleHandle( "pdh" );
@@ -54,7 +78,7 @@
 
 static const WCHAR system_uptime[] =
    
{'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m','
','U','p','
','T','i','m','e',0};
-static const WCHAR system_downtime[] = /* does not exist */
+static const WCHAR nonexistent_counter[] =
    
{'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m','
','D','o','w','n','
','T','i','m','e',0};
 static const WCHAR percentage_processor_time[] =
    
{'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')',
@@ -129,8 +153,10 @@
     ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, NULL );
     ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret);
 
-    ret = PdhAddCounterA( query, "\\System\\System Down Time", 0, &counter
);
-    ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret);
+    ret = PdhAddCounterA( query, "\\System\\Nonexistent Counter", 0,
&counter );
+    ok(ret == PDH_CSTATUS_NO_COUNTER ||
+       broken(ret == PDH_INVALID_PATH), /* Win2K */
+       "PdhAddCounterA failed 0x%08x\n", ret);
     ok(!counter, "PdhAddCounterA failed %p\n", counter);
 
     ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter
);
@@ -176,8 +202,10 @@
     ret = PdhAddCounterW( query, percentage_processor_time, 0, NULL );
     ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret);
 
-    ret = PdhAddCounterW( query, system_downtime, 0, &counter );
-    ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret);
+    ret = PdhAddCounterW( query, nonexistent_counter, 0, &counter );
+    ok(ret == PDH_CSTATUS_NO_COUNTER ||
+       broken(ret == PDH_INVALID_PATH), /* Win2K */
+       "PdhAddCounterW failed 0x%08x\n", ret);
     ok(!counter, "PdhAddCounterW failed %p\n", counter);
 
     ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter );
@@ -267,7 +295,7 @@
     ret = pPdhAddEnglishCounterW( query, system_uptime, 0, NULL );
     ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n",
ret);
 
-    ret = pPdhAddEnglishCounterW( query, system_downtime, 0, &counter );
+    ret = pPdhAddEnglishCounterW( query, nonexistent_counter, 0, &counter );
     ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddEnglishCounterW failed 0x%08x\n",
ret);
     ok(!counter, "PdhAddEnglishCounterA failed %p\n", counter);
 
@@ -705,7 +733,7 @@
     ret = PdhValidatePathA( "System Up Time" );
     ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathA failed 0x%08x\n",
ret);
 
-    ret = PdhValidatePathA( "\\System\\System Down Time" );
+    ret = PdhValidatePathA( "\\System\\Nonexistent Counter" );
     ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathA failed 0x%08x\n",
ret);
 
     ret = PdhValidatePathA( "\\System\\System Up Time" );
@@ -731,7 +759,7 @@
     ret = PdhValidatePathW( uptime );
     ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathW failed 0x%08x\n",
ret);
 
-    ret = PdhValidatePathW( system_downtime );
+    ret = PdhValidatePathW( nonexistent_counter );
     ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathW failed 0x%08x\n",
ret);
 
     ret = PdhValidatePathW( system_uptime );
@@ -780,7 +808,7 @@
     ret = pPdhValidatePathExW( NULL, uptime );
     ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExW failed
0x%08x\n", ret);
 
-    ret = pPdhValidatePathExW( NULL, system_downtime );
+    ret = pPdhValidatePathExW( NULL, nonexistent_counter );
     ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathExW failed 0x%08x\n",
ret);
 
     ret = pPdhValidatePathExW( NULL, system_uptime );
@@ -958,9 +986,9 @@
 
 START_TEST(pdh)
 {
-    if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)
+    if (!is_lang_english())
     {
-        skip("non-english locale\n");
+        skip("An English UI is needed for the pdh tests\n");
         return;
     }
     init_function_ptrs();

Modified: trunk/rostests/winetests/pdh/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/testlist.c?…
==============================================================================
--- trunk/rostests/winetests/pdh/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/pdh/testlist.c	[iso-8859-1] Thu Sep 26 14:05:13 2013
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_pdh(void);