Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 41899: - Implement retrieving position
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sun Jul 12 03:21:09 2009 New Revision: 41899 URL: http://svn.reactos.org/svn/reactos?rev=41899&view=rev Log: - Implement retrieving position Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/format.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Sun Jul 12 03:21:09 2009 @@ -121,7 +121,7 @@ if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); - Result = SetWaveDeviceFormat(SoundDeviceInstance, Format, sizeof(WAVEFORMATEX)); + Result = SetWaveDeviceFormat(SoundDeviceInstance, DeviceId, Format, sizeof(WAVEFORMATEX)); if ( ! MMSUCCESS(Result) ) { /* TODO: Destroy sound instance */ @@ -204,3 +204,46 @@ return StopStreaming(SoundDeviceInstance); } + +MMRESULT +MmeGetPosition( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN DWORD PrivateHandle, + IN MMTIME* Time, + IN DWORD Size) +{ + MMRESULT Result; + PSOUND_DEVICE_INSTANCE SoundDeviceInstance; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE FunctionTable; + + VALIDATE_MMSYS_PARAMETER( PrivateHandle ); + SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle; + + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) + return MMSYSERR_INVALHANDLE; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + if ( Size != sizeof(MMTIME) ) + return MMSYSERR_INVALPARAM; + + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + if ( FunctionTable->GetPos == NULL ) + { + /* This indicates bad practice, really! If you can open, why not close?! */ + return MMSYSERR_NOTSUPPORTED; + } + + /* Call the driver */ + Result = FunctionTable->GetPos(SoundDeviceInstance, Time); + + return Result; +} + Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sun Jul 12 03:21:09 2009 @@ -53,6 +53,7 @@ MMRESULT SetWaveDeviceFormat( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD DeviceId, IN LPWAVEFORMATEX Format, IN DWORD FormatSize) { @@ -87,5 +88,5 @@ if ( ! FunctionTable->SetWaveFormat ) return MMSYSERR_NOTSUPPORTED; - return FunctionTable->SetWaveFormat(SoundDeviceInstance, Format, FormatSize); + return FunctionTable->SetWaveFormat(SoundDeviceInstance, DeviceId, Format, FormatSize); } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 12 03:21:09 2009 @@ -113,6 +113,7 @@ case WODM_GETPOS : { + Result = MmeGetPosition(WAVE_OUT_DEVICE_TYPE, DeviceId, PrivateHandle, (MMTIME*)Parameter1, Parameter2); break; } }

1 0

[janderwald] 41898: - Add function for retrieving current position
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sun Jul 12 03:20:22 2009 New Revision: 41898 URL: http://svn.reactos.org/svn/reactos?rev=41898&view=rev Log: - Add function for retrieving current position Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 12 03:20:22 2009 @@ -201,6 +201,7 @@ typedef MMRESULT (*MMWAVESETFORMAT_FUNC)( IN struct _SOUND_DEVICE_INSTANCE* Instance, + IN DWORD DeviceId, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize); @@ -220,6 +221,10 @@ IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN PVOID Buffer, IN DWORD Length); + +typedef MMRESULT(*MMGETPOS_FUNC)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMTIME* Time); typedef struct _MMFUNCTION_TABLE { @@ -240,6 +245,8 @@ WAVE_COMMIT_FUNC CommitWaveBuffer; + MMGETPOS_FUNC GetPos; + // Redundant //MMWAVEHEADER_FUNC PrepareWaveHeader; //MMWAVEHEADER_FUNC UnprepareWaveHeader; @@ -377,6 +384,15 @@ MmeCloseDevice( IN DWORD PrivateHandle); +MMRESULT +MmeGetPosition( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN DWORD PrivateHandle, + IN MMTIME* Time, + IN DWORD Size); + + #define MmePrepareWaveHeader(private_handle, header) \ PrepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) @@ -564,6 +580,7 @@ MMRESULT SetWaveDeviceFormat( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN DWORD DeviceId, IN LPWAVEFORMATEX Format, IN DWORD FormatSize);

1 0

[dreimer] 41897: Fix a bug. Spotted by paule_52
by dreimer＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: dreimer Date: Sun Jul 12 02:56:05 2009 New Revision: 41897 URL: http://svn.reactos.org/svn/reactos?rev=41897&view=rev Log: Fix a bug. Spotted by paule_52 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sun Jul 12 02:56:05 2009 @@ -85,19 +85,19 @@ if ($_ROSBE_SHOWTIME -eq 1) { [System.Diagnostics.Stopwatch] $sw; $sw = New-Object System.Diagnostics.StopWatch + $sw.Start() } if ($_ROSBE_WRITELOG -eq 1) { - $sw.Start() $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file +} else { + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) +} +if ($_ROSBE_SHOWTIME -eq 1) { $sw.Stop() -} else { - $sw.Start() - &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) - $sw.Stop() + write-host "Total Build Time:" $sw.Elapsed.ToString() } -write-host "Total Build Time:" $sw.Elapsed.ToString() # Highlight the fact that building has ended. "$_ROSBE_BASEDIR\Tools\flash.exe"

1 0

[jimtabor] 41896: - Global/LocalFlags, now checking the right bit for discared heap and not doing it the wine way.
by jimtabor＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: jimtabor Date: Sun Jul 12 02:52:36 2009 New Revision: 41896 URL: http://svn.reactos.org/svn/reactos?rev=41896&view=rev Log: - Global/LocalFlags, now checking the right bit for discared heap and not doing it the wine way. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] Sun Jul 12 02:52:36 2009 @@ -224,7 +224,7 @@ /* Get the lock count first */ uFlags = HandleEntry->LockCount & GMEM_LOCKCOUNT; - /* Now check if it's discarded */ + /* Now check if it's discardable */ if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE) { /* Set the Win32 Flag */ @@ -238,7 +238,10 @@ uFlags |= GMEM_DDESHARE; } - if (!HandleEntry->Object) uFlags |= GMEM_DISCARDED; + /* Now check if it's discarded */ + if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSE) + /* Set the Win32 Flag */ + uFlags |= GMEM_DISCARDED; } } Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Sun Jul 12 02:52:36 2009 @@ -201,14 +201,17 @@ /* Get the lock count first */ uFlags = HandleEntry->LockCount & LMEM_LOCKCOUNT; - /* Now check if it's discarded */ + /* Now check if it's discardable */ if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE) { /* Set the Win32 Flag */ uFlags |= LMEM_DISCARDABLE; } - if (!HandleEntry->Object) uFlags |= LMEM_DISCARDED; + /* Now check if it's discarded */ + if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSE) + /* Set the Win32 Flag */ + uFlags |= LMEM_DISCARDED; } }

1 0

[jimtabor] 41895: - Fix Global/LocalFlags returns. Now pass all kernel32 heap tests.
by jimtabor＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: jimtabor Date: Sun Jul 12 02:14:19 2009 New Revision: 41895 URL: http://svn.reactos.org/svn/reactos?rev=41895&view=rev Log: - Fix Global/LocalFlags returns. Now pass all kernel32 heap tests. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] Sun Jul 12 02:14:19 2009 @@ -228,14 +228,7 @@ if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE) { /* Set the Win32 Flag */ - uFlags |= GMEM_DISCARDED; - } - - /* Check if it's movable */ - if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_MOVABLE) - { - /* Set the Win32 Flag */ - uFlags |= GMEM_MOVEABLE; + uFlags |= GMEM_DISCARDABLE; } /* Check if it's DDE Shared */ @@ -244,6 +237,8 @@ /* Set the Win32 Flag */ uFlags |= GMEM_DDESHARE; } + + if (!HandleEntry->Object) uFlags |= GMEM_DISCARDED; } } @@ -806,6 +801,7 @@ /* It's not, fail */ BASE_TRACE_FAILURE(); SetLastError(ERROR_INVALID_HANDLE); + RetVal = FALSE; } else { Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Sun Jul 12 02:14:19 2009 @@ -205,15 +205,10 @@ if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSABLE) { /* Set the Win32 Flag */ - uFlags |= LMEM_DISCARDED; - } - - /* Check if it's movable */ - if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_MOVABLE) - { - /* Set the Win32 Flag */ uFlags |= LMEM_DISCARDABLE; } + + if (!HandleEntry->Object) uFlags |= LMEM_DISCARDED; } }

1 0

[janderwald] 41894: [WDMAUD.DRV] - The wave / mixer / midi handles are kernel handles, consequently wdmaud_kernel must close them
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sun Jul 12 02:02:30 2009 New Revision: 41894 URL: http://svn.reactos.org/svn/reactos?rev=41894&view=rev Log: [WDMAUD.DRV] - The wave / mixer / midi handles are kernel handles, consequently wdmaud_kernel must close them Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Sun Jul 12 02:02:30 2009 @@ -175,6 +175,18 @@ IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN PVOID Handle) { + WDMAUD_DEVICE_INFO DeviceInfo; + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + PSOUND_DEVICE SoundDevice; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + if ( OpenCount == 0 ) { return MMSYSERR_NOERROR; @@ -182,9 +194,23 @@ SND_ASSERT( KernelHandle != INVALID_HANDLE_VALUE ); + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + if (SoundDeviceInstance->Handle != (PVOID)KernelHandle) { - CloseHandle((HANDLE)SoundDeviceInstance->Handle); + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.hDevice = SoundDeviceInstance->Handle; + + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_CLOSE_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); } --OpenCount;

1 0

[dchapyshev] 41893: - Set status to STATUS_OBJECT_NAME_INVALID if NtCreateMailslotFile returned STATUS_NOT_SUPPORTED
by dchapyshev＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: dchapyshev Date: Sun Jul 12 00:34:33 2009 New Revision: 41893 URL: http://svn.reactos.org/svn/reactos?rev=41893&view=rev Log: - Set status to STATUS_OBJECT_NAME_INVALID if NtCreateMailslotFile returned STATUS_NOT_SUPPORTED Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] Sun Jul 12 00:34:33 2009 @@ -109,7 +109,7 @@ nMaxMessageSize, &DefaultTimeOut); - if (Status == STATUS_INVALID_DEVICE_REQUEST) + if (Status == STATUS_INVALID_DEVICE_REQUEST || Status == STATUS_NOT_SUPPORTED) { Status = STATUS_OBJECT_NAME_INVALID; }

1 0

