Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[silverblade] 39610: Fix #includes in a few more files to get ReactOS building again.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Feb 15 10:08:40 2009 New Revision: 39610 URL: http://svn.reactos.org/svn/reactos?rev=39610&view=rev Log: Fix #includes in a few more files to get ReactOS building again. Modified: trunk/reactos/dll/win32/sndblst/sndblst.c trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/thread.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c trunk/reactos/lib/drivers/sound/mment4/detect.c trunk/reactos/lib/drivers/sound/mment4/registry.c Modified: trunk/reactos/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Feb 15 10:08:40 2009 @@ -14,7 +14,7 @@ #include <windows.h> #include <ntddsnd.h> -#include <reactos/sndtypes.h> +#include <sndtypes.h> #include <mmddk.h> #include <mmebuddy.h> #include <mment4.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 Feb 15 10:08:40 2009 @@ -13,7 +13,8 @@ * * NOTES: MME Buddy was the best name I could come up with... * The structures etc. here should be treated as internal to the - * library so should not be directly accessed elsewhere. + * library so should not be directly accessed elsewhere. Perhaps they + * can be moved to an internal header? */ #ifndef ROS_AUDIO_MMEBUDDY_H Modified: trunk/reactos/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Feb 15 10:08:40 2009 @@ -194,7 +194,10 @@ DestroySoundThread( IN PSOUND_THREAD Thread) { - /* TODO: Implement me! */ + VALIDATE_MMSYS_PARAMETER( Thread ); + SND_TRACE(L"Terminating sound thread\n"); + Thread->Running = FALSE; + /* TODO: Implement me! Wait for thread to have finished? */ return MMSYSERR_NOTSUPPORTED; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sun Feb 15 10:08:40 2009 @@ -155,8 +155,29 @@ if ( ! FunctionTable->SubmitWaveHeader ) return MMSYSERR_NOTSUPPORTED; - return WaveHeaderOperation(FunctionTable->SubmitWaveHeader, - SoundDeviceInstance, - Header); + /* + A few minor sanity checks - any custom checks should've been carried + out during wave header preparation etc. + */ + VALIDATE_MMSYS_PARAMETER( Header->lpData != NULL ); + VALIDATE_MMSYS_PARAMETER( Header->dwBufferLength > 0 ); + VALIDATE_MMSYS_PARAMETER( Header->dwFlags & WHDR_PREPARED ); + VALIDATE_MMSYS_PARAMETER( ! Header->dwFlags & WHDR_INQUEUE ); + + /* Clear the "done" flag for the buffer */ + Header->dwFlags &= ~WHDR_DONE; + + Result = WaveHeaderOperation(FunctionTable->SubmitWaveHeader, + SoundDeviceInstance, + Header); + + if ( ! MMSUCCESS(Result) ) + { + return Result; + } + + /* Set the "in queue" flag if everything was OK */ + Header->dwFlags |= WHDR_INQUEUE; + + return MMSYSERR_NOERROR; } - Modified: trunk/reactos/lib/drivers/sound/mment4/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/d… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/detect.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/detect.c [iso-8859-1] Sun Feb 15 10:08:40 2009 @@ -15,8 +15,8 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> -#include <reactos/sndnames.h> -#include <reactos/sndtypes.h> +#include <sndnames.h> +#include <sndtypes.h> #include <mmebuddy.h> #include <mment4.h> Modified: trunk/reactos/lib/drivers/sound/mment4/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/r… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/registry.c [iso-8859-1] Sun Feb 15 10:08:40 2009 @@ -13,8 +13,8 @@ #include <mmddk.h> #include <ntddsnd.h> -#include <reactos/sndnames.h> -#include <reactos/sndtypes.h> +#include <sndnames.h> +#include <sndtypes.h> #include <mmebuddy.h> #include <mment4.h>

16 years, 2 months

[silverblade] 39609: Fixed build by including the correct header this time! Renamed SubmitWaveHeader to EnqueueWaveHeader, except for in the functiontable which will actually do the wave header submission to the driver.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Feb 15 09:37:44 2009 New Revision: 39609 URL: http://svn.reactos.org/svn/reactos?rev=39609&view=rev Log: Fixed build by including the correct header this time! Renamed SubmitWaveHeader to EnqueueWaveHeader, except for in the functiontable which will actually do the wave header submission to the driver. Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c trunk/reactos/lib/drivers/sound/mment4/control.c 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 Feb 15 09:37:44 2009 @@ -307,8 +307,8 @@ #define MmeUnprepareWaveHeader(private_handle, header) \ UnprepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) -#define MmeSubmitWaveHeader(private_handle, header) \ - SubmitWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) +#define MmeEnqueueWaveHeader(private_handle, header) \ + EnqueueWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) /* @@ -503,7 +503,7 @@ IN PWAVEHDR Header); MMRESULT -SubmitWaveHeader( +EnqueueWaveHeader( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEHDR Header); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sun Feb 15 09:37:44 2009 @@ -131,7 +131,7 @@ } MMRESULT -SubmitWaveHeader( +EnqueueWaveHeader( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEHDR Header) { 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 Feb 15 09:37:44 2009 @@ -94,7 +94,7 @@ case WODM_WRITE : { - Result = MmeSubmitWaveHeader(PrivateHandle, Parameter1); + Result = MmeEnqueueWaveHeader(PrivateHandle, Parameter1); break; } Modified: trunk/reactos/lib/drivers/sound/mment4/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] Sun Feb 15 09:37:44 2009 @@ -12,7 +12,7 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> -#include <reactos/sndtypes.h> +#include <sndtypes.h> #include <mmebuddy.h> #include <mment4.h> @@ -229,3 +229,17 @@ return MMSYSERR_NOERROR; } +#if 0 +MMRESULT +SubmitNt4WaveHeader( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR WaveHeader) +{ + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); + VALIDATE_MMSYS_PARAMETER( WaveHeader ); + + SND_TRACE(L"Submitting wave header %p (in sound thread)\n", WaveHeader); + + /* TODO: This should only submit the header to the device, nothing more! */ +} +#endif

16 years, 2 months

[silverblade] 39608: WaveHdr prepare/unprepare/submit now gets handled within the context of the appropriate sound thread. This removes some responsibility of the sound threading from the actual usermode sound component implementations. Minor cleanup to CallSoundThread as we can deduce the thread handle from the sound device instance.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Feb 15 09:19:58 2009 New Revision: 39608 URL: http://svn.reactos.org/svn/reactos?rev=39608&view=rev Log: WaveHdr prepare/unprepare/submit now gets handled within the context of the appropriate sound thread. This removes some responsibility of the sound threading from the actual usermode sound component implementations. Minor cleanup to CallSoundThread as we can deduce the thread handle from the sound device instance. Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c trunk/reactos/lib/drivers/sound/mmebuddy/functiontable.c trunk/reactos/lib/drivers/sound/mmebuddy/thread.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c 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 Feb 15 09:19:58 2009 @@ -376,7 +376,7 @@ MMRESULT SetSoundDeviceFunctionTable( IN PSOUND_DEVICE SoundDevice, - IN PMMFUNCTION_TABLE FunctionTable OPTIONAL); + IN PMMFUNCTION_TABLE FunctionTable); MMRESULT GetSoundDeviceFunctionTable( @@ -438,9 +438,8 @@ MMRESULT CallSoundThread( - IN PSOUND_THREAD Thread, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, IN PVOID Parameter OPTIONAL); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Sun Feb 15 09:19:58 2009 @@ -243,7 +243,7 @@ SND_ASSERT( FunctionTable->Close ); if ( FunctionTable->Close == NULL ) { - /* Bad practice, really! If you can open, why not close?! */ + /* This indicates bad practice, really! If you can open, why not close?! */ return MMSYSERR_NOTSUPPORTED; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/functiontable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/functiontable.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/functiontable.c [iso-8859-1] Sun Feb 15 09:19:58 2009 @@ -18,26 +18,26 @@ /* Attaches a function table to a sound device. Any NULL entries in this table are automatically set to point to a default routine to handle - the appropriate function. If NULL is passed as the function table itself, - the entire function table will use only the default routines. + the appropriate function. */ MMRESULT SetSoundDeviceFunctionTable( IN PSOUND_DEVICE SoundDevice, - IN PMMFUNCTION_TABLE FunctionTable OPTIONAL) + IN PMMFUNCTION_TABLE FunctionTable) { VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( FunctionTable ); /* Zero out the existing function table (if present) */ ZeroMemory(&SoundDevice->FunctionTable, sizeof(MMFUNCTION_TABLE)); - if ( FunctionTable ) - { - /* Fill in the client-supplied functions */ - CopyMemory(&SoundDevice->FunctionTable, - FunctionTable, - sizeof(MMFUNCTION_TABLE)); - } + if ( ! FunctionTable ) + return MMSYSERR_INVALPARAM; + + /* Fill in the client-supplied functions */ + CopyMemory(&SoundDevice->FunctionTable, + FunctionTable, + sizeof(MMFUNCTION_TABLE)); return MMSYSERR_NOERROR; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Feb 15 09:19:58 2009 @@ -175,6 +175,7 @@ /* Wake the thread up */ if ( ResumeThread(NewThread->Handle) == -1 ) { + SND_ERR(L"Failed to resume thread!\n"); CloseHandle(NewThread->Handle); DestroySoundThreadEvents(NewThread->Events.Ready, NewThread->Events.Request, @@ -199,13 +200,15 @@ MMRESULT CallSoundThread( - IN PSOUND_THREAD Thread, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, IN PVOID Parameter OPTIONAL) { - VALIDATE_MMSYS_PARAMETER( Thread ); + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); VALIDATE_MMSYS_PARAMETER( RequestHandler ); + + /* TODO: Don't call this directly? */ + PSOUND_THREAD Thread = SoundDeviceInstance->Thread; SND_TRACE(L"Waiting for READY event\n"); WaitForSingleObject(Thread->Events.Ready, INFINITE); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sun Feb 15 09:19:58 2009 @@ -13,6 +13,62 @@ #include <mmddk.h> #include <ntddsnd.h> #include <mmebuddy.h> + + +/* + This structure gets used locally within functions as a way to shuttle data + to the sound thread. It's safe to use locally since CallSoundThread will + not return until the operation has been carried out. +*/ + +typedef struct +{ + MMWAVEHEADER_FUNC Function; + PWAVEHDR Header; +} THREADED_WAVEHEADER_PARAMETERS; + + +/* + Helper routines to simplify the call to the sound thread for the header + functions. +*/ + +MMRESULT +WaveHeaderOperationInSoundThread( + PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + THREADED_WAVEHEADER_PARAMETERS* Parameters = (THREADED_WAVEHEADER_PARAMETERS*) Parameter; + return Parameters->Function(SoundDeviceInstance, Parameters->Header); +} + +MMRESULT +WaveHeaderOperation( + MMWAVEHEADER_FUNC Function, + PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + PWAVEHDR Header) +{ + THREADED_WAVEHEADER_PARAMETERS Parameters; + + Parameters.Function = Function; + Parameters.Header = Header; + + return CallSoundThread(SoundDeviceInstance, + WaveHeaderOperationInSoundThread, + &Parameters); +} + + +/* + The following routines are basically handlers for: + - WODM_PREPARE + - WODM_UNPREPARE + - WODM_WRITE + + All of these calls are ultimately dealt with in the context of the + appropriate sound thread, so the implementation should expect itself to + be running in this other thread when any of these operations take place. +*/ MMRESULT PrepareWaveHeader( @@ -39,7 +95,9 @@ if ( ! FunctionTable->PrepareWaveHeader ) return MMSYSERR_NOTSUPPORTED; - return FunctionTable->PrepareWaveHeader(SoundDeviceInstance, Header); + return WaveHeaderOperation(FunctionTable->PrepareWaveHeader, + SoundDeviceInstance, + Header); } MMRESULT @@ -67,7 +125,9 @@ if ( ! FunctionTable->UnprepareWaveHeader ) return MMSYSERR_NOTSUPPORTED; - return FunctionTable->UnprepareWaveHeader(SoundDeviceInstance, Header); + return WaveHeaderOperation(FunctionTable->UnprepareWaveHeader, + SoundDeviceInstance, + Header); } MMRESULT @@ -95,6 +155,8 @@ if ( ! FunctionTable->SubmitWaveHeader ) return MMSYSERR_NOTSUPPORTED; - return FunctionTable->SubmitWaveHeader(SoundDeviceInstance, Header); + return WaveHeaderOperation(FunctionTable->SubmitWaveHeader, + SoundDeviceInstance, + Header); }

16 years, 2 months

