Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[dgorbachev] 43317: Fix my stupid mistake, made in r43169. Bug #4863. Thanks to Gabriel & Victor.
by dgorbachev＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: dgorbachev Date: Wed Oct 7 03:41:53 2009 New Revision: 43317 URL: http://svn.reactos.org/svn/reactos?rev=43317&view=rev Log: Fix my stupid mistake, made in r43169. Bug #4863. Thanks to Gabriel & Victor. Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Wed Oct 7 03:41:53 2009 @@ -5,6 +5,7 @@ #include <reactos/version.rc> #include "windows.h" +#include "errcodes.rc" #include "locale_rc.rc"

1 0

[mkupfer] 43316: - fix typo in registry key name - fix wrong argument order in SystemParametersInfo call - use static variables instead of multiple strings - fix wrong pointer access in sysparams
by mkupfer＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: mkupfer Date: Wed Oct 7 02:07:30 2009 New Revision: 43316 URL: http://svn.reactos.org/svn/reactos?rev=43316&view=rev Log: - fix typo in registry key name - fix wrong argument order in SystemParametersInfo call - use static variables instead of multiple strings - fix wrong pointer access in sysparams Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -30,7 +30,7 @@ HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 -HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80 +HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400" HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3" Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -30,7 +30,7 @@ HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 -HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80 +HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400" HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3" Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -384,9 +384,9 @@ //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); #if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETMOUSECLICKLOCK, pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, &pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); if (pButtonData->g_ClickLockEnabled) - SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); #endif } else if (lppsn->hdr.code == PSN_RESET) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -70,6 +70,7 @@ #if (_WIN32_WINNT >= 0x0600) static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars"; #endif +static const WCHAR* VAL_USERPREFMASK = L"UserPreferencesMask"; static const WCHAR* KEY_MDALIGN = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; static const WCHAR* VAL_MDALIGN = L"MenuDropAlignment"; @@ -515,7 +516,7 @@ SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl) { DWORD dwRegMask; - BOOL bValue = pvValue ? 1 : 0; + BOOL bValue = *(BOOL *)pvValue; REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); @@ -527,7 +528,7 @@ { /* Read current value */ RegReadUserSetting(KEY_DESKTOP, - L"UserPreferencesMask", + VAL_USERPREFMASK, REG_BINARY, &dwRegMask, sizeof(DWORD)); @@ -537,7 +538,7 @@ /* write back value */ RegWriteUserSetting(KEY_DESKTOP, - L"UserPreferencesMask", + VAL_USERPREFMASK, REG_BINARY, &dwRegMask, sizeof(DWORD));

1 0

