Commit a2b2456b authored by Alexandre Julliard's avatar Alexandre Julliard

Revert SPI_SETMOUSEBUTTONSWAP changes.

parent 8fefccd6
...@@ -1467,18 +1467,18 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ...@@ -1467,18 +1467,18 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
{ {
WCHAR buf[5]; WCHAR buf[5];
spi_idx = SPI_SETMOUSEBUTTONSWAP_IDX; spi_idx = SPI_SETMOUSEBUTTONSWAP_IDX;
wsprintfW(buf, CSu, uiParam); wsprintfW(buf, CSu, uiParam);
/* MSDN says it returns previous state of swapbutton always */
ret = sysMetrics[SM_SWAPBUTTON];
if (SYSPARAMS_Save( SPI_SETMOUSEBUTTONSWAP_REGKEY, if (SYSPARAMS_Save( SPI_SETMOUSEBUTTONSWAP_REGKEY,
SPI_SETMOUSEBUTTONSWAP_VALNAME, SPI_SETMOUSEBUTTONSWAP_VALNAME,
buf, fWinIni )) buf, fWinIni ))
{ {
sysMetrics[SM_SWAPBUTTON] = uiParam; sysMetrics[SM_SWAPBUTTON] = uiParam;
spi_loaded[spi_idx] = TRUE; spi_loaded[spi_idx] = TRUE;
SYSPARAMS_NotifyChange( uiAction, fWinIni );
} }
return ret; else
ret = FALSE;
break;
} }
WINE_SPI_FIXME(SPI_SETICONTITLELOGFONT); /* 34 */ WINE_SPI_FIXME(SPI_SETICONTITLELOGFONT); /* 34 */
......
...@@ -1010,7 +1010,7 @@ static void test_SPI_SETMOUSEBUTTONSWAP( void ) /* 33 */ ...@@ -1010,7 +1010,7 @@ static void test_SPI_SETMOUSEBUTTONSWAP( void ) /* 33 */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, vals[i], 0, rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, vals[i], 0,
SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
if (!test_error_msg(rc!=vals[i],"SPI_{GET,SET}MOUSEBUTTONSWAP")) if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEBUTTONSWAP"))
return; return;
test_change_message( SPI_SETMOUSEBUTTONSWAP, 0 ); test_change_message( SPI_SETMOUSEBUTTONSWAP, 0 );
...@@ -1023,7 +1023,7 @@ static void test_SPI_SETMOUSEBUTTONSWAP( void ) /* 33 */ ...@@ -1023,7 +1023,7 @@ static void test_SPI_SETMOUSEBUTTONSWAP( void ) /* 33 */
rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, old_b, 0, rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, old_b, 0,
SPIF_UPDATEINIFILE ); SPIF_UPDATEINIFILE );
ok(!rc,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError()); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
} }
static void test_SPI_SETFASTTASKSWITCH( void ) /* 36 */ static void test_SPI_SETFASTTASKSWITCH( void ) /* 36 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment