Implemented SPI{GET,SET}MOUSEHOVERWIDTH, SPI{GET,SET}MOUSEHOVERHEIGHT,

dlls/user/tests/sysparams.c

@@ -78,6 +78,16 @@ static int strict;
 #define SPI_SETSHOWSOUNDS_VALNAME    "On"
 #define SPI_SETDRAGFULLWINDOWS_REGKEY           "Control Panel\\Desktop"
 #define SPI_SETDRAGFULLWINDOWS_VALNAME          "DragFullWindows"
+#define SPI_SETMOUSEHOVERWIDTH_REGKEY           "Control Panel\\Mouse"
+#define SPI_SETMOUSEHOVERWIDTH_VALNAME          "MouseHoverWidth"
+#define SPI_SETMOUSEHOVERHEIGHT_REGKEY          "Control Panel\\Mouse"
+#define SPI_SETMOUSEHOVERHEIGHT_VALNAME         "MouseHoverHeight"
+#define SPI_SETMOUSEHOVERTIME_REGKEY            "Control Panel\\Mouse"
+#define SPI_SETMOUSEHOVERTIME_VALNAME           "MouseHoverTime"
+#define SPI_SETMOUSESCROLLLINES_REGKEY          "Control Panel\\Desktop"
+#define SPI_SETMOUSESCROLLLINES_VALNAME         "WheelScrollLines"
+#define SPI_SETMENUSHOWDELAY_REGKEY             "Control Panel\\Desktop"
+#define SPI_SETMENUSHOWDELAY_VALNAME            "MenuShowDelay"
 #define SPI_SETDESKWALLPAPER_REGKEY		"Control Panel\\Desktop"
 #define SPI_SETDESKWALLPAPER_VALNAME		"Wallpaper"
 /* FIXME - don't have access to Windows with this action (W95, NT5.0). Set real values */
@@ -1028,6 +1038,200 @@ static void test_SPI_SETSCREENREADER( void )           /*     71 */
     /* TODO!!! - don't have version of Windows which has this */
 }
 
