Sync to trunk (r44371)
[reactos.git] / reactos / dll / cpl / main / mouse.c
index 2e7681e..c208fb2 100644 (file)
@@ -12,9 +12,9 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /* $Id$
  *
@@ -27,9 +27,6 @@
 
 //TODO:
 //  add missing icons
-//  Options- pointer precision
-
-#define WINVER 0x0501
 
 #include <windows.h>
 #include <winuser.h>
@@ -39,6 +36,9 @@
 #include <tchar.h>
 #include <math.h>
 #include <limits.h>
+#include <shlobj.h>
+#include <cplext.h>
+#include <regstr.h>
 
 #include <stdio.h>
 
 
 #define DEFAULT_DOUBLE_CLICK_SPEED     500
 #define DEFAULT_CLICK_LOCK_TIME                2200
-#define DEFAULT_MOUSE_SENSITIVITY      16
+#define DEFAULT_MOUSE_SPEED            10
+#define DEFAULT_MOUSE_ACCELERATION     1
 #define DEFAULT_MOUSE_THRESHOLD1       6
 #define DEFAULT_MOUSE_THRESHOLD2       10
 #define MIN_DOUBLE_CLICK_SPEED         200
 #define MAX_DOUBLE_CLICK_SPEED         900
 #define DEFAULT_WHEEL_SCROLL_LINES     3
 
-
 typedef struct _BUTTON_DATA
 {
     ULONG g_SwapMouseButtons;
@@ -75,25 +75,40 @@ typedef struct _BUTTON_DATA
 
 typedef struct _POINTER_DATA
 {
-    BOOL bDropShadow;
-    BOOL bOrigDropShadow;
+    BOOL bCursorShadow;
+    BOOL bOrigCursorShadow;
 
+    INT cxCursor;
+    INT cyCursor;
 } POINTER_DATA, *PPOINTER_DATA;
 
 
+typedef struct _MOUSE_ACCEL
+{
+    INT nThreshold1;
+    INT nThreshold2;
+    INT nAcceleration;
+} MOUSE_ACCEL;
+
 typedef struct _OPTION_DATA
 {
-    ULONG ulMouseSensitivity;
-    ULONG ulOrigMouseSensitivity;
+    ULONG ulMouseSpeed;
+    ULONG ulOrigMouseSpeed;
+
+    MOUSE_ACCEL MouseAccel;
+    MOUSE_ACCEL OrigMouseAccel;
 
-    ULONG ulMouseSpeed; // = 1;
-    ULONG ulMouseThreshold1; // = DEFAULT_MOUSE_THRESHOLD1;
-    ULONG ulMouseThreshold2; // = DEFAULT_MOUSE_THRESHOLD2;
+    BOOL bSnapToDefaultButton;
+    BOOL bOrigSnapToDefaultButton;
 
-    ULONG ulSnapToDefaultButton;
-    ULONG ulMouseTrails;
-    ULONG ulShowPointer;
-    ULONG ulHidePointer;
+    UINT uMouseTrails;
+    UINT uOrigMouseTrails;
+
+    BOOL bMouseVanish;
+    BOOL bOrigMouseVanish;
+
+    BOOL bMouseSonar;
+    BOOL bOrigMouseSonar;
 } OPTION_DATA, *POPTION_DATA;
 
 
@@ -106,7 +121,8 @@ typedef struct _WHEEL_DATA
 typedef struct _CURSOR_DATA
 {
     UINT uStringId;
-    LPWSTR uDefaultCursorId;
+    UINT uDefaultCursorId;
+    LPTSTR lpValueName;
     HCURSOR hCursor;
     TCHAR szCursorName[MAX_PATH];
     TCHAR szCursorPath[MAX_PATH];
@@ -114,21 +130,21 @@ typedef struct _CURSOR_DATA
 
 
 CURSOR_DATA g_CursorData[] =
-{{IDS_ARROW,       IDC_ARROW,       0, _T(""), _T("")},
- {IDS_HELP,        IDC_HELP,        0, _T(""), _T("")},
- {IDS_APPSTARTING, IDC_APPSTARTING, 0, _T(""), _T("")},
- {IDS_WAIT,        IDC_WAIT,        0, _T(""), _T("")},
- {IDS_CROSSHAIR,   IDC_CROSS,       0, _T(""), _T("")},
- {IDS_IBEAM,       IDC_IBEAM,       0, _T(""), _T("")},
- {IDS_NWPEN,       0/*IDC_NWPEN*/,       0, _T(""), _T("")}, /* FIXME */
- {IDS_NO,          IDC_NO,          0, _T(""), _T("")},
- {IDS_SIZENS,      IDC_SIZENS,      0, _T(""), _T("")},
- {IDS_SIZEWE,      IDC_SIZEWE,      0, _T(""), _T("")},
- {IDS_SIZENWSE,    IDC_SIZENWSE,    0, _T(""), _T("")},
- {IDS_SIZENESW,    IDC_SIZENESW,    0, _T(""), _T("")},
- {IDS_SIZEALL,     IDC_SIZEALL,     0, _T(""), _T("")},
- {IDS_UPARROW,     IDC_UPARROW,     0, _T(""), _T("")},
- {IDS_HAND,        IDC_HAND,        0, _T(""), _T("")}};
+{{IDS_ARROW,       100/*OCR_NORMAL*/,      _T("Arrow"),       0, _T(""), _T("")},
+ {IDS_HELP,        112/*OCR_HELP*/,        _T("Help"),        0, _T(""), _T("")},
+ {IDS_APPSTARTING, 111/*OCR_APPSTARTING*/, _T("AppStarting"), 0, _T(""), _T("")},
+ {IDS_WAIT,        102/*OCR_WAIT*/,        _T("Wait"),        0, _T(""), _T("")},
+ {IDS_CROSSHAIR,   103/*OCR_CROSS*/,       _T("Crosshair"),   0, _T(""), _T("")},
+ {IDS_IBEAM,       101/*OCR_IBEAM*/,       _T("IBeam"),       0, _T(""), _T("")},
+ {IDS_NWPEN,       113/*OCR_NWPEN*/,       _T("NWPen"),       0, _T(""), _T("")},
+ {IDS_NO,          110/*OCR_NO*/,          _T("No"),          0, _T(""), _T("")},
+ {IDS_SIZENS,      108/*OCR_SIZENS*/,      _T("SizeNS"),      0, _T(""), _T("")},
+ {IDS_SIZEWE,      107/*OCR_SIZEWE*/,      _T("SizeWE"),      0, _T(""), _T("")},
+ {IDS_SIZENWSE,    105/*OCR_SIZENWSE*/,    _T("SizeNWSE"),    0, _T(""), _T("")},
+ {IDS_SIZENESW,    106/*OCR_SIZENESW*/,    _T("SizeNESW"),    0, _T(""), _T("")},
+ {IDS_SIZEALL,     109/*OCR_SIZEALL*/,     _T("SizeAll"),     0, _T(""), _T("")},
+ {IDS_UPARROW,     104/*OCR_UP*/,          _T("UpArrow"),     0, _T(""), _T("")},
+ {IDS_HAND,        114/*OCR_HAND*/,        _T("Hand"),        0, _T(""), _T("")}};
 
 
 #if 0