[khornicek] 39607: - update wined3d/d3d8/d3d9 to Wine 1.1.15

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Feb 15 08:01:23 2009 New Revision: 39607 URL: http://svn.reactos.org/svn/reactos?rev=39607&view=rev Log: - update wined3d/d3d8/d3d9 to Wine 1.1.15 Modified: trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -2265,19 +2265,19 @@ - FIELD_OFFSET(struct IDirect3DDevice8Impl, device_parent_vtbl)); } -HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); return IDirect3DDevice8Impl_QueryInterface((IDirect3DDevice8 *)This, riid, object); } -ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); return IDirect3DDevice8Impl_AddRef((IDirect3DDevice8 *)This); } -ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); return IDirect3DDevice8Impl_Release((IDirect3DDevice8 *)This); Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -265,7 +265,7 @@ } static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) { - BOOL *resources_ok = (BOOL *) data; + BOOL *resources_ok = data; WINED3DRESOURCETYPE type; HRESULT ret = S_OK; WINED3DSURFACE_DESC surface_desc; @@ -617,7 +617,7 @@ TRACE("(%p)->(%p,%p,%p,%p,%d)\n" , This, src, pSourceRect, dst, pDestRect, Filter); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DSurface_Blt(dst->wineD3DSurface, (RECT *) pDestRect, src->wineD3DSurface, (RECT *) pSourceRect, 0, NULL, Filter); + hr = IWineD3DSurface_Blt(dst->wineD3DSurface, pDestRect, src->wineD3DSurface, pSourceRect, 0, NULL, Filter); LeaveCriticalSection(&d3d9_cs); return hr; } @@ -1338,7 +1338,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9EX iface, DWORD FVF) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/directx.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -37,7 +37,7 @@ return S_OK; } else if(IsEqualGUID(riid, &IID_IDirect3D9Ex)) { if(This->extended) { - *ppobj = (IDirect3D9Ex *) This; + *ppobj = This; TRACE("Returning IDirect3D9Ex interface at %p\n", *ppobj); IDirect3D9Ex_AddRef((IDirect3D9Ex *)*ppobj); } else { Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -510,7 +510,7 @@ break; case WINED3DSPR_INPUT: - if (This->swizzle_map & (1 << reg)) is_color = TRUE; + if (This->cur_args->swizzle_map & (1 << reg)) is_color = TRUE; sprintf(tmpReg, "vertex.attrib[%u]", reg); strcat(hwLine, tmpReg); @@ -1741,18 +1741,19 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_arb_priv *priv = (struct shader_arb_priv *) This->shader_priv; + struct shader_arb_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; if (useVS) { + struct vs_compile_args compile_args; + TRACE("Using vertex shader\n"); - IWineD3DVertexShaderImpl_CompileShader(This->stateBlock->vertexShader); - - priv->current_vprogram_id = ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->prgId; + find_vs_compile_args((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, This->stateBlock, &compile_args); + priv->current_vprogram_id = find_gl_vshader((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, &compile_args); /* Bind the vertex program */ GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); - checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, vertexShader->prgId);"); + checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id);"); /* Enable OpenGL vertex programs */ glEnable(GL_VERTEX_PROGRAM_ARB); @@ -1773,7 +1774,7 @@ /* Bind the fragment program */ GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); - checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixelShader->prgId);"); + checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);"); if(!priv->use_arbfp_fixed_func) { /* Enable OpenGL fragment programs */ @@ -1794,7 +1795,7 @@ static void shader_arb_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_arb_priv *priv = (struct shader_arb_priv *) This->shader_priv; + struct shader_arb_priv *priv = This->shader_priv; GLuint *blt_fprogram = &priv->depth_blt_fprogram_id[tex_type]; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; @@ -1809,7 +1810,7 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_arb_priv *priv = (struct shader_arb_priv *) This->shader_priv; + struct shader_arb_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; if (priv->current_vprogram_id) { @@ -1857,16 +1858,22 @@ HeapFree(GetProcessHeap(), 0, This->gl_shaders); This->gl_shaders = NULL; This->num_gl_shaders = 0; + This->shader_array_size = 0; } else { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *) iface; + UINT i; ENTER_GL(); - GL_EXTCALL(glDeleteProgramsARB(1, &This->prgId)); - checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &This->prgId))"); - ((IWineD3DVertexShaderImpl *) This)->prgId = 0; + for(i = 0; i < This->num_gl_shaders; i++) { + GL_EXTCALL(glDeleteProgramsARB(1, &This->gl_shaders[i].prgId)); + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &This->gl_shaders[i].prgId))"); + } LEAVE_GL(); - } - baseShader->baseShader.is_compiled = FALSE; + HeapFree(GetProcessHeap(), 0, This->gl_shaders); + This->gl_shaders = NULL; + This->num_gl_shaders = 0; + This->shader_array_size = 0; + } } static HRESULT shader_arb_alloc(IWineD3DDevice *iface) { @@ -1878,7 +1885,7 @@ static void shader_arb_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - struct shader_arb_priv *priv = (struct shader_arb_priv *) This->shader_priv; + struct shader_arb_priv *priv = This->shader_priv; int i; if(priv->depth_blt_vprogram_id) { @@ -2007,13 +2014,14 @@ return retval; } -static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer) { +static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer, const struct vs_compile_args *args) { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; const local_constant *lconst; + GLuint ret; /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -2060,9 +2068,16 @@ /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, buffer, reg_maps, function); - /* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */ - if (!reg_maps->fog) + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->fog_src == VS_FOG_Z) { shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); + } else if (!reg_maps->fog) { + shader_addline(buffer, "MOV result.fogcoord, 0.0;\n"); + } /* Write the final position. * @@ -2085,12 +2100,12 @@ shader_addline(buffer, "END\n"); /* TODO: change to resource.glObjectHandle or something like that */ - GL_EXTCALL(glGenProgramsARB(1, &This->prgId)); - - TRACE("Creating a hw vertex shader, prg=%d\n", This->prgId); - GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, This->prgId)); - - TRACE("Created hw vertex shader, prg=%d\n", This->prgId); + GL_EXTCALL(glGenProgramsARB(1, &ret)); + + TRACE("Creating a hw vertex shader, prg=%d\n", ret); + GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, ret)); + + TRACE("Created hw vertex shader, prg=%d\n", ret); /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, buffer->bsize, buffer->buffer)); @@ -2100,16 +2115,17 @@ glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); FIXME("HW VertexShader Error at position %d: %s\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - This->prgId = -1; - } - - /* Load immediate constants */ - if(!This->baseShader.load_local_constsF) { - LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { - const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst->idx, value)); - } - } + ret = -1; + } else { + /* Load immediate constants */ + if(!This->baseShader.load_local_constsF) { + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + const float *value = (const float *)lconst->value; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst->idx, value)); + } + } + } + return ret; } static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) @@ -2294,7 +2310,7 @@ This->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_arb_priv)); if(!This->fragment_priv) return E_OUTOFMEMORY; } - priv = (struct shader_arb_priv *) This->fragment_priv; + priv = This->fragment_priv; priv->fragment_shaders = hash_table_create(ffp_frag_program_key_hash, ffp_frag_program_key_compare); priv->use_arbfp_fixed_func = TRUE; return WINED3D_OK; @@ -2313,7 +2329,7 @@ static void arbfp_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct shader_arb_priv *priv = (struct shader_arb_priv *) This->fragment_priv; + struct shader_arb_priv *priv = This->fragment_priv; hash_table_destroy(priv->fragment_shaders, arbfp_free_ffpshader, &This->adapter->gl_info); priv->use_arbfp_fixed_func = FALSE; @@ -2952,7 +2968,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; - struct shader_arb_priv *priv = (struct shader_arb_priv *) device->fragment_priv; + struct shader_arb_priv *priv = device->fragment_priv; BOOL use_pshader = use_ps(stateblock); BOOL use_vshader = use_vs(stateblock); struct ffp_frag_settings settings; @@ -3051,22 +3067,17 @@ if(!stateblock->renderState[WINED3DRS_FOGENABLE]) return; - if(use_vs(stateblock) - && ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.fog) { - if( stateblock->renderState[WINED3DRS_FOGTABLEMODE] != WINED3DFOG_NONE ) { - FIXME("vertex shader with table fog used\n"); - } - context->last_was_foggy_shader = TRUE; - new_source = FOGSOURCE_VS; - } else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { - context->last_was_foggy_shader = FALSE; - if(stateblock->renderState[WINED3DRS_FOGVERTEXMODE] == WINED3DFOG_NONE || context->last_was_rhw) { - new_source = FOGSOURCE_COORD; + if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { + if(use_vs(stateblock)) { + new_source = FOGSOURCE_VS; } else { - new_source = FOGSOURCE_FFP; + if(stateblock->renderState[WINED3DRS_FOGVERTEXMODE] == WINED3DFOG_NONE || context->last_was_rhw) { + new_source = FOGSOURCE_COORD; + } else { + new_source = FOGSOURCE_FFP; + } } } else { - context->last_was_foggy_shader = FALSE; new_source = FOGSOURCE_FFP; } if(new_source != context->fog_source) { @@ -3263,7 +3274,7 @@ } static void arbfp_blit_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - struct arbfp_blit_priv *priv = (struct arbfp_blit_priv *) device->blit_priv; + struct arbfp_blit_priv *priv = device->blit_priv; ENTER_GL(); GL_EXTCALL(glDeleteProgramsARB(1, &priv->yuy2_rect_shader)); @@ -3514,7 +3525,7 @@ GLenum shader; SHADER_BUFFER buffer; char luminance_component; - struct arbfp_blit_priv *priv = (struct arbfp_blit_priv *) device->blit_priv; + struct arbfp_blit_priv *priv = device->blit_priv; /* Shader header */ shader_buffer_init(&buffer); @@ -3649,7 +3660,7 @@ GLenum shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; float size[4] = {width, height, 1, 1}; - struct arbfp_blit_priv *priv = (struct arbfp_blit_priv *) device->blit_priv; + struct arbfp_blit_priv *priv = device->blit_priv; const struct GlPixelFormatDesc *glDesc; enum yuv_fixup yuv_fixup; Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -803,7 +803,7 @@ IWineD3DDeviceImpl *This = stateblock->wineD3DDevice; const struct atifs_ffp_desc *desc; struct ffp_frag_settings settings; - struct atifs_private_data *priv = (struct atifs_private_data *) This->fragment_priv; + struct atifs_private_data *priv = This->fragment_priv; DWORD mapped_stage; unsigned int i; @@ -1107,7 +1107,7 @@ ERR("Out of memory\n"); return E_OUTOFMEMORY; } - priv = (struct atifs_private_data *) This->fragment_priv; + priv = This->fragment_priv; priv->fragment_shaders = hash_table_create(ffp_frag_program_key_hash, ffp_frag_program_key_compare); return WINED3D_OK; } @@ -1126,7 +1126,7 @@ static void atifs_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct atifs_private_data *priv = (struct atifs_private_data *) This->fragment_priv; + struct atifs_private_data *priv = This->fragment_priv; hash_table_destroy(priv->fragment_shaders, atifs_free_ffpshader, This); Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/baseshader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/baseshader.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -31,8 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#define GLNAME_REQUIRE_GLSL ((const char *)1) - static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version); static inline BOOL shader_is_version_token(DWORD token) { @@ -1135,8 +1133,9 @@ FIXME("NONE shader backend asked to generate a pixel shader\n"); return 0; } -static void shader_none_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer) { +static GLuint shader_none_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer, const struct vs_compile_args *args) { FIXME("NONE shader backend asked to generate a vertex shader\n"); + return 0; } #define GLINFO_LOCATION (*gl_info) Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -2104,7 +2104,7 @@ HDC dcb = NULL, dcs = NULL; WINEDDCOLORKEY colorkey; - hbm = (HBITMAP) LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE | LR_CREATEDIBSECTION); + hbm = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE | LR_CREATEDIBSECTION); if(hbm) { GetObjectA(hbm, sizeof(BITMAP), &bm); @@ -6765,7 +6765,7 @@ { const struct GlPixelFormatDesc *glDesc; const StaticPixelFormatDesc *tableEntry = getFormatDescEntry(WINED3DFMT_A8R8G8B8, &GLINFO_LOCATION, &glDesc); - char *mem, *bits = (char *)rect.pBits; + char *mem, *bits = rect.pBits; GLint intfmt = glDesc->glInternal; GLint format = glDesc->glFormat; GLint type = glDesc->glType; Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -1287,6 +1287,12 @@ gl_info->gl_card = CARD_ATI_RADEON_X700; vidmem = 128; /* x700/x8*0 use 128-256MB, >=x1300 128-512MB */ } + /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400MHz */ + else if(strstr(gl_info->gl_renderer, "Radeon Xpress")) + { + gl_info->gl_card = CARD_ATI_RADEON_XPRESS_200M; + vidmem = 64; /* Shared RAM, BIOS configurable, 64-256M */ + } /* Radeon R3xx */ else { gl_info->gl_card = CARD_ATI_RADEON_9500; /* Radeon 9500/9550/9600/9700/9800/X300/X550/X600 */ Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -324,8 +324,8 @@ idxData = ((IWineD3DIndexBufferImpl *) This->stateBlock->pIndexData)->resource.allocatedMemory; } - if (idxSize == 2) pIdxBufS = (const WORD *) idxData; - else pIdxBufL = (const DWORD *) idxData; + if (idxSize == 2) pIdxBufS = idxData; + else pIdxBufL = idxData; } else if (idxData) { ERR("non-NULL idxData with 0 idxSize, this should never happen\n"); return; @@ -519,31 +519,41 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, const UINT index, const void *ptr) { switch(type) { case WINED3DDECLTYPE_FLOAT1: - GL_EXTCALL(glVertexAttrib1fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib1fvARB(index, ptr)); break; case WINED3DDECLTYPE_FLOAT2: - GL_EXTCALL(glVertexAttrib2fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib2fvARB(index, ptr)); break; case WINED3DDECLTYPE_FLOAT3: - GL_EXTCALL(glVertexAttrib3fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib3fvARB(index, ptr)); break; case WINED3DDECLTYPE_FLOAT4: - GL_EXTCALL(glVertexAttrib4fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib4fvARB(index, ptr)); break; case WINED3DDECLTYPE_UBYTE4: GL_EXTCALL(glVertexAttrib4ubvARB(index, ptr)); break; + case WINED3DDECLTYPE_D3DCOLOR: + if (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA)) + { + const DWORD *src = ptr; + DWORD c = *src & 0xff00ff00; + c |= (*src & 0xff0000) >> 16; + c |= (*src & 0xff) << 16; + GL_EXTCALL(glVertexAttrib4NubvARB(index, (GLubyte *)&c)); + break; + } + /* else fallthrough */ case WINED3DDECLTYPE_UBYTE4N: - case WINED3DDECLTYPE_D3DCOLOR: GL_EXTCALL(glVertexAttrib4NubvARB(index, ptr)); break; case WINED3DDECLTYPE_SHORT2: - GL_EXTCALL(glVertexAttrib4svARB(index, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); break; case WINED3DDECLTYPE_SHORT4: - GL_EXTCALL(glVertexAttrib4svARB(index, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); break; case WINED3DDECLTYPE_SHORT2N: @@ -559,10 +569,10 @@ break; } case WINED3DDECLTYPE_SHORT4N: - GL_EXTCALL(glVertexAttrib4NsvARB(index, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib4NsvARB(index, ptr)); break; case WINED3DDECLTYPE_USHORT4N: - GL_EXTCALL(glVertexAttrib4NusvARB(index, (const GLushort *)ptr)); + GL_EXTCALL(glVertexAttrib4NusvARB(index, ptr)); break; case WINED3DDECLTYPE_UDEC3: @@ -579,7 +589,7 @@ * byte float according to the IEEE standard */ if (GL_SUPPORT(NV_HALF_FLOAT)) { - GL_EXTCALL(glVertexAttrib2hvNV(index, (const GLhalfNV *)ptr)); + GL_EXTCALL(glVertexAttrib2hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); float y = float_16_to_32(((const unsigned short *)ptr) + 1); @@ -588,7 +598,7 @@ break; case WINED3DDECLTYPE_FLOAT16_4: if (GL_SUPPORT(NV_HALF_FLOAT)) { - GL_EXTCALL(glVertexAttrib4hvNV(index, (const GLhalfNV *)ptr)); + GL_EXTCALL(glVertexAttrib4hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); float y = float_16_to_32(((const unsigned short *)ptr) + 1); @@ -626,8 +636,8 @@ idxData = ((IWineD3DIndexBufferImpl *) stateblock->pIndexData)->resource.allocatedMemory; } - if (idxSize == 2) pIdxBufS = (const WORD *) idxData; - else pIdxBufL = (const DWORD *) idxData; + if (idxSize == 2) pIdxBufS = idxData; + else pIdxBufL = idxData; } else if (idxData) { ERR("non-NULL idxData with 0 idxSize, this should never happen\n"); return; @@ -954,7 +964,7 @@ sprintf(buffer, "/tmp/texture_%p_%ld_%d.tga", This->stateBlock->textures[textureNo], primCounter, textureNo); TRACE("Saving texture %s\n", buffer); if (IWineD3DBaseTexture_GetType(This->stateBlock->textures[textureNo]) == WINED3DRTYPE_TEXTURE) { - IWineD3DTexture_GetSurfaceLevel((IWineD3DTexture *)This->stateBlock->textures[textureNo], 0, &pSur); + IWineD3DTexture_GetSurfaceLevel(This->stateBlock->textures[textureNo], 0, &pSur); IWineD3DSurface_SaveSnapshot(pSur, buffer); IWineD3DSurface_Release(pSur); } else { Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -101,16 +101,18 @@ GLhandleARB luminanceoffset_location[MAX_TEXTURES]; GLhandleARB ycorrection_location; GLenum vertex_color_clamp; - GLhandleARB vshader; + IWineD3DVertexShader *vshader; IWineD3DPixelShader *pshader; + struct vs_compile_args vs_args; struct ps_compile_args ps_args; UINT constant_version; }; typedef struct { - GLhandleARB vshader; + IWineD3DVertexShader *vshader; IWineD3DPixelShader *pshader; struct ps_compile_args ps_args; + struct vs_compile_args vs_args; } glsl_program_key_t; @@ -471,7 +473,7 @@ static void reset_program_constant_version(void *value, void *context) { - struct glsl_shader_prog_link *entry = (struct glsl_shader_prog_link *)value; + struct glsl_shader_prog_link *entry = value; entry->constant_version = 0; } @@ -484,7 +486,7 @@ char useVertexShader) { IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *)deviceImpl->shader_priv; + struct shader_glsl_priv *priv = deviceImpl->shader_priv; IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; @@ -621,7 +623,7 @@ static void shader_glsl_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; + struct shader_glsl_priv *priv = This->shader_priv; struct constant_heap *heap = &priv->vconst_heap; UINT i; @@ -637,7 +639,7 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; + struct shader_glsl_priv *priv = This->shader_priv; struct constant_heap *heap = &priv->pconst_heap; UINT i; @@ -1030,7 +1032,7 @@ strcpy(tmpStr, "gl_SecondaryColor"); } } else { - if (((IWineD3DVertexShaderImpl *)This)->swizzle_map & (1 << reg)) *is_color = TRUE; + if (((IWineD3DVertexShaderImpl *)This)->cur_args->swizzle_map & (1 << reg)) *is_color = TRUE; sprintf(tmpStr, "attrib%u", reg); } break; @@ -2918,20 +2920,23 @@ key = HeapAlloc(GetProcessHeap(), 0, sizeof(glsl_program_key_t)); key->vshader = entry->vshader; key->pshader = entry->pshader; + key->vs_args = entry->vs_args; key->ps_args = entry->ps_args; hash_table_put(priv->glsl_program_lookup, key, entry); } static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, - GLhandleARB vshader, IWineD3DPixelShader *pshader, struct ps_compile_args *ps_args) { + IWineD3DVertexShader *vshader, IWineD3DPixelShader *pshader, struct vs_compile_args *vs_args, + struct ps_compile_args *ps_args) { glsl_program_key_t key; key.vshader = vshader; key.pshader = pshader; + key.vs_args = *vs_args; key.ps_args = *ps_args; - return (struct glsl_shader_prog_link *)hash_table_get(priv->glsl_program_lookup, &key); + return hash_table_get(priv->glsl_program_lookup, &key); } static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const WineD3D_GL_Info *gl_info, @@ -2942,6 +2947,7 @@ key = HeapAlloc(GetProcessHeap(), 0, sizeof(glsl_program_key_t)); key->vshader = entry->vshader; key->pshader = entry->pshader; + key->vs_args = entry->vs_args; key->ps_args = entry->ps_args; hash_table_remove(priv->glsl_program_lookup, key); @@ -3248,7 +3254,7 @@ ret = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); checkGLcall("glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)"); GL_EXTCALL(glShaderSourceARB(ret, 1, (const char**)&buffer.buffer, NULL)); - checkGLcall("glShaderSourceARB(ret, 1, (const char**)&buffer.buffer, NULL)"); + checkGLcall("glShaderSourceARB(ret, 1, &buffer.buffer, NULL)"); GL_EXTCALL(glCompileShaderARB(ret)); checkGLcall("glCompileShaderARB(ret)"); @@ -3283,7 +3289,7 @@ */ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use_vs) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; + struct shader_glsl_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; IWineD3DPixelShader *pshader = This->stateBlock->pixelShader; IWineD3DVertexShader *vshader = This->stateBlock->vertexShader; @@ -3293,21 +3299,22 @@ int i; char glsl_name[8]; GLhandleARB vshader_id, pshader_id; - struct ps_compile_args compile_args; + struct ps_compile_args ps_compile_args; + struct vs_compile_args vs_compile_args; if(use_vs) { - IWineD3DVertexShaderImpl_CompileShader(vshader); - vshader_id = ((IWineD3DVertexShaderImpl*)vshader)->prgId; - } else { - vshader_id = 0; - } - if(use_ps) { - find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &compile_args); + find_vs_compile_args((IWineD3DVertexShaderImpl*)This->stateBlock->vertexShader, This->stateBlock, &vs_compile_args); } else { /* FIXME: Do we really have to spend CPU cycles to generate a few zeroed bytes? */ - memset(&compile_args, 0, sizeof(compile_args)); - } - entry = get_glsl_program_entry(priv, vshader_id, pshader, &compile_args); + memset(&vs_compile_args, 0, sizeof(vs_compile_args)); + } + if(use_ps) { + find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &ps_compile_args); + } else { + /* FIXME: Do we really have to spend CPU cycles to generate a few zeroed bytes? */ + memset(&ps_compile_args, 0, sizeof(ps_compile_args)); + } + entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { priv->glsl_program = entry; return; @@ -3320,15 +3327,22 @@ /* Create the entry */ entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); entry->programId = programId; - entry->vshader = vshader_id; + entry->vshader = vshader; entry->pshader = pshader; - entry->ps_args = compile_args; + entry->vs_args = vs_compile_args; + entry->ps_args = ps_compile_args; entry->constant_version = 0; /* Add the hash table entry */ add_glsl_program_entry(priv, entry); /* Set the current program */ priv->glsl_program = entry; + + if(use_vs) { + vshader_id = find_gl_vshader((IWineD3DVertexShaderImpl *) vshader, &vs_compile_args); + } else { + vshader_id = 0; + } /* Attach GLSL vshader */ if (vshader_id) { @@ -3369,7 +3383,7 @@ } if(use_ps) { - pshader_id = find_gl_pshader((IWineD3DPixelShaderImpl *) pshader, &compile_args); + pshader_id = find_gl_pshader((IWineD3DPixelShaderImpl *) pshader, &ps_compile_args); } else { pshader_id = 0; } @@ -3543,7 +3557,7 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; + struct shader_glsl_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; GLhandleARB program_id = 0; GLenum old_vertex_color_clamp, current_vertex_color_clamp; @@ -3573,7 +3587,7 @@ static void shader_glsl_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *) This->shader_priv; + struct shader_glsl_priv *priv = This->shader_priv; GLhandleARB *blt_program = &priv->depth_blt_program[tex_type]; if (!*blt_program) { @@ -3590,7 +3604,7 @@ static void shader_glsl_deselect_depth_blt(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *) This->shader_priv; + struct shader_glsl_priv *priv = This->shader_priv; GLhandleARB program_id; program_id = priv->glsl_program ? priv->glsl_program->programId : 0; @@ -3604,7 +3618,7 @@ const struct list *linked_programs; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *)device->shader_priv; + struct shader_glsl_priv *priv = device->shader_priv; const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; IWineD3DPixelShaderImpl *ps = NULL; IWineD3DVertexShaderImpl *vs = NULL; @@ -3619,7 +3633,7 @@ if(ps->num_gl_shaders == 0) return; } else { vs = (IWineD3DVertexShaderImpl *) This; - if(vs->prgId == 0) return; + if(vs->num_gl_shaders == 0) return; } linked_programs = &This->baseShader.linked_programs; @@ -3652,22 +3666,29 @@ HeapFree(GetProcessHeap(), 0, ps->gl_shaders); ps->gl_shaders = NULL; ps->num_gl_shaders = 0; + ps->shader_array_size = 0; } else { - TRACE("Deleting shader object %u\n", vs->prgId); + UINT i; + ENTER_GL(); - GL_EXTCALL(glDeleteObjectARB(vs->prgId)); - checkGLcall("glDeleteObjectARB"); + for(i = 0; i < vs->num_gl_shaders; i++) { + TRACE("deleting vshader %u\n", vs->gl_shaders[i].prgId); + GL_EXTCALL(glDeleteObjectARB(vs->gl_shaders[i].prgId)); + checkGLcall("glDeleteObjectARB"); + } LEAVE_GL(); - vs->prgId = 0; - vs->baseShader.is_compiled = FALSE; + HeapFree(GetProcessHeap(), 0, vs->gl_shaders); + vs->gl_shaders = NULL; + vs->num_gl_shaders = 0; + vs->shader_array_size = 0; } } static unsigned int glsl_program_key_hash(const void *key) { - const glsl_program_key_t *k = (const glsl_program_key_t *)key; - - unsigned int hash = k->vshader | ((DWORD_PTR) k->pshader) << 16; + const glsl_program_key_t *k = key; + + unsigned int hash = ((DWORD_PTR) k->vshader) | ((DWORD_PTR) k->pshader) << 16; hash += ~(hash << 15); hash ^= (hash >> 10); hash += (hash << 3); @@ -3680,11 +3701,12 @@ static BOOL glsl_program_key_compare(const void *keya, const void *keyb) { - const glsl_program_key_t *ka = (const glsl_program_key_t *)keya; - const glsl_program_key_t *kb = (const glsl_program_key_t *)keyb; + const glsl_program_key_t *ka = keya; + const glsl_program_key_t *kb = keyb; return ka->vshader == kb->vshader && ka->pshader == kb->pshader && - (memcmp(&ka->ps_args, &kb->ps_args, sizeof(kb->ps_args)) == 0); + (memcmp(&ka->ps_args, &kb->ps_args, sizeof(kb->ps_args)) == 0) && + (memcmp(&ka->vs_args, &kb->vs_args, sizeof(kb->vs_args)) == 0); } static BOOL constant_heap_init(struct constant_heap *heap, unsigned int constant_count) @@ -3752,7 +3774,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; + struct shader_glsl_priv *priv = This->shader_priv; int i; for (i = 0; i < tex_type_count; ++i) @@ -3850,10 +3872,16 @@ shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; case FOG_EXP: - FIXME("Implement EXP fog in glsl\n"); + /* Fog = e^(-gl_Fog.density * gl_FogFragCoord) */ + shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); + shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); + shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; case FOG_EXP2: - FIXME("Implement EXP2 fog in glsl\n"); + /* Fog = e^(-(gl_Fog.density * gl_FogFragCoord)^2) */ + shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); + shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); + shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; } } @@ -3869,7 +3897,7 @@ return shader_obj; } -static void shader_glsl_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer) { +static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer, const struct vs_compile_args *args) { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; @@ -3890,9 +3918,16 @@ if (reg_maps->shader_version >= WINED3DVS_VERSION(3,0)) shader_addline(buffer, "order_ps_input(OUT);\n"); else shader_addline(buffer, "order_ps_input();\n"); - /* If this shader doesn't use fog copy the z coord to the fog coord so that we can use table fog */ - if (!reg_maps->fog) + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->fog_src == VS_FOG_Z) { shader_addline(buffer, "gl_FogFragCoord = gl_Position.z;\n"); + } else if (!reg_maps->fog) { + shader_addline(buffer, "gl_FogFragCoord = 0.0;\n"); + } /* Write the final position. * @@ -3919,8 +3954,7 @@ GL_EXTCALL(glCompileShaderARB(shader_obj)); print_glsl_info_log(&GLINFO_LOCATION, shader_obj); - /* Store the shader object */ - This->prgId = shader_obj; + return shader_obj; } static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/pixelshader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/pixelshader.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLINFO_LOCATION ((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info - -#define GLNAME_REQUIRE_GLSL ((const char *)1) static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj); @@ -439,8 +437,6 @@ retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer, args); shader_buffer_free(&buffer); - This->baseShader.is_compiled = TRUE; - return retval; } @@ -520,10 +516,12 @@ GLuint find_gl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_args *args) { UINT i; - struct ps_compiled_shader *old_array; + DWORD new_size; + struct ps_compiled_shader *new_array; /* Usually we have very few GL shaders for each d3d shader(just 1 or maybe 2), - * so a linear search is more performant than a hashmap + * so a linear search is more performant than a hashmap or a binary search + * (cache coherency etc) */ for(i = 0; i < shader->num_gl_shaders; i++) { if(memcmp(&shader->gl_shaders[i].args, args, sizeof(*args)) == 0) { @@ -532,17 +530,22 @@ } TRACE("No matching GL shader found, compiling a new shader\n"); - old_array = shader->gl_shaders; - if(old_array) { - shader->gl_shaders = HeapReAlloc(GetProcessHeap(), 0, old_array, - (shader->num_gl_shaders + 1) * sizeof(*shader->gl_shaders)); - } else { - shader->gl_shaders = HeapAlloc(GetProcessHeap(), 0, sizeof(*shader->gl_shaders)); - } - - if(!shader->gl_shaders) { - ERR("Out of memory\n"); - return 0; + if(shader->shader_array_size == shader->num_gl_shaders) { + if(shader->gl_shaders) { + new_size = shader->shader_array_size + max(1, shader->shader_array_size / 2); + new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders, + new_size * sizeof(*shader->gl_shaders)); + } else { + new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*shader->gl_shaders)); + new_size = 1; + } + + if(!new_array) { + ERR("Out of memory\n"); + return 0; + } + shader->gl_shaders = new_array; + shader->shader_array_size = new_size; } shader->gl_shaders[shader->num_gl_shaders].args = *args; Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -133,7 +133,7 @@ case WINED3DQUERYTYPE_VCACHE: { - WINED3DDEVINFO_VCACHE *data = (WINED3DDEVINFO_VCACHE *)pData; + WINED3DDEVINFO_VCACHE *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_VCACHE\n", This); if(pData == NULL || dwSize == 0) break; data->Pattern = WINEMAKEFOURCC('C','A','C','H'); @@ -145,7 +145,7 @@ break; case WINED3DQUERYTYPE_RESOURCEMANAGER: { - WINED3DDEVINFO_RESOURCEMANAGER *data = (WINED3DDEVINFO_RESOURCEMANAGER *)pData; + WINED3DDEVINFO_RESOURCEMANAGER *data = pData; int i; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_RESOURCEMANAGER\n", This); if(pData == NULL || dwSize == 0) break; @@ -169,7 +169,7 @@ break; case WINED3DQUERYTYPE_VERTEXSTATS: { - WINED3DDEVINFO_VERTEXSTATS *data = (WINED3DDEVINFO_VERTEXSTATS *)pData; + WINED3DDEVINFO_VERTEXSTATS *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_VERTEXSTATS\n", This); if(pData == NULL || dwSize == 0) break; data->NumRenderedTriangles = 1; @@ -203,7 +203,7 @@ break; case WINED3DQUERYTYPE_PIPELINETIMINGS: { - WINED3DDEVINFO_PIPELINETIMINGS *data = (WINED3DDEVINFO_PIPELINETIMINGS *)pData; + WINED3DDEVINFO_PIPELINETIMINGS *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_PIPELINETIMINGS\n", This); if(pData == NULL || dwSize == 0) break; @@ -215,7 +215,7 @@ break; case WINED3DQUERYTYPE_INTERFACETIMINGS: { - WINED3DDEVINFO_INTERFACETIMINGS *data = (WINED3DDEVINFO_INTERFACETIMINGS *)pData; + WINED3DDEVINFO_INTERFACETIMINGS *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_INTERFACETIMINGS\n", This); if(pData == NULL || dwSize == 0) break; @@ -229,7 +229,7 @@ break; case WINED3DQUERYTYPE_VERTEXTIMINGS: { - WINED3DDEVINFO_STAGETIMINGS *data = (WINED3DDEVINFO_STAGETIMINGS *)pData; + WINED3DDEVINFO_STAGETIMINGS *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_VERTEXTIMINGS\n", This); if(pData == NULL || dwSize == 0) break; @@ -240,7 +240,7 @@ break; case WINED3DQUERYTYPE_PIXELTIMINGS: { - WINED3DDEVINFO_STAGETIMINGS *data = (WINED3DDEVINFO_STAGETIMINGS *)pData; + WINED3DDEVINFO_STAGETIMINGS *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_PIXELTIMINGS\n", This); if(pData == NULL || dwSize == 0) break; @@ -250,7 +250,7 @@ break; case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: { - WINED3DDEVINFO_BANDWIDTHTIMINGS *data = (WINED3DDEVINFO_BANDWIDTHTIMINGS *)pData; + WINED3DDEVINFO_BANDWIDTHTIMINGS *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_BANDWIDTHTIMINGS\n", This); if(pData == NULL || dwSize == 0) break; @@ -263,7 +263,7 @@ break; case WINED3DQUERYTYPE_CACHEUTILIZATION: { - WINED3DDEVINFO_CACHEUTILIZATION *data = (WINED3DDEVINFO_CACHEUTILIZATION *)pData; + WINED3DDEVINFO_CACHEUTILIZATION *data = pData; FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_CACHEUTILIZATION\n", This); if(pData == NULL || dwSize == 0) break; Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -25,7 +25,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->resource.wineD3DDevice)->wineD3D))->gl_info HRESULT resource_init(struct IWineD3DResourceClass *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent) Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -1019,75 +1019,72 @@ * and 2) disables the fog computation (in either the fixed function or programmable * rasterizer) if using a vertex program. * + * D3D shaders can provide an explicit fog coordinate. This fog coordinate is used with + * D3DRS_FOGTABLEMODE==D3DFOG_NONE. The FOGVERTEXMODE is ignored, d3d always uses linear + * fog with start=1.0 and end=0.0 in this case. This is similar to fog coordinates in + * the specular color, a vertex shader counts as pretransformed geometry in this case. + * There are some GL differences between specular fog coords and vertex shaders though. + * + * With table fog the vertex shader fog coordinate is ignored. * * If a fogtablemode and a fogvertexmode are specified, table fog is applied (with or * without shaders). */ - if (use_vs(stateblock) && ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.fog) { - if( stateblock->renderState[WINED3DRS_FOGTABLEMODE] != WINED3DFOG_NONE ) { - FIXME("vertex shader with table fog used\n"); - } else { - /* Set fog computation in the rasterizer to pass through the value (just blend it) */ - glFogi(GL_FOG_MODE, GL_LINEAR); - checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); - } - context->last_was_foggy_shader = TRUE; - new_source = FOGSOURCE_VS; - } /* DX 7 sdk: "If both render states(vertex and table fog) are set to valid modes, * the system will apply only pixel(=table) fog effects." */ - else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { - context->last_was_foggy_shader = FALSE; - - switch (stateblock->renderState[WINED3DRS_FOGVERTEXMODE]) { - /* If processed vertices are used, fall through to the NONE case */ - case WINED3DFOG_EXP: - if(!context->last_was_rhw) { - glFogi(GL_FOG_MODE, GL_EXP); - checkGLcall("glFogi(GL_FOG_MODE, GL_EXP)"); - new_source = FOGSOURCE_FFP; - break; - } - /* drop through */ - - case WINED3DFOG_EXP2: - if(!context->last_was_rhw) { - glFogi(GL_FOG_MODE, GL_EXP2); - checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2)"); - new_source = FOGSOURCE_FFP; - break; - } - /* drop through */ - - case WINED3DFOG_LINEAR: - if(!context->last_was_rhw) { + if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { + if(use_vs(stateblock)) { + glFogi(GL_FOG_MODE, GL_LINEAR); + checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); + new_source = FOGSOURCE_VS; + } else { + switch (stateblock->renderState[WINED3DRS_FOGVERTEXMODE]) { + /* If processed vertices are used, fall through to the NONE case */ + case WINED3DFOG_EXP: + if(!context->last_was_rhw) { + glFogi(GL_FOG_MODE, GL_EXP); + checkGLcall("glFogi(GL_FOG_MODE, GL_EXP)"); + new_source = FOGSOURCE_FFP; + break; + } + /* drop through */ + + case WINED3DFOG_EXP2: + if(!context->last_was_rhw) { + glFogi(GL_FOG_MODE, GL_EXP2); + checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2)"); + new_source = FOGSOURCE_FFP; + break; + } + /* drop through */ + + case WINED3DFOG_LINEAR: + if(!context->last_was_rhw) { + glFogi(GL_FOG_MODE, GL_LINEAR); + checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); + new_source = FOGSOURCE_FFP; + break; + } + /* drop through */ + + case WINED3DFOG_NONE: + /* Both are none? According to msdn the alpha channel of the specular + * color contains a fog factor. Set it in drawStridedSlow. + * Same happens with Vertexfog on transformed vertices + */ + new_source = FOGSOURCE_COORD; glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); - new_source = FOGSOURCE_FFP; break; - } - /* drop through */ - - case WINED3DFOG_NONE: - /* Both are none? According to msdn the alpha channel of the specular - * color contains a fog factor. Set it in drawStridedSlow. - * Same happens with Vertexfog on transformed vertices - */ - new_source = FOGSOURCE_COORD; - glFogi(GL_FOG_MODE, GL_LINEAR); - checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); - break; - - default: - FIXME("Unexpected WINED3DRS_FOGVERTEXMODE %d\n", stateblock->renderState[WINED3DRS_FOGVERTEXMODE]); - new_source = FOGSOURCE_FFP; /* Make the compiler happy */ + + default: + FIXME("Unexpected WINED3DRS_FOGVERTEXMODE %d\n", stateblock->renderState[WINED3DRS_FOGVERTEXMODE]); + new_source = FOGSOURCE_FFP; /* Make the compiler happy */ + } } } else { - glHint(GL_FOG_HINT, GL_NICEST); - checkGLcall("glHint(GL_FOG_HINT, GL_NICEST)"); - context->last_was_foggy_shader = FALSE; new_source = FOGSOURCE_FFP; switch (stateblock->renderState[WINED3DRS_FOGTABLEMODE]) { @@ -3928,8 +3925,18 @@ case WINED3DDECLTYPE_UBYTE4: GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); break; + case WINED3DDECLTYPE_D3DCOLOR: + if (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA)) + { + const DWORD *src = (const DWORD *)ptr; + DWORD c = *src & 0xff00ff00; + c |= (*src & 0xff0000) >> 16; + c |= (*src & 0xff) << 16; + GL_EXTCALL(glVertexAttrib4NubvARB(i, (GLubyte *)&c)); + break; + } + /* else fallthrough */ case WINED3DDECLTYPE_UBYTE4N: - case WINED3DDECLTYPE_D3DCOLOR: GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); break; @@ -4270,10 +4277,12 @@ load_numbered = TRUE; device->useDrawStridedSlow = FALSE; } - } else if (fixup || GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) || - (dataLocations->u.s.pSize.lpData == NULL && - dataLocations->u.s.diffuse.lpData == NULL && - dataLocations->u.s.specular.lpData == NULL)) { + } else if (fixup || (!dataLocations->u.s.pSize.lpData + && !dataLocations->position_transformed + && (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) + || (!dataLocations->u.s.diffuse.lpData + && !dataLocations->u.s.specular.lpData)))) + { /* Load the vertex data using named arrays */ load_named = TRUE; device->useDrawStridedSlow = FALSE; @@ -4330,15 +4339,6 @@ /* Some stuff is in the device until we have per context tracking */ IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL wasrhw = context->last_was_rhw; - - if (useVertexShaderFunction) - { - if(((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.fog != context->last_was_foggy_shader) { - updateFog = TRUE; - } - } else if(context->last_was_foggy_shader) { - updateFog = TRUE; - } transformed = device->strided_streams.position_transformed; if(transformed != context->last_was_rhw && !useVertexShaderFunction) { @@ -4405,8 +4405,11 @@ state_colormat(STATE_RENDER(WINED3DRS_COLORVERTEX), stateblock, context); } - if(context->last_was_vshader && !isStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPLANEENABLE))) { - state_clipping(STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), stateblock, context); + if(context->last_was_vshader) { + updateFog = TRUE; + if(!isStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPLANEENABLE))) { + state_clipping(STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), stateblock, context); + } } if(!isStateDirty(context, STATE_RENDER(WINED3DRS_NORMALIZENORMALS))) { state_normalize(STATE_RENDER(WINED3DRS_NORMALIZENORMALS), stateblock, context); @@ -4440,6 +4443,7 @@ transform_world(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), stateblock, context); } } + updateFog = TRUE; } } Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/surface.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -2228,7 +2228,7 @@ glEnable(GL_FRAGMENT_PROGRAM_ARB); GL_EXTCALL(glGenProgramsARB(1, &device->paletteConversionShader)); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, device->paletteConversionShader)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(fragment_palette_conversion), (const GLbyte *)fragment_palette_conversion)); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(fragment_palette_conversion), fragment_palette_conversion)); glDisable(GL_FRAGMENT_PROGRAM_ARB); } Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/surface_base.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -29,7 +29,6 @@ #include "config.h" #include "wine/port.h" #include "wined3d_private.h" -#include "float.h" #include <assert.h> @@ -46,7 +45,7 @@ /* Deal with special numbers */ if(*in == 0.0) return 0x0000; if(isnan(*in)) return 0x7C01; - if(!_finite(*in)) return (*in < 0.0 ? 0xFC00 : 0x7c00); + if(isinf(*in)) return (*in < 0.0 ? 0xFC00 : 0x7c00); if(tmp < pow(2, 10)) { do @@ -1145,7 +1144,7 @@ assert(width <= dlock.Pitch); if (DestRect && Src != This) - dbuf = (BYTE*)dlock.pBits; + dbuf = dlock.pBits; else dbuf = (BYTE*)dlock.pBits+(xdst.top*dlock.Pitch)+(xdst.left*bpp); Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -1365,8 +1365,6 @@ } #undef GLINFO_LOCATION -#define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info - /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { @@ -1456,8 +1454,6 @@ TRACE("Returning depthSize: %d and stencilSize: %d for fmt=%s\n", *depthSize, *stencilSize, debug_d3dformat(fmt)); return TRUE; } - -#undef GLINFO_LOCATION /* DirectDraw stuff */ WINED3DFORMAT pixelformat_for_depth(DWORD depth) { @@ -2096,17 +2092,21 @@ if(stateblock->renderState[WINED3DRS_FOGENABLE] == FALSE) { settings->fog = FOG_OFF; } else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { - switch(stateblock->renderState[WINED3DRS_FOGVERTEXMODE]) { - case WINED3DFOG_NONE: - case WINED3DFOG_LINEAR: - settings->fog = FOG_LINEAR; - break; - case WINED3DFOG_EXP: - settings->fog = FOG_EXP; - break; - case WINED3DFOG_EXP2: - settings->fog = FOG_EXP2; - break; + if(use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->position_transformed) { + settings->fog = FOG_LINEAR; + } else { + switch(stateblock->renderState[WINED3DRS_FOGVERTEXMODE]) { + case WINED3DFOG_NONE: + case WINED3DFOG_LINEAR: + settings->fog = FOG_LINEAR; + break; + case WINED3DFOG_EXP: + settings->fog = FOG_EXP; + break; + case WINED3DFOG_EXP2: + settings->fog = FOG_EXP2; + break; + } } } else { switch(stateblock->renderState[WINED3DRS_FOGTABLEMODE]) { @@ -2132,7 +2132,7 @@ const struct ffp_frag_desc *find_ffp_frag_shader(const struct hash_table_t *fragment_shaders, const struct ffp_frag_settings *settings) { - return (const struct ffp_frag_desc *)hash_table_get(fragment_shaders, settings); + return hash_table_get(fragment_shaders, settings); } void add_ffp_frag_shader(struct hash_table_t *shaders, struct ffp_frag_desc *desc) { @@ -2241,7 +2241,7 @@ unsigned int ffp_frag_program_key_hash(const void *key) { - const struct ffp_frag_settings *k = (const struct ffp_frag_settings *)key; + const struct ffp_frag_settings *k = key; unsigned int hash = 0, i; const DWORD *blob; @@ -2268,8 +2268,8 @@ BOOL ffp_frag_program_key_compare(const void *keya, const void *keyb) { - const struct ffp_frag_settings *ka = (const struct ffp_frag_settings *)keya; - const struct ffp_frag_settings *kb = (const struct ffp_frag_settings *)keyb; + const struct ffp_frag_settings *ka = keya; + const struct ffp_frag_settings *kb = keyb; return memcmp(ka, kb, sizeof(*ka)) == 0; } Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/vertexshader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/vertexshader.c [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -36,8 +36,6 @@ /* TODO: Vertex and Pixel shaders are almost identical, the only exception being the way that some of the data is looked up or the availability of some of the data i.e. some instructions are only valid for pshaders and some for vshaders because of this the bulk of the software pipeline can be shared between pixel and vertex shaders... and it wouldn't surprise me if the program can be cross compiled using a large body of shared code */ - -#define GLNAME_REQUIRE_GLSL ((const char *)1) CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { /* This table is not order or position dependent. */ @@ -218,21 +216,6 @@ return FALSE; } -/** Generate a vertex shader string using either GL_VERTEX_PROGRAM_ARB - or GLSL and send it to the card */ -static void IWineD3DVertexShaderImpl_GenerateShader(IWineD3DVertexShader *iface, - const struct shader_reg_maps* reg_maps, const DWORD *pFunction) -{ - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - SHADER_BUFFER buffer; - - This->swizzle_map = ((IWineD3DDeviceImpl *)This->baseShader.device)->strided_streams.swizzle_map; - - shader_buffer_init(&buffer); - ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_vshader(iface, &buffer); - shader_buffer_free(&buffer); -} - /* ******************************************* IWineD3DVertexShader IUnknown parts follow ******************************************* */ @@ -418,40 +401,20 @@ return WINED3D_OK; } -HRESULT IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - CONST DWORD *function = This->baseShader.function; +static GLuint vertexshader_compile(IWineD3DVertexShaderImpl *This, const struct vs_compile_args *args) { IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; - - TRACE("(%p) : function %p\n", iface, function); - - /* We're already compiled. */ - if (This->baseShader.is_compiled) { - if ((This->swizzle_map & deviceImpl->strided_streams.use_map) != deviceImpl->strided_streams.swizzle_map) - { - WARN("Recompiling vertex shader %p due to D3DCOLOR input changes\n", This); - goto recompile; - } - - return WINED3D_OK; - - recompile: - if(This->recompile_count < 50) { - This->recompile_count++; - } else { - FIXME("Vertexshader %p recompiled more than 50 times\n", This); - } - - deviceImpl->shader_backend->shader_destroy((IWineD3DBaseShader *) iface); - } + SHADER_BUFFER buffer; + GLuint ret; /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); - IWineD3DVertexShaderImpl_GenerateShader(iface, &This->baseShader.reg_maps, function); - - This->baseShader.is_compiled = TRUE; - - return WINED3D_OK; + shader_buffer_init(&buffer); + This->cur_args = args; + ret = deviceImpl->shader_backend->shader_generate_vshader((IWineD3DVertexShader *)This, &buffer, args); + This->cur_args = NULL; + shader_buffer_free(&buffer); + + return ret; } const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = @@ -470,3 +433,56 @@ IWineD3DVertexShaderImpl_FakeSemantics, IWIneD3DVertexShaderImpl_SetLocalConstantsF }; + +void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct vs_compile_args *args) { + args->fog_src = stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE ? VS_FOG_COORD : VS_FOG_Z; + args->swizzle_map = ((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.swizzle_map; +} + +static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, + const DWORD use_map) { + if((stored->swizzle_map & use_map) != new->swizzle_map) return FALSE; + return stored->fog_src == new->fog_src; +} + +GLuint find_gl_vshader(IWineD3DVertexShaderImpl *shader, const struct vs_compile_args *args) +{ + UINT i; + DWORD new_size = shader->shader_array_size; + struct vs_compiled_shader *new_array; + DWORD use_map = ((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.use_map; + + /* Usually we have very few GL shaders for each d3d shader(just 1 or maybe 2), + * so a linear search is more performant than a hashmap or a binary search + * (cache coherency etc) + */ + for(i = 0; i < shader->num_gl_shaders; i++) { + if(vs_args_equal(&shader->gl_shaders[i].args, args, use_map)) { + return shader->gl_shaders[i].prgId; + } + } + + TRACE("No matching GL shader found, compiling a new shader\n"); + + if(shader->shader_array_size == shader->num_gl_shaders) { + if(shader->gl_shaders) { + new_size = shader->shader_array_size + max(1, shader->shader_array_size / 2); + new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders, + new_size * sizeof(*shader->gl_shaders)); + } else { + new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*shader->gl_shaders)); + new_size = 1; + } + + if(!new_array) { + ERR("Out of memory\n"); + return 0; + } + shader->gl_shaders = new_array; + shader->shader_array_size = new_size; + } + + shader->gl_shaders[shader->num_gl_shaders].args = *args; + shader->gl_shaders[shader->num_gl_shaders].prgId = vertexshader_compile(shader, args); + return shader->gl_shaders[shader->num_gl_shaders++].prgId; +} Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -3257,6 +3257,7 @@ CARD_ATI_RADEON_7200 = 0x5144, CARD_ATI_RADEON_8500 = 0x514c, CARD_ATI_RADEON_9500 = 0x4144, + CARD_ATI_RADEON_XPRESS_200M = 0x5955, CARD_ATI_RADEON_X700 = 0x5e4c, CARD_ATI_RADEON_X1600 = 0x71c2, CARD_ATI_RADEON_HD2300 = 0x7210, Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Sun Feb 15 08:01:23 2009 @@ -461,6 +461,18 @@ /* Texture types(2D, Cube, 3D) in ps 1.x */ }; +#define MAX_ATTRIBS 16 + +enum fog_src_type { + VS_FOG_Z = 0, + VS_FOG_COORD = 1 +}; + +struct vs_compile_args { + WORD fog_src; + WORD swizzle_map; /* MAX_ATTRIBS, 16 */ +}; + typedef struct { const SHADER_HANDLER *shader_instruction_handler_table; void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); @@ -475,7 +487,7 @@ void (*shader_free_private)(IWineD3DDevice *iface); BOOL (*shader_dirtifyable_constants)(IWineD3DDevice *iface); GLuint (*shader_generate_pshader)(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer, const struct ps_compile_args *args); - void (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer); + GLuint (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer, const struct vs_compile_args *args); void (*shader_get_caps)(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); } shader_backend_t; @@ -804,7 +816,6 @@ WORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ WORD last_was_pshader : 1; WORD last_was_vshader : 1; - WORD last_was_foggy_shader : 1; WORD namedArraysLoaded : 1; WORD numberedArraysLoaded : 1; WORD last_was_blit : 1; @@ -813,7 +824,7 @@ WORD isPBuffer : 1; WORD fog_enabled : 1; WORD num_untracked_materials : 2; /* Max value 2 */ - WORD padding : 2; + WORD padding : 3; BYTE texShaderBumpMap; /* MAX_TEXTURES, 8 */ BYTE lastWasPow2Texture; /* MAX_TEXTURES, 8 */ DWORD numbered_array_mask; @@ -2210,7 +2221,6 @@ CONST SHADER_OPCODE *shader_ins; DWORD *function; UINT functionLength; - BOOL is_compiled; UINT cur_loop_depth, cur_loop_regno; BOOL load_local_constsF; BOOL uses_bool_consts, uses_int_consts; @@ -2326,8 +2336,14 @@ } /***************************************************************************** - * IDirect3DVertexShader implementation structure - */ + * IDirect3DVertexShader implementation structures + */ + +struct vs_compiled_shader { + struct vs_compile_args args; + GLuint prgId; +}; + typedef struct IWineD3DVertexShaderImpl { /* IUnknown parts*/ const IWineD3DVertexShaderVtbl *lpVtbl; @@ -2341,22 +2357,25 @@ DWORD usage; /* The GL shader */ - GLuint prgId; + struct vs_compiled_shader *gl_shaders; + UINT num_gl_shaders, shader_array_size; /* Vertex shader input and output semantics */ semantic semantics_in [MAX_ATTRIBS]; semantic semantics_out [MAX_REG_OUTPUT]; - WORD swizzle_map; /* MAX_ATTRIBS, 16 */ - UINT min_rel_offset, max_rel_offset; UINT rel_offset; UINT recompile_count; + + const struct vs_compile_args *cur_args; } IWineD3DVertexShaderImpl; extern const SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[]; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl; -HRESULT IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface); + +void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct vs_compile_args *args); +GLuint find_gl_vshader(IWineD3DVertexShaderImpl *shader, const struct vs_compile_args *args); /***************************************************************************** * IDirect3DPixelShader implementation structure @@ -2384,7 +2403,7 @@ /* The GL shader */ struct ps_compiled_shader *gl_shaders; - UINT num_gl_shaders; + UINT num_gl_shaders, shader_array_size; /* Some information about the shader behavior */ struct stb_const_desc bumpenvmatconst[MAX_TEXTURES];

