On Wed, 4 Dec 2002, Greg Turner wrote:
[...]
> Anyhoo, yes, I like something like what you are doing better, it seems
> that if anything might just break out of the blue, it would be the
> unicode version, right? So I should have done more like that and that
> way wine doesn't lose the test. knowing there's no crash involved
> makes the difference, I guess.
Submitting for inclusion then :-)
---------- Forwarded message ----------
Date: Tue, 3 Dec 2002 23:41:02 -0800 (PST)
From: Francois Gouget <fgouget@free.fr>
To: wine-devel@winehq.com
Cc: Greg Turner <gmturner007@ameritech.net>
Subject: Re: rpc_J_PL4
On Tue, 3 Dec 2002, Greg Turner wrote:
> License: X11-MIT
>
> Changelog:
>
> * programs/rpcss/tests: rpc.c:
> Greg Turner <gmturner007@ameritech.net>
> - W9x doesn't support widechar uuids (crashes on test)
That surprises me. I ran these tests on Win95 and Win98 and they failed
but did not crash. Thus I think it would be better to apply this
patch instead:
Index: dlls/rpcrt4/tests/rpc.c
===================================================================
RCS file: /home/wine/wine/dlls/rpcrt4/tests/rpc.c,v
retrieving revision 1.1
diff -u -r1.1 rpc.c
--- dlls/rpcrt4/tests/rpc.c 7 Oct 2002 21:54:07 -0000 1.1
+++ dlls/rpcrt4/tests/rpc.c 4 Dec 2002 07:29:22 -0000
@@ -101,7 +101,12 @@
/* Uuid to String to Uuid (wchar) */
for (i1 = 0; i1 < 10; i1++) {
Uuid1 = Uuid_Table[i1];
- ok( (UuidToStringW(&Uuid1, &wstr) == RPC_S_OK), "Simple UUID->WString copy" );
+ rslt=UuidToStringW(&Uuid1, &wstr);
+ if (rslt==RPC_S_CANNOT_SUPPORT) {
+ /* Must be Win9x (no Unicode support), skip the tests */
+ break;
+ }
+ ok( (rslt == RPC_S_OK), "Simple UUID->WString copy" );
ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String" );
ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform" );
/* invalid uuid tests -- size of valid UUID string=36 */
With this patch, all tests are run on NT and Wine platforms, and on
Win9x platforms, all tests are skipped after the first first Unicode
call.
--
Francois Gouget fgouget@free.fr http://fgouget.free.fr/
Before you criticize someone, walk a mile in his shoes.
That way, if he gets angry, he'll be a mile away - and barefoot.