@@ -183,6 +199,7 @@ ClickLockProc(IN HWND hwndDlg,
 {
     HWND hDlgCtrl;
     int pos;
+    static HICON hIcon;
 
     PBUTTON_DATA pButtonData;
 
@@ -198,6 +215,10 @@ ClickLockProc(IN HWND hwndDlg,
             SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10));
             pos = (pButtonData->g_ClickLockTime - 200) / 200;
             SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos);
+
+            hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOOK_KEY),
+                              IMAGE_ICON, 16, 16, 0);
+            SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
             return TRUE;
 
         case WM_COMMAND:
@@ -206,10 +227,12 @@ ClickLockProc(IN HWND hwndDlg,
                 hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_CLICK_LOCK);
                 pButtonData->g_ClickLockTime = (DWORD) (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200;
                 EndDialog(hwndDlg, TRUE);
+                if (hIcon) DestroyIcon(hIcon);
             }
             else if (LOWORD(wParam) == IDCANCEL)
             {
                 EndDialog(hwndDlg, FALSE);
+                if (hIcon) DestroyIcon(hIcon);
             }
             break;
     }
@@ -310,7 +333,7 @@ ButtonProc(IN HWND hwndDlg,
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
                         SendDlgItemMessage(hwndDlg, IDC_IMAGE_SWAP_MOUSE, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hButtonRight);
                     }
-                    SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_SwapMouseButtons, NULL, SPIF_SENDCHANGE);
+                    //SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_SwapMouseButtons, NULL, 0);
                     PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
 
@@ -326,8 +349,8 @@ ButtonProc(IN HWND hwndDlg,
                     else if (lResult == BST_UNCHECKED)
                     {
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
-                        EnableWindow(hDlgCtrl, TRUE);
                         pButtonData->g_ClickLockEnabled = TRUE;
+                        EnableWindow(hDlgCtrl, TRUE);
                     }
                     PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
@@ -351,21 +374,29 @@ ButtonProc(IN HWND hwndDlg,
             lppsn = (LPPSHNOTIFY) lParam;
             if (lppsn->hdr.code == PSN_APPLY)
             {
+                if (pButtonData->g_OrigSwapMouseButtons != pButtonData->g_SwapMouseButtons)
+                {
+                    pButtonData->g_OrigSwapMouseButtons = pButtonData->g_SwapMouseButtons;
+                    SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    
+                }
+                SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed);
+
 #if (WINVER >= 0x0500)
-                SystemParametersInfo(SPI_SETMOUSECLICKLOCK, pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE);
+                SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, UlongToPtr(pButtonData->g_ClickLockEnabled), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
                 if (pButtonData->g_ClickLockEnabled)
-                   SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE);
+                   SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
 #endif
-                SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
             }
             else if (lppsn->hdr.code == PSN_RESET)
             {
                 /* Reset swap mouse button setting */
-                SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, SPIF_SENDCHANGE);
+                SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, 0);
 
                 /* Reset double click speed setting */
-//                SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, SPIF_SENDCHANGE);
-                SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed);
+                SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0);
+                //SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed);
             }
             return TRUE;
 
@@ -383,14 +414,14 @@ ButtonProc(IN HWND hwndDlg,
                     case TB_ENDTRACK:
                         lResult = SendDlgItemMessage(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED, TBM_GETPOS, 0, 0);
                         pButtonData->g_DoubleClickSpeed = (14 - (INT)lResult) * 50 + 200;
-//                        SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE);
+                       //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
                         SetDoubleClickTime(pButtonData->g_DoubleClickSpeed);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                         break;
 
                     case TB_THUMBTRACK:
                         pButtonData->g_DoubleClickSpeed = (14 - (INT)HIWORD(wParam)) * 50 + 200;
-//                        SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE);
+                        //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, 0);
                         SetDoubleClickTime(pButtonData->g_DoubleClickSpeed);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                         break;
@@ -403,130 +434,150 @@ ButtonProc(IN HWND hwndDlg,
 }
 
 
+static VOID
+CompressPath(LPTSTR lpShortPath, LPTSTR lpPath)
+{
+    TCHAR szUserProfile[MAX_PATH];
+    TCHAR szSystemRoot[MAX_PATH];
+    TCHAR szProgramFiles[MAX_PATH];
+    DWORD dwUserProfile;
+    DWORD dwSystemRoot;
+    DWORD dwProgramFiles;
+
+    dwUserProfile = GetEnvironmentVariable(_T("USERPROFILE"), szUserProfile, MAX_PATH);
+    dwSystemRoot = GetEnvironmentVariable(_T("SystemRoot"), szSystemRoot, MAX_PATH);
+    dwProgramFiles = GetEnvironmentVariable(_T("ProgramFiles"), szProgramFiles, MAX_PATH);
+
+    if (dwUserProfile > 0 && _tcsncmp(lpPath, szUserProfile, dwUserProfile) == 0)
+    {
+        _tcscpy(lpShortPath, _T("%USERPROFILE%"));
+        _tcscat(lpShortPath, &lpPath[dwUserProfile]);
+    }
+    else if (dwSystemRoot > 0 && _tcsncmp(lpPath, szSystemRoot, dwSystemRoot) == 0)
+    {
+        _tcscpy(lpShortPath, _T("%SystemRoot%"));
+        _tcscat(lpShortPath, &lpPath[dwSystemRoot]);
+    }
+    else if (dwProgramFiles > 0 && _tcsncmp(lpPath, szProgramFiles, dwProgramFiles) == 0)
+    {
+        _tcscpy(lpShortPath, _T("%ProgramFiles%"));
+        _tcscat(lpShortPath, &lpPath[dwProgramFiles]);
+    }
+    else
+    {
+        _tcscpy(lpShortPath, lpPath);
+    }
+}
+
+
 static BOOL
 EnumerateCursorSchemes(HWND hwndDlg)
 {
-    HKEY hCuKey;
-    HKEY hCuCursorKey;
+    HKEY hCursorKey;
     DWORD dwIndex;
     TCHAR szValueName[MAX_PATH];
     DWORD dwValueName;
     TCHAR szSystemScheme[MAX_PATH];
     TCHAR szValueData[2000];
+    TCHAR szTempData[2000];
     DWORD dwValueData;
-    LONG dwResult;
+    LONG lError;
     HWND hDlgCtrl;
     LRESULT lResult;
-    BOOL ProcessedHKLM = FALSE;
-    TCHAR szCurrentScheme[MAX_PATH];
-    DWORD dwCurrentScheme;
-    INT nSchemeIndex;
-    INT i, nCount;
-    LPTSTR p;
-
-    if (RegOpenCurrentUser(KEY_READ, &hCuKey) != ERROR_SUCCESS)
-        return FALSE;
-
-    if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ, &hCuCursorKey) != ERROR_SUCCESS)
-    {
-        RegCloseKey(hCuKey);
-        return FALSE;
-    }
 
     hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMBO_CURSOR_SCHEME);
     SendMessage(hDlgCtrl, CB_RESETCONTENT, 0, 0);
-    dwIndex = 0;
 
-    for (;;)
+    /* Read the users cursor schemes */
+    lError = RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Cursors\\Schemes"),
+                          0, KEY_READ | KEY_QUERY_VALUE , &hCursorKey);
+    if (lError == ERROR_SUCCESS)
     {
-        dwValueName = sizeof(szValueName) / sizeof(TCHAR);
-        dwValueData = sizeof(szValueData) / sizeof(TCHAR);
-        dwResult = RegEnumValue(hCuCursorKey, dwIndex, szValueName, &dwValueName, NULL, NULL, (LPBYTE)szValueData, &dwValueData);
-
-        if (dwResult == ERROR_NO_MORE_ITEMS)
+        for (dwIndex = 0;; dwIndex++)
         {
-            if (!ProcessedHKLM)
+            dwValueName = sizeof(szValueName) / sizeof(TCHAR);
+            dwValueData = sizeof(szValueData) / sizeof(TCHAR);
+            lError = RegEnumValue(hCursorKey, dwIndex, szValueName, &dwValueName,
+                                  NULL, NULL, (LPBYTE)szValueData, &dwValueData);
+            if (lError == ERROR_NO_MORE_ITEMS)
+                break;
+
+            ExpandEnvironmentStrings(szValueData, szTempData, 2000);
+
+            if (_tcslen(szTempData) > 0)
             {
-                RegCloseKey(hCuCursorKey);
-                dwResult = RegOpenKeyEx(HKEY_LOCAL_MACHINE, 
-                                        _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cursors\\Schemes"),
-                                        0, KEY_READ, &hCuCursorKey);
-                if (dwResult == ERROR_SUCCESS)
+                LPTSTR lpCopy, lpStart;
+
+                /* Remove quotation marks */
+                if (szTempData[0] == _T('"'))
                 {
-                    dwIndex = 0;
-                    ProcessedHKLM = TRUE;
-                    LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
-                    continue;
+                    lpStart = szValueData + 1;
+                    szTempData[_tcslen(szTempData) - 1] = 0;
+                }
+                else
+                {
+                    lpStart = szTempData;
                 }
-            }
-            break;
-        }
 
-        if (_tcslen(szValueData) > 0)
-        {
-            TCHAR * copy = _tcsdup(szValueData);
-            if (ProcessedHKLM)
-            {
-               _tcscat(szValueName, TEXT(" "));
-               _tcscat(szValueName, szSystemScheme);
+                lpCopy = _tcsdup(lpStart);
+
+                lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName);
+                SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)lpCopy);
             }
-            lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName);
-            SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)copy);
         }
 
-        dwIndex++;
+        RegCloseKey(hCursorKey);
     }
 
-    RegCloseKey(hCuCursorKey);
-    RegCloseKey(hCuKey);
+    /* Read the system cursor schemes */
+    lError = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                          _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cursors\\Schemes"),
+                          0, KEY_READ | KEY_QUERY_VALUE , &hCursorKey);
+    if (lError == ERROR_SUCCESS)
+    {
+        LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
 
-    /* Add the "(none)" entry */
-    LoadString(hApplet, IDS_NONE, szSystemScheme, MAX_PATH);
-    lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szSystemScheme);
-    SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)NULL);
+        for (dwIndex = 0;; dwIndex++)
+        {
+            dwValueName = sizeof(szValueName) / sizeof(TCHAR);
+            dwValueData = sizeof(szValueData) / sizeof(TCHAR);
+            lError = RegEnumValue(hCursorKey, dwIndex, szValueName, &dwValueName,
+                                  NULL, NULL, (LPBYTE)szValueData, &dwValueData);
+            if (lError == ERROR_NO_MORE_ITEMS)
+                break;
+
+            if (_tcslen(szValueData) > 0)
+            {
+                LPTSTR lpCopy, lpStart;
 
+                /* Remove quotation marks */
+                if (szValueData[0] == _T('"'))
+                {
+                    lpStart = szValueData + 1;
+                    szValueData[_tcslen(szValueData) - 1] = 0;
+                }
+                else
+                {
+                    lpStart = szValueData;
+                }
 
-    /* Get the name of the current cursor scheme */
-    szCurrentScheme[0] = 0;
-    if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Cursors"), 0, KEY_READ, &hCuCursorKey) == ERROR_SUCCESS)
-    {
-        dwCurrentScheme = sizeof(szCurrentScheme) / sizeof(TCHAR);
-        if (RegQueryValueEx(hCuCursorKey, NULL, NULL, NULL, (LPBYTE)szCurrentScheme, &dwCurrentScheme))
-            szCurrentScheme[0] = 0;
-        RegCloseKey(hCuCursorKey);
-    }
+                lpCopy = _tcsdup(lpStart);
 
-    /* Search for the matching entry in the cursor scheme list */
-    LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
-    nSchemeIndex = -1;
-    nCount = (INT)SendMessage(hDlgCtrl, CB_GETCOUNT, 0, 0);
-    for (i = 0; i < nCount; i++)
-    {
-        SendMessage(hDlgCtrl, CB_GETLBTEXT, i, (LPARAM)szValueName);
+                _tcscat(szValueName, TEXT(" "));
+                _tcscat(szValueName, szSystemScheme);
 
-        p = _tcsstr(szValueName, szSystemScheme);
-        if (p)
-        {
-            p -= 1;
-            *p = 0;
+                lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName);
+                SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)lpCopy);
+            }
         }
 
-        if (_tcscmp(szValueName, szCurrentScheme) == 0)
-        {
-            nSchemeIndex = (INT)i;
-            break;
-        }
+        RegCloseKey(hCursorKey);
     }
 
-    /* Select the matching entry */
-    if (nSchemeIndex != -1)
-        SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)nSchemeIndex, (LPARAM)0);
-    else
-    {
-        SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0);
-        hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME);
-        EnableWindow(hDlgCtrl, FALSE);
-    }
+    /* Add the "(none)" entry */
+    LoadString(hApplet, IDS_NONE, szSystemScheme, MAX_PATH);
+    lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szSystemScheme);
+    SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)NULL);
 
     return TRUE;
 }
@@ -568,6 +619,9 @@ static BOOL
 DeleteUserCursorScheme(HWND hwndDlg)
 {
     TCHAR szSchemeName[MAX_PATH];
+    TCHAR szTitle[128];
+    TCHAR szRawText[256];
+    TCHAR szText[256];
     HWND hDlgCtrl;
     HKEY hCuKey;
     HKEY hCuCursorKey;
@@ -581,6 +635,15 @@ DeleteUserCursorScheme(HWND hwndDlg)
 
     SendMessage(hDlgCtrl, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName);
 
+    LoadString(hApplet, IDS_REMOVE_TITLE, szTitle, 128);
+    LoadString(hApplet, IDS_REMOVE_TEXT, szRawText, 256);
+
+    _stprintf(szText, szRawText, szSchemeName);
+
+    /* Confirm scheme removal */
+    if (MessageBox(hwndDlg, szText, szTitle, MB_YESNO | MB_ICONQUESTION) == IDNO)
+        return TRUE;
+
     if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS)
         return FALSE;
 
@@ -646,12 +709,19 @@ SaveCursorScheme(HWND hwndDlg)
 {
     TCHAR szSystemScheme[MAX_PATH];
     TCHAR szSchemeName[MAX_PATH];
+    TCHAR szNewSchemeName[MAX_PATH];
+    TCHAR szTempPath[MAX_PATH];
+    TCHAR szTitle[128];
+    TCHAR szText[256];
     INT nSel;
     INT index, i, nLength;
     LPTSTR lpSchemeData;
     HKEY hCuKey;
     HKEY hCuCursorKey;
-    LONG lResult = ERROR_SUCCESS;
+    LONG lError = ERROR_SUCCESS;
+    BOOL bSchemeExists;
+
+    LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
 
     nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCURSEL, 0, 0);
     if (nSel == CB_ERR)
@@ -663,57 +733,97 @@ SaveCursorScheme(HWND hwndDlg)
     }
     else
     {
-        SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName);
-
-        LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
+        SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)szNewSchemeName);
 
-        if (_tcsstr(szSchemeName, szSystemScheme))
+        if (_tcsstr(szNewSchemeName, szSystemScheme))
         {
-            szSchemeName[_tcslen(szSchemeName) - _tcslen(szSystemScheme) - 1] = 0;
+            szNewSchemeName[_tcslen(szNewSchemeName) - _tcslen(szSystemScheme) - 1] = 0;
         }
     }
 
-    if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS),
-                       hwndDlg, SaveSchemeProc, (LPARAM)szSchemeName))
+    /* Ask for a name for the new cursor scheme */
+    if (!DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS),
+                        hwndDlg, SaveSchemeProc, (LPARAM)szNewSchemeName))
+        return TRUE;
+
+    /* Check all non-system schemes for the new name */
+    nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCOUNT, 0, 0);
+    if (nSel == CB_ERR)
+        return FALSE;
+
+    bSchemeExists = FALSE;
+    for (i = 0; i < nSel; i++)
     {
-        /* Save the cursor scheme */
-        nLength = 0;
-        for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
+        SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, i, (LPARAM)szSchemeName);
+        if (_tcsstr(szSchemeName, szSystemScheme) == NULL)
         {
-            if (i > 0)
-                nLength++;
-            nLength += _tcslen(g_CursorData[i].szCursorPath);
+            if (_tcscmp(szSchemeName, szNewSchemeName) == 0)
+            {
+                bSchemeExists = TRUE;
+                break;
+            }
         }
-        nLength++;
+    }
 
-        lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR));
+    if (bSchemeExists)
+    {
+        LoadString(hApplet, IDS_OVERWRITE_TITLE, szTitle, 128);
+        LoadString(hApplet, IDS_OVERWRITE_TEXT, szText, 256);
 
-        for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
-        {
-            if (i > 0)
-                _tcscat(lpSchemeData, _T(","));
-            _tcscat(lpSchemeData, g_CursorData[i].szCursorPath);
-        }
+         /* Confirm scheme overwrite */
+        if (MessageBox(hwndDlg, szText, szTitle, MB_YESNO | MB_ICONQUESTION) == IDNO)
+            return TRUE;
+    }
 
-        if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS)
-            return FALSE;
+    /* Save the cursor scheme */
+    nLength = 0;
+    for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
+    {
+        if (i > 0)
+            nLength++;
+        nLength += _tcslen(g_CursorData[i].szCursorPath);
+    }
+    nLength++;
 
-        if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS)
-        {
-            RegCloseKey(hCuKey);
-            return FALSE;
-        }
+    lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR));
 
-        lResult = RegSetValueEx(hCuCursorKey, szSchemeName, 0, REG_EXPAND_SZ,
-                                (LPBYTE)lpSchemeData, nLength * sizeof(TCHAR));
+    for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
+    {
+        CompressPath(szTempPath, g_CursorData[i].szCursorPath);
+        if (i > 0)
+            _tcscat(lpSchemeData, _T(","));
+        _tcscat(lpSchemeData, szTempPath);
+    }
 
-        RegCloseKey(hCuCursorKey);
+    if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS)
+        return FALSE;
+
+    if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS)
+    {
         RegCloseKey(hCuKey);
+        return FALSE;
+    }
+
+    lError = RegSetValueEx(hCuCursorKey, szNewSchemeName, 0,
+                           REG_EXPAND_SZ, (LPBYTE)lpSchemeData,
+                           (_tcslen(lpSchemeData) + 1) * sizeof(TCHAR));
+
+    RegCloseKey(hCuCursorKey);
+    RegCloseKey(hCuKey);
 
-        HeapFree(GetProcessHeap(), 0, lpSchemeData);
+    /* Add the new scheme to the scheme list and select it */
+    if (lError == ERROR_SUCCESS)
+    {
+        LPTSTR copy = _tcsdup(lpSchemeData);
+
+        nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szNewSchemeName);
+        SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_SETITEMDATA, (WPARAM)nSel, (LPARAM)copy);
+        SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_SETCURSEL, (WPARAM)nSel, (LPARAM)0);
     }
 
-    return (lResult == ERROR_SUCCESS);
+    HeapFree(GetProcessHeap(), 0, lpSchemeData);
+
+    return (lError == ERROR_SUCCESS);
 }
 
 
@@ -800,7 +910,7 @@ LoadCursorScheme(LPTSTR lpName, BOOL bSystem)
     for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
     {
         if (g_CursorData[i].szCursorPath[0] == 0)
-            g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].uDefaultCursorId,
+            g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(g_CursorData[i].uDefaultCursorId),
                                                          IMAGE_CURSOR, 0, 0,
                                                          LR_DEFAULTSIZE | LR_SHARED);
         else
@@ -822,7 +932,7 @@ ReloadCurrentCursorScheme(VOID)
             DestroyCursor(g_CursorData[i].hCursor);
 
         if (g_CursorData[i].szCursorPath[0] == 0)
-            g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].uDefaultCursorId,
+            g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(g_CursorData[i].uDefaultCursorId),
                                                          IMAGE_CURSOR, 0, 0,
                                                          LR_DEFAULTSIZE | LR_SHARED);
         else
@@ -835,7 +945,8 @@ ReloadCurrentCursorScheme(VOID)
 
 static VOID
 OnDrawItem(UINT idCtl,
-           LPDRAWITEMSTRUCT lpdis)
+           LPDRAWITEMSTRUCT lpdis,
+           PPOINTER_DATA pPointerData)
 {
     RECT rc;
 
@@ -860,7 +971,7 @@ OnDrawItem(UINT idCtl,
                    GetSysColor(COLOR_WINDOWTEXT));
     }
 
-    if (lpdis->itemID != -1)
+    if (lpdis->itemID != (UINT)-1)
     {
         CopyRect(&rc, &lpdis->rcItem);
         rc.left += 5;
@@ -873,7 +984,7 @@ OnDrawItem(UINT idCtl,
         if (g_CursorData[lpdis->itemData].hCursor != NULL)
         {
             DrawIcon(lpdis->hDC,
-                     lpdis->rcItem.right - 32 - 4,
+                     lpdis->rcItem.right - pPointerData->cxCursor - 4,
                      lpdis->rcItem.top + 2,
                      g_CursorData[lpdis->itemData].hCursor);
         }
@@ -889,7 +1000,7 @@ OnDrawItem(UINT idCtl,
 
 
 static VOID
-LoadNewCursorScheme(HWND hwndDlg, BOOL bInit)
+LoadNewCursorScheme(HWND hwndDlg)
 {
     TCHAR buffer[MAX_PATH];
     TCHAR szSystemScheme[MAX_PATH];
@@ -916,14 +1027,173 @@ LoadNewCursorScheme(HWND hwndDlg, BOOL bInit)
 
     lpName = (LPTSTR)SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETITEMDATA, nSel, 0);
     LoadCursorScheme(lpName, !bEnable);
-    RefreshCursorList(hwndDlg, bInit);
+    RefreshCursorList(hwndDlg, FALSE);
+}
+
+
+static VOID
+LoadInitialCursorScheme(HWND hwndDlg)
+{
+    TCHAR szSchemeName[256];
+    TCHAR szSystemScheme[256];
+    TCHAR szCursorPath[256];
+    HKEY hCursorKey;
+    LONG lError;
+    DWORD dwDataSize;
+    DWORD dwSchemeSource = 0;
+    UINT index, i;
+    DWORD dwType;
+    INT nSel;
+
+    for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
+    {
+        g_CursorData[i].hCursor = 0;
+        g_CursorData[i].szCursorPath[0] = 0;
+    }
+
+    lError = RegOpenKeyEx(HKEY_CURRENT_USER,
+                          _T("Control Panel\\Cursors"),
+                          0,
+                          KEY_READ | KEY_QUERY_VALUE,
+                          &hCursorKey);
+    if (lError != ERROR_SUCCESS)
+        return;
+
+    dwDataSize = sizeof(DWORD);
+    lError = RegQueryValueEx(hCursorKey,
+                             _T("Scheme Source"),
+                             NULL,
+                             NULL,
+                             (LPBYTE)&dwSchemeSource,
+                             &dwDataSize);
+
+    if (dwSchemeSource != 0)
+    {
+        dwDataSize = 256 * sizeof(TCHAR);
+        lError = RegQueryValueEx(hCursorKey,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 (LPBYTE)szSchemeName,
+                                 &dwDataSize);
+
+        for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
+        {
+            dwDataSize = MAX_PATH * sizeof(TCHAR);
+            lError = RegQueryValueEx(hCursorKey,
+                                     g_CursorData[i].lpValueName,
+                                     NULL,
+                                     &dwType,
+                                     (LPBYTE)szCursorPath,
+                                     &dwDataSize);
+            if (lError == ERROR_SUCCESS)
+            {
+                if (dwType == REG_EXPAND_SZ)
+                {
+                    ExpandEnvironmentStrings(szCursorPath, g_CursorData[i].szCursorPath, MAX_PATH);
+                }
+                else
+                {
+                    _tcscpy(g_CursorData[i].szCursorPath, szCursorPath);
+                }
+            }
+        }
+    }
+
+    RegCloseKey(hCursorKey);
+
+    ReloadCurrentCursorScheme();
+    RefreshCursorList(hwndDlg, TRUE);
+
+    /* Build the full scheme name */
+    if (dwSchemeSource == 0)
+    {
+        LoadString(hApplet, IDS_NONE, szSchemeName, MAX_PATH);
+    }
+    else if (dwSchemeSource == 2)
+    {
+        LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
+        _tcscat(szSchemeName, _T(" "));
+        _tcscat(szSchemeName, szSystemScheme);
+    }
+
+    /* Search and select the curent scheme name from the scheme list */
+    nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_FINDSTRINGEXACT, -1, (LPARAM)szSchemeName);
+    if (nSel != CB_ERR)
+        SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_SETCURSEL, (WPARAM)nSel, (LPARAM)0);
+
+    /* Enable /disable delete button */
+    EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME), (dwSchemeSource == 1));
 }
 
 
 static BOOL
 ApplyCursorScheme(HWND hwndDlg)
 {
-    /* FIXME: Apply the cursor scheme */
+    TCHAR szSchemeName[MAX_PATH];
+    TCHAR szSystemScheme[MAX_PATH];
+    TCHAR szTempPath[MAX_PATH];
+    LPTSTR lpSchemeData;
+    DWORD dwNameLength;
+    DWORD dwSchemeSource;
+    UINT index, i;
+    HKEY hCursorKey;
+    INT nSel;
+
+    nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCURSEL, 0, 0);
+    if (nSel == CB_ERR)
+       return FALSE;
+
+    lpSchemeData = (LPTSTR)SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETITEMDATA, nSel, 0);
+    if (lpSchemeData == NULL)
+    {
+        /* "None" cursor scheme */
+        dwSchemeSource = 0;
+        szSchemeName[0] = 0;
+        dwNameLength = 0;
+    }
+    else
+    {
+        SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName);
+        LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH);
+
+        if (_tcsstr(szSchemeName, szSystemScheme))
+        {
+            /* System scheme */
+            dwSchemeSource = 2;
+            szSchemeName[_tcslen(szSchemeName) - _tcslen(szSystemScheme) - 1] = 0;
+        }
+        else
+        {
+            /* User scheme */
+            dwSchemeSource = 1;
+        }
+
+        dwNameLength = (_tcslen(szSchemeName) + 1) * sizeof(TCHAR);
+    }
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Cursors"), 0,
+                     KEY_READ | KEY_SET_VALUE, &hCursorKey) != ERROR_SUCCESS)
+        return FALSE;
+
+    RegSetValueEx(hCursorKey, NULL, 0, REG_SZ,
+                  (LPBYTE)szSchemeName, dwNameLength);
+
+    RegSetValueEx(hCursorKey, _T("Scheme Source"), 0, REG_DWORD,
+                  (LPBYTE)&dwSchemeSource, sizeof(DWORD));
+
+    for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++)
+    {
+        CompressPath(szTempPath, g_CursorData[i].szCursorPath);
+        RegSetValueEx(hCursorKey, g_CursorData[i].lpValueName, 0,
+                      REG_EXPAND_SZ, (LPBYTE)szTempPath,
+                      (_tcslen(szTempPath) + 1) * sizeof(TCHAR));
+    }
+
+    RegCloseKey(hCursorKey);
+
+    /* Force the system to reload its cursors */
+    SystemParametersInfo(SPI_SETCURSORS, 0, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
 
     return TRUE;
 }
@@ -947,18 +1217,19 @@ PointerProc(IN HWND hwndDlg,
             pPointerData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(POINTER_DATA));
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pPointerData);
 
-            EnumerateCursorSchemes(hwndDlg);
-            LoadNewCursorScheme(hwndDlg, TRUE);
+            pPointerData->cxCursor = GetSystemMetrics(SM_CXCURSOR);
+            pPointerData->cyCursor = GetSystemMetrics(SM_CYCURSOR);
 
-            /* Get drop shadow setting */
-            if (!SystemParametersInfo(SPI_GETDROPSHADOW, 0, &pPointerData->bDropShadow, 0))
-                pPointerData->bDropShadow = FALSE;
+            EnumerateCursorSchemes(hwndDlg);
+            LoadInitialCursorScheme(hwndDlg);
 
-            pPointerData->bOrigDropShadow = pPointerData->bDropShadow;
+            /* Get cursor shadow setting */
+            SystemParametersInfo(SPI_GETCURSORSHADOW, 0, &pPointerData->bCursorShadow, 0);
+            pPointerData->bOrigCursorShadow = pPointerData->bCursorShadow;
 
-            if (pPointerData->bDropShadow)
+            if (pPointerData->bCursorShadow)
             {
-                SendDlgItemMessage(hwndDlg, IDC_CHECK_DROP_SHADOW, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
+                SendDlgItemMessage(hwndDlg, IDC_CHECK_CURSOR_SHADOW, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
             }
 
             if ((INT)wParam == IDC_LISTBOX_CURSOR)
@@ -967,12 +1238,12 @@ PointerProc(IN HWND hwndDlg,
                 return FALSE;
 
         case WM_MEASUREITEM:
-            ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 32 + 4;
+            ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = GetSystemMetrics(SM_CYCURSOR) + 4;
             break;
 
         case WM_DRAWITEM:
             if (wParam == IDC_LISTBOX_CURSOR)
-                OnDrawItem((UINT)wParam, (LPDRAWITEMSTRUCT)lParam);
+                OnDrawItem((UINT)wParam, (LPDRAWITEMSTRUCT)lParam, pPointerData);
             return TRUE;
 
         case WM_DESTROY:
@@ -984,16 +1255,20 @@ PointerProc(IN HWND hwndDlg,
             if (lppsn->hdr.code == PSN_APPLY)
             {
                 ApplyCursorScheme(hwndDlg);
-#if (WINVER >= 0x0500)
-                SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE);
-#endif
+//#if (WINVER >= 0x0500)
+                if (pPointerData->bOrigCursorShadow != pPointerData->bCursorShadow)
+                {
+                    SystemParametersInfo(SPI_SETCURSORSHADOW, 0, UlongToPtr(pPointerData->bCursorShadow), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    pPointerData->bOrigCursorShadow = pPointerData->bCursorShadow;
+                }
+//#endif
                 return TRUE;
             }
             else if (lppsn->hdr.code == PSN_RESET)
             {
-#if (WINVER >= 0x0500)
-                SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bOrigDropShadow, SPIF_SENDCHANGE);
-#endif
+//#if (WINVER >= 0x0500)
+                SystemParametersInfo(SPI_SETCURSORSHADOW, 0, UlongToPtr(pPointerData->bOrigCursorShadow), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+//#endif
             }
             break;
 
@@ -1002,7 +1277,10 @@ PointerProc(IN HWND hwndDlg,
             {
                 case IDC_COMBO_CURSOR_SCHEME:
                     if (HIWORD(wParam) == CBN_SELENDOK)
-                        LoadNewCursorScheme(hwndDlg, FALSE);
+                    {
+                        LoadNewCursorScheme(hwndDlg);
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                    }
                     break;
 
                 case IDC_LISTBOX_CURSOR:
@@ -1025,16 +1303,15 @@ PointerProc(IN HWND hwndDlg,
 
                                 /* Enable the "Set Default" button */
                                 EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), TRUE);
+
+                                PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             }
                             break;
                     }
                     break;
 
                 case IDC_BUTTON_SAVEAS_SCHEME:
-                    if (SaveCursorScheme(hwndDlg))
-                    {
-
-                    }
+                    SaveCursorScheme(hwndDlg);
                     break;
 
                 case IDC_BUTTON_USE_DEFAULT_CURSOR:
@@ -1050,6 +1327,8 @@ PointerProc(IN HWND hwndDlg,
 
                         /* Disable the "Set Default" button */
                         EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), FALSE);
+
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
                     break;
 
@@ -1062,6 +1341,8 @@ PointerProc(IN HWND hwndDlg,
 
                         /* Enable the "Set Default" button */
                         EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), TRUE);
+
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
                     break;
 
@@ -1069,25 +1350,25 @@ PointerProc(IN HWND hwndDlg,
                     DeleteUserCursorScheme(hwndDlg);
                     break;
 
-                case IDC_CHECK_DROP_SHADOW:
-                    if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_DROP_SHADOW))
+                case IDC_CHECK_CURSOR_SHADOW:
+                    if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_CURSOR_SHADOW))
                     {
-                        pPointerData->bDropShadow = FALSE;
+                        pPointerData->bCursorShadow = FALSE;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
-#if (WINVER >= 0x0500)
-                        SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE);
-#endif
-                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+//#if (WINVER >= 0x0500)
+//                        SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bCursorShadow, 0);
+//#endif
+//                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
                     else
                     {
-                        pPointerData->bDropShadow = TRUE;
+                        pPointerData->bCursorShadow = TRUE;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
-#if (WINVER >= 0x0500)
-                        SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE);
-#endif
-                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
+//#if (WINVER >= 0x0500)
+                    //SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bCursorShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+//#endif
+                    PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
             }
             break;
@@ -1097,52 +1378,15 @@ PointerProc(IN HWND hwndDlg,
 }
 
 
-static BOOL
-InitializeMouse(POPTION_DATA pOptionData)
-{
-    //FIXME
-    //pointer precision
-    // SPI_GETMOUSE?
-
-    /* Get mouse sensitivity */
-    if (!SystemParametersInfo(SPI_GETMOUSESPEED, 0, &pOptionData->ulMouseSensitivity, 0))
-        pOptionData->ulMouseSensitivity = DEFAULT_MOUSE_SENSITIVITY;
-    pOptionData->ulOrigMouseSensitivity = pOptionData->ulMouseSensitivity;
-
-    pOptionData->ulMouseSpeed = 1;
-    pOptionData->ulMouseThreshold1 = DEFAULT_MOUSE_THRESHOLD1;
-    pOptionData->ulMouseThreshold2 = DEFAULT_MOUSE_THRESHOLD2;
-
-    /* snap to default button */
-    if (SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->ulSnapToDefaultButton, 0))
-        pOptionData->ulSnapToDefaultButton = 0;
-
-    /* mouse trails */
-    if (!SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->ulMouseTrails, 0))
-        pOptionData->ulMouseTrails = 0;
-
-    /* hide pointer while typing */
-    if (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->ulHidePointer, 0))
-        pOptionData->ulHidePointer = 0;
-
-    /* show pointer with Ctrl-Key */
-    if (!SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->ulShowPointer, 0))
-        pOptionData->ulShowPointer = 0;
-
-    return TRUE;
-}
-
-
 static INT_PTR CALLBACK
 OptionProc(IN HWND hwndDlg,
            IN UINT uMsg,
            IN WPARAM wParam,
            IN LPARAM lParam)
 {
+    POPTION_DATA pOptionData;
     HWND hDlgCtrl;
     LPPSHNOTIFY lppsn;
-    LRESULT lResult;
-    POPTION_DATA pOptionData;
 
     pOptionData = (POPTION_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
 
@@ -1152,20 +1396,50 @@ OptionProc(IN HWND hwndDlg,
             pOptionData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OPTION_DATA));
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pOptionData);
 
-            InitializeMouse(pOptionData);
+            /* Get mouse sensitivity */
+            if (!SystemParametersInfo(SPI_GETMOUSESPEED, 0, &pOptionData->ulMouseSpeed, 0))
+                pOptionData->ulMouseSpeed = DEFAULT_MOUSE_SPEED;
+            pOptionData->ulOrigMouseSpeed = pOptionData->ulMouseSpeed;
+
+
+            if (!SystemParametersInfo(SPI_GETMOUSE, 0, &pOptionData->MouseAccel, 0))
+            {
+                pOptionData->MouseAccel.nAcceleration = DEFAULT_MOUSE_ACCELERATION;
+                pOptionData->MouseAccel.nThreshold1 = DEFAULT_MOUSE_THRESHOLD1;
+                pOptionData->MouseAccel.nThreshold2 = DEFAULT_MOUSE_THRESHOLD2;
+            }
+            pOptionData->OrigMouseAccel.nAcceleration = pOptionData->MouseAccel.nAcceleration;
+            pOptionData->OrigMouseAccel.nThreshold1 = pOptionData->MouseAccel.nThreshold1;
+            pOptionData->OrigMouseAccel.nThreshold2 = pOptionData->MouseAccel.nThreshold2;
+
+            /* snap to default button */
+            SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0);
+            pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton;
+
+            /* mouse trails */
+            SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0);
+            pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails;
+
+            /* hide pointer while typing */
+            SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0);
+            pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish;
 
-            /* set mouse sensitivity */
-            hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY);
+            /* show pointer with Ctrl-Key */
+            SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0);
+            pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar;
+
+            /* Set mouse speed */
+            hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SPEED);
             SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 19));
-            SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseSensitivity - 1);
+            SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseSpeed - 1);
 
-            if (pOptionData->ulMouseSpeed)
+            if (pOptionData->MouseAccel.nAcceleration)
             {
                 hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_POINTER_PRECISION);
                 SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
             }
 
-            if (pOptionData->ulSnapToDefaultButton)
+            if (pOptionData->bSnapToDefaultButton)
             {
                 hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SNAP_TO);
                 SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
@@ -1174,22 +1448,31 @@ OptionProc(IN HWND hwndDlg,
             /* set mouse trail */
             hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL);
             SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 5));
-            if (pOptionData->ulMouseTrails < 2)
+            if (pOptionData->uMouseTrails < 2)
+            {
+                SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)5);
                 EnableWindow(hDlgCtrl, FALSE);
+                EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_SHORT), FALSE);
+                EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_LONG), FALSE);
+            }
             else
-                SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseTrails - 2);
+            {
+                SendDlgItemMessage(hwndDlg, IDC_CHECK_POINTER_TRAIL, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
+                SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->uMouseTrails - 2);
+            }
 
-            if (pOptionData->ulShowPointer)
+            if (pOptionData->bMouseVanish)
             {
-                hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SHOW_POINTER);
+                hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_HIDE_POINTER);
                 SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
             }
 
-            if (pOptionData->ulHidePointer)
+            if (pOptionData->bMouseSonar)
             {
-                hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_HIDE_POINTER);
+                hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SHOW_POINTER);
                 SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
             }
+
             break;
 
         case WM_DESTROY:
@@ -1202,74 +1485,84 @@ OptionProc(IN HWND hwndDlg,
                 case IDC_CHECK_POINTER_PRECISION:
                     if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_PRECISION))
                     {
-                        pOptionData->ulMouseSpeed = 0;
-                        pOptionData->ulMouseThreshold1 = 0;
-                        pOptionData->ulMouseThreshold2 = 0;
+                        pOptionData->MouseAccel.nAcceleration = 0;
+                        pOptionData->MouseAccel.nThreshold1 = 0;
+                        pOptionData->MouseAccel.nThreshold2 = 0;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
                     }
                     else
                     {
-                        pOptionData->ulMouseSpeed = 1;
-                        pOptionData->ulMouseThreshold1 = 6;
-                        pOptionData->ulMouseThreshold2 = 10;
+                        pOptionData->MouseAccel.nAcceleration = 1;
+                        pOptionData->MouseAccel.nThreshold1 = 6;
+                        pOptionData->MouseAccel.nThreshold2 = 10;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
                     }
+                    SystemParametersInfo(SPI_SETMOUSE, 0, &pOptionData->MouseAccel, 0);
                     break;
 
                 case IDC_CHECK_SNAP_TO:
                     if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SNAP_TO))
                     {
-                        pOptionData->ulSnapToDefaultButton = 0;
+                        pOptionData->bSnapToDefaultButton = 0;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
                     }
                     else
                     {
-                        pOptionData->ulSnapToDefaultButton = 1;
+                        pOptionData->bSnapToDefaultButton = 1;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
                     }
+                    SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bSnapToDefaultButton, 0, 0);
                     break;
 
                 case IDC_CHECK_POINTER_TRAIL:
                     hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL);
                     if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_TRAIL))
                     {
-                        pOptionData->ulMouseTrails = 0;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
                         EnableWindow(hDlgCtrl, FALSE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_SHORT), FALSE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_LONG), FALSE);
+                        pOptionData->uMouseTrails = 0;
                     }
                     else
                     {
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
                         EnableWindow(hDlgCtrl, TRUE);
-                        pOptionData->ulMouseTrails = (ULONG)SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2;
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_SHORT), TRUE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_LONG), TRUE);
+                        pOptionData->uMouseTrails = (UINT)SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2;
                     }
+                    SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, 0);
                     break;
 
-                case IDC_CHECK_SHOW_POINTER:
-                    if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOW_POINTER))
+                case IDC_CHECK_HIDE_POINTER:
+                    if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_HIDE_POINTER))
                     {
-                        pOptionData->ulShowPointer = 0;
+                        pOptionData->bMouseVanish = FALSE;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
                     }
                     else
                     {
-                        pOptionData->ulShowPointer = 1;
+                        pOptionData->bMouseVanish = TRUE;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
                     }
+                    SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), 0);
                     break;
 
-                case IDC_CHECK_HIDE_POINTER:
-                    if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_HIDE_POINTER))
+                case IDC_CHECK_SHOW_POINTER:
+                    if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOW_POINTER))
                     {
-                        pOptionData->ulHidePointer = 0;
+                        pOptionData->bMouseSonar = FALSE;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0);
                     }
                     else
                     {
-                        pOptionData->ulHidePointer = 1;
+                        pOptionData->bMouseSonar = TRUE;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
                     }
+                    SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), 0);
                     break;
+
             }
             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
             break;
@@ -1278,51 +1571,65 @@ OptionProc(IN HWND hwndDlg,
             lppsn = (LPPSHNOTIFY)lParam;
             if (lppsn->hdr.code == PSN_APPLY)
             {
-                /* set snap to default button */
-                SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, pOptionData->ulSnapToDefaultButton, 0, SPIF_SENDCHANGE);
-
-#if 0
-                /* set mouse trails */
-                if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_TRAIL))
+                /* Set mouse speed */
+                if (pOptionData->ulOrigMouseSpeed != pOptionData->ulMouseSpeed)
                 {
-                    hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL);
-                    lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2;
+                    SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulMouseSpeed), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    pOptionData->ulOrigMouseSpeed = pOptionData->ulMouseSpeed;
                 }
-                else
+
+                if (pOptionData->OrigMouseAccel.nAcceleration != pOptionData->MouseAccel.nAcceleration)
                 {
-                    lResult = 0;
+                    SystemParametersInfo(SPI_SETMOUSE, 0, &pOptionData->MouseAccel, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    pOptionData->OrigMouseAccel.nAcceleration = pOptionData->MouseAccel.nAcceleration;
+                    pOptionData->OrigMouseAccel.nThreshold1 = pOptionData->MouseAccel.nThreshold1;
+                    pOptionData->OrigMouseAccel.nThreshold2 = pOptionData->MouseAccel.nThreshold2;
                 }
 
-                SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
-#endif
 
-                //FIXME
-                //pointer precision
-                //SPI_SETMOUSE?
+                /* set snap to default button */
+                if (pOptionData->bOrigSnapToDefaultButton != pOptionData->bSnapToDefaultButton)
+                {
+                    SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bSnapToDefaultButton, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton;
+                }
 
-                /* calc pos and set mouse sensitivity */
-                hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY);
-                lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 1;
-                SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSensitivity, SPIF_SENDCHANGE);
+                /* Set mouse trails setting */
+                if (pOptionData->uOrigMouseTrails != pOptionData->uMouseTrails)
+                {
+                    SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails;
+                }
 
                 /* hide pointer while typing */