[tkreuzer] 41892: [win32k] Implement brush realization part 2 / 2 Use EBRUSHOBJ_pvGetEngBrush to get a handle to the realized (color translated) brush and use this instead of the original pattern when doing patblts. We don't use any XLATEOBJ anymore. I'll leave it to the interested reader to cleanup the DIB code from remnants of pattern to dest color translation.
by tkreuzer＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: tkreuzer Date: Sun Jul 12 00:15:37 2009 New Revision: 41892 URL: http://svn.reactos.org/svn/reactos?rev=41892&view=rev Log: [win32k] Implement brush realization part 2 / 2 Use EBRUSHOBJ_pvGetEngBrush to get a handle to the realized (color translated) brush and use this instead of the original pattern when doing patblts. We don't use any XLATEOBJ anymore. I'll leave it to the interested reader to cleanup the DIB code from remnants of pattern to dest color translation. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c trunk/reactos/subsystems/win32/win32k/include/brush.h Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Jul 12 00:15:37 2009 @@ -48,9 +48,8 @@ LONG PatternX0 = 0, PatternX = 0, PatternY = 0; PFN_DIB_PutPixel fnDest_PutPixel = NULL; PFN_DIB_GetPixel fnPattern_GetPixel = NULL; - XLATEOBJ *XlateObj; ULONG Pattern = 0; - SURFACE *psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); + HBITMAP hbmPattern; if (psoMask == NULL) { @@ -61,7 +60,8 @@ { pebo = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - psurfPattern = SURFACE_LockSurface(pebo->pbrush->hbmPattern); + hbmPattern = EBRUSHOBJ_pvGetEngBrush(pebo); + psurfPattern = SURFACE_LockSurface(hbmPattern); if (psurfPattern != NULL) { psoPattern = &psurfPattern->SurfObj; @@ -79,9 +79,6 @@ fnDest_PutPixel = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_PutPixel; if (psurfPattern) { - XlateObj = IntCreateBrushXlate(pebo->pbrush, - psurfDest, - pebo->crCurrentBack); PatternY = (prclDest->top - pptlBrush->y) % PatternHeight; if (PatternY < 0) { @@ -104,8 +101,7 @@ if (*pjMskCurrent & fjMaskBit) { fnDest_PutPixel(psoDest, x, y, - XLATEOBJ_iXlate(XlateObj, - fnPattern_GetPixel(psoPattern, PatternX, PatternY))); + fnPattern_GetPixel(psoPattern, PatternX, PatternY)); } fjMaskBit = _rotr8(fjMaskBit, 1); pjMskCurrent += (fjMaskBit >> 7); @@ -116,9 +112,6 @@ PatternY++; PatternY %= PatternHeight; } - - if (XlateObj) - EngDeleteXlate(XlateObj); } else { @@ -183,8 +176,7 @@ PEBRUSHOBJ GdiBrush = NULL; SURFACE *psurfPattern; BOOLEAN Result; - SURFACE *psurfDest = CONTAINING_RECORD(OutputObj, SURFACE, SurfObj); - XLATEOBJ *XlatePatternToDest = NULL; + HBITMAP hbmPattern; BltInfo.DestSurface = OutputObj; BltInfo.SourceSurface = InputObj; @@ -205,7 +197,9 @@ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { GdiBrush = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - if ((psurfPattern = SURFACE_LockSurface(GdiBrush->pbrush->hbmPattern))) + hbmPattern = EBRUSHOBJ_pvGetEngBrush(GdiBrush); + psurfPattern = SURFACE_LockSurface(hbmPattern); + if (psurfPattern) { BltInfo.PatternSurface = &psurfPattern->SurfObj; } @@ -213,10 +207,6 @@ { /* FIXME - What to do here? */ } - XlatePatternToDest = IntCreateBrushXlate(GdiBrush->pbrush, - psurfDest, - GdiBrush->crCurrentBack); - BltInfo.XlatePatternToDest = XlatePatternToDest; } else { @@ -225,11 +215,8 @@ Result = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(&BltInfo); - if (XlatePatternToDest) - EngDeleteXlate(XlatePatternToDest); - /* Pattern brush */ - if (psurfPattern != NULL) + if (psurfPattern) { SURFACE_UnlockSurface(psurfPattern); } Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sun Jul 12 00:15:37 2009 @@ -276,8 +276,10 @@ if (!bResult) { if (pbo->pvRbrush) + { EngFreeMem(pbo->pvRbrush); - pbo->pvRbrush = NULL; + pbo->pvRbrush = NULL; + } } } Modified: trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Sun Jul 12 00:15:37 2009 @@ -38,9 +38,8 @@ SURFACE* psurfPattern; PEBRUSHOBJ GdiBrush = NULL; SURFOBJ* PatternSurface = NULL; - XLATEOBJ* XlatePatternToDest = NULL; BOOL bResult; - SURFACE *psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); + HBITMAP hbmPattern; if (BrushOrigin == NULL) { @@ -55,7 +54,8 @@ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { GdiBrush = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - psurfPattern = SURFACE_LockSurface(GdiBrush->pbrush->hbmPattern); + hbmPattern = EBRUSHOBJ_pvGetEngBrush(GdiBrush); + psurfPattern = SURFACE_LockSurface(hbmPattern); if (psurfPattern) { PatternSurface = &psurfPattern->SurfObj; @@ -64,9 +64,6 @@ { /* FIXME - What to do here? */ } - XlatePatternToDest = IntCreateBrushXlate(GdiBrush->pbrush, - psurfDest, - GdiBrush->crCurrentBack); } else { @@ -76,12 +73,7 @@ bResult = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( psoDest, psoSource, Mask, PatternSurface, OutputRect, InputRect, MaskOrigin, pbo, &RealBrushOrigin, - ColorTranslation, XlatePatternToDest, Rop4); - - if (XlatePatternToDest) - { - EngDeleteXlate(XlatePatternToDest); - } + ColorTranslation, NULL, Rop4); /* Pattern brush */ if (psurfPattern) @@ -155,7 +147,7 @@ /* Copy destination onto itself: nop */ return TRUE; } - + OutputRect = *prclDest; if (OutputRect.right < OutputRect.left) { @@ -167,7 +159,7 @@ OutputRect.top = prclDest->bottom; OutputRect.bottom = prclDest->top; } - + InputRect = *prclSrc; if (UsesSource) { @@ -256,12 +248,12 @@ switch (clippingType) { case DC_TRIVIAL: - Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ColorTranslation, &OutputRect, &InputRect, MaskOrigin, pbo, &AdjustedBrushOrigin, ROP4); break; case DC_RECT: - // Clip the blt to the clip rectangle + // Clip the blt to the clip rectangle ClipRect.left = ClipRegion->rclBounds.left + Translate.x; ClipRect.right = ClipRegion->rclBounds.right + Translate.x; ClipRect.top = ClipRegion->rclBounds.top + Translate.y; @@ -272,13 +264,13 @@ InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; - Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, - ColorTranslation, + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, + ColorTranslation, &CombinedRect, &InputToCombinedRect, MaskOrigin, - pbo, - &AdjustedBrushOrigin, + pbo, + &AdjustedBrushOrigin, ROP4); } break; @@ -317,13 +309,13 @@ InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; - Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, - ColorTranslation, + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, + ColorTranslation, &CombinedRect, &InputToCombinedRect, MaskOrigin, - pbo, - &AdjustedBrushOrigin, + pbo, + &AdjustedBrushOrigin, ROP4); } } @@ -415,7 +407,7 @@ InputClippedRect.top = DestRect->bottom; InputClippedRect.bottom = DestRect->top; } - + if (UsesSource) { if (NULL == SourceRect || NULL == psoSource) @@ -423,14 +415,14 @@ return FALSE; } InputRect = *SourceRect; - + if (InputRect.right < InputRect.left || InputRect.bottom < InputRect.top) { /* Everything clipped away, nothing to do */ return TRUE; } - } + } if (ClipRegion) { @@ -454,7 +446,7 @@ { OutputRect = InputClippedRect; } - + if (pMaskOrigin != NULL) { MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y; Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sun Jul 12 00:15:37 2009 @@ -124,4 +124,8 @@ NTAPI EBRUSHOBJ_vCleanup(EBRUSHOBJ *pebo); +PVOID +NTAPI +EBRUSHOBJ_pvGetEngBrush(EBRUSHOBJ *pebo); + #endif

1 0

[janderwald] 41891: - Implement dynamic unregistration of physical connections - Implement IUnregisterPhysicalConnection interface for all port drivers
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sat Jul 11 23:01:18 2009 New Revision: 41891 URL: http://svn.reactos.org/svn/reactos?rev=41891&view=rev Log: - Implement dynamic unregistration of physical connections - Implement IUnregisterPhysicalConnection interface for all port drivers Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c [iso-8859-1] Sat Jul 11 23:01:18 2009 @@ -9,6 +9,247 @@ #include "private.h" +typedef struct +{ + IUnregisterPhysicalConnectionVtbl *lpVtbl; + LONG ref; + +}IUnregisterPhysicalConnectionImpl; + +NTSTATUS +NTAPI +IUnregisterPhysicalConnection_fnQueryInterface( + IUnregisterPhysicalConnection* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IUnregisterPhysicalConnectionImpl * This = (IUnregisterPhysicalConnectionImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IUnregisterPhysicalConnection) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IUnregisterPhysicalConnection_fnAddRef( + IUnregisterPhysicalConnection* iface) +{ + IUnregisterPhysicalConnectionImpl * This = (IUnregisterPhysicalConnectionImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IUnregisterPhysicalConnection_fnRelease( + IUnregisterPhysicalConnection* iface) +{ + IUnregisterPhysicalConnectionImpl * This = (IUnregisterPhysicalConnectionImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +static +NTSTATUS +UnRegisterConnection( + IN OUT PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN PUNICODE_STRING ToString, + IN ULONG ToPin) +{ + PLIST_ENTRY Entry; + PPHYSICAL_CONNECTION Connection; + PPCLASS_DEVICE_EXTENSION DeviceExt; + NTSTATUS Status; + ISubdevice * FromSubDevice = NULL; + ISubdevice * ToSubDevice = NULL; + ULONG bFound; + + DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (FromUnknown) + { + /* get our private interface */ + Status = FromUnknown->lpVtbl->QueryInterface(FromUnknown, &IID_ISubdevice, (PVOID*)&FromSubDevice); + if (!NT_SUCCESS(Status)) + return STATUS_INVALID_PARAMETER; + } + + if (ToUnknown) + { + Status = ToUnknown->lpVtbl->QueryInterface(ToUnknown, &IID_ISubdevice, (PVOID*)&ToSubDevice); + if (!NT_SUCCESS(Status)) + goto cleanup; + } + + + Entry = DeviceExt->PhysicalConnectionList.Flink; + bFound = FALSE; + /* loop physical connection list */ + while(Entry != &DeviceExt->PhysicalConnectionList) + { + Connection = (PPHYSICAL_CONNECTION)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION, Entry); + /* compare current entry */ + if (Connection->FromPin == FromPin && Connection->ToPin == ToPin && + Connection->FromSubDevice == FromSubDevice && Connection->ToSubDevice == ToSubDevice) + { + if (FromString && Connection->FromUnicodeString.Buffer) + { + if (!RtlCompareUnicodeString(FromString, &Connection->FromUnicodeString, TRUE)) + { + /* UnregisterPhysicalConnectionFromExternal */ + bFound = TRUE; + break; + } + } + else if (ToString && Connection->ToUnicodeString.Buffer) + { + if (!RtlCompareUnicodeString(ToString, &Connection->ToUnicodeString, TRUE)) + { + /* UnregisterPhysicalConnectionToExternal */ + bFound = TRUE; + break; + } + } + else + { + /* UnregisterPhysicalConnection */ + bFound = TRUE; + break; + } + } + Entry = Entry->Flink; + } + + if (!bFound) + { + /* not found */ + Status = STATUS_NOT_FOUND; + goto cleanup; + } + + /* remove list entry */ + RemoveEntryList(&Connection->Entry); + + /* release resources */ + if (Connection->FromSubDevice) + Connection->FromSubDevice->lpVtbl->Release(Connection->FromSubDevice); + + + if (Connection->ToSubDevice) + Connection->ToSubDevice->lpVtbl->Release(Connection->ToSubDevice); + + if (Connection->FromUnicodeString.Buffer) + RtlFreeUnicodeString(&Connection->FromUnicodeString); + + if (Connection->ToUnicodeString.Buffer) + RtlFreeUnicodeString(&Connection->ToUnicodeString); + + FreeItem(Connection, TAG_PORTCLASS); + Status = STATUS_SUCCESS; + +cleanup: + + if (FromSubDevice) + FromSubDevice->lpVtbl->Release(FromSubDevice); + + if (ToSubDevice) + ToSubDevice->lpVtbl->Release(ToSubDevice); + + return Status; + +} + +NTSTATUS +NTAPI +IUnregisterPhysicalConnection_fnUnregisterPhysicalConnection( + IN IUnregisterPhysicalConnection* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + if (!DeviceObject || !FromUnknown || !ToUnknown) + return STATUS_INVALID_PARAMETER; + + return UnRegisterConnection(DeviceObject, FromUnknown, NULL, FromPin, ToUnknown, NULL, ToPin); +} + +NTSTATUS +NTAPI +IUnregisterPhysicalConnection_fnUnregisterPhysicalConnectionToExternal( + IN IUnregisterPhysicalConnection* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNICODE_STRING ToString, + IN ULONG ToPin) +{ + if (!DeviceObject || !FromUnknown || !ToString) + return STATUS_INVALID_PARAMETER; + + return UnRegisterConnection(DeviceObject, FromUnknown, NULL, FromPin, NULL, ToString, ToPin); +} + +NTSTATUS +NTAPI +IUnregisterPhysicalConnection_fnUnregisterPhysicalConnectionFromExternal( + IN IUnregisterPhysicalConnection* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + if (!DeviceObject || !FromString || !ToUnknown) + return STATUS_INVALID_PARAMETER; + + return UnRegisterConnection(DeviceObject, NULL, FromString, FromPin, ToUnknown, NULL, ToPin); +} + +static IUnregisterPhysicalConnectionVtbl vt_IUnregisterPhysicalConnection = +{ + IUnregisterPhysicalConnection_fnQueryInterface, + IUnregisterPhysicalConnection_fnAddRef, + IUnregisterPhysicalConnection_fnRelease, + IUnregisterPhysicalConnection_fnUnregisterPhysicalConnection, + IUnregisterPhysicalConnection_fnUnregisterPhysicalConnectionToExternal, + IUnregisterPhysicalConnection_fnUnregisterPhysicalConnectionFromExternal +}; + +NTSTATUS +NTAPI +NewIUnregisterPhysicalConnection( + OUT PUNREGISTERPHYSICALCONNECTION *OutConnection) +{ + IUnregisterPhysicalConnectionImpl * This = (IUnregisterPhysicalConnectionImpl*)AllocateItem(NonPagedPool, sizeof(IUnregisterPhysicalConnectionImpl), TAG_PORTCLASS); + + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_IUnregisterPhysicalConnection; + This->ref = 1; + *OutConnection = (PUNREGISTERPHYSICALCONNECTION)&This->lpVtbl; + return STATUS_SUCCESS; +} NTSYSAPI BOOLEAN @@ -30,75 +271,66 @@ IN ULONG ToPin) { PHYSICAL_CONNECTION *NewConnection; - UNICODE_STRING FromUnicodeString = {0, 0, 0}; - UNICODE_STRING ToUnicodeString = {0, 0, 0}; - ISubdevice * FromSubDevice = NULL; - ISubdevice * ToSubDevice = NULL; PPCLASS_DEVICE_EXTENSION DeviceExt; + NTSTATUS Status; DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - - NTSTATUS Status = STATUS_SUCCESS; - - if (FromUnknown) - { - Status = FromUnknown->lpVtbl->QueryInterface(FromUnknown, &IID_ISubdevice, (PVOID*)&FromSubDevice); - if (!NT_SUCCESS(Status)) - return STATUS_INVALID_PARAMETER; - } - else - { - if (!RtlCreateUnicodeString(&FromUnicodeString, (PCWSTR)FromString)) - return STATUS_INSUFFICIENT_RESOURCES; - } - - if (ToUnknown) - { - Status = ToUnknown->lpVtbl->QueryInterface(ToUnknown, &IID_ISubdevice, (PVOID*)&ToSubDevice); - } - else - { - if (!RtlCreateUnicodeString(&ToUnicodeString, (PCWSTR)ToString)) - Status = STATUS_INSUFFICIENT_RESOURCES; - } - - if (!NT_SUCCESS(Status)) - { - goto cleanup; - } NewConnection = AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION), TAG_PORTCLASS); if (!NewConnection) { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - - NewConnection->FromPin = FromPin; - NewConnection->FromSubDevice = FromSubDevice; - NewConnection->FromUnicodeString = FromUnicodeString.Buffer; - NewConnection->ToPin = ToPin; - NewConnection->ToSubDevice = ToSubDevice; - NewConnection->ToUnicodeString = ToUnicodeString.Buffer; - + return STATUS_INSUFFICIENT_RESOURCES; + } + + + if (FromUnknown) + { + Status = FromUnknown->lpVtbl->QueryInterface(FromUnknown, &IID_ISubdevice, (PVOID*)&NewConnection->FromSubDevice); + if (!NT_SUCCESS(Status)) + goto cleanup; + } + else + { + if (!RtlCreateUnicodeString(&NewConnection->FromUnicodeString, (PCWSTR)FromString)) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + } + + if (ToUnknown) + { + Status = ToUnknown->lpVtbl->QueryInterface(ToUnknown, &IID_ISubdevice, (PVOID*)&NewConnection->ToSubDevice); + if (!NT_SUCCESS(Status)) + goto cleanup; + } + else + { + if (!RtlCreateUnicodeString(&NewConnection->ToUnicodeString, (PCWSTR)ToString)) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + } InsertTailList(&DeviceExt->PhysicalConnectionList, &NewConnection->Entry); return STATUS_SUCCESS; cleanup: - if (FromSubDevice) - FromSubDevice->lpVtbl->Release(FromSubDevice); - - if (ToSubDevice) - ToSubDevice->lpVtbl->Release(ToSubDevice); - - if (FromUnicodeString.Buffer) - RtlFreeUnicodeString(&FromUnicodeString); - - if (ToUnicodeString.Buffer) - RtlFreeUnicodeString(&ToUnicodeString); + if (NewConnection->FromSubDevice) + NewConnection->FromSubDevice->lpVtbl->Release(NewConnection->FromSubDevice); + + if (NewConnection->ToSubDevice) + NewConnection->ToSubDevice->lpVtbl->Release(NewConnection->ToSubDevice); + + if (NewConnection->FromUnicodeString.Buffer) + RtlFreeUnicodeString(&NewConnection->FromUnicodeString); + + if (NewConnection->ToUnicodeString.Buffer) + RtlFreeUnicodeString(&NewConnection->ToUnicodeString); + + FreeItem(NewConnection, TAG_PORTCLASS); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Sat Jul 11 23:01:18 2009 @@ -86,6 +86,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterPhysicalConnection)) + { + return NewIUnregisterPhysicalConnection((PUNREGISTERPHYSICALCONNECTION*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sat Jul 11 23:01:18 2009 @@ -104,6 +104,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterPhysicalConnection)) + { + return NewIUnregisterPhysicalConnection((PUNREGISTERPHYSICALCONNECTION*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Sat Jul 11 23:01:18 2009 @@ -229,6 +229,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterPhysicalConnection)) + { + return NewIUnregisterPhysicalConnection((PUNREGISTERPHYSICALCONNECTION*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sat Jul 11 23:01:18 2009 @@ -289,6 +289,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterPhysicalConnection)) + { + return NewIUnregisterPhysicalConnection((PUNREGISTERPHYSICALCONNECTION*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] Sat Jul 11 23:01:18 2009 @@ -225,6 +225,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterPhysicalConnection)) + { + return NewIUnregisterPhysicalConnection((PUNREGISTERPHYSICALCONNECTION*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sat Jul 11 23:01:18 2009 @@ -300,6 +300,10 @@ NewIUnregisterSubdevice( OUT PUNREGISTERSUBDEVICE *OutDevice); +NTSTATUS +NTAPI +NewIUnregisterPhysicalConnection( + OUT PUNREGISTERPHYSICALCONNECTION *OutConnection); #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ @@ -337,12 +341,12 @@ { LIST_ENTRY Entry; ISubdevice * FromSubDevice; - LPWSTR FromUnicodeString; + UNICODE_STRING FromUnicodeString; ULONG FromPin; ISubdevice * ToSubDevice; - LPWSTR ToUnicodeString; + UNICODE_STRING ToUnicodeString; ULONG ToPin; -}PHYSICAL_CONNECTION; +}PHYSICAL_CONNECTION, *PPHYSICAL_CONNECTION; typedef struct {

1 0

[janderwald] 41890: - Implement dynamic unregistration of audio devices - IoGetDeviceProperty expects the PDO, not FDO - Implement IUnregisterSubdevice interface for all port drivers
by janderwald＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: janderwald Date: Sat Jul 11 21:44:41 2009 New Revision: 41890 URL: http://svn.reactos.org/svn/reactos?rev=41890&view=rev Log: - Implement dynamic unregistration of audio devices - IoGetDeviceProperty expects the PDO, not FDO - Implement IUnregisterSubdevice interface for all port drivers Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -145,6 +145,8 @@ goto cleanup; } + /* store max subdevice count */ + portcls_ext->MaxSubDevices = MaxObjects; /* store the physical device object */ portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; /* set up the start device function */ @@ -237,6 +239,8 @@ SUBDEVICE_DESCRIPTOR * SubDeviceDescriptor; ULONG Index; UNICODE_STRING RefName; + PSUBDEVICE_ENTRY Entry; + PSYMBOLICLINK_ENTRY SymEntry; DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -276,18 +280,36 @@ return STATUS_UNSUCCESSFUL; } + /* allocate subdevice entry */ + Entry = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); + if (!Entry) + { + /* Insufficient memory */ + SubDevice->lpVtbl->Release(SubDevice); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* add an create item to the device header */ Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PcCreateItemDispatch, (PVOID)SubDevice, Name, NULL); if (!NT_SUCCESS(Status)) { /* failed to attach */ SubDevice->lpVtbl->Release(SubDevice); + FreeItem(Entry, TAG_PORTCLASS); DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } /* initialize reference string */ RtlInitUnicodeString(&RefName, Name); + + /* initialize subdevice entry */ + Entry->SubDevice = SubDevice; + RtlInitUnicodeString(&Entry->Name, Name); + InitializeListHead(&Entry->SymbolicLinkList); + + /* store subdevice entry */ + InsertTailList(&DeviceExt->SubDeviceList, &Entry->Entry); for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { @@ -300,12 +322,26 @@ &SymbolicLinkName); if (NT_SUCCESS(Status)) { + /* activate device interface */ IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); - RtlFreeUnicodeString(&SymbolicLinkName); + /* allocate symbolic link entry */ + SymEntry = AllocateItem(NonPagedPool, sizeof(SYMBOLICLINK_ENTRY), TAG_PORTCLASS); + if (SymEntry) + { + /* initialize symbolic link item */ + RtlInitUnicodeString(&SymEntry->SymbolicLink, SymbolicLinkName.Buffer); + /* store item */ + InsertTailList(&Entry->SymbolicLinkList, &SymEntry->Entry); + } + else + { + /* allocating failed */ + RtlFreeUnicodeString(&SymbolicLinkName); + } } } - /* Release SubDevice reference */ + /* release SubDevice reference */ SubDevice->lpVtbl->Release(SubDevice); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -20,8 +20,13 @@ OUT PVOID PropertyBuffer, OUT PULONG ResultLength) { + PPCLASS_DEVICE_EXTENSION DeviceExtension; + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - return IoGetDeviceProperty(DeviceObject, DeviceProperty, BufferLength, PropertyBuffer, ResultLength); + + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)((PDEVICE_OBJECT)DeviceObject)->DeviceExtension; + + return IoGetDeviceProperty(DeviceExtension->PhysicalDeviceObject, DeviceProperty, BufferLength, PropertyBuffer, ResultLength); } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -91,5 +91,6 @@ const GUID IID_IMiniportWaveRT = {0x0f9fc4d6, 0x6061, 0x4f3c, {0xb1, 0xfc, 0x7, 0x5e, 0x35, 0xf7, 0x96, 0xa}}; const GUID IID_IMiniportWaveRTStream = {0x000ac9ab, 0xfaab, 0x4f3d, {0x94, 0x55, 0x6f, 0xf8, 0x30, 0x6a, 0x74, 0xa0}}; const GUID IID_IMiniportWaveRTStreamNotification = {0x23759128, 0x96f1, 0x423b, {0xab, 0x4d, 0x81, 0x63, 0x5b, 0xcf, 0x8c, 0xa1}}; +const GUID IID_IUnregisterSubdevice = {0x16738177, 0xe199, 0x41f9, {0x9a, 0x87, 0xab, 0xb2, 0xa5, 0x43, 0x2f, 0x21}}; +const GUID IID_IUnregisterPhysicalConnection = {0x6c38e231, 0x2a0d, 0x428d, {0x81, 0xf8, 0x07, 0xcc, 0x42, 0x8b, 0xb9, 0xa4}}; - Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -82,6 +82,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -100,6 +100,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -225,6 +225,10 @@ IsEqualGUIDAligned(refiid, &IID_IDrmPort2)) { return NewIDrmPort((PDRMPORT2*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -285,6 +285,10 @@ else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -221,6 +221,10 @@ IsEqualGUIDAligned(refiid, &IID_IDrmPort2)) { return NewIDrmPort((PDRMPORT2*)Output); + } + else if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice)) + { + return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); } if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -49,6 +49,7 @@ <file>resource.c</file> <file>service_group.c</file> <file>undoc.c</file> + <file>unregister.c</file> <file>version.c</file> <file>portcls.rc</file> </module> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -294,6 +294,12 @@ PcIoTimerRoutine( IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); + +NTSTATUS +NTAPI +NewIUnregisterSubdevice( + OUT PUNREGISTERSUBDEVICE *OutDevice); + #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ @@ -315,8 +321,17 @@ typedef struct { LIST_ENTRY Entry; - KSOBJECT_HEADER ObjectHeader; -}SUBDEVICE_ENTRY; + UNICODE_STRING SymbolicLink; +}SYMBOLICLINK_ENTRY, *PSYMBOLICLINK_ENTRY; + + +typedef struct +{ + LIST_ENTRY Entry; + ISubdevice *SubDevice; + UNICODE_STRING Name; + LIST_ENTRY SymbolicLinkList; +}SUBDEVICE_ENTRY, *PSUBDEVICE_ENTRY; typedef struct { Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c [iso-8859-1] Sat Jul 11 21:44:41 2009 @@ -1,0 +1,172 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/backpln/portcls/unregister.c + * PURPOSE: Unregisters a subdevice + * PROGRAMMER: Johannes Anderwald + */ + +#include "private.h" + +typedef struct +{ + IUnregisterSubdeviceVtbl *lpVtbl; + LONG ref; + +}IUnregisterSubdeviceImpl; + +NTSTATUS +NTAPI +IUnregisterSubdevice_fnQueryInterface( + IUnregisterSubdevice* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IUnregisterSubdeviceImpl * This = (IUnregisterSubdeviceImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IUnregisterSubdevice) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IUnregisterSubdevice_fnAddRef( + IUnregisterSubdevice* iface) +{ + IUnregisterSubdeviceImpl * This = (IUnregisterSubdeviceImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IUnregisterSubdevice_fnRelease( + IUnregisterSubdevice* iface) +{ + IUnregisterSubdeviceImpl * This = (IUnregisterSubdeviceImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +NTSTATUS +NTAPI +IUnregisterSubdevice_fnUnregisterSubdevice( + IUnregisterSubdevice* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN Unknown) +{ + PPCLASS_DEVICE_EXTENSION DeviceExtension; + PLIST_ENTRY Entry; + PSUBDEVICE_ENTRY SubDeviceEntry; + PSYMBOLICLINK_ENTRY SymLinkEntry; + ISubdevice *SubDevice; + ULONG Found; + ULONG Index; + NTSTATUS Status; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension); + + /* look up our undocumented interface */ + Status = Unknown->lpVtbl->QueryInterface(Unknown, &IID_ISubdevice, (LPVOID)&SubDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No ISubdevice interface\n"); + /* the provided port driver doesnt support ISubdevice */ + return STATUS_INVALID_PARAMETER; + } + + Entry = DeviceExtension->SubDeviceList.Flink; + Found = FALSE; + /* loop subdevice entry list and search for the subdevice */ + while(Entry != &DeviceExtension->SubDeviceList) + { + SubDeviceEntry = (PSUBDEVICE_ENTRY)CONTAINING_RECORD(Entry, SUBDEVICE_ENTRY, Entry); + if (SubDeviceEntry->SubDevice == SubDevice) + { + Found = TRUE; + break; + } + Entry = Entry->Flink; + } + /* release the subdevice */ + SubDevice->lpVtbl->Release(SubDevice); + + if (!Found) + return STATUS_NOT_FOUND; + + /* remove subdevice entry */ + RemoveEntryList(&SubDeviceEntry->Entry); + + /* loop our create items and disable the create handler */ + for(Index = 0; Index < DeviceExtension->MaxSubDevices; Index++) + { + if (!RtlCompareUnicodeString(&SubDeviceEntry->Name, &DeviceExtension->CreateItems[Index].ObjectClass, TRUE)) + { + DeviceExtension->CreateItems[Index].Create = NULL; + RtlInitUnicodeString(&DeviceExtension->CreateItems[Index].ObjectClass, NULL); + break; + } + } + + /* now unregister device interfaces */ + while(!IsListEmpty(&SubDeviceEntry->SymbolicLinkList)) + { + /* remove entry */ + Entry = RemoveHeadList(&SubDeviceEntry->SymbolicLinkList); + /* get symlink entry */ + SymLinkEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(Entry, SYMBOLICLINK_ENTRY, Entry); + + /* unregister device interface */ + IoSetDeviceInterfaceState(&SymLinkEntry->SymbolicLink, FALSE); + /* free symbolic link */ + RtlFreeUnicodeString(&SymLinkEntry->SymbolicLink); + /* free sym entry */ + FreeItem(SymLinkEntry, TAG_PORTCLASS); + } + + /* free subdevice entry */ + ExFreePool(SubDeviceEntry); + + return STATUS_SUCCESS; +} + +static IUnregisterSubdeviceVtbl vt_IUnregisterSubdeviceVtbl = +{ + IUnregisterSubdevice_fnQueryInterface, + IUnregisterSubdevice_fnAddRef, + IUnregisterSubdevice_fnRelease, + IUnregisterSubdevice_fnUnregisterSubdevice +}; + +NTSTATUS +NTAPI +NewIUnregisterSubdevice( + OUT PUNREGISTERSUBDEVICE *OutDevice) +{ + IUnregisterSubdeviceImpl * This = AllocateItem(NonPagedPool, sizeof(IUnregisterSubdeviceImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_IUnregisterSubdeviceVtbl; + This->ref = 1; + + *OutDevice = (PUNREGISTERSUBDEVICE)&This->lpVtbl; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c ------------------------------------------------------------------------------ svn:eol-style = native

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