16 years, 2 months

[silverblade] 39606: Split custom ReactOS-only non-standard extensions from NTDDSND.H Updated relevant code to include the new headers SNDTYPES.H and SNDNAMES.H Corrected CTL_CODE macros and included SNDTYPES.H in WDMAUD interface header A lot of this is just refactoring, hence the large number of files!

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Feb 15 07:31:52 2009 New Revision: 39606 URL: http://svn.reactos.org/svn/reactos?rev=39606&view=rev Log: Split custom ReactOS-only non-standard extensions from NTDDSND.H Updated relevant code to include the new headers SNDTYPES.H and SNDNAMES.H Corrected CTL_CODE macros and included SNDTYPES.H in WDMAUD interface header A lot of this is just refactoring, hence the large number of files! Added: trunk/reactos/dll/win32/sndblst/ trunk/reactos/dll/win32/sndblst/sndblst.c (with props) trunk/reactos/dll/win32/sndblst/sndblst.def (with props) trunk/reactos/dll/win32/sndblst/sndblst.rbuild (with props) trunk/reactos/include/reactos/libs/sound/sndnames.h (with props) trunk/reactos/include/reactos/libs/sound/sndtypes.h (with props) Modified: trunk/reactos/dll/win32/win32.rbuild trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild trunk/reactos/include/ddk/ntddsnd.h trunk/reactos/lib/drivers/directory.rbuild trunk/reactos/lib/drivers/sound/legacy/devname.c trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c trunk/reactos/lib/drivers/sound/mmebuddy/devicelist.c trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c trunk/reactos/lib/drivers/sound/mmebuddy/reentrancy.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/format.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c trunk/reactos/lib/drivers/sound/mment4/control.c trunk/reactos/lib/drivers/sound/mment4/detect.c trunk/reactos/lib/drivers/sound/mment4/registry.c Added: trunk/reactos/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.c (added) +++ trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -1,0 +1,226 @@ +/* + * PROJECT: ReactOS Sound System + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/sndblst/sndblst.c + * + * PURPOSE: Sound Blaster MME User-Mode Driver + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) + * + * NOTES: Currently very experimental and being used as a guinea-pig for + * changes to the MME-Buddy libraries. + * TODO: Adhere to maximum device name length! +*/ + +#include <windows.h> +#include <ntddsnd.h> +#include <reactos/sndtypes.h> +#include <mmddk.h> +#include <mmebuddy.h> +#include <mment4.h> +//#include <debug.h> + +PWSTR SBWaveOutDeviceName = L"ROS Sound Blaster Out"; +PWSTR SBWaveInDeviceName = L"ROS Sound Blaster In"; +/* TODO: Mixer etc */ + +MMRESULT +GetSoundBlasterDeviceCapabilities( + IN PSOUND_DEVICE SoundDevice, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + + SND_ASSERT( SoundDevice ); + SND_ASSERT( Capabilities ); + + SND_TRACE(L"Sndblst - GetSoundBlasterDeviceCapabilities\n"); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Use the default method of obtaining device capabilities */ + Result = GetNt4SoundDeviceCapabilities(SoundDevice, + Capabilities, + CapabilitiesSize); + + if ( ! MMSUCCESS(Result) ) + return Result; + + /* Inject the appropriate device name */ + switch ( DeviceType ) + { + case WAVE_OUT_DEVICE_TYPE : + { + LPWAVEOUTCAPS WaveOutCaps = (LPWAVEOUTCAPS) Capabilities; + CopyWideString(WaveOutCaps->szPname, SBWaveOutDeviceName); + break; + } + case WAVE_IN_DEVICE_TYPE : + { + LPWAVEINCAPS WaveInCaps = (LPWAVEINCAPS) Capabilities; + CopyWideString(WaveInCaps->szPname, SBWaveInDeviceName); + break; + } + } + + return MMSYSERR_NOERROR; +} + +BOOLEAN FoundDevice( + UCHAR DeviceType, + PWSTR DevicePath) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice = NULL; + MMFUNCTION_TABLE FuncTable; + PWSTR PathCopy; + + SND_TRACE(L"(Callback) Found device: %wS\n", DevicePath); + + PathCopy = AllocateWideString(wcslen(DevicePath)); + + if ( ! PathCopy ) + return FALSE; + + CopyWideString(PathCopy, DevicePath); + + Result = ListSoundDevice(DeviceType, (PVOID) PathCopy, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + return FALSE; + + /* Set up our function table */ + FuncTable.GetCapabilities = GetSoundBlasterDeviceCapabilities; + FuncTable.QueryWaveFormatSupport = QueryNt4WaveDeviceFormatSupport; + FuncTable.SetWaveFormat = SetNt4WaveDeviceFormat; + FuncTable.Open = OpenNt4SoundDevice; + FuncTable.Close = CloseNt4SoundDevice; + FuncTable.PrepareWaveHeader = NULL; + FuncTable.UnprepareWaveHeader = NULL; + FuncTable.SubmitWaveHeader = NULL; + + SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); + + return TRUE; +} + +APIENTRY LONG +DriverProc( + DWORD DriverId, + HANDLE DriverHandle, + UINT Message, + LONG Parameter1, + LONG Parameter2) +{ + MMRESULT Result; + + switch ( Message ) + { + case DRV_LOAD : + { + SND_TRACE(L"DRV_LOAD\n"); + + Result = InitEntrypointMutexes(); + + if ( ! MMSUCCESS(Result) ) + return 0L; + + Result = EnumerateNt4ServiceSoundDevices(L"sndblst", + 0, + FoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + CleanupEntrypointMutexes(); + + UnlistAllSoundDevices(); + + return 0L; + } + +/* + PSOUND_DEVICE snd; + GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &snd); + GetSoundDevice(AUX_DEVICE_TYPE, 0, &snd); + GetSoundDevice(AUX_DEVICE_TYPE, 1, &snd); + GetSoundDevice(AUX_DEVICE_TYPE, 2, &snd); +*/ + + SND_TRACE(L"Initialisation complete\n"); + + return 1L; + } + + case DRV_FREE : + { + SND_TRACE(L"DRV_FREE\n"); + + /* TODO: Clean up the path names! */ + UnlistAllSoundDevices(); + + CleanupEntrypointMutexes(); + + SND_TRACE(L"Unfreed memory blocks: %d\n", + GetMemoryAllocationCount()); + + return 1L; + } + + case DRV_ENABLE : + case DRV_DISABLE : + { + SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n"); + return 1L; + } + + case DRV_OPEN : + case DRV_CLOSE : + { + SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n"); + return 1L; + } + + case DRV_QUERYCONFIGURE : + { + SND_TRACE(L"DRV_QUERYCONFIGURE"); + return 0L; + } + case DRV_CONFIGURE : + return DRVCNF_OK; + + default : + SND_TRACE(L"Unhandled message %d\n", Message); + return DefDriverProc(DriverId, + DriverHandle, + Message, + Parameter1, + Parameter2); + } +} + +BOOL WINAPI DllMain( + HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch ( fdwReason ) + { + case DLL_PROCESS_ATTACH : + SND_TRACE(L"DLL_PROCESS_ATTACH\n"); + break; + case DLL_PROCESS_DETACH : + SND_TRACE(L"DLL_PROCESS_DETACH\n"); + break; + case DLL_THREAD_ATTACH : + SND_TRACE(L"DLL_THREAD_ATTACH\n"); + break; + case DLL_THREAD_DETACH : + SND_TRACE(L"DLL_THREAD_DETACH\n"); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/sndblst/sndblst.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.def (added) +++ trunk/reactos/dll/win32/sndblst/sndblst.def [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -1,0 +1,15 @@ +; $Id: sndblst.def 34299 2008-07-05 02:43:17Z silverblade $ +; +; sndblst.def +; +; ReactOS Operating System +; +LIBRARY sndblst.dll +EXPORTS +DriverProc@20 +widMessage@20 +wodMessage@20 +midMessage@20 +modMessage@20 +mxdMessage@20 +auxMessage@20 Propchange: trunk/reactos/dll/win32/sndblst/sndblst.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.rbuild (added) +++ trunk/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -1,0 +1,16 @@ + +<module name="sndblst" type="win32dll" installbase="system32" installname="sndblst.dll" unicode="yes"> + <importlibrary definition="sndblst.def" /> + <include base="ReactOS">include/reactos/libs/sound</include> + <include base="sndblst">.</include> + <define name="DEBUG_NT4" /> + <library>mment4</library> + <library>mmebuddy</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>winmm</library> + <library>advapi32</library> + <file>sndblst.c</file> +</module> Propchange: trunk/reactos/dll/win32/sndblst/sndblst.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -394,6 +394,9 @@ <directory name="smdll"> <xi:include href="smdll/smdll.rbuild" /> </directory> +<directory name="sndblst"> + <xi:include href="sndblst/sndblst.rbuild" /> +</directory> <directory name="snmpapi"> <xi:include href="snmpapi/snmpapi.rbuild" /> </directory> Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -6,7 +6,8 @@ /// /// History: 12/02/2008 Created - +// These are now in sndtypes.h +/* typedef enum { DEVICE_TYPE_NONE = 0, @@ -18,10 +19,13 @@ DEVICE_TYPE_AUX_OUT }AUDIO_DEVICE_TYPE; +*/ + +#include <sndtypes.h> typedef struct { - AUDIO_DEVICE_TYPE DeviceType; + SOUND_DEVICE_TYPE DeviceType; ULONG DeviceIndex; HANDLE hDevice; @@ -55,7 +59,11 @@ /// Return Code: STATUS_SUCCESS indicates success, otherwise appropiate error code /// Prequsites: none -#define IOCTL_OPEN_WDMAUD CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 0, METHOD_BUFFERED); +#define IOCTL_OPEN_WDMAUD \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 0, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); /// IOCTL_CLOSE_WDMAUD @@ -68,7 +76,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: openend device -#define IOCTL_CLOSE_WDMAUD CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 1, METHOD_BUFFERED); +#define IOCTL_CLOSE_WDMAUD \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 1, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); \ /// IOCTL_GETNUMDEVS_TYPE @@ -82,8 +94,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: none -#define IOCTL_GETNUMDEVS_TYPE CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 2, METHOD_BUFFERED); - +#define IOCTL_GETNUMDEVS_TYPE \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 2, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); /// IOCTL_SETDEVICE_STATE @@ -96,7 +111,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: opened device -#define IOCTL_SETDEVICE_STATE CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 3, METHOD_BUFFERED); +#define IOCTL_SETDEVICE_STATE \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 3, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); /// IOCTL_GETDEVID @@ -110,9 +129,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: opened device - -#define IOCTL_GETDEVID CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 4, METHOD_BUFFERED); - +#define IOCTL_GETDEVID \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 4, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); /// IOCTL_GETVOLUME @@ -126,8 +147,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: opened device - -#define IOCTL_GETVOLUME CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 5, METHOD_BUFFERED); +#define IOCTL_GETVOLUME \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 5, \ + METHOD_BUFFEERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); /// IOCTL_SETVOLUME @@ -140,8 +164,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: opened device - -#define IOCTL_SETVOLUME CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 6, METHOD_BUFFERED); +#define IOCTL_SETVOLUME \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 6, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); /// IOCTL_GETCAPABILTIES @@ -154,8 +181,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: none - -#define IOCTL_GETCAPABILTIES CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 7, METHOD_BUFFERED); +#define IOCTL_GETCAPABILITIES \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 7, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); /// IOCTL_WRITEDATA @@ -168,11 +198,11 @@ /// ReturnCode: STATUS_SUCCESS indicates success /// Prequsites: opened device - -#define IOCTL_WRITEDATA CTL_CODE(FILE_DEVICE_SOUND, FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS, 8, METHOD_BUFFERED); - - - +#define IOCTL_WRITEDATA \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 8, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS); #endif Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> <module name="wdmaud_kernel" type="kernelmodedriver" installbase="system32/drivers" installname="wdmaud.sys"> <include base="wdmaud_kernel">.</include> + <include base="ReactOS">include/reactos/libs/sound</include> <library>ntoskrnl</library> <library>ks</library> <file>entry.c</file> Modified: trunk/reactos/include/ddk/ntddsnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddsnd.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddsnd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddsnd.h [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -9,6 +9,7 @@ 24 May 2008 - Created 2 July 2008 - Added device names as seen from user-mode 5 July 2008 - Added macros for checking device type + 14 Feb 2009 - Added base control codes for nonstandard extensions This file contains definitions and structures for Windows NT4 style multimedia drivers. The NT4 DDK has these split across multiple header @@ -23,108 +24,11 @@ type IDs). */ -#ifndef NTDDWAVE -#define NTDDWAVE +#ifndef NTDDSND_H +#define NTDDSND_H #define SOUND_MAX_DEVICES 100 - - -/* - Device types - - Not part of the original DDK header, but based on the values stored in - registry by sndblst -*/ - -#define WAVE_IN_DEVICE_TYPE 1 -#define WAVE_OUT_DEVICE_TYPE 2 -#define MIDI_IN_DEVICE_TYPE 3 -#define MIDI_OUT_DEVICE_TYPE 4 -#define AUX_DEVICE_TYPE 5 -#define MIXER_DEVICE_TYPE 6 - -#define MIN_SOUND_DEVICE_TYPE WAVE_IN_DEVICE_TYPE -#define MAX_SOUND_DEVICE_TYPE MIXER_DEVICE_TYPE -#define SOUND_DEVICE_TYPES 6 - -#define IS_VALID_SOUND_DEVICE_TYPE(x) \ - ( ( x >= MIN_SOUND_DEVICE_TYPE ) && ( x <= MAX_SOUND_DEVICE_TYPE ) ) - -#define IS_WAVE_DEVICE_TYPE(x) \ - ( ( x == WAVE_IN_DEVICE_TYPE ) || ( x == WAVE_OUT_DEVICE_TYPE ) ) - -#define IS_MIDI_DEVICE_TYPE(x) \ - ( ( x == MIDI_IN_DEVICE_TYPE ) || ( x == MIDI_OUT_DEVICE_TYPE ) ) - -#define IS_AUX_DEVICE_TYPE(x) \ - ( x == AUX_DEVICE_TYPE ) - -#define IS_MIXER_DEVICE_TYPE(x) \ - ( x == MIXER_DEVICE_TYPE ) - - -/* - Base device names - - Each device name should be given a numerical suffix identifying that - unique device, eg: - - \Device\WaveOut0 - First wave output device - \Device\WaveOut1 - Second wave output device -*/ - -#define SOUND_MAX_DEVICE_NAME 80 - -#define DD_WAVE_IN_DEVICE_NAME "\\Device\\WaveIn" -#define DD_WAVE_IN_DEVICE_NAME_U L"\\Device\\WaveIn" -#define DD_WAVE_IN_DOS_DEVICE_NAME "\\DosDevices\\WaveIn" -#define DD_WAVE_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveIn" -#define DD_WAVE_IN_WIN32_DEVICE_NAME "\\\\.\\WaveIn" -#define DD_WAVE_IN_WIN32_DEVICE_NAME_U L"\\\\.\\WaveIn" - -#define DD_WAVE_OUT_DEVICE_NAME "\\Device\\WaveOut" -#define DD_WAVE_OUT_DEVICE_NAME_U L"\\Device\\WaveOut" -#define DD_WAVE_OUT_DOS_DEVICE_NAME "\\DosDevices\\WaveOut" -#define DD_WAVE_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveOut" -#define DD_WAVE_OUT_WIN32_DEVICE_NAME "\\\\.\\WaveOut" -#define DD_WAVE_OUT_WIN32_DEVICE_NAME_U L"\\\\.\\WaveOut" - -#define DD_MIDI_IN_DEVICE_NAME "\\Device\\MidiIn" -#define DD_MIDI_IN_DEVICE_NAME_U L"\\Device\\MidiIn" -#define DD_MIDI_IN_DOS_DEVICE_NAME "\\DosDevices\\MidiIn" -#define DD_MIDI_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiIn" -#define DD_MIDI_IN_WIN32_DEVICE_NAME "\\\\.\\MidiIn" -#define DD_MIDI_IN_WIN32_DEVICE_NAME_U L"\\\\.\\MidiIn" - -#define DD_MIDI_OUT_DEVICE_NAME "\\Device\\MidiOut" -#define DD_MIDI_OUT_DEVICE_NAME_U L"\\Device\\MidiOut" -#define DD_MIDI_OUT_DOS_DEVICE_NAME "\\DosDevices\\MidiOut" -#define DD_MIDI_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiOut" -#define DD_MIDI_OUT_WIN32_DEVICE_NAME "\\\\.\\MidiOut" -#define DD_MIDI_OUT_WIN32_DEVICE_NAME_U L"\\\\.\\MidiOut" - -#define DD_MIX_DEVICE_NAME "\\Device\\MMMix" -#define DD_MIX_DEVICE_NAME_U L"\\Device\\MMMix" -#define DD_MIX_DOS_DEVICE_NAME "\\DosDevices\\MMMix" -#define DD_MIX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMMix" -#define DD_MIX_WIN32_DEVICE_NAME "\\\\.\\MMMix" -#define DD_MIX_WIN32_DEVICE_NAME_U L"\\\\.\\MMMix" - -#define DD_AUX_DEVICE_NAME "\\Device\\MMAux" -#define DD_AUX_DEVICE_NAME_U L"\\Device\\MMAux" -#define DD_AUX_DOS_DEVICE_NAME "\\DosDevices\\MMAux" -#define DD_AUX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMAux" -#define DD_AUX_WIN32_DEVICE_NAME "\\\\.\\MMAux" -#define DD_AUX_WIN32_DEVICE_NAME_U L"\\\\.\\MMAux" - -/* - Registry keys -*/ - -#define REG_SERVICES_KEY_NAME_U L"System\\CurrentControlSet\\Services" -#define REG_PARAMETERS_KEY_NAME_U L"Parameters" -#define REG_DEVICE_KEY_NAME_U L"Device" -#define REG_DEVICES_KEY_NAME_U L"Devices" +#define SOUND_MAX_DEVICE_NAME 80 /* Added: trunk/reactos/include/reactos/libs/sound/sndnames.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/sndnames.h (added) +++ trunk/reactos/include/reactos/libs/sound/sndnames.h [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -1,0 +1,80 @@ +/* + ReactOS Sound System + NT4 audio device and registry key names + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 14 Feb 2009 - Split from ntddsnd.h + + These were enhancements to the original NT4 DDK audio device header + files. +*/ + +#ifndef SNDNAMES_H +#define SNDNAMES_H + +/* + Base device names (NT4) + + Each device name should be given a numerical suffix identifying that + unique device, eg: + + \Device\WaveOut0 - First wave output device + \Device\WaveOut1 - Second wave output device +*/ + +#define DD_WAVE_IN_DEVICE_NAME "\\Device\\WaveIn" +#define DD_WAVE_IN_DEVICE_NAME_U L"\\Device\\WaveIn" +#define DD_WAVE_IN_DOS_DEVICE_NAME "\\DosDevices\\WaveIn" +#define DD_WAVE_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveIn" +#define DD_WAVE_IN_WIN32_DEVICE_NAME "\\\\.\\WaveIn" +#define DD_WAVE_IN_WIN32_DEVICE_NAME_U L"\\\\.\\WaveIn" + +#define DD_WAVE_OUT_DEVICE_NAME "\\Device\\WaveOut" +#define DD_WAVE_OUT_DEVICE_NAME_U L"\\Device\\WaveOut" +#define DD_WAVE_OUT_DOS_DEVICE_NAME "\\DosDevices\\WaveOut" +#define DD_WAVE_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\WaveOut" +#define DD_WAVE_OUT_WIN32_DEVICE_NAME "\\\\.\\WaveOut" +#define DD_WAVE_OUT_WIN32_DEVICE_NAME_U L"\\\\.\\WaveOut" + +#define DD_MIDI_IN_DEVICE_NAME "\\Device\\MidiIn" +#define DD_MIDI_IN_DEVICE_NAME_U L"\\Device\\MidiIn" +#define DD_MIDI_IN_DOS_DEVICE_NAME "\\DosDevices\\MidiIn" +#define DD_MIDI_IN_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiIn" +#define DD_MIDI_IN_WIN32_DEVICE_NAME "\\\\.\\MidiIn" +#define DD_MIDI_IN_WIN32_DEVICE_NAME_U L"\\\\.\\MidiIn" + +#define DD_MIDI_OUT_DEVICE_NAME "\\Device\\MidiOut" +#define DD_MIDI_OUT_DEVICE_NAME_U L"\\Device\\MidiOut" +#define DD_MIDI_OUT_DOS_DEVICE_NAME "\\DosDevices\\MidiOut" +#define DD_MIDI_OUT_DOS_DEVICE_NAME_U L"\\DosDevices\\MidiOut" +#define DD_MIDI_OUT_WIN32_DEVICE_NAME "\\\\.\\MidiOut" +#define DD_MIDI_OUT_WIN32_DEVICE_NAME_U L"\\\\.\\MidiOut" + +#define DD_MIX_DEVICE_NAME "\\Device\\MMMix" +#define DD_MIX_DEVICE_NAME_U L"\\Device\\MMMix" +#define DD_MIX_DOS_DEVICE_NAME "\\DosDevices\\MMMix" +#define DD_MIX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMMix" +#define DD_MIX_WIN32_DEVICE_NAME "\\\\.\\MMMix" +#define DD_MIX_WIN32_DEVICE_NAME_U L"\\\\.\\MMMix" + +#define DD_AUX_DEVICE_NAME "\\Device\\MMAux" +#define DD_AUX_DEVICE_NAME_U L"\\Device\\MMAux" +#define DD_AUX_DOS_DEVICE_NAME "\\DosDevices\\MMAux" +#define DD_AUX_DOS_DEVICE_NAME_U L"\\DosDevices\\MMAux" +#define DD_AUX_WIN32_DEVICE_NAME "\\\\.\\MMAux" +#define DD_AUX_WIN32_DEVICE_NAME_U L"\\\\.\\MMAux" + + +/* + Registry keys (NT4) +*/ + +#define REG_SERVICES_KEY_NAME_U L"System\\CurrentControlSet\\Services" +#define REG_PARAMETERS_KEY_NAME_U L"Parameters" +#define REG_DEVICE_KEY_NAME_U L"Device" +#define REG_DEVICES_KEY_NAME_U L"Devices" + +#endif Propchange: trunk/reactos/include/reactos/libs/sound/sndnames.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/libs/sound/sndtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/sndtypes.h (added) +++ trunk/reactos/include/reactos/libs/sound/sndtypes.h [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -1,0 +1,59 @@ +/* + ReactOS Sound System + Device type IDs and macros + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 14 Feb 2009 - Split from ntddsnd.h + + These are enhancements to the original NT4 DDK audio device header + files. +*/ + +#ifndef SNDTYPES_H +#define SNDTYPES_H + +/* + Device types + + Based on the values stored into the registry by the NT4 sndblst + driver. +*/ + +typedef enum +{ + // The sound device types + WAVE_IN_DEVICE_TYPE = 1, + WAVE_OUT_DEVICE_TYPE = 2, + MIDI_IN_DEVICE_TYPE = 3, + MIDI_OUT_DEVICE_TYPE = 4, + AUX_DEVICE_TYPE = 5, + MIXER_DEVICE_TYPE = 6, + + // Range of valid device type IDs + MIN_SOUND_DEVICE_TYPE = 1, + MAX_SOUND_DEVICE_TYPE = 6, + + // Number of sound device types + SOUND_DEVICE_TYPES = 6 +} SOUND_DEVICE_TYPE; + +#define IS_VALID_SOUND_DEVICE_TYPE(x) \ + ( ( x >= MIN_SOUND_DEVICE_TYPE ) && ( x <= MAX_SOUND_DEVICE_TYPE ) ) + +#define IS_WAVE_DEVICE_TYPE(x) \ + ( ( x == WAVE_IN_DEVICE_TYPE ) || ( x == WAVE_OUT_DEVICE_TYPE ) ) + +#define IS_MIDI_DEVICE_TYPE(x) \ + ( ( x == MIDI_IN_DEVICE_TYPE ) || ( x == MIDI_OUT_DEVICE_TYPE ) ) + +#define IS_AUX_DEVICE_TYPE(x) \ + ( x == AUX_DEVICE_TYPE ) + +#define IS_MIXER_DEVICE_TYPE(x) \ + ( x == MIXER_DEVICE_TYPE ) + + +#endif Propchange: trunk/reactos/include/reactos/libs/sound/sndtypes.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/directory.rbui… ============================================================================== --- trunk/reactos/lib/drivers/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/directory.rbuild [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -13,4 +13,7 @@ <directory name="chew"> <xi:include href="chew/chew.rbuild" /> </directory> + <directory name="sound"> + <xi:include href="sound/sound.rbuild" /> + </directory> </group> Modified: trunk/reactos/lib/drivers/sound/legacy/devname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/legacy/d… ============================================================================== --- trunk/reactos/lib/drivers/sound/legacy/devname.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/legacy/devname.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -11,6 +11,7 @@ #include <ntddk.h> #include <ntddsnd.h> +#include <sndnames.h> #include <debug.h> Modified: trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -14,6 +14,7 @@ #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> Modified: trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -12,6 +12,7 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> /* Modified: trunk/reactos/lib/drivers/sound/mmebuddy/devicelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -12,6 +12,7 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> ULONG SoundDeviceCounts[SOUND_DEVICE_TYPES]; Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -14,6 +14,7 @@ #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -14,6 +14,7 @@ #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -14,6 +14,7 @@ #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> 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 Feb 15 07:31:52 2009 @@ -12,6 +12,7 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> /* Modified: trunk/reactos/lib/drivers/sound/mmebuddy/reentrancy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/reentrancy.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/reentrancy.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -12,6 +12,7 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> HANDLE EntrypointMutexes[SOUND_DEVICE_TYPES]; 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 Feb 15 07:31:52 2009 @@ -12,6 +12,7 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> MMRESULT Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -14,6 +14,7 @@ #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> 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 Feb 15 07:31:52 2009 @@ -14,6 +14,7 @@ #include <mmddk.h> #include <ntddsnd.h> +#include <sndtypes.h> #include <mmebuddy.h> Modified: trunk/reactos/lib/drivers/sound/mment4/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/control.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -12,6 +12,7 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> +#include <reactos/sndtypes.h> #include <mmebuddy.h> #include <mment4.h> Modified: trunk/reactos/lib/drivers/sound/mment4/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/d… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/detect.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/detect.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -15,6 +15,8 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> +#include <reactos/sndnames.h> +#include <reactos/sndtypes.h> #include <mmebuddy.h> #include <mment4.h> Modified: trunk/reactos/lib/drivers/sound/mment4/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/r… ============================================================================== --- trunk/reactos/lib/drivers/sound/mment4/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mment4/registry.c [iso-8859-1] Sun Feb 15 07:31:52 2009 @@ -12,6 +12,9 @@ #include <mmsystem.h> #include <mmddk.h> #include <ntddsnd.h> + +#include <reactos/sndnames.h> +#include <reactos/sndtypes.h> #include <mmebuddy.h> #include <mment4.h>

16 years, 2 months

[janderwald] 39605: - Partly implement IPortFilterWaveCyclic_fnNewIrpTarget - Store KSPIN_DESCRIPTOR in subdevice descriptor - Return correct result for IInterruptSync_fnCallSynchronizedRoutine - Add stub interface for IPortPinWaveCyclic - Implement PcValidateConnectRequest

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 15 07:29:01 2009 New Revision: 39605 URL: http://svn.reactos.org/svn/reactos?rev=39605&view=rev Log: - Partly implement IPortFilterWaveCyclic_fnNewIrpTarget - Store KSPIN_DESCRIPTOR in subdevice descriptor - Return correct result for IInterruptSync_fnCallSynchronizedRoutine - Add stub interface for IPortPinWaveCyclic - Implement PcValidateConnectRequest Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Sun Feb 15 07:29:01 2009 @@ -5,6 +5,9 @@ IPortFilterWaveCyclicVtbl *lpVtbl; LONG ref; + + IPortWaveCyclic* Port; + IPortPinWaveCyclic * Pin; }IPortFilterWaveCyclicImpl; @@ -80,8 +83,53 @@ IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { - - return STATUS_UNSUCCESSFUL; + ISubdevice * ISubDevice; + NTSTATUS Status; + IPortPinWaveCyclic * Pin; + + SUBDEVICE_DESCRIPTOR * Descriptor; + PKSPIN_CONNECT ConnectDetails; + + IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; + + ASSERT(This->Port); + + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + Status = PcValidateConnectRequest(Irp, &Descriptor->Factory, &ConnectDetails); + if (!NT_SUCCESS(Status)) + { + ISubDevice->lpVtbl->Release(ISubDevice); + return STATUS_UNSUCCESSFUL; + } + + ISubDevice->lpVtbl->Release(ISubDevice); + + Status = NewPortPinWaveCyclic(&Pin); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId]); + if (!NT_SUCCESS(Status)) + { + Pin->lpVtbl->Release(Pin); + return Status; + } + + /* store pin handle */ + This->Pin = Pin; + + /* store result */ + *OutTarget = (IIrpTarget*)Pin; + return Status; } /* @@ -256,7 +304,8 @@ NTSTATUS NewPortFilterWaveCyclic( - OUT IPortFilterWaveCyclic ** OutFilter) + OUT IPortFilterWaveCyclic ** OutFilter, + IN IPortWaveCyclic* iface) { IPortFilterWaveCyclicImpl * This; @@ -267,6 +316,10 @@ /* initialize IPortFilterWaveCyclic */ This->ref = 1; This->lpVtbl = &vt_IPortFilterWaveCyclic; + This->Port = iface; + + /* increment reference count */ + iface->lpVtbl->AddRef(iface); /* return result */ *OutFilter = (IPortFilterWaveCyclic*)&This->lpVtbl; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Sun Feb 15 07:29:01 2009 @@ -99,8 +99,16 @@ typedef struct { + ULONG PinDescriptorCount; + ULONG PinDescriptorSize; + KSPIN_DESCRIPTOR * KsPinDescriptor; +}KSPIN_FACTORY; + +typedef struct +{ ULONG InterfaceCount; GUID *Interfaces; + KSPIN_FACTORY Factory; }SUBDEVICE_DESCRIPTOR, *PSUBDEVICE_DESCRIPTOR; #undef INTERFACE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Sun Feb 15 07:29:01 2009 @@ -120,7 +120,7 @@ KIRQL OldIrql; IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; - DPRINT1("IInterruptSync_fnCallSynchronizedRoutine This %p Routine %p DynamicContext %p\n", This, Routine, DynamicContext); + DPRINT1("IInterruptSync_fnCallSynchronizedRoutine This %p Routine %p DynamicContext %p Irql %x Interrupt %p\n", This, Routine, DynamicContext, KeGetCurrentIrql(), This->Interrupt); if (!This->Interrupt) { @@ -140,7 +140,10 @@ This->SyncRoutine = Routine; This->DynamicContext = DynamicContext; - return KeSynchronizeExecution(This->Interrupt, IInterruptSynchronizedRoutine, (PVOID)This); + if (KeSynchronizeExecution(This->Interrupt, IInterruptSynchronizedRoutine, (PVOID)This)) + return STATUS_SUCCESS; + else + return STATUS_UNSUCCESSFUL; } NTAPI Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Feb 15 07:29:01 2009 @@ -1,0 +1,486 @@ +#include "private.h" + +typedef struct +{ + IPortPinWaveCyclicVtbl *lpVtbl; + IServiceSinkVtbl *lpVtblServiceSink; + + LONG ref; + IPortWaveCyclic * Port; + IPortFilterWaveCyclic * Filter; + KSPIN_DESCRIPTOR * KsPinDescriptor; + +}IPortPinWaveCyclicImpl; + +//================================================================================================================================== + +static +NTSTATUS +NTAPI +IServiceSink_fnQueryInterface( + IServiceSink* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortPinWaveCyclicImpl, lpVtblServiceSink); + + DPRINT("IServiceSink_fnQueryInterface entered\n"); + + if (IsEqualGUIDAligned(refiid, &IID_IServiceSink) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtblServiceSink; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +static +ULONG +NTAPI +IServiceSink_fnAddRef( + IServiceSink* iface) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortPinWaveCyclicImpl, lpVtblServiceSink); + DPRINT("IServiceSink_fnAddRef entered\n"); + + return InterlockedIncrement(&This->ref); +} + +static +ULONG +NTAPI +IServiceSink_fnRelease( + IServiceSink* iface) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortPinWaveCyclicImpl, lpVtblServiceSink); + + InterlockedDecrement(&This->ref); + + DPRINT("IServiceSink_fnRelease entered %u\n", This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +static +VOID +NTAPI +IServiceSink_fnRequestService( + IServiceSink* iface) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortPinWaveCyclicImpl, lpVtblServiceSink); + + DPRINT("IServiceSink_fnRequestService entered %p\n", This); +} + +static IServiceSinkVtbl vt_IServiceSink = +{ + IServiceSink_fnQueryInterface, + IServiceSink_fnAddRef, + IServiceSink_fnRelease, + IServiceSink_fnRequestService +}; + +//================================================================================================================================== +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnQueryInterface( + IPortPinWaveCyclic* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IIrpTarget) || + //IsEqualGUIDAligned(refiid, &IID_IPortPinWaveCyclic) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortPinWaveCyclic_fnAddRef( + IPortPinWaveCyclic* iface) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortPinWaveCyclic_fnRelease( + IPortPinWaveCyclic* iface) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnNewIrpTarget( + IN IPortPinWaveCyclic* iface, + OUT struct IIrpTarget **OutTarget, + IN WCHAR * Name, + IN PUNKNOWN Unknown, + IN POOL_TYPE PoolType, + IN PDEVICE_OBJECT * DeviceObject, + IN PIRP Irp, + IN KSOBJECT_CREATE *CreateObject) +{ + + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnDeviceIoControl( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + UNIMPLEMENTED + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) + { + /// FIXME + /// handle property event + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_ENABLE_EVENT) + { + /// FIXME + /// handle enable event + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_DISABLE_EVENT) + { + /// FIXME + /// handle disable event + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_RESET_STATE) + { + /// FIXME + /// handle reset state + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM || IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) + { + /// FIXME + /// handle reset state + } + else + { + return KsDefaultDeviceIoCompletion(DeviceObject, Irp); + } + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnRead( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnWrite( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnFlush( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnClose( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnQuerySecurity( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnSetSecurity( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnFastDeviceIoControl( + IN IPortPinWaveCyclic* iface, + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN ULONG IoControlCode, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnFastRead( + IN IPortPinWaveCyclic* iface, + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnFastWrite( + IN IPortPinWaveCyclic* iface, + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnInit( + IN IPortPinWaveCyclic* iface, + IN PPORTWAVECYCLIC Port, + IN PPORTFILTERWAVECYCLIC Filter, + IN KSPIN_CONNECT * ConnectDetails, + IN KSPIN_DESCRIPTOR * KsPinDescriptor) +{ + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + Port->lpVtbl->AddRef(Port); + Filter->lpVtbl->AddRef(Filter); + + This->Port = Port; + This->Filter = Filter; + This->KsPinDescriptor = KsPinDescriptor; + + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +ULONG +NTAPI +IPortPinWaveCyclic_fnGetCompletedPosition( + IN IPortPinWaveCyclic* iface) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +ULONG +NTAPI +IPortPinWaveCyclic_fnGetCycleCount( + IN IPortPinWaveCyclic* iface) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +ULONG +NTAPI +IPortPinWaveCyclic_fnGetDeviceBufferSize( + IN IPortPinWaveCyclic* iface) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +IPortPinWaveCyclic_fnGetIrpStream( + IN IPortPinWaveCyclic* iface) +{ + UNIMPLEMENTED; + return NULL; +} + + +/* + * @implemented + */ +PMINIPORT +NTAPI +IPortPinWaveCyclic_fnGetMiniport( + IN IPortPinWaveCyclic* iface) +{ + UNIMPLEMENTED; + return NULL; +} + +static IPortPinWaveCyclicVtbl vt_IPortPinWaveCyclic = +{ + IPortPinWaveCyclic_fnQueryInterface, + IPortPinWaveCyclic_fnAddRef, + IPortPinWaveCyclic_fnRelease, + IPortPinWaveCyclic_fnNewIrpTarget, + IPortPinWaveCyclic_fnDeviceIoControl, + IPortPinWaveCyclic_fnRead, + IPortPinWaveCyclic_fnWrite, + IPortPinWaveCyclic_fnFlush, + IPortPinWaveCyclic_fnClose, + IPortPinWaveCyclic_fnQuerySecurity, + IPortPinWaveCyclic_fnSetSecurity, + IPortPinWaveCyclic_fnFastDeviceIoControl, + IPortPinWaveCyclic_fnFastRead, + IPortPinWaveCyclic_fnFastWrite, + IPortPinWaveCyclic_fnInit, + IPortPinWaveCyclic_fnGetCompletedPosition, + IPortPinWaveCyclic_fnGetCycleCount, + IPortPinWaveCyclic_fnGetDeviceBufferSize, + IPortPinWaveCyclic_fnGetIrpStream, + IPortPinWaveCyclic_fnGetMiniport +}; + + + + +NTSTATUS NewPortPinWaveCyclic( + OUT IPortPinWaveCyclic ** OutPin) +{ + IPortPinWaveCyclicImpl * This; + + This = AllocateItem(NonPagedPool, sizeof(IPortPinWaveCyclicImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + /* initialize IPortPinWaveCyclic */ + This->ref = 1; + This->lpVtbl = &vt_IPortPinWaveCyclic; + This->lpVtblServiceSink = &vt_IServiceSink; + + + /* store result */ + *OutPin = (IPortPinWaveCyclic*)&This->lpVtbl; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pool.c [iso-8859-1] Sun Feb 15 07:29:01 2009 @@ -22,5 +22,5 @@ IN ULONG Tag) { - //ExFreePoolWithTag(Item, Tag); + ExFreePoolWithTag(Item, Tag); } 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] Sun Feb 15 07:29:01 2009 @@ -97,7 +97,7 @@ IPortEvents* iface) { IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortWaveCyclicImpl, lpVtblPortEvents); - DPRINT1("IPortEvents_fnQueryInterface entered\n"); + DPRINT1("IPortEvents_fnRelease entered\n"); InterlockedDecrement(&This->ref); if (This->ref == 0) @@ -272,7 +272,7 @@ PPOWERNOTIFY PowerNotify; IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; - DPRINT1("IPortWaveCyclic_Init entered\n"); + DPRINT1("IPortWaveCyclic_Init entered %p\n", This); if (This->bInitialized) { @@ -537,12 +537,21 @@ IN PUNKNOWN Unknown, IN POOL_TYPE PoolType, IN PDEVICE_OBJECT * DeviceObject, - IN PIRP Irp, + IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { + NTSTATUS Status; + IPortFilterWaveCyclic * Filter; IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortWaveCyclicImpl, lpVtblSubDevice); DPRINT1("ISubDevice_NewIrpTarget this %p\n", This); + + Status = NewPortFilterWaveCyclic(&Filter, (IPortWaveCyclic*)This); + if (NT_SUCCESS(Status)) + { + *OutTarget = (IIrpTarget*)Filter; + } + return STATUS_UNSUCCESSFUL; } @@ -567,9 +576,11 @@ { IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortWaveCyclicImpl, lpVtblSubDevice); + ASSERT(This->SubDeviceDescriptor != NULL); + *Descriptor = This->SubDeviceDescriptor; - DPRINT1("ISubDevice_GetDescriptor this %p\n", This); + DPRINT1("ISubDevice_GetDescriptor this %p desc %p\n", This, This->SubDeviceDescriptor); return 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] Sun Feb 15 07:29:01 2009 @@ -26,6 +26,7 @@ <file>resource.c</file> <file>registry.c</file> <file>service_group.c</file> + <file>pin_wavecyclic.c</file> <file>pool.c</file> <file>port.c</file> <file>power.c</file> 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] Sun Feb 15 07:29:01 2009 @@ -83,7 +83,11 @@ OUT PPORTCLSVERSION * OutVersion); NTSTATUS NewPortFilterWaveCyclic( - OUT IPortFilterWaveCyclic ** OutFilter); + OUT IPortFilterWaveCyclic ** OutFilter, + IN IPortWaveCyclic* iface); + +NTSTATUS NewPortPinWaveCyclic( + OUT IPortPinWaveCyclic ** OutPin); PVOID AllocateItem(IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes, IN ULONG Tag); @@ -179,6 +183,13 @@ NTSTATUS NTAPI +PcValidateConnectRequest( + IN PIRP Irp, + IN KSPIN_FACTORY * Descriptor, + OUT PKSPIN_CONNECT* Connect); + +NTSTATUS +NTAPI PcCreateItemDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Sun Feb 15 07:29:01 2009 @@ -37,7 +37,8 @@ { IServiceGroupImpl * This = (IServiceGroupImpl*)iface; if (IsEqualGUIDAligned(refiid, &IID_IServiceGroup) || - IsEqualGUIDAligned(refiid, &IID_IServiceSink)) + IsEqualGUIDAligned(refiid, &IID_IServiceSink) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) { *Output = &This->lpVtbl; InterlockedIncrement(&This->ref); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] Sun Feb 15 07:29:01 2009 @@ -102,6 +102,7 @@ IN PPCFILTER_DESCRIPTOR FilterDescription) { SUBDEVICE_DESCRIPTOR * Descriptor; + ULONG Index; NTSTATUS Status = STATUS_INSUFFICIENT_RESOURCES; Descriptor = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_DESCRIPTOR), TAG_PORTCLASS); @@ -116,6 +117,24 @@ RtlCopyMemory(Descriptor->Interfaces, InterfaceGuids, sizeof(GUID) * InterfaceCount); Descriptor->InterfaceCount = InterfaceCount; + + if (FilterDescription->PinCount) + { + /// FIXME + /// handle extra size + ASSERT(FilterDescription->PinSize == sizeof(KSPIN_DESCRIPTOR)); + Descriptor->Factory.KsPinDescriptor = AllocateItem(NonPagedPool, sizeof(KSPIN_DESCRIPTOR) * FilterDescription->PinCount, TAG_PORTCLASS); + if (!Descriptor->Factory.KsPinDescriptor) + goto cleanup; + + Descriptor->Factory.PinDescriptorCount = FilterDescription->PinCount; + Descriptor->Factory.PinDescriptorSize = FilterDescription->PinSize; + + /* copy pin factories */ + for(Index = 0; Index < FilterDescription->PinCount; Index++) + RtlMoveMemory(&Descriptor->Factory.KsPinDescriptor[Index], &FilterDescription->Pins[Index].KsPinDescriptor, sizeof(KSPIN_DESCRIPTOR)); + } + *OutSubdeviceDescriptor = Descriptor; return STATUS_SUCCESS; @@ -125,10 +144,28 @@ if (Descriptor->Interfaces) FreeItem(Descriptor->Interfaces, TAG_PORTCLASS); + if (Descriptor->Factory.KsPinDescriptor) + FreeItem(Descriptor->Factory.KsPinDescriptor, TAG_PORTCLASS); + FreeItem(Descriptor, TAG_PORTCLASS); } return Status; } + +/* + * @implemented + */ + +NTSTATUS +NTAPI +PcValidateConnectRequest( + IN PIRP Irp, + IN KSPIN_FACTORY * Factory, + OUT PKSPIN_CONNECT * Connect) +{ + return KsValidateConnectRequest(Irp, Factory->PinDescriptorCount, Factory->KsPinDescriptor, Connect); +} + /* PcDeleteSubdeviceDescriptor */

