Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[gedmurphy] 26513: add stubed out clusapi.dll from Wine. part 1 of 3
by gedmurphy＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: gedmurphy Date: Thu Apr 26 15:28:30 2007 New Revision: 26513 URL: http://svn.reactos.org/svn/reactos?rev=26513&view=rev Log: add stubed out clusapi.dll from Wine. part 1 of 3 Added: trunk/reactos/dll/win32/clusapi/ trunk/reactos/dll/win32/clusapi/clusapi.c trunk/reactos/dll/win32/clusapi/clusapi.rbuild trunk/reactos/dll/win32/clusapi/clusapi.spec Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/clusapi/clusapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.c (added) +++ trunk/reactos/dll/win32/clusapi/clusapi.c Thu Apr 26 15:28:30 2007 @@ -1,0 +1,57 @@ +/* + * clusapi main + * + * Copyright 2006 Benjamin Arai (Google) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "clusapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(clusapi); + +/*********************************************************************** + * GetNodeClusterState (CLUSAPI.@) + * + */ +DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState) +{ + FIXME("(%s,%p) stub!\n",debugstr_w(lpszNodeName),pdwClusterState); + + return 0; +} + + +/*********************************************************************** + * DllMain (CLUSAPI.@) + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} Added: trunk/reactos/dll/win32/clusapi/clusapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.rbuild (added) +++ trunk/reactos/dll/win32/clusapi/clusapi.rbuild Thu Apr 26 15:28:30 2007 @@ -1,0 +1,17 @@ +<module name="clusapi" type="win32dll" baseaddress="${BASEADDRESS_CLUSAPI}" installbase="system32" installname="clusapi2.dll" allowwarnings="false"> + <importlibrary definition="clusapi.spec.def" /> + <include base="clusapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>clusapi.c</file> + <file>clusapi.spec</file> +</module> Added: trunk/reactos/dll/win32/clusapi/clusapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.spec (added) +++ trunk/reactos/dll/win32/clusapi/clusapi.spec Thu Apr 26 15:28:30 2007 @@ -1,0 +1,115 @@ +@ stub AddClusterResourceDependency +@ stub AddClusterResourceNode +@ stub BackupClusterDatabase +@ stub CanResourceBeDependent +@ stub ChangeClusterResourceGroup +@ stub CloseCluster +@ stub CloseClusterGroup +@ stub CloseClusterNetInterface +@ stub CloseClusterNetwork +@ stub CloseClusterNode +@ stub CloseClusterNotifyPort +@ stub CloseClusterResource +@ stub ClusterCloseEnum +@ stub ClusterControl +@ stub ClusterEnum +@ stub ClusterGetEnumCount +@ stub ClusterGroupCloseEnum +@ stub ClusterGroupControl +@ stub ClusterGroupEnum +@ stub ClusterGroupGetEnumCount +@ stub ClusterGroupOpenEnum +@ stub ClusterNetInterfaceControl +@ stub ClusterNetworkCloseEnum +@ stub ClusterNetworkControl +@ stub ClusterNetworkEnum +@ stub ClusterNetworkGetEnumCount +@ stub ClusterNetworkOpenEnum +@ stub ClusterNodeCloseEnum +@ stub ClusterNodeControl +@ stub ClusterNodeEnum +@ stub ClusterNodeGetEnumCount +@ stub ClusterNodeOpenEnum +@ stub ClusterOpenEnum +@ stub ClusterRegCloseKey +@ stub ClusterRegCreateKey +@ stub ClusterRegDeleteKey +@ stub ClusterRegDeleteValue +@ stub ClusterRegEnumKey +@ stub ClusterRegEnumValue +@ stub ClusterRegGetKeySecurity +@ stub ClusterRegOpenKey +@ stub ClusterRegQueryInfoKey +@ stub ClusterRegQueryValue +@ stub ClusterRegSetKeySecurity +@ stub ClusterRegSetValue +@ stub ClusterResourceCloseEnum +@ stub ClusterResourceControl +@ stub ClusterResourceEnum +@ stub ClusterResourceGetEnumCount +@ stub ClusterResourceOpenEnum +@ stub ClusterResourceTypeCloseEnum +@ stub ClusterResourceTypeControl +@ stub ClusterResourceTypeEnum +@ stub ClusterResourceTypeGetEnumCount +@ stub ClusterResourceTypeOpenEnum +@ stub CreateClusterGroup +@ stub CreateClusterNotifyPort +@ stub CreateClusterResource +@ stub CreateClusterResourceType +@ stub DeleteClusterGroup +@ stub DeleteClusterResource +@ stub DeleteClusterResourceType +@ stub EvictClusterNode +@ stub EvictClusterNodeEx +@ stub FailClusterResource +@ stub GetClusterFromGroup +@ stub GetClusterFromNetInterface +@ stub GetClusterFromNetwork +@ stub GetClusterFromNode +@ stub GetClusterFromResource +@ stub GetClusterGroupKey +@ stub GetClusterGroupState +@ stub GetClusterInformation +@ stub GetClusterKey +@ stub GetClusterNetInterface +@ stub GetClusterNetInterfaceKey +@ stub GetClusterNetInterfaceState +@ stub GetClusterNetworkId +@ stub GetClusterNetworkKey +@ stub GetClusterNetworkState +@ stub GetClusterNodeId +@ stub GetClusterNodeKey +@ stub GetClusterNodeState +@ stub GetClusterNotify +@ stub GetClusterQuorumResource +@ stub GetClusterResourceKey +@ stub GetClusterResourceNetworkName +@ stub GetClusterResourceState +@ stub GetClusterResourceTypeKey +@ stdcall GetNodeClusterState(wstr ptr) +@ stub MoveClusterGroup +@ stub OfflineClusterGroup +@ stub OfflineClusterResource +@ stub OnlineClusterGroup +@ stub OnlineClusterResource +@ stub OpenCluster +@ stub OpenClusterGroup +@ stub OpenClusterNetInterface +@ stub OpenClusterNetwork +@ stub OpenClusterNode +@ stub OpenClusterResource +@ stub PauseClusterNode +@ stub RegisterClusterNotify +@ stub RemoveClusterResourceDependency +@ stub RemoveClusterResourceNode +@ stub RestoreClusterDatabase +@ stub ResumeClusterNode +@ stub SetClusterGroupName +@ stub SetClusterGroupNodeList +@ stub SetClusterName +@ stub SetClusterNetworkName +@ stub SetClusterNetworkPriorityOrder +@ stub SetClusterQuorumResource +@ stub SetClusterResourceName +@ stub SetClusterServiceAccountPassword Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Thu Apr 26 15:28:30 2007 @@ -31,6 +31,9 @@ <directory name="cfgmgr32"> <xi:include href="cfgmgr32/cfgmgr32.rbuild" /> </directory> +<directory name="clusapi"> + <xi:include href="clusapi/clusapi.rbuild" /> +</directory> <directory name="console"> <xi:include href="console/console.rbuild" /> </directory>

1 0

[ekohl] 26512: - Ensure that cursor schemes can be loaded from an unmodified Windows XP. The users "Schemes" key does not exist in this case. - Also use the KEY_QUERY_VALUE access right to open registry keys.
by ekohl＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: ekohl Date: Thu Apr 26 12:28:23 2007 New Revision: 26512 URL: http://svn.reactos.org/svn/reactos?rev=26512&view=rev Log: - Ensure that cursor schemes can be loaded from an unmodified Windows XP. The users "Schemes" key does not exist in this case. - Also use the KEY_QUERY_VALUE access right to open registry keys. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Thu Apr 26 12:28:23 2007 @@ -428,94 +428,96 @@ 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]; 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 (;;) - { - 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) + + /* 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) + { + for (dwIndex = 0;; dwIndex++) { - if (!ProcessedHKLM) - { - RegCloseKey(hCuCursorKey); - dwResult = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cursors\\Schemes"), - 0, KEY_READ, &hCuCursorKey); - if (dwResult == ERROR_SUCCESS) - { - dwIndex = 0; - ProcessedHKLM = TRUE; - LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - continue; - } - } - break; + 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 copy = _tcsdup(szValueData); + + lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)copy); + } } - if (_tcslen(szValueData) > 0) + RegCloseKey(hCursorKey); + } + + /* 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); + + for (dwIndex = 0;; dwIndex++) { - TCHAR * copy = _tcsdup(szValueData); - if (ProcessedHKLM) - { - _tcscat(szValueName, TEXT(" ")); - _tcscat(szValueName, szSystemScheme); - } - lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); - SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)copy); + 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 copy = _tcsdup(szValueData); + _tcscat(szValueName, TEXT(" ")); + _tcscat(szValueName, szSystemScheme); + + lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)copy); + } } - dwIndex++; - } - - RegCloseKey(hCuCursorKey); - RegCloseKey(hCuKey); + RegCloseKey(hCursorKey); + } /* 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); - /* 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) + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\Cursors"), 0, KEY_READ | KEY_QUERY_VALUE, &hCursorKey) == ERROR_SUCCESS) { dwCurrentScheme = sizeof(szCurrentScheme) / sizeof(TCHAR); - if (RegQueryValueEx(hCuCursorKey, NULL, NULL, NULL, (LPBYTE)szCurrentScheme, &dwCurrentScheme)) + if (RegQueryValueEx(hCursorKey, NULL, NULL, NULL, (LPBYTE)szCurrentScheme, &dwCurrentScheme)) szCurrentScheme[0] = 0; - RegCloseKey(hCuCursorKey); + + RegCloseKey(hCursorKey); } /* Search for the matching entry in the cursor scheme list */

1 0

[jimtabor] 26511: Update FontGetObject, point out required modifications to support ENUMLOGFONTEXDVW for font objects.
by jimtabor＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: jimtabor Date: Thu Apr 26 08:34:46 2007 New Revision: 26511 URL: http://svn.reactos.org/svn/reactos?rev=26511&view=rev Log: Update FontGetObject, point out required modifications to support ENUMLOGFONTEXDVW for font objects. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Thu Apr 26 08:34:46 2007 @@ -4108,12 +4108,39 @@ { if( Buffer == NULL ) return sizeof(LOGFONTW); - /* fixme SetLastWin32Error(ERROR_BUFFER_OVERFLOW); in count<0*/ - if (Count < sizeof(LOGFONTW)) return 0; - if (Count > sizeof(LOGFONTW)) Count = sizeof(LOGFONTW); - - RtlCopyMemory(Buffer, &Font->logfont, sizeof(LOGFONTW)); - return sizeof(LOGFONTW); + switch (Count) + { +/* Everything will need to be converted over to ENUMLOGFONTEXDVW. + case sizeof(ENUMLOGFONTEXDVW): + RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer.elfDesignVector, + &Font->logFont.elfDesignVector, + sizeof(DESIGNVECTOR)); + case sizeof(ENUMLOGFONTEXW): + RtlCopyMemory( (LPENUMLOGFONTEXW) Buffer, + &Font->logFont.elfEnumLogfontEx, + sizeof(ENUMLOGFONTEXW)); + break; + + case sizeof(EXTLOGFONTW): + case sizeof(ENUMLOGFONTW): + RtlCopyMemory((LPENUMLOGFONTW) Buffer, + (LPENUMLOGFONTW) &Font->logfont.elfEnumLogfontEx.elfLogFont, + sizeof(ENUMLOGFONTW)); + break; +*/ + case sizeof(LOGFONTW): +/* RtlCopyMemory((LPLOGFONTW) Buffer, + &Font->logFont.elfEnumLogfontEx.elfLogFont, + sizeof(LOGFONTW)); +*/ + RtlCopyMemory(Buffer, &Font->logfont, sizeof(LOGFONTW)); + break; + + default: + SetLastWin32Error(ERROR_BUFFER_OVERFLOW); + return 0; + } + return Count; }

