Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[greatlrd] 26343: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sat Apr 14 22:18:31 2007 New Revision: 26343 URL: http://svn.reactos.org/svn/reactos?rev=26343&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/ trunk/reactos/include/dxsdk/ActiveCf.h (with props) trunk/reactos/include/dxsdk/amaudio.h (with props) trunk/reactos/include/dxsdk/amparse.h (with props) trunk/reactos/include/dxsdk/atsmedia.h (with props) trunk/reactos/include/dxsdk/comlite.h (with props) trunk/reactos/include/dxsdk/d3drmwin.h (with props) trunk/reactos/include/dxsdk/dmo.h (with props) trunk/reactos/include/dxsdk/dv.h (with props) trunk/reactos/include/dxsdk/dxsdkver.h (with props) trunk/reactos/include/dxsdk/errors.h (with props) trunk/reactos/include/dxsdk/ksguid.h (with props) trunk/reactos/include/dxsdk/mediaerr.h (with props) Added: trunk/reactos/include/dxsdk/ActiveCf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ActiveCf.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/ActiveCf.h (added) +++ trunk/reactos/include/dxsdk/ActiveCf.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,8 @@ + +typedef struct tagVFW_FILTERLIST +{ + UINT cFilters; + CLSID aClsId[1]; +} VFW_FILTERLIST; + +#define CFSTR_VFW_FILTERLIST "Video for Windows 4 Filters" Propchange: trunk/reactos/include/dxsdk/ActiveCf.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/amaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amaudio.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/amaudio.h (added) +++ trunk/reactos/include/dxsdk/amaudio.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,33 @@ + +#ifndef __AMAUDIO__ +#define __AMAUDIO__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <mmsystem.h> +#include <dsound.h> + +#undef INTERFACE +#define INTERFACE IAMDirectSound + +DECLARE_INTERFACE_(IAMDirectSound,IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(GetDirectSoundInterface)(THIS_ LPDIRECTSOUND *lplpds) PURE; + STDMETHOD(GetPrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(GetSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(ReleaseDirectSoundInterface)(THIS_ LPDIRECTSOUND lpds) PURE; + STDMETHOD(ReleasePrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(ReleaseSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(SetFocusWindow)(THIS_ HWND, BOOL) PURE ; + STDMETHOD(GetFocusWindow)(THIS_ HWND *, BOOL*) PURE ; +}; + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/dxsdk/amaudio.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/amparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amparse.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/amparse.h (added) +++ trunk/reactos/include/dxsdk/amparse.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,22 @@ + +#ifndef __AMPARSE__ +#define __AMPARSE__ + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(IID_IAMParse, 0xC47A3420, 0x005C, 0x11D2, 0x90, 0x38, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x98); + +DECLARE_INTERFACE_(IAMParse, IUnknown) +{ + STDMETHOD(GetParseTime) (THIS_ REFERENCE_TIME *prtCurrent) PURE; + STDMETHOD(SetParseTime) (THIS_ REFERENCE_TIME rtCurrent) PURE; + STDMETHOD(Flush) (THIS) PURE; +}; + +#ifdef __cplusplus +} +#endif +#endif + Propchange: trunk/reactos/include/dxsdk/amparse.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/atsmedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/atsmedia.h (added) +++ trunk/reactos/include/dxsdk/atsmedia.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,17 @@ + +#if !defined(_BDAMEDIA_) + #error BDAMEDIA.H must be included before ATSCMEDIA.H +#endif + +#if !defined(_KSMEDIA_) + #error KSMEDIA.H must be included before BDAMEDIA.H +#endif + +#if !defined(_ATSCMEDIA_) +#define _ATSCMEDIA_ + +#define BDANETWORKTYPE_ATSC DEFINE_GUIDNAMED(BDANETWORKTYPE_ATSC) +#define STATIC_BDANETWORKTYPE_ATSC 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 +DEFINE_GUIDSTRUCT("71985F51-1CA1-11D3-9CC8-00C04F7971E0", BDANETWORKTYPE_ATSC); +#endif + Propchange: trunk/reactos/include/dxsdk/atsmedia.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/comlite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/comlite.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/comlite.h (added) +++ trunk/reactos/include/dxsdk/comlite.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,15 @@ + +#ifndef _INC_COMLITE_ +#define _INC_COMLITE_ +#define QzCLSIDFromString CLSIDFromString +#define QzCreateFilterObject CoCreateInstance +#define QzFreeUnusedLibraries CoFreeUnusedLibraries +#define QzGetMalloc CoGetMalloc +#define QzInitialize CoInitialize +#define QzTaskMemAlloc CoTaskMemAlloc +#define QzTaskMemRealloc CoTaskMemRealloc +#define QzTaskMemFree CoTaskMemFree +#define QzUninitialize CoUninitialize +#define QzStringFromGUID2 StringFromGUID2 + +#endif Propchange: trunk/reactos/include/dxsdk/comlite.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/d3drmwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3drmwin.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/d3drmwin.h (added) +++ trunk/reactos/include/dxsdk/d3drmwin.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,28 @@ + +#ifndef __D3DRMWIN_H__ +#define __D3DRMWIN_H__ + +#ifndef WIN32 +#define WIN32 +#endif + +#include "d3drm.h" +#include "ddraw.h" +#include "d3d.h" + +#undef INTERFACE +#define INTERFACE IDirect3DRMWinDevice + +DECLARE_INTERFACE_(IDirect3DRMWinDevice, IDirect3DRMObject) +{ + IUNKNOWN_METHODS(PURE); + IDIRECT3DRMOBJECT_METHODS(PURE); + STDMETHOD(HandlePaint) (THIS_ HDC hdc) PURE; + STDMETHOD(HandleActivate) (THIS_ WORD wparam) PURE; +}; + +DEFINE_GUID(IID_IDirect3DRMWinDevice, 0xC5016CC0, 0xD273, 0x11CE, 0xAC, 0x48, 0x0, 0x0, 0xC0, 0x38, 0x25, 0xA1); +WIN_TYPES(IDirect3DRMWinDevice, DIRECT3DRMWINDEVICE); + +#endif + Propchange: trunk/reactos/include/dxsdk/d3drmwin.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dmo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmo.h?rev=26… ============================================================================== --- trunk/reactos/include/dxsdk/dmo.h (added) +++ trunk/reactos/include/dxsdk/dmo.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,19 @@ + +#ifndef __DMO_H__ +#define __DMO_H__ + +#include "mediaerr.h" + +#ifdef FIX_LOCK_NAME + #define Lock DMOLock +#endif + +#include "mediaobj.h" + +#ifdef FIX_LOCK_NAME + #undef Lock +#endif + +#include "dmoreg.h" +#include "dmort.h" + Propchange: trunk/reactos/include/dxsdk/dmo.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dv.h?rev=263… ============================================================================== --- trunk/reactos/include/dxsdk/dv.h (added) +++ trunk/reactos/include/dxsdk/dv.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,35 @@ + +#ifndef _DV_H_ +#define _DV_H_ + +typedef struct Tag_DVAudInfo +{ + BYTE bAudStyle[2]; + BYTE bAudQu[2]; + BYTE bNumAudPin; + WORD wAvgSamplesPerPinPerFrm[2]; + WORD wBlkMode; + WORD wDIFMode; + WORD wBlkDiv; + +} DVAudInfo; + +#define DV_AUDIOMODE 0x00000f00 +#define DV_AUDIOQU 0x07000000 +#define DV_AUDIOSMP 0x38000000 +#define DV_CAP_AUD16Bits 0x00 +#define DV_CAP_AUD12Bits 0x01 +#define DV_HD 0x01 +#define DV_DVSD_NTSC_FRAMESIZE 120000 +#define DV_DVSD_PAL_FRAMESIZE 144000 +#define DV_NTSC 0 +#define DV_NTSCPAL 0x00200000 +#define DV_PAL 1 +#define DV_SMCHN 0x0000e000 +#define DV_SD 0x00 +#define DV_SL 0x02 +#define DV_STYPE 0x001f0000 + +#define SIZE_DVINFO 0x20 + +#endif Propchange: trunk/reactos/include/dxsdk/dv.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dxsdkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdkver.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdkver.h (added) +++ trunk/reactos/include/dxsdk/dxsdkver.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,10 @@ +#ifndef _DXSDKVER_H_ + +#define _DXSDKVER_H_ + +#define _DXSDK_PRODUCT_MAJOR 9 +#define _DXSDK_PRODUCT_MINOR 04 +#define _DXSDK_BUILD_MAJOR 91 +#define _DXSDK_BUILD_MINOR 0000 + +#endif Propchange: trunk/reactos/include/dxsdk/dxsdkver.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/errors.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/errors.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/errors.h (added) +++ trunk/reactos/include/dxsdk/errors.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,38 @@ + +#ifndef __ERRORS__ +#define __ERRORS__ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _AMOVIE_ + #define AMOVIEAPI DECLSPEC_IMPORT +#else + #define AMOVIEAPI +#endif + +#define VFW_FIRST_CODE 0x200 +#define MAX_ERROR_TEXT_LEN 160 + +#include <VFWMSGS.H> + +typedef BOOL (WINAPI* AMGETERRORTEXTPROCA)(HRESULT, char *, DWORD); +typedef BOOL (WINAPI* AMGETERRORTEXTPROCW)(HRESULT, WCHAR *, DWORD); + +AMOVIEAPI DWORD WINAPI AMGetErrorTextA( HRESULT hr , char *pbuffer , DWORD MaxLen); +AMOVIEAPI DWORD WINAPI AMGetErrorTextW( HRESULT hr , WCHAR *pbuffer , DWORD MaxLen); + +#ifdef UNICODE + #define AMGetErrorText AMGetErrorTextW + typedef AMGETERRORTEXTPROCW AMGETERRORTEXTPROC; +#else + #define AMGetErrorText AMGetErrorTextA + typedef AMGETERRORTEXTPROCA AMGETERRORTEXTPROC; +#endif + +#ifdef __cplusplus +} +#endif +#endif + Propchange: trunk/reactos/include/dxsdk/errors.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/ksguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ksguid.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/ksguid.h (added) +++ trunk/reactos/include/dxsdk/ksguid.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,18 @@ +#define INITGUID +#include <guiddef.h> + +#ifndef STATICGUIDOF + #define STATICGUIDOF(guid) STATIC_##guid +#endif + +#if !defined( DEFINE_WAVEFORMATEX_GUID ) + #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 +#endif + +#if defined( DEFINE_GUIDEX ) + #undef DEFINE_GUIDEX + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID __declspec(selectany) name = { STATICGUIDOF(name) } +#else + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID __declspec(selectany) name = { STATICGUIDOF(name) } +#endif + Propchange: trunk/reactos/include/dxsdk/ksguid.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/mediaerr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mediaerr.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/mediaerr.h (added) +++ trunk/reactos/include/dxsdk/mediaerr.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,11 @@ + +#ifndef _MEDIAERR_H_ +#define _MEDIAERR_H_ +#define DMO_E_INVALIDSTREAMINDEX 0x80040201 +#define DMO_E_INVALIDTYPE 0x80040202 +#define DMO_E_TYPE_NOT_SET 0x80040203 +#define DMO_E_NOTACCEPTING 0x80040204 +#define DMO_E_TYPE_NOT_ACCEPTED 0x80040205 +#define DMO_E_NO_MORE_ITEMS 0x80040206 +#endif _MEDIAERR_H_ + Propchange: trunk/reactos/include/dxsdk/mediaerr.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgorbachev] 26342: Fix a bug.
by dgorbachev＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: dgorbachev Date: Sat Apr 14 22:07:08 2007 New Revision: 26342 URL: http://svn.reactos.org/svn/reactos?rev=26342&view=rev Log: Fix a bug. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Apr 14 22:07:08 2007 @@ -267,7 +267,7 @@ VmCounters->PeakPagefileUsage = Process->QuotaPeak[2]; /* Set the return length */ - *ReturnLength = sizeof(VM_COUNTERS); + Length = sizeof(VM_COUNTERS); } _SEH_HANDLE {

1 0

[ekohl] 26341: - Fix the mouse wheel page. - Get rid of global variables.
by ekohl＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: ekohl Date: Sat Apr 14 20:12:26 2007 New Revision: 26341 URL: http://svn.reactos.org/svn/reactos?rev=26341&view=rev Log: - Fix the mouse wheel page. - Get rid of global variables. 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 Sat Apr 14 20:12:26 2007 @@ -75,9 +75,14 @@ } BUTTON_DATA, *PBUTTON_DATA; +typedef struct _WHEEL_DATA +{ + UINT uWheelScrollLines; +} WHEEL_DATA, *PWHEEL_DATA; + + ULONG g_Initialized = 0; -UINT g_WheelScrollLines = 5; BOOL g_DropShadow = 0; ULONG g_MouseSensitivity = DEFAULT_MOUSE_SENSITIVITY; @@ -147,9 +152,6 @@ /* snap to default button */ SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &g_SnapToDefaultButton, 0); - - /* wheel scroll lines */ - SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &g_WheelScrollLines, 0); //FIXME //pointer precision @@ -1208,11 +1210,11 @@ static VOID -ShowDialogWheelControls(HWND hwndDlg) +ShowDialogWheelControls(HWND hwndDlg, UINT uWheelScrollLines, BOOL bInit) { HWND hDlgCtrl; - if (g_WheelScrollLines != -1) + if (uWheelScrollLines != WHEEL_PAGESCROLL) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_WHEEL_SCROLL_LINES); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); @@ -1235,10 +1237,14 @@ EnableWindow(hDlgCtrl, FALSE); hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES); - EnableWindow(hDlgCtrl, TRUE); + EnableWindow(hDlgCtrl, FALSE); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_WHEEL_SCROLL_PAGE); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + /* Set the default scroll lines value */ + if (bInit == TRUE) + SetDlgItemInt(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES, DEFAULT_WHEEL_SCROLL_LINES, FALSE); } } @@ -1249,54 +1255,66 @@ IN WPARAM wParam, IN LPARAM lParam) { - HWND hDlgCtrl; - WCHAR buffer[MAX_PATH]; LPPSHNOTIFY lppsn; + PWHEEL_DATA pWheelData; + + pWheelData = (PWHEEL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - ShowDialogWheelControls(hwndDlg); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES), UDM_SETRANGE, 0, MAKELONG ((short) 100, (short) 0)); - if (g_WheelScrollLines != UINT_MAX) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES); - wsprintf(buffer, _T("%d"), g_WheelScrollLines); - SendMessage(hDlgCtrl, WM_SETTEXT, (WPARAM)0, (LPARAM)buffer); + pWheelData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WHEEL_DATA)); + 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; + } + + ShowDialogWheelControls(hwndDlg, pWheelData->uWheelScrollLines, TRUE); + SendDlgItemMessage(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES, UDM_SETRANGE, 0, MAKELONG((short)100, (short)0)); + if (pWheelData->uWheelScrollLines != WHEEL_PAGESCROLL) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES, pWheelData->uWheelScrollLines, FALSE); } return TRUE; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pWheelData); + break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_RADIO_WHEEL_SCROLL_LINES: - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES); - SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)100, (LPARAM)buffer); - g_WheelScrollLines = _wtoi(buffer); - ShowDialogWheelControls(hwndDlg); - break; - } + pWheelData->uWheelScrollLines = GetDlgItemInt(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES, NULL, FALSE); + ShowDialogWheelControls(hwndDlg, pWheelData->uWheelScrollLines, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case IDC_RADIO_WHEEL_SCROLL_PAGE: - { - g_WheelScrollLines = UINT_MAX; - ShowDialogWheelControls(hwndDlg); - break; - } - } - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + pWheelData->uWheelScrollLines = WHEEL_PAGESCROLL; + ShowDialogWheelControls(hwndDlg, pWheelData->uWheelScrollLines, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + + case IDC_EDIT_WHEEL_SCROLL_LINES: + if (pWheelData && HIWORD(wParam) == EN_CHANGE) + { + pWheelData->uWheelScrollLines = GetDlgItemInt(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES, NULL, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } break; case WM_NOTIFY: - lppsn = (LPPSHNOTIFY) lParam; + lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == PSN_APPLY) { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES); - SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)buffer); - g_WheelScrollLines = _wtoi(buffer); - SystemParametersInfo(SPI_SETWHEELSCROLLLINES, g_WheelScrollLines, 0, SPIF_SENDCHANGE); - - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + SystemParametersInfo(SPI_SETWHEELSCROLLLINES, pWheelData->uWheelScrollLines, + 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); return TRUE; } break;

1 0

[spetreolle] 26340: fix swap file caption size
by spetreolle＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: spetreolle Date: Sat Apr 14 19:12:22 2007 New Revision: 26340 URL: http://svn.reactos.org/svn/reactos?rev=26340&view=rev Log: fix swap file caption size Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/sysdm.c Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Sat Apr 14 19:12:22 2007 @@ -189,11 +189,11 @@ LTEXT "", IDC_DRIVE, 88, 81, 100, 9 LTEXT "Espace disponible :", IDC_STATIC, 20, 92, 66, 9 LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 - LTEXT "Taille &Initiale (MB):", -1, 22, 118, 54, 9 - LTEXT "Taille Ma&ximum (MB):", -1, 22, 131, 64, 9 + LTEXT "Taille &Initiale (MB):", -1, 22, 118, 72, 9 + LTEXT "Taille Ma&ximum (MB):", -1, 22, 131, 72, 9 CONTROL "&Taille personnalisée", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 75, 9 - CONTROL "&Taille &gérée par le système", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 98, 9 - CONTROL "&Pas de mémoire virtuelle", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 90,9 + CONTROL "&Taille &gérée par le système", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 100, 9 + CONTROL "&Pas de mémoire virtuelle", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 100,9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE PUSHBUTTON "Régler", IDC_SET, 158, 155, 50, 13 Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Sat Apr 14 19:12:22 2007 @@ -102,7 +102,7 @@ HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; PROPSHEETHEADER psh; HMODULE hNetIdDll; - HPSXA hpsxa; + HPSXA hpsxa = NULL; LONG Ret; static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS};

1 0

[ekohl] 26339: Ooops! Forgot to add the icons!
by ekohl＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: ekohl Date: Sat Apr 14 18:37:27 2007 New Revision: 26339 URL: http://svn.reactos.org/svn/reactos?rev=26339&view=rev Log: Ooops! Forgot to add the icons! Added: trunk/reactos/dll/cpl/main/resources/folder_closed.ico (with props) trunk/reactos/dll/cpl/main/resources/folder_open.ico (with props) trunk/reactos/dll/cpl/main/resources/mouse_left.ico (with props) trunk/reactos/dll/cpl/main/resources/mouse_right.ico (with props) Added: trunk/reactos/dll/cpl/main/resources/folder_closed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/main/resources/folder_closed.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/main/resources/folder_open.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/main/resources/folder_open.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/main/resources/mouse_left.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/main/resources/mouse_left.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/main/resources/mouse_right.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/main/resources/mouse_right.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[ekohl] 26338: - Swap mouse buttons on-the-fly. - Add mouse button preview icons. - Change double click speed on-the-fly. - Add double click test icons. - Fix double click speed calculation. - Get rid of rsrc.rc.
by ekohl＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: ekohl Date: Sat Apr 14 18:26:46 2007 New Revision: 26338 URL: http://svn.reactos.org/svn/reactos?rev=26338&view=rev Log: - Swap mouse buttons on-the-fly. - Add mouse button preview icons. - Change double click speed on-the-fly. - Add double click test icons. - Fix double click speed calculation. - Get rid of rsrc.rc. Removed: trunk/reactos/dll/cpl/main/rsrc.rc 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/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/main.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 Sat Apr 14 18:26:46 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Nastavení tlaèítek", -1, 5, 5, 230, 70 CHECKBOX "Z&amìnit levé a pravé tlaèítko", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Zakrtnutím toto políèka nastavíte pravé tlaèítko jako primární pro funkce jako výbìr nebo pøetaení.", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Zakrtnutím toto políèka nastavíte pravé tlaèítko jako primární pro funkce jako výbìr nebo pøetaení.", -1, 10, 30, 150, 30 GROUPBOX "Rychlost poklepání", -1, 5, 75, 230, 70 - LTEXT "Poklepejte na sloku pro otestování nastavení. Pokud se sloka neotevøe, zkuste nií rychlost.", -1, 10, 85, 160, 30 + LTEXT "Poklepejte na sloku pro otestování nastavení. Pokud se sloka neotevøe, zkuste nií rychlost.", -1, 10, 85, 150, 30 LTEXT "&Rychlost: Malá", -1, 10, 120, 90, 8 LTEXT "Velká", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Funkce ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Zapnout funkci ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 100, 20 PUSHBUTTON "&Nastavení...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -55,17 +55,17 @@ BEGIN GROUPBOX "Tastenkonfiguration", -1, 5, 5, 230, 70 CHECKBOX "&Primäre und sekundäre Taste umschalten", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 145, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Aktivieren Sie dieses Kontrollkästchen, um die rechte Maustaste für primäre Funktionen, wie Auswählen und Ziehen zu verwenden.", -1, 10, 30, 140, 31 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Aktivieren Sie dieses Kontrollkästchen, um die rechte Maustaste für primäre Funktionen, wie Auswählen und Ziehen zu verwenden.", -1, 10, 30, 150, 31 GROUPBOX "Doppelklickgeschwindigkeit", -1, 5, 75, 230, 70 - LTEXT "Doppelklicken Sie auf den Ordner, um die Einstellung zu testen. Verwenden Sie eine langsamere Einstellung, wenn der Ordner sich nicht öffnen oder schließen lässt.", -1, 10, 85, 160, 32 + LTEXT "Doppelklicken Sie auf den Ordner, um die Einstellung zu testen. Verwenden Sie eine langsamere Einstellung, wenn der Ordner sich nicht öffnen oder schließen lässt.", -1, 10, 85, 150, 32 LTEXT "Langsam", -1, 10, 120, 90, 8 LTEXT "Schnell", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "KlickEinrasten", -1, 5, 150, 230, 70 CHECKBOX "&KlickEinrasten aktivieren", IDC_CHECK_CLICK_LOCK, 10, 160, 91, 20 - PUSHBUTTON "&Einstellungen...", IDC_BUTTON_CLICK_LOCK, 167, 160, 53, 10 + PUSHBUTTON "&Einstellungen...", IDC_BUTTON_CLICK_LOCK, 167, 160, 60, 14 LTEXT "Ermöglicht das Markieren oder Ziehen, ohne die Maustaste ständig gedrückt zu halten. Drücken Sie die Maustaste kurzzeitig, um die Funktion zu verwenden. Klicken Sie die Maustaste erneut, um die Tastenfeststellung zu beenden.", -1, 10, 180, 190, 33 END 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 Sat Apr 14 18:26:46 2007 @@ -53,17 +53,17 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 - PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 END 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 Sat Apr 14 18:26:46 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Configuration des boutons", -1, 5, 5, 230, 70 CHECKBOX "&Inverser les boutons gauche et droite", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Cochez cette case pour faire du bouton droit le bouton principal pour les fonctions telles que la sélection et le déplacement.", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Cochez cette case pour faire du bouton droit le bouton principal pour les fonctions telles que la sélection et le déplacement.", -1, 10, 30, 150, 30 GROUPBOX "Vitesse du double-click ", -1, 5, 75, 230, 70 - LTEXT "Double-cliquer le dossier pour tester le paramètre. Si le dossier ne s'ouvre pas ou se ferme, essayez un réglage plus lent.", -1, 10, 85, 135, 30 + LTEXT "Double-cliquer le dossier pour tester le paramètre. Si le dossier ne s'ouvre pas ou se ferme, essayez un réglage plus lent.", -1, 10, 85, 150, 30 LTEXT "Vite&sse: Lente", -1, 10, 120, 90, 8 LTEXT "Rapide", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Verrouillage clic", -1, 5, 150, 230, 70 CHECKBOX "&Activer le Verrouillage clic", IDC_CHECK_CLICK_LOCK, 10, 160, 95, 20 PUSHBUTTON "&Paramètres...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 15 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 Sat Apr 14 18:26:46 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Konfigurasi tombol", -1, 5, 5, 230, 70 CHECKBOX "&Saklar primer dan tombol sekunder", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Pilih kotak centang ini untuk membuat tombol yang benar yang biasa anda pakai fungsi primer seperi memilih dan menggeser", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Pilih kotak centang ini untuk membuat tombol yang benar yang biasa anda pakai fungsi primer seperi memilih dan menggeser", -1, 10, 30, 150, 30 GROUPBOX "Kecepatan klik-dobel", -1, 5, 75, 230, 70 - LTEXT "Klik-dobel folder untuk menguji setelan anda. Jika folder tidak membuka atau menutup, coba menggunakan setelan lebih lambat.", -1, 10, 85, 160, 30 + LTEXT "Klik-dobel folder untuk menguji setelan anda. Jika folder tidak membuka atau menutup, coba menggunakan setelan lebih lambat.", -1, 10, 85, 150, 30 LTEXT "Ke&cepatan: Lambat", -1, 10, 120, 90, 8 LTEXT "Cepat", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Kunci Klik", -1, 5, 150, 230, 70 CHECKBOX "&Hidupkan KunciKlik", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Setelan...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -55,14 +55,14 @@ BEGIN GROUPBOX "Configurazione dei bottoni", -1, 5, 5, 230, 70 CHECKBOX "&Scambia il bottone secondario e primario", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento", -1, 10, 30, 150, 30 GROUPBOX "Velocità del doppio clic", -1, 5, 75, 230, 70 - LTEXT "Fai doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 85, 160, 30 + LTEXT "Fai doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 85, 150, 30 LTEXT "Velocità: Lenta", -1, 10, 120, 90, 8 LTEXT "Veloce", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Blocca clic", -1, 5, 150, 230, 70 CHECKBOX "&Abilita Blocca Clic", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Impostazioni...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -52,14 +52,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 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 Sat Apr 14 18:26:46 2007 @@ -61,14 +61,14 @@ BEGIN GROUPBOX "Êîíô³ãóðàö³ÿ êíîïîê", -1, 5, 5, 230, 70 CHECKBOX "&Ïîì³íÿòè ïðèçíà÷åííÿ êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE - LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü, ùîá ïðèçíà÷èòè ïðàâó êíîïêó äëÿ âèêîíàííÿ òàêèõ îñíîâíèõ ôóíêö³é, ÿê âèá³ð ³ ïåðåòÿãóâàííÿ", -1, 10, 30, 140, 30 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü, ùîá ïðèçíà÷èòè ïðàâó êíîïêó äëÿ âèêîíàííÿ òàêèõ îñíîâíèõ ôóíêö³é, ÿê âèá³ð ³ ïåðåòÿãóâàííÿ", -1, 10, 30, 150, 30 GROUPBOX "Øâèäê³ñòü ïîäâ³éíîãî êëàöàííÿ", -1, 5, 75, 230, 70 - LTEXT "Çðîá³òü ïîäâ³éíå êëàöàííÿ ïî ïàïö³. ßêùî ïàïêà íå â³äêðèâàºòüñÿ àáî íå çàêðèâàºòüñÿ, âèáåð³òü íèæ÷ó øâèäê³ñòü.", -1, 10, 85, 160, 30 + LTEXT "Çðîá³òü ïîäâ³éíå êëàöàííÿ ïî ïàïö³. ßêùî ïàïêà íå â³äêðèâàºòüñÿ àáî íå çàêðèâàºòüñÿ, âèáåð³òü íèæ÷ó øâèäê³ñòü.", -1, 10, 85, 150, 30 LTEXT "&Øâèäê³ñòü: Íèæ÷å", -1, 10, 120, 90, 8 LTEXT "Âèùå", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Çàë³ïàí³ÿ", -1, 5, 150, 230, 70 CHECKBOX "&Â³âìêíóòè Çàë³ïàí³ÿ", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Ïàðàìåòðè...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc (original) +++ trunk/reactos/dll/cpl/main/main.rc Sat Apr 14 18:26:46 2007 @@ -2,6 +2,11 @@ #include <windows.h> #include "resource.h" + + +/* define language neutral resources */ + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sample Control Panel\0" @@ -9,8 +14,25 @@ #define REACTOS_STR_ORIGINAL_FILENAME "main.cpl\0" #include <reactos/version.rc> - IDC_CPLICON_1 ICON "resources/mouse.ico" IDC_CPLICON_2 ICON "resources/keyboard.ico" +IDI_FOLDER_OPEN ICON "resources/folder_open.ico" +IDI_FOLDER_CLOSED ICON "resources/folder_closed.ico" +IDI_MOUSE_LEFT ICON "resources/mouse_left.ico" +IDI_MOUSE_RIGHT ICON "resources/mouse_right.ico" -#include "rsrc.rc" + +/* include localised resources */ + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" 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 Sat Apr 14 18:26:46 2007 @@ -1,6 +1,6 @@ /* * ReactOS - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004, 2007 ReactOS Team * * 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 @@ -27,7 +27,6 @@ //TODO: //detect slider changes - for apply stuff -//implement Double-Click Speed measuring // cursor icon shows - may need overriden items // implement Pointer-APPLY // implement Pointer-Browser @@ -57,15 +56,30 @@ #define MAX_DOUBLE_CLICK_SPEED 900 #define DEFAULT_WHEEL_SCROLL_LINES 3 + +typedef struct _BUTTON_DATA +{ + ULONG g_SwapMouseButtons; + ULONG g_OrigSwapMouseButtons; + ULONG g_DoubleClickSpeed; // = DEFAULT_DOUBLE_CLICK_SPEED; + ULONG g_OrigDoubleClickSpeed; + BOOL g_ClickLockEnabled; // = 0; + DWORD g_ClickLockTime; // = DEFAULT_CLICK_LOCK_TIME; + + HICON hButtonLeft; + HICON hButtonRight; + + HICON hIcon1; + HICON hIcon2; + BOOL bClicked; +} BUTTON_DATA, *PBUTTON_DATA; + + ULONG g_Initialized = 0; UINT g_WheelScrollLines = 5; -ULONG g_SwapMouseButtons = 0; -ULONG g_DoubleClickSpeed = DEFAULT_DOUBLE_CLICK_SPEED; -BOOL g_ClickLockEnabled = 0; BOOL g_DropShadow = 0; -DWORD g_ClickLockTime = DEFAULT_CLICK_LOCK_TIME; ULONG g_MouseSensitivity = DEFAULT_MOUSE_SENSITIVITY; ULONG g_MouseSpeed = 1; ULONG g_MouseThreshold1 = DEFAULT_MOUSE_THRESHOLD1; @@ -96,12 +110,13 @@ TCHAR g_szNewScheme[MAX_PATH]; + /* Property page dialog callback */ static INT_PTR CALLBACK MouseHardwareProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { GUID Guids[1]; Guids[0] = GUID_DEVCLASS_MOUSE; @@ -112,21 +127,20 @@ switch(uMsg) { case WM_INITDIALOG: - { /* create the hardware page */ DeviceCreateHardwarePageEx(hwndDlg, Guids, sizeof(Guids) / sizeof(Guids[0]), HWPD_STANDARDLIST); break; - } } return FALSE; } -BOOL InitializeMouse() +static BOOL +InitializeMouse(VOID) { /* mouse trails */ SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &g_MouseTrails, 0); @@ -147,12 +161,6 @@ /* hide pointer while typing */ SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &g_HidePointer, 0); - /* click lock time */ - SystemParametersInfo(SPI_GETMOUSECLICKLOCK, 0, &g_ClickLockEnabled, 0); - SystemParametersInfo(SPI_GETMOUSECLICKLOCKTIME, 0, &g_ClickLockTime, 0); - - g_DoubleClickSpeed = GetDoubleClickTime(); - g_SwapMouseButtons = GetSystemMetrics(SM_SWAPBUTTON); /* show pointer with Ctrl-Key */ @@ -163,184 +171,235 @@ static INT_PTR CALLBACK ClickLockProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { HWND hDlgCtrl; int pos; - UNREFERENCED_PARAMETER(lParam); + + PBUTTON_DATA pButtonData; + + pButtonData = (PBUTTON_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: - { + pButtonData = (PBUTTON_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pButtonData); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_CLICK_LOCK); SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10)); - pos = (g_ClickLockTime-200) / 200; + pos = (pButtonData->g_ClickLockTime - 200) / 200; SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos); return TRUE; - } + case WM_COMMAND: - { if (LOWORD(wParam) == IDOK) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_CLICK_LOCK); - g_ClickLockTime = (DWORD) (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; + pButtonData->g_ClickLockTime = (DWORD) (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; EndDialog(hwndDlg, TRUE); } else if (LOWORD(wParam) == IDCANCEL) { EndDialog(hwndDlg, FALSE); } - } + break; } return FALSE; } + static INT_PTR CALLBACK ButtonProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { HWND hDlgCtrl; LRESULT lResult; - float pos; LPPSHNOTIFY lppsn; - switch(uMsg) + PBUTTON_DATA pButtonData; + + pButtonData = (PBUTTON_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) { case WM_INITDIALOG: - { - if (InitializeMouse()) - { - if (g_SwapMouseButtons) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_SWAP_MOUSE_BUTTONS); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - if (g_ClickLockEnabled) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_CLICK_LOCK); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_CLICK_LOCK); - EnableWindow(hDlgCtrl, FALSE); - } - hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED); - SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 14)); - pos = ((float)g_DoubleClickSpeed / MAX_DOUBLE_CLICK_SPEED); - pos /= (1.0f/11.0f); - SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(INT)ceil(pos)); - - - } + pButtonData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BUTTON_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pButtonData); + + pButtonData->g_SwapMouseButtons = GetSystemMetrics(SM_SWAPBUTTON); + pButtonData->g_OrigSwapMouseButtons = pButtonData->g_SwapMouseButtons; + pButtonData->g_DoubleClickSpeed = GetDoubleClickTime(); + pButtonData->g_OrigDoubleClickSpeed = pButtonData->g_DoubleClickSpeed; + + /* Click lock time */ + SystemParametersInfo(SPI_GETMOUSECLICKLOCK, 0, &pButtonData->g_ClickLockEnabled, 0); + SystemParametersInfo(SPI_GETMOUSECLICKLOCKTIME, 0, &pButtonData->g_ClickLockTime, 0); + + /* Load mouse button icons */ + pButtonData->hButtonLeft = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MOUSE_LEFT), IMAGE_ICON, 48, 48, LR_DEFAULTCOLOR); + pButtonData->hButtonRight = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MOUSE_RIGHT), IMAGE_ICON, 48, 48, LR_DEFAULTCOLOR); + + /* Load folder icons */ + pButtonData->hIcon1 = LoadImage(hApplet, MAKEINTRESOURCE(IDI_FOLDER_CLOSED), IMAGE_ICON, 48, 48, LR_DEFAULTCOLOR); + pButtonData->hIcon2 = LoadImage(hApplet, MAKEINTRESOURCE(IDI_FOLDER_OPEN), IMAGE_ICON, 48, 48, LR_DEFAULTCOLOR); + + if (pButtonData->g_SwapMouseButtons) + { + SendDlgItemMessage(hwndDlg, IDC_SWAP_MOUSE_BUTTONS, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_IMAGE_SWAP_MOUSE, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hButtonRight); + } + else + { + SendDlgItemMessage(hwndDlg, IDC_IMAGE_SWAP_MOUSE, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hButtonLeft); + } + + if (pButtonData->g_ClickLockEnabled) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_CLICK_LOCK); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + else + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_CLICK_LOCK); + EnableWindow(hDlgCtrl, FALSE); + } + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED); + SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 14)); + SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, 14 - ((pButtonData->g_DoubleClickSpeed - 200) / 50)); + + + SendDlgItemMessage(hwndDlg, IDC_IMAGE_DOUBLE_CLICK_SPEED, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hIcon1); + pButtonData->bClicked = TRUE; return TRUE; - } + + case WM_DESTROY: + DestroyIcon(pButtonData->hButtonLeft); + DestroyIcon(pButtonData->hButtonRight); + DestroyIcon(pButtonData->hIcon1); + DestroyIcon(pButtonData->hIcon2); + HeapFree(GetProcessHeap(), 0, pButtonData); + break; + case WM_COMMAND: - { switch(LOWORD(wParam)) { case IDC_SWAP_MOUSE_BUTTONS: - { lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); if (lResult == BST_CHECKED) { - g_SwapMouseButtons = FALSE; + pButtonData->g_SwapMouseButtons = FALSE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_IMAGE_SWAP_MOUSE, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hButtonLeft); } else if (lResult == BST_UNCHECKED) { - g_SwapMouseButtons = TRUE; + pButtonData->g_SwapMouseButtons = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - break; - } + SendDlgItemMessage(hwndDlg, IDC_IMAGE_SWAP_MOUSE, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hButtonRight); + } + SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_SwapMouseButtons, NULL, SPIF_SENDCHANGE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case IDC_CHECK_CLICK_LOCK: - { lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_CLICK_LOCK); if (lResult == BST_CHECKED) { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); - g_ClickLockEnabled = FALSE; + pButtonData->g_ClickLockEnabled = FALSE; EnableWindow(hDlgCtrl, FALSE); } else if (lResult == BST_UNCHECKED) { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, TRUE); - g_ClickLockEnabled = TRUE; - } - break; + pButtonData->g_ClickLockEnabled = TRUE; + } + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + + case IDC_BUTTON_CLICK_LOCK: + DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CLICK_LOCK), hwndDlg, ClickLockProc, (LPARAM)pButtonData); + break; + + case IDC_IMAGE_DOUBLE_CLICK_SPEED: + if (HIWORD(wParam) == STN_DBLCLK) + { + pButtonData->bClicked = !pButtonData->bClicked; + SendDlgItemMessage(hwndDlg, IDC_IMAGE_DOUBLE_CLICK_SPEED, STM_SETIMAGE, IMAGE_ICON, + (LPARAM)(pButtonData->bClicked ? pButtonData->hIcon1 : pButtonData->hIcon2)); + } + break; + } + break; + + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY) lParam; + if (lppsn->hdr.code == PSN_APPLY) + { +#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); + + /* Reset double click speed setting */ +// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, SPIF_SENDCHANGE); + SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); + } + return TRUE; + + case WM_HSCROLL: + if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED)) + { + switch (LOWORD(wParam)) + { + case TB_LINEUP: + case TB_LINEDOWN: + case TB_PAGEUP: + case TB_PAGEDOWN: + case TB_TOP: + case TB_BOTTOM: + 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); + 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); + SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; } - case IDC_BUTTON_CLICK_LOCK: - { - lResult = DialogBox(hApplet, MAKEINTRESOURCE(IDD_CLICK_LOCK), hwndDlg, ClickLockProc); - if ((INT)lResult == FALSE) - return FALSE; // no need to enable apply button - break; - } - } - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case WM_NOTIFY: - { - lppsn = (LPPSHNOTIFY) lParam; - if (lppsn->hdr.code == PSN_APPLY) - { - /* apply swap mouse button */ - SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, g_SwapMouseButtons, NULL, SPIF_SENDCHANGE); - - /* apply double click speed */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED); - lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0); - g_DoubleClickSpeed = (INT)lResult * 50 + 200; - SystemParametersInfo(SPI_SETDOUBLECLICKTIME, g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE); - -#if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETMOUSECLICKLOCK, g_ClickLockEnabled, NULL, SPIF_SENDCHANGE); - if (g_ClickLockEnabled) - SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, g_ClickLockTime, NULL, SPIF_SENDCHANGE); -#endif - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); - return TRUE; - } - - } - case WM_DRAWITEM: - { - LPDRAWITEMSTRUCT drawItem; - drawItem = (LPDRAWITEMSTRUCT)lParam; - if(drawItem->CtlID == IDC_IMAGE_SWAP_MOUSE) - { - //FIXME - //show mouse with left/right button highlighted - // depending on val g_SwapMouseButtons - return TRUE; - } - else if (drawItem->CtlID == IDC_IMAGE_DOUBLE_CLICK_SPEED) - { - //FIXME - //measure click speed && draw item - } - break; - } - case WM_HSCROLL: - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - } + } + break; + } + return FALSE; } -BOOL ReadActiveCursorScheme() + +#if 0 +static BOOL +ReadActiveCursorScheme(VOID) { HKEY hCuKey; HKEY hCuCursorKey; @@ -359,7 +418,7 @@ RegCloseKey(hCuKey); return FALSE; } - + memset(g_szArrow, 0x0, sizeof(g_szArrow)); memset(g_szHelp, 0x0, sizeof(g_szHelp)); memset(g_szAppStarting, 0x0, sizeof(g_szAppStarting)); @@ -377,12 +436,11 @@ memset(g_szHand, 0x0, sizeof(g_szHand)); dwIndex = 0; - do + 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) break; @@ -418,15 +476,18 @@ _tcsncpy(g_szHand, szValueData, MAX_PATH); dwIndex++; - }while(1); + } RegCloseKey(hCuCursorKey); RegCloseKey(hCuKey); - + return TRUE; } - -BOOL EnumerateCursorSchemes(HWND hwndDlg) +#endif + + +static BOOL +EnumerateCursorSchemes(HWND hwndDlg) { HKEY hCuKey; HKEY hCuCursorKey; @@ -442,9 +503,8 @@ BOOL ProcessedHKLM = FALSE; 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); @@ -455,12 +515,12 @@ SendMessage(hDlgCtrl, CB_RESETCONTENT, 0, 0); dwIndex = 0; - do + 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) { if(!ProcessedHKLM) @@ -479,30 +539,36 @@ } break; } + if(_tcslen(szValueData) > 0) { 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); + } + lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)copy); } dwIndex++; - }while(1); + } RegCloseKey(hCuCursorKey); RegCloseKey(hCuKey); LoadString(hApplet, IDS_NONE, szSystemScheme, MAX_PATH); - SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szSystemScheme); + lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szSystemScheme); + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)NULL); SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); return TRUE; } -void RefreshCursorList(HWND hwndDlg) +static VOID +RefreshCursorList(HWND hwndDlg) { TCHAR szCursorName[MAX_PATH]; HWND hDlgCtrl; @@ -517,12 +583,11 @@ column.mask = LVCF_SUBITEM | LVCF_WIDTH; column.iSubItem = 0; column.cx = 200; - + (void)ListView_InsertColumn(hDlgCtrl, 0, &column); - LoadString(hApplet, IDS_ARROW, szCursorName, MAX_PATH); - + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; listItem.pszText = szCursorName; @@ -534,7 +599,7 @@ (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_HELP, szCursorName, MAX_PATH); - listItem.iItem = index++; + listItem.iItem = index++; (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_APPSTARTING, szCursorName, MAX_PATH); @@ -587,32 +652,37 @@ (void)ListView_InsertItem(hDlgCtrl, &listItem); } -BOOL DeleteUserCursorScheme(TCHAR * szScheme) + +static BOOL +DeleteUserCursorScheme(TCHAR * szScheme) { HKEY hCuKey; HKEY hCuCursorKey; LONG Result; + 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; } + Result = RegDeleteValue(hCuCursorKey, szScheme); RegCloseKey(hCuCursorKey); RegCloseKey(hCuKey); + return (Result == ERROR_SUCCESS); } + static INT_PTR CALLBACK SaveSchemeProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { HWND hDlgCtrl; UNREFERENCED_PARAMETER(lParam); @@ -620,7 +690,6 @@ switch(uMsg) { case WM_COMMAND: - { if (LOWORD(wParam) == IDOK) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_SCHEME_NAME); @@ -631,13 +700,15 @@ { EndDialog(hwndDlg, FALSE); } - } + break; } return FALSE; } -BOOL BrowseCursor(TCHAR * szFileName, HWND hwndDlg) + +static BOOL +BrowseCursor(TCHAR * szFileName, HWND hwndDlg) { //FIXME load text resources from string OPENFILENAME ofn; @@ -662,11 +733,100 @@ } +static VOID +LoadCurrentCursorScheme(LPTSTR lpName, BOOL bSystem) +{ + HKEY hCursorKey; + TCHAR szValue[2048]; + TCHAR szRaw[256]; + DWORD dwValueLen; + LONG lError; + LPTSTR ptrStart, ptrEnd; + INT_PTR len; + int i; + + if (lpName == NULL) + { + memset(g_szArrow, 0x0, sizeof(g_szArrow)); + memset(g_szHelp, 0x0, sizeof(g_szHelp)); + memset(g_szAppStarting, 0x0, sizeof(g_szAppStarting)); + memset(g_szWait, 0x0, sizeof(g_szWait)); + memset(g_szCrosshair, 0x0, sizeof(g_szCrosshair)); + memset(g_szIBeam, 0x0, sizeof(g_szIBeam)); + memset(g_szNWPen, 0x0, sizeof(g_szNWPen)); + memset(g_szNo, 0x0, sizeof(g_szNo)); + memset(g_szSizeNS, 0x0, sizeof(g_szSizeNS)); + memset(g_szSizeWE, 0x0, sizeof(g_szSizeWE)); + memset(g_szSizeNWSE, 0x0, sizeof(g_szSizeNWSE)); + memset(g_szSizeNESW, 0x0, sizeof(g_szSizeNESW)); + memset(g_szSizeAll, 0x0, sizeof(g_szSizeAll)); + memset(g_szUpArrow, 0x0, sizeof(g_szUpArrow)); + memset(g_szHand, 0x0, sizeof(g_szHand)); + } + else + { + if (bSystem) + { + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cursors\\Schemes"), + 0, KEY_READ, &hCursorKey)) + return; + } + else + { + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("Control Panel\\Cursors\\Schemes"), + 0, KEY_READ, &hCursorKey) != ERROR_SUCCESS) + return; + } + + dwValueLen = 2048 * sizeof(TCHAR); + lError = RegQueryValueEx(hCursorKey, lpName, NULL, NULL, (LPBYTE)szValue, &dwValueLen); + + RegCloseKey(hCursorKey); + + if (lError == ERROR_SUCCESS) + { + ptrStart = szValue; + for (i = 0; ; i++) + { + ptrEnd = _tcschr(ptrStart, TEXT(',')); + if (ptrEnd != NULL) + { + len = (ptrEnd - ptrStart) / sizeof(TCHAR); + _tcsncpy(szRaw, ptrStart, len); + szRaw[len] = 0; + } + else + { + _tcscpy(szRaw, ptrStart); + } + + switch (i) + { + case 0: + ExpandEnvironmentStrings(szRaw, g_szArrow, MAX_PATH); + break; + + } + + + + if (ptrEnd == NULL) + break; + + ptrStart = ptrEnd + 1; + } + } + } +} + + static INT_PTR CALLBACK PointerProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { LPPSHNOTIFY lppsn; TCHAR buffer[MAX_PATH]; @@ -679,7 +839,6 @@ switch(uMsg) { case WM_INITDIALOG: - { EnumerateCursorSchemes(hwndDlg); RefreshCursorList(hwndDlg); /* drop shadow */ @@ -693,9 +852,8 @@ return TRUE; else return FALSE; - } + case WM_NOTIFY: - { lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_APPLY) { @@ -706,46 +864,46 @@ return TRUE; } break; - } + case WM_COMMAND: - { switch(HIWORD(wParam)) { case CBN_SELENDOK: { BOOL bEnable; + LPTSTR lpName; + wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); if(wParam == CB_ERR) break; SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted - bEnable = 0; + bEnable = FALSE; else - bEnable = 1; - + bEnable = TRUE; + /* delete button */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); EnableWindow(hDlgCtrl, bEnable); - + + lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); + LoadCurrentCursorScheme(lpName, !bEnable); break; } } - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_BUTTON_SAVEAS_SCHEME: - { - if(DialogBox(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), hwndDlg, SaveSchemeProc)) + if (DialogBox(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), hwndDlg, SaveSchemeProc)) { //FIXME - //save cursor scheme - - } - break; - } + //save cursor scheme + } + break; + case IDC_BUTTON_USE_DEFAULT_CURSOR: - { hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if (lResult != CB_ERR) @@ -782,9 +940,8 @@ memset(g_szHand, 0x0, MAX_PATH * sizeof(TCHAR)); } break; - } + case IDC_BUTTON_BROWSE_CURSOR: - { memset(buffer, 0x0, sizeof(buffer)); hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); @@ -792,7 +949,6 @@ MessageBox(hwndDlg, _T("CB_ERR"), _T(""),MB_ICONERROR); if (BrowseCursor(buffer, hwndDlg)) { - if ((INT)lResult == 0) _tcsncpy(g_szArrow, buffer, MAX_PATH); else if ((INT)lResult == 1) @@ -838,9 +994,8 @@ ReleaseDC(hDlgCtrl, memDC); } break; - } + case IDC_BUTTON_DELETE_SCHEME: - { hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMBO_CURSOR_SCHEME); wParam = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if(wParam == CB_ERR) @@ -852,9 +1007,8 @@ SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); } break; - } + case IDC_CHECK_DROP_SHADOW: - { if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_DROP_SHADOW)) { g_DropShadow = 0; @@ -864,22 +1018,20 @@ { g_DropShadow = 1; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - } - } - break; - } - + } + } + break; } return FALSE; } + static INT_PTR CALLBACK OptionProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { HWND hDlgCtrl; LPPSHNOTIFY lppsn; @@ -888,14 +1040,13 @@ switch(uMsg) { case WM_INITDIALOG: - { if (InitializeMouse()) { /* set mouse sensitivity */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY); SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 19)); SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)g_MouseSensitivity-1); - + if (g_MouseSpeed) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_POINTER_PRECISION); @@ -921,23 +1072,19 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SHOW_POINTER); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - + if (g_HidePointer) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_HIDE_POINTER); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - - } - - break; - } + } + break; + case WM_COMMAND: - { switch(LOWORD(wParam)) { case IDC_CHECK_POINTER_PRECISION: - { if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_PRECISION)) { g_MouseSpeed = 0; @@ -953,9 +1100,8 @@ SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; - } + case IDC_CHECK_SNAP_TO: - { if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SNAP_TO)) { g_SnapToDefaultButton = 0; @@ -967,9 +1113,8 @@ SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; - } + case IDC_CHECK_POINTER_TRAIL: - { hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_TRAIL)) { @@ -983,10 +1128,9 @@ EnableWindow(hDlgCtrl, TRUE); g_MouseTrails = (ULONG) SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; } - break; - } + break; + case IDC_CHECK_SHOW_POINTER: - { if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOW_POINTER)) { g_ShowPointer = 0; @@ -998,9 +1142,8 @@ SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; - } + case IDC_CHECK_HIDE_POINTER: - { if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_HIDE_POINTER)) { g_HidePointer = 0; @@ -1012,27 +1155,27 @@ SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; - } } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; - } + case WM_NOTIFY: - { lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_APPLY) { /* set snap to default button */ SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, g_SnapToDefaultButton, 0, SPIF_SENDCHANGE); - + /* set mouse trails */ if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_TRAIL)) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0); } - else + else + { lResult = 0; + } SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE); @@ -1044,7 +1187,6 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY); lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 1; SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)g_MouseSensitivity, SPIF_SENDCHANGE); - /* hide pointer while typing */ SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)g_HidePointer, SPIF_SENDCHANGE); @@ -1055,17 +1197,18 @@ return TRUE; } break; - } + case WM_HSCROLL: - { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; - } - } + } + return FALSE; } -static void ShowDialogWheelControls(HWND hwndDlg) + +static VOID +ShowDialogWheelControls(HWND hwndDlg) { HWND hDlgCtrl; @@ -1073,7 +1216,7 @@ { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_WHEEL_SCROLL_LINES); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES); EnableWindow(hDlgCtrl, TRUE); @@ -1097,25 +1240,24 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_WHEEL_SCROLL_PAGE); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - -} +} + static INT_PTR CALLBACK WheelProc(IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { HWND hDlgCtrl; WCHAR buffer[MAX_PATH]; LPPSHNOTIFY lppsn; - switch(uMsg) + switch (uMsg) { case WM_INITDIALOG: - { ShowDialogWheelControls(hwndDlg); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES), UDM_SETRANGE, 0, MAKELONG ((short) 100, (short) 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES), UDM_SETRANGE, 0, MAKELONG ((short) 100, (short) 0)); if (g_WheelScrollLines != UINT_MAX) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES); @@ -1123,10 +1265,9 @@ SendMessage(hDlgCtrl, WM_SETTEXT, (WPARAM)0, (LPARAM)buffer); } return TRUE; - } + case WM_COMMAND: - { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_RADIO_WHEEL_SCROLL_LINES: { @@ -1145,9 +1286,8 @@ } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; - } + case WM_NOTIFY: - { lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_APPLY) { @@ -1155,17 +1295,16 @@ SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)buffer); g_WheelScrollLines = _wtoi(buffer); SystemParametersInfo(SPI_SETWHEELSCROLLLINES, g_WheelScrollLines, 0, SPIF_SENDCHANGE); - + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } - - } - + break; } return FALSE; } + LONG APIENTRY MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) 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 Sat Apr 14 18:26:46 2007 @@ -1,9 +1,14 @@ #ifndef __CPL_RESOURCE_H #define __CPL_RESOURCE_H - +/* Icons */ #define IDC_CPLICON_1 100 #define IDC_CPLICON_2 200 + +#define IDI_FOLDER_OPEN 201 +#define IDI_FOLDER_CLOSED 202 +#define IDI_MOUSE_LEFT 203 +#define IDI_MOUSE_RIGHT 204 #define IDD_PAGE_BUTTON 101 #define IDD_PAGE_POINTER 102 Removed: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/rsrc.rc (original) +++ trunk/reactos/dll/cpl/main/rsrc.rc (removed) @@ -1,24 +1,0 @@ - - -#include <windows.h> -#include <commctrl.h> -#include "resource.h" - -/* define language neutral resources */ - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* include localised resources */ - -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc"

