Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[mkupfer] 43307: - add new desktop and mouse property keys to registry - disable global settings from _SYSTEM_CURSORINFO and change files accordingly - bind and load added registry keys for SystemParametersInfo - TODO: read and set via SystemParametersInfo still incomplete
by mkupfer＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: mkupfer Date: Mon Oct 5 21:53:15 2009 New Revision: 43307 URL: http://svn.reactos.org/svn/reactos?rev=43307&view=rev Log: - add new desktop and mouse property keys to registry - disable global settings from _SYSTEM_CURSORINFO and change files accordingly - bind and load added registry keys for SystemParametersInfo - TODO: read and set via SystemParametersInfo still incomplete Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.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] Mon Oct 5 21:53:15 2009 @@ -13,6 +13,12 @@ HKCU,"Control Panel\Mouse","MouseThreshold2",0x00000002,"10" HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00000002,"480" HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00000002,"0" +HKCU,"Control Panel\Mouse","MouseSensitivity",0x00000002,"10" +HKCU,"Control Panel\Mouse","MouseHoverTime",0x00000002,"400" +HKCU,"Control Panel\Mouse","MouseHoverWidth",0x00000002,"4" +HKCU,"Control Panel\Mouse","MouseHoverHeight",0x00000002,"4" +HKCU,"Control Panel\Mouse","DoubleClickWidth",0x00000002,"4" +HKCU,"Control Panel\Mouse","DoubleClickHeight",0x00000002,"4" HKCU,"Control Panel\Desktop","AutoEndTasks",0x00000002,"0" HKCU,"Control Panel\Desktop","CursorBlinkRate",0x00000002,"530" @@ -22,6 +28,25 @@ HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" 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","LowPowerActive",,"0" +HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400" +HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3" +HKCU,"Control Panel\Desktop","WheelScrollChars",2,"3" + +HKCU,"Control Panel\Desktop\WindowMetrics","ScrollWidth",2,"16" +HKCU,"Control Panel\Desktop\WindowMetrics","ScrollHeight",2,"16" +HKCU,"Control Panel\Desktop\WindowMetrics","CaptionWidth",2,"18" +HKCU,"Control Panel\Desktop\WindowMetrics","CaptionHeight",2,"18" +HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionWidth",2,"13" +HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionHeight",2,"15" +HKCU,"Control Panel\Desktop\WindowMetrics","MenuWidth",2,"18" +HKCU,"Control Panel\Desktop\WindowMetrics","MenuHeight",2,"18" +HKCU,"Control Panel\Desktop\WindowMetrics","BorderWidth",2,"1" +HKCU,"Control Panel\Desktop\WindowMetrics","Shell Icon Size",2,"32" + HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" 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] Mon Oct 5 21:53:15 2009 @@ -11,8 +11,14 @@ HKCU,"Control Panel\Mouse","MouseSpeed",0x00000002,"1" HKCU,"Control Panel\Mouse","MouseThreshold1",0x00000002,"6" HKCU,"Control Panel\Mouse","MouseThreshold2",0x00000002,"10" -HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00000002,"480" +HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00000002,"500" HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00000002,"0" +HKCU,"Control Panel\Mouse","MouseSensitivity",0x00000002,"10" +HKCU,"Control Panel\Mouse","MouseHoverTime",0x00000002,"400" +HKCU,"Control Panel\Mouse","MouseHoverWidth",0x00000002,"4" +HKCU,"Control Panel\Mouse","MouseHoverHeight",0x00000002,"4" +HKCU,"Control Panel\Mouse","DoubleClickWidth",0x00000002,"4" +HKCU,"Control Panel\Mouse","DoubleClickHeight",0x00000002,"4" HKCU,"Control Panel\Desktop","AutoEndTasks",0x00000002,"0" HKCU,"Control Panel\Desktop","CursorBlinkRate",0x00000002,"530" @@ -27,6 +33,8 @@ HKCU,"Control Panel\Desktop","UserPreferenceMask",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" +HKCU,"Control Panel\Desktop","WheelScrollChars",2,"3" HKCU,"Control Panel\Desktop\WindowMetrics","ScrollWidth",2,"16" HKCU,"Control Panel\Desktop\WindowMetrics","ScrollHeight",2,"16" Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Mon Oct 5 21:53:15 2009 @@ -41,14 +41,15 @@ typedef struct _SYSTEM_CURSORINFO { BOOL Enabled; - BOOL SwapButtons;// +// BOOL SwapButtons; UINT ButtonsDown; CURSORCLIP_INFO CursorClipInfo; PCURICON_OBJECT CurrentCursorObject; -// UINT WheelScroLines; -// UINT WheelScroChars; BYTE ShowingCursor; - UINT DblClickSpeed;// +/* + UINT WheelScroLines; + UINT WheelScroChars; + UINT DblClickSpeed; UINT DblClickWidth; UINT DblClickHeight; @@ -56,9 +57,9 @@ UINT MouseHoverWidth; UINT MouseHoverHeight; -// UINT MouseSpeed; -// CURSORACCELERATION_INFO CursorAccelerationInfo; - + UINT MouseSpeed; + CURSORACCELERATION_INFO CursorAccelerationInfo; +*/ DWORD LastBtnDown; LONG LastBtnDownX; LONG LastBtnDownY; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Mon Oct 5 21:53:15 2009 @@ -133,9 +133,9 @@ piSysMet[SM_MOUSEPRESENT] = 1; piSysMet[SM_MOUSEWHEELPRESENT] = 1; piSysMet[SM_CMOUSEBUTTONS] = 2; - piSysMet[SM_SWAPBUTTON] = gspv.bMouseBtnSwap ? 1 : 0; //CurInfo ? CurInfo->SwapButtons : 0; - piSysMet[SM_CXDOUBLECLK] = gspv.iDblClickWidth;//CurInfo ? CurInfo->DblClickWidth : 4; - piSysMet[SM_CYDOUBLECLK] = gspv.iDblClickHeight;//CurInfo ? CurInfo->DblClickWidth : 4; + piSysMet[SM_SWAPBUTTON] = gspv.bMouseBtnSwap ? 1 : 0; + piSysMet[SM_CXDOUBLECLK] = gspv.iDblClickWidth; + piSysMet[SM_CYDOUBLECLK] = gspv.iDblClickHeight; #if (_WIN32_WINNT >= 0x0600) piSysMet[SM_MOUSEHORIZONTALWHEELPRESENT] = 0; #endif Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Oct 5 21:53:15 2009 @@ -251,7 +251,7 @@ CurInfo = IntGetSysCursorInfo(WinStaObject); Res = (Msg->hwnd == (HWND)CurInfo->LastClkWnd) && - ((Msg->time - CurInfo->LastBtnDown) < CurInfo->DblClickSpeed); + ((Msg->time - CurInfo->LastBtnDown) < gspv.iDblClickTime); if(Res) { @@ -262,8 +262,8 @@ if(dY < 0) dY = -dY; - Res = (dX <= CurInfo->DblClickWidth) && - (dY <= CurInfo->DblClickHeight); + Res = (dX <= gspv.iDblClickWidth) && + (dY <= gspv.iDblClickHeight); if(Res) { 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 21:53:15 2009 @@ -52,6 +52,10 @@ static const WCHAR* VAL_DBLCLKTIME = L"DoubleClickSpeed"; static const WCHAR* VAL_SNAPDEFBTN = L"SnapToDefaultButton"; static const WCHAR* VAL_SWAP = L"SwapMouseButtons"; +static const WCHAR* VAL_HOVERTIME = L"MouseHoverTime"; +static const WCHAR* VAL_HOVERWIDTH = L"MouseHoverWidth"; +static const WCHAR* VAL_HOVERHEIGHT = L"MouseHoverHeight"; +//static const WCHAR* VAL_SENSITIVITY = L"MouseSensitivity"; static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop"; static const WCHAR* VAL_SCRTO = L"ScreenSaveTimeOut"; @@ -61,6 +65,10 @@ static const WCHAR* VAL_DRAGHEIGHT = L"DragHeight"; static const WCHAR* VAL_DRAGWIDTH = L"DragWidth"; static const WCHAR* VAL_FNTSMOOTH = L"FontSmoothing"; +static const WCHAR* VAL_SCRLLLINES = L"WheelScrollLines"; +#if (_WIN32_WINNT >= 0x0600) +static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars"; +#endif static const WCHAR* KEY_MDALIGN = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; static const WCHAR* VAL_MDALIGN = L"MenuDropAlignment"; @@ -179,14 +187,16 @@ /* Load mouse settings */ gspv.caiMouse.FirstThreshold = SpiLoadMouse(VAL_MOUSE1, 6); gspv.caiMouse.SecondThreshold = SpiLoadMouse(VAL_MOUSE2, 10); - gspv.caiMouse.Acceleration = SpiLoadMouse(VAL_MOUSE3, 1); + gspv.caiMouse.Acceleration = gspv.iMouseSpeed = SpiLoadMouse(VAL_MOUSE3, 1); gspv.bMouseBtnSwap = SpiLoadMouse(VAL_SWAP, 0); gspv.bSnapToDefBtn = SpiLoadMouse(VAL_SNAPDEFBTN, 0); gspv.iMouseTrails = SpiLoadMouse(VAL_MOUSETRAILS, 0); - gspv.iMouseSpeed = SpiLoadMouse(VAL_MOUSE3, 1); - gspv.iDblClickTime = SpiLoadMouse(VAL_DBLCLKTIME, 480); + gspv.iDblClickTime = SpiLoadMouse(VAL_DBLCLKTIME, 500); gspv.iDblClickWidth = SpiLoadMouse(VAL_DBLCLKWIDTH, 4); gspv.iDblClickHeight = SpiLoadMouse(VAL_DBLCLKHEIGHT, 4); + gspv.iMouseHoverTime = SpiLoadMouse(VAL_HOVERTIME, 400); + gspv.iMouseHoverWidth = SpiLoadMouse(VAL_HOVERWIDTH, 4); + gspv.iMouseHoverHeight = SpiLoadMouse(VAL_HOVERHEIGHT, 4); /* Load NONCLIENTMETRICS */ gspv.ncm.cbSize = sizeof(NONCLIENTMETRICSW); @@ -224,15 +234,12 @@ /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); + gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); +#if (_WIN32_WINNT >= 0x0600) + gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); +#endif /* Some hardcoded values for now */ - gspv.iMouseHoverTime = 80; - gspv.iMouseHoverWidth = 4; - gspv.iMouseHoverHeight = 4; - gspv.iWheelScrollLines = 3; -#if (_WIN32_WINNT >= 0x0600) - gspv.uiWheelScrollChars = 1; -#endif gspv.tmCaptionFont.tmAveCharWidth = 6; gspv.bBeep = TRUE; @@ -1083,13 +1090,13 @@ return SpiGetInt(pvParam, &gspv.iMouseTrails, fl); case SPI_SETMOUSETRAILS: - return SpiSetInt(&gspv.iMouseTrails, uiParam, KEY_MOUSE, L"MouseTrails", fl); + return SpiSetInt(&gspv.iMouseTrails, uiParam, KEY_MOUSE, VAL_MOUSETRAILS, fl); case SPI_GETSNAPTODEFBUTTON: return SpiGetInt(pvParam, &gspv.bSnapToDefBtn, fl); case SPI_SETSNAPTODEFBUTTON: - return SpiSetBool(&gspv.bSnapToDefBtn, uiParam, KEY_MOUSE, L"SnapToDefaultButton", fl); + return SpiSetBool(&gspv.bSnapToDefBtn, uiParam, KEY_MOUSE, VAL_SNAPDEFBTN, fl); case SPI_GETMOUSEHOVERWIDTH: return SpiGetInt(pvParam, &gspv.iMouseHoverWidth, fl); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Mon Oct 5 21:53:15 2009 @@ -538,23 +538,26 @@ CurInfo->CurrentCursorObject = NULL; CurInfo->ShowingCursor = 0; - /* FIXME: Obtain the following information from the registry */ - -// CurInfo->WheelScroLines = 3; -// CurInfo->WheelScroChars = 3; - CurInfo->SwapButtons = FALSE; - CurInfo->DblClickSpeed = 500; - CurInfo->DblClickWidth = 4; - CurInfo->DblClickHeight = 4; - -// CurInfo->MouseSpeed = 10; -// CurInfo->CursorAccelerationInfo.FirstThreshold = 6; -// CurInfo->CursorAccelerationInfo.SecondThreshold = 10; -// CurInfo->CursorAccelerationInfo.Acceleration = 1; - -// CurInfo->MouseHoverTime = 80; -// CurInfo->MouseHoverWidth = 4; -// CurInfo->MouseHoverHeight = 4; +/* + // not used anymore + CurInfo->WheelScroLines = gspv.iWheelScrollLines; +#if (_WIN32_WINNT >= 0x0600) + CurInfo->WheelScroChars = gspv.iWheelScrollChars; +#endif + CurInfo->SwapButtons = gspv.bMouseBtnSwap; + CurInfo->DblClickSpeed = gspv.iDblClickTime; + CurInfo->DblClickWidth = gspv.iDblClickWidth; + CurInfo->DblClickHeight = gspv.iDblClickHeight; + + CurInfo->MouseSpeed = gspv.iMouseSpeed; + CurInfo->CursorAccelerationInfo.FirstThreshold = gspv.caiMouse.FirstThreshold; + CurInfo->CursorAccelerationInfo.SecondThreshold = gspv.caiMouse.SecondThreshold; + CurInfo->CursorAccelerationInfo.Acceleration = gspv.caiMouse.Acceleration; + + CurInfo->MouseHoverTime = gspv.iMouseHoverTime; + CurInfo->MouseHoverWidth = gspv.iMouseHoverWidth; + CurInfo->MouseHoverHeight = gspv.iMouseHoverHeight; +*/ // WindowStationObject->ScreenSaverActive = FALSE; // WindowStationObject->ScreenSaverTimeOut = 10;