1 0

[jimtabor] 26510: Apply Alex patch to dc.c NtGdiExtGetObject.
by jimtabor＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: jimtabor Date: Thu Apr 26 07:25:42 2007 New Revision: 26510 URL: http://svn.reactos.org/svn/reactos?rev=26510&view=rev Log: Apply Alex patch to dc.c NtGdiExtGetObject. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Apr 26 07:25:42 2007 @@ -1753,9 +1753,11 @@ DC_GET_VAL( INT, NtGdiGetMapMode, w.MapMode ) DC_GET_VAL( INT, NtGdiGetPolyFillMode, w.polyFillMode ) - -INT FASTCALL -IntGdiGetObject(HANDLE Handle, INT cbCount, LPVOID lpBuffer) +INT +FASTCALL +IntGdiGetObject(IN HANDLE Handle, + IN INT cbCount, + IN LPVOID lpBuffer) { PVOID pGdiObject; INT Result = 0; @@ -1808,70 +1810,101 @@ return Result; } -INT STDCALL -NtGdiExtGetObjectW(HANDLE hGdiObj, INT cbCount, LPVOID lpUnsafeBuf) -{ - LPVOID lpSafeBuf; - NTSTATUS Status = STATUS_SUCCESS; - INT RetCount = 0; - - /* From Wine: GetObject does not SetLastError() on a null object */ - if (!hGdiObj) - { - return 0; - } - - if (!lpUnsafeBuf) - { - return IntGdiGetObject(hGdiObj, 0, NULL); - } - - if (!cbCount) - { - return 0; - } - - RetCount = IntGdiGetObject(hGdiObj, cbCount, NULL); - if (!RetCount) - { - return 0; - } - if ((UINT)cbCount > RetCount) - { - cbCount = RetCount; - } - lpSafeBuf = ExAllocatePoolWithTag(PagedPool, RetCount, TAG_GDIOBJ); - if(!lpSafeBuf) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - RetCount = IntGdiGetObject(hGdiObj, cbCount, lpSafeBuf); - if (RetCount) - { - _SEH_TRY - { - ProbeForWrite(lpUnsafeBuf, cbCount, 1); - RtlCopyMemory(lpUnsafeBuf, lpSafeBuf, cbCount); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(lpSafeBuf); - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - - return RetCount; -} - +INT +NTAPI +NtGdiExtGetObjectW(IN HANDLE hGdiObj, + IN INT cbCount, + OUT LPVOID lpBuffer) +{ + INT iRetCount = 0; + INT iObjectType; + INT cbRealCount = cbCount; + union + { + BITMAP bmpObject; + DIBSECTION disObject; + LOGPEN lgpObject; + LOGBRUSH lgbObject; + LOGFONTW lgfObject; + EXTLOGFONTW elgfObject; + } Object; + + // + // Get the object type + // + iObjectType = GDIOBJ_GetObjectType(hGdiObj); + + // + // Check if the given size is too large + // + if (cbCount > sizeof(Object)) + { + // + // Normalize to the largest supported object size + // + DPRINT1("cbCount too big!\n"); + cbCount = sizeof(Object); + } + + // + // Check if this is a brush + // + if (iObjectType == GDI_OBJECT_TYPE_BRUSH) + { + // + // Windows GDI Hack: Manually correct the size + // + cbCount = sizeof(LOGBRUSH); + } + + // + // Now do the actual call + // + iRetCount = IntGdiGetObject(hGdiObj, cbCount, lpBuffer ? &Object : NULL); + + // + // Check if this is a brush + // + if (iObjectType == GDI_OBJECT_TYPE_BRUSH) + { + // + // Fixup the size to account for our previous fixup + // + cbCount = min(cbCount, cbRealCount); + } + + // + // Make sure we have a buffer and a return size + // + if ((iRetCount) && (lpBuffer)) + { + // + // Enter SEH for buffer transfer + // + _SEH_TRY + { + // + // Probe the buffer and copy it + // + ProbeForWrite(lpBuffer, min(cbCount, cbRealCount), sizeof(WORD)); + RtlCopyMemory(lpBuffer, &Object, min(cbCount, cbRealCount)); + } + _SEH_HANDLE + { + // + // Clear the return value. + // Do *NOT* set last error here! + // + iRetCount = 0; + } + _SEH_END; + } + + // + // Return the count + // + return iRetCount; +} DC_GET_VAL( INT, NtGdiGetRelAbs, w.relAbsMode ) DC_GET_VAL( INT, NtGdiGetROP2, w.ROPmode )

1 0

[jimtabor] 26509: GetObject: Don't mix Apples and Oranges! - Reorder A/W structure handling for ColorSpace. - Pointed out the default size to be sent to NtGdiExtGetObjectW.
by jimtabor＠svn.reactos.org 26 Apr '07

26 Apr '07

Author: jimtabor Date: Thu Apr 26 04:37:09 2007 New Revision: 26509 URL: http://svn.reactos.org/svn/reactos?rev=26509&view=rev Log: GetObject: Don't mix Apples and Oranges! - Reorder A/W structure handling for ColorSpace. - Pointed out the default size to be sent to NtGdiExtGetObjectW. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Thu Apr 26 04:37:09 2007 @@ -168,10 +168,27 @@ if(lpwszOutput) RtlInitUnicodeString(&Driver, lpwszOutput); - return NtGdiCreateDC((lpwszDriver ? &Driver : NULL), + HDC hDC = NtGdiCreateDC((lpwszDriver ? &Driver : NULL), (lpwszDevice ? &Device : NULL), (lpwszOutput ? &Output : NULL), (PDEVMODEW)lpInitData); +/* DC_ATTR Tests. + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_DC) + { + PDC_ATTR Dc_Attr; + + GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr); + DPRINT1("Test DC_ATTR -> ! 0x%x\n", Dc_Attr); + + DPRINT1("Test DC_ATTR access! 0x%x\n", Dc_Attr->pvLDC); + Dc_Attr->pvLDC = (PVOID)1; + DPRINT1("Test DC_ATTR access! 0x%x\n", Dc_Attr->pvLDC); + Dc_Attr->pvLDC = (PVOID)0; + DPRINT1("Test DC_ATTR access! 0x%x\n", Dc_Attr->pvLDC); + + } + */ + return hDC; } @@ -405,20 +422,16 @@ case GDI_OBJECT_TYPE_REGION: case GDI_OBJECT_TYPE_METAFILE: case GDI_OBJECT_TYPE_ENHMETAFILE: - case GDI_OBJECT_TYPE_EMF: + case GDI_OBJECT_TYPE_EMF: + case GDI_OBJECT_TYPE_METADC: SetLastError(ERROR_INVALID_HANDLE); return 0; - case GDI_OBJECT_TYPE_COLORSPACE: - SetLastError(ERROR_NOT_SUPPORTED); - return 0; - - case GDI_OBJECT_TYPE_PEN: - case GDI_OBJECT_TYPE_BRUSH: + case GDI_OBJECT_TYPE_PEN: //Check the structures and see if A & W are the same. + case GDI_OBJECT_TYPE_BRUSH: // Mixing Apples and Oranges? case GDI_OBJECT_TYPE_BITMAP: case GDI_OBJECT_TYPE_PALETTE: - case GDI_OBJECT_TYPE_METADC: - if (!lpBuffer) + if (!lpBuffer) // Should pass it all to Win32k and let god sort it out. ;^) { switch(dwType) { @@ -430,12 +443,6 @@ return sizeof(BITMAP); case GDI_OBJECT_TYPE_PALETTE: return sizeof(WORD); - case GDI_OBJECT_TYPE_METADC: - /* Windows does not SetLastError() in this case, more investigation needed */ - return 0; - case GDI_OBJECT_TYPE_COLORSPACE: /* yes, windows acts like this */ - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 60; // FIXME: what structure is this? */ case GDI_OBJECT_TYPE_EXTPEN: /* we don't know the size, ask win32k */ break; default: @@ -443,7 +450,7 @@ return 0; } } - //Handle = GdiFixUpHandle(hGdiObj); new system is not ready + hGdiObj = (HANDLE)GdiFixUpHandle(hGdiObj); return NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); } return 0; @@ -457,13 +464,17 @@ STDCALL GetObjectA(HGDIOBJ hGdiObj, int cbSize, LPVOID lpBuffer) { - EXTLOGFONTW ExtLogFontW; - LOGFONTA LogFontA; - + ENUMLOGFONTEXDVW LogFont; DWORD dwType; - int Result = 0; + INT Result = 0; dwType = GDI_HANDLE_GET_TYPE(hGdiObj);; + + if(dwType == GDI_OBJECT_TYPE_COLORSPACE) //Stays here, processes struct A + { + SetLastError(ERROR_NOT_SUPPORTED); + return 0; + } if (dwType == GDI_OBJECT_TYPE_FONT) { @@ -476,25 +487,35 @@ /* Windows does not SetLastError() */ return 0; } - Result = NtGdiExtGetObjectW(hGdiObj, sizeof(EXTLOGFONTW), &ExtLogFontW); + // ENUMLOGFONTEXDVW is the default size and should be the structure for + // Entry->KernelData for Font objects. + Result = NtGdiExtGetObjectW(hGdiObj, sizeof(ENUMLOGFONTEXDVW), &LogFont); + if (0 == Result) { return 0; } - LogFontW2A(&LogFontA, &ExtLogFontW.elfLogFont); - - /* FIXME: windows writes up to 260 bytes */ - /* What structure is that? */ - if ((UINT)cbSize > 260) - { - cbSize = 260; - } - memcpy(lpBuffer, &LogFontA, cbSize); -/* - During testing of font objects, I passed ENUM/EXT/LOGFONT/EX/W to NtGdiExtGetObjectW. - I think it likes EXTLOGFONTW. So,,, How do we handle the rest when a - caller wants to use E/E/L/E/A structures. Check for size? More research~ - */ + + switch (cbSize) + { + case sizeof(ENUMLOGFONTEXDVA): + // need to move more here. + case sizeof(ENUMLOGFONTEXA): + EnumLogFontExW2A( (LPENUMLOGFONTEXA) lpBuffer, &LogFont.elfEnumLogfontEx ); + break; + + case sizeof(ENUMLOGFONTA): + // Same here, maybe? Check the structures. + case sizeof(EXTLOGFONTA): + // Same here + case sizeof(LOGFONTA): + LogFontW2A((LPLOGFONTA) lpBuffer, &LogFont.elfEnumLogfontEx.elfLogFont); + break; + + default: + SetLastError(ERROR_BUFFER_OVERFLOW); + return 0; + } return cbSize; } @@ -510,8 +531,7 @@ GetObjectW(HGDIOBJ hGdiObj, int cbSize, LPVOID lpBuffer) { DWORD dwType = GDI_HANDLE_GET_TYPE(hGdiObj); - EXTLOGFONTW ExtLogFontW; - int Result = 0; + INT Result = 0; /* Check List: @@ -519,6 +539,11 @@ a font, a palette, a pen, or a device independent bitmap created by calling the CreateDIBSection function." */ + if(dwType == GDI_OBJECT_TYPE_COLORSPACE) //Stays here, processes struct W + { + SetLastError(ERROR_NOT_SUPPORTED); // Not supported yet. + return 0; + } if (dwType == GDI_OBJECT_TYPE_FONT) { @@ -526,24 +551,22 @@ { return sizeof(LOGFONTW); } + if (cbSize == 0) { /* Windows does not SetLastError() */ return 0; } - Result = NtGdiExtGetObjectW(hGdiObj, sizeof(EXTLOGFONTW), &ExtLogFontW); + // Poorly written apps are not ReactOS problem! + // We fix it here if the size is larger than the default size. + if( cbSize > sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW); + + Result = NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); // Should handle the copy. + if (0 == Result) { return 0; } - /* FIXME: windows writes up to 356 bytes */ - /* What structure is that? */ - if ((UINT)cbSize > 356) - { - /* windows seems to delete the font in this case, more investigation needed */ - cbSize = 356; - } - memcpy(lpBuffer, &ExtLogFontW.elfLogFont, cbSize); return cbSize; }

1 0

[dgorbachev] 26508: "Fix" explorer crash.
by dgorbachev＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: dgorbachev Date: Thu Apr 26 03:54:45 2007 New Revision: 26508 URL: http://svn.reactos.org/svn/reactos?rev=26508&view=rev Log: "Fix" explorer crash. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Thu Apr 26 03:54:45 2007 @@ -735,7 +735,7 @@ /* Fill in biSizeImage */ GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); + bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage * 2); /* HACK */ if (bits) {

1 0

[tkreuzer] 26507: - Fix calculation of handle - Add Type column
by tkreuzer＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: tkreuzer Date: Thu Apr 26 02:09:23 2007 New Revision: 26507 URL: http://svn.reactos.org/svn/reactos?rev=26507&view=rev Log: - Fix calculation of handle - Add Type column Modified: trunk/rosapps/devutils/gdihv/gdi.h trunk/rosapps/devutils/gdihv/gdihv.c trunk/rosapps/devutils/gdihv/handlelist.c trunk/rosapps/devutils/gdihv/handlelist.h trunk/rosapps/devutils/gdihv/mainwnd.c trunk/rosapps/devutils/gdihv/proclist.c Modified: trunk/rosapps/devutils/gdihv/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdi.h?rev=2… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdi.h (original) +++ trunk/rosapps/devutils/gdihv/gdi.h Thu Apr 26 02:09:23 2007 @@ -18,11 +18,11 @@ #define GDI_HANDLE_STOCK_MASK 0x00800000 #define GDI_HANDLE_REUSE_MASK 0xff000000 #define GDI_HANDLE_REUSECNT_SHIFT 24 -#define GDI_HANDLE_UPPER_MASK 0xffff0000 +#define GDI_HANDLE_UPPER_MASK 0x0000ffff /* Handle macros */ #define GDI_HANDLE_CREATE(i, t) \ - ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) & GDI_HANDLE_UPPER_MASK))) + ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) << 16))) #define GDI_HANDLE_GET_INDEX(h) \ (((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) Modified: trunk/rosapps/devutils/gdihv/gdihv.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/gdihv.c?rev… ============================================================================== --- trunk/rosapps/devutils/gdihv/gdihv.c (original) +++ trunk/rosapps/devutils/gdihv/gdihv.c Thu Apr 26 02:09:23 2007 @@ -3,7 +3,7 @@ * * gdihv.c * - * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/rosapps/devutils/gdihv/handlelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/handlelist.… ============================================================================== --- trunk/rosapps/devutils/gdihv/handlelist.c (original) +++ trunk/rosapps/devutils/gdihv/handlelist.c Thu Apr 26 02:09:23 2007 @@ -3,7 +3,7 @@ * * handlelist.c * - * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,6 +58,10 @@ column.cx = 80; (void)ListView_InsertColumn(hListCtrl, 6, &column); + column.pszText = L"Type"; + column.cx = 80; + (void)ListView_InsertColumn(hListCtrl, 7, &column); + HandleList_Update(hListCtrl, 0); } @@ -65,6 +69,7 @@ HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessId) { INT i, index; + HANDLE handle; PGDI_TABLE_ENTRY pEntry; LV_ITEM item; TCHAR strText[80]; @@ -91,10 +96,11 @@ wsprintf(strText, L"%d", i); ListView_SetItemText(hHandleListCtrl, index, 1, strText); - wsprintf(strText, L"%#08x", GDI_HANDLE_CREATE(i, pEntry->Type)); + handle = GDI_HANDLE_CREATE(i, pEntry->Type); + wsprintf(strText, L"%#08x", handle); ListView_SetItemText(hHandleListCtrl, index, 2, strText); - str2 = GetTypeName(pEntry->Type & GDI_HANDLE_TYPE_MASK); + str2 = GetTypeName(handle); ListView_SetItemText(hHandleListCtrl, index, 3, str2); wsprintf(strText, L"%#08x", (UINT)pEntry->ProcessId); @@ -105,15 +111,19 @@ wsprintf(strText, L"%#08x", (UINT)pEntry->UserData); ListView_SetItemText(hHandleListCtrl, index, 6, strText); + + wsprintf(strText, L"%#08x", (UINT)pEntry->Type); + ListView_SetItemText(hHandleListCtrl, index, 7, strText); } } } } TCHAR* -GetTypeName(UINT Type) +GetTypeName(HANDLE handle) { TCHAR* strText; + UINT Type = GDI_HANDLE_GET_TYPE(handle); switch (Type) { Modified: trunk/rosapps/devutils/gdihv/handlelist.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/handlelist.… ============================================================================== --- trunk/rosapps/devutils/gdihv/handlelist.h (original) +++ trunk/rosapps/devutils/gdihv/handlelist.h Thu Apr 26 02:09:23 2007 @@ -1,4 +1,4 @@ VOID HandleList_Create(HWND hListCtrl); VOID HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessID); -TCHAR* GetTypeName(UINT Type); +TCHAR* GetTypeName(HANDLE handle); Modified: trunk/rosapps/devutils/gdihv/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/mainwnd.c?r… ============================================================================== --- trunk/rosapps/devutils/gdihv/mainwnd.c (original) +++ trunk/rosapps/devutils/gdihv/mainwnd.c Thu Apr 26 02:09:23 2007 @@ -3,7 +3,7 @@ * * mainwnd.c * - * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/rosapps/devutils/gdihv/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/proclist.c?… ============================================================================== --- trunk/rosapps/devutils/gdihv/proclist.c (original) +++ trunk/rosapps/devutils/gdihv/proclist.c Thu Apr 26 02:09:23 2007 @@ -3,7 +3,7 @@ * * proclist.c * - * Copyright (C) 2007 Timo kreuzer <timo <dot> kreuzer <at> web.de> + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> web.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

1 0

[janderwald] 26506: - add missing rosapps targets
by janderwald＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: janderwald Date: Thu Apr 26 01:48:56 2007 New Revision: 26506 URL: http://svn.reactos.org/svn/reactos?rev=26506&view=rev Log: - add missing rosapps targets Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Apr 26 01:48:56 2007 @@ -420,26 +420,64 @@ modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional modules\vms\server\vmssrv.dll 1 optional modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional +modules\rosapps\avtest\avtest.sys 1 optional modules\rosapps\cmdutils\comp\comp.exe 1 optional modules\rosapps\cmdutils\mode\mode.exe 1 optional modules\rosapps\cmdutils\sort\sort.exe 1 optional modules\rosapps\cmdutils\tee\tee.exe 1 optional modules\rosapps\cmdutils\touch\touch.exe 1 optional +modules\rosapps\cmdutils\uptime\uptime.exe 1 optional modules\rosapps\cmdutils\y\y.exe 1 optional +modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional +modules\rosapps\demos\maze\maze.exe 1 optional +modules\rosapps\devutils\cputointel\cputointel.exe 1 optional +modules\rosapps\devutils\gdb2\gdb2.exe 1 optional +modules\rosapps\devutils\gdihv\gdihv.exe 1 optional +modules\rosapps\devutils\genguid\genguid.exe 1 optional +modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional +modules\rosapps\devutils\zoomin\zoomin.exe 1 optional +modules\rosapps\dflat32\edit.exe 1 optional +modules\rosapps\downloader\downloader.exe 1 optional +modules\rosapps\gettype\gettype.exe 1 optional +modules\rosapps\green\green.sys 1 optional +modules\rosapps\imagesoft\imagesoft.exe 1 optional +modules\rosapps\lib\dflat32\dflat32.dll 1 optional modules\rosapps\mc\mc.exe 1 optional modules\rosapps\net\ncftp\ncftp.exe 1 optional +modules\rosapps\net\netreg\netreg.exe 1 optional modules\rosapps\net\niclist\niclist.exe 1 optional modules\rosapps\notevil\notevil.exe 1 optional modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\packmgr\gui\packmgr.exe 1 optional modules\rosapps\packmgr\lib\package.dll 1 optional +modules\rosapps\ramdrv\ramdrv.sys 1 optional +modules\rosapps\roshttpd\roshttpd.exe 1 optional +modules\rosapps\screenshot\screenshot.exe 1 optional +modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\sysutils\chklib\chklib.exe 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\sysutils\kill\kill.exe 1 optional modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional modules\rosapps\sysutils\man\man.exe 1 optional modules\rosapps\sysutils\pedump\pedump.exe 1 optional modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\sysutils\tcat\cat.exe 1 optional modules\rosapps\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional +modules\rosapps\sysutils\utils\cat\cat.exe 1 optional +modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional +modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional +modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional +modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional +modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional +modules\rosapps\sysutils\utils\ps\ps.exe 1 optional +modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional +modules\rosapps\sysutils\utils\stats\stats.exe 1 optional +modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional +modules\rosapps\templates\dialog.exe 1 optional +modules\rosapps\templates\mdi.exe 1 optional +modules\rosapps\winefile\winefile.exe 1 optional modules\rosapps\winver\winver.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional

1 0

[ekohl] 26505: - Implement the mouse speed and acceleration settings. - Update mouse option settings only if they have changed.
by ekohl＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: ekohl Date: Wed Apr 25 19:22:44 2007 New Revision: 26505 URL: http://svn.reactos.org/svn/reactos?rev=26505&view=rev Log: - Implement the mouse speed and acceleration settings. - Update mouse option settings only if they have changed. Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Pohyb", -1, 5, 5, 230, 60 LTEXT "&Vyberte rychlost ukazatele:", -1, 60, 15, 110, 10 LTEXT "Malá", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Velká", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Zvýit pøesnost ukazatele.", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Pøichytit", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Wed Apr 25 19:22:44 2007 @@ -99,15 +99,15 @@ IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Zeiger Optionen" +CAPTION "Zeigeroptionen" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Bewegung", -1, 5, 5, 230, 60 LTEXT "&Zeigergeschwindigkeit auswählen:", -1, 60, 15, 110, 10 LTEXT "Langsam", -1, 60, 30, 29, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Schnell", -1, 170, 30, 23, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "Z&eigerbeschleunigung verbessern", IDC_CHECK_POINTER_PRECISION, 60, 50, 121, 10 GROUPBOX "Zur Standardschaltfläche springen", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Mouvement", -1, 5, 5, 230, 60 LTEXT "Séle&ctionner une vitesse de curseur :", -1, 40, 15, 120, 10 LTEXT "Lent", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Rapide", -1, 170, 30, 30, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Augmenter la précision du pointeur", IDC_CHECK_POINTER_PRECISION, 40, 50, 130, 10 GROUPBOX "Accrocher", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 40, 80, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Gerakan", -1, 5, 5, 230, 60 LTEXT "Pilih ke&cepatan pointer:", -1, 60, 15, 110, 10 LTEXT "Lambat", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Cepat", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Naikkan ketepatan pointer", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Menempel Ke", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Wed Apr 25 19:22:44 2007 @@ -106,9 +106,9 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Scegli una velocità per il puntatore:", -1, 60, 15, 110, 10 LTEXT "Lento", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Veloce", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Aumenta la precisione del puntatore", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Salta a", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Wed Apr 25 19:22:44 2007 @@ -103,9 +103,9 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/pl-PL.rc Wed Apr 25 19:22:44 2007 @@ -110,9 +110,9 @@ GROUPBOX "Ruch", -1, 5, 5, 230, 60 LTEXT "&Wybierz szybkoæ wskanika:", -1, 60, 15, 110, 10 LTEXT "Wolno", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Szybko", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "Zwiêksz pr&ecyzjê wskanika", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Przyci¹ganie do", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Wed Apr 25 19:22:44 2007 @@ -104,9 +104,9 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Wed Apr 25 19:22:44 2007 @@ -112,9 +112,9 @@ GROUPBOX "Ïåðåì³ùåííÿ", -1, 5, 5, 230, 60 LTEXT "&Âèáåð³òü øâèäê³ñòü ðóõó âêàç³âíèêà:", -1, 60, 15, 110, 10 LTEXT "Íèæ÷å", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Âèùå", -1, 170, 30, 20, 10 - ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Ï³äâèùåíà òî÷í³ñòü âêàç³âíèêà", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Ïðèâ'ÿçêà äî", -1, 5, 65, 230, 40 CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Wed Apr 25 19:22:44 2007 @@ -47,7 +47,8 @@ #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 @@ -83,19 +84,32 @@ } 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; // = 1; - ULONG ulMouseThreshold1; // = DEFAULT_MOUSE_THRESHOLD1; - ULONG ulMouseThreshold2; // = DEFAULT_MOUSE_THRESHOLD2; - - ULONG ulSnapToDefaultButton; - ULONG ulMouseTrails; - ULONG ulShowPointer; - ULONG ulHidePointer; + ULONG ulMouseSpeed; + ULONG ulOrigMouseSpeed; + + MOUSE_ACCEL MouseAccel; + MOUSE_ACCEL OrigMouseAccel; + + BOOL bSnapToDefaultButton; + BOOL bOrigSnapToDefaultButton; + + UINT uMouseTrails; + UINT uOrigMouseTrails; + + BOOL bMouseVanish; + BOOL bOrigMouseVanish; + + BOOL bMouseSonar; + BOOL bOrigMouseSonar; } OPTION_DATA, *POPTION_DATA; @@ -313,7 +327,7 @@ 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; @@ -329,8 +343,8 @@ else if (lResult == BST_UNCHECKED) { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + pButtonData->g_ClickLockEnabled = TRUE; EnableWindow(hDlgCtrl, TRUE); - pButtonData->g_ClickLockEnabled = TRUE; } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -354,20 +368,25 @@ lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_APPLY) { + if (pButtonData->g_OrigSwapMouseButtons != pButtonData->g_SwapMouseButtons) + { + SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + pButtonData->g_OrigSwapMouseButtons = pButtonData->g_SwapMouseButtons; + } + #if (WINVER >= 0x0500) SystemParametersInfo(SPI_SETMOUSECLICKLOCK, pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE); if (pButtonData->g_ClickLockEnabled) SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE); #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); +// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0); SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); } return TRUE; @@ -386,14 +405,14 @@ 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, 0); 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; @@ -1037,16 +1056,20 @@ 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->bOrigDropShadow != pPointerData->bDropShadow) + { + SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + pPointerData->bOrigDropShadow = pPointerData->bDropShadow; + } +//#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_SETDROPSHADOW, 0, (PVOID)pPointerData->bOrigDropShadow, 0); +//#endif } break; @@ -1134,62 +1157,26 @@ { pPointerData->bDropShadow = 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_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, 0); +//#endif +// PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } else { pPointerData->bDropShadow = 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_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, 0); +//#endif + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } break; } return FALSE; -} - - -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; } @@ -1199,10 +1186,9 @@ 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); @@ -1212,20 +1198,54 @@ pOptionData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OPTION_DATA)); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pOptionData); - InitializeMouse(pOptionData); - - /* set mouse sensitivity */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY); + /* 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 */ + if (SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0)) + pOptionData->bSnapToDefaultButton = FALSE; + pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton; + + /* mouse trails */ + if (!SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0)) + pOptionData->uMouseTrails = 0; + pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails; + + /* hide pointer while typing */ + if (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0)) + pOptionData->bMouseVanish = FALSE; + pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish; + + /* show pointer with Ctrl-Key */ + if (!SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0)) + pOptionData->bMouseSonar = FALSE; + 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); - - if (pOptionData->ulMouseSpeed) + SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseSpeed - 1); + + 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); @@ -1234,22 +1254,29 @@ /* 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); + } else - SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseTrails - 2); - - if (pOptionData->ulShowPointer) + { + 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->bMouseVanish) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_HIDE_POINTER); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + + if (pOptionData->bMouseSonar) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SHOW_POINTER); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - if (pOptionData->ulHidePointer) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_HIDE_POINTER); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } break; case WM_DESTROY: @@ -1262,74 +1289,80 @@ 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); + 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; - } + pOptionData->uMouseTrails = (UINT)SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; + } + SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, 0); + break; + + case IDC_CHECK_HIDE_POINTER: + if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_HIDE_POINTER)) + { + pOptionData->bMouseVanish = FALSE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + } + else + { + pOptionData->bMouseVanish = TRUE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->bMouseVanish, 0); break; case IDC_CHECK_SHOW_POINTER: if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOW_POINTER)) { - pOptionData->ulShowPointer = 0; + pOptionData->bMouseSonar = FALSE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else { - pOptionData->ulShowPointer = 1; + pOptionData->bMouseSonar = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - break; - - case IDC_CHECK_HIDE_POINTER: - if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_HIDE_POINTER)) - { - pOptionData->ulHidePointer = 0; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); - } - else - { - pOptionData->ulHidePointer = 1; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - break; + SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->bMouseSonar, 0); + break; + } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -1338,51 +1371,65 @@ lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == PSN_APPLY) { + /* Set mouse speed */ + if (pOptionData->ulOrigMouseSpeed != pOptionData->ulMouseSpeed) + { + SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSpeed, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + pOptionData->ulOrigMouseSpeed = pOptionData->ulMouseSpeed; + } + + if (pOptionData->OrigMouseAccel.nAcceleration != pOptionData->MouseAccel.nAcceleration) + { + 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; + } + + /* 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)) + if (pOptionData->bOrigSnapToDefaultButton != pOptionData->bSnapToDefaultButton) { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); - lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; + SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bSnapToDefaultButton, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton; } - else + + /* Set mouse trails setting */ + if (pOptionData->uOrigMouseTrails != pOptionData->uMouseTrails) { - lResult = 0; + SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails; } - SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); -#endif - - //FIXME - //pointer precision - //SPI_SETMOUSE? - - /* 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); - /* hide pointer while typing */ - SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->ulHidePointer, SPIF_SENDCHANGE); + if (pOptionData->bOrigMouseVanish != pOptionData->bMouseVanish) + { + SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)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, (PVOID)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, (PVOID)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, (PVOID)pOptionData->bOrigMouseVanish, 0); + SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)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)) { @@ -1393,14 +1440,14 @@ 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, (PVOID)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 @@ -1417,14 +1464,14 @@ 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; } Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Wed Apr 25 19:22:44 2007 @@ -57,7 +57,7 @@ #define IDC_EDIT_WHEEL_SCROLL_LINES 2005 #define IDC_UPDOWN_WHEEL_SCROLL_LINES 2006 #define IDC_RADIO_WHEEL_SCROLL_PAGE 2007 -#define IDC_SLIDER_MOUSE_SENSITIVITY 2008 +#define IDC_SLIDER_MOUSE_SPEED 2008 #define IDC_CHECK_SNAP_TO 2009 #define IDC_CHECK_SHOW_POINTER 2010 #define IDC_CHECK_HIDE_POINTER 2011 @@ -70,7 +70,7 @@ #define IDC_CHECK_DROP_SHADOW 2034 #define IDC_IMAGE_SWAP_MOUSE 2035 #define IDC_IMAGE_DOUBLE_CLICK_SPEED 2036 -#define IDC_ICON_MOUSE_SENSITIVITY 2037 +#define IDC_ICON_MOUSE_SPEED 2037 #define IDC_ICON_SNAP_TO 2038 #define IDC_ICON_POINTER_TRAIL 2039 #define IDC_ICON_SHOW_POINTER 2040

1 0

[spetreolle] 26504: winver now lives in rosapps, add it as optional
by spetreolle＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: spetreolle Date: Wed Apr 25 15:03:10 2007 New Revision: 26504 URL: http://svn.reactos.org/svn/reactos?rev=26504&view=rev Log: winver now lives in rosapps, add it as optional Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Apr 25 15:03:10 2007 @@ -440,6 +440,7 @@ modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\sysutils\tcat\cat.exe 1 optional modules\rosapps\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\winver\winver.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
38
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2007