1 0

[gedmurphy] 26337: - don't put items to the start menu if they aren't in the OS. this applies to the apps we moved out for trunk builds - remove ibrowser and winefile completely - add devmgmt
by gedmurphy＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: gedmurphy Date: Sat Apr 14 05:09:38 2007 New Revision: 26337 URL: http://svn.reactos.org/svn/reactos?rev=26337&view=rev Log: - don't put items to the start menu if they aren't in the OS. this applies to the apps we moved out for trunk builds - remove ibrowser and winefile completely - add devmgmt Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Sat Apr 14 05:09:38 2007 @@ -490,7 +490,8 @@ { TCHAR sAccessories[256]; TCHAR sGames[256]; - TCHAR szBuffer[MAX_PATH]; + TCHAR szBuffer[MAX_PATH]; + TCHAR Path[MAX_PATH]; # if 0 OutputDebugStringA ("InstallReactOS() called\n"); @@ -527,14 +528,24 @@ /* create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); - /* create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("winefile.lnk"), _T("winefile.exe"), IDS_CMT_WINEFILE); - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("ibrowser.lnk"), _T("ibrowser.exe"), IDS_CMT_IBROWSER); - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Get Firefox.lnk"), _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Download !.lnk"), _T("downloader.exe"), IDS_CMT_DOWNLOADER); + /* create program startmenu shortcuts */ + CreateShortcut(CSIDL_PROGRAMS, NULL, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); + /* workaround to stop empty links for trunk builds */ + if(GetSystemDirectory(szBuffer, MAX_PATH)) + { + _tcscpy(Path, szBuffer); + if((_taccess(_tcscat(Path, _T("\\downloader.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Download !.lnk"), _T("downloader.exe"), IDS_CMT_DOWNLOADER); + + _tcscpy(Path, szBuffer); + if((_taccess(_tcscat(Path, _T("\\getfirefox.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Get Firefox.lnk"), _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); + } + /* create administritive tools startmenu shortcuts */ - CreateShortcut(CSIDL_ADMINTOOLS, NULL, _T("Services.lnk"), _T("servman.exe"), IDS_CMT_SERVMAN); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, _T("Service Manager.lnk"), _T("servman.exe"), IDS_CMT_SERVMAN); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, _T("Device Manager.lnk"), _T("devmgmt.exe"), IDS_CMT_DEVMGMT); /* create and fill Accessories subfolder */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) @@ -542,12 +553,15 @@ CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"), _T("calc.exe"), IDS_CMT_CALC); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"), _T("wordpad.exe"), IDS_CMT_WORDPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("SnapShot.lnk"), _T("screenshot.exe"), IDS_CMT_SCREENSHOT); - } - + if(GetSystemDirectory(szBuffer, MAX_PATH)) + { + _tcscpy(Path, szBuffer); + if((_taccess(_tcscat(Path, _T("\\screenshot.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("SnapShot.lnk"), _T("screenshot.exe"), IDS_CMT_SCREENSHOT); + } + } /* create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Sat Apr 14 05:09:38 2007 @@ -100,7 +100,8 @@ #define IDS_CMT_SERVMAN 3220 #define IDS_CMT_WORDPAD 3221 #define IDS_CMT_SCREENSHOT 3222 -#define IDS_CMT_DOWNLOADER 3223 +#define IDS_CMT_DOWNLOADER 3223 +#define IDS_CMT_DEVMGMT 3224 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301