[janderwald] 43315: - Implement MIXER_GETLINEINFOF_COMPONENTTYPE for WdmAudGetLineInfo - Implement MIXER_GETLINECONTROLSF_ONEBYID for WdmAudGetLineControls - Clear MIXER_OBJECTF_HMIXER from Flags - Fix a bug SetGetVolumeControlDetails which fixes retrieving current volume level (verified by sndvol32.exe from XP / mmsys.cpl ReactOS)
by janderwald＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: janderwald Date: Tue Oct 6 20:16:21 2009 New Revision: 43315 URL: http://svn.reactos.org/svn/reactos?rev=43315&view=rev Log: - Implement MIXER_GETLINEINFOF_COMPONENTTYPE for WdmAudGetLineInfo - Implement MIXER_GETLINECONTROLSF_ONEBYID for WdmAudGetLineControls - Clear MIXER_OBJECTF_HMIXER from Flags - Fix a bug SetGetVolumeControlDetails which fixes retrieving current volume level (verified by sndvol32.exe from XP / mmsys.cpl ReactOS) Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Tue Oct 6 20:16:21 2009 @@ -96,9 +96,12 @@ { if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) { - *MixerLine = MixerLineSrc; - *MixerControl = &MixerLineSrc->LineControls[Index]; - *NodeId = MixerLineSrc->NodeIds[Index]; + if (MixerLine) + *MixerLine = MixerLineSrc; + if (MixerControl) + *MixerControl = &MixerLineSrc->LineControls[Index]; + if (NodeId) + *NodeId = MixerLineSrc->NodeIds[Index]; return STATUS_SUCCESS; } } @@ -108,7 +111,28 @@ return STATUS_NOT_FOUND; } - +LPMIXERLINE_EXT +GetSourceMixerLineByComponentType( + LPMIXER_INFO MixerInfo, + DWORD dwComponentType) +{ + PLIST_ENTRY Entry; + LPMIXERLINE_EXT MixerLineSrc; + + /* get first entry */ + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); + if (MixerLineSrc->Line.dwComponentType == dwComponentType) + return MixerLineSrc; + + Entry = Entry->Flink; + } + + return NULL; +} LPMIXERLINE_EXT GetSourceMixerLineByLineId( @@ -1761,6 +1785,8 @@ /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; + if (DeviceInfo->Flags == MIXER_GETLINEINFOF_DESTINATION) { if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) @@ -1822,7 +1848,21 @@ RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } - + else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_COMPONENTTYPE) + { + if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + { + /* invalid parameter */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + MixerLineSrc = GetSourceMixerLineByComponentType(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwComponentType); + ASSERT(MixerLineSrc); + + /* copy cached data */ + RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); + } DPRINT1("Flags %x\n", DeviceInfo->Flags); UNIMPLEMENTED; @@ -1841,11 +1881,15 @@ IN PWDMAUD_CLIENT ClientInfo) { LPMIXERLINE_EXT MixerLineSrc; + LPMIXERCONTROLW MixerControl; PWDMAUD_DEVICE_EXTENSION DeviceExtension; ULONG Index; + NTSTATUS Status; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ALL) { @@ -1887,6 +1931,22 @@ DPRINT1("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", DeviceInfo->u.MixControls.dwControlType, DeviceInfo->u.MixControls.dwLineID, MixerLineSrc->Line.cControls); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, sizeof(WDMAUD_DEVICE_INFO)); } + else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYID) + { + if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + { + /* invalid parameter */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); + if (NT_SUCCESS(Status)) + { + RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); + } + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + } + UNIMPLEMENTED; //DbgBreakPoint(); @@ -2042,7 +2102,7 @@ { for(Index = 0; Index < VolumeData->ValuesCount; Index++) { - if (VolumeData->Values[Index] < Value) + if (VolumeData->Values[Index] > Value) { /* FIXME SEH */ Input->dwValue = VolumeData->InputSteppingDelta * Index; @@ -2069,6 +2129,8 @@ PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; + DPRINT("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags); @@ -2119,6 +2181,8 @@ PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; + DPRINT("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags);

1 0

[janderwald] 43314: - Fix creation of mixer pin
by janderwald＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: janderwald Date: Tue Oct 6 11:55:19 2009 New Revision: 43314 URL: http://svn.reactos.org/svn/reactos?rev=43314&view=rev Log: - Fix creation of mixer pin Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Tue Oct 6 11:55:19 2009 @@ -227,7 +227,7 @@ /* Query pin data ranges */ Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)PinRequest, sizeof(KSP_PIN), NULL, 0, &BytesReturned); - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status != STATUS_MORE_ENTRIES) { /* Failed to data ranges */ return Status;

1 0

[janderwald] 43313: - Partly implement WIDM_ADDBUFFER
by janderwald＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: janderwald Date: Tue Oct 6 11:54:10 2009 New Revision: 43313 URL: http://svn.reactos.org/svn/reactos?rev=43313&view=rev Log: - Partly implement WIDM_ADDBUFFER Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Tue Oct 6 11:54:10 2009 @@ -47,6 +47,7 @@ case WIDM_GETDEVCAPS : { + Result = MmeGetSoundDeviceCapabilities(WAVE_IN_DEVICE_TYPE, DeviceId, (PVOID) Parameter1, @@ -89,6 +90,13 @@ Result = MmeResetWavePlayback(PrivateHandle); break; } + + case WIDM_ADDBUFFER : + { + Result = MmeWriteWaveHeader(PrivateHandle, Parameter1); + break; + } + } SND_TRACE(L"widMessage returning MMRESULT %d\n", Result);