16 years, 2 months

[cfinck] 39604: - Downgrade MinGW Runtime back to 3.13. Using the complete 3.15.x package leads to building problems. - Set the PATH variable again in RosBE-Builder.sh, otherwise GCC compilation fails - Fix building "make" with RosBE-Builder.sh - Delete the contents of the target directory before doing a reinstallation - Delete the "$installdir/share" directory as well after compiling the stuff - Update the README with the latest information - Make the version.sh output nicer - Minor tweaks in m

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Feb 14 12:22:46 2009 New Revision: 39604 URL: http://svn.reactos.org/svn/reactos?rev=39604&view=rev Log: - Downgrade MinGW Runtime back to 3.13. Using the complete 3.15.x package leads to building problems. - Set the PATH variable again in RosBE-Builder.sh, otherwise GCC compilation fails - Fix building "make" with RosBE-Builder.sh - Delete the contents of the target directory before doing a reinstallation - Delete the "$installdir/share" directory as well after compiling the stuff - Update the README with the latest information - Make the version.sh output nicer - Minor tweaks in makepackage.sh to get the package built properly - Update the SVN-Readme.txt files Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt trunk/tools/RosBE/RosBE-Unix/SVN-Readme.txt trunk/tools/RosBE/RosBE-Unix/makepackage.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] Sat Feb 14 12:22:46 2009 @@ -36,10 +36,11 @@ The executable file and the package name are often called "flex". * GNU GCC - You need the GCC compiler, which is suitable for your system. The + You need a GCC compiler, which is suitable for your system. The executable file and the package name are often called "gcc". Your GCC compiler needs to be able to compile both C and C++ sources. Therefore the "g++" module also has to be installed. + The compiler needs to be in version 3.4 or later. * Grep The executable file and the package name are often called "grep". @@ -91,6 +92,12 @@ the shortcut. +Uninstallation +--------------- + If you want to uninstall RosBE, just delete the entire installation directory +and any shortcuts you have created. + + Version Information -------------------- This version of RosBE for Unix-based operating systems uses the following @@ -115,7 +122,7 @@ NOTE: This GCC version only supports C and C++ * Make 20071219 (CVS version) - * MinGW-Runtime 3.15.2 + * MinGW-Runtime 3.13 * NASM, The Netwide assembler v2.05.01 * W32api 3.10 Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Sat Feb 14 12:22:46 2009 @@ -51,6 +51,7 @@ createdir=false installdir="" +reinstall=false update=false while [ "$installdir" = "" ]; do @@ -94,7 +95,7 @@ echo "Please choose one of the following options:" echo echo " (U)pdate the existing Build Environment" - echo " (R)einstall all new components of the Build Environment" + echo " (R)einstall all components of the Build Environment" echo " (C)hoose a different installation directory" echo @@ -106,12 +107,18 @@ fi done - if [ "$choice" = "U" ] || [ "$choice" = "u" ]; then - update=true - elif [ "$choice" = "C" ] || [ "$choice" = "c" ]; then - echo "Please enter another directory!" - installdir="" - fi + case "$choice" in + "U"|"u") + update=true + ;; + "R"|"r") + reinstall=true + ;; + "C"|"c") + echo "Please enter another directory!" + installdir="" + ;; + esac else echo "The directory \"$installdir\" is not empty. Do you really want to continue? (yes/no)" read -p "[no] " answer @@ -179,7 +186,6 @@ "1.1") # Updated components from 1.1 to 1.4 process_binutils=true - process_mingwruntime=true process_nasm=true # Reorganize the existing files @@ -207,6 +213,11 @@ process_buildtime=true process_scut=true + # Delete the contents of the current installation directory if we're reinstalling + if $reinstall; then + rm -rf "$installdir/"* + fi + # Create the directory if necessary if $createdir; then if ! mkdir -p "$installdir"; then @@ -228,6 +239,9 @@ boldmsg "Building..." mkdir "$installdir/bin" >& /dev/null mkdir -p "$installdir/$TARGET_ARCH/mingw32" >& /dev/null + +# For compiling gcc, it needs to access the already compiled mingw32 binutils +PATH="$installdir/$TARGET_ARCH/bin:$PATH" # cpucount if $process_cpucount; then @@ -333,7 +347,7 @@ mkdir "make-build" cd "make-build" ../make/configure --prefix="$installdir" --disable-dependency-tracking \ - --disable-nls --enable-case-insensitive-file-system + --disable-nls --enable-case-insensitive-file-system \ --disable-job-server --disable-rpath >& "$SCRIPTDIR/configure.log" setup_check_run "configure" @@ -407,6 +421,7 @@ fi echo -n "Removing unneeded files... " +rm -rf "$installdir/share" rm -rf "$installdir/$TARGET_ARCH/mingw32/sys-include" rm -rf "$installdir/$TARGET_ARCH/info" rm -rf "$installdir/$TARGET_ARCH/man" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh [iso-8859-1] Sat Feb 14 12:22:46 2009 @@ -6,10 +6,18 @@ # # Released under GNU GPL v2 or any later version. +source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" + # Display RosBE version echo "This is the ReactOS Build Environment for Unix-based Operating Systems" -echo "Version $_ROSBE_VERSION, currently running with these components:" +echo "Version $_ROSBE_VERSION" +echo + +# Environment Information +boldmsg "Environment Information" +echo "Selected Target Architecture: $_ROSBE_ARCH" echo # Display tool versions +boldmsg "Build Tools" source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt [iso-8859-1] Sat Feb 14 12:22:46 2009 @@ -22,4 +22,4 @@ - w32api.tar.bz2 --> containing the "include" and "lib" subdirectories of the w32api package - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 + Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 Modified: trunk/tools/RosBE/RosBE-Unix/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/SVN-Readme.… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/SVN-Readme.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/SVN-Readme.txt [iso-8859-1] Sat Feb 14 12:22:46 2009 @@ -6,5 +6,5 @@ It does not contain a fully functional Build Environment as some packages are missing in the "sources" directory. -You can download a full RosBE-Unix package from http://reactos.colinfinck.de -(later on it will be downloadable from the official ReactOS Website) +You can download a full RosBE-Unix package from +http://sourceforge.net/project/showfiles.php?group_id=6553&package_id=308458 Modified: trunk/tools/RosBE/RosBE-Unix/makepackage.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/makepackage… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/makepackage.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/makepackage.sh [iso-8859-1] Sat Feb 14 12:22:46 2009 @@ -82,17 +82,16 @@ # # The Process # -# Copy the directory and delete some stuff +# Copy the directory, delete some stuff and set the permissions +echo "Copying the \"$package_name\" directory..." +rm -rf "$full_package_name" cp -R "$package_name" "$full_package_name" find "$full_package_name" -type d -name ".svn" | xargs rm -rf +find "$full_package_name" -type f -name "SVN-Readme.txt" | xargs rm rm "$full_package_name/README.odt" -# Copy the source packages -for source in $sources; do - echo "Copying $source.tar.bz2..." - cp "$package_name/sources/$source.tar.bz2" "$full_package_name/sources/$source.tar.bz2" -done +find "$full_package_name" -type f -name "*.sh" | xargs chmod +x # Copy the shared tools for tool in $tools; do