1 0

[tkreuzer] 26336: NtUserBuildHwndList: - non-recursive implementation, which saves stack space and should be about twice as fast. - use SEH instead of MmCopyToCaller
by tkreuzer＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: tkreuzer Date: Sat Apr 14 04:06:21 2007 New Revision: 26336 URL: http://svn.reactos.org/svn/reactos?rev=26336&view=rev Log: NtUserBuildHwndList: - non-recursive implementation, which saves stack space and should be about twice as fast. - use SEH instead of MmCopyToCaller Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sat Apr 14 04:06:21 2007 @@ -1128,43 +1128,6 @@ return(0); } -STATIC -ULONG -STDCALL -IntBuildHwndList( - PWINDOW_OBJECT Window, - BOOLEAN bChildren, - HWND* pWnd, - ULONG nBufSize) -{ - NTSTATUS Status; - PWINDOW_OBJECT Child; - ULONG dwInc, dwCount = 0; - - for(Child = Window->FirstChild; Child != NULL; Child = Child->NextSibling) - { - if(dwCount++ < nBufSize && pWnd) - { - Status = MmCopyToCaller(pWnd++, &Child->hSelf, sizeof(HWND)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - break; - } - } - if (bChildren) - { - dwInc = IntBuildHwndList(Child, - bChildren, - pWnd, - nBufSize > dwCount ? nBufSize - dwCount : 0); - dwCount += dwInc; - pWnd += dwInc; - } - } - return dwCount; -} - /* * As best as I can figure, this function is used by EnumWindows, * EnumChildWindows, EnumDesktopWindows, & EnumThreadWindows. @@ -1193,7 +1156,7 @@ if (hwndParent || !dwThreadId) { PDESKTOP_OBJECT Desktop; - PWINDOW_OBJECT Window; + PWINDOW_OBJECT Parent, Window; if(!hwndParent) { @@ -1222,16 +1185,55 @@ hDesktop = 0; } - if(!(Window = UserGetWindowObject(hwndParent))) - { - if(hDesktop) + if((Parent = UserGetWindowObject(hwndParent)) && + (Window = Parent->FirstChild)) + { + BOOL bGoDown = TRUE; + + Status = STATUS_SUCCESS; + while(TRUE) { - ObDereferenceObject(Desktop); + if (bGoDown) + { + if(dwCount++ < nBufSize && pWnd) + { + _SEH_TRY + { + ProbeForWrite(pWnd, sizeof(HWND), 1); + *pWnd = Window->hSelf; + pWnd++; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + break; + } + } + if (Window->FirstChild && bChildren) + { + Window = Window->FirstChild; + continue; + } + bGoDown = FALSE; + } + if (Window->NextSibling) + { + Window = Window->NextSibling; + bGoDown = TRUE; + continue; + } + Window = Window->Parent; + if (Window == Parent) + { + break; + } } - return 0; - } - - dwCount = IntBuildHwndList(Window, bChildren, pWnd, nBufSize); + } if(hDesktop) {