1 0

[mkupfer] 43312: - bind (almost all) mouse settings to system and registry and fixup sysparams
by mkupfer＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: mkupfer Date: Tue Oct 6 11:02:31 2009 New Revision: 43312 URL: http://svn.reactos.org/svn/reactos?rev=43312&view=rev Log: - bind (almost all) mouse settings to system and registry and fixup sysparams Modified: trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/subsystems/win32/win32k/include/sysparams.h trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Tue Oct 6 11:02:31 2009 @@ -333,6 +333,7 @@ SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); SendDlgItemMessage(hwndDlg, IDC_IMAGE_SWAP_MOUSE, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hButtonRight); } + //SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_SwapMouseButtons, NULL, 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -379,6 +380,8 @@ SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); } + SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); #if (WINVER >= 0x0500) SystemParametersInfo(SPI_SETMOUSECLICKLOCK, pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE); @@ -392,8 +395,8 @@ SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, 0); /* Reset double click speed setting */ -// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0); - SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); + SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0); + //SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); } return TRUE; @@ -411,14 +414,14 @@ case TB_ENDTRACK: lResult = SendDlgItemMessage(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED, TBM_GETPOS, 0, 0); pButtonData->g_DoubleClickSpeed = (14 - (INT)lResult) * 50 + 200; -// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, 0); + //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case TB_THUMBTRACK: pButtonData->g_DoubleClickSpeed = (14 - (INT)HIWORD(wParam)) * 50 + 200; -// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, 0); + //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, 0); SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -1412,23 +1415,19 @@ pOptionData->OrigMouseAccel.nThreshold2 = pOptionData->MouseAccel.nThreshold2; /* snap to default button */ - if (SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0)) - pOptionData->bSnapToDefaultButton = FALSE; + SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0); pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton; /* mouse trails */ - if (!SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0)) - pOptionData->uMouseTrails = 0; + SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0); pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails; /* hide pointer while typing */ - if (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0)) - pOptionData->bMouseVanish = FALSE; + SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0); pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish; /* show pointer with Ctrl-Key */ - if (!SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0)) - pOptionData->bMouseSonar = FALSE; + SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0); pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar; /* Set mouse speed */ @@ -1744,10 +1743,7 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pWheelData); /* Get wheel scroll lines */ - if (!SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &pWheelData->uWheelScrollLines, 0)) - { - pWheelData->uWheelScrollLines = DEFAULT_WHEEL_SCROLL_LINES; - } + SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &pWheelData->uWheelScrollLines, 0); ShowDialogWheelControls(hwndDlg, pWheelData->uWheelScrollLines, TRUE); SendDlgItemMessage(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES, UDM_SETRANGE, 0, MAKELONG((short)100, (short)0)); Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] Tue Oct 6 11:02:31 2009 @@ -31,6 +31,7 @@ UPM_TOOLTIPANIMATION = 0x800, UPM_TOOLTIPFADE = 0x1000, UPM_CURSORSHADOW = 0x2000, + UPM_CLICKLOCK = 0x8000, // room for more UPM_UIEFFECTS = 0x80000000, UPM_DEFAULT = 0x80003E9E Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Oct 6 11:02:31 2009 @@ -66,6 +66,7 @@ static const WCHAR* VAL_DRAGWIDTH = L"DragWidth"; static const WCHAR* VAL_FNTSMOOTH = L"FontSmoothing"; static const WCHAR* VAL_SCRLLLINES = L"WheelScrollLines"; +static const WCHAR* VAL_CLICKLOCKTIME = L"ClickLockTime"; #if (_WIN32_WINNT >= 0x0600) static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars"; #endif @@ -94,6 +95,18 @@ /** Loading the settings ******************************************************/ + +static +INT +SpiLoadDWord(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) +{ + DWORD Result; + if (!RegReadUserSetting(pwszKey, pwszValue, REG_DWORD, &Result, sizeof(Result))) + { + return iValue; + } + return Result; +} static INT @@ -235,6 +248,7 @@ /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); + gspv.dwMouseClickLockTime = SpiLoadDWord(KEY_DESKTOP, VAL_CLICKLOCKTIME, 1200); #if (_WIN32_WINNT >= 0x0600) gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); #endif @@ -299,6 +313,17 @@ static VOID +SpiStoreDWord(PCWSTR pwszKey, PCWSTR pwszValue, DWORD Value) +{ + RegWriteUserSetting(pwszKey, + pwszValue, + REG_DWORD, + &Value, + sizeof(Value)); +} + +static +VOID SpiStoreSz(PCWSTR pwszKey, PCWSTR pwszValue, PCWSTR pwsz) { RegWriteUserSetting(pwszKey, @@ -442,6 +467,19 @@ if (fl & SPIF_UPDATEINIFILE) { SpiStoreSzInt(pwszKey, pwszValue, iValue); + } + return (UINT_PTR)pwszKey; +} + +static inline +UINT_PTR +SpiSetDWord(PVOID pvData, INT iValue, PCWSTR pwszKey, PCWSTR pwszValue, FLONG fl) +{ + REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); + *(INT*)pvData = iValue; + if (fl & SPIF_UPDATEINIFILE) + { + SpiStoreDWord(pwszKey, pwszValue, iValue); } return (UINT_PTR)pwszKey; } @@ -1268,10 +1306,10 @@ return SpiSetBool(&gspv.bMouseSonar, uiParam, KEY_MOUSE, L"", fl); case SPI_GETMOUSECLICKLOCK: - return SpiGetInt(pvParam, &gspv.bMouseClickLock, fl); + return SpiGetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_SETMOUSECLICKLOCK: - return SpiSetBool(&gspv.bMouseClickLock, uiParam, KEY_MOUSE, L"", fl); + return SpiSetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_GETMOUSEVANISH: return SpiGetInt(pvParam, &gspv.bMouseVanish, fl); @@ -1351,7 +1389,7 @@ return SpiGetInt(pvParam, &gspv.dwMouseClickLockTime, fl); case SPI_SETMOUSECLICKLOCKTIME: - return SpiSetInt(&gspv.dwMouseClickLockTime, uiParam, KEY_MOUSE, L"", fl); + return SpiSetDWord(&gspv.dwMouseClickLockTime, uiParam, KEY_DESKTOP, VAL_CLICKLOCKTIME, fl); case SPI_GETFONTSMOOTHINGTYPE: return SpiGetInt(pvParam, &gspv.uiFontSmoothingType, fl);

