[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    [user32]: fix tests and behaviour for SPI_SETMOUSEBUTTONSWAP
From:       Ivan Leo Puoti <ivanleo () gmail ! com>
Date:       2005-06-30 10:36:52
Message-ID: 191564ad050630033672f7b423 () mail ! gmail ! com
[Download RAW message or body]

ChangeLog: fix tests and behaviour for SPI_SETMOUSEBUTTONSWAP

Ivan.

["fixmouse.diff" (text/x-patch)]

--- wine/dlls/user/sysparams.c	2005-06-23 07:54:00.000000000 +0200
+++ new/dlls/user/sysparams.c	2005-06-30 12:02:44.000000000 +0200
@@ -1468,8 +1468,7 @@
         WCHAR buf[5];
         spi_idx = SPI_SETMOUSEBUTTONSWAP_IDX;
         wsprintfW(buf, CSu, uiParam);
-        /* MSDN says it returns previous state of swapbutton always */
-	ret = sysMetrics[SM_SWAPBUTTON];
+        ret = FALSE;
         if (SYSPARAMS_Save( SPI_SETMOUSEBUTTONSWAP_REGKEY,
                             SPI_SETMOUSEBUTTONSWAP_VALNAME,
                             buf, fWinIni ))
@@ -1477,6 +1476,7 @@
             sysMetrics[SM_SWAPBUTTON] = uiParam;
             spi_loaded[spi_idx] = TRUE;
             SYSPARAMS_NotifyChange( uiAction, fWinIni );
+            ret = TRUE;
         }
         return ret;
     }

["fixtest2.diff" (text/x-patch)]

--- wine/dlls/user/tests/sysparams.c	2005-06-29 17:35:42.000000000 +0200
+++ new/dlls/user/tests/sysparams.c	2005-06-30 12:21:51.000000000 +0200
@@ -1010,7 +1010,7 @@
         SetLastError(0xdeadbeef);
         rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, vals[i], 0,
                                   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;
             
         test_change_message( SPI_SETMOUSEBUTTONSWAP, 0 );
@@ -1023,7 +1023,7 @@
 
     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=%ld\n",rc,GetLastError());
 }
 
 static void test_SPI_SETFASTTASKSWITCH( void )         /*     36 */


[prev in list] [next in list] [prev in thread] [next in thread]