1 0

[gedmurphy] 26335: delete cplsample, we have no reason to have a cpl applet shell in our tree
by gedmurphy＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: gedmurphy Date: Sat Apr 14 03:44:07 2007 New Revision: 26335 URL: http://svn.reactos.org/svn/reactos?rev=26335&view=rev Log: delete cplsample, we have no reason to have a cpl applet shell in our tree Removed: trunk/reactos/dll/cpl/cplsample/

1 0

[gedmurphy] 26334: delete vc6 files
by gedmurphy＠svn.reactos.org 13 Apr '07

13 Apr '07

Author: gedmurphy Date: Sat Apr 14 03:43:53 2007 New Revision: 26334 URL: http://svn.reactos.org/svn/reactos?rev=26334&view=rev Log: delete vc6 files Removed: trunk/reactos/dll/cpl/ncpa/ncpa.dsp trunk/reactos/dll/cpl/ncpa/ncpa.dsw Removed: trunk/reactos/dll/cpl/ncpa/ncpa.dsp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.dsp?rev=… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.dsp (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.dsp (removed) @@ -1,136 +1,0 @@ -# Microsoft Developer Studio Project File - Name="ncpa" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ncpa - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ncpa.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ncpa.mak" CFG="ncpa - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ncpa - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ncpa - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ncpa - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ncpa_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "ncpa_EXPORTS" /D "_UNICODE" /D "UNICODE" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_MSC_VER" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib iphlpapi.lib /nologo /dll /machine:I386 /out:"Release/ncpa.cpl" - -!ELSEIF "$(CFG)" == "ncpa - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ncpa_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "ncpa_EXPORTS" /D "_UNICODE" /D "UNICODE" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_MSC_VER" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"Debug/ncpa.cpl" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "ncpa - Win32 Release" -# Name "ncpa - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Makefile -# End Source File -# Begin Source File - -SOURCE=.\ncpa.c -# End Source File -# Begin Source File - -SOURCE=.\ncpa.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\tcpip_properties.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ncpa.def -# End Source File -# Begin Source File - -SOURCE=.\ncpa.rc -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\resources\applet.ico -# End Source File -# End Group -# End Target -# End Project Removed: trunk/reactos/dll/cpl/ncpa/ncpa.dsw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.dsw?rev=… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.dsw (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.dsw (removed) @@ -1,29 +1,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ncpa"=.\ncpa.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### -

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
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