Re: KERNEL32: Re: Fix thread tests on WinME

[Saulius Krasuckas]

* On Fri, 22 Jul 2005, Saulius Krasuckas wrote:
> - Felix Nawothnig wrote:
> > Tested on Wine and WinXP. I couldn't verify it on WinME since I don't 
> > have it but since this is quite trivial... *crosses fingers*
>
> Though three tests are still failing:
>
> | thread.c:293:not restricted, assuming consistent behaviour
> | thread.c:412: Test failed: access restrictions obeyed
> | thread.c:414: Test failed: access restrictions obeyed
> | thread.c:488: Test failed: access restrictions obeyed

Felix, I have reverted part of your patch and tested this.  Reversion is 
doing fine on WinME -- zero failed tests.  Didn't tested on XP or so.

Is this acceptable?  If so, feel free to submit it under own name.  Or 
correct the code. :-)

Index: dlls/kernel/tests/thread.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/thread.c,v
retrieving revision 1.22
diff -p -u -r1.22 thread.c
--- dlls/kernel/tests/thread.c  25 Jul 2005 11:07:54 -0000      1.22
+++ dlls/kernel/tests/thread.c  28 Jul 2005 21:55:41 -0000
@@ -409,9 +409,11 @@ static VOID test_thread_priority(void)
        obey_ar(SetThreadPriority(access_thread,1)==0);
        obey_ar(GetThreadPriority(access_thread)==THREAD_PRIORITY_ERROR_RETURN);
        if (pSetThreadPriorityBoost)
-         obey_ar(pSetThreadPriorityBoost(access_thread,1)==0);
+         ok(pSetThreadPriorityBoost(access_thread,1)==0,
+            "SetThreadPriorityBoost did not obey access restrictions\n");
        if (pGetThreadPriorityBoost)
-         obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0);
+         ok(pGetThreadPriorityBoost(access_thread,&disabled)==0,
+            "GetThreadPriorityBoost did not obey access restrictions\n");
        obey_ar(GetExitCodeThread(access_thread,&exitCode)==0);
        ok(CloseHandle(access_thread),"Error Closing thread handle\n");
      }
@@ -485,7 +487,7 @@ static VOID test_GetThreadTimes(void)
      if(access_thread!=NULL) {
        error=GetThreadTimes(access_thread,&creationTime,&exitTime,
                             &kernelTime,&userTime);
-       obey_ar(error==0);
+       ok(error==0, "GetThreadTimes did not obey access restrictions\n");
        ok(CloseHandle(access_thread)!=0,"CloseHandle Failed\n");
      }
      creationTime.dwLowDateTime=99; creationTime.dwHighDateTime=99;

KERNEL32: Re: Fix thread tests on WinME

[Felix Nawothnig]

Saulius Krasuckas wrote:
> Felix, I have reverted part of your patch and tested this.  Reversion is 
> doing fine on WinME -- zero failed tests.  Didn't tested on XP or so.
>
> Is this acceptable?  If so, feel free to submit it under own name.  Or 
> correct the code. :-)

This is not really correct, SetThreadPriority, GetThreadPriority and 
GetThreadTimes all return ERROR_CALL_NOT_IMPLEMENTED on WinME. The order 
of the tests is wrong (first the restrictions are tested, then it's 
tested if they are actually implemented) - the tests for the former two 
functions need to be put into the scope below and the latter has to be 
put below the scope below. IIRC (I looked at it a few days ago).

I'll do that tomorrow.

Felix