I think your patch causes test to fail on Wine, Ivan. My try goes next. ChangeLog: Saulius Krasuckas <saulius.krasuckas(a)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;