Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 39922: - fix glEdgeFlagPointe prototype - clean up opengl32.h a bit

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Mar 9 22:55:00 2009 New Revision: 39922 URL: http://svn.reactos.org/svn/reactos?rev=39922&view=rev Log: - fix glEdgeFlagPointe prototype - clean up opengl32.h a bit Modified: trunk/reactos/dll/win32/opengl32/glfuncs.h trunk/reactos/dll/win32/opengl32/opengl32.h Modified: trunk/reactos/dll/win32/opengl32/glfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/glfuncs… ============================================================================== --- trunk/reactos/dll/win32/opengl32/glfuncs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/glfuncs.h [iso-8859-1] Mon Mar 9 22:55:00 2009 @@ -86,7 +86,7 @@ X(glDrawElements, void, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices), (mode,count,type,indices), 311, 149, 16) \ X(glDrawPixels, void, (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels), (width,height,format,type,pixels), 257, -1, 20) \ X(glEdgeFlag, void, (GLboolean flag), (flag), 41, 35, 4) \ - X(glEdgeFlagPointer, void, (GLsizei stride, const GLboolean *pointer), (stride,pointer), 312, 150, 8) \ + X(glEdgeFlagPointer, void, (GLsizei stride, const GLvoid *pointer), (stride,pointer), 312, 150, 8) \ X(glEdgeFlagv, void, (const GLboolean *flag), (flag), 42, 36, 4) \ X(glEnable, void, (GLenum cap), (cap), 215, 117, 4) \ X(glEnableClientState, void, (GLenum array), (array), 313, 151, 4) \ Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.h [iso-8859-1] Mon Mar 9 22:55:00 2009 @@ -33,14 +33,13 @@ #define WIN32_LEAN_AND_MEAN #define WIN32_NO_STATUS #include <windows.h> - #include <winreg.h> #define NTOS_MODE_USER -#include <ddraw.h> -#include <ddrawi.h> #include <winddi.h> #include <ndk/ntndk.h> + +#include <GL/gl.h> /* gl function list */ #include "glfuncs.h" @@ -61,7 +60,6 @@ /* debug macros */ # ifdef DEBUG_OPENGL32 -ULONG DbgPrint(PCH Format,...); # include <debug.h> # define DBGPRINT( fmt, args... ) \ DPRINT( "OpenGL32.DLL: %s: "fmt"\n", __FUNCTION__, ##args ) @@ -106,27 +104,6 @@ #undef APIENTRY #endif /* APIENTRY */ #define APIENTRY EXPORT __stdcall - -/* gl function list */ -#include "glfuncs.h" - -/* GL data types - x86 typedefs */ -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef signed char GLbyte; -typedef short GLshort; -typedef int GLint; -typedef int GLsizei; -typedef unsigned char GLubyte; -typedef unsigned short GLushort; -typedef unsigned int GLuint; -typedef unsigned short GLhalf; -typedef float GLfloat; -typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; -typedef void GLvoid; /* Called by the driver to set the dispatch table */ typedef DWORD (WINAPI *SetContextCallBack)( const ICDTable * );

16 years, 4 months

[khornicek] 39921: - fix some prototypes, remove dxroslayer from dsound - sync dsound with wine head, it now works again (tested on win xp and reactos)

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Mar 9 22:46:37 2009 New Revision: 39921 URL: http://svn.reactos.org/svn/reactos?rev=39921&view=rev Log: - fix some prototypes, remove dxroslayer from dsound - sync dsound with wine head, it now works again (tested on win xp and reactos) Added: trunk/reactos/dll/directx/dsound/dsound_convert.c (with props) Removed: trunk/reactos/dll/directx/dsound/dxroslayer/ Modified: trunk/reactos/dll/directx/dsound/buffer.c trunk/reactos/dll/directx/dsound/capture.c trunk/reactos/dll/directx/dsound/dsound.c trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/directx/dsound/dsound_main.c trunk/reactos/dll/directx/dsound/dsound_private.h trunk/reactos/dll/directx/dsound/duplex.c trunk/reactos/dll/directx/dsound/mixer.c trunk/reactos/dll/directx/dsound/primary.c trunk/reactos/dll/directx/dsound/propset.c trunk/reactos/dll/directx/dsound/regsvr.c trunk/reactos/dll/directx/dsound/sound3d.c trunk/reactos/dll/directx/dsound/version.rc trunk/reactos/include/psdk/dsdriver.h trunk/reactos/include/psdk/dsound.h trunk/reactos/include/reactos/wine/mmsystem.h trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/dsound/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/buffer.… Modified: trunk/reactos/dll/directx/dsound/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/capture… Modified: trunk/reactos/dll/directx/dsound/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… Added: trunk/reactos/dll/directx/dsound/dsound_convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Modified: trunk/reactos/dll/directx/dsound/dsound_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Modified: trunk/reactos/dll/directx/dsound/dsound_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… Modified: trunk/reactos/dll/directx/dsound/duplex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/duplex.… Modified: trunk/reactos/dll/directx/dsound/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/mixer.c… Modified: trunk/reactos/dll/directx/dsound/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/primary… Modified: trunk/reactos/dll/directx/dsound/propset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/propset… Modified: trunk/reactos/dll/directx/dsound/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/regsvr.… Modified: trunk/reactos/dll/directx/dsound/sound3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/sound3d… Modified: trunk/reactos/dll/directx/dsound/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/version… Modified: trunk/reactos/include/psdk/dsdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsdriver.h?re… Modified: trunk/reactos/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=… Modified: trunk/reactos/include/reactos/wine/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mmsys… Modified: trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dxguid-ming…

16 years, 4 months

[khornicek] 39920: - fix the class name, vbox guest additions installer proceeds a bit further now

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Mar 9 22:34:37 2009 New Revision: 39920 URL: http://svn.reactos.org/svn/reactos?rev=39920&view=rev Log: - fix the class name, vbox guest additions installer proceeds a bit further now Modified: trunk/reactos/media/inf/audio.inf Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=39… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Mon Mar 9 22:34:37 2009 @@ -6,7 +6,7 @@ Signature = "$Windows NT$" ;Signature = "$ReactOS$" LayoutFile = layout.inf -Class = AUDIO +Class = MEDIA ClassGUID = {4d36e96c-e325-11ce-bfc1-08002be10318} Provider = %ReactOS% DriverVer = 10/19/1999,5.00.2157.1

16 years, 4 months

[khornicek] 39919: - fix logic, global mouse and keyboard hooks are supported, dinput now works again

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Mar 9 22:01:11 2009 New Revision: 39919 URL: http://svn.reactos.org/svn/reactos?rev=39919&view=rev Log: - fix logic, global mouse and keyboard hooks are supported, dinput now works again Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Mar 9 22:01:11 2009 @@ -1051,7 +1051,7 @@ Global = TRUE; } - if ( ( Global && (HookId != WH_KEYBOARD_LL || HookId != WH_MOUSE_LL) ) || + if ( ( Global && (HookId != WH_KEYBOARD_LL && HookId != WH_MOUSE_LL) ) || WH_DEBUG == HookId || WH_JOURNALPLAYBACK == HookId || WH_JOURNALRECORD == HookId)