-                SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->ulHidePointer, SPIF_SENDCHANGE);
+                if (pOptionData->bOrigMouseVanish != pOptionData->bMouseVanish)
+                {
+                    SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish;
+                }
 
                 /* show pointer with Ctrl-Key */
-                SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->ulShowPointer, SPIF_SENDCHANGE);
-
-                SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
+                if (pOptionData->bOrigMouseSonar != pOptionData->bMouseSonar)
+                {
+                    SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                    pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar;
+                }
                 return TRUE;
             }
             else if (lppsn->hdr.code == PSN_RESET)
             {
                 /* Set the original mouse speed */
-                SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulOrigMouseSensitivity, SPIF_SENDCHANGE);
+                SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulOrigMouseSpeed), 0);
+                SystemParametersInfo(SPI_SETMOUSE, 0, &pOptionData->OrigMouseAccel, 0);
+                SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bOrigSnapToDefaultButton, 0, 0);
+                SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uOrigMouseTrails, 0, 0);
+                SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bOrigMouseVanish), 0);
+                SystemParametersInfo(SPI_SETMOUSESONAR, 0,IntToPtr(pOptionData->bOrigMouseSonar), 0);
             }
             break;
 
         case WM_HSCROLL:
-            if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY))
+            if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SPEED))
             {
                 switch (LOWORD(wParam))
                 {
@@ -1333,14 +1640,14 @@ OptionProc(IN HWND hwndDlg,
                     case TB_TOP:
                     case TB_BOTTOM:
                     case TB_ENDTRACK:
-                        pOptionData->ulMouseSensitivity = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY, TBM_GETPOS, 0, 0) + 1;
-                        SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSensitivity, SPIF_SENDCHANGE);
+                        pOptionData->ulMouseSpeed = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_MOUSE_SPEED, TBM_GETPOS, 0, 0) + 1;
+                        SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulMouseSpeed), SPIF_SENDCHANGE);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                         break;
 #if 0
                     case TB_THUMBTRACK:
-                        pOptionData->ulMouseSensitivity = (ULONG)HIWORD(wParam) + 1;
-                        SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSensitivity, SPIF_SENDCHANGE);
+                        pOptionData->ulMouseSpeed = (ULONG)HIWORD(wParam) + 1;
+                        SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSpeed, SPIF_SENDCHANGE);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                         break;
 #endif
@@ -1357,14 +1664,14 @@ OptionProc(IN HWND hwndDlg,
                     case TB_TOP:
                     case TB_BOTTOM:
                     case TB_ENDTRACK:
-                        pOptionData->ulMouseTrails = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_POINTER_TRAIL, TBM_GETPOS, 0, 0) + 2;
-                        SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->ulMouseTrails, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                        pOptionData->uMouseTrails = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_POINTER_TRAIL, TBM_GETPOS, 0, 0) + 2;
+                        SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, SPIF_UPDATEINIFILE);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                         break;
 
                     case TB_THUMBTRACK:
-                        pOptionData->ulMouseTrails = (ULONG)HIWORD(wParam) + 2;
-                        SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->ulMouseTrails, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+                        pOptionData->uMouseTrails = (ULONG)HIWORD(wParam) + 2;
+                        SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, SPIF_UPDATEINIFILE);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                         break;
                 }
@@ -1434,10 +1741,7 @@ WheelProc(IN HWND hwndDlg,
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pWheelData);
 
             /* Get wheel scroll lines */
-            if (!SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &pWheelData->uWheelScrollLines, 0))
-            {
-                pWheelData->uWheelScrollLines = DEFAULT_WHEEL_SCROLL_LINES;
-            }
+            SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &pWheelData->uWheelScrollLines, 0);
 
             ShowDialogWheelControls(hwndDlg, pWheelData->uWheelScrollLines, TRUE);
             SendDlgItemMessage(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES, UDM_SETRANGE, 0, MAKELONG((short)100, (short)0));
@@ -1490,13 +1794,29 @@ WheelProc(IN HWND hwndDlg,
     return FALSE;
 }
 
+static const struct
+{
+    WORD idDlg;
+    DLGPROC DlgProc;
+    UINT uiReplaceWith;
+} PropPages[] =
+{
+    { IDD_PAGE_BUTTON, ButtonProc, CPLPAGE_MOUSE_BUTTONS },
+    { IDD_PAGE_POINTER, PointerProc, 0 },
+    { IDD_PAGE_OPTION, OptionProc, CPLPAGE_MOUSE_PTRMOTION },
+    { IDD_PAGE_WHEEL, WheelProc, CPLPAGE_MOUSE_WHEEL },
+    { IDD_HARDWARE, MouseHardwareProc, 0 },
+};
 
 LONG APIENTRY
-MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2)
+MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 {
-    PROPSHEETPAGE psp[5];
+    HPROPSHEETPAGE hpsp[MAX_CPL_PAGES];
     PROPSHEETHEADER psh;
+    HPSXA hpsxa;
     TCHAR Caption[256];
+    UINT i;
+    LONG ret;
 
     UNREFERENCED_PARAMETER(lParam1);
     UNREFERENCED_PARAMETER(lParam2);
@@ -1507,21 +1827,40 @@ MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2)
 
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
-    psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE;
-    psh.hwndParent = NULL;
+    psh.dwFlags = PSH_PROPTITLE;
+    psh.hwndParent = hwnd;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1));
     psh.pszCaption = Caption;
-    psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
     psh.nStartPage = 0;
-    psh.ppsp = psp;
-
-    InitPropSheetPage(&psp[0], IDD_PAGE_BUTTON, ButtonProc);
-    InitPropSheetPage(&psp[1], IDD_PAGE_POINTER, PointerProc);
-    InitPropSheetPage(&psp[2], IDD_PAGE_OPTION, OptionProc);
-    InitPropSheetPage(&psp[3], IDD_PAGE_WHEEL, WheelProc);
-    InitPropSheetPage(&psp[4], IDD_HARDWARE, MouseHardwareProc);
-    return (LONG)(PropertySheet(&psh) != -1);
+    psh.phpage = hpsp;
+
+    /* Load additional pages provided by shell extensions */
+    hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Mouse"), MAX_CPL_PAGES - psh.nPages);
+
+    for (i = 0; i != sizeof(PropPages) / sizeof(PropPages[0]); i++)
+    {
+        /* Override the background page if requested by a shell extension */
+        if (PropPages[i].uiReplaceWith != 0 && hpsxa != NULL &&
+            SHReplaceFromPropSheetExtArray(hpsxa, PropPages[i].uiReplaceWith, PropSheetAddPage, (LPARAM)&psh) != 0)
+        {
+            /* The shell extension added one or more pages to replace a page.
+               Don't create the built-in page anymore! */
+            continue;
+        }
+
+        InitPropSheetPage(&psh, PropPages[i].idDlg, PropPages[i].DlgProc);
+    }
+
+    if (hpsxa != NULL)
+        SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh);
+
+    ret = (LONG)(PropertySheet(&psh) != -1);
+
+    if (hpsxa != NULL)
+        SHDestroyPropSheetExtArray(hpsxa);
+
+    return ret;
 }
 
 /* EOF */