#4 pdh: Implement and test PdhAddEnglishCounter{A, W} and PdhCollectQueryDataWithTime.

Paul Vriens paul.vriens.wine at gmail.com
Tue Jul 31 06:15:36 CDT 2007


Alexandre Julliard wrote:
> Paul Vriens <paul.vriens.wine at gmail.com> writes:
> 
>> I'll have a look.
>>
>> How do yo want to report a missing test? In the normal report file? If
>> that's the case we should also change the dissect/gather scripts:
> 
> It has to be part of the report data, so yes the scripts probably need
> to be updated.
> 
>> If this thing works out, should we change the old tests back or use
>> this new approach only for new (and currently failing) dll's?
> 
> If it simplifies the code we can certainly change the old tests too.
> 
Hi,

a patch somewhat like this?

diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index f743ffc..3c4846d 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -433,6 +433,24 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType,
                     LPTSTR lpszName, LONG_PTR lParam)
  {
      const char *tempdir = (const char *)lParam;
+    char dllname[MAX_PATH];
+    HMODULE dll;
+
+    /* Check if the main dll is present on this system */
+    strcpy(dllname, lpszName);
+    *strstr(dllname, "_TEST.EXE") = 0;
+
+    dll = LoadLibrary(dllname);
+    if (!dll) {
+        /* Here we add some information to the results file
+         * that indicates that the dll is not present
+         * on this platform.
+         */
+        report (R_WARNING, "dll : %s is not present", dllname);
+        return TRUE;
+    }
+    FreeLibrary(dll);
+
      get_subtests( tempdir, &wine_tests[nr_of_files], lpszName );
      nr_of_tests += wine_tests[nr_of_files].subtest_count;
      nr_of_files++;

Running this on win9x gives me 13 dll's that are not available (the R_WARNING is 
of course only for testing).

Cheers,

Paul.



More information about the wine-devel mailing list