[user/tests]: Re: Fix bug that left mouse buttons swapped after tests

Saulius Krasuckas saulius2 at ar.fi.lt
Thu Jun 30 02:43:05 CDT 2005


> ChangeLog: Fix bug that left mouse buttons swapped after tests
> 
> Ivan.

I think your patch causes test to fail on Wine, Ivan.  My try goes next.


ChangeLog:
	Saulius Krasuckas <saulius.krasuckas at ieee.org>
	- Break from the loop to restore SM_SWAPBUTTON metrics.
	- SetLastError() to see if restoration changes it.


Index: dlls/user/tests/sysparams.c
===================================================================
RCS file: /home/wine/wine/dlls/user/tests/sysparams.c,v
retrieving revision 1.38
diff -p -u -r1.38 sysparams.c
--- dlls/user/tests/sysparams.c 20 Jun 2005 15:36:17 -0000      1.38
+++ dlls/user/tests/sysparams.c 30 Jun 2005 07:36:40 -0000
@@ -1011,7 +1011,7 @@ static void test_SPI_SETMOUSEBUTTONSWAP(
         rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, vals[i], 0,
                                   SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
         if (!test_error_msg(rc!=vals[i],"SPI_{GET,SET}MOUSEBUTTONSWAP"))
-            return;
+            break;
             
         test_change_message( SPI_SETMOUSEBUTTONSWAP, 0 );
         test_reg_key( SPI_SETMOUSEBUTTONSWAP_REGKEY,
@@ -1021,9 +1021,10 @@ static void test_SPI_SETMOUSEBUTTONSWAP(
             "SM_SWAPBUTTON", "%d" );
     }
 
+    SetLastError(0xfaceabad);
     rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, old_b, 0,
                               SPIF_UPDATEINIFILE );
-    ok(!rc,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
+    ok(!rc,"***warning*** failed to restore the original value: rc=%d err=0x%08lx\n",rc,GetLastError());
 }
 
 static void test_SPI_SETFASTTASKSWITCH( void )         /*     36 */




More information about the wine-patches mailing list