16 years, 2 months

[janderwald] 39603: - Directly create the device objects in its DriverEntry as AddDevice is never called - Remove the hack of hardcoding the symbolic device name object - Add registering of device interfaces (fails atm because no pdo is provided)

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 14 10:10:38 2009 New Revision: 39603 URL: http://svn.reactos.org/svn/reactos?rev=39603&view=rev Log: - Directly create the device objects in its DriverEntry as AddDevice is never called - Remove the hack of hardcoding the symbolic device name object - Add registering of device interfaces (fails atm because no pdo is provided) Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sat Feb 14 10:10:38 2009 @@ -11,12 +11,15 @@ #include <ntifs.h> #include <ntddk.h> +#include <portcls.h> #include <ks.h> #define YDEBUG #include <debug.h> //#include <dxsdk/mediaobj.h> #include "sysaudio.h" +const GUID DMOCATEGORY_ACOUSTIC_ECHO_CANCEL = {0xBF963D80L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSCATEGORY_SYSAUDIO = {0xA7C7A5B1L, 0x5AF3, 0x11D1, {0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07}}; const GUID KSCATEGORY_AUDIO_DEVICE = {0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; const GUID KSCATEGORY_PREFERRED_WAVEOUT_DEVICE = {0xD6C5066EL, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; const GUID KSCATEGORY_PREFERRED_WAVEIN_DEVICE = {0xD6C50671L, 0x72C1, 0x11D2, {0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}}; @@ -46,8 +49,19 @@ IrpStack = IoGetCurrentIrpStackLocation(Irp); DPRINT1("SysAudio_Pnp called for func %x\n", IrpStack->MinorFunction); + DbgBreakPoint(); DeviceExtension = (SYSAUDIODEVEXT*)DeviceObject->DeviceExtension; + + + if (IrpStack->MinorFunction == IRP_MN_START_DEVICE) + { + DPRINT1("SysAudio_Pnp called for func IRP_MN_START_DEVICE\n"); + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } if (IrpStack->MinorFunction == IRP_MN_REMOVE_DEVICE) { @@ -85,7 +99,6 @@ /* a new device has arrived */ PFILE_OBJECT FileObject = NULL; - UNICODE_STRING DeviceName; PKSAUDIO_DEVICE_ENTRY DeviceEntry; HANDLE NodeHandle; IO_STATUS_BLOCK IoStatusBlock; @@ -95,19 +108,34 @@ if (!DeviceEntry) return STATUS_INSUFFICIENT_RESOURCES; - if (!RtlCreateUnicodeString(&DeviceEntry->DeviceName, Event->SymbolicLinkName->Buffer)) + DeviceEntry->DeviceName.Length = 0; + DeviceEntry->DeviceName.MaximumLength = Event->SymbolicLinkName->Length + 5 * sizeof(WCHAR); + DeviceEntry->DeviceName.Buffer = ExAllocatePool(NonPagedPool, DeviceEntry->DeviceName.MaximumLength); + if (!DeviceEntry->DeviceName.Buffer) { ExFreePool(DeviceEntry); return STATUS_INSUFFICIENT_RESOURCES; } -#if 1 //HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK - RtlInitUnicodeString(&DeviceName, L"\\Device\\00000017"); -#else - RtlInitUnicodeString(&DeviceName, Event->SymbolicLinkName->Buffer); -#endif - - InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + if (!NT_SUCCESS(RtlAppendUnicodeToString(&DeviceEntry->DeviceName, L"\\??\\"))) + { + + ExFreePool(DeviceEntry->DeviceName.Buffer); + ExFreePool(DeviceEntry); + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (!NT_SUCCESS(RtlAppendUnicodeStringToString(&DeviceEntry->DeviceName, Event->SymbolicLinkName))) + { + + ExFreePool(DeviceEntry->DeviceName.Buffer); + ExFreePool(DeviceEntry); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DPRINT1("Sym %wZ\n", &DeviceEntry->DeviceName); + + InitializeObjectAttributes(&ObjectAttributes, &DeviceEntry->DeviceName, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwCreateFile(&NodeHandle, GENERIC_READ | GENERIC_WRITE, @@ -181,20 +209,19 @@ NTSTATUS NTAPI -SysAudio_AddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PhysicalDeviceObject) +SysAudio_InstallDevice( + IN PDRIVER_OBJECT DriverObject) { NTSTATUS Status; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\sysaudio"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\sysaudio"); PDEVICE_OBJECT DeviceObject; - PDEVICE_OBJECT NextDeviceObject; + //PDEVICE_OBJECT NextDeviceObject; KSOBJECT_CREATE_ITEM CreateItem; SYSAUDIODEVEXT *DeviceExtension; UNICODE_STRING SymbolicLink; - DPRINT1("SysAudio_AddDevice called\n"); + DPRINT1("SysAudio_InstallDevice called\n"); /* create the device */ Status = IoCreateDevice(DriverObject, @@ -227,7 +254,7 @@ RtlZeroMemory(DeviceExtension, sizeof(SYSAUDIODEVEXT)); KeInitializeMutex(&DeviceExtension->Mutex, 0); - DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + //DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; InitializeListHead(&DeviceExtension->KsAudioDeviceList); /* initialize create item struct */ @@ -238,84 +265,114 @@ 1, &CreateItem); - if (NT_SUCCESS(Status)) - { - NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); - if (NextDeviceObject) - { - /// FIXME - /// KsSetDevicePnpAndBaseObject(DeviceExtension->KsDeviceHeader, NextDeviceObject, DeviceObject); - /// - - DeviceExtension->NextDeviceObject = NextDeviceObject; - - Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, - PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, - (PVOID)&KS_CATEGORY_AUDIO, - DriverObject, - DeviceInterfaceChangeCallback, - (PVOID)DeviceExtension, - (PVOID*)&DeviceExtension->KsAudioNotificationEntry); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); - return Status; - } + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsAllocateDeviceHeader failed with %x\n", Status); + goto cleanup; + } + #if 0 - Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, - PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, - &DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, - DriverObject, - DeviceInterfaceChangeCallback, - (PVOID)DeviceExtension, - &DeviceExtension->EchoCancelNotificationEntry); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); - return Status; - } + //NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + /// FIXME + /// KsSetDevicePnpAndBaseObject(DeviceExtension->KsDeviceHeader, NextDeviceObject, DeviceObject); + /// + /// DeviceExtension->NextDeviceObject = NextDeviceObject; #endif - Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, NULL, &SymbolicLink); - if (NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&SymbolicLink); - } - else - { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface Status %x\n", Status); - } - - Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_WAVEIN_DEVICE, NULL, &SymbolicLink); - if (NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&SymbolicLink); - } - else - { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface Status %x\n", Status); - } - - Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, NULL, &SymbolicLink); - if (NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&SymbolicLink); - } - else - { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface Status %x\n", Status); - } - - /* set io flags */ - DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; - /* clear initializing flag */ - DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; - } - } + Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, + PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, + (PVOID)&KS_CATEGORY_AUDIO, + DriverObject, + DeviceInterfaceChangeCallback, + (PVOID)DeviceExtension, + (PVOID*)&DeviceExtension->KsAudioNotificationEntry); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); + goto cleanup; + } + +#if 0 + Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, + PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, + (PVOID)&DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, + DriverObject, + DeviceInterfaceChangeCallback, + (PVOID)DeviceExtension, + (PVOID*)&DeviceExtension->EchoCancelNotificationEntry); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); + goto cleanup; + } +#endif + + Status = IoRegisterDeviceInterface(DeviceObject, &KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, NULL, &SymbolicLink); + if (NT_SUCCESS(Status)) + { + IoSetDeviceInterfaceState(&SymbolicLink, TRUE); + RtlFreeUnicodeString(&SymbolicLink); + } + else + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface Status %x\n", Status); + } + + Status = IoRegisterDeviceInterface(DeviceObject, &KSCATEGORY_PREFERRED_WAVEIN_DEVICE, NULL, &SymbolicLink); + if (NT_SUCCESS(Status)) + { + IoSetDeviceInterfaceState(&SymbolicLink, TRUE); + RtlFreeUnicodeString(&SymbolicLink); + } + else + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface Status %x\n", Status); + } + + Status = IoRegisterDeviceInterface(DeviceObject, &KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, NULL, &SymbolicLink); + if (NT_SUCCESS(Status)) + { + IoSetDeviceInterfaceState(&SymbolicLink, TRUE); + RtlFreeUnicodeString(&SymbolicLink); + } + else + { + DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface Status %x\n", Status); + } + + Status = IoRegisterDeviceInterface(DeviceObject, &KSCATEGORY_SYSAUDIO, NULL, &SymbolicLink); + if (NT_SUCCESS(Status)) + { + IoSetDeviceInterfaceState(&SymbolicLink, TRUE); + RtlFreeUnicodeString(&SymbolicLink); + } + else + { + DPRINT1("Failed to register KSCATEGORY_SYSAUDIO interface Status %x\n", Status); + } + + + /* set io flags */ + DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + /* clear initializing flag */ + DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; DPRINT("Device SysAudio_AddDevice result %x\n", Status); - return STATUS_SUCCESS; + +cleanup: + + if (DeviceExtension->KsAudioNotificationEntry) + IoUnregisterPlugPlayNotification(DeviceExtension->KsAudioNotificationEntry); + + if (DeviceExtension->EchoCancelNotificationEntry) + IoUnregisterPlugPlayNotification(DeviceExtension->EchoCancelNotificationEntry); + + IoDeleteSymbolicLink(&SymlinkName); + IoDeleteDevice(DeviceObject); + return Status; } NTSTATUS @@ -334,7 +391,6 @@ return STATUS_SUCCESS; } - NTSTATUS NTAPI DriverEntry( @@ -362,7 +418,6 @@ DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; DriverObject->MajorFunction[IRP_MJ_PNP] = SysAudio_Pnp; DriverObject->DriverUnload = SysAudio_Unload; - DriverObject->DriverExtension->AddDevice = SysAudio_AddDevice; - - return STATUS_SUCCESS; -} + + return SysAudio_InstallDevice(DriverObject); +}

16 years, 2 months

[dchapyshev] 39602: - Add url.dll from Wine

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Feb 14 02:54:01 2009 New Revision: 39602 URL: http://svn.reactos.org/svn/reactos?rev=39602&view=rev Log: - Add url.dll from Wine Added: trunk/reactos/dll/win32/url/ (with props) trunk/reactos/dll/win32/url/url.rbuild (with props) trunk/reactos/dll/win32/url/url.spec (with props) trunk/reactos/dll/win32/url/url_main.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=396… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -9,6 +9,7 @@ <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> <property name="BASEADDRESS_RSAENH" value="0x35780000" /> + <property name="BASEADDRESS_URL" value="0x42ea0000" /> <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" /> <property name="BASEADDRESS_LOADPERF" value="0x4B920000" /> <property name="BASEADDRESS_MPRAPI" value="0x4C400000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -379,6 +379,7 @@ dll\win32\ufat\ufat.dll 1 dll\win32\ufatx\ufatx.dll 1 optional dll\win32\untfs\untfs.dll 1 +dll\win32\url\url.dll 1 dll\win32\urlmon\urlmon.dll 1 dll\win32\user32\user32.dll 1 dll\win32\userenv\userenv.dll 1 Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 14 02:54:01 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/url/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/url/url.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/url/url.rbuild (added) +++ trunk/reactos/dll/win32/url/url.rbuild [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -1,0 +1,12 @@ +<module name="url" type="win32dll" baseaddress="${BASEADDRESS_URL}" installbase="system32" installname="url.dll" allowwarnings="true"> + <importlibrary definition="url.spec" /> + <include base="url">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>url_main.c</file> + <library>wine</library> + <library>shell32</library> + <library>shlwapi</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/url/url.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/url/url.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/url/url.spec (added) +++ trunk/reactos/dll/win32/url/url.spec [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -1,0 +1,23 @@ +@ stdcall AddMIMEFileTypesPS(ptr ptr) +@ stub AutodialHookCallback +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DummyEntryPoint +@ stub DummyEntryPointA +@ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA +@ stdcall FileProtocolHandlerA(long ptr str long) +@ stdcall InetIsOffline(long) +@ stub MIMEAssociationDialogA +@ stub MIMEAssociationDialogW +@ stub MailToProtocolHandler +@ stub MailToProtocolHandlerA +@ stub NewsProtocolHandler +@ stub NewsProtocolHandlerA +@ stub OpenURL +@ stub OpenURLA +@ stdcall TelnetProtocolHandler(long str) TelnetProtocolHandlerA +@ stdcall TelnetProtocolHandlerA(long str) +@ stub TranslateURLA +@ stub TranslateURLW +@ stub URLAssociationDialogA +@ stub URLAssociationDialogW Propchange: trunk/reactos/dll/win32/url/url.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/url/url_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/url/url_main.c (added) +++ trunk/reactos/dll/win32/url/url_main.c [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -1,0 +1,118 @@ +/* + * Copyright 2006 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "shellapi.h" +#include "shlwapi.h" +#include "intshcut.h" +#include "winuser.h" +#include "commctrl.h" +#include "prsht.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(url); + +/*********************************************************************** + * DllMain (URL.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + +/*********************************************************************** + * AddMIMEFileTypesPS (URL.@) + * + * Build and Manage a Filetype-Association Property Sheet + * + * PARAMS + * unknown1 [I] Pointer to an Read-Only Area + * lppsh [I] PTR to the target PropertySheetHeader (ANSI) + * + * RETURNS + * Success: 0 + * + */ +DWORD WINAPI AddMIMEFileTypesPS(VOID * unknown1, LPPROPSHEETHEADERA lppsh) +{ + FIXME("(%p, %p): stub!\n", unknown1, lppsh); + return 0; +} + +/*********************************************************************** + * InetIsOffline (URL.@) + * + */ +BOOL WINAPI InetIsOffline(DWORD flags) +{ + FIXME("(%08x): stub!\n", flags); + + return FALSE; +} + +/*********************************************************************** + * FileProtocolHandlerA (URL.@) + * + * Handles a URL given to it and executes it. + * + * HWND hWnd - Parent Window + * HINSTANCE hInst - ignored + * LPCSTR pszUrl - The URL that needs to be handled + * int nShowCmd - How to display the operation. + */ + +HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, + int nShowCmd) +{ + CHAR pszPath[MAX_PATH]; + DWORD size = MAX_PATH; + HRESULT createpath = PathCreateFromUrlA(pszUrl,pszPath,&size,0); + + TRACE("(%p, %s, %d)\n",hWnd,debugstr_a(pszUrl),nShowCmd); + + if(createpath != S_OK) + return E_FAIL; + + ShellExecuteA(hWnd,NULL,pszPath,NULL,NULL,nShowCmd); + + return S_OK; +} + +/*********************************************************************** + * TelnetProtocolHandlerA (URL.@) + * + */ + +HRESULT WINAPI TelnetProtocolHandlerA(HWND hWnd, LPSTR lpStr) +{ + FIXME("(%p, %p): stub!\n",hWnd,lpStr); + + return E_NOTIMPL; +} Propchange: trunk/reactos/dll/win32/url/url_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -436,6 +436,9 @@ <directory name="untfs"> <xi:include href="untfs/untfs.rbuild" /> </directory> +<directory name="url"> + <xi:include href="url/url.rbuild" /> +</directory> <directory name="urlmon"> <xi:include href="urlmon/urlmon.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Feb 14 02:54:01 2009 @@ -111,6 +111,7 @@ reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/twain_32 # Out of sync +reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Autosync reactos/dll/win32/uxtheme # Autosync

16 years, 2 months

[dchapyshev] 39601: - Sync gdiplus with Wine head

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Feb 14 02:14:34 2009 New Revision: 39601 URL: http://svn.reactos.org/svn/reactos?rev=39601&view=rev Log: - Sync gdiplus with Wine head Modified: trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/dll/win32/gdiplus/stringformat.c trunk/reactos/include/psdk/gdiplusflat.h Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -374,6 +374,29 @@ } /******************************************************************************* + * GdipGetLogFontA [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, + LOGFONTA *lfa) +{ + GpStatus status; + LOGFONTW lfw; + + TRACE("(%p, %p, %p)\n", font, graphics, lfa); + + status = GdipGetLogFontW(font, graphics, &lfw); + if(status != Ok) + return status; + + memcpy(lfa, &lfw, FIELD_OFFSET(LOGFONTA,lfFaceName) ); + + if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) + return GenericError; + + return Ok; +} + +/******************************************************************************* * GdipGetLogFontW [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -76,7 +76,7 @@ @ stdcall GdipCreateBitmapFromGdiDib(ptr ptr ptr) @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) @ stdcall GdipCreateBitmapFromHBITMAP(long long ptr) -@ stub GdipCreateBitmapFromHICON +@ stdcall GdipCreateBitmapFromHICON(long ptr) @ stdcall GdipCreateBitmapFromResource(long wstr ptr) @ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr) @ stdcall GdipCreateBitmapFromStream(ptr ptr) @@ -245,8 +245,8 @@ @ stdcall GdipGetCellAscent(ptr long ptr) @ stdcall GdipGetCellDescent(ptr long ptr) @ stdcall GdipGetClip(ptr ptr) -@ stub GdipGetClipBounds -@ stub GdipGetClipBoundsI +@ stdcall GdipGetClipBounds(ptr ptr) +@ stdcall GdipGetClipBoundsI(ptr ptr) @ stdcall GdipGetCompositingMode(ptr ptr) @ stdcall GdipGetCompositingQuality(ptr ptr) @ stdcall GdipGetCustomLineCapBaseCap(ptr ptr) @@ -311,7 +311,7 @@ @ stdcall GdipGetLineSpacing(ptr long ptr) @ stub GdipGetLineTransform @ stdcall GdipGetLineWrapMode(ptr ptr) -@ stub GdipGetLogFontA +@ stdcall GdipGetLogFontA(ptr ptr ptr) @ stdcall GdipGetLogFontW(ptr ptr ptr) @ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit @@ -507,7 +507,7 @@ @ stdcall GdipSetAdjustableArrowCapMiddleInset(ptr long) @ stdcall GdipSetAdjustableArrowCapWidth(ptr long) @ stdcall GdipSetClipGraphics(ptr ptr long) -@ stub GdipSetClipHrgn +@ stdcall GdipSetClipHrgn(ptr long long) @ stdcall GdipSetClipPath(ptr ptr long) @ stdcall GdipSetClipRect(ptr long long long long long) @ stdcall GdipSetClipRectI(ptr long long long long long) @@ -609,8 +609,8 @@ @ stdcall GdipTransformPoints(ptr long long ptr long) @ stdcall GdipTransformPointsI(ptr long long ptr long) @ stdcall GdipTransformRegion(ptr ptr) -@ stub GdipTranslateClip -@ stub GdipTranslateClipI +@ stdcall GdipTranslateClip(ptr long long) +@ stdcall GdipTranslateClipI(ptr long long) @ stdcall GdipTranslateLineTransform(ptr long long long) @ stdcall GdipTranslateMatrix(ptr long long long) @ stub GdipTranslatePathGradientTransform Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -2375,18 +2375,39 @@ return ret; } +/***************************************************************************** + * GdipFillRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, GpRegion* region) { + INT save_state; + GpStatus status; + HRGN hrgn; + + TRACE("(%p, %p, %p)\n", graphics, brush, region); + if (!(graphics && brush && region)) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %p, %p): stub\n", graphics, brush, region); - - return NotImplemented; + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok) + return status; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + FillRgn(graphics->hdc, hrgn, brush->gdibrush); + + RestoreDC(graphics->hdc, save_state); + + DeleteObject(hrgn); + + return Ok; } GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) @@ -2403,6 +2424,38 @@ FIXME("not implemented\n"); return NotImplemented; +} + +/***************************************************************************** + * GdipGetClipBounds [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics *graphics, GpRectF *rect) +{ + TRACE("(%p, %p)\n", graphics, rect); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipGetRegionBounds(graphics->clip, graphics, rect); +} + +/***************************************************************************** + * GdipGetClipBoundsI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics *graphics, GpRect *rect) +{ + TRACE("(%p, %p)\n", graphics, rect); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipGetRegionBoundsI(graphics->clip, graphics, rect); } /* FIXME: Compositing mode is not used anywhere except the getter/setter. */ @@ -3057,6 +3110,29 @@ return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); } +/***************************************************************************** + * GdipSetClipHrgn [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics *graphics, HRGN hrgn, CombineMode mode) +{ + GpRegion *region; + GpStatus status; + + TRACE("(%p, %p, %d)\n", graphics, hrgn, mode); + + if(!graphics) + return InvalidParameter; + + status = GdipCreateRegionHrgn(hrgn, &region); + if(status != Ok) + return status; + + status = GdipSetClipRegion(graphics, region, mode); + + GdipDeleteRegion(region); + return status; +} + GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics *graphics, GpPath *path, CombineMode mode) { TRACE("(%p, %p, %d)\n", graphics, path, mode); @@ -3318,3 +3394,35 @@ return NULL; } + +/***************************************************************************** + * GdipTranslateClip [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics *graphics, REAL dx, REAL dy) +{ + TRACE("(%p, %.2f, %.2f)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipTranslateRegion(graphics->clip, dx, dy); +} + +/***************************************************************************** + * GdipTranslateClipI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics *graphics, INT dx, INT dy) +{ + TRACE("(%p, %d, %d)\n", graphics, dx, dy); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipTranslateRegion(graphics->clip, (REAL)dx, (REAL)dy); +} Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -723,6 +723,17 @@ if(!path) return InvalidParameter; + /* on zero width/height only start point added */ + if(width <= 1e-7 || height <= 1e-7){ + if(!lengthen_path(path, 1)) + return OutOfMemory; + path->pathdata.Points[0].X = x + width / 2.0; + path->pathdata.Points[0].Y = y + height / 2.0; + path->pathdata.Types[0] = PathPointTypeStart | PathPointTypeCloseSubpath; + path->pathdata.Count = 1; + return InvalidParameter; + } + count = arc2polybezier(NULL, x, y, width, height, startAngle, sweepAngle); if(count == 0) Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -18,6 +18,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -427,6 +429,50 @@ NULL, bitmap); return ret; +} + +GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) +{ + HICON icon_copy; + ICONINFO iinfo; + PICTDESC desc; + + TRACE("%p, %p\n", hicon, bitmap); + + if(!bitmap || !GetIconInfo(hicon, &iinfo)) + return InvalidParameter; + + *bitmap = GdipAlloc(sizeof(GpBitmap)); + if(!*bitmap) return OutOfMemory; + + icon_copy = CreateIconIndirect(&iinfo); + + if(!icon_copy){ + GdipFree(*bitmap); + return InvalidParameter; + } + + desc.cbSizeofstruct = sizeof(PICTDESC); + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = icon_copy; + + if(OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, + (LPVOID*) &((*bitmap)->image.picture)) != S_OK){ + DestroyIcon(icon_copy); + GdipFree(*bitmap); + return GenericError; + } + + (*bitmap)->format = PixelFormat32bppARGB; + (*bitmap)->image.type = ImageTypeBitmap; + (*bitmap)->image.flags = ImageFlagsNone; + (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); + (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); + + DeleteObject(iinfo.hbmColor); + DeleteObject(iinfo.hbmMask); + + return Ok; } GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -567,15 +567,58 @@ return NotImplemented; } + +/****************************************************************************** + * GdipCreateRegionHrgn [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) { - FIXME("(%p, %p): stub\n", hrgn, region); - - if(!hrgn || !region) - return InvalidParameter; - - *region = NULL; - return NotImplemented; + union { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + } rdata; + DWORD size; + GpRectF rectf; + GpPath *path; + GpStatus stat; + + TRACE("(%p, %p)\n", hrgn, region); + + if(!region || !(size = GetRegionData(hrgn, 0, NULL))) + return InvalidParameter; + + if(size > sizeof(RGNDATAHEADER) + sizeof(RECT)){ + FIXME("Only simple rect regions supported.\n"); + *region = NULL; + return NotImplemented; + } + + if(!GetRegionData(hrgn, sizeof(rdata), &rdata.data)) + return GenericError; + + /* return empty region */ + if(IsRectEmpty(&rdata.data.rdh.rcBound)){ + stat = GdipCreateRegion(region); + if(stat == Ok) + GdipSetEmpty(*region); + return stat; + } + + rectf.X = (REAL)rdata.data.rdh.rcBound.left; + rectf.Y = (REAL)rdata.data.rdh.rcBound.top; + rectf.Width = (REAL)rdata.data.rdh.rcBound.right - rectf.X; + rectf.Height = (REAL)rdata.data.rdh.rcBound.bottom - rectf.Y; + + stat = GdipCreatePath(FillModeAlternate, &path); + if(stat != Ok) + return stat; + + GdipAddPathRectangle(path, rectf.X, rectf.Y, rectf.Width, rectf.Height); + + stat = GdipCreateRegionPath(path, region); + GdipDeletePath(path); + + return stat; } GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) @@ -591,18 +634,66 @@ return Ok; } +/***************************************************************************** + * GdipGetRegionBounds [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); - - return NotImplemented; -} - + HRGN hrgn; + RECT r; + GpStatus status; + + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!region || !graphics || !rect) + return InvalidParameter; + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + if(status != Ok) + return status; + + /* infinite */ + if(!hrgn){ + rect->X = rect->Y = -(REAL)(1 << 22); + rect->Width = rect->Height = (REAL)(1 << 23); + return Ok; + } + + if(!GetRgnBox(hrgn, &r)){ + DeleteObject(hrgn); + return GenericError; + } + + rect->X = r.left; + rect->Y = r.top; + rect->Width = r.right - r.left; + rect->Height = r.bottom - r.top; + + return Ok; +} + +/***************************************************************************** + * GdipGetRegionBoundsI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *region, GpGraphics *graphics, GpRect *rect) { - FIXME("(%p, %p, %p): stub\n", region, graphics, rect); - - return NotImplemented; + GpRectF rectf; + GpStatus status; + + TRACE("(%p, %p, %p)\n", region, graphics, rect); + + if(!rect) + return InvalidParameter; + + status = GdipGetRegionBounds(region, graphics, &rectf); + if(status == Ok){ + rect->X = roundr(rectf.X); + rect->Y = roundr(rectf.X); + rect->Width = roundr(rectf.Width); + rect->Height = roundr(rectf.Height); + } + + return status; } static inline void write_dword(DWORD* location, INT* offset, const DWORD write) @@ -963,12 +1054,39 @@ return Ok; } +/***************************************************************************** + * GdipIsEqualRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGraphics *graphics, BOOL *res) { - FIXME("(%p, %p, %p, %p): stub\n", region, region2, graphics, res); - - return NotImplemented; + HRGN hrgn1, hrgn2; + GpStatus stat; + + TRACE("(%p, %p, %p, %p)\n", region, region2, graphics, res); + + if(!region || !region2 || !graphics || !res) + return InvalidParameter; + + stat = GdipGetRegionHRgn(region, graphics, &hrgn1); + if(stat != Ok) + return stat; + stat = GdipGetRegionHRgn(region2, graphics, &hrgn2); + if(stat != Ok){ + DeleteObject(hrgn1); + return stat; + } + + *res = EqualRgn(hrgn1, hrgn2); + + /* one of GpRegions is infinite */ + if(*res == ERROR) + *res = (!hrgn1 && !hrgn2); + + DeleteObject(hrgn1); + DeleteObject(hrgn2); + + return Ok; } /***************************************************************************** @@ -1027,16 +1145,54 @@ return NotImplemented; } +/* Translates GpRegion elements with specified offsets */ +static void translate_region_element(region_element* element, REAL dx, REAL dy) +{ + INT i; + + switch(element->type) + { + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + return; + case RegionDataRect: + element->elementdata.rect.X += dx; + element->elementdata.rect.Y += dy; + return; + case RegionDataPath: + for(i = 0; i < element->elementdata.pathdata.path->pathdata.Count; i++){ + element->elementdata.pathdata.path->pathdata.Points[i].X += dx; + element->elementdata.pathdata.path->pathdata.Points[i].Y += dy; + } + return; + default: + translate_region_element(element->elementdata.combine.left, dx, dy); + translate_region_element(element->elementdata.combine.right, dx, dy); + return; + } +} + +/***************************************************************************** + * GdipTranslateRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *region, REAL dx, REAL dy) { - FIXME("(%p, %f, %f): stub\n", region, dx, dy); - - return NotImplemented; -} - + TRACE("(%p, %f, %f)\n", region, dx, dy); + + if(!region) + return InvalidParameter; + + translate_region_element(&region->node, dx, dy); + + return Ok; +} + +/***************************************************************************** + * GdipTranslateRegionI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *region, INT dx, INT dy) { - FIXME("(%p, %d, %d): stub\n", region, dx, dy); - - return NotImplemented; -} + TRACE("(%p, %d, %d)\n", region, dx, dy); + + return GdipTranslateRegion(region, (REAL)dx, (REAL)dy); +} Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfo… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -284,9 +284,12 @@ return Ok; } -GpStatus WINGDIPAPI GdipSetStringFormatFlags(GDIPCONST GpStringFormat *format, INT flags) -{ - FIXME("format (%p) flags (%d)\n", format, flags); +GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat *format, INT flags) +{ + if(!format) + return InvalidParameter; + + format->attr = flags; return Ok; } Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Sat Feb 14 02:14:34 2009 @@ -49,6 +49,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP, HPALETTE, GpBitmap**); +GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON, GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE,GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**); @@ -189,6 +190,8 @@ GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT); GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*); GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*); +GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics*,GpRectF*); +GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics*,GpRect*); GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*); @@ -221,6 +224,7 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder); +GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics*,HRGN,CombineMode); GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode); GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode); GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); @@ -239,6 +243,8 @@ GpPointF *, INT); GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace, GpPoint *, INT); +GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics*,REAL,REAL); +GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics*,INT,INT); GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder); /* GraphicsPath */ @@ -561,6 +567,7 @@ GpStringFormat*, INT, GDIPCONST CharacterRange*); GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat*,REAL,INT,GDIPCONST REAL*); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); +GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat*, INT); GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **); GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **);

16 years, 2 months

← Newer
1
...
19
20
21
22
23
24
25
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009