1 0

[janderwald] 43306: - Fix a critical bug in the counted worker implementation
by janderwald＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: janderwald Date: Mon Oct 5 21:15:04 2009 New Revision: 43306 URL: http://svn.reactos.org/svn/reactos?rev=43306&view=rev Log: - Fix a critical bug in the counted worker implementation Modified: trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Mon Oct 5 21:15:04 2009 @@ -179,7 +179,7 @@ if (NT_SUCCESS(Status)) { /* get ks worker implementation */ - KsWorker = (PKSIWORKER)Worker; + KsWorker = *(PKSIWORKER*)Worker; /* store counted work item */ KsWorker->CountedWorkItem = CountedWorkItem; }

1 0

[janderwald] 43305: - Implement setting / getting volume level
by janderwald＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: janderwald Date: Mon Oct 5 19:00:59 2009 New Revision: 43305 URL: http://svn.reactos.org/svn/reactos?rev=43305&view=rev Log: - Implement setting / getting volume level Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h 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] Mon Oct 5 19:00:59 2009 @@ -50,6 +50,29 @@ return NULL; } +LPMIXERCONTROL_DATA +GetMixerControlDataById( + PLIST_ENTRY ListHead, + DWORD dwControlId) +{ + PLIST_ENTRY Entry; + LPMIXERCONTROL_DATA Control; + + /* get first entry */ + Entry = ListHead->Flink; + + while(Entry != ListHead) + { + Control = (LPMIXERCONTROL_DATA)CONTAINING_RECORD(Entry, MIXERCONTROL_DATA, Entry); + DPRINT("dwSource %x dwSource %x\n", Control->dwControlID, dwControlId); + if (Control->dwControlID == dwControlId) + return Control; + + Entry = Entry->Flink; + } + return NULL; +} + NTSTATUS GetMixerControlById( LPMIXER_INFO MixerInfo, @@ -101,7 +124,7 @@ while(Entry != &MixerInfo->LineList) { MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); - DPRINT1("dwLineID %x dwLineID %x\n", MixerLineSrc->Line.dwLineID, dwLineID); + DPRINT("dwLineID %x dwLineID %x\n", MixerLineSrc->Line.dwLineID, dwLineID); if (MixerLineSrc->Line.dwLineID == dwLineID) return MixerLineSrc; @@ -889,6 +912,7 @@ IN PFILE_OBJECT FileObject, IN PKSMULTIPLE_ITEM NodeTypes, IN ULONG NodeIndex, + IN LPMIXERLINE_EXT MixerLine, OUT LPMIXERCONTROLW MixerControl) { LPGUID NodeType; @@ -896,7 +920,6 @@ ULONG BytesReturned; NTSTATUS Status; LPWSTR Name; - /* initialize mixer control */ MixerControl->cbStruct = sizeof(MIXERCONTROLW); @@ -958,6 +981,77 @@ } MixerInfo->ControlId++; + + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + { + KSNODEPROPERTY_AUDIO_CHANNEL Property; + ULONG Length; + PKSPROPERTY_DESCRIPTION Desc; + PKSPROPERTY_MEMBERSHEADER Members; + PKSPROPERTY_STEPPING_LONG Range; + + Length = sizeof(KSPROPERTY_DESCRIPTION) + sizeof(KSPROPERTY_MEMBERSHEADER) + sizeof(KSPROPERTY_STEPPING_LONG); + Desc = ExAllocatePool(NonPagedPool, Length); + ASSERT(Desc); + RtlZeroMemory(Desc, Length); + + /* setup the request */ + RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL)); + + Property.NodeProperty.NodeId = NodeIndex; + Property.NodeProperty.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL; + Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT; + Property.NodeProperty.Property.Set = KSPROPSETID_Audio; + + /* get node volume level info */ + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), Desc, Length, &BytesReturned); + + if (NT_SUCCESS(Status)) + { + LPMIXERVOLUME_DATA VolumeData; + ULONG Steps, MaxRange, Index; + LONG Value; + + Members = (PKSPROPERTY_MEMBERSHEADER)(Desc + 1); + Range = (PKSPROPERTY_STEPPING_LONG)(Members + 1); //98304 + + DPRINT("NodeIndex %u Range Min %d Max %d Steps %x UMin %x UMax %x\n", NodeIndex, Range->Bounds.SignedMinimum, Range->Bounds.SignedMaximum, Range->SteppingDelta, Range->Bounds.UnsignedMinimum, Range->Bounds.UnsignedMaximum); + + VolumeData = ExAllocatePool(NonPagedPool, sizeof(MIXERVOLUME_DATA)); + if (!VolumeData) + return STATUS_INSUFFICIENT_RESOURCES; + + MaxRange = (abs(Range->Bounds.SignedMinimum) + abs(Range->Bounds.SignedMaximum)); + Steps = MaxRange / Range->SteppingDelta + 1; + + /* store mixer control info there */ + VolumeData->Header.dwControlID = MixerControl->dwControlID; + VolumeData->SignedMaximum = Range->Bounds.SignedMaximum; + VolumeData->SignedMinimum = Range->Bounds.SignedMinimum; + VolumeData->SteppingDelta = Range->SteppingDelta; + VolumeData->ValuesCount = Steps; + VolumeData->InputSteppingDelta = 0x10000 / Steps; + + VolumeData->Values = ExAllocatePool(NonPagedPool, sizeof(LONG) * Steps); + if (!VolumeData->Values) + { + ExFreePool(Desc); + ExFreePool(VolumeData); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + Value = Range->Bounds.SignedMinimum; + for(Index = 0; Index < Steps; Index++) + { + VolumeData->Values[Index] = Value; + Value += Range->SteppingDelta; + } + InsertTailList(&MixerLine->LineControlsExtraData, &VolumeData->Header.Entry); + } + ExFreePool(Desc); + } + DPRINT("Status %x Name %S\n", Status, MixerControl->szName); return STATUS_SUCCESS; @@ -1026,6 +1120,7 @@ SrcLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; + InitializeListHead(&SrcLine->LineControlsExtraData); wcscpy(SrcLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); } @@ -1107,7 +1202,7 @@ /* store the node index for retrieving / setting details */ SrcLine->NodeIds[ControlCount] = Index; - Status = AddMixerControl(MixerInfo, FileObject, NodeTypes, Index, &SrcLine->LineControls[ControlCount]); + Status = AddMixerControl(MixerInfo, FileObject, NodeTypes, Index, SrcLine, &SrcLine->LineControls[ControlCount]); if (NT_SUCCESS(Status)) { /* increment control count on success */ @@ -1430,6 +1525,7 @@ /* initialize source line list */ InitializeListHead(&MixerInfo->LineList); + InitializeListHead(&DestinationLine->LineControlsExtraData); /* insert destination line */ InsertHeadList(&MixerInfo->LineList, &DestinationLine->Entry); @@ -1781,13 +1877,14 @@ Index = 0; for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) { + DPRINT1("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); if (DeviceInfo->u.MixControls.dwControlType == MixerLineSrc->LineControls[Index].dwControlType) { RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, &MixerLineSrc->LineControls[Index], sizeof(MIXERCONTROLW)); return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } } - DPRINT1("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x\n", DeviceInfo->u.MixControls.dwControlType, DeviceInfo->u.MixControls.dwLineID); + 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)); } @@ -1795,6 +1892,65 @@ //DbgBreakPoint(); return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); +} + +NTSTATUS +SetGetControlDetails( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DeviceId, + IN ULONG NodeId, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN ULONG bSet, + IN ULONG PropertyId, + IN ULONG Channel, + IN PLONG InputValue) +{ + KSNODEPROPERTY_AUDIO_CHANNEL Property; + NTSTATUS Status; + HANDLE hDevice; + PFILE_OBJECT FileObject; + LONG Value; + ULONG BytesReturned; + + if (bSet) + Value = *InputValue; + + /* open virtual audio device */ + Status = OpenSysAudioDeviceByIndex(DeviceObject, DeviceId, &hDevice, &FileObject); + + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + /* setup the request */ + RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL)); + + Property.NodeProperty.NodeId = NodeId; + Property.NodeProperty.Property.Id = PropertyId; + Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY; + Property.NodeProperty.Property.Set = KSPROPSETID_Audio; + Property.Channel = Channel; + + if (bSet) + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_SET; + else + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_GET; + + /* send the request */ + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Value, sizeof(LONG), &BytesReturned); + + ObDereferenceObject(FileObject); + ZwClose(hDevice); + + if (!bSet) + { + *InputValue = Value; + } + + DPRINT1("Status %x bSet %u NodeId %u Value %d PropertyId %u\n", Status, bSet, NodeId, Value, PropertyId); + return Status; } NTSTATUS @@ -1805,13 +1961,9 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN ULONG bSet) { - KSNODEPROPERTY_AUDIO_CHANNEL Property; + LPMIXERCONTROLDETAILS_BOOLEAN Input; + LONG Value; NTSTATUS Status; - HANDLE hDevice; - PFILE_OBJECT FileObject; - BOOL Value; - ULONG BytesReturned; - LPMIXERCONTROLDETAILS_BOOLEAN Input; if (DeviceInfo->u.MixDetails.cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) return STATUS_INVALID_PARAMETER; @@ -1819,49 +1971,87 @@ /* get input */ Input = (LPMIXERCONTROLDETAILS_BOOLEAN)DeviceInfo->u.MixDetails.paDetails; - - // - // FIXME SEH!!! - // + /* FIXME SEH */ if (bSet) Value = Input->fValue; - /* open virtual audio device */ - Status = OpenSysAudioDeviceByIndex(DeviceObject, DeviceId, &hDevice, &FileObject); - - if (!NT_SUCCESS(Status)) - { - /* failed */ - return Status; - } - - /* setup the request */ - RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL)); - - Property.NodeProperty.NodeId = NodeId; - Property.NodeProperty.Property.Id = KSPROPERTY_AUDIO_MUTE; - Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY; - Property.NodeProperty.Property.Set = KSPROPSETID_Audio; - Property.Channel = MAXULONG; + /* set control details */ + Status = SetGetControlDetails(DeviceObject, DeviceId, NodeId, DeviceInfo, bSet, KSPROPERTY_AUDIO_MUTE, MAXULONG, &Value); + + /* FIXME SEH */ + if (!bSet) + Input->fValue = Value; + + return Status; +} + +NTSTATUS +SetGetVolumeControlDetails( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DeviceId, + IN ULONG NodeId, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN ULONG bSet, + LPMIXERCONTROLW MixerControl, + LPMIXERLINE_EXT MixerLine) +{ + LPMIXERCONTROLDETAILS_UNSIGNED Input; + LONG Value, Index, Channel = 0; + NTSTATUS Status; + LPMIXERVOLUME_DATA VolumeData; + + if (DeviceInfo->u.MixDetails.cbDetails != sizeof(MIXERCONTROLDETAILS_SIGNED)) + return STATUS_INVALID_PARAMETER; + + VolumeData = (LPMIXERVOLUME_DATA)GetMixerControlDataById(&MixerLine->LineControlsExtraData, MixerControl->dwControlID); + if (!VolumeData) + return STATUS_INSUFFICIENT_RESOURCES; + + + /* get input */ + Input = (LPMIXERCONTROLDETAILS_UNSIGNED)DeviceInfo->u.MixDetails.paDetails; if (bSet) - Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_SET; + { + /* FIXME SEH */ + Value = Input->dwValue; + Index = Value / VolumeData->InputSteppingDelta; + + if (Index >= VolumeData->ValuesCount) + { + DPRINT1("Index %u out of bounds %u \n", Index, VolumeData->ValuesCount); + DbgBreakPoint(); + return STATUS_INVALID_PARAMETER; + } + + Value = VolumeData->Values[Index]; + } + + /* set control details */ + if (bSet) + { + Status = SetGetControlDetails(DeviceObject, DeviceId, NodeId, DeviceInfo, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); + Status = SetGetControlDetails(DeviceObject, DeviceId, NodeId, DeviceInfo, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); + } else - Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_GET; - - /* send the request */ - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Value, sizeof(BOOL), &BytesReturned); - - ObDereferenceObject(FileObject); - ZwClose(hDevice); + { + Status = SetGetControlDetails(DeviceObject, DeviceId, NodeId, DeviceInfo, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); + } if (!bSet) { - // FIXME SEH !!! - Input->fValue = Value; - } - - DPRINT("Status %x bSet %u NodeId %u Value %u\n", Status, bSet, NodeId, Value); + for(Index = 0; Index < VolumeData->ValuesCount; Index++) + { + if (VolumeData->Values[Index] < Value) + { + /* FIXME SEH */ + Input->dwValue = VolumeData->InputSteppingDelta * Index; + return Status; + } + } + Input->dwValue = VolumeData->InputSteppingDelta * (VolumeData->ValuesCount-1); + } + return Status; } @@ -1879,7 +2069,7 @@ PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT1("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", + 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); if (DeviceInfo->Flags & MIXER_GETCONTROLDETAILSF_LISTTEXT) @@ -1901,12 +2091,16 @@ } Status = STATUS_NOT_IMPLEMENTED; + DPRINT("dwLineId %x dwControlID %x dwControlType %x\n", MixerLine->Line.dwLineID, MixerControl->dwControlID, MixerControl->dwControlType); if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) { /* send the request */ Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, TRUE); } - + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + { + Status = SetGetVolumeControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, TRUE, MixerControl, MixerLine); + } return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } @@ -1925,7 +2119,7 @@ PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT1("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", + 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); if (DeviceInfo->Flags & MIXER_GETCONTROLDETAILSF_LISTTEXT) @@ -1952,6 +2146,10 @@ /* send the request */ Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, FALSE); } + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + { + Status = SetGetVolumeControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, FALSE, MixerControl, MixerLine); + } return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Mon Oct 5 19:00:59 2009 @@ -36,11 +36,31 @@ typedef struct { LIST_ENTRY Entry; + ULONG dwControlID; +}MIXERCONTROL_DATA, *LPMIXERCONTROL_DATA; + +typedef struct +{ + MIXERCONTROL_DATA Header; + LONG SignedMinimum; + LONG SignedMaximum; + LONG SteppingDelta; + ULONG InputSteppingDelta; + ULONG ValuesCount; + PLONG Values; +}MIXERVOLUME_DATA, *LPMIXERVOLUME_DATA; + + + +typedef struct +{ + LIST_ENTRY Entry; ULONG PinId; ULONG DeviceIndex; MIXERLINEW Line; LPMIXERCONTROLW LineControls; PULONG NodeIds; + LIST_ENTRY LineControlsExtraData; }MIXERLINE_EXT, *LPMIXERLINE_EXT;

1 0

[mkupfer] 43304: - partly revert 43298 - fix the mouse swap button issue - cleanup loading mouse properties - change reg key types for mouse values like windows
by mkupfer＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: mkupfer Date: Mon Oct 5 16:13:29 2009 New Revision: 43304 URL: http://svn.reactos.org/svn/reactos?rev=43304&view=rev Log: - partly revert 43298 - fix the mouse swap button issue - cleanup loading mouse properties - change reg key types for mouse values like windows Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf 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] Mon Oct 5 16:13:29 2009 @@ -6,13 +6,13 @@ HKCU,"Control Panel",,0x00000012 HKCU,"Control Panel\Accessibility",,0x00000012 HKCU,"Control Panel\Appearance",,0x00000012 -HKCU,"Control Panel\Mouse","MouseTrails",0x00010001,0x00000000 -HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00010001,0x00000000 -HKCU,"Control Panel\Mouse","MouseSpeed",0x00010001,0x00000001 -HKCU,"Control Panel\Mouse","MouseThreshold1",0x00010001,0x00000006 -HKCU,"Control Panel\Mouse","MouseThreshold2",0x00010001,0x0000000A -HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00010001,0x000001E0 -HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00010001,0x00000000 +HKCU,"Control Panel\Mouse","MouseTrails",0x00000002,"0" +HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00000002,"0" +HKCU,"Control Panel\Mouse","MouseSpeed",0x00000002,"1" +HKCU,"Control Panel\Mouse","MouseThreshold1",0x00000002,"6" +HKCU,"Control Panel\Mouse","MouseThreshold2",0x00000002,"10" +HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00000002,"480" +HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00000002,"0" HKCU,"Control Panel\Desktop","AutoEndTasks",0x00000002,"0" HKCU,"Control Panel\Desktop","CursorBlinkRate",0x00000002,"530" 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] Mon Oct 5 16:13:29 2009 @@ -6,13 +6,13 @@ HKCU,"Control Panel",,0x00000012 HKCU,"Control Panel\Accessibility",,0x00000012 HKCU,"Control Panel\Appearance",,0x00000012 -HKCU,"Control Panel\Mouse","MouseTrails",0x00010001,0x00000000 -HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00010001,0x00000000 -HKCU,"Control Panel\Mouse","MouseSpeed",0x00010001,0x00000001 -HKCU,"Control Panel\Mouse","MouseThreshold1",0x00010001,0x00000006 -HKCU,"Control Panel\Mouse","MouseThreshold2",0x00010001,0x0000000A -HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00010001,0x000001E0 -HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00010001,0x00000000 +HKCU,"Control Panel\Mouse","MouseTrails",0x00000002,"0" +HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00000002,"0" +HKCU,"Control Panel\Mouse","MouseSpeed",0x00000002,"1" +HKCU,"Control Panel\Mouse","MouseThreshold1",0x00000002,"6" +HKCU,"Control Panel\Mouse","MouseThreshold2",0x00000002,"10" +HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00000002,"480" +HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00000002,"0" HKCU,"Control Panel\Desktop","AutoEndTasks",0x00000002,"0" HKCU,"Control Panel\Desktop","CursorBlinkRate",0x00000002,"530" 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 16:13:29 2009 @@ -46,9 +46,11 @@ static const WCHAR* VAL_MOUSE1 = L"MouseThreshold1"; static const WCHAR* VAL_MOUSE2 = L"MouseThreshold2"; static const WCHAR* VAL_MOUSE3 = L"MouseSpeed"; +static const WCHAR* VAL_MOUSETRAILS = L"MouseTrails"; static const WCHAR* VAL_DBLCLKWIDTH = L"DoubleClickWidth"; static const WCHAR* VAL_DBLCLKHEIGHT = L"DoubleClickHeight"; static const WCHAR* VAL_DBLCLKTIME = L"DoubleClickSpeed"; +static const WCHAR* VAL_SNAPDEFBTN = L"SnapToDefaultButton"; static const WCHAR* VAL_SWAP = L"SwapMouseButtons"; static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop"; @@ -87,19 +89,7 @@ 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 -SpiLoadszInt(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) +SpiLoadInt(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) { WCHAR awcBuffer[12]; ULONG cbSize; @@ -116,7 +106,7 @@ INT SpiLoadMouse(PCWSTR pwszValue, INT iValue) { - return SpiLoadDWord(KEY_MOUSE, pwszValue, iValue); + return SpiLoadInt(KEY_MOUSE, pwszValue, iValue); } static @@ -125,7 +115,7 @@ { INT iRegVal; - iRegVal = SpiLoadszInt(KEY_METRIC, pwszValue, METRIC2REG(iValue)); + iRegVal = SpiLoadInt(KEY_METRIC, pwszValue, METRIC2REG(iValue)); DPRINT("Loaded metric setting '%S', iValue=%d(reg:%d), ret=%d(reg:%d)\n", pwszValue, iValue, METRIC2REG(iValue), REG2METRIC(iRegVal), iRegVal); return REG2METRIC(iRegVal); @@ -191,8 +181,10 @@ gspv.caiMouse.SecondThreshold = SpiLoadMouse(VAL_MOUSE2, 10); gspv.caiMouse.Acceleration = SpiLoadMouse(VAL_MOUSE3, 1); gspv.bMouseBtnSwap = SpiLoadMouse(VAL_SWAP, 0); + gspv.bSnapToDefBtn = SpiLoadMouse(VAL_SNAPDEFBTN, 0); + gspv.iMouseTrails = SpiLoadMouse(VAL_MOUSETRAILS, 0); gspv.iMouseSpeed = SpiLoadMouse(VAL_MOUSE3, 1); - gspv.iDblClickTime = SpiLoadMouse(VAL_DBLCLKTIME, 500); + gspv.iDblClickTime = SpiLoadMouse(VAL_DBLCLKTIME, 480); gspv.iDblClickWidth = SpiLoadMouse(VAL_DBLCLKWIDTH, 4); gspv.iDblClickHeight = SpiLoadMouse(VAL_DBLCLKHEIGHT, 4); @@ -221,7 +213,7 @@ gspv.mm.iWidth = SpiLoadMetric(L"MinWidth", 160); gspv.mm.iHorzGap = SpiLoadMetric(L"MinHorzGap", 160); gspv.mm.iVertGap = SpiLoadMetric(L"MinVertGap", 24); - gspv.mm.iArrange = SpiLoadszInt(KEY_METRIC, L"MinArrange", ARW_HIDE); + gspv.mm.iArrange = SpiLoadInt(KEY_METRIC, L"MinArrange", ARW_HIDE); /* Load ICONMETRICS */ gspv.im.cbSize = sizeof(ICONMETRICSW); @@ -231,7 +223,7 @@ SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); /* Load desktop settings */ - gspv.bDragFullWindows = SpiLoadszInt(KEY_DESKTOP, VAL_DRAG, 0); + gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); /* Some hardcoded values for now */ gspv.iMouseHoverTime = 80; @@ -311,18 +303,6 @@ static VOID -SpiStoreDWord(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) -{ - DWORD Value = iValue; - RegWriteUserSetting(pwszKey, - pwszValue, - REG_DWORD, - &Value, - sizeof(Value)); -} - -static -VOID SpiStoreSzInt(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) { WCHAR awcBuffer[15]; @@ -461,20 +441,7 @@ 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; -} - -static inline -UINT_PTR -SpiSetszInt(PVOID pvData, INT iValue, PCWSTR pwszKey, PCWSTR pwszValue, FLONG fl) +SpiSetInt(PVOID pvData, INT iValue, PCWSTR pwszKey, PCWSTR pwszValue, FLONG fl) { REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); *(INT*)pvData = iValue; @@ -623,8 +590,8 @@ GDIOBJ_SetOwnership(hbmp, NULL); /* Yes, Windows really loads the current setting from the registry. */ - ulTile = SpiLoadszInt(KEY_DESKTOP, L"TileWallpaper", 0); - ulStyle = SpiLoadszInt(KEY_DESKTOP, L"WallpaperStyle", 0); + ulTile = SpiLoadInt(KEY_DESKTOP, L"TileWallpaper", 0); + ulStyle = SpiLoadInt(KEY_DESKTOP, L"WallpaperStyle", 0); DPRINT("SpiSetWallpaper: ulTile=%ld, ulStyle=%d\n", ulTile, ulStyle); /* Check the values we found in the registry */ @@ -694,13 +661,13 @@ case SPI_SETBORDER: uiParam = max(uiParam, 1); - return SpiSetszInt(&gspv.ncm.iBorderWidth, uiParam, KEY_METRIC, VAL_BORDER, fl); + return SpiSetInt(&gspv.ncm.iBorderWidth, uiParam, KEY_METRIC, VAL_BORDER, fl); case SPI_GETKEYBOARDSPEED: return SpiGetInt(pvParam, &gspv.dwKbdSpeed, fl); case SPI_SETKEYBOARDSPEED: - return SpiSetszInt(&gspv.dwKbdSpeed, uiParam, KEY_KBD, VAL_KBDSPD, fl); + return SpiSetInt(&gspv.dwKbdSpeed, uiParam, KEY_KBD, VAL_KBDSPD, fl); case SPI_LANGDRIVER: DPRINT1("SPI_LANGDRIVER is unimplemented\n"); @@ -710,19 +677,19 @@ return SpiGetInt(pvParam, &gspv.iScrSaverTimeout, fl); case SPI_SETSCREENSAVETIMEOUT: - return SpiSetszInt(&gspv.iScrSaverTimeout, uiParam, KEY_DESKTOP, VAL_SCRTO, fl); + return SpiSetInt(&gspv.iScrSaverTimeout, uiParam, KEY_DESKTOP, VAL_SCRTO, fl); case SPI_GETSCREENSAVEACTIVE: return SpiGetInt(pvParam, &gspv.bScrSaverActive, fl); case SPI_SETSCREENSAVEACTIVE: - return SpiSetszInt(&gspv.bScrSaverActive, uiParam, KEY_DESKTOP, VAL_SCRACT, fl); + return SpiSetInt(&gspv.bScrSaverActive, uiParam, KEY_DESKTOP, VAL_SCRACT, fl); case SPI_GETGRIDGRANULARITY: return SpiGetInt(pvParam, &gspv.uiGridGranularity, fl); case SPI_SETGRIDGRANULARITY: - return SpiSetszInt(&gspv.uiGridGranularity, uiParam, KEY_DESKTOP, VAL_GRID, fl); + return SpiSetInt(&gspv.uiGridGranularity, uiParam, KEY_DESKTOP, VAL_GRID, fl); case SPI_GETDESKWALLPAPER: uiParam = min(uiParam, gspv.ustrWallpaper.Length + 1); @@ -739,7 +706,7 @@ return SpiGetInt(pvParam, &gspv.iKbdDelay, fl); case SPI_SETKEYBOARDDELAY: - return SpiSetszInt(&gspv.iKbdDelay, uiParam, KEY_KBD, VAL_KBDDELAY, fl); + return SpiSetInt(&gspv.iKbdDelay, uiParam, KEY_KBD, VAL_KBDDELAY, fl); case SPI_ICONHORIZONTALSPACING: if (pvParam) @@ -761,7 +728,7 @@ return SpiGetInt(pvParam, &gspv.im.iTitleWrap, fl); case SPI_SETICONTITLEWRAP: - return SpiSetszInt(&gspv.im.iTitleWrap, uiParam, KEY_METRIC, VAL_ITWRAP, fl); + return SpiSetInt(&gspv.im.iTitleWrap, uiParam, KEY_METRIC, VAL_ITWRAP, fl); case SPI_GETMENUDROPALIGNMENT: return SpiGetInt(pvParam, &gspv.bMenuDropAlign, fl); @@ -770,10 +737,10 @@ return SpiSetBool(&gspv.bMenuDropAlign, uiParam, KEY_MDALIGN, VAL_MDALIGN, fl); case SPI_SETDOUBLECLKWIDTH: - return SpiSetszInt(&gspv.iDblClickWidth, uiParam, KEY_MOUSE, VAL_DBLCLKWIDTH, fl); + return SpiSetInt(&gspv.iDblClickWidth, uiParam, KEY_MOUSE, VAL_DBLCLKWIDTH, fl); case SPI_SETDOUBLECLKHEIGHT: - return SpiSetszInt(&gspv.iDblClickHeight, uiParam, KEY_MOUSE, VAL_DBLCLKHEIGHT, fl); + return SpiSetInt(&gspv.iDblClickHeight, uiParam, KEY_MOUSE, VAL_DBLCLKHEIGHT, fl); case SPI_GETICONTITLELOGFONT: return SpiGet(pvParam, &gspv.im.lfFont, sizeof(LOGFONTW), fl); @@ -788,10 +755,10 @@ return (UINT_PTR)KEY_METRIC; case SPI_SETDOUBLECLICKTIME: - return SpiSetszInt(&gspv.iDblClickTime, uiParam, KEY_MOUSE, VAL_DBLCLKTIME, fl); + return SpiSetInt(&gspv.iDblClickTime, uiParam, KEY_MOUSE, VAL_DBLCLKTIME, fl); case SPI_SETMOUSEBUTTONSWAP: - return SpiSetDWord(&gspv.bMouseBtnSwap, uiParam, KEY_MOUSE, VAL_SWAP, fl); + return SpiSetInt(&gspv.bMouseBtnSwap, uiParam, KEY_MOUSE, VAL_SWAP, fl); case SPI_GETFASTTASKSWITCH: return SpiGetInt(pvParam, &gspv.bFastTaskSwitch, fl); @@ -804,7 +771,7 @@ return SpiGetInt(pvParam, &gspv.bDragFullWindows, fl); case SPI_SETDRAGFULLWINDOWS: - return SpiSetszInt(&gspv.bDragFullWindows, uiParam, KEY_DESKTOP, VAL_DRAG, fl); + return SpiSetInt(&gspv.bDragFullWindows, uiParam, KEY_DESKTOP, VAL_DRAG, fl); case SPI_GETNONCLIENTMETRICS: return SpiGet(pvParam, &gspv.ncm, sizeof(NONCLIENTMETRICSW), fl); @@ -1056,10 +1023,10 @@ return (UINT_PTR)KEY_DESKTOP; case SPI_SETDRAGWIDTH: - return SpiSetszInt(&gspv.iDragWidth, uiParam, KEY_DESKTOP, VAL_DRAGWIDTH, fl); + return SpiSetInt(&gspv.iDragWidth, uiParam, KEY_DESKTOP, VAL_DRAGWIDTH, fl); case SPI_SETDRAGHEIGHT: - return SpiSetszInt(&gspv.iDragHeight, uiParam, KEY_DESKTOP, VAL_DRAGHEIGHT, fl); + return SpiSetInt(&gspv.iDragHeight, uiParam, KEY_DESKTOP, VAL_DRAGHEIGHT, fl); case SPI_SETHANDHELD: return SpiSetBool(&gspv.bHandHeld, uiParam, KEY_DESKTOP, L"HandHeld", fl); @@ -1071,10 +1038,10 @@ return SpiGetInt(pvParam, &gspv.iPwrOffTimeout, fl); case SPI_SETLOWPOWERTIMEOUT: - return SpiSetszInt(&gspv.iLowPwrTimeout, uiParam, KEY_DESKTOP, L"LowPowerTimeOut", fl); + return SpiSetInt(&gspv.iLowPwrTimeout, uiParam, KEY_DESKTOP, L"LowPowerTimeOut", fl); case SPI_SETPOWEROFFTIMEOUT: - return SpiSetszInt(&gspv.iPwrOffTimeout, uiParam, KEY_DESKTOP, L"PowerOffTimeOut", fl); + return SpiSetInt(&gspv.iPwrOffTimeout, uiParam, KEY_DESKTOP, L"PowerOffTimeOut", fl); case SPI_GETLOWPOWERACTIVE: return SpiGetInt(pvParam, &gspv.iPwrOffTimeout, fl); @@ -1116,7 +1083,7 @@ return SpiGetInt(pvParam, &gspv.iMouseTrails, fl); case SPI_SETMOUSETRAILS: - return SpiSetszInt(&gspv.iMouseTrails, uiParam, KEY_MOUSE, L"MouseTrails", fl); + return SpiSetInt(&gspv.iMouseTrails, uiParam, KEY_MOUSE, L"MouseTrails", fl); case SPI_GETSNAPTODEFBUTTON: return SpiGetInt(pvParam, &gspv.bSnapToDefBtn, fl); @@ -1128,13 +1095,13 @@ return SpiGetInt(pvParam, &gspv.iMouseHoverWidth, fl); case SPI_SETMOUSEHOVERWIDTH: - return SpiSetszInt(&gspv.iMouseHoverWidth, uiParam, KEY_MOUSE, L"MouseHoverWidth", fl); + return SpiSetInt(&gspv.iMouseHoverWidth, uiParam, KEY_MOUSE, L"MouseHoverWidth", fl); case SPI_GETMOUSEHOVERHEIGHT: return SpiGetInt(pvParam, &gspv.iMouseHoverHeight, fl); case SPI_SETMOUSEHOVERHEIGHT: - return SpiSetszInt(&gspv.iMouseHoverHeight, uiParam, KEY_MOUSE, L"MouseHoverHeight", fl); + return SpiSetInt(&gspv.iMouseHoverHeight, uiParam, KEY_MOUSE, L"MouseHoverHeight", fl); case SPI_GETMOUSEHOVERTIME: return SpiGetInt(pvParam, &gspv.iMouseHoverTime, fl); @@ -1147,26 +1114,26 @@ * enforce the use of USER_TIMER_MAXIMUM and USER_TIMER_MINIMUM until * Windows Server 2003 SP1 and Windows XP SP2 " */ - return SpiSetszInt(&gspv.iMouseHoverTime, uiParam, KEY_MOUSE, L"MouseHoverTime", fl); + return SpiSetInt(&gspv.iMouseHoverTime, uiParam, KEY_MOUSE, L"MouseHoverTime", fl); case SPI_GETWHEELSCROLLLINES: return SpiGetInt(pvParam, &gspv.iWheelScrollLines, fl); case SPI_SETWHEELSCROLLLINES: - return SpiSetszInt(&gspv.iWheelScrollLines, uiParam, KEY_DESKTOP, L"WheelScrollLines", fl); + return SpiSetInt(&gspv.iWheelScrollLines, uiParam, KEY_DESKTOP, L"WheelScrollLines", fl); case SPI_GETMENUSHOWDELAY: return SpiGetInt(pvParam, &gspv.dwMenuShowDelay, fl); case SPI_SETMENUSHOWDELAY: - return SpiSetszInt(&gspv.dwMenuShowDelay, uiParam, KEY_DESKTOP, L"MenuShowDelay", fl); + return SpiSetInt(&gspv.dwMenuShowDelay, uiParam, KEY_DESKTOP, L"MenuShowDelay", fl); #if (_WIN32_WINNT >= 0x0600) case SPI_GETWHEELSCROLLCHARS: return SpiGetInt(pvParam, &gspv.uiWheelScrollChars, fl); case SPI_SETWHEELSCROLLCHARS: - return SpiSetszInt(&gspv.uiWheelScrollChars, uiParam, KEY_DESKTOP, L"WheelScrollChars", fl); + return SpiSetInt(&gspv.uiWheelScrollChars, uiParam, KEY_DESKTOP, L"WheelScrollChars", fl); #endif case SPI_GETSHOWIMEUI: return SpiGetInt(pvParam, &gspv.bShowImeUi, fl); @@ -1179,7 +1146,7 @@ case SPI_SETMOUSESPEED: // vgl SETMOUSE - return SpiSetszInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, L"MouseSpeed", fl); + return SpiSetInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, L"MouseSpeed", fl); case SPI_GETSCREENSAVERRUNNING: return SpiGetInt(pvParam, &gspv.bScrSaverRunning, fl); @@ -1353,61 +1320,61 @@ return SpiGetInt(pvParam, &gspv.dwForegroundLockTimeout, fl); case SPI_SETFOREGROUNDLOCKTIMEOUT: - return SpiSetszInt(&gspv.dwForegroundLockTimeout, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.dwForegroundLockTimeout, uiParam, KEY_MOUSE, L"", fl); case SPI_GETACTIVEWNDTRKTIMEOUT: return SpiGetInt(pvParam, &gspv.dwActiveTrackingTimeout, fl); case SPI_SETACTIVEWNDTRKTIMEOUT: - return SpiSetszInt(&gspv.dwActiveTrackingTimeout, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.dwActiveTrackingTimeout, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFOREGROUNDFLASHCOUNT: return SpiGetInt(pvParam, &gspv.dwForegroundFlashCount, fl); case SPI_SETFOREGROUNDFLASHCOUNT: - return SpiSetszInt(&gspv.dwForegroundFlashCount, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.dwForegroundFlashCount, uiParam, KEY_MOUSE, L"", fl); case SPI_GETCARETWIDTH: return SpiGetInt(pvParam, &gspv.dwCaretWidth, fl); case SPI_SETCARETWIDTH: - return SpiSetszInt(&gspv.dwCaretWidth, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.dwCaretWidth, uiParam, KEY_MOUSE, L"", fl); case SPI_GETMOUSECLICKLOCKTIME: return SpiGetInt(pvParam, &gspv.dwMouseClickLockTime, fl); case SPI_SETMOUSECLICKLOCKTIME: - return SpiSetszInt(&gspv.dwMouseClickLockTime, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.dwMouseClickLockTime, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFONTSMOOTHINGTYPE: return SpiGetInt(pvParam, &gspv.uiFontSmoothingType, fl); case SPI_SETFONTSMOOTHINGTYPE: - return SpiSetszInt(&gspv.uiFontSmoothingType, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.uiFontSmoothingType, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFONTSMOOTHINGCONTRAST: return SpiGetInt(pvParam, &gspv.uiFontSmoothingContrast, fl); case SPI_SETFONTSMOOTHINGCONTRAST: - return SpiSetszInt(&gspv.uiFontSmoothingContrast, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.uiFontSmoothingContrast, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFOCUSBORDERWIDTH: return SpiGetInt(pvParam, &gspv.uiFocusBorderWidth, fl); case SPI_SETFOCUSBORDERWIDTH: - return SpiSetszInt(&gspv.uiFocusBorderWidth, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.uiFocusBorderWidth, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFOCUSBORDERHEIGHT: return SpiGetInt(pvParam, &gspv.uiFocusBorderHeight, fl); case SPI_SETFOCUSBORDERHEIGHT: - return SpiSetszInt(&gspv.uiFocusBorderHeight, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.uiFocusBorderHeight, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFONTSMOOTHINGORIENTATION: return SpiGetInt(pvParam, &gspv.uiFontSmoothingOrientation, fl); case SPI_SETFONTSMOOTHINGORIENTATION: - return SpiSetszInt(&gspv.uiFontSmoothingOrientation, uiParam, KEY_MOUSE, L"", fl); + return SpiSetInt(&gspv.uiFontSmoothingOrientation, uiParam, KEY_MOUSE, L"", fl); /* The following are undocumented, but valid SPI values */ case 0x1010:

1 0

[dgorbachev] 43303: select: change it to be more readable, avoid a spurious compiler warning.
by dgorbachev＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: dgorbachev Date: Mon Oct 5 16:13:15 2009 New Revision: 43303 URL: http://svn.reactos.org/svn/reactos?rev=43303&view=rev Log: select: change it to be more readable, avoid a spurious compiler warning. Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Mon Oct 5 16:13:15 2009 @@ -48,72 +48,69 @@ PWSSOCKET Socket; INT Status; INT ErrorCode; - BOOL Found = FALSE; SOCKET Handle; + LPWSPSELECT WSPSelect; + DPRINT("select: %lx %p %p %p %p\n", s, readfds, writefds, exceptfds, timeout); -#if defined(__GNUC__) && \ - (__GNUC__ * 100 + __GNUC_MINOR__ == 404) - /* Silence incorrect GCC 4.4.x warning */ - Handle = 0; -#endif - /* Check for WSAStartup */ - if ((ErrorCode = WsQuickProlog()) == ERROR_SUCCESS) - { - /* Use the first Socket from the first valid set */ - if (readfds && readfds->fd_count) - { - Handle = readfds->fd_array[0]; - Found = TRUE; - } - if (!Found && writefds && writefds->fd_count) - { - Handle = writefds->fd_array[0]; - Found = TRUE; - } - if (!Found && exceptfds && exceptfds->fd_count) - { - Handle = exceptfds->fd_array[0]; - Found = TRUE; - } - - /* Make sure we found one */ - if (Found) - { - /* Get the Socket Context */ - if ((Socket = WsSockGetSocket(Handle))) - { - /* Make the call */ - Status = Socket->Provider->Service.lpWSPSelect(s, - readfds, - writefds, - exceptfds, - (struct timeval *)timeout, - &ErrorCode); - /* Deference the Socket Context */ - WsSockDereference(Socket); - - /* Return Provider Value */ - if (Status != SOCKET_ERROR) return Status; - - /* If everything seemed fine, then the WSP call failed itself */ - if (ErrorCode == NO_ERROR) ErrorCode = WSASYSCALLFAILURE; - } - else - { - /* No Socket Context Found */ - ErrorCode = WSAENOTSOCK; - } - } - else - { - /* Invalid handles */ - ErrorCode = WSAEINVAL; - } - } - - /* Return with an Error */ + ErrorCode = WsQuickProlog(); + + if (ErrorCode != ERROR_SUCCESS) + { + SetLastError(ErrorCode); + return SOCKET_ERROR; + } + + /* Use the first Socket from the first valid set */ + if (readfds && readfds->fd_count) + { + Handle = readfds->fd_array[0]; + } + else if (writefds && writefds->fd_count) + { + Handle = writefds->fd_array[0]; + } + else if (exceptfds && exceptfds->fd_count) + { + Handle = exceptfds->fd_array[0]; + } + else + { + /* Invalid handles */ + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + + /* Get the Socket Context */ + Socket = WsSockGetSocket(Handle); + + if (!Socket) + { + /* No Socket Context Found */ + SetLastError(WSAENOTSOCK); + return SOCKET_ERROR; + } + + /* Get the select procedure */ + WSPSelect = Socket->Provider->Service.lpWSPSelect; + + /* Make the call */ + Status = WSPSelect(s, readfds, writefds, exceptfds, (struct timeval *)timeout, + &ErrorCode); + + /* Deference the Socket Context */ + WsSockDereference(Socket); + + /* Return Provider Value */ + if (Status != SOCKET_ERROR) + return Status; + + /* If everything seemed fine, then the WSP call failed itself */ + if (ErrorCode == NO_ERROR) + ErrorCode = WSASYSCALLFAILURE; + + /* Return with an error */ SetLastError(ErrorCode); return SOCKET_ERROR; }

1 0

[dgorbachev] 43302: Avoid GCC warnings: deprecated conversion from string constant to 'WCHAR*'.
by dgorbachev＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: dgorbachev Date: Mon Oct 5 16:13:09 2009 New Revision: 43302 URL: http://svn.reactos.org/svn/reactos?rev=43302&view=rev Log: Avoid GCC warnings: deprecated conversion from string constant to 'WCHAR*'. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -68,7 +68,7 @@ NTAPI CPortFilterDMus::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -69,7 +69,7 @@ NTAPI CPortFilterTopology::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -68,7 +68,7 @@ NTAPI CPortFilterWaveCyclic::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -70,7 +70,7 @@ NTAPI CPortFilterWavePci::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -69,7 +69,7 @@ NTAPI CPortFilterWaveRT::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -11,10 +11,10 @@ ***************************************************************************** */ -#define IMP_IIrpTarget \ +#define IMP_IIrpTarget \ STDMETHODIMP_(NTSTATUS) NewIrpTarget(THIS_ \ OUT struct IIrpTarget **OutTarget, \ - IN WCHAR * Name, \ + IN PCWSTR Name, \ IN PUNKNOWN Unknown, \ IN POOL_TYPE PoolType, \ IN PDEVICE_OBJECT DeviceObject, \ @@ -25,23 +25,23 @@ IN PDEVICE_OBJECT DeviceObject, \ IN PIRP Irp); \ \ - STDMETHODIMP_(NTSTATUS) Read(THIS_ \ - IN PDEVICE_OBJECT DeviceObject, \ - IN PIRP Irp); \ - \ - STDMETHODIMP_(NTSTATUS) Write(THIS_ \ - IN PDEVICE_OBJECT DeviceObject, \ - IN PIRP Irp); \ - \ - STDMETHODIMP_(NTSTATUS) Flush(THIS_ \ - IN PDEVICE_OBJECT DeviceObject, \ - IN PIRP Irp); \ - \ - STDMETHODIMP_(NTSTATUS) Close(THIS_ \ - IN PDEVICE_OBJECT DeviceObject, \ - IN PIRP Irp); \ - \ - STDMETHODIMP_(NTSTATUS) QuerySecurity(THIS_ \ + STDMETHODIMP_(NTSTATUS) Read(THIS_ \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PIRP Irp); \ + \ + STDMETHODIMP_(NTSTATUS) Write(THIS_ \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PIRP Irp); \ + \ + STDMETHODIMP_(NTSTATUS) Flush(THIS_ \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PIRP Irp); \ + \ + STDMETHODIMP_(NTSTATUS) Close(THIS_ \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PIRP Irp); \ + \ + STDMETHODIMP_(NTSTATUS) QuerySecurity(THIS_ \ IN PDEVICE_OBJECT DeviceObject, \ IN PIRP Irp); \ \ @@ -83,7 +83,7 @@ #define DEFINE_ABSTRACT_IRPTARGET() \ STDMETHOD_(NTSTATUS, NewIrpTarget)(THIS_ \ OUT struct IIrpTarget **OutTarget, \ - IN WCHAR * Name, \ + IN PCWSTR Name, \ IN PUNKNOWN Unknown, \ IN POOL_TYPE PoolType, \ IN PDEVICE_OBJECT DeviceObject, \ @@ -118,7 +118,7 @@ IN PDEVICE_OBJECT DeviceObject, \ IN PIRP Irp)PURE; \ \ - STDMETHOD_(BOOLEAN, FastDeviceIoControl)(THIS_ \ + STDMETHOD_(BOOLEAN, FastDeviceIoControl)(THIS_ \ IN PFILE_OBJECT FileObject, \ IN BOOLEAN Wait, \ IN PVOID InputBuffer, \ @@ -223,7 +223,7 @@ #define DEFINE_ABSTRACT_ISUBDEVICE() \ STDMETHOD_(NTSTATUS, NewIrpTarget)(THIS_ \ OUT IIrpTarget **OutTarget, \ - IN WCHAR * Name, \ + IN PCWSTR Name, \ IN PUNKNOWN Unknown, \ IN POOL_TYPE PoolType, \ IN PDEVICE_OBJECT DeviceObject, \ @@ -259,7 +259,7 @@ #define IMP_ISubdevice \ STDMETHODIMP_(NTSTATUS) NewIrpTarget( \ OUT IIrpTarget **OutTarget, \ - IN WCHAR * Name, \ + IN PCWSTR Name, \ IN PUNKNOWN Unknown, \ IN POOL_TYPE PoolType, \ IN PDEVICE_OBJECT DeviceObject, \ @@ -369,42 +369,42 @@ IN ULONG Alignment, \ IN PVOID SilenceBuffer); \ \ - STDMETHODIMP_(NTSTATUS) AddMapping(THIS_ \ + STDMETHODIMP_(NTSTATUS) AddMapping(THIS_ \ IN PUCHAR Buffer, \ IN ULONG BufferSize, \ IN PIRP Irp); \ \ - STDMETHODIMP_(NTSTATUS) GetMapping(THIS_ \ + STDMETHODIMP_(NTSTATUS) GetMapping(THIS_ \ OUT PUCHAR * Buffer, \ OUT PULONG BufferSize); \ \ - STDMETHODIMP_(VOID) UpdateMapping(THIS_ \ + STDMETHODIMP_(VOID) UpdateMapping(THIS_ \ IN ULONG BytesWritten); \ \ - STDMETHODIMP_(ULONG) NumMappings(THIS); \ + STDMETHODIMP_(ULONG) NumMappings(THIS); \ \ - STDMETHODIMP_(ULONG) NumData(THIS); \ + STDMETHODIMP_(ULONG) NumData(THIS); \ \ - STDMETHODIMP_(BOOL) MinimumDataAvailable(THIS); \ + STDMETHODIMP_(BOOL) MinimumDataAvailable(THIS); \ \ - STDMETHODIMP_(BOOL) CancelBuffers(THIS); \ + STDMETHODIMP_(BOOL) CancelBuffers(THIS); \ \ - STDMETHODIMP_(VOID) UpdateFormat(THIS_ \ + STDMETHODIMP_(VOID) UpdateFormat(THIS_ \ IN PKSDATAFORMAT DataFormat); \ \ - STDMETHODIMP_(NTSTATUS) GetMappingWithTag(THIS_ \ + STDMETHODIMP_(NTSTATUS) GetMappingWithTag(THIS_ \ IN PVOID Tag, \ OUT PPHYSICAL_ADDRESS PhysicalAddress, \ OUT PVOID *VirtualAddress, \ OUT PULONG ByteCount, \ OUT PULONG Flags); \ \ - STDMETHODIMP_(NTSTATUS) ReleaseMappingWithTag( \ + STDMETHODIMP_(NTSTATUS) ReleaseMappingWithTag( \ IN PVOID Tag); \ \ - STDMETHODIMP_(BOOL) HasLastMappingFailed(THIS); \ - STDMETHODIMP_(VOID) PrintQueueStatus(THIS); \ - STDMETHODIMP_(VOID) SetMinimumDataThreshold( \ + STDMETHODIMP_(BOOL) HasLastMappingFailed(THIS); \ + STDMETHODIMP_(VOID) PrintQueueStatus(THIS); \ + STDMETHODIMP_(VOID) SetMinimumDataThreshold( \ IN ULONG MinimumDataThreshold); \ STDMETHODIMP_(ULONG) GetMinimumDataThreshold(VOID) @@ -871,7 +871,7 @@ IN PPORTFILTERDMUS Filter, \ IN KSPIN_CONNECT * ConnectDetails, \ IN KSPIN_DESCRIPTOR * PinDescriptor, \ - IN PDEVICE_OBJECT DeviceObject); \ + IN PDEVICE_OBJECT DeviceObject); \ STDMETHODIMP_(VOID) Notify(THIS) typedef IPortPinDMus *PPORTPINDMUS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -424,7 +424,7 @@ NTAPI CPortPinDMus::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -346,7 +346,7 @@ NTAPI CPortPinWaveCyclic::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -289,7 +289,7 @@ NTAPI CPortPinWavePci::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -311,7 +311,7 @@ NTAPI CPortPinWaveRT::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -387,7 +387,7 @@ NTAPI CPortDMus::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -320,7 +320,7 @@ NTAPI CPortTopology::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -437,7 +437,7 @@ NTAPI CPortWaveCyclic::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -438,7 +438,7 @@ NTAPI CPortWavePci::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] Mon Oct 5 16:13:09 2009 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel Streaming + * PROJECT: ReactOS Kernel Streaming * FILE: drivers/wdm/audio/backpln/portcls/port_wavert.cpp * PURPOSE: WaveRT Port Driver * PROGRAMMER: Johannes Anderwald @@ -339,7 +339,7 @@ NTAPI CPortWaveRT::NewIrpTarget( OUT struct IIrpTarget **OutTarget, - IN WCHAR * Name, + IN PCWSTR Name, IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT DeviceObject,

1 0

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