16 years, 4 months

[fireball] 39918: - Fix wrong placement of KEYBOARD_DEVICE_EXTENSION structure. - Fix wrong include order. - Fixes build.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 9 21:49:47 2009 New Revision: 39918 URL: http://svn.reactos.org/svn/reactos?rev=39918&view=rev Log: - Fix wrong placement of KEYBOARD_DEVICE_EXTENSION structure. - Fix wrong include order. - Fixes build. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Mon Mar 9 21:49:47 2009 @@ -7,7 +7,6 @@ */ #include "usbdriver.h" -#include "kbdmou.h" NTSTATUS AddRegistryEntry(IN PCWSTR PortTypeName, Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h [iso-8859-1] Mon Mar 9 21:49:47 2009 @@ -1,5 +1,7 @@ #ifndef __KEYBOARD_H__ #define __KEYBOARD_H__ + +#include "kbdmou.h" typedef struct _KEYBOARD_DRVR_EXTENSION { @@ -17,6 +19,15 @@ struct _KEYBOARD_DEVICE_EXTENSION *device_ext; // back pointer } KEYBOARD_DRVR_EXTENSION, *PKEYBOARD_DRVR_EXTENSION; +typedef struct _KEYBOARD_DEVICE_EXTENSION +{ + DEVEXT_HEADER hdr; // mandatory header + PKEYBOARD_DRVR_EXTENSION DriverExtension; + KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicators; + CONNECT_DATA ConnectData; + PDEVICE_OBJECT Fdo; +} KEYBOARD_DEVICE_EXTENSION, *PKEYBOARD_DEVICE_EXTENSION; + BOOLEAN kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);

16 years, 4 months

[janderwald] 39917: - Disable message flood when playing audio files as it is very time critical and makes audio stutter - Free remaining irps and make sure that the dpc finished before stopping the audio stream. This fixing stuttering when there are too few audio buffers available. - Complete the IRPs when they are actually have played. This should make audio playback position become more accurate and prevents application to feed in too much audio buffers - VLC 0.9.8a can now playback audio fil

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Mar 9 21:05:56 2009 New Revision: 39917 URL: http://svn.reactos.org/svn/reactos?rev=39917&view=rev Log: - Disable message flood when playing audio files as it is very time critical and makes audio stutter - Free remaining irps and make sure that the dpc finished before stopping the audio stream. This fixing stuttering when there are too few audio buffers available. - Complete the IRPs when they are actually have played. This should make audio playback position become more accurate and prevents application to feed in too much audio buffers - VLC 0.9.8a can now playback audio files (no window is shown -> different issue) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/mmebuddy.rbuild Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] Mon Mar 9 21:05:56 2009 @@ -216,7 +216,7 @@ PDEVICE_OBJECT DeviceObject) { IIrpTarget * IrpTarget; - DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + //DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); IrpTarget = (IIrpTarget *)FileObject->FsContext2; 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] Mon Mar 9 21:05:56 2009 @@ -214,6 +214,8 @@ STDMETHOD_(BOOL, MinimumDataAvailable)(THIS); + STDMETHOD_(BOOL, CancelBuffers)(THIS); + }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Mon Mar 9 21:05:56 2009 @@ -85,7 +85,6 @@ DPRINT1("Freed %u Buffers / IRP Available Mappings %u\n", Count, This->NumMappings); } - NTSTATUS NTAPI IIrpQueue_fnQueryInterface( @@ -170,7 +169,7 @@ Mapping->Irp = Irp; Mapping->Next = NULL; - DPRINT1("FirstMap %p LastMap %p NumMappings %u\n", This->FirstMap, This->LastMap, This->NumMappings); + //DPRINT1("FirstMap %p LastMap %p NumMappings %u\n", This->FirstMap, This->LastMap, This->NumMappings); if (!This->FirstMap) This->FirstMap = Mapping; @@ -190,7 +189,7 @@ This->NumDataAvailable += Mapping->Header->DataUsed; - DPRINT1("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable); + DPRINT1("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); return STATUS_SUCCESS; } @@ -230,6 +229,9 @@ This->CurrentOffset = 0; Mapping = This->FirstMap; This->FirstMap = This->FirstMap->Next; + + if (!This->FirstMap) + This->LastMap = NULL; This->FreeCount++; @@ -245,8 +247,7 @@ This->NumDataAvailable -= Mapping->Header->DataUsed; - if ((This->FreeDataSize > This->DataFormat->WaveFormatEx.nAvgBytesPerSec || This->FreeCount > 25) && - This->DpcActive == FALSE) + if (This->FreeCount > 5 && This->DpcActive == FALSE) { Mapping = This->FreeMapHead; This->FreeMapHead = NULL; @@ -292,7 +293,34 @@ return Result; } - +BOOL +NTAPI +IIrpQueue_fnCancelBuffers( + IN IIrpQueue *iface) +{ + PIRP_MAPPING Mapping; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + if (This->DpcActive) + return FALSE; + + ASSERT(This->FirstMap == NULL); + ASSERT(This->LastMap == NULL); + + if (This->FreeMapHead == NULL) + { + ASSERT(This->FreeMapTail == NULL); + This->FreeMapTail = NULL; + return TRUE; + } + + Mapping = This->FreeMapHead; + This->FreeMapHead = NULL; + This->FreeMapTail = NULL; + This->DpcActive = TRUE; + KeInsertQueueDpc(&This->Dpc, (PVOID)Mapping, NULL); + return FALSE; +} static IIrpQueueVtbl vt_IIrpQueue = { @@ -305,7 +333,8 @@ IIrpQueue_fnUpdateMapping, IIrpQueue_fnNumMappings, IIrpQueue_fnMinMappings, - IIrpQueue_fnMinimumDataAvailable + IIrpQueue_fnMinimumDataAvailable, + IIrpQueue_fnCancelBuffers }; Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Mon Mar 9 21:05:56 2009 @@ -26,7 +26,6 @@ ULONG ActiveIrpBufferSize; ULONG ActiveIrpOffset; ULONG DelayedRequestInProgress; - ULONG RetryCount; ULONG FrameSize; }IPortPinWaveCyclicImpl; @@ -176,20 +175,19 @@ Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); if (!NT_SUCCESS(Status)) { - This->RetryCount++; - if (This->RetryCount > 30) + if (!This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue)) { - DPRINT1("Stopping %u\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); - This->RetryCount = 0; - This->State = KSSTATE_STOP; + /* there is an active dpc pending + * wait untill this dpc is done, in order to complete the remaining irps + */ return; } - DPRINT("IServiceSink_fnRequestService> Waiting for mapping\n"); - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + DPRINT1("Stopping %u\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); + + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); + This->State = KSSTATE_PAUSE; return; } - This->RetryCount = 0; if (KeGetCurrentIrql() == DISPATCH_LEVEL) return; @@ -381,6 +379,7 @@ if (This->Stream) { + This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue); This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); This->State = KSSTATE_STOP; @@ -653,13 +652,13 @@ PIRP Irp; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - DPRINT1("IPortPinWaveCyclic_fnFastWrite entered\n"); + //DPRINT1("IPortPinWaveCyclic_fnFastWrite entered\n"); Packet = (PCONTEXT_WRITE)Buffer; - //if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)) - // Irp = Packet->Irp; - //else + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)) + Irp = Packet->Irp; + else Irp = NULL; Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); @@ -678,7 +677,7 @@ if (!Irp) { - DPRINT1("Completing Irp %p\n", Packet->Irp); + //DPRINT1("Completing Irp %p\n", Packet->Irp); Packet->Irp->IoStatus.Status = STATUS_SUCCESS; Packet->Irp->IoStatus.Information = Packet->Header.DataUsed; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Mon Mar 9 21:05:56 2009 @@ -650,7 +650,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("WdmAudWrite entered\n"); + //DPRINT("WdmAudWrite entered\n"); if (IoStack->Parameters.Write.Length < sizeof(WDMAUD_DEVICE_INFO)) { @@ -670,7 +670,7 @@ } - DPRINT1("DeviceInfo %p %p %p\n", DeviceInfo, Irp->MdlAddress->StartVa, Irp->MdlAddress->MappedSystemVa); + //DPRINT("DeviceInfo %p %p %p\n", DeviceInfo, Irp->MdlAddress->StartVa, Irp->MdlAddress->MappedSystemVa); if (DeviceInfo->DeviceType < MIN_SOUND_DEVICE_TYPE || DeviceInfo->DeviceType > MAX_SOUND_DEVICE_TYPE) { /* invalid parameter */ @@ -735,7 +735,5 @@ return IoStatusBlock.Status; - - //return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); -} - +} + Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Mar 9 21:05:56 2009 @@ -218,7 +218,8 @@ { PDISPATCH_CONTEXT Context; NTSTATUS Status; - DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + + //DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); Context = (PDISPATCH_CONTEXT)FileObject->FsContext2; Status = KsStreamIo(Context->FileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); 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] Mon Mar 9 21:05:56 2009 @@ -56,7 +56,7 @@ { \ if ( ! ( condition ) ) \ { \ - SND_ERR(L"ASSERT FAILED: %hS\n", #condition); \ + SND_ERR(L"ASSERT FAILED: %hS File %hS Line %u\n", #condition, __FILE__, __LINE__); \ POPUP(L"ASSERT FAILED: %hS\n", #condition); \ ExitProcess(1); \ } \ @@ -80,6 +80,7 @@ #define SND_WARN(...) do {} while ( 0 ) #define SND_TRACE(...) do {} while ( 0 ) #define SND_ASSERT(condition) do {} while ( 0 ) + #define DUMP_WAVEHDR_QUEUE(condition) do {} while ( 0 ) #endif /* Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Mon Mar 9 21:05:56 2009 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="mmebuddy" type="staticlibrary" allowwarnings="false" unicode="yes"> <include base="ReactOS">include/reactos/libs/sound</include> - <define name="DEBUG_NT4">1</define> + <define name="NDEBUG">1</define> <file>capabilities.c</file> <file>devicelist.c</file> <file>deviceinstance.c</file>

16 years, 4 months

[dgoette] 39916: * convert templates, instead of just change type * load backends of current instance instead of roscms master * show language selection in user interface again * minor adjustments

by dgoette＠svn.reactos.org

Author: dgoette Date: Mon Mar 9 19:55:04 2009 New Revision: 39916 URL: http://svn.reactos.org/svn/reactos?rev=39916&view=rev Log: * convert templates, instead of just change type * load backends of current instance instead of roscms master * show language selection in user interface again * minor adjustments Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -323,7 +323,7 @@ -- -------------------------------------------------------- CREATE TABLE roscms_entries ( id bigint(20) unsigned NOT NULL auto_increment, - type enum('page','content','dynamic','script','system') collate utf8_unicode_ci NOT NULL, + type enum('page','content','dynamic','script','system', 'template') collate utf8_unicode_ci NOT NULL, name varchar(64) collate utf8_unicode_ci NOT NULL, access_id bigint(20) unsigned COMMENT '->access(id)', old_id int(11) NOT NULL, @@ -343,16 +343,7 @@ s.id, d.data_id, TRUE -FROM data_a d JOIN roscms_entries_access s ON d.data_acl=s.name_short WHERE data_type != 'template' -UNION -SELECT - NULL, - 'content', - d.data_name, - s.id, - d.data_id, - TRUE -FROM data_a d JOIN roscms_entries_access s ON d.data_acl=s.name_short WHERE data_type = 'template' +FROM data_a d JOIN roscms_entries_access s ON d.data_acl=s.name_short UNION SELECT NULL, @@ -361,16 +352,7 @@ s.id, d.data_id, FALSE -FROM data_ d JOIN roscms_entries_access s ON d.data_acl=s.name_short WHERE data_type != 'template' -UNION -SELECT - NULL, - 'template', - d.data_name, - s.id, - d.data_id, - FALSE -FROM data_ d JOIN roscms_entries_access s ON d.data_acl=s.name_short WHERE data_type = 'template'; +FROM data_ d JOIN roscms_entries_access s ON d.data_acl=s.name_short; @@ -725,12 +707,37 @@ -- -------------------------------------------------------- +-- convert templates +-- -------------------------------------------------------- +INSERT INTO roscms_entries_tags +SELECT + NULL, + r.id, + -1, + 'kind', + 'template' +FROM roscms_entries d +JOIN roscms_entries_revisions r ON r.data_id=d.id +WHERE d.type = 'template'; + +-- remove from texts +UPDATE roscms_entries_text +SET content = REPLACE(content, '[#templ_', '[#cont_'); + +-- update entries +UPDATE roscms_entries +SET type = 'content' WHERE type ='template'; + + + +-- -------------------------------------------------------- -- remove converter specific fields -- -------------------------------------------------------- ALTER TABLE roscms_entries DROP old_id, DROP old_archive, - ADD UNIQUE KEY type_name ( type , name ); + ADD UNIQUE KEY type_name ( type , name ), + CHANGE `type` `type` ENUM( 'page', 'content', 'dynamic', 'script', 'system' ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; ALTER TABLE roscms_entries_revisions DROP old_id; ALTER TABLE roscms_entries_access DROP name_short; Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -1053,7 +1053,7 @@ if (kind === 'POST') { var parameters = getFormData(); - http_request.open('POST', url, true); + http_request.open('POST', roscms_intern_link+url, true); http_request.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); http_request.setRequestHeader("Content-length", parameters.length); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache @@ -1061,7 +1061,7 @@ http_request.send(parameters); } else { - http_request.open('GET', url, true); + http_request.open('GET', roscms_intern_link+url, true); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache http_request.send(null); } Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -1510,7 +1510,7 @@ }; // internal function end if (kind === 'POST') { - http_request.open('POST', roscms_intern_webserver_roscms+url, true); + http_request.open('POST', roscms_intern_link+url, true); http_request.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); http_request.setRequestHeader("Content-length", parameters.length); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache @@ -1518,7 +1518,7 @@ http_request.send(parameters); } else { - http_request.open('GET', roscms_intern_webserver_roscms+url, true); + http_request.open('GET', roscms_intern_link+url, true); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache http_request.send(null); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -133,7 +133,7 @@ // print current language $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id = :lang_id"); - $stmt->bindParam('lang_id',$_GET['lang'],PDO::PARAM_INT); + $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); $stmt->execute(); $current_lang = $stmt->fetchOnce(PDO::FETCH_ASSOC); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -55,7 +55,7 @@ private $limit_password_max = 50; private $system_brand = 'RosCMS 4'; - private $system_version = '4.0.0 alpha'; + private $system_version = '4.0.0 beta'; private $applied = false; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Maintain.cla… [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -69,6 +69,7 @@ <script type="text/javascript"> <!--'." var roscms_intern_webserver_roscms = '".RosCMS::getInstance()->pathRosCMS()."'; + var roscms_intern_link = '".RosCMS::getInstance()->pathInstance()."'; // access restrictions var roscms_access = new Object(); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_CMS_Website.clas… [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -95,7 +95,7 @@ var roscms_standard_language = '".Language::getStandardId()."'; var roscms_intern_login_check_username = '".$thisuser->name()."'; var roscms_intern_webserver_roscms = '".RosCMS::getInstance()->pathRosCMS()."'; - var roscms_intern_page_link = '".RosCMS::getInstance()->pathInstance()."?page='; + var roscms_intern_link = '".RosCMS::getInstance()->pathInstance()."'; var roscms_get_edit = '".(isset($_GET['edit']) ? $_GET['edit'] : '')."'; // access restrictions Modified: branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/roscms_instance_example.php [iso-8859-1] Mon Mar 9 19:55:04 2009 @@ -40,7 +40,8 @@ /////////////////////////////////////////////////////// // Config start /////////////////////////////////////// - + +// use this settings to force that the user has to login seperatly from original roscms $config->setCookieUserKey('roscmsusrkey'); // session key $config->setCookieUserName('roscmsusrname'); // user_name $config->setCookiePassword('rospassword'); // user_password (used for keep login function) @@ -55,11 +56,14 @@ // RosCMS Table Names -$config->setTable('ROSCMST_ENTRIES' , 'roscms_entries'); -$config->setTable('ROSCMST_REVISIONS' , 'roscms_entries_revisions'); -$config->setTable('ROSCMST_STEXT' , 'roscms_entries_stext'); -$config->setTable('ROSCMST_TAGS' , 'roscms_entries_tags'); -$config->setTable('ROSCMST_TEXT' , 'roscms_entries_text'); +$config->setTable('ROSCMST_ENTRIES' , 'other_entries'); +$config->setTable('ROSCMST_DEPENDENCIES' , 'other_rel_revisions_dependencies'); +$config->setTable('ROSCMST_REVISIONS' , 'other_entries_revisions'); +$config->setTable('ROSCMST_STEXT' , 'other_entries_stext'); +$config->setTable('ROSCMST_TAGS' , 'other_entries_tags'); +$config->setTable('ROSCMST_TEXT' , 'other_entries_text'); + +// see config.php in original RosCMS for more possible settings // Config end ///////////////////////////////////////// ///////////////////////////////////////////////////////

16 years, 4 months

[janderwald] 39915: - Register default sound schemes when an new audio adapter is installed - Pass the full filename to PlaySound as the sound might not be in standard location

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Mar 9 14:51:28 2009 New Revision: 39915 URL: http://svn.reactos.org/svn/reactos?rev=39915&view=rev Log: - Register default sound schemes when an new audio adapter is installed - Pass the full filename to PlaySound as the sound might not be in standard location Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Mon Mar 9 14:51:28 2009 @@ -30,6 +30,62 @@ HWPD_MAX = HWPD_LARGELIST } HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; +typedef struct +{ + LPWSTR LabelName; + LPWSTR DefaultName; + UINT LocalizedResId; + LPWSTR FileName; +}EVENT_LABEL_ITEM; + +typedef struct +{ + LPWSTR LabelName; + LPWSTR DefaultName; + UINT IconId; +}SYSTEM_SCHEME_ITEM; + +static EVENT_LABEL_ITEM EventLabels[] = +{ + { + L"WindowsLogon", + L"ReactOS Logon", + IDS_REACTOS_LOGON, + L"ReactOS_Logon.wav" + }, + { + L"WindowsLogoff", + L"ReactOS Logoff", + IDS_REACTOS_LOGOFF, + L"ReactOS_Logoff.wav" + }, + { + NULL, + NULL, + 0, + NULL + } +}; + +static SYSTEM_SCHEME_ITEM SystemSchemes[] = +{ + { + L".Default", + L"ReactOS Standard", + IDS_REACTOS_DEFAULT_SCHEME + }, + { + L".None", + L"No Sounds", + -1 + }, + { + NULL, + NULL + } +}; + + HWND WINAPI DeviceCreateHardwarePageEx(HWND hWndParent, LPGUID lpGuids, @@ -155,6 +211,127 @@ { DPRINT1("ShowFullControlPanel() stubs\n"); } + +VOID +InstallSystemSoundLabels(HKEY hKey) +{ + UINT i = 0; + HKEY hSubKey; + WCHAR Buffer[40]; + + do + { + if (RegCreateKeyExW(hKey, EventLabels[i].LabelName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueExW(hSubKey, NULL, 0, REG_SZ, (LPBYTE)EventLabels[i].DefaultName, (wcslen(EventLabels[i].DefaultName)+1) * sizeof(WCHAR)); + swprintf(Buffer, L"@mmsys.cpl,-%u", EventLabels[i].LocalizedResId); + RegSetValueExW(hSubKey, L"DispFileName", 0, REG_SZ, (LPBYTE)Buffer, (wcslen(Buffer)+1) * sizeof(WCHAR)); + + RegCloseKey(hSubKey); + } + i++; + }while(EventLabels[i].LabelName); +} + +VOID +InstallSystemSoundSchemeNames(HKEY hKey) +{ + UINT i = 0; + HKEY hSubKey; + + do + { + if (RegCreateKeyExW(hKey, SystemSchemes[i].LabelName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueExW(hSubKey, NULL, 0, REG_SZ, (LPBYTE)SystemSchemes[i].DefaultName, (wcslen(SystemSchemes[i].DefaultName)+1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + i++; + }while(SystemSchemes[i].LabelName); +} + +VOID +InstallDefaultSystemSoundScheme(HKEY hRootKey) +{ + HKEY hKey, hSubKey; + WCHAR Path[MAX_PATH]; + UINT i = 0; + + if (RegCreateKeyExW(hRootKey, L".Default", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL) != ERROR_SUCCESS) + return; + + RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)SystemSchemes[0].DefaultName, (wcslen(SystemSchemes[0].DefaultName)+1) * sizeof(WCHAR)); + swprintf(Path, L"@mmsys.cpl,-%u", SystemSchemes[0].IconId); + RegSetValueExW(hKey, L"DispFileName", 0, REG_SZ, (LPBYTE)Path, (wcslen(Path)+1) * sizeof(WCHAR)); + + do + { + if (RegCreateKeyExW(hKey, EventLabels[i].LabelName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + HKEY hScheme; + + swprintf(Path, L"%%SystemRoot%%\\media\\%s", EventLabels[i].FileName); + if (RegCreateKeyExW(hSubKey, L".Current", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hScheme, NULL) == ERROR_SUCCESS) + { + RegSetValueExW(hScheme, NULL, 0, REG_SZ, (LPBYTE)Path, (wcslen(Path)+1) * sizeof(WCHAR)); + RegCloseKey(hScheme); + } + + if (RegCreateKeyExW(hSubKey, L".Default", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hScheme, NULL) == ERROR_SUCCESS) + { + RegSetValueExW(hScheme, NULL, 0, REG_SZ, (LPBYTE)Path, (wcslen(Path)+1) * sizeof(WCHAR)); + RegCloseKey(hScheme); + } + RegCloseKey(hSubKey); + } + i++; + }while(EventLabels[i].LabelName); + + RegCloseKey(hKey); +} + + +VOID +InstallSystemSoundScheme() +{ + HKEY hKey, hSubKey; + DWORD dwDisposition; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"AppEvents", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL) != ERROR_SUCCESS) + return; + + if (RegCreateKeyExW(hKey, L"EventLabels", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + InstallSystemSoundLabels(hSubKey); + RegCloseKey(hSubKey); + } + + if (RegCreateKeyExW(hKey, L"Schemes", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hSubKey, &dwDisposition) == ERROR_SUCCESS) + { + HKEY hNames; + + if (RegCreateKeyExW(hSubKey, L"Names", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hNames, NULL) == ERROR_SUCCESS) + { + InstallSystemSoundSchemeNames(hNames); + RegCloseKey(hNames); + } + + if (RegCreateKeyExW(hSubKey, L"Apps", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hNames, NULL) == ERROR_SUCCESS) + { + InstallDefaultSystemSoundScheme(hNames); + RegCloseKey(hNames); + if (dwDisposition & REG_CREATED_NEW_KEY) + { + RegSetValueExW(hSubKey, NULL, 0, REG_SZ, (LPBYTE)L".Default", (wcslen(L".Default")+1) * sizeof(WCHAR)); //FIXME + } + } + + RegCloseKey(hSubKey); + } + + RegCloseKey(hKey); +} + DWORD MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) @@ -263,6 +440,7 @@ } RegCloseKey(hKey); } + InstallSystemSoundScheme(); return ERROR_DI_DO_DEFAULT; Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] Mon Mar 9 14:51:28 2009 @@ -66,6 +66,11 @@ #define IDC_SPEAKIMG 4625 #define IDC_MUTE_ICON 4626 +#define IDS_REACTOS_LOGON 5853 +#define IDS_REACTOS_LOGOFF 5852 +#define IDS_REACTOS_DEFAULT_SCHEME 5856 + + /* Strings */ #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Mon Mar 9 14:51:28 2009 @@ -826,15 +826,17 @@ case IDC_PLAY_SOUND: { LRESULT lIndex; - TCHAR szValue[MAX_PATH]; - lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); if (lIndex == CB_ERR) { break; } - SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETLBTEXT, (WPARAM)lIndex, (LPARAM)szValue); - PlaySound(szValue, NULL, SND_FILENAME); + + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lIndex != CB_ERR) + { + PlaySound((TCHAR*)lIndex, NULL, SND_FILENAME); + } break; } case IDC_SOUND_SCHEME:

16 years, 4 months

[fireball] 39914: - Move USB keyboard LEDs managing code into an own function.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 9 13:11:24 2009 New Revision: 39914 URL: http://svn.reactos.org/svn/reactos?rev=39914&view=rev Log: - Move USB keyboard LEDs managing code into an own function. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Mon Mar 9 13:11:24 2009 @@ -18,7 +18,6 @@ BOOLEAN kbd_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN kbd_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); VOID kbd_irq(PURB purb, PVOID pcontext); -VOID kbd_led(PURB purb, PVOID pcontext); static NTSTATUS KeyboardCreateDevice(IN PDRIVER_OBJECT DriverObject, IN PKEYBOARD_DRVR_EXTENSION DriverExtension); void * memscan(void * addr, int c, size_t size); @@ -130,7 +129,6 @@ PKEYBOARD_DRVR_EXTENSION pdev_ext; PUSB_ENDPOINT_DESC pendp_desc = NULL; ULONG MaxPacketSize; - PUSB_CTRL_SETUP_PACKET psetup; usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): entering...\n")); @@ -183,41 +181,6 @@ purb = NULL; } - // Set LEDs request - purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); - if (purb == NULL) return FALSE; - RtlZeroMemory(purb, sizeof(URB)); - - pdev_ext->leds_old = 0; - pdev_ext->leds = 7; - - // Build a URB for setting LEDs - psetup = (PUSB_CTRL_SETUP_PACKET) (purb)->setup_packet; - urb_init((purb)); - - purb->endp_handle = usb_make_handle((dev_handle >> 16), 0, 0) | 0xffff; - purb->data_buffer = &pdev_ext->leds; - purb->data_length = 1; - purb->completion = NULL; - purb->context = NULL; - purb->reference = (LONG)pdrvr; - psetup->bmRequestType = USB_DT_HID; - psetup->bRequest = USB_REQ_SET_CONFIGURATION; - psetup->wValue = USB_DT_CONFIG << 8; - psetup->wIndex = param->if_desc->bInterfaceNumber; - psetup->wLength = 1; - - // Call USB driver stack - status = usb_submit_urb(pdev_ext->dev_mgr, purb); - if (status != STATUS_PENDING) - { - usb_free_mem(purb); - purb = NULL; - } - - usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): leds urb status 0x%x, Interface number %d\n", - status, param->if_desc->bInterfaceNumber)); - return TRUE; } @@ -362,7 +325,43 @@ VOID kbd_setleds(PKEYBOARD_DEVICE_EXTENSION DeviceExtension) { - //DPRINT("%x\n", DevExt->KeyboardIndicators.LedFlags); + PURB Urb; + PUSB_CTRL_SETUP_PACKET Setup; + NTSTATUS Status; + + // Set LEDs request + Urb = usb_alloc_mem(NonPagedPool, sizeof(URB)); + if (!Urb) return; + RtlZeroMemory(Urb, sizeof(URB)); + + DeviceExtension->DriverExtension->leds_old = 0; + DeviceExtension->DriverExtension->leds = 7; + + // Convert from LedFlags to USB format + //DeviceExtension->KeyboardIndicators.LedFlags + + // Build a URB for setting LEDs + Setup = (PUSB_CTRL_SETUP_PACKET)Urb->setup_packet; + urb_init((Urb)); + + Urb->endp_handle = usb_make_handle((DeviceExtension->DriverExtension->dev_handle >> 16), 0, 0) | 0xffff; + Urb->data_buffer = &DeviceExtension->DriverExtension->leds; + Urb->data_length = 1; + Urb->completion = NULL; + Urb->context = NULL; + Urb->reference = 0; + Setup->bmRequestType = USB_DT_HID; + Setup->bRequest = USB_REQ_SET_CONFIGURATION; + Setup->wValue = USB_DT_CONFIG << 8; + Setup->wIndex = 0; + Setup->wLength = 1; + + // Call USB driver stack + Status = usb_submit_urb(DeviceExtension->DriverExtension->dev_mgr, Urb); + if (Status != STATUS_PENDING) + { + usb_free_mem(Urb); + } } // Dispatch routine for our IRPs