+static void test_SPI_SETMOUSEHOVERWIDTH( void )      /*     99 */
+{
+    BOOL rc;
+    UINT old_width;
+    const UINT vals[]={0,32767};
+    int i;
+
+    trace("testing SPI_{GET,SET}MOUSEHOVERWIDTH\n");
+    rc=SystemParametersInfoA( SPI_GETMOUSEHOVERWIDTH, 0, &old_width, 0 );
+    if (rc==0 && (GetLastError()==0 || GetLastError()==ERROR_INVALID_SPI_VALUE))
+    {
+        /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite
+         * what MSDN states (Verified on Win98SE)
+         */
+        trace("SPI_{GET,SET}MOUSEHOVERWIDTH not supported on this platform\n");
+        return;
+    }
+    ok(rc!=0,"SystemParametersInfoA: rc=%d err=%ld\n",rc,GetLastError());
+    
+    for (i=0;i<sizeof(vals)/sizeof(*vals);i++)
+    {
+        UINT v;
+        char buf[10];
+
+        rc=SystemParametersInfoA( SPI_SETMOUSEHOVERWIDTH, vals[i], 0,
+                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        test_change_message( SPI_SETMOUSEHOVERWIDTH, 0 );
+        sprintf( buf, "%d", vals[i] );
+        test_reg_key( SPI_SETMOUSEHOVERWIDTH_REGKEY,
+                      SPI_SETMOUSEHOVERWIDTH_VALNAME, buf );
+
+        SystemParametersInfoA( SPI_GETMOUSEHOVERWIDTH, 0, &v, 0 );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        eq( v, vals[i], "SPI_{GET,SET}MOUSEHOVERWIDTH", "%d" );
+    }
+
+    rc=SystemParametersInfoA( SPI_SETMOUSEHOVERWIDTH, old_width, 0,
+                              SPIF_UPDATEINIFILE );
+    ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
+}
+
+static void test_SPI_SETMOUSEHOVERHEIGHT( void )      /*     101 */
+{
+    BOOL rc;
+    UINT old_height;
+    const UINT vals[]={0,32767};
+    int i;
+
+    trace("testing SPI_{GET,SET}MOUSEHOVERHEIGHT\n");
+    rc=SystemParametersInfoA( SPI_GETMOUSEHOVERHEIGHT, 0, &old_height, 0 );
+    if (rc==0 && (GetLastError()==0 || GetLastError()==ERROR_INVALID_SPI_VALUE))
+    {
+        /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite
+         * what MSDN states (Verified on Win98SE)
+         */
+        trace("SPI_{GET,SET}MOUSEHOVERHEIGHT not supported on this platform\n");
+        return;
+    }
+    ok(rc!=0,"SystemParametersInfoA: rc=%d err=%ld\n",rc,GetLastError());
+    
+    for (i=0;i<sizeof(vals)/sizeof(*vals);i++)
+    {
+        UINT v;
+        char buf[10];
+
+        rc=SystemParametersInfoA( SPI_SETMOUSEHOVERHEIGHT, vals[i], 0,
+                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        test_change_message( SPI_SETMOUSEHOVERHEIGHT, 0 );
+        sprintf( buf, "%d", vals[i] );
+        test_reg_key( SPI_SETMOUSEHOVERHEIGHT_REGKEY,
+                      SPI_SETMOUSEHOVERHEIGHT_VALNAME, buf );
+
+        SystemParametersInfoA( SPI_GETMOUSEHOVERHEIGHT, 0, &v, 0 );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        eq( v, vals[i], "SPI_{GET,SET}MOUSEHOVERHEIGHT", "%d" );
+    }
+
+    rc=SystemParametersInfoA( SPI_SETMOUSEHOVERHEIGHT, old_height, 0,
+                              SPIF_UPDATEINIFILE );
+    ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
+}
+
+static void test_SPI_SETMOUSEHOVERTIME( void )      /*     103 */
+{
+    BOOL rc;
+    UINT old_time;
+    const UINT vals[]={0,32767};
+    int i;
+
+    trace("testing SPI_{GET,SET}MOUSEHOVERTIME\n");
+    rc=SystemParametersInfoA( SPI_GETMOUSEHOVERTIME, 0, &old_time, 0 );
+    if (rc==0 && (GetLastError()==0 || GetLastError()==ERROR_INVALID_SPI_VALUE))
+    {
+        /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite
+         * what MSDN states (Verified on Win98SE)
+         */
+        trace("SPI_{GET,SET}MOUSEHOVERTIME not supported on this platform\n");
+        return;
+    }
+    ok(rc!=0,"SystemParametersInfoA: rc=%d err=%ld\n",rc,GetLastError());
+    
+    for (i=0;i<sizeof(vals)/sizeof(*vals);i++)
+    {
+        UINT v;
+        char buf[10];
+
+        rc=SystemParametersInfoA( SPI_SETMOUSEHOVERTIME, vals[i], 0,
+                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        test_change_message( SPI_SETMOUSEHOVERTIME, 0 );
+        sprintf( buf, "%d", vals[i] );
+        test_reg_key( SPI_SETMOUSEHOVERTIME_REGKEY,
+                      SPI_SETMOUSEHOVERTIME_VALNAME, buf );
+
+        SystemParametersInfoA( SPI_GETMOUSEHOVERTIME, 0, &v, 0 );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        eq( v, vals[i], "SPI_{GET,SET}MOUSEHOVERTIME", "%d" );
+    }
+
+    rc=SystemParametersInfoA( SPI_SETMOUSEHOVERTIME, old_time, 0,
+                              SPIF_UPDATEINIFILE );
+    ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
+}
+
+static void test_SPI_SETWHEELSCROLLLINES( void )      /*     105 */
+{
+    BOOL rc;
+    UINT old_lines;
+    const UINT vals[]={0,32767};
+    int i;
+
+    trace("testing SPI_{GET,SET}WHEELSCROLLLINES\n");
+    rc=SystemParametersInfoA( SPI_GETWHEELSCROLLLINES, 0, &old_lines, 0 );
+    ok(rc!=0,"SystemParametersInfoA: rc=%d err=%ld\n",rc,GetLastError());
+
+    for (i=0;i<sizeof(vals)/sizeof(*vals);i++)
+    {
+        UINT v;
+        char buf[10];
+
+        rc=SystemParametersInfoA( SPI_SETWHEELSCROLLLINES, vals[i], 0,
+                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        test_change_message( SPI_SETWHEELSCROLLLINES, 0 );
+        sprintf( buf, "%d", vals[i] );
+        test_reg_key( SPI_SETMOUSESCROLLLINES_REGKEY,
+                      SPI_SETMOUSESCROLLLINES_VALNAME, buf );
+
+        SystemParametersInfoA( SPI_GETWHEELSCROLLLINES, 0, &v, 0 );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        eq( v, vals[i], "SPI_{GET,SET}MOUSESCROLLLINES", "%d" );
+    }
+
+    rc=SystemParametersInfoA( SPI_SETWHEELSCROLLLINES, old_lines, 0,
+                              SPIF_UPDATEINIFILE );
+    ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
+}
+
+static void test_SPI_SETMENUSHOWDELAY( void )      /*     107 */
+{
+    BOOL rc;
+    UINT old_delay;
+    const UINT vals[]={0,32767};
+    int i;
+
+    trace("testing SPI_{GET,SET}MENUSHOWDELAY\n");
+    rc=SystemParametersInfoA( SPI_GETMENUSHOWDELAY, 0, &old_delay, 0 );
+    ok(rc!=0,"SystemParametersInfoA: rc=%d err=%ld\n",rc,GetLastError());
+
+    for (i=0;i<sizeof(vals)/sizeof(*vals);i++)
+    {
+        UINT v;
+        char buf[10];
+
+        rc=SystemParametersInfoA( SPI_SETMENUSHOWDELAY, vals[i], 0,
+                               SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        test_change_message( SPI_SETMENUSHOWDELAY, 0 );
+        sprintf( buf, "%d", vals[i] );
+        test_reg_key( SPI_SETMENUSHOWDELAY_REGKEY,
+                      SPI_SETMENUSHOWDELAY_VALNAME, buf );
+
+        SystemParametersInfoA( SPI_GETMENUSHOWDELAY, 0, &v, 0 );
+        ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError());
+        eq( v, vals[i], "SPI_{GET,SET}MENUSHOWDELAY", "%d" );
+    }
+
+    rc=SystemParametersInfoA( SPI_SETMENUSHOWDELAY, old_delay, 0,
+                              SPIF_UPDATEINIFILE );
+    ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError());
+}
+
 static void test_SPI_SETWALLPAPER( void )              /*   115 */
 {
     BOOL rc;
@@ -1088,6 +1292,11 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam )
     test_SPI_SETSHOWSOUNDS();                   /*     57 */
     test_SPI_SETKEYBOARDPREF();                 /*     69 */
     test_SPI_SETSCREENREADER();                 /*     71 */
+    test_SPI_SETMOUSEHOVERWIDTH();              /*     99 */
+    test_SPI_SETMOUSEHOVERHEIGHT();             /*    101 */
+    test_SPI_SETMOUSEHOVERTIME();               /*    103 */
+    test_SPI_SETWHEELSCROLLLINES();             /*    105 */
+    test_SPI_SETMENUSHOWDELAY();                /*    107 */
     test_SPI_SETWALLPAPER();                    /*    115 */
     SendMessageA( ghTestWnd, WM_DESTROY, 0, 0 );
     return 0;

windows/sysparams.c

@@ -66,6 +66,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(system);
 #define SPI_SETGRADIENTCAPTIONS_IDX             23
 #define SPI_SETHOTTRACKING_IDX                  24
 #define SPI_SETLISTBOXSMOOTHSCROLLING_IDX       25
+#define SPI_SETMOUSEHOVERWIDTH_IDX              26
+#define SPI_SETMOUSEHOVERHEIGHT_IDX             27
+#define SPI_SETMOUSEHOVERTIME_IDX               28
+#define SPI_SETMOUSESCROLLLINES_IDX             29
+#define SPI_SETMENUSHOWDELAY_IDX                30
 
 #define SPI_WINE_IDX                            SPI_SETSCREENSAVERRUNNING_IDX
 
@@ -137,7 +142,16 @@ static const WCHAR SPI_USERPREFERENCEMASK_REGKEY[]=           {'C','o','n','t','
 static const WCHAR SPI_USERPREFERENCEMASK_VALNAME[]=          {'U','s','e','r','P','r','e','f','e','r','e','n','c','e','m','a','s','k',0};
 static const WCHAR SPI_SETLISTBOXSMOOTHSCROLLING_REGKEY[]=    {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0};
 static const WCHAR SPI_SETLISTBOXSMOOTHSCROLLING_VALNAME[]=   {'S','m','o','o','t','h','S','c','r','o','l','l',0};
-
+static const WCHAR SPI_SETMOUSEHOVERWIDTH_REGKEY[]=           {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0};
+static const WCHAR SPI_SETMOUSEHOVERWIDTH_VALNAME[]=          {'M','o','u','s','e','H','o','v','e','r','W','i','d','t','h',0};
+static const WCHAR SPI_SETMOUSEHOVERHEIGHT_REGKEY[]=          {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0};
+static const WCHAR SPI_SETMOUSEHOVERHEIGHT_VALNAME[]=         {'M','o','u','s','e','H','o','v','e','r','H','e','i','g','h','t',0};
+static const WCHAR SPI_SETMOUSEHOVERTIME_REGKEY[]=            {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0};
+static const WCHAR SPI_SETMOUSEHOVERTIME_VALNAME[]=           {'M','o','u','s','e','H','o','v','e','r','T','i','m','e',0};
+static const WCHAR SPI_SETMOUSESCROLLLINES_REGKEY[]=          {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0};
+static const WCHAR SPI_SETMOUSESCROLLLINES_VALNAME[]=         {'W','h','e','e','l','S','c','r','o','l','l','L','i','n','e','s',0};
+static const WCHAR SPI_SETMENUSHOWDELAY_REGKEY[]=             {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0};
+static const WCHAR SPI_SETMENUSHOWDELAY_VALNAME[]=            {'M','e','n','u','S','h','o','w','D','e','l','a','y',0};
 
 /* FIXME - real values */
 static const WCHAR SPI_SETKEYBOARDPREF_REGKEY[]=         {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0};
@@ -186,6 +200,11 @@ static BOOL drag_full_windows = FALSE;
 static RECT work_area;
 static BOOL keyboard_pref = TRUE;
 static BOOL screen_reader = FALSE;
+static int mouse_hover_width = 4;
+static int mouse_hover_height = 4;
+static int mouse_hover_time = 400;
+static int mouse_scroll_lines = 3;
+static int menu_show_delay = 400;
 static BOOL screensaver_running = FALSE;
 static BOOL font_smoothing = FALSE;
 static BOOL keyboard_cues = FALSE;
@@ -1770,39 +1789,192 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
 
     case SPI_GETMOUSEHOVERWIDTH:		/*     98  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
         if (!pvParam) return FALSE;
-	*(UINT *)pvParam = 4;
+
+        spi_idx = SPI_SETMOUSEHOVERWIDTH_IDX;
+        if (!spi_loaded[spi_idx])
+        {
+            WCHAR buf[10];
+
+            if (SYSPARAMS_Load( SPI_SETMOUSEHOVERWIDTH_REGKEY,
+                                SPI_SETMOUSEHOVERWIDTH_VALNAME,
+                                buf, sizeof(buf) ))
+                mouse_hover_width = atoiW( buf );
+            spi_loaded[spi_idx] = TRUE;
+        }
+	*(INT *)pvParam = mouse_hover_width;
 	break;
 	
-    WINE_SPI_FIXME(SPI_SETMOUSEHOVERWIDTH);	/*     99  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    case SPI_SETMOUSEHOVERWIDTH:		/*     99  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    {
+        WCHAR buf[10];
+
+        spi_idx = SPI_SETMOUSEHOVERWIDTH_IDX;
+        wsprintfW(buf, CSu, uiParam);
+
+        if (SYSPARAMS_Save( SPI_SETMOUSEHOVERWIDTH_REGKEY,
+                            SPI_SETMOUSEHOVERWIDTH_VALNAME,
+                            buf, fWinIni ))
+        {
+            mouse_hover_width = uiParam;
+            spi_loaded[spi_idx] = TRUE;
+        }
+        else
+            ret = FALSE;
+        break;
+    }
 	
     case SPI_GETMOUSEHOVERHEIGHT:		/*    100  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
         if (!pvParam) return FALSE;
-	*(UINT *)pvParam = 4;
+
+        spi_idx = SPI_SETMOUSEHOVERHEIGHT_IDX;
+        if (!spi_loaded[spi_idx])
+        {
+            WCHAR buf[10];
+
+            if (SYSPARAMS_Load( SPI_SETMOUSEHOVERHEIGHT_REGKEY,
+                                SPI_SETMOUSEHOVERHEIGHT_VALNAME,
+                                buf, sizeof(buf) ))
+                mouse_hover_height = atoiW( buf );
+
+            spi_loaded[spi_idx] = TRUE;
+        }
+	*(INT *)pvParam = mouse_hover_height;
 	break;
 
-    WINE_SPI_FIXME(SPI_SETMOUSEHOVERHEIGHT);	/*    101  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    case SPI_SETMOUSEHOVERHEIGHT:		/*    101  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    {
+        WCHAR buf[10];
+
+        spi_idx = SPI_SETMOUSEHOVERHEIGHT_IDX;
+        wsprintfW(buf, CSu, uiParam);
+
+        if (SYSPARAMS_Save( SPI_SETMOUSEHOVERHEIGHT_REGKEY,
+                            SPI_SETMOUSEHOVERHEIGHT_VALNAME,
+                            buf, fWinIni ))
+        {
+            mouse_hover_height = uiParam;
+            spi_loaded[spi_idx] = TRUE;
+        }
+        else
+            ret = FALSE;
+        break;
+    }
     
     case SPI_GETMOUSEHOVERTIME:			/*    102  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
         if (!pvParam) return FALSE;
-	*(UINT *)pvParam = 400; /* default for menu dropdowns */
+
+        spi_idx = SPI_SETMOUSEHOVERTIME_IDX;
+        if (!spi_loaded[spi_idx])
+        {
+            WCHAR buf[10];
+
+            if (SYSPARAMS_Load( SPI_SETMOUSEHOVERTIME_REGKEY,
+                                SPI_SETMOUSEHOVERTIME_VALNAME,
+                                buf, sizeof(buf) ))
+                mouse_hover_time = atoiW( buf );
+
+            spi_loaded[spi_idx] = TRUE;
+        }
+	*(INT *)pvParam = mouse_hover_time;
 	break;
 
-    WINE_SPI_FIXME(SPI_SETMOUSEHOVERTIME);	/*    103  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    case SPI_SETMOUSEHOVERTIME:			/*    103  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    {
+        WCHAR buf[10];
+
+        spi_idx = SPI_SETMOUSEHOVERTIME_IDX;
+        wsprintfW(buf, CSu, uiParam);
+
+        if (SYSPARAMS_Save( SPI_SETMOUSEHOVERTIME_REGKEY,
+                            SPI_SETMOUSEHOVERTIME_VALNAME,
+                            buf, fWinIni ))
+        {
+            mouse_hover_time = uiParam;
+            spi_loaded[spi_idx] = TRUE;
+        }
+        else
+            ret = FALSE;
+        break;
+    }
     
     case SPI_GETWHEELSCROLLLINES:		/*    104  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
         if (!pvParam) return FALSE;
-	*(UINT *)pvParam = 3; /* default for num scroll lines */
+
+        spi_idx = SPI_SETMOUSESCROLLLINES_IDX;
+        if (!spi_loaded[spi_idx])
+        {
+            WCHAR buf[10];
+
+            if (SYSPARAMS_Load( SPI_SETMOUSESCROLLLINES_REGKEY,
+                                SPI_SETMOUSESCROLLLINES_VALNAME,
+                                buf, sizeof(buf) ))
+                mouse_scroll_lines = atoiW( buf );
+
+            spi_loaded[spi_idx] = TRUE;
+        }
+	*(INT *)pvParam = mouse_scroll_lines;
 	break;
 
-    WINE_SPI_FIXME(SPI_SETWHEELSCROLLLINES);	/*    105  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    case SPI_SETWHEELSCROLLLINES:		/*    105  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    {
+        WCHAR buf[10];
+
+        spi_idx = SPI_SETMOUSESCROLLLINES_IDX;
+        wsprintfW(buf, CSu, uiParam);
+
+        if (SYSPARAMS_Save( SPI_SETMOUSESCROLLLINES_REGKEY,
+                            SPI_SETMOUSESCROLLLINES_VALNAME,
+                            buf, fWinIni ))
+        {
+            mouse_scroll_lines = uiParam;
+            spi_loaded[spi_idx] = TRUE;
+        }
+        else
+            ret = FALSE;
+        break;
+    }
     
     case SPI_GETMENUSHOWDELAY:			/*    106  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
         if (!pvParam) return FALSE;
-        *(UINT *)pvParam = 400; /* Tested against Windows NT 4.0 and Windows 2000 */
+
+        spi_idx = SPI_SETMENUSHOWDELAY_IDX;
+        if (!spi_loaded[spi_idx])
+        {
+            WCHAR buf[10];
+
+            if (SYSPARAMS_Load( SPI_SETMENUSHOWDELAY_REGKEY,
+                                SPI_SETMENUSHOWDELAY_VALNAME,
+                                buf, sizeof(buf) ))
+                menu_show_delay = atoiW( buf );
+
+            spi_loaded[spi_idx] = TRUE;
+        }
+	*(INT *)pvParam = menu_show_delay;
 	break;
 
+    case SPI_SETMENUSHOWDELAY:			/*    107  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    {
+        WCHAR buf[10];
+
+        spi_idx = SPI_SETMENUSHOWDELAY_IDX;
+        wsprintfW(buf, CSu, uiParam);
+
+        if (SYSPARAMS_Save( SPI_SETMENUSHOWDELAY_REGKEY,
+                            SPI_SETMENUSHOWDELAY_VALNAME,
+                            buf, fWinIni ))
+        {
+            menu_show_delay = uiParam;
+            spi_loaded[spi_idx] = TRUE;
+        }
+        else
+            ret = FALSE;
+        break;
+    }
+    
     WINE_SPI_FIXME(SPI_GETSHOWIMEUI);		/*    110  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
     WINE_SPI_FIXME(SPI_SETSHOWIMEUI);		/*    111  _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
+    WINE_SPI_FIXME(SPI_GETMOUSESPEED);          /*    112  _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */
+    WINE_SPI_FIXME(SPI_SETMOUSESPEED);          /*    113  _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */
 
     case SPI_GETSCREENSAVERRUNNING:             /*    114  _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */
         if (!pvParam) return FALSE;