Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 44931: Hackfix wdmaud.drv for now (Johannes Anderwald)
by spetreolle＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: spetreolle Date: Mon Jan 4 19:07:27 2010 New Revision: 44931 URL: http://svn.reactos.org/svn/reactos?rev=44931&view=rev Log: Hackfix wdmaud.drv for now (Johannes Anderwald) Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Mon Jan 4 19:07:27 2010 @@ -17,7 +17,7 @@ #define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" extern HANDLE KernelHandle; -DWORD OpenCount = 0; +extern DWORD OpenCount; DWORD WINAPI @@ -559,6 +559,7 @@ return MMSYSERR_NOERROR; } + MMRESULT 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] Mon Jan 4 19:07:27 2010 @@ -14,7 +14,307 @@ #include "wdmaud.h" + +#define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" + +PWSTR UnknownWaveIn = L"Wave Input"; +PWSTR UnknownWaveOut = L"Wave Output"; +PWSTR UnknownMidiIn = L"Midi Input"; +PWSTR UnknownMidiOut = L"Midi Output"; + + HANDLE KernelHandle = INVALID_HANDLE_VALUE; +DWORD OpenCount = 0; + +MMRESULT +WriteFileEx_Remixer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID OffsetPtr, + IN DWORD Length, + IN PSOUND_OVERLAPPED Overlap, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); + + + +MMRESULT +GetNumWdmDevs( + IN HANDLE Handle, + IN MMDEVICE_TYPE DeviceType, + OUT DWORD* DeviceCount) +{ +#ifdef USE_MMIXER_LIB + + switch(DeviceType) + { + case MIXER_DEVICE_TYPE: + *DeviceCount = WdmAudGetMixerCount(); + break; + case WAVE_OUT_DEVICE_TYPE: + *DeviceCount = WdmAudGetWaveOutCount(); + break; + case WAVE_IN_DEVICE_TYPE: + *DeviceCount = WdmAudGetWaveInCount(); + break; + default: + *DeviceCount = 0; + } + return MMSYSERR_NOERROR; +#else + + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + + VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); + VALIDATE_MMSYS_PARAMETER( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); + VALIDATE_MMSYS_PARAMETER( DeviceCount ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + + Result = SyncOverlappedDeviceIoControl(Handle, + IOCTL_GETNUMDEVS_TYPE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS( Result ) ) + { + SND_ERR(L"Call to IOCTL_GETNUMDEVS_TYPE failed\n"); + *DeviceCount = 0; + return TranslateInternalMmResult(Result); + } + + *DeviceCount = DeviceInfo.DeviceCount; + + return MMSYSERR_NOERROR; +#endif +} + +MMRESULT +GetWdmDeviceCapabilities( + IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + /* NOTE - At this time, WDMAUD does not support this properly */ + + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + WDMAUD_DEVICE_INFO DeviceInfo; + + SND_ASSERT( SoundDevice ); + SND_ASSERT( Capabilities ); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if ( ! MMSUCCESS(Result) ) + return Result; + + SND_TRACE(L"WDMAUD - GetWdmDeviceCapabilities DeviceType %u DeviceId %u\n", DeviceType, DeviceId); + +#ifdef USE_MMIXER_LIB + if (DeviceType == MIXER_DEVICE_TYPE) + { + return WdmAudGetMixerCapabilities(DeviceId, (LPMIXERCAPSW)Capabilities); + } + else if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + return WdmAudGetWaveOutCapabilities(DeviceId, (LPWAVEOUTCAPSW)Capabilities); + } + else if (DeviceType == WAVE_IN_DEVICE_TYPE) + { + return WdmAudGetWaveInCapabilities(DeviceId, (LPWAVEINCAPSW)Capabilities); + } + +#endif + + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.DeviceIndex = DeviceId; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GETCAPABILITIES, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + /* This is pretty much a big hack right now */ + switch ( DeviceType ) + { + case MIXER_DEVICE_TYPE: + { + LPMIXERCAPS MixerCaps = (LPMIXERCAPS) Capabilities; + + DeviceInfo.u.MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; + CopyWideString(MixerCaps->szPname, DeviceInfo.u.MixCaps.szPname); + + MixerCaps->cDestinations = DeviceInfo.u.MixCaps.cDestinations; + MixerCaps->fdwSupport = DeviceInfo.u.MixCaps.fdwSupport; + MixerCaps->vDriverVersion = DeviceInfo.u.MixCaps.vDriverVersion; + MixerCaps->wMid = DeviceInfo.u.MixCaps.wMid; + MixerCaps->wPid = DeviceInfo.u.MixCaps.wPid; + break; + } + case WAVE_OUT_DEVICE_TYPE : + { + LPWAVEOUTCAPS WaveOutCaps = (LPWAVEOUTCAPS) Capabilities; + + DeviceInfo.u.WaveOutCaps.szPname[MAXPNAMELEN-1] = L'\0'; + WaveOutCaps->wMid = DeviceInfo.u.WaveOutCaps.wMid; + WaveOutCaps->wPid = DeviceInfo.u.WaveOutCaps.wPid; + + WaveOutCaps->vDriverVersion = 0x0001; + CopyWideString(WaveOutCaps->szPname, DeviceInfo.u.WaveOutCaps.szPname); + + WaveOutCaps->dwFormats = DeviceInfo.u.WaveOutCaps.dwFormats; + WaveOutCaps->wChannels = DeviceInfo.u.WaveOutCaps.wChannels; + WaveOutCaps->dwSupport = DeviceInfo.u.WaveOutCaps.dwSupport; + break; + } + case WAVE_IN_DEVICE_TYPE : + { + LPWAVEINCAPSW WaveInCaps = (LPWAVEINCAPSW) Capabilities; + + DeviceInfo.u.WaveInCaps.szPname[MAXPNAMELEN-1] = L'\0'; + + WaveInCaps->wMid = DeviceInfo.u.WaveInCaps.wMid; + WaveInCaps->wPid = DeviceInfo.u.WaveInCaps.wPid; + + WaveInCaps->vDriverVersion = 0x0001; + CopyWideString(WaveInCaps->szPname, DeviceInfo.u.WaveInCaps.szPname); + + WaveInCaps->dwFormats = DeviceInfo.u.WaveInCaps.dwFormats; + WaveInCaps->wChannels = DeviceInfo.u.WaveInCaps.wChannels; + WaveInCaps->wReserved1 = 0; + break; + } + } + + return MMSYSERR_NOERROR; +} + + +MMRESULT +OpenWdmSoundDevice( + IN struct _SOUND_DEVICE* SoundDevice, /* NOT USED */ + OUT PVOID* Handle) +{ + /* Only open this if it's not already open */ + if ( KernelHandle == INVALID_HANDLE_VALUE ) + { + SND_TRACE(L"Opening wdmaud device\n"); + KernelHandle = CreateFileW(KERNEL_DEVICE_NAME, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + } + + if ( KernelHandle == INVALID_HANDLE_VALUE ) + return MMSYSERR_ERROR; + + SND_ASSERT( Handle ); + + *Handle = KernelHandle; + ++ OpenCount; + + return MMSYSERR_NOERROR; +} + +MMRESULT +CloseWdmSoundDevice( + 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; + } + + SND_ASSERT( KernelHandle != INVALID_HANDLE_VALUE ); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if (SoundDeviceInstance->Handle != (PVOID)KernelHandle) + { + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.hDevice = SoundDeviceInstance->Handle; + + /* First stop the stream */ + if (DeviceType != MIXER_DEVICE_TYPE) + { + DeviceInfo.u.State = KSSTATE_STOP; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } +#ifdef USE_MMIXER_LIB + if (DeviceType == MIXER_DEVICE_TYPE) + { + return WdmAudCloseMixer(SoundDeviceInstance->Handle, SoundDeviceInstance->hNotifyEvent); + } +#endif + + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_CLOSE_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } + + if (DeviceType == MIXER_DEVICE_TYPE) + { + SetEvent(SoundDeviceInstance->hStopEvent); + CloseHandle(SoundDeviceInstance->hStopEvent); + CloseHandle(SoundDeviceInstance->hNotifyEvent); + } + + --OpenCount; + + if ( OpenCount < 1 ) + { + CloseHandle(KernelHandle); + KernelHandle = INVALID_HANDLE_VALUE; + } + + return MMSYSERR_NOERROR; +} + MMRESULT QueryWdmWaveDeviceFormatSupport( @@ -27,8 +327,483 @@ } + + + +MMRESULT +SetWdmMixerDeviceFormat( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize) +{ + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + HANDLE hThread; + + + Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if ( ! Instance->hNotifyEvent ) + return MMSYSERR_NOMEM; + +#ifdef USE_MMIXER_LIB + return WdmAudOpenMixer(&Instance->Handle, DeviceId, Instance->hNotifyEvent); +#endif + + if (Instance->Handle != KernelHandle) + { + /* device is already open */ + return MMSYSERR_NOERROR; + } + + Instance->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if ( ! Instance->hStopEvent ) + return MMSYSERR_NOMEM; + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; + DeviceInfo.DeviceIndex = DeviceId; + DeviceInfo.u.hNotifyEvent = Instance->hNotifyEvent; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_OPEN_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + CloseHandle(Instance->hNotifyEvent); + CloseHandle(Instance->hStopEvent); + return TranslateInternalMmResult(Result); + } + + hThread = CreateThread(NULL, 0, MixerEventThreadRoutine, (LPVOID)Instance, 0, NULL); + if ( hThread ) + { + CloseHandle(hThread); + } + + /* Store sound device handle instance handle */ + Instance->Handle = (PVOID)DeviceInfo.hDevice; + + return MMSYSERR_NOERROR; +} + +MMRESULT +SetWdmWaveDeviceFormat( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PVOID Identifier; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + + Result = GetSoundDeviceFromInstance(Instance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceIdentifier(SoundDevice, &Identifier); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + if (Instance->Handle != KernelHandle) + { + /* device is already open */ + return MMSYSERR_NOERROR; + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + +#ifdef USE_MMIXER_LIB + return WdmAudOpenWavePin(Instance, DeviceId, WaveFormat, DeviceType); +#endif + + + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.DeviceIndex = DeviceId; + DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); //WaveFormat->cbSize; + DeviceInfo.u.WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; +#ifdef USERMODE_MIXER + DeviceInfo.u.WaveFormatEx.nChannels = 2; + DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 44100; + DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; + DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 176400; + DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; +#else + DeviceInfo.u.WaveFormatEx.nChannels = WaveFormat->nChannels; + DeviceInfo.u.WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; + DeviceInfo.u.WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; + DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; + DeviceInfo.u.WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; +#endif + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_OPEN_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + /* Store format */ + Instance->WaveFormatEx.cbSize = WaveFormat->cbSize; + Instance->WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; + Instance->WaveFormatEx.nChannels = WaveFormat->nChannels; + Instance->WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; + Instance->WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; + Instance->WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; + Instance->WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; + + /* Store sound device handle instance handle */ + Instance->Handle = (PVOID)DeviceInfo.hDevice; + + /* Now determine framing requirements */ + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GETFRAMESIZE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( MMSUCCESS(Result) ) + { + if (DeviceInfo.u.FrameSize) + { + Instance->FrameSize = DeviceInfo.u.FrameSize * 2; + Instance->BufferCount = WaveFormat->nAvgBytesPerSec / Instance->FrameSize; + SND_TRACE(L"FrameSize %u BufferCount %u\n", Instance->FrameSize, Instance->BufferCount); + } + } + else + { + // use a default of 100 buffers + Instance->BufferCount = 100; + } + + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + /* Now start the stream */ + DeviceInfo.u.State = KSSTATE_RUN; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } + + return MMSYSERR_NOERROR; +} + + +MMRESULT +SetWdmWaveState( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN BOOL bStart) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + HANDLE Handle; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + + if (bStart) + DeviceInfo.u.State = KSSTATE_RUN; + else + DeviceInfo.u.State = KSSTATE_PAUSE; + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + return Result; +} + +MMRESULT +GetDeviceInterfaceString( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN LPWSTR Interface, + IN DWORD InterfaceLength, + OUT DWORD * InterfaceSize) +{ + WDMAUD_DEVICE_INFO DeviceInfo; + MMRESULT Result; + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.DeviceIndex = DeviceId; + + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_QUERYDEVICEINTERFACESTRING, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + + if (!Interface) + { + SND_ASSERT(InterfaceSize); + + *InterfaceSize = DeviceInfo.u.Interface.DeviceInterfaceStringSize; + return MMSYSERR_NOERROR; + } + + if (InterfaceLength < DeviceInfo.u.Interface.DeviceInterfaceStringSize) + { + /* buffer is too small */ + return MMSYSERR_MOREDATA; + } + + DeviceInfo.u.Interface.DeviceInterfaceStringSize = InterfaceLength; + DeviceInfo.u.Interface.DeviceInterfaceString = Interface; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_QUERYDEVICEINTERFACESTRING, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( MMSUCCESS(Result) && InterfaceLength > 2) + { + Interface[1] = L'\\'; + Interface[InterfaceLength-1] = L'\0'; + } + + return Result; +} + +MMRESULT +GetWdmPosition( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMTIME* Time) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + HANDLE Handle; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_OPEN_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Time->wType = TIME_BYTES; + Time->u.cb = (DWORD)DeviceInfo.u.Position; + + return MMSYSERR_NOERROR; +} + +MMRESULT +ResetStream( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMDEVICE_TYPE DeviceType, + IN BOOLEAN bStartReset) +{ + MMRESULT Result; + HANDLE Handle; + WDMAUD_DEVICE_INFO DeviceInfo; + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.u.ResetStream = (bStartReset ? KSRESET_BEGIN : KSRESET_END); + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_RESET_STREAM, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + return Result; +} + + +MMRESULT +QueryMixerInfo( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN UINT uMsg, + IN LPVOID Parameter, + IN DWORD Flags) +{ + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + HANDLE Handle; + DWORD IoControlCode; + LPMIXERLINEW MixLine; + LPMIXERLINECONTROLSW MixControls; + LPMIXERCONTROLDETAILS MixDetails; + + SND_TRACE(L"uMsg %x Flags %x\n", uMsg, Flags); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; + DeviceInfo.Flags = Flags; + + MixLine = (LPMIXERLINEW)Parameter; + MixControls = (LPMIXERLINECONTROLSW)Parameter; + MixDetails = (LPMIXERCONTROLDETAILS)Parameter; + +#ifdef USE_MMIXER_LIB + switch(uMsg) + { + case MXDM_GETLINEINFO: + return WdmAudGetLineInfo(SoundDeviceInstance->Handle, MixLine, Flags); + case MXDM_GETLINECONTROLS: + return WdmAudGetLineControls(SoundDeviceInstance->Handle, MixControls, Flags); + case MXDM_SETCONTROLDETAILS: + return WdmAudSetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); + break; + case MXDM_GETCONTROLDETAILS: + return WdmAudGetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); + break; + default: + SND_ASSERT(0); + return MMSYSERR_NOTSUPPORTED; + } +#endif + + + switch(uMsg) + { + case MXDM_GETLINEINFO: + RtlCopyMemory(&DeviceInfo.u.MixLine, MixLine, sizeof(MIXERLINEW)); + IoControlCode = IOCTL_GETLINEINFO; + break; + case MXDM_GETLINECONTROLS: + RtlCopyMemory(&DeviceInfo.u.MixControls, MixControls, sizeof(MIXERLINECONTROLSW)); + IoControlCode = IOCTL_GETLINECONTROLS; + break; + case MXDM_SETCONTROLDETAILS: + RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); + IoControlCode = IOCTL_SETCONTROLDETAILS; + break; + case MXDM_GETCONTROLDETAILS: + RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); + IoControlCode = IOCTL_GETCONTROLDETAILS; + break; + default: + SND_ASSERT(0); + return MMSYSERR_NOTSUPPORTED; + } + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IoControlCode, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return Result; + } + + switch(uMsg) + { + case MXDM_GETLINEINFO: + { + RtlCopyMemory(MixLine, &DeviceInfo.u.MixLine, sizeof(MIXERLINEW)); + break; + } + } + + return Result; +} + + MMRESULT PopulateWdmDeviceList( + HANDLE Handle, MMDEVICE_TYPE DeviceType) { MMRESULT Result; @@ -37,13 +812,10 @@ MMFUNCTION_TABLE FuncTable; DWORD i; + VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); VALIDATE_MMSYS_PARAMETER( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); -#ifdef USE_MMIXER_LIB - Result = WdmAudGetNumDevsByMMixer(DeviceType, &DeviceCount); -#else - Result = WdmAudGetNumWdmDevsByLegacy(DeviceType, &DeviceCount); -#endif + Result = GetNumWdmDevs(Handle, DeviceType, &DeviceCount); if ( ! MMSUCCESS(Result) ) { @@ -66,58 +838,41 @@ /* Set up our function table */ ZeroMemory(&FuncTable, sizeof(MMFUNCTION_TABLE)); -#ifdef USE_MMIXER_LIB - FuncTable.GetCapabilities = WdmAudGetCapabilitiesByMMixer; - FuncTable.Open = WdmAudOpenSoundDeviceByMMixer; - FuncTable.Close = WdmAudCloseSoundDeviceByMMixer; - FuncTable.GetDeviceInterfaceString = WdmAudGetDeviceInterfaceStringByMMixer; -#else - FuncTable.GetCapabilities = WdmAudGetCapabilitiesByLegacy; - FuncTable.Open = WdmAudOpenSoundDeviceByLegacy; - FuncTable.Close = WdmAudCloseSoundDeviceByLegacy; - FuncTable.GetDeviceInterfaceString = WdmAudGetDeviceInterfaceStringByLegacy; -#endif - + FuncTable.GetCapabilities = GetWdmDeviceCapabilities; FuncTable.QueryWaveFormatSupport = QueryWdmWaveDeviceFormatSupport; if (DeviceType == MIXER_DEVICE_TYPE) { -#ifdef USE_MMIXER_LIB - FuncTable.SetWaveFormat = WdmAudSetMixerDeviceFormatByMMixer; - FuncTable.QueryMixerInfo = WdmAudQueryMixerInfoByMMixer; + FuncTable.SetWaveFormat = SetWdmMixerDeviceFormat; + FuncTable.QueryMixerInfo = QueryMixerInfo; + } + else + { + FuncTable.SetWaveFormat = SetWdmWaveDeviceFormat; + } + + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + FuncTable.SetState = SetWdmWaveState; + FuncTable.ResetStream = ResetStream; + } + + FuncTable.Open = OpenWdmSoundDevice; + FuncTable.Close = CloseWdmSoundDevice; + FuncTable.GetDeviceInterfaceString = GetDeviceInterfaceString; +#ifndef USERMODE_MIXER + FuncTable.CommitWaveBuffer = WriteFileEx_Committer2; #else - FuncTable.SetWaveFormat = WdmAudSetMixerDeviceFormatByLegacy; - FuncTable.QueryMixerInfo = WdmAudQueryMixerInfoByLegacy; + FuncTable.CommitWaveBuffer = WriteFileEx_Remixer; #endif - } - - if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) - { -#ifdef USE_MMIXER_LIB - FuncTable.SetWaveFormat = WdmAudSetWdmWaveDeviceFormatByMMixer; - FuncTable.SetState = WdmAudSetWdmWaveStateByMMixer; - FuncTable.ResetStream = WdmAudResetStreamByMMixer; - FuncTable.GetPos = WdmAudGetWdmPositionByMMixer; -#else - FuncTable.SetWaveFormat = WdmAudSetWaveDeviceFormatByLegacy; - FuncTable.SetState = WdmAudSetWaveStateByLegacy; - FuncTable.ResetStream = WdmAudResetStreamByLegacy; - FuncTable.GetPos = WdmAudGetWavePositionByLegacy; -#endif - -#ifdef USE_MMIXER_LIB - FuncTable.CommitWaveBuffer = WdmAudCommitWaveBufferByMMixer; -#elif defined (USERMODE_MIXER) - FuncTable.CommitWaveBuffer = WriteFileEx_Remixer; -#else - FuncTable.CommitWaveBuffer = WriteFileEx_Committer2; -#endif - } + FuncTable.GetPos = GetWdmPosition; SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); } return MMSYSERR_NOERROR; } + + LONG APIENTRY @@ -134,6 +889,7 @@ { case DRV_LOAD : { + HANDLE Handle; SND_TRACE(L"DRV_LOAD\n"); Result = InitEntrypointMutexes(); @@ -141,14 +897,9 @@ if ( ! MMSUCCESS(Result) ) return 0L; -#ifdef USE_MMIXER_LIB - if (!WdmAudInitUserModeMixer()) - { - SND_ERR(L"Failed to initialize mmixer lib\n"); - return 0; - } -#else - if (WdmAudOpenSoundDeviceByLegacy() != MMSYSERR_NOERROR) + OpenWdmSoundDevice(NULL, &Handle); + + if ( Handle == INVALID_HANDLE_VALUE ) { SND_ERR(L"Failed to open \\\\.\\wdmaud\n"); CleanupEntrypointMutexes(); @@ -157,16 +908,15 @@ return 0L; } -#endif /* Populate the device lists */ SND_TRACE(L"Populating device lists\n"); - PopulateWdmDeviceList(WAVE_OUT_DEVICE_TYPE); - PopulateWdmDeviceList(WAVE_IN_DEVICE_TYPE); - PopulateWdmDeviceList(MIDI_OUT_DEVICE_TYPE); - PopulateWdmDeviceList(MIDI_IN_DEVICE_TYPE); - PopulateWdmDeviceList(AUX_DEVICE_TYPE); - PopulateWdmDeviceList(MIXER_DEVICE_TYPE); + PopulateWdmDeviceList(KernelHandle, WAVE_OUT_DEVICE_TYPE); + PopulateWdmDeviceList(KernelHandle, WAVE_IN_DEVICE_TYPE); + PopulateWdmDeviceList(KernelHandle, MIDI_OUT_DEVICE_TYPE); + PopulateWdmDeviceList(KernelHandle, MIDI_IN_DEVICE_TYPE); + PopulateWdmDeviceList(KernelHandle, AUX_DEVICE_TYPE); + PopulateWdmDeviceList(KernelHandle, MIXER_DEVICE_TYPE); SND_TRACE(L"Initialisation complete\n"); @@ -177,11 +927,11 @@ { SND_TRACE(L"DRV_FREE\n"); -#ifdef USE_MMIXER_LIB - WdmAudCleanupMMixer(); -#else - WdmAudCleanupLegacy(); -#endif + if ( KernelHandle != INVALID_HANDLE_VALUE ) + { + CloseHandle(KernelHandle); + KernelHandle = INVALID_HANDLE_VALUE; + } /* TODO: Clean up the path names! */ UnlistAllSoundDevices(); @@ -235,6 +985,9 @@ switch ( fdwReason ) { case DLL_PROCESS_ATTACH : +#ifdef USE_MMIXER_LIB + WdmAudInitUserModeMixer(); +#endif SND_TRACE(L"WDMAUD.DRV - Process attached\n"); break; case DLL_PROCESS_DETACH :