16 years, 4 months

[fireball] 39913: - Major cleanup of USB keyboard driver: * Remove huge hack, which is not needed anymore since 39912. * Put all global variables into device extension, allowing support for more than one USB keyboard. * Cleanup driver extension structure. * Remove unneeded endpoint finding code. - Add test code for LEDs support (now puts three of them into ON state).

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 9 13:04:40 2009 New Revision: 39913 URL: http://svn.reactos.org/svn/reactos?rev=39913&view=rev Log: - Major cleanup of USB keyboard driver: * Remove huge hack, which is not needed anymore since 39912. * Put all global variables into device extension, allowing support for more than one USB keyboard. * Cleanup driver extension structure. * Remove unneeded endpoint finding code. - Add test code for LEDs support (now puts three of them into ON state). Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Mon Mar 9 13:04:40 2009 @@ -9,11 +9,6 @@ #include "usbdriver.h" #include "kbdmou.h" -/* Data for embedded drivers */ -CONNECT_DATA KbdClassInformation; - -PDEVICE_OBJECT KeyboardFdo = NULL; - NTSTATUS AddRegistryEntry(IN PCWSTR PortTypeName, IN PUNICODE_STRING DeviceName, @@ -23,8 +18,9 @@ BOOLEAN kbd_disconnect(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); BOOLEAN kbd_stop(PUSB_DEV_MANAGER dev_mgr, DEV_HANDLE dev_handle); VOID kbd_irq(PURB purb, PVOID pcontext); +VOID kbd_led(PURB purb, PVOID pcontext); static NTSTATUS -KeyboardCreateDevice(IN PDRIVER_OBJECT DriverObject); +KeyboardCreateDevice(IN PDRIVER_OBJECT DriverObject, IN PKEYBOARD_DRVR_EXTENSION DriverExtension); void * memscan(void * addr, int c, size_t size); static UCHAR usb_kbd_keycode[256] = @@ -47,6 +43,18 @@ 150,158,159,128,136,177,178,176,142,152,173,140 }; +/* This structure starts with the same layout as KEYBOARD_INDICATOR_TRANSLATION */ +typedef struct _LOCAL_KEYBOARD_INDICATOR_TRANSLATION { + USHORT NumberOfIndicatorKeys; + INDICATOR_LIST IndicatorList[3]; +} LOCAL_KEYBOARD_INDICATOR_TRANSLATION, *PLOCAL_KEYBOARD_INDICATOR_TRANSLATION; + +static LOCAL_KEYBOARD_INDICATOR_TRANSLATION IndicatorTranslation = { 3, { + {0x3A, KEYBOARD_CAPS_LOCK_ON}, + {0x45, KEYBOARD_NUM_LOCK_ON}, + {0x46, KEYBOARD_SCROLL_LOCK_ON}}}; + + BOOLEAN kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) { @@ -61,8 +69,8 @@ pdriver->driver_desc.product_id = 0xffff; // USB Product ID. pdriver->driver_desc.release_num = 0x100; // Release Number of Device - pdriver->driver_desc.config_val = 1; // Configuration Value - pdriver->driver_desc.if_num = 1; // Interface Number + pdriver->driver_desc.config_val = 0; // Configuration Value + pdriver->driver_desc.if_num = 0; // Interface Number pdriver->driver_desc.if_class = USB_CLASS_HID; // Interface Class pdriver->driver_desc.if_sub_class = 1; // Interface SubClass pdriver->driver_desc.if_protocol = 1; // Interface Protocol @@ -85,11 +93,8 @@ pdriver->disp_tbl.dev_stop = kbd_stop; pdriver->disp_tbl.dev_reserved = NULL; - // Zero out the class information structure - RtlZeroMemory(&KbdClassInformation, sizeof(CONNECT_DATA)); - // Create the device - KeyboardCreateDevice(dev_mgr->usb_driver_obj); + KeyboardCreateDevice(dev_mgr->usb_driver_obj, pdrvr_ext); usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_driver_init(): keyboard driver is initialized\n")); return TRUE; @@ -123,102 +128,41 @@ PUSB_DRIVER pdrvr; PUSB_DEV pdev; PKEYBOARD_DRVR_EXTENSION pdev_ext; -// LONG i; PUSB_ENDPOINT_DESC pendp_desc = NULL; ULONG MaxPacketSize; + PUSB_CTRL_SETUP_PACKET psetup; usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): entering...\n")); dev_mgr = param->dev_mgr; pdrvr = param->pdriver; pdev_ext = (PKEYBOARD_DRVR_EXTENSION)pdrvr->driver_ext; + pdev_ext->dev_handle = dev_handle; // Lock USB Device status = usb_query_and_lock_dev(dev_mgr, dev_handle, &pdev); if (status != STATUS_SUCCESS) { - //usb_free_mem(desc_buf); usb_dbg_print(DBGLVL_MEDIUM, ("kbd_connect(): unable to query&lock device, status=0x%x\n", status)); return FALSE; } - // Endpoint-finding code - if (param->if_desc) - { - // Get a pointer to the config packet from compdev - PUCHAR Buffer = (PUCHAR)param->if_desc; - ULONG Offset = 0; - BOOLEAN FoundEndpoint = FALSE; - - // Find our the only needed endpoint descriptor - while (Offset < 512) - { - pendp_desc = (PUSB_ENDPOINT_DESC)&Buffer[Offset]; - usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): DescType=0x%x, Attrs=0x%x, Len=%d\n", - pendp_desc->bDescriptorType, pendp_desc->bmAttributes, pendp_desc->bLength)); - - if (pendp_desc->bDescriptorType == USB_DT_ENDPOINT && - pendp_desc->bLength == sizeof(USB_ENDPOINT_DESC)) - { - // Found it - FoundEndpoint = TRUE; - break; - } - - Offset += pendp_desc->bLength; - } - - if (!FoundEndpoint) - return FALSE; - - // FIXME: Check if it's INT endpoint - // (pendp_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) - - // endpoint must be IN - if ((pendp_desc->bEndpointAddress & USB_DIR_IN) == 0) - return FALSE; - - usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): FoundEndpoint=%d\n", FoundEndpoint)); - } - - // Endpoint descriptor substitution code - { - ULONG if_idx, endp_idx; - PUSB_ENDPOINT pendp; - - //FoundEndpoint = FALSE; - for(if_idx = 0; if_idx < MAX_INTERFACES_PER_CONFIG /*pdev->usb_config->if_count*/; if_idx++) - { - for(endp_idx = 0; endp_idx < MAX_ENDPS_PER_IF /*pdev->usb_config->interf[if_idx].endp_count*/; endp_idx++) - { - pendp = &pdev->usb_config->interf[if_idx].endp[endp_idx]; - - if (pendp->pusb_endp_desc != NULL) - { - //HACKHACK: for some reason this usb driver chooses different and completely wrong - // endpoint. Since I don't have time to research this, I just find the - // endpoint descriptor myself and copy it - memcpy(pendp->pusb_endp_desc, pendp_desc, pendp_desc->bLength); - - usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): [%i][%i] DescType=0x%x, Attrs=0x%x, Len=%d\n",if_idx, endp_idx, - pendp->pusb_endp_desc->bDescriptorType, pendp->pusb_endp_desc->bmAttributes, pendp->pusb_endp_desc->bLength)); - } - } - } - } + // Get pointer to the endpoint descriptor + pendp_desc = pdev->usb_config->interf[0].endp[0].pusb_endp_desc; + + // Store max packet size + MaxPacketSize = pendp_desc->wMaxPacketSize; + if (MaxPacketSize > 8) + MaxPacketSize = 8; // Unlock USB Device usb_unlock_dev(pdev); - // Send URB + // Send interrupt URB purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); if (purb == NULL) return FALSE; RtlZeroMemory(purb, sizeof(URB)); - - MaxPacketSize = pendp_desc->wMaxPacketSize; - if (MaxPacketSize > 8) - MaxPacketSize = 8; RtlZeroMemory(pdev_ext->kbd_old, 8); @@ -228,7 +172,7 @@ (PUCHAR)&pdev_ext->kbd_data, MaxPacketSize, //use max packet size kbd_irq, - pdev_ext, + pdev_ext->device_ext, 0); // Call USB driver stack @@ -239,19 +183,54 @@ purb = NULL; } + // Set LEDs request + purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); + if (purb == NULL) return FALSE; + RtlZeroMemory(purb, sizeof(URB)); + + pdev_ext->leds_old = 0; + pdev_ext->leds = 7; + + // Build a URB for setting LEDs + psetup = (PUSB_CTRL_SETUP_PACKET) (purb)->setup_packet; + urb_init((purb)); + + purb->endp_handle = usb_make_handle((dev_handle >> 16), 0, 0) | 0xffff; + purb->data_buffer = &pdev_ext->leds; + purb->data_length = 1; + purb->completion = NULL; + purb->context = NULL; + purb->reference = (LONG)pdrvr; + psetup->bmRequestType = USB_DT_HID; + psetup->bRequest = USB_REQ_SET_CONFIGURATION; + psetup->wValue = USB_DT_CONFIG << 8; + psetup->wIndex = param->if_desc->bInterfaceNumber; + psetup->wLength = 1; + + // Call USB driver stack + status = usb_submit_urb(pdev_ext->dev_mgr, purb); + if (status != STATUS_PENDING) + { + usb_free_mem(purb); + purb = NULL; + } + + usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_connect(): leds urb status 0x%x, Interface number %d\n", + status, param->if_desc->bInterfaceNumber)); + return TRUE; } VOID kbd_irq(PURB purb, PVOID pcontext) { - KEYBOARD_INPUT_DATA KeyboardInputData[10]; + KEYBOARD_INPUT_DATA KeyboardInputData[20]; ULONG DataPrepared=0, DataConsumed, i; UCHAR ScanCode; NTSTATUS status; - PKEYBOARD_DRVR_EXTENSION pdev_ext = (PKEYBOARD_DRVR_EXTENSION)pcontext; - PUCHAR data = pdev_ext->kbd_data; - PUCHAR data_old = pdev_ext->kbd_old; + PKEYBOARD_DRVR_EXTENSION pdev_ext; + PKEYBOARD_DEVICE_EXTENSION DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)pcontext; + PUCHAR data, data_old; usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_irq(): called\n")); ASSERT(purb); @@ -259,8 +238,12 @@ if (purb->status != STATUS_SUCCESS) { usb_dbg_print(DBGLVL_MAXIMUM, ("kbd_irq(): purb->status 0x%08X\n", purb->status)); - //return; - } + return; + } + + pdev_ext = DeviceExtension->DriverExtension; + data = pdev_ext->kbd_data; + data_old = pdev_ext->kbd_old; usb_dbg_print(DBGLVL_MAXIMUM, ("Kbd input: %d %d %d %d %d %d %d %d\n", data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7])); @@ -317,13 +300,13 @@ } // Commit the input data somewhere... - if (KbdClassInformation.ClassService && DataPrepared > 0) + if (DeviceExtension->ConnectData.ClassService && DataPrepared > 0) { KIRQL OldIrql; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - (*(PSERVICE_CALLBACK_ROUTINE)KbdClassInformation.ClassService)( - KbdClassInformation.ClassDeviceObject, + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ConnectData.ClassService)( + DeviceExtension->ConnectData.ClassDeviceObject, &KeyboardInputData[0], (&KeyboardInputData[0])+DataPrepared, &DataConsumed); @@ -376,59 +359,53 @@ return TRUE;//umss_delete_device(dev_mgr, pdrvr, dev_obj, FALSE); } +VOID +kbd_setleds(PKEYBOARD_DEVICE_EXTENSION DeviceExtension) +{ + //DPRINT("%x\n", DevExt->KeyboardIndicators.LedFlags); +} + // Dispatch routine for our IRPs NTSTATUS KbdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) { NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PKEYBOARD_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; usb_dbg_print(DBGLVL_MAXIMUM, ("KbdDispatch(DO %p, code 0x%lx) called\n", DeviceObject, IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode)); - if (DeviceObject == KeyboardFdo) + if (DeviceObject == DeviceExtension->Fdo) { // it's keyboard's IOCTL - PIO_STACK_LOCATION Stk; + PIO_STACK_LOCATION Stack; Irp->IoStatus.Information = 0; - Stk = IoGetCurrentIrpStackLocation(Irp); - - switch (Stk->Parameters.DeviceIoControl.IoControlCode) + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch (Stack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_INTERNAL_KEYBOARD_CONNECT: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_INTERNAL_KEYBOARD_CONNECT\n")); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_INTERNAL_KEYBOARD_CONNECT " "invalid buffer size\n")); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; goto intcontfailure; } - RtlCopyMemory(&KbdClassInformation, - Stk->Parameters.DeviceIoControl.Type3InputBuffer, + RtlCopyMemory(&DeviceExtension->ConnectData, + Stack->Parameters.DeviceIoControl.Type3InputBuffer, sizeof(CONNECT_DATA)); - Irp->IoStatus.Status = STATUS_SUCCESS; - break; -#if 0 - case IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER: - usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER\n")); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < 1) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - goto intcontfailure; - } - /* if (!DevExt->KeyboardInterruptObject) { - Irp->IoStatus.Status = STATUS_DEVICE_NOT_READY; - goto intcontfailure; - }*/ - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; -#endif + Status = STATUS_SUCCESS; + break; case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_ATTRIBUTES\n")); - if (Stk->Parameters.DeviceIoControl.OutputBufferLength < + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_ATTRIBUTES)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_ATTRIBUTES: " "invalid buffer size\n")); @@ -443,22 +420,23 @@ break; case IOCTL_KEYBOARD_QUERY_INDICATORS: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_INDICATORS\n")); - if (Stk->Parameters.DeviceIoControl.OutputBufferLength < - sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { - usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_INDICATORS: " - "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; - } - /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &DevExt->KeyboardIndicators, - sizeof(KEYBOARD_INDICATOR_PARAMETERS));*/ - - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) + { + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + RtlCopyMemory( + Irp->AssociatedIrp.SystemBuffer, + &DeviceExtension->KeyboardIndicators, + sizeof(KEYBOARD_INDICATOR_PARAMETERS)); + Irp->IoStatus.Information = sizeof(KEYBOARD_INDICATOR_PARAMETERS); + Status = STATUS_SUCCESS; + } break; case IOCTL_KEYBOARD_QUERY_TYPEMATIC: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_TYPEMATIC\n")); - if (Stk->Parameters.DeviceIoControl.OutputBufferLength < + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_TYPEMATIC: " "invalid buffer size\n")); @@ -469,11 +447,11 @@ &DevExt->KeyboardTypematic, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS));*/ - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_SET_INDICATORS: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_SET_INDICATORS\n")); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_INDICTATORS: " "invalid buffer size\n")); @@ -481,17 +459,17 @@ goto intcontfailure; } - /*RtlCopyMemory(&DevExt->KeyboardIndicators, - Irp->AssociatedIrp.SystemBuffer, - sizeof(KEYBOARD_INDICATOR_PARAMETERS));*/ + RtlCopyMemory(&DeviceExtension->KeyboardIndicators, + Irp->AssociatedIrp.SystemBuffer, + sizeof(KEYBOARD_INDICATOR_PARAMETERS)); //DPRINT("%x\n", DevExt->KeyboardIndicators.LedFlags); - - Irp->IoStatus.Status = STATUS_SUCCESS; + kbd_setleds(DeviceExtension); + Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_SET_TYPEMATIC: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_SET_TYPEMATIC\n")); - if (Stk->Parameters.DeviceIoControl.InputBufferLength < + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_TYPEMATIC " "invalid buffer size\n")); @@ -503,20 +481,25 @@ Irp->AssociatedIrp.SystemBuffer, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS));*/ - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: - /* We should check the UnitID, but it's kind of pointless as - * all keyboards are supposed to have the same one - */ - /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - &IndicatorTranslation, - sizeof(LOCAL_KEYBOARD_INDICATOR_TRANSLATION));*/ - - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(LOCAL_KEYBOARD_INDICATOR_TRANSLATION)) + { + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + RtlCopyMemory( + Irp->AssociatedIrp.SystemBuffer, + &IndicatorTranslation, + sizeof(LOCAL_KEYBOARD_INDICATOR_TRANSLATION)); + Irp->IoStatus.Information = sizeof(LOCAL_KEYBOARD_INDICATOR_TRANSLATION); + Status = STATUS_SUCCESS; + } break; default: - Irp->IoStatus.Status = STATUS_SUCCESS;//STATUS_INVALID_DEVICE_REQUEST; + Status = STATUS_SUCCESS;//STATUS_INVALID_DEVICE_REQUEST; break; } intcontfailure: @@ -529,6 +512,7 @@ usb_dbg_print(DBGLVL_MINIMUM, ("Invalid internal device request!\n")); } + Irp->IoStatus.Status = Status; if (Status != STATUS_PENDING) IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -536,10 +520,10 @@ } static NTSTATUS -KeyboardCreateDevice(IN PDRIVER_OBJECT DriverObject) +KeyboardCreateDevice(IN PDRIVER_OBJECT DriverObject, IN PKEYBOARD_DRVR_EXTENSION DriverExtension) { UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardPortUSB"); - PDEVEXT_HEADER DeviceExtension; + PKEYBOARD_DEVICE_EXTENSION DeviceExtension; PDEVICE_OBJECT Fdo; NTSTATUS Status; @@ -551,7 +535,7 @@ } Status = IoCreateDevice(DriverObject, - sizeof(DEVEXT_HEADER), + sizeof(KEYBOARD_DEVICE_EXTENSION), &DeviceName, FILE_DEVICE_KEYBOARD, FILE_DEVICE_SECURE_OPEN, @@ -563,12 +547,14 @@ usb_dbg_print(DBGLVL_MINIMUM, ("IoCreateDevice() for usb keyboard driver failed with status 0x%08lx\n", Status)); return Status; } - DeviceExtension = (PDEVEXT_HEADER)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(DEVEXT_HEADER)); - - DeviceExtension->dispatch = KbdDispatch; - - KeyboardFdo = Fdo; + DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(KEYBOARD_DEVICE_EXTENSION)); + + DeviceExtension->hdr.dispatch = KbdDispatch; + DeviceExtension->DriverExtension = DriverExtension; + DriverExtension->device_ext = DeviceExtension; + + DeviceExtension->Fdo = Fdo; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; usb_dbg_print(DBGLVL_MEDIUM, ("Created keyboard Fdo: %p\n", Fdo)); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h [iso-8859-1] Mon Mar 9 13:04:40 2009 @@ -3,16 +3,19 @@ typedef struct _KEYBOARD_DRVR_EXTENSION { - //INTERRUPT_DATA_BLOCK idb; PUSB_INTERFACE_DESC pif_desc; - UCHAR if_idx, out_endp_idx, in_endp_idx, int_endp_idx; - PUSB_ENDPOINT_DESC pout_endp_desc, pin_endp_desc, pint_endp_desc; + DEV_HANDLE dev_handle; PUSB_DEV_MANAGER dev_mgr; + UCHAR kbd_data[8]; UCHAR kbd_old[8]; + + UCHAR leds; + UCHAR leds_old; + + struct _KEYBOARD_DEVICE_EXTENSION *device_ext; // back pointer } KEYBOARD_DRVR_EXTENSION, *PKEYBOARD_DRVR_EXTENSION; - BOOLEAN kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);

16 years, 4 months

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