1 0

[janderwald] 43311: - Implement WIDM_OPEN, WIDM_CLOSE, WIDM_PREPARE, WIDM_UNPREPARE, WIDM_RESET for wave in devices - Original code by Silverblade
by janderwald＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: janderwald Date: Tue Oct 6 10:47:27 2009 New Revision: 43311 URL: http://svn.reactos.org/svn/reactos?rev=43311&view=rev Log: - Implement WIDM_OPEN, WIDM_CLOSE, WIDM_PREPARE, WIDM_UNPREPARE, WIDM_RESET for wave in devices - Original code by Silverblade Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Tue Oct 6 10:47:27 2009 @@ -53,6 +53,42 @@ Parameter2); break; } + case WIDM_OPEN : + { + Result = MmeOpenWaveDevice(WAVE_IN_DEVICE_TYPE, + DeviceId, + (LPWAVEOPENDESC) Parameter1, + Parameter2, + (DWORD*) PrivateHandle); + break; + } + + case WIDM_CLOSE : + { + Result = MmeCloseDevice(PrivateHandle); + + break; + } + + case WIDM_PREPARE : + { + /* TODO: Do we need to pass 2nd parameter? */ + Result = MmePrepareWaveHeader(PrivateHandle, Parameter1); + break; + } + + case WIDM_UNPREPARE : + { + Result = MmeUnprepareWaveHeader(PrivateHandle, Parameter1); + break; + } + + case WIDM_RESET : + { + /* Stop playback, reset position to zero */ + Result = MmeResetWavePlayback(PrivateHandle); + break; + } } SND_TRACE(L"widMessage returning MMRESULT %d\n", Result);

