Implemented processing for actions: SPI_GET/SETGRIDGRANULARITY,

dlls/user/user_main.c

@@ -230,9 +230,6 @@ static BOOL process_attach(void)
     /* Initialize message spying */
     if (!SPY_Init()) return FALSE;
 
-    /* Set double click time */
-    SetDoubleClickTime( GetProfileIntA("windows","DoubleClickSpeed",452) );
-
     /* Create message queue of initial thread */
     InitThreadInput16( 0, 0 );
 

include/sysmetrics.h

@@ -10,6 +10,7 @@
 extern void SYSMETRICS_Init(void);  /* sysmetrics.c */
 extern INT SYSMETRICS_Set( INT index, INT value );  /* sysmetrics.c */
 extern void SYSCOLOR_Init(void);  /* syscolor.c */
+extern void SYSPARAMS_GetDoubleClickSize( INT *width, INT *height );
 
 /* Wine extensions */
 #define SM_WINE_BPP (SM_CMETRICS+1)  /* screen bpp */

windows/message.c

@@ -38,7 +38,6 @@ DECLARE_DEBUG_CHANNEL(key);
 #define WM_NCMOUSELAST          WM_NCMBUTTONDBLCLK
 
 static BYTE QueueKeyStateTable[256];
-static UINT doubleClickSpeed = 452;
 
 
 /***********************************************************************
@@ -407,7 +406,7 @@ static BOOL process_raw_mouse_message( MSG *msg, ULONG_PTR extra_info )
         {
            if ((msg->message == clk_msg.message) &&
                (msg->hwnd == clk_msg.hwnd) &&
-               (msg->time - clk_msg.time < doubleClickSpeed) &&
+               (msg->time - clk_msg.time < GetDoubleClickTime()) &&
                (abs(msg->pt.x - clk_msg.pt.x) < GetSystemMetrics(SM_CXDOUBLECLK)/2) &&
                (abs(msg->pt.y - clk_msg.pt.y) < GetSystemMetrics(SM_CYDOUBLECLK)/2))
            {
@@ -651,25 +650,6 @@ BOOL WINAPI SetKeyboardState(LPBYTE lpKeyState)
 }
 
 
-/**********************************************************************
- *		SetDoubleClickTime (USER32.@)
- */
-BOOL WINAPI SetDoubleClickTime( UINT interval )
-{
-    doubleClickSpeed = interval ? interval : 500;
-    return TRUE;
-}		
-
-
-/**********************************************************************
- *		GetDoubleClickTime (USER32.@)
- */
-UINT WINAPI GetDoubleClickTime(void)
-{
-    return doubleClickSpeed;
-}		
-
-
 /***********************************************************************
  *		WaitMessage (USER.112) Suspend thread pending messages
  *		WaitMessage (USER32.@) Suspend thread pending messages

windows/sysmetrics.c

@@ -180,10 +180,10 @@ void SYSMETRICS_Init(void)
     sysMetrics[SM_CYSIZE] = sysMetrics[SM_CXSIZE];
     sysMetrics[SM_CXMINTRACK] = sysMetrics[SM_CXMIN];
     sysMetrics[SM_CYMINTRACK] = sysMetrics[SM_CYMIN];
-    sysMetrics[SM_CXDOUBLECLK] =
-	(GetProfileIntA("Windows", "DoubleClickWidth", 4) + 1) & ~1;
-    sysMetrics[SM_CYDOUBLECLK] =
-	(GetProfileIntA("Windows","DoubleClickHeight", 4) + 1) & ~1;
+
+    sysMetrics[SM_CXDOUBLECLK] = 4;
+    sysMetrics[SM_CYDOUBLECLK] = 4;
+    SYSPARAMS_GetDoubleClickSize( &sysMetrics[SM_CXDOUBLECLK], &sysMetrics[SM_CYDOUBLECLK] );
 
     sysMetrics[SM_CXICONSPACING] = 75;
     SystemParametersInfoA( SPI_ICONHORIZONTALSPACING, 0,
@@ -192,8 +192,8 @@ void SYSMETRICS_Init(void)
     SystemParametersInfoA( SPI_ICONVERTICALSPACING, 0,
                            &sysMetrics[SM_CYICONSPACING], 0 );
 
-    sysMetrics[SM_MENUDROPALIGNMENT] =
-	GetProfileIntA("Windows", "MenuDropAlignment", 0);
+    SystemParametersInfoA( SPI_GETMENUDROPALIGNMENT, 0,
+                           &sysMetrics[SM_MENUDROPALIGNMENT], 0 );
     sysMetrics[SM_PENWINDOWS] = 0;
     sysMetrics[SM_DBCSENABLED] = 0;