1 0

[dgorbachev] 44930: Chinese translations of NTVDM by Samuel Lee. Bug #5087.
by dgorbachev＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: dgorbachev Date: Mon Jan 4 17:39:38 2010 New Revision: 44930 URL: http://svn.reactos.org/svn/reactos?rev=44930&view=rev Log: Chinese translations of NTVDM by Samuel Lee. Bug #5087. Added: trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc (with props) trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc (with props) Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc Added: trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/zh-C… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc (added) +++ trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc [iso-8859-1] Mon Jan 4 17:39:38 2010 @@ -1,0 +1,9 @@ +#include "resource.h" + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STRINGTABLE DISCARDABLE +BEGIN + +STRING_WelcomeMsg, "ReactOS ÐéÄâ DOS »úÖ§³Ö¡£\n" +STRING_PromptMsg, "ÊäÈë r<cr> ÒÔ±ãÔËÐÐ£¬s<cr> ÒÔ±ã¹Ø±Õ»òÕß q<cr> ÒÔ±ãÁ¢¼´ÍË³ö¡£" +END Propchange: trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/zh-T… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc (added) +++ trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc [iso-8859-1] Mon Jan 4 17:39:38 2010 @@ -1,0 +1,9 @@ +#include "resource.h" + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +STRINGTABLE DISCARDABLE +BEGIN + +STRING_WelcomeMsg, "ReactOS µêÀÀ DOS ¾÷¤ä´©¡C\n" +STRING_PromptMsg, "Áä¤J r<cr> ¥H«K¹B¦æ¡A s<cr> ¥H«KÃö³¬©ÎªÌ q<cr> ¥H«K¥ß§Y°h¥X¡C" +END Propchange: trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/rsrc.rc?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] Mon Jan 4 17:39:38 2010 @@ -19,3 +19,5 @@ #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" +#include "lang/zh-CN.rc" +#include "lang/zh-TW.rc"

1 0

[gedmurphy] 44929: Rehack the explorer hack for secure CRT usage. This should fix the build, unless there are any more oddities in our tree.
by gedmurphy＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: gedmurphy Date: Mon Jan 4 17:10:33 2010 New Revision: 44929 URL: http://svn.reactos.org/svn/reactos?rev=44929&view=rev Log: Rehack the explorer hack for secure CRT usage. This should fix the build, unless there are any more oddities in our tree. Modified: trunk/reactos/base/shell/explorer/utility/utility.cpp trunk/reactos/base/shell/explorer/utility/utility.h trunk/reactos/base/shell/explorer/utility/xmlstorage.h Modified: trunk/reactos/base/shell/explorer/utility/utility.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] Mon Jan 4 17:10:33 2010 @@ -158,7 +158,7 @@ BOOL time_to_filetime(const time_t* t, FILETIME* ftime) { -#ifdef __STDC_WANT_SECURE_LIB__ +#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) SYSTEMTIME stime; struct tm tm_; struct tm* tm = &tm_; Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Mon Jan 4 17:10:33 2010 @@ -183,7 +183,7 @@ // secure CRT functions -#ifdef __STDC_WANT_SECURE_LIB__ // for VS 2005: _MSC_VER>=1400 +#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) // for VS 2005: _MSC_VER>=1400 #define _stprintf_s1 _stprintf_s #define _stprintf_s2 _stprintf_s Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] Mon Jan 4 17:10:33 2010 @@ -512,7 +512,7 @@ { FileHolder(LPCTSTR path, LPCTSTR mode) { -#ifdef __STDC_WANT_SECURE_LIB__ // secure CRT functions using VS 2005 +#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) // secure CRT functions using VS 2005 if (_tfopen_s(&_pfile, path, mode) != 0) _pfile = NULL; #else

1 0

[gedmurphy] 44928: Fix __STDC_WANT_SECURE_LIB__ redefinition
by gedmurphy＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: gedmurphy Date: Mon Jan 4 15:02:49 2010 New Revision: 44928 URL: http://svn.reactos.org/svn/reactos?rev=44928&view=rev Log: Fix __STDC_WANT_SECURE_LIB__ redefinition Modified: trunk/reactos/lib/sdk/crt/time/ctime.c Modified: trunk/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Mon Jan 4 15:02:49 2010 @@ -8,7 +8,6 @@ #define MINGW_HAS_SECURE_API 1 #include <tchar.h> -#define __STDC_WANT_SECURE_LIB__ #include <time.h> #include "bitsfixup.h"

1 0

[gedmurphy] 44927: Add wcsncat back, it was removed accidentally
by gedmurphy＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: gedmurphy Date: Mon Jan 4 14:47:19 2010 New Revision: 44927 URL: http://svn.reactos.org/svn/reactos?rev=44927&view=rev Log: Add wcsncat back, it was removed accidentally Modified: trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Mon Jan 4 14:47:19 2010 @@ -112,6 +112,7 @@ _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); #endif _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); + _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); #if __STDC_WANT_SECURE_LIB__

1 0

[gedmurphy] 44926: Add some of the string safe stuff to the headers.
by gedmurphy＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: gedmurphy Date: Mon Jan 4 14:36:59 2010 New Revision: 44926 URL: http://svn.reactos.org/svn/reactos?rev=44926&view=rev Log: Add some of the string safe stuff to the headers. Modified: trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Mon Jan 4 14:36:59 2010 @@ -163,7 +163,17 @@ /** Deprecated ***************************************************************/ -#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated) +#ifdef __GNUC__ +#define _CRT_DEPRECATE_TEXT(_Text) __attribute__ ((deprecated)) +#elif defined(_MSC_VER) +#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated(_Text)) +#else +#define _CRT_DEPRECATE_TEXT(_Text) +#endif + +#ifndef __STDC_WANT_SECURE_LIB__ +#define __STDC_WANT_SECURE_LIB__ 1 +#endif #ifndef _CRT_INSECURE_DEPRECATE # ifdef _CRT_SECURE_NO_DEPRECATE Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Mon Jan 4 14:36:59 2010 @@ -101,16 +101,27 @@ #define _WSTRING_DEFINED _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); - _CRTIMP wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); + _CRTIMP _CRT_INSECURE_DEPRECATE(wcsat_s) wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); +#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); + _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); +#endif _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); - _CRTIMP size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); - _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); + _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); +#endif _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); + _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); +#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control);

1 0

[fireball] 44925: - Remove unnecessary line from FreeEnvironmentStringsW. See issue #5073 for more details.
by fireball＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: fireball Date: Mon Jan 4 12:17:57 2010 New Revision: 44925 URL: http://svn.reactos.org/svn/reactos?rev=44925&view=rev Log: - Remove unnecessary line from FreeEnvironmentStringsW. See issue #5073 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/env.c Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] Mon Jan 4 12:17:57 2010 @@ -382,7 +382,6 @@ LPWSTR EnvironmentStrings ) { - (void)EnvironmentStrings; return TRUE; }

1 0

[fireball] 44924: Daniel Zimmermann <netzimme@aim.com> - Fix missing arguments for the call KdbpPrint() in differents places in kdbg_cli.c. See issue #5089 for more details.
by fireball＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: fireball Date: Mon Jan 4 12:03:23 2010 New Revision: 44924 URL: http://svn.reactos.org/svn/reactos?rev=44924&view=rev Log: Daniel Zimmermann <netzimme(a)aim.com> - Fix missing arguments for the call KdbpPrint() in differents places in kdbg_cli.c. See issue #5089 for more details. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Mon Jan 4 12:03:23 2010 @@ -527,7 +527,7 @@ return TRUE; if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("Warning: Address %I64x is beeing truncated\n"); + KdbpPrint("Warning: Address %I64x is beeing truncated\n",Result); Address = (ULONG_PTR)Result; } @@ -790,7 +790,7 @@ return TRUE; if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("Warning: Address %I64x is beeing truncated\n"); + KdbpPrint("Warning: Address %I64x is beeing truncated\n",Result); Frame = (ULONG_PTR)Result; } @@ -1133,7 +1133,7 @@ } if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0]); + KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0],Result); Address = (ULONG_PTR)Result; @@ -1491,7 +1491,7 @@ } if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0]); + KdbpPrint("%s: Warning: Address %I64x is beeing truncated\n", Argv[0],Result); Address = (ULONG_PTR)Result;

1 0

[jimtabor] 44923: - Another attempt to fix RGNOBJAPI_Un/Lock SEH issue. Resort code.
by jimtabor＠svn.reactos.org 04 Jan '10

04 Jan '10

Author: jimtabor Date: Mon Jan 4 02:36:24 2010 New Revision: 44923 URL: http://svn.reactos.org/svn/reactos?rev=44923&view=rev Log: - Another attempt to fix RGNOBJAPI_Un/Lock SEH issue. Resort code. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Mon Jan 4 02:36:24 2010 @@ -2084,7 +2084,8 @@ INT Index; PGDI_TABLE_ENTRY Entry; PROSRGNDATA pRgn; - PRGN_ATTR pRgn_Attr; + PRGN_ATTR pRgn_Attr; + BOOL Hit = FALSE; pRgn = REGION_LockRgn(hRgn); @@ -2124,6 +2125,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = TRUE; } _SEH2_END; @@ -2146,6 +2148,7 @@ INT Index; PGDI_TABLE_ENTRY Entry; PRGN_ATTR pRgn_Attr; + BOOL Hit = FALSE; if (pRgn) { @@ -2172,6 +2175,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = TRUE; } _SEH2_END; } @@ -2315,65 +2319,6 @@ return result; } - -// NtGdi Exported Functions -INT -APIENTRY -NtGdiCombineRgn(HRGN hDest, - HRGN hSrc1, - HRGN hSrc2, - INT CombineMode) -{ - INT result = ERROR; - PROSRGNDATA destRgn, src1Rgn, src2Rgn = NULL; - - if ( CombineMode > RGN_COPY && CombineMode < RGN_AND) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return ERROR; - } - - destRgn = RGNOBJAPI_Lock(hDest, NULL); - if (!destRgn) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return ERROR; - } - - src1Rgn = RGNOBJAPI_Lock(hSrc1, NULL); - if (!src1Rgn) - { - RGNOBJAPI_Unlock(destRgn); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return ERROR; - } - - if (hSrc2) - src2Rgn = RGNOBJAPI_Lock(hSrc2, NULL); - - result = IntGdiCombineRgn( destRgn, src1Rgn, src2Rgn, CombineMode); - - if (src2Rgn) - RGNOBJAPI_Unlock(src2Rgn); - RGNOBJAPI_Unlock(src1Rgn); - RGNOBJAPI_Unlock(destRgn); - - return result; -} - -HRGN -APIENTRY -NtGdiCreateEllipticRgn( - INT Left, - INT Top, - INT Right, - INT Bottom -) -{ - return NtGdiCreateRoundRectRgn(Left, Top, Right, Bottom, - Right - Left, Bottom - Top); -} - PROSRGNDATA FASTCALL IntGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) @@ -2388,362 +2333,6 @@ pRgn = GDIOBJ_ShareLockObj(pRgn->BaseObject.hHmgr, GDI_OBJECT_TYPE_REGION); return pRgn; -} - - -HRGN APIENTRY -NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) -{ - PROSRGNDATA pRgn; - HRGN hRgn; - - /* Allocate region data structure with space for 1 RECTL */ - if (!(pRgn = REGION_AllocRgnWithHandle(1))) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hRgn = pRgn->BaseObject.hHmgr; - - REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); - RGNOBJAPI_Unlock(pRgn); - - return hRgn; -} - - -HRGN -APIENTRY -NtGdiCreateRoundRectRgn( - INT left, - INT top, - INT right, - INT bottom, - INT ellipse_width, - INT ellipse_height -) -{ - PROSRGNDATA obj; - HRGN hrgn; - int asq, bsq, d, xd, yd; - RECTL rect; - - /* Make the dimensions sensible */ - - if (left > right) - { - INT tmp = left; - left = right; - right = tmp; - } - if (top > bottom) - { - INT tmp = top; - top = bottom; - bottom = tmp; - } - - ellipse_width = abs(ellipse_width); - ellipse_height = abs(ellipse_height); - - /* Check parameters */ - - if (ellipse_width > right-left) ellipse_width = right-left; - if (ellipse_height > bottom-top) ellipse_height = bottom-top; - - /* Check if we can do a normal rectangle instead */ - - if ((ellipse_width < 2) || (ellipse_height < 2)) - return NtGdiCreateRectRgn(left, top, right, bottom); - - /* Create region */ - - d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; - if (!(obj = REGION_AllocRgnWithHandle(d))) return 0; - hrgn = obj->BaseObject.hHmgr; - - /* Ellipse algorithm, based on an article by K. Porter */ - /* in DDJ Graphics Programming Column, 8/89 */ - - asq = ellipse_width * ellipse_width / 4; /* a^2 */ - bsq = ellipse_height * ellipse_height / 4; /* b^2 */ - d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */ - xd = 0; - yd = asq * ellipse_height; /* 2a^2b */ - - rect.left = left + ellipse_width / 2; - rect.right = right - ellipse_width / 2; - - /* Loop to draw first half of quadrant */ - - while (xd < yd) - { - if (d > 0) /* if nearest pixel is toward the center */ - { - /* move toward center */ - rect.top = top++; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - rect.top = --bottom; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - yd -= 2*asq; - d -= yd; - } - rect.left--; /* next horiz point */ - rect.right++; - xd += 2*bsq; - d += bsq + xd; - } - /* Loop to draw second half of quadrant */ - - d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2; - while (yd >= 0) - { - /* next vertical point */ - rect.top = top++; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - rect.top = --bottom; - rect.bottom = rect.top + 1; - REGION_UnionRectWithRgn(obj, &rect); - if (d < 0) /* if nearest pixel is outside ellipse */ - { - rect.left--; /* move away from center */ - rect.right++; - xd += 2*bsq; - d += xd; - } - yd -= 2*asq; - d += asq - yd; - } - /* Add the inside rectangle */ - - if (top <= bottom) - { - rect.top = top; - rect.bottom = bottom; - REGION_UnionRectWithRgn(obj, &rect); - } - - RGNOBJAPI_Unlock(obj); - return hrgn; -} - -BOOL -APIENTRY -NtGdiEqualRgn( - HRGN hSrcRgn1, - HRGN hSrcRgn2 -) -{ - PROSRGNDATA rgn1, rgn2; - PRECTL tRect1, tRect2; - ULONG i; - BOOL bRet = FALSE; - - if ( !(rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL)) ) - return ERROR; - - if ( !(rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL)) ) - { - RGNOBJAPI_Unlock(rgn1); - return ERROR; - } - - if (rgn1->rdh.nCount != rgn2->rdh.nCount || - rgn1->rdh.nCount == 0 || - rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || - rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || - rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || - rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom) - goto exit; - - tRect1 = rgn1->Buffer; - tRect2 = rgn2->Buffer; - - if (!tRect1 || !tRect2) - goto exit; - - for (i=0; i < rgn1->rdh.nCount; i++) - { - if (tRect1[i].left != tRect2[i].left || - tRect1[i].right != tRect2[i].right || - tRect1[i].top != tRect2[i].top || - tRect1[i].bottom != tRect2[i].bottom) - goto exit; - } - bRet = TRUE; - -exit: - RGNOBJAPI_Unlock(rgn1); - RGNOBJAPI_Unlock(rgn2); - return bRet; -} - -HRGN -APIENTRY -NtGdiExtCreateRegion( - OPTIONAL LPXFORM Xform, - DWORD Count, - LPRGNDATA RgnData -) -{ - HRGN hRgn; - PROSRGNDATA Region; - DWORD nCount = 0; - DWORD iType = 0; - DWORD dwSize = 0; - NTSTATUS Status = STATUS_SUCCESS; - MATRIX matrix; - - DPRINT("NtGdiExtCreateRegion\n"); - _SEH2_TRY - { - ProbeForRead(RgnData, Count, 1); - nCount = RgnData->rdh.nCount; - iType = RgnData->rdh.iType; - dwSize = RgnData->rdh.dwSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - - /* Check parameters, but don't set last error here */ - if (Count < sizeof(RGNDATAHEADER) + nCount * sizeof(RECT) || - iType != RDH_RECTANGLES || - dwSize != sizeof(RGNDATAHEADER)) - { - return NULL; - } - - Region = REGION_AllocRgnWithHandle(nCount); - - if (Region == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - hRgn = Region->BaseObject.hHmgr; - - _SEH2_TRY - { - if (Xform) - { - ULONG ret; - - /* Init the XFORMOBJ from the Xform struct */ - Status = STATUS_INVALID_PARAMETER; - ret = XFORMOBJ_iSetXform((XFORMOBJ*)&matrix, (XFORML*)Xform); - - /* Check for error, also no scale and shear allowed */ - if (ret != DDI_ERROR && ret != GX_GENERAL) - { - /* Apply the coordinate transformation on the rects */ - if (XFORMOBJ_bApplyXform((XFORMOBJ*)&matrix, - XF_LTOL, - nCount * 2, - RgnData->Buffer, - Region->Buffer)) - { - Status = STATUS_SUCCESS; - } - } - } - else - { - /* Copy rect coordinates */ - RtlCopyMemory(Region->Buffer, - RgnData->Buffer, - nCount * sizeof(RECT)); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RGNOBJAPI_Unlock(Region); - GreDeleteObject(hRgn); - return NULL; - } - - RGNOBJAPI_Unlock(Region); - - return hRgn; -} - -BOOL -APIENTRY -NtGdiFillRgn( - HDC hDC, - HRGN hRgn, - HBRUSH hBrush -) -{ - HBRUSH oldhBrush; - PROSRGNDATA rgn; - PRECTL r; - - if (NULL == (rgn = RGNOBJAPI_Lock(hRgn, NULL))) - { - return FALSE; - } - - if (NULL == (oldhBrush = NtGdiSelectBrush(hDC, hBrush))) - { - RGNOBJAPI_Unlock(rgn); - return FALSE; - } - - for (r = rgn->Buffer; r < rgn->Buffer + rgn->rdh.nCount; r++) - { - NtGdiPatBlt(hDC, r->left, r->top, r->right - r->left, r->bottom - r->top, PATCOPY); - } - - RGNOBJAPI_Unlock(rgn); - NtGdiSelectBrush(hDC, oldhBrush); - - return TRUE; -} - -BOOL -APIENTRY -NtGdiFrameRgn( - HDC hDC, - HRGN hRgn, - HBRUSH hBrush, - INT Width, - INT Height -) -{ - HRGN FrameRgn; - BOOL Ret; - - if (!(FrameRgn = NtGdiCreateRectRgn(0, 0, 0, 0))) - { - return FALSE; - } - if (!REGION_CreateFrameRgn(FrameRgn, hRgn, Width, Height)) - { - GreDeleteObject(FrameRgn); - return FALSE; - } - - Ret = NtGdiFillRgn(hDC, FrameRgn, hBrush); - - GreDeleteObject(FrameRgn); - return Ret; } INT FASTCALL @@ -2764,85 +2353,6 @@ return 0; //if invalid region return zero } - -/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw - - 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! - - The intersection of the clip with the meta region is not Rao it's API! - Go back and read 7.2 Clipping pages 418-19: - Rao = API & Vis: - 1) The Rao region is the intersection of the API region and the system region, - named after the Microsoft engineer who initially proposed it. - 2) The Rao region can be calculated from the API region and the system region. - - API: - API region is the intersection of the meta region and the clipping region, - clearly named after the fact that it is controlled by GDI API calls. -*/ -INT APIENTRY -NtGdiGetRandomRgn( - HDC hDC, - HRGN hDest, - INT iCode -) -{ - INT ret = 0; - PDC pDC; - HRGN hSrc = NULL; - POINT org; - - pDC = DC_LockDc(hDC); - if (pDC == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return -1; - } - - switch (iCode) - { - case CLIPRGN: - hSrc = pDC->rosdc.hClipRgn; -// if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; - break; - case METARGN: - if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; - break; - case APIRGN: - hSrc = pDC->rosdc.hClipRgn; -// if (pDC->prgnAPI) hSrc = ((PROSRGNDATA)pDC->prgnAPI)->BaseObject.hHmgr; -// else if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; -// else if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; - break; - case SYSRGN: - hSrc = pDC->rosdc.hVisRgn; -// if (pDC->prgnVis) hSrc = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr; - break; - default: - hSrc = 0; - } - if (hSrc) - { - if (NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) - { - ret = -1; - } - else - { - ret = 1; - } - } - if (iCode == SYSRGN) - { - IntGdiGetDCOrg(pDC, &org); - NtGdiOffsetRgn(hDest, org.x, org.y ); - } - - DC_UnlockDc(pDC); - - return ret; -} - INT APIENTRY IntGdiGetRgnBox( HRGN hRgn, @@ -2860,129 +2370,6 @@ ret = REGION_GetRgnBox(Rgn, pRect); RGNOBJAPI_Unlock(Rgn); - return ret; -} - - -INT APIENTRY -NtGdiGetRgnBox( - HRGN hRgn, - PRECTL pRect -) -{ - PROSRGNDATA Rgn; - RECTL SafeRect; - DWORD ret; - NTSTATUS Status = STATUS_SUCCESS; - - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) - { - return ERROR; - } - - ret = REGION_GetRgnBox(Rgn, &SafeRect); - RGNOBJAPI_Unlock(Rgn); - if (ERROR == ret) - { - return ret; - } - - _SEH2_TRY - { - ProbeForWrite(pRect, sizeof(RECT), 1); - *pRect = SafeRect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - return ERROR; - } - - return ret; -} - -BOOL -APIENTRY -NtGdiInvertRgn( - HDC hDC, - HRGN hRgn -) -{ - PROSRGNDATA RgnData; - ULONG i; - PRECTL rc; - - if (!(RgnData = RGNOBJAPI_Lock(hRgn, NULL))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - rc = RgnData->Buffer; - for (i = 0; i < RgnData->rdh.nCount; i++) - { - - if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) - { - RGNOBJAPI_Unlock(RgnData); - return FALSE; - } - rc++; - } - - RGNOBJAPI_Unlock(RgnData); - return TRUE; -} - -INT -APIENTRY -NtGdiOffsetRgn( - HRGN hRgn, - INT XOffset, - INT YOffset -) -{ - PROSRGNDATA rgn = RGNOBJAPI_Lock(hRgn, NULL); - INT ret; - - DPRINT("NtGdiOffsetRgn: hRgn %d Xoffs %d Yoffs %d rgn %x\n", hRgn, XOffset, YOffset, rgn ); - - if (!rgn) - { - DPRINT("NtGdiOffsetRgn: hRgn error\n"); - return ERROR; - } - - if (XOffset || YOffset) - { - int nbox = rgn->rdh.nCount; - PRECTL pbox = rgn->Buffer; - - if (nbox && pbox) - { - while (nbox--) - { - pbox->left += XOffset; - pbox->right += XOffset; - pbox->top += YOffset; - pbox->bottom += YOffset; - pbox++; - } - if (rgn->Buffer != &rgn->rdh.rcBound) - { - rgn->rdh.rcBound.left += XOffset; - rgn->rdh.rcBound.right += XOffset; - rgn->rdh.rcBound.top += YOffset; - rgn->rdh.rcBound.bottom += YOffset; - } - } - } - ret = REGION_Complexity(rgn); - RGNOBJAPI_Unlock(rgn); return ret; } @@ -3046,38 +2433,6 @@ // Fill the region return TRUE; -} - -BOOL -APIENTRY -NtGdiPtInRegion( - HRGN hRgn, - INT X, - INT Y -) -{ - PROSRGNDATA rgn; - ULONG i; - PRECTL r; - - if (!(rgn = RGNOBJAPI_Lock(hRgn, NULL) ) ) - return FALSE; - - if (rgn->rdh.nCount > 0 && INRECT(rgn->rdh.rcBound, X, Y)) - { - r = rgn->Buffer; - for (i = 0; i < rgn->rdh.nCount; i++) - { - if (INRECT(*r, X, Y)) - { - RGNOBJAPI_Unlock(rgn); - return TRUE; - } - r++; - } - } - RGNOBJAPI_Unlock(rgn); - return FALSE; } BOOL @@ -3130,47 +2485,6 @@ } } return FALSE; -} - -BOOL -APIENTRY -NtGdiRectInRegion( - HRGN hRgn, - LPRECTL unsaferc -) -{ - PROSRGNDATA Rgn; - RECTL rc = {0}; - BOOL Ret; - NTSTATUS Status = STATUS_SUCCESS; - - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) - { - return ERROR; - } - - _SEH2_TRY - { - ProbeForRead(unsaferc, sizeof(RECT), 1); - rc = *unsaferc; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - RGNOBJAPI_Unlock(Rgn); - SetLastNtError(Status); - DPRINT1("NtGdiRectInRegion: bogus rc\n"); - return ERROR; - } - - Ret = REGION_RectInRegion(Rgn, &rc); - RGNOBJAPI_Unlock(Rgn); - return Ret; } VOID @@ -3210,128 +2524,11 @@ rgn->rdh.iType = RDH_RECTANGLES; } else + { + DPRINT1("SetRectRgn NULL Count: %d \n", rgn->rdh.nCount); EMPTY_REGION(rgn); -} - -BOOL -APIENTRY -NtGdiSetRectRgn( - HRGN hRgn, - INT LeftRect, - INT TopRect, - INT RightRect, - INT BottomRect -) -{ - PROSRGNDATA rgn; - - if ( !(rgn = RGNOBJAPI_Lock(hRgn, NULL)) ) - { - return 0; //per documentation - } - - REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); - - RGNOBJAPI_Unlock(rgn); - return TRUE; -} - -HRGN APIENTRY -NtGdiUnionRectWithRgn( - HRGN hDest, - const RECTL *UnsafeRect -) -{ - RECTL SafeRect = {0}; - PROSRGNDATA Rgn; - NTSTATUS Status = STATUS_SUCCESS; - - if (!(Rgn = RGNOBJAPI_Lock(hDest, NULL))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - - _SEH2_TRY - { - ProbeForRead(UnsafeRect, sizeof(RECT), 1); - SafeRect = *UnsafeRect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (! NT_SUCCESS(Status)) - { - RGNOBJAPI_Unlock(Rgn); - SetLastNtError(Status); - return NULL; - } - - REGION_UnionRectWithRgn(Rgn, &SafeRect); - RGNOBJAPI_Unlock(Rgn); - return hDest; -} - -/*! - * MSDN: GetRegionData, Return Values: - * - * "If the function succeeds and dwCount specifies an adequate number of bytes, - * the return value is always dwCount. If dwCount is too small or the function - * fails, the return value is 0. If lpRgnData is NULL, the return value is the - * required number of bytes. - * - * If the function fails, the return value is zero." - */ -DWORD APIENTRY -NtGdiGetRegionData( - HRGN hrgn, - DWORD count, - LPRGNDATA rgndata -) -{ - DWORD size; - PROSRGNDATA obj = RGNOBJAPI_Lock(hrgn, NULL); - NTSTATUS Status = STATUS_SUCCESS; - - if (!obj) - return 0; - - size = obj->rdh.nCount * sizeof(RECT); - if (count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) - { - RGNOBJAPI_Unlock(obj); - if (rgndata) /* buffer is too small, signal it by return 0 */ - return 0; - else /* user requested buffer size with rgndata NULL */ - return size + sizeof(RGNDATAHEADER); - } - - _SEH2_TRY - { - ProbeForWrite(rgndata, count, 1); - RtlCopyMemory(rgndata, &obj->rdh, sizeof(RGNDATAHEADER)); - RtlCopyMemory(rgndata->Buffer, obj->Buffer, size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RGNOBJAPI_Unlock(obj); - return 0; - } - - RGNOBJAPI_Unlock(obj); - return size + sizeof(RGNDATAHEADER); -} - + } +} /*********************************************************************** * REGION_InsertEdgeInET @@ -3967,4 +3164,811 @@ return hrgn; } +// +// NtGdi Exported Functions +// +INT +APIENTRY +NtGdiCombineRgn(HRGN hDest, + HRGN hSrc1, + HRGN hSrc2, + INT CombineMode) +{ + INT result = ERROR; + PROSRGNDATA destRgn, src1Rgn, src2Rgn = NULL; + + if ( CombineMode > RGN_COPY && CombineMode < RGN_AND) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return ERROR; + } + + destRgn = RGNOBJAPI_Lock(hDest, NULL); + if (!destRgn) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return ERROR; + } + + src1Rgn = RGNOBJAPI_Lock(hSrc1, NULL); + if (!src1Rgn) + { + RGNOBJAPI_Unlock(destRgn); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return ERROR; + } + + if (hSrc2) + src2Rgn = RGNOBJAPI_Lock(hSrc2, NULL); + + result = IntGdiCombineRgn( destRgn, src1Rgn, src2Rgn, CombineMode); + + if (src2Rgn) + RGNOBJAPI_Unlock(src2Rgn); + RGNOBJAPI_Unlock(src1Rgn); + RGNOBJAPI_Unlock(destRgn); + + return result; +} + +HRGN +APIENTRY +NtGdiCreateEllipticRgn( + INT Left, + INT Top, + INT Right, + INT Bottom +) +{ + return NtGdiCreateRoundRectRgn(Left, Top, Right, Bottom, + Right - Left, Bottom - Top); +} + +HRGN APIENTRY +NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect) +{ + PROSRGNDATA pRgn; + HRGN hRgn; + + /* Allocate region data structure with space for 1 RECTL */ + if (!(pRgn = REGION_AllocRgnWithHandle(1))) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hRgn = pRgn->BaseObject.hHmgr; + + REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); + RGNOBJAPI_Unlock(pRgn); + + return hRgn; +} + +HRGN +APIENTRY +NtGdiCreateRoundRectRgn( + INT left, + INT top, + INT right, + INT bottom, + INT ellipse_width, + INT ellipse_height +) +{ + PROSRGNDATA obj; + HRGN hrgn; + int asq, bsq, d, xd, yd; + RECTL rect; + + /* Make the dimensions sensible */ + + if (left > right) + { + INT tmp = left; + left = right; + right = tmp; + } + if (top > bottom) + { + INT tmp = top; + top = bottom; + bottom = tmp; + } + + ellipse_width = abs(ellipse_width); + ellipse_height = abs(ellipse_height); + + /* Check parameters */ + + if (ellipse_width > right-left) ellipse_width = right-left; + if (ellipse_height > bottom-top) ellipse_height = bottom-top; + + /* Check if we can do a normal rectangle instead */ + + if ((ellipse_width < 2) || (ellipse_height < 2)) + return NtGdiCreateRectRgn(left, top, right, bottom); + + /* Create region */ + + d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; + if (!(obj = REGION_AllocRgnWithHandle(d))) return 0; + hrgn = obj->BaseObject.hHmgr; + + /* Ellipse algorithm, based on an article by K. Porter */ + /* in DDJ Graphics Programming Column, 8/89 */ + + asq = ellipse_width * ellipse_width / 4; /* a^2 */ + bsq = ellipse_height * ellipse_height / 4; /* b^2 */ + d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */ + xd = 0; + yd = asq * ellipse_height; /* 2a^2b */ + + rect.left = left + ellipse_width / 2; + rect.right = right - ellipse_width / 2; + + /* Loop to draw first half of quadrant */ + + while (xd < yd) + { + if (d > 0) /* if nearest pixel is toward the center */ + { + /* move toward center */ + rect.top = top++; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + rect.top = --bottom; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + yd -= 2*asq; + d -= yd; + } + rect.left--; /* next horiz point */ + rect.right++; + xd += 2*bsq; + d += bsq + xd; + } + /* Loop to draw second half of quadrant */ + + d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2; + while (yd >= 0) + { + /* next vertical point */ + rect.top = top++; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + rect.top = --bottom; + rect.bottom = rect.top + 1; + REGION_UnionRectWithRgn(obj, &rect); + if (d < 0) /* if nearest pixel is outside ellipse */ + { + rect.left--; /* move away from center */ + rect.right++; + xd += 2*bsq; + d += xd; + } + yd -= 2*asq; + d += asq - yd; + } + /* Add the inside rectangle */ + + if (top <= bottom) + { + rect.top = top; + rect.bottom = bottom; + REGION_UnionRectWithRgn(obj, &rect); + } + + RGNOBJAPI_Unlock(obj); + return hrgn; +} + +BOOL +APIENTRY +NtGdiEqualRgn( + HRGN hSrcRgn1, + HRGN hSrcRgn2 +) +{ + PROSRGNDATA rgn1, rgn2; + PRECTL tRect1, tRect2; + ULONG i; + BOOL bRet = FALSE; + + if ( !(rgn1 = RGNOBJAPI_Lock(hSrcRgn1, NULL)) ) + return ERROR; + + if ( !(rgn2 = RGNOBJAPI_Lock(hSrcRgn2, NULL)) ) + { + RGNOBJAPI_Unlock(rgn1); + return ERROR; + } + + if (rgn1->rdh.nCount != rgn2->rdh.nCount || + rgn1->rdh.nCount == 0 || + rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || + rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || + rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || + rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom) + goto exit; + + tRect1 = rgn1->Buffer; + tRect2 = rgn2->Buffer; + + if (!tRect1 || !tRect2) + goto exit; + + for (i=0; i < rgn1->rdh.nCount; i++) + { + if (tRect1[i].left != tRect2[i].left || + tRect1[i].right != tRect2[i].right || + tRect1[i].top != tRect2[i].top || + tRect1[i].bottom != tRect2[i].bottom) + goto exit; + } + bRet = TRUE; + +exit: + RGNOBJAPI_Unlock(rgn1); + RGNOBJAPI_Unlock(rgn2); + return bRet; +} + +HRGN +APIENTRY +NtGdiExtCreateRegion( + OPTIONAL LPXFORM Xform, + DWORD Count, + LPRGNDATA RgnData +) +{ + HRGN hRgn; + PROSRGNDATA Region; + DWORD nCount = 0; + DWORD iType = 0; + DWORD dwSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + MATRIX matrix; + + DPRINT("NtGdiExtCreateRegion\n"); + _SEH2_TRY + { + ProbeForRead(RgnData, Count, 1); + nCount = RgnData->rdh.nCount; + iType = RgnData->rdh.iType; + dwSize = RgnData->rdh.dwSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + + /* Check parameters, but don't set last error here */ + if (Count < sizeof(RGNDATAHEADER) + nCount * sizeof(RECT) || + iType != RDH_RECTANGLES || + dwSize != sizeof(RGNDATAHEADER)) + { + return NULL; + } + + Region = REGION_AllocRgnWithHandle(nCount); + + if (Region == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + hRgn = Region->BaseObject.hHmgr; + + _SEH2_TRY + { + if (Xform) + { + ULONG ret; + + /* Init the XFORMOBJ from the Xform struct */ + Status = STATUS_INVALID_PARAMETER; + ret = XFORMOBJ_iSetXform((XFORMOBJ*)&matrix, (XFORML*)Xform); + + /* Check for error, also no scale and shear allowed */ + if (ret != DDI_ERROR && ret != GX_GENERAL) + { + /* Apply the coordinate transformation on the rects */ + if (XFORMOBJ_bApplyXform((XFORMOBJ*)&matrix, + XF_LTOL, + nCount * 2, + RgnData->Buffer, + Region->Buffer)) + { + Status = STATUS_SUCCESS; + } + } + } + else + { + /* Copy rect coordinates */ + RtlCopyMemory(Region->Buffer, + RgnData->Buffer, + nCount * sizeof(RECT)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RGNOBJAPI_Unlock(Region); + GreDeleteObject(hRgn); + return NULL; + } + + RGNOBJAPI_Unlock(Region); + + return hRgn; +} + +BOOL +APIENTRY +NtGdiFillRgn( + HDC hDC, + HRGN hRgn, + HBRUSH hBrush +) +{ + HBRUSH oldhBrush; + PROSRGNDATA rgn; + PRECTL r; + + if (NULL == (rgn = RGNOBJAPI_Lock(hRgn, NULL))) + { + return FALSE; + } + + if (NULL == (oldhBrush = NtGdiSelectBrush(hDC, hBrush))) + { + RGNOBJAPI_Unlock(rgn); + return FALSE; + } + + for (r = rgn->Buffer; r < rgn->Buffer + rgn->rdh.nCount; r++) + { + NtGdiPatBlt(hDC, r->left, r->top, r->right - r->left, r->bottom - r->top, PATCOPY); + } + + RGNOBJAPI_Unlock(rgn); + NtGdiSelectBrush(hDC, oldhBrush); + + return TRUE; +} + +BOOL +APIENTRY +NtGdiFrameRgn( + HDC hDC, + HRGN hRgn, + HBRUSH hBrush, + INT Width, + INT Height +) +{ + HRGN FrameRgn; + BOOL Ret; + + if (!(FrameRgn = NtGdiCreateRectRgn(0, 0, 0, 0))) + { + return FALSE; + } + if (!REGION_CreateFrameRgn(FrameRgn, hRgn, Width, Height)) + { + GreDeleteObject(FrameRgn); + return FALSE; + } + + Ret = NtGdiFillRgn(hDC, FrameRgn, hBrush); + + GreDeleteObject(FrameRgn); + return Ret; +} + + +/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw + + 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! + + The intersection of the clip with the meta region is not Rao it's API! + Go back and read 7.2 Clipping pages 418-19: + Rao = API & Vis: + 1) The Rao region is the intersection of the API region and the system region, + named after the Microsoft engineer who initially proposed it. + 2) The Rao region can be calculated from the API region and the system region. + + API: + API region is the intersection of the meta region and the clipping region, + clearly named after the fact that it is controlled by GDI API calls. +*/ +INT APIENTRY +NtGdiGetRandomRgn( + HDC hDC, + HRGN hDest, + INT iCode +) +{ + INT ret = 0; + PDC pDC; + HRGN hSrc = NULL; + POINT org; + + pDC = DC_LockDc(hDC); + if (pDC == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return -1; + } + + switch (iCode) + { + case CLIPRGN: + hSrc = pDC->rosdc.hClipRgn; +// if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; + break; + case METARGN: + if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; + break; + case APIRGN: + hSrc = pDC->rosdc.hClipRgn; +// if (pDC->prgnAPI) hSrc = ((PROSRGNDATA)pDC->prgnAPI)->BaseObject.hHmgr; +// else if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; +// else if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; + break; + case SYSRGN: + hSrc = pDC->rosdc.hVisRgn; +// if (pDC->prgnVis) hSrc = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr; + break; + default: + hSrc = 0; + } + if (hSrc) + { + if (NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) + { + ret = -1; + } + else + { + ret = 1; + } + } + if (iCode == SYSRGN) + { + IntGdiGetDCOrg(pDC, &org); + NtGdiOffsetRgn(hDest, org.x, org.y ); + } + + DC_UnlockDc(pDC); + + return ret; +} + +INT APIENTRY +NtGdiGetRgnBox( + HRGN hRgn, + PRECTL pRect +) +{ + PROSRGNDATA Rgn; + RECTL SafeRect; + DWORD ret; + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + { + return ERROR; + } + + ret = REGION_GetRgnBox(Rgn, &SafeRect); + RGNOBJAPI_Unlock(Rgn); + if (ERROR == ret) + { + return ret; + } + + _SEH2_TRY + { + ProbeForWrite(pRect, sizeof(RECT), 1); + *pRect = SafeRect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + return ERROR; + } + + return ret; +} + +BOOL +APIENTRY +NtGdiInvertRgn( + HDC hDC, + HRGN hRgn +) +{ + PROSRGNDATA RgnData; + ULONG i; + PRECTL rc; + + if (!(RgnData = RGNOBJAPI_Lock(hRgn, NULL))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + rc = RgnData->Buffer; + for (i = 0; i < RgnData->rdh.nCount; i++) + { + + if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) + { + RGNOBJAPI_Unlock(RgnData); + return FALSE; + } + rc++; + } + + RGNOBJAPI_Unlock(RgnData); + return TRUE; +} + +INT +APIENTRY +NtGdiOffsetRgn( + HRGN hRgn, + INT XOffset, + INT YOffset +) +{ + PROSRGNDATA rgn = RGNOBJAPI_Lock(hRgn, NULL); + INT ret; + + DPRINT("NtGdiOffsetRgn: hRgn %d Xoffs %d Yoffs %d rgn %x\n", hRgn, XOffset, YOffset, rgn ); + + if (!rgn) + { + DPRINT("NtGdiOffsetRgn: hRgn error\n"); + return ERROR; + } + + if (XOffset || YOffset) + { + int nbox = rgn->rdh.nCount; + PRECTL pbox = rgn->Buffer; + + if (nbox && pbox) + { + while (nbox--) + { + pbox->left += XOffset; + pbox->right += XOffset; + pbox->top += YOffset; + pbox->bottom += YOffset; + pbox++; + } + if (rgn->Buffer != &rgn->rdh.rcBound) + { + rgn->rdh.rcBound.left += XOffset; + rgn->rdh.rcBound.right += XOffset; + rgn->rdh.rcBound.top += YOffset; + rgn->rdh.rcBound.bottom += YOffset; + } + } + } + ret = REGION_Complexity(rgn); + RGNOBJAPI_Unlock(rgn); + return ret; +} + +BOOL +APIENTRY +NtGdiPtInRegion( + HRGN hRgn, + INT X, + INT Y +) +{ + PROSRGNDATA rgn; + ULONG i; + PRECTL r; + + if (!(rgn = RGNOBJAPI_Lock(hRgn, NULL) ) ) + return FALSE; + + if (rgn->rdh.nCount > 0 && INRECT(rgn->rdh.rcBound, X, Y)) + { + r = rgn->Buffer; + for (i = 0; i < rgn->rdh.nCount; i++) + { + if (INRECT(*r, X, Y)) + { + RGNOBJAPI_Unlock(rgn); + return TRUE; + } + r++; + } + } + RGNOBJAPI_Unlock(rgn); + return FALSE; +} + +BOOL +APIENTRY +NtGdiRectInRegion( + HRGN hRgn, + LPRECTL unsaferc +) +{ + PROSRGNDATA Rgn; + RECTL rc = {0}; + BOOL Ret; + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + { + return ERROR; + } + + _SEH2_TRY + { + ProbeForRead(unsaferc, sizeof(RECT), 1); + rc = *unsaferc; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + RGNOBJAPI_Unlock(Rgn); + SetLastNtError(Status); + DPRINT1("NtGdiRectInRegion: bogus rc\n"); + return ERROR; + } + + Ret = REGION_RectInRegion(Rgn, &rc); + RGNOBJAPI_Unlock(Rgn); + return Ret; +} + +BOOL +APIENTRY +NtGdiSetRectRgn( + HRGN hRgn, + INT LeftRect, + INT TopRect, + INT RightRect, + INT BottomRect +) +{ + PROSRGNDATA rgn; + + if ( !(rgn = RGNOBJAPI_Lock(hRgn, NULL)) ) + { + return 0; //per documentation + } + + REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); + + RGNOBJAPI_Unlock(rgn); + return TRUE; +} + +HRGN APIENTRY +NtGdiUnionRectWithRgn( + HRGN hDest, + const RECTL *UnsafeRect +) +{ + RECTL SafeRect = {0}; + PROSRGNDATA Rgn; + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Rgn = RGNOBJAPI_Lock(hDest, NULL))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + _SEH2_TRY + { + ProbeForRead(UnsafeRect, sizeof(RECT), 1); + SafeRect = *UnsafeRect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (! NT_SUCCESS(Status)) + { + RGNOBJAPI_Unlock(Rgn); + SetLastNtError(Status); + return NULL; + } + + REGION_UnionRectWithRgn(Rgn, &SafeRect); + RGNOBJAPI_Unlock(Rgn); + return hDest; +} + +/*! + * MSDN: GetRegionData, Return Values: + * + * "If the function succeeds and dwCount specifies an adequate number of bytes, + * the return value is always dwCount. If dwCount is too small or the function + * fails, the return value is 0. If lpRgnData is NULL, the return value is the + * required number of bytes. + * + * If the function fails, the return value is zero." + */ +DWORD APIENTRY +NtGdiGetRegionData( + HRGN hrgn, + DWORD count, + LPRGNDATA rgndata +) +{ + DWORD size; + PROSRGNDATA obj = RGNOBJAPI_Lock(hrgn, NULL); + NTSTATUS Status = STATUS_SUCCESS; + + if (!obj) + return 0; + + size = obj->rdh.nCount * sizeof(RECT); + if (count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) + { + RGNOBJAPI_Unlock(obj); + if (rgndata) /* buffer is too small, signal it by return 0 */ + return 0; + else /* user requested buffer size with rgndata NULL */ + return size + sizeof(RGNDATAHEADER); + } + + _SEH2_TRY + { + ProbeForWrite(rgndata, count, 1); + RtlCopyMemory(rgndata, &obj->rdh, sizeof(RGNDATAHEADER)); + RtlCopyMemory(rgndata->Buffer, obj->Buffer, size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RGNOBJAPI_Unlock(obj); + return 0; + } + + RGNOBJAPI_Unlock(obj); + return size + sizeof(RGNDATAHEADER); +} + /* EOF */