1 0

[jimtabor] 43310: - Remove Thread from event structure and substitute with thread info from head structure.
by jimtabor＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: jimtabor Date: Tue Oct 6 06:22:11 2009 New Revision: 43310 URL: http://svn.reactos.org/svn/reactos?rev=43310&view=rev Log: - Remove Thread from event structure and substitute with thread info from head structure. Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/ntuser/event.c Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Tue Oct 6 06:22:11 2009 @@ -17,7 +17,6 @@ { THROBJHEAD head; LIST_ENTRY Chain; /* Event chain entry */ - PETHREAD Thread; /* Thread owning the event */ UINT eventMin; UINT eventMax; DWORD idProcess; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Tue Oct 6 06:22:11 2009 @@ -112,15 +112,15 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage(((PTHREADINFO)pEH->Thread->Tcb.Win32Thread)->MessageQueue, - hwnd, - event, - 0, - (LPARAM)&EP, - 5000, - TRUE, - MSQ_ISEVENT, - &uResult); + Status = co_MsqSendMessage( pEH->head.pti->MessageQueue, + hwnd, + event, + 0, + (LPARAM)&EP, + 5000, + TRUE, + MSQ_ISEVENT, + &uResult); return NT_SUCCESS(Status) ? uResult : 0; } @@ -199,7 +199,7 @@ // Must be inside the event window. if ( (pEH->eventMin <= Event) && (pEH->eventMax >= Event)) { - if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) + if (pEH->head.pti->pEThread != PsGetCurrentThread()) { // if all process || all thread || other thread same process if (!(pEH->idProcess) || !(pEH->idThread) || (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess)) @@ -330,11 +330,10 @@ GlobalEvents->Counts++; UserHMGetHandle(pEH) = Handle; -// pEH->head.pti =? if (Thread) - pEH->Thread = Thread; + pEH->head.pti = Thread->Tcb.Win32Thread; else - pEH->Thread = PsGetCurrentThread(); + pEH->head.pti = GetW32ThreadInfo(); pEH->eventMin = eventMin; pEH->eventMax = eventMax; pEH->idProcess = idProcess;

1 0

[jimtabor] 43309: - Set Process, pass keyboard handle and enable check for user hooks.
by jimtabor＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: jimtabor Date: Tue Oct 6 05:38:23 2009 New Revision: 43309 URL: http://svn.reactos.org/svn/reactos?rev=43309&view=rev Log: - Set Process, pass keyboard handle and enable check for user hooks. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Tue Oct 6 05:38:23 2009 @@ -41,6 +41,9 @@ /* SEH Support with PSEH */ #include <pseh/pseh2.h> + +#define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) +#define ISITHOOKED(HookId) (GetWin32ClientInfo()->fsHooks & HOOKID_TO_FLAG(HookId)) /* Temporarily in here for now. */ typedef struct _USERAPIHOOKINFO Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Tue Oct 6 05:38:23 2009 @@ -121,7 +121,6 @@ typedef struct _USER32_THREAD_DATA { MSG LastMessage; - HKL KeyboardLayoutHandle; USER32_TRACKINGLIST tracking_info; /* TrackMouseEvent stuff */ } USER32_THREAD_DATA, *PUSER32_THREAD_DATA; Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Oct 6 05:38:23 2009 @@ -667,14 +667,14 @@ DeleteObject(DesktopRgn); } } -//#if 0 -// if (ISITHOOKED(WH_CBT)) + + if (ISITHOOKED(WH_CBT)) { LRESULT lResult; NtUserMessageCall( hwnd, WM_CBT, HCBT_MOVESIZE, (LPARAM)&sizingRect, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); if (lResult) moved = FALSE; } -//#endif + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 ); SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L); @@ -756,14 +756,13 @@ if (!IsWindowEnabled( hWnd )) return 0; -//#if 0 -// if (ISITHOOKED(WH_CBT)) + if (ISITHOOKED(WH_CBT)) { LRESULT lResult; NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); if (lResult) return 0; } -//#endif + switch (wParam & 0xfff0) { case SC_MOVE: Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue Oct 6 05:38:23 2009 @@ -129,6 +129,7 @@ Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; } + Win32Process->peProcess = Process; /* setup process flags */ Win32Process->W32PF_flags = 0; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue Oct 6 05:38:23 2009 @@ -492,6 +492,7 @@ pci->pClientThreadInfo = NULL; // FIXME Need to set it in desktop.c! pci->ppi = ppi; pci->fsHooks = pti->fsHooks; + pci->hKL = pti->KeyboardLayout->hkl; /* CI may not have been initialized. */ if (!pci->pDeskInfo && pti->pDeskInfo) {

1 0

[mkupfer] 43308: - use static variables instead of multiple strings
by mkupfer＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: mkupfer Date: Mon Oct 5 23:00:44 2009 New Revision: 43308 URL: http://svn.reactos.org/svn/reactos?rev=43308&view=rev Log: - use static variables instead of multiple strings Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Oct 5 23:00:44 2009 @@ -119,7 +119,7 @@ static INT -SpiLoadMetric(LPWSTR pwszValue, INT iValue) +SpiLoadMetric(PCWSTR pwszValue, INT iValue) { INT iRegVal; @@ -200,7 +200,7 @@ /* Load NONCLIENTMETRICS */ gspv.ncm.cbSize = sizeof(NONCLIENTMETRICSW); - gspv.ncm.iBorderWidth = SpiLoadMetric(L"BorderWidth", 1); + gspv.ncm.iBorderWidth = SpiLoadMetric(VAL_BORDER, 1); gspv.ncm.iScrollWidth = SpiLoadMetric(L"ScrollWidth", 16); gspv.ncm.iScrollHeight = SpiLoadMetric(L"ScrollHeight", 16); gspv.ncm.iCaptionWidth = SpiLoadMetric(L"CaptionWidth", 19); @@ -227,9 +227,9 @@ /* Load ICONMETRICS */ gspv.im.cbSize = sizeof(ICONMETRICSW); - gspv.im.iHorzSpacing = SpiLoadMetric(L"IconSpacing", 64); - gspv.im.iVertSpacing = SpiLoadMetric(L"IconVerticalspacing", 64); - gspv.im.iTitleWrap = SpiLoadMetric(L"IconTitleWrap", 0); + gspv.im.iHorzSpacing = SpiLoadMetric(VAL_ICONSPC, 64); + gspv.im.iVertSpacing = SpiLoadMetric(VAL_ICONVSPC, 64); + gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 0); SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); /* Load desktop settings */ @@ -788,7 +788,7 @@ return 0; if (fl & SPIF_UPDATEINIFILE) { - SpiStoreMetric(L"BorderWidth", gspv.ncm.iBorderWidth); + SpiStoreMetric(VAL_BORDER, gspv.ncm.iBorderWidth); SpiStoreMetric(L"ScrollWidth", gspv.ncm.iScrollWidth); SpiStoreMetric(L"ScrollHeight", gspv.ncm.iScrollHeight); SpiStoreMetric(L"CaptionWidth", gspv.ncm.iCaptionWidth); @@ -835,9 +835,9 @@ return 0; if (fl & SPIF_UPDATEINIFILE) { - SpiStoreMetric(L"IconSpacing", gspv.im.iHorzSpacing); - SpiStoreMetric(L"IconVerticalspacing", gspv.im.iVertSpacing); - SpiStoreMetric(L"IconTitleWrap", gspv.im.iTitleWrap); + SpiStoreMetric(VAL_ICONSPC, gspv.im.iHorzSpacing); + SpiStoreMetric(VAL_ICONVSPC, gspv.im.iVertSpacing); + SpiStoreMetric(VAL_ITWRAP, gspv.im.iTitleWrap); SpiStoreFont(L"IconFont", &gspv.im.lfFont); } return (UINT_PTR)KEY_METRIC; @@ -1102,13 +1102,13 @@ return SpiGetInt(pvParam, &gspv.iMouseHoverWidth, fl); case SPI_SETMOUSEHOVERWIDTH: - return SpiSetInt(&gspv.iMouseHoverWidth, uiParam, KEY_MOUSE, L"MouseHoverWidth", fl); + return SpiSetInt(&gspv.iMouseHoverWidth, uiParam, KEY_MOUSE, VAL_HOVERWIDTH, fl); case SPI_GETMOUSEHOVERHEIGHT: return SpiGetInt(pvParam, &gspv.iMouseHoverHeight, fl); case SPI_SETMOUSEHOVERHEIGHT: - return SpiSetInt(&gspv.iMouseHoverHeight, uiParam, KEY_MOUSE, L"MouseHoverHeight", fl); + return SpiSetInt(&gspv.iMouseHoverHeight, uiParam, KEY_MOUSE, VAL_HOVERHEIGHT, fl); case SPI_GETMOUSEHOVERTIME: return SpiGetInt(pvParam, &gspv.iMouseHoverTime, fl); @@ -1121,13 +1121,13 @@ * enforce the use of USER_TIMER_MAXIMUM and USER_TIMER_MINIMUM until * Windows Server 2003 SP1 and Windows XP SP2 " */ - return SpiSetInt(&gspv.iMouseHoverTime, uiParam, KEY_MOUSE, L"MouseHoverTime", fl); + return SpiSetInt(&gspv.iMouseHoverTime, uiParam, KEY_MOUSE, VAL_HOVERTIME, fl); case SPI_GETWHEELSCROLLLINES: return SpiGetInt(pvParam, &gspv.iWheelScrollLines, fl); case SPI_SETWHEELSCROLLLINES: - return SpiSetInt(&gspv.iWheelScrollLines, uiParam, KEY_DESKTOP, L"WheelScrollLines", fl); + return SpiSetInt(&gspv.iWheelScrollLines, uiParam, KEY_DESKTOP, VAL_SCRLLLINES, fl); case SPI_GETMENUSHOWDELAY: return SpiGetInt(pvParam, &gspv.dwMenuShowDelay, fl); @@ -1140,7 +1140,7 @@ return SpiGetInt(pvParam, &gspv.uiWheelScrollChars, fl); case SPI_SETWHEELSCROLLCHARS: - return SpiSetInt(&gspv.uiWheelScrollChars, uiParam, KEY_DESKTOP, L"WheelScrollChars", fl); + return SpiSetInt(&gspv.uiWheelScrollChars, uiParam, KEY_DESKTOP, VAL_SCRLLCHARS, fl); #endif case SPI_GETSHOWIMEUI: return SpiGetInt(pvParam, &gspv.bShowImeUi, fl); @@ -1153,7 +1153,7 @@ case SPI_SETMOUSESPEED: // vgl SETMOUSE - return SpiSetInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, L"MouseSpeed", fl); + return SpiSetInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, VAL_MOUSE3, fl); case SPI_GETSCREENSAVERRUNNING: return SpiGetInt(pvParam, &gspv.bScrSaverRunning, fl);

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009