1 0

[ekohl] 44922: Coding-style fixes. No code changes.
by ekohl＠svn.reactos.org 03 Jan '10

03 Jan '10

Author: ekohl Date: Sun Jan 3 23:44:10 2010 New Revision: 44922 URL: http://svn.reactos.org/svn/reactos?rev=44922&view=rev Log: Coding-style fixes. No code changes. Modified: trunk/reactos/drivers/filesystems/mup/create.c trunk/reactos/drivers/filesystems/mup/mup.c Modified: trunk/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/cr… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] Sun Jan 3 23:44:10 2010 @@ -39,33 +39,33 @@ NTSTATUS NTAPI MupCreate(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { - PDEVICE_EXTENSION DeviceExt; - PIO_STACK_LOCATION Stack; - PFILE_OBJECT FileObject; - NTSTATUS Status; + PDEVICE_EXTENSION DeviceExt; + PIO_STACK_LOCATION Stack; + PFILE_OBJECT FileObject; + NTSTATUS Status; - DPRINT("MupCreate() called\n"); + DPRINT("MupCreate() called\n"); - DeviceExt = DeviceObject->DeviceExtension; - ASSERT(DeviceExt); - Stack = IoGetCurrentIrpStackLocation (Irp); - ASSERT(Stack); + DeviceExt = DeviceObject->DeviceExtension; + ASSERT(DeviceExt); + Stack = IoGetCurrentIrpStackLocation (Irp); + ASSERT(Stack); - FileObject = Stack->FileObject; + FileObject = Stack->FileObject; - DPRINT("FileName: '%wZ'\n", &FileObject->FileName); + DPRINT("FileName: '%wZ'\n", &FileObject->FileName); - Status = STATUS_ACCESS_DENIED; + Status = STATUS_ACCESS_DENIED; - Irp->IoStatus.Information = (NT_SUCCESS(Status)) ? FILE_OPENED : 0; - Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = (NT_SUCCESS(Status)) ? FILE_OPENED : 0; + Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); + IoCompleteRequest(Irp, + IO_NO_INCREMENT); - return(Status); + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sun Jan 3 23:44:10 2010 @@ -40,9 +40,6 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS NTAPI -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) /* * FUNCTION: Called by the system to initalize the driver * ARGUMENTS: @@ -50,56 +47,59 @@ * RegistryPath = path to our configuration entries * RETURNS: Success or failure */ +NTSTATUS NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) { - PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; - UNICODE_STRING DeviceName; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + UNICODE_STRING DeviceName; - DPRINT("MUP 0.0.1\n"); + DPRINT("MUP 0.0.1\n"); - RtlInitUnicodeString(&DeviceName, - L"\\Device\\Mup"); - Status = IoCreateDevice(DriverObject, - sizeof(DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_MULTI_UNC_PROVIDER, - 0, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) + RtlInitUnicodeString(&DeviceName, + L"\\Device\\Mup"); + Status = IoCreateDevice(DriverObject, + sizeof(DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_MULTI_UNC_PROVIDER, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) { - return(Status); + return Status; } - /* Initialize driver data */ - DeviceObject->Flags |= DO_DIRECT_IO; -// DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; - DriverObject->MajorFunction[IRP_MJ_CREATE] = MupCreate; - DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = MupCreate; - DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = MupCreate; -// DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead; -// DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsWrite; -// DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = -// NtfsFileSystemControl; -// DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = -// NtfsDirectoryControl; -// DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = -// NtfsQueryInformation; -// DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = -// NtfsQueryVolumeInformation; -// DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = -// NtfsSetVolumeInformation; + /* Initialize driver data */ + DeviceObject->Flags |= DO_DIRECT_IO; +// DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsClose; + DriverObject->MajorFunction[IRP_MJ_CREATE] = MupCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = MupCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = MupCreate; +// DriverObject->MajorFunction[IRP_MJ_READ] = NtfsRead; +// DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsWrite; +// DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = +// NtfsFileSystemControl; +// DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = +// NtfsDirectoryControl; +// DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = +// NtfsQueryInformation; +// DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = +// NtfsQueryVolumeInformation; +// DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = +// NtfsSetVolumeInformation; - DriverObject->DriverUnload = NULL; + DriverObject->DriverUnload = NULL; - /* Initialize global data */ -// DeviceExtensionNtfsGlobalData = DeviceObject->DeviceExtension; -// RtlZeroMemory(NtfsGlobalData, -// sizeof(NTFS_GLOBAL_DATA)); -// NtfsGlobalData->DriverObject = DriverObject; -// NtfsGlobalData->DeviceObject = DeviceObject; + /* Initialize global data */ +// DeviceExtensionNtfsGlobalData = DeviceObject->DeviceExtension; +// RtlZeroMemory(NtfsGlobalData, +// sizeof(NTFS_GLOBAL_DATA)); +// NtfsGlobalData->DriverObject = DriverObject; +// NtfsGlobalData->DeviceObject = DeviceObject; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; }

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