Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 18908: Fix some crach in ddraw.dll startup process for surface, we still got crach and surface are being setup wrong. working on this.
by greatlrd＠svn.reactos.com 31 Oct '05

31 Oct '05

Fix some crach in ddraw.dll startup process for surface, we still got crach and surface are being setup wrong. working on this. Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c Modified: trunk/reactos/lib/ddraw/main/surface_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-10-31 00:53:00 UTC (rev 18907) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-10-31 01:22:19 UTC (rev 18908) @@ -13,7 +13,8 @@ HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; if (!(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT)) _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-10-31 00:53:00 UTC (rev 18907) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-10-31 01:22:19 UTC (rev 18908) @@ -38,7 +38,8 @@ // ... then overwrite with hal if((ret = Hel_DirectDraw_Initialize (iface)) != DD_OK) return ret; - + + return DD_OK; } @@ -165,22 +166,30 @@ return DDERR_UNSUPPORTED; // the nasty com stuff + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* That; That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); - + if (That == NULL) return E_OUTOFMEMORY; ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); - + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; - + + This->DirectDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDRAWI_DDRAWSURFACE_INT)); + + That->owner = (IDirectDrawImpl *)This; + That->owner->DirectDrawGlobal.dsList->dwIntRefCnt =1; /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ That->owner->DirectDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; + *ppSurf = (LPDIRECTDRAWSURFACE7)That; _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 00:53:00 UTC (rev 18907) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 01:22:19 UTC (rev 18908) @@ -14,17 +14,14 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD) { IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - - if (This->owner) - return DDERR_ALREADYINITIALIZED; - + if(sizeof(DDSURFACEDESC2) != pDDSD->dwSize) return DDERR_UNSUPPORTED; if(!(pDDSD->dwFlags & DDSD_CAPS)) return DDERR_INVALIDPARAMS; - This->owner = (IDirectDrawImpl*)pDD; + This->owner = (IDirectDrawImpl*)pDD; if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) {

1 0

[turner] 18907: only show one screen of text at a time for displaying help.
by turner＠svn.reactos.com 31 Oct '05

31 Oct '05

only show one screen of text at a time for displaying help. Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-10-31 00:14:45 UTC (rev 18906) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-10-31 00:53:00 UTC (rev 18907) @@ -218,7 +218,7 @@ */ static VOID DirHelp(VOID) { - ConOutResPuts(STRING_DIR_HELP1); + ConOutResPaging(TRUE, STRING_DIR_HELP1); }

1 0

[hpoussin] 18906: Rewrite mouclass, so it can now handle more than one mouse.
by hpoussin＠svn.reactos.com 31 Oct '05

31 Oct '05

Rewrite mouclass, so it can now handle more than one mouse. win32k: try to open the keyboard/mouse in a loop, as they can not be present at startup Modified: trunk/reactos/bootdata/hivesys.inf Added: trunk/reactos/drivers/input/mouclass/misc.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/input/mouclass/mouclass.xml Modified: trunk/reactos/subsys/win32k/ntuser/input.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-10-31 00:10:32 UTC (rev 18905) +++ trunk/reactos/bootdata/hivesys.inf 2005-10-31 00:14:45 UTC (rev 18906) @@ -532,7 +532,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00 000001 HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMul tiplePorts",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","MouseDataQ ueueSize",0x00010001,0x00000064 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","PointerDe viceBaseName",0x00000000,"PointerClass" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","PointerDe viceBaseName",0x00000000,"PointerClassPnp" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08 002BE10318}","UpperFilters",0x00010000,"mouclass" ; Mailslot filesystem driver _____ Added: trunk/reactos/drivers/input/mouclass/misc.c --- trunk/reactos/drivers/input/mouclass/misc.c 2005-10-31 00:10:32 UTC (rev 18905) +++ trunk/reactos/drivers/input/mouclass/misc.c 2005-10-31 00:14:45 UTC (rev 18906) @@ -0,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Mouse class driver + * FILE: drivers/input/mouclass/misc.c + * PURPOSE: Misceallenous operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#define NDEBUG +#include <debug.h> + +#include "mouclass.h" + +static NTSTATUS NTAPI +ForwardIrpAndWaitCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice = ((PMOUCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + KEVENT Event; + NTSTATUS Status; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + +NTSTATUS NTAPI +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice = ((PMOUCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); +} Property changes on: trunk/reactos/drivers/input/mouclass/misc.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-10-31 00:10:32 UTC (rev 18905) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-10-31 00:14:45 UTC (rev 18906) @@ -1,277 +1,599 @@ -/* +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Mouse class driver + * FILE: drivers/mouclass/mouclass.c + * PURPOSE: Mouse class driver + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ - ** Mouse class driver 0.0.1 - ** Written by Jason Filby (jasonfilby(a)yahoo.com) - ** For ReactOS (www.reactos.com) +#define NDEBUG +#include <debug.h> - ** The class driver between win32k and the various mouse port drivers +#define INITGUID +#include "mouclass.h" - ** FIXME: Support IRP cancellation properly. -*/ +static VOID NTAPI +DriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + // nothing to do here yet +} -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/kbdmou.h> -#include "mouclass.h" +static NTSTATUS NTAPI +MouclassCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("IRP_MJ_CREATE\n"); -#define NDEBUG -#include <debug.h> + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); -NTSTATUS STDCALL -DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); + /* FIXME: open all associated Port devices */ + return STATUS_SUCCESS; +} -PDEVICE_OBJECT MouclassDeviceObject; +static NTSTATUS NTAPI +MouclassClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("IRP_MJ_CLOSE\n"); -static BOOLEAN MouseClassCallBack( - PDEVICE_OBJECT ClassDeviceObject, PMOUSE_INPUT_DATA MouseDataStart, - PMOUSE_INPUT_DATA MouseDataEnd, PULONG ConsumedCount) + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); + + /* FIXME: close all associated Port devices */ + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI +MouclassRead( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - PDEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; - PIRP Irp = NULL; - KIRQL OldIrql; - PIO_STACK_LOCATION Stack; - ULONG InputCount = MouseDataEnd - MouseDataStart; - ULONG ReadSize; + DPRINT("IRP_MJ_READ\n"); - DPRINT("Entering MouseClassCallBack\n"); - /* A filter driver might have consumed all the data already; I'm - * not sure if they are supposed to move the packets when they - * consume them though. - */ - if (ClassDeviceExtension->ReadIsPending == TRUE && - InputCount) - { - Irp = ClassDeviceObject->CurrentIrp; - ClassDeviceObject->CurrentIrp = NULL; - Stack = IoGetCurrentIrpStackLocation(Irp); + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); - /* A read request is waiting for input, so go straight to it */ - RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, MouseDataStart, - sizeof(MOUSE_INPUT_DATA)); + if (IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length < sizeof(MOUSE_INPUT_DATA)) + { + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Go to next packet and complete this request with STATUS_SUCCESS */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + return STATUS_BUFFER_TOO_SMALL; + } - ClassDeviceExtension->ReadIsPending = FALSE; + IoMarkIrpPending(Irp); + IoStartPacket(DeviceObject, Irp, NULL, NULL); + return STATUS_PENDING; +} - /* Skip the packet we just sent away */ - MouseDataStart++; - (*ConsumedCount)++; - InputCount--; - } +static NTSTATUS NTAPI +IrpStub( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_NOT_SUPPORTED; - /* If we have data from the port driver and a higher service to send the data to */ - if (InputCount != 0) - { - KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + { + /* Forward some IRPs to lower device */ + switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) + { + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + return ForwardIrpAndForget(DeviceObject, Irp); + default: + { + DPRINT1("Port DO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + ASSERT(FALSE); + Status = Irp->IoStatus.Status; + } + } + } + else if (IoGetCurrentIrpStackLocation(Irp)->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL) /* HACK FOR I8042PRT */ + { + Status = STATUS_SUCCESS; + } + else + { + DPRINT1("Class DO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + ASSERT(FALSE); + Status = Irp->IoStatus.Status; + } - if (ClassDeviceExtension->InputCount + InputCount > MOUSE_BUFFER_SIZE) - { - ReadSize = MOUSE_BUFFER_SIZE - ClassDeviceExtension->InputCount; - } else { - ReadSize = InputCount; - } + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} - /* - * FIXME: If we exceed the buffer, mouse data gets thrown away.. better - * solution? - */ +static NTSTATUS +ReadRegistryEntries( + IN PUNICODE_STRING RegistryPath, + IN PMOUCLASS_DRIVER_EXTENSION DriverExtension) +{ + RTL_QUERY_REGISTRY_TABLE Parameters[4]; + NTSTATUS Status; - /* - * Move the mouse input data from the port data queue to our class data - * queue. - */ - RtlMoveMemory(ClassDeviceExtension->PortData, (PCHAR)MouseDataStart, - sizeof(MOUSE_INPUT_DATA) * ReadSize); + ULONG DefaultConnectMultiplePorts = 1; + ULONG DefaultMouseDataQueueSize = 0x64; + UNICODE_STRING DefaultPointerDeviceBaseName = RTL_CONSTANT_STRING(L"PointerClassPnp"); - /* Move the pointer and counter up */ - ClassDeviceExtension->PortData += ReadSize; - ClassDeviceExtension->InputCount += ReadSize; + RtlZeroMemory(Parameters, sizeof(Parameters)); - KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql); - (*ConsumedCount) += ReadSize; - } else { - DPRINT("MouseClassCallBack() entered, InputCount = %d - DOING NOTHING\n", InputCount); - } + Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[0].Name = L"ConnectMultiplePorts"; + Parameters[0].EntryContext = &DriverExtension->ConnectMultiplePorts; + Parameters[0].DefaultType = REG_DWORD; + Parameters[0].DefaultData = &DefaultConnectMultiplePorts; + Parameters[0].DefaultLength = sizeof(ULONG); + + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[1].Name = L"MouseDataQueueSize"; + Parameters[1].EntryContext = &DriverExtension->MouseDataQueueSize; + Parameters[1].DefaultType = REG_DWORD; + Parameters[1].DefaultData = &DefaultMouseDataQueueSize; + Parameters[1].DefaultLength = sizeof(ULONG); + + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[2].Name = L"PointerDeviceBaseName"; + Parameters[2].EntryContext = &DriverExtension->PointerDeviceBaseName; + Parameters[2].DefaultType = REG_SZ; + Parameters[2].DefaultData = &DefaultPointerDeviceBaseName; + Parameters[2].DefaultLength = sizeof(ULONG); - if (Irp != NULL) - { - IoStartNextPacket(ClassDeviceObject, FALSE); - IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); - } + Status = RtlQueryRegistryValues( + RTL_REGISTRY_ABSOLUTE, + RegistryPath->Buffer, + Parameters, + NULL, + NULL); - DPRINT("Leaving MouseClassCallBack\n"); - return TRUE; + if (NT_SUCCESS(Status)) + { + /* Check values */ + if (DriverExtension->ConnectMultiplePorts != 0 + && DriverExtension->ConnectMultiplePorts != 1) + { + DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; + } + if (DriverExtension->MouseDataQueueSize == 0) + { + DriverExtension->MouseDataQueueSize = DefaultMouseDataQueueSize; + } + } + + return Status; } -static NTSTATUS ConnectMousePortDriver(PDEVICE_OBJECT ClassDeviceObject) +static NTSTATUS +CreatePointerClassDeviceObject( + IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT *ClassDO OPTIONAL) { - PDEVICE_OBJECT PortDeviceObject = NULL; - PFILE_OBJECT FileObject = NULL; - NTSTATUS status; - UNICODE_STRING PortName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0"); - IO_STATUS_BLOCK ioStatus; - KEVENT event; - PIRP irp; - CONNECT_DATA ClassInformation; - PDEVICE_EXTENSION DeviceExtension = ClassDeviceObject->DeviceExtension; + PMOUCLASS_DRIVER_EXTENSION DriverExtension; + ULONG DeviceId = 0; + ULONG PrefixLength; + UNICODE_STRING DeviceNameU; + PWSTR DeviceIdW = NULL; /* Pointer into DeviceNameU.Buffer */ + PDEVICE_OBJECT Fdo; + PMOUCLASS_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; - // Get the port driver's DeviceObject - // FIXME: The name might change.. find a way to be more dynamic? + DPRINT("CreatePointerClassDeviceObject(0x%p)\n", DriverObject); - status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); + /* Create new device object */ + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + DeviceNameU.Length = 0; + DeviceNameU.MaximumLength = + wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + + DriverExtension->PointerDeviceBaseName.Length /* "PointerClass" */ + + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + + sizeof(UNICODE_NULL); /* Final NULL char */ + DeviceNameU.Buffer = ExAllocatePool(PagedPool, DeviceNameU.MaximumLength); + if (!DeviceNameU.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->PointerDeviceBaseName); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + PrefixLength = DeviceNameU.MaximumLength - 4 * sizeof(WCHAR) - sizeof(UNICODE_NULL); + DeviceIdW = &DeviceNameU.Buffer[PrefixLength / sizeof(WCHAR)]; + while (DeviceId < 9999) + { + DeviceNameU.Length = PrefixLength + swprintf(DeviceIdW, L"%ld", DeviceId) * sizeof(WCHAR); + Status = IoCreateDevice( + DriverObject, + sizeof(MOUCLASS_DEVICE_EXTENSION), + &DeviceNameU, + FILE_DEVICE_MOUSE, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (NT_SUCCESS(Status)) + goto cleanup; + else if (Status != STATUS_OBJECT_NAME_COLLISION) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + goto cleanup; + } + DeviceId++; + } + DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->PointerDeviceBaseName); + Status = STATUS_UNSUCCESSFUL; +cleanup: + ExFreePool(DeviceNameU.Buffer); + if (!NT_SUCCESS(Status)) + return Status; - if(status != STATUS_SUCCESS) - { - DPRINT("MOUCLASS: Could not connect to mouse port driver\n"); - DPRINT("Status: %x\n", status); - return status; - } + DeviceExtension = (PMOUCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(MOUCLASS_DEVICE_EXTENSION)); + DeviceExtension->Common.IsClassDO = TRUE; + DeviceExtension->DriverExtension = DriverExtension; + DeviceExtension->PnpState = dsStopped; + KeInitializeSpinLock(&(DeviceExtension->SpinLock)); + DeviceExtension->ReadIsPending = FALSE; + DeviceExtension->InputCount = 0; + DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->MouseDataQueueSize * sizeof(MOUSE_INPUT_DATA)); + Fdo->Flags |= DO_POWER_PAGABLE; + Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - DeviceExtension->PortDeviceObject = PortDeviceObject; - DeviceExtension->PortData = ExAllocatePool(NonPagedPool, MOUSE_BUFFER_SIZE * sizeof(MOUSE_INPUT_DATA)); - DeviceExtension->InputCount = 0; - DeviceExtension->ReadIsPending = FALSE; - DeviceExtension->WorkItem = NULL; - KeInitializeSpinLock(&(DeviceExtension->SpinLock)); - DeviceExtension->PassiveCallbackQueued = FALSE; + /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ - // Connect our callback to the port driver + if (ClassDO) + *ClassDO = Fdo; - KeInitializeEvent(&event, NotificationEvent, FALSE); + return STATUS_SUCCESS; +} - ClassInformation.ClassDeviceObject = ClassDeviceObject; - ClassInformation.ClassService = MouseClassCallBack; +static BOOLEAN +MouclassCallback( + IN PDEVICE_OBJECT ClassDeviceObject, + IN OUT PMOUSE_INPUT_DATA MouseDataStart, + IN PMOUSE_INPUT_DATA MouseDataEnd, + IN OUT PULONG ConsumedCount) +{ + PMOUCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; + PIRP Irp = NULL; + KIRQL OldIrql; + PIO_STACK_LOCATION Stack; + ULONG InputCount = MouseDataEnd - MouseDataStart; + ULONG ReadSize; - irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_MOUSE_CONNECT, - PortDeviceObject, &ClassInformation, sizeof(CONNECT_DATA), NULL, 0, TRUE, &event, &ioStatus); + ASSERT(ClassDeviceExtension->Common.IsClassDO); - status = IoCallDriver(DeviceExtension->PortDeviceObject, irp); + DPRINT("MouclassCallback()\n"); + /* A filter driver might have consumed all the data already; I'm + * not sure if they are supposed to move the packets when they + * consume them though. + */ + if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) + { + Irp = ClassDeviceObject->CurrentIrp; + ClassDeviceObject->CurrentIrp = NULL; + Stack = IoGetCurrentIrpStackLocation(Irp); - if (status == STATUS_PENDING) { - KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); - } else { - ioStatus.Status = status; - } + /* A read request is waiting for input, so go straight to it */ + RtlMoveMemory( + Irp->AssociatedIrp.SystemBuffer, + MouseDataStart, + sizeof(MOUSE_INPUT_DATA)); - return ioStatus.Status; + /* Go to next packet and complete this request with STATUS_SUCCESS */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + + ClassDeviceExtension->ReadIsPending = FALSE; + + /* Skip the packet we just sent away */ + MouseDataStart++; + (*ConsumedCount)++; + InputCount--; + } + + /* If we have data from the port driver and a higher service to send the data to */ + if (InputCount != 0) + { + KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); + + if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->MouseDataQueueSize) + ReadSize = ClassDeviceExtension->DriverExtension->MouseDataQueueSize - ClassDeviceExtension->InputCount; + else + ReadSize = InputCount; + + /* + * FIXME: If we exceed the buffer, mouse data gets thrown away.. better + * solution? + */ + + /* + * Move the mouse input data from the port data queue to our class data + * queue. + */ + RtlMoveMemory( + ClassDeviceExtension->PortData, + (PCHAR)MouseDataStart, + sizeof(MOUSE_INPUT_DATA) * ReadSize); + + /* Move the pointer and counter up */ + ClassDeviceExtension->PortData += ReadSize; + ClassDeviceExtension->InputCount += ReadSize; + + KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql); + (*ConsumedCount) += ReadSize; + } + else + { + DPRINT("MouclassCallBack() entered, InputCount = %lu - DOING NOTHING\n", InputCount); + } + + if (Irp != NULL) + { + IoStartNextPacket(ClassDeviceObject, FALSE); + IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); + } + + DPRINT("Leaving MouclassCallback()\n"); + return TRUE; } -static NTSTATUS STDCALL MouseClassDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) +/* Send IOCTL_INTERNAL_MOUSE_CONNECT to pointer port */ +static NTSTATUS +ConnectMousePortDriver( + IN PDEVICE_OBJECT PointerPortDO, + IN PDEVICE_OBJECT PointerClassDO) { - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); - NTSTATUS Status; + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + CONNECT_DATA ConnectData; + NTSTATUS Status; - switch (Stack->MajorFunction) - { - case IRP_MJ_CREATE: - Status = ConnectMousePortDriver(MouclassDeviceObject); - break; + KeInitializeEvent(&Event, NotificationEvent, FALSE); - case IRP_MJ_CLOSE: - Status = STATUS_SUCCESS; - break; + ConnectData.ClassDeviceObject = PointerClassDO; + ConnectData.ClassService = MouclassCallback; - case IRP_MJ_READ: - if (Stack->Parameters.Read.Length < sizeof(MOUSE_INPUT_DATA)) - { - Status = STATUS_BUFFER_TOO_SMALL; - break; - } - IoMarkIrpPending(Irp); - IoStartPacket(DeviceObject, Irp, NULL, NULL); - return STATUS_PENDING; + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_MOUSE_CONNECT, + PointerPortDO, + &ConnectData, sizeof(CONNECT_DATA), + NULL, 0, + TRUE, &Event, &IoStatus); - default: - DPRINT1("NOT IMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } + Status = IoCallDriver(PointerPortDO, Irp); - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status == STATUS_PENDING) + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + else + IoStatus.Status = Status; - return Status; + return IoStatus.Status; } -static VOID STDCALL -MouseClassStartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp) +static NTSTATUS NTAPI +MouclassAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) { - PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + PMOUCLASS_DRIVER_EXTENSION DriverExtension; + PDEVICE_OBJECT Fdo; + PMOUCLASS_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; - if (DeviceExtension->InputCount > 0) - { - KIRQL oldIrql; + DPRINT("MouclassAddDevice called. Pdo = 0x%p\n", Pdo); - KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); - RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, - DeviceExtension->PortData - DeviceExtension->InputCount, - sizeof(MOUSE_INPUT_DATA)); + /* Create new device object */ + Status = IoCreateDevice( + DriverObject, + sizeof(MOUCLASS_DEVICE_EXTENSION), + NULL, + Pdo->DeviceType, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + return Status; + } - if (DeviceExtension->InputCount > 1) - { - RtlMoveMemory( - DeviceExtension->PortData - DeviceExtension->InputCount, - DeviceExtension->PortData - DeviceExtension->InputCount + 1, - (DeviceExtension->InputCount - 1) * sizeof(MOUSE_INPUT_DATA)); - } - DeviceExtension->PortData--; - DeviceExtension->InputCount--; - DeviceExtension->ReadIsPending = FALSE; + DeviceExtension = (PMOUCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(MOUCLASS_DEVICE_EXTENSION)); + DeviceExtension->Common.IsClassDO = FALSE; + DeviceExtension->PnpState = dsStopped; + Fdo->Flags |= DO_POWER_PAGABLE; + Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + IoDeleteDevice(Fdo); + return Status; + } + Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* Go to next packet and complete this request with STATUS_SUCCESS */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); - IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); + if (DriverExtension->ConnectMultiplePorts) + Status = ConnectMousePortDriver(Fdo, DriverExtension->MainMouclassDeviceObject); + else + Status = ConnectMousePortDriver(Fdo, Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("ConnectMousePortDriver() failed with status 0x%08lx\n", Status); + /* FIXME: why can't I cleanup without error? */ + //IoDetachDevice(Fdo); + //IoDeleteDevice(Fdo); + return Status; + } - IoStartNextPacket(DeviceObject, FALSE); - KeReleaseSpinLock(&DeviceExtension->SpinLock, oldIrql); - } else { - DeviceExtension->ReadIsPending = TRUE; - } + /* Register GUID_DEVINTERFACE_MOUSE interface */ + Status = IoRegisterDeviceInterface( + Pdo, + &GUID_DEVINTERFACE_MOUSE, + NULL, + &DeviceExtension->MouseInterfaceName); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + return Status; + } + + return STATUS_SUCCESS; } -NTSTATUS STDCALL -DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) +static VOID NTAPI +MouclassStartIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Mouse"); - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Mouse"); - NTSTATUS Status; + PMOUCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); - DriverObject->MajorFunction[IRP_MJ_CREATE] = MouseClassDispatch; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = MouseClassDispatch; - DriverObject->MajorFunction[IRP_MJ_READ] = MouseClassDispatch; - DriverObject->DriverStartIo = MouseClassStartIo; + ASSERT(DeviceExtension->Common.IsClassDO); - Status = IoCreateDevice(DriverObject, - sizeof(DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_MOUSE, - 0, - TRUE, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + if (DeviceExtension->InputCount > 0) + { + KIRQL oldIrql; - DeviceObject->Flags = DeviceObject->Flags | DO_BUFFERED_IO; + KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); - Status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); - if (!NT_SUCCESS(Status)) - { - IoDeleteDevice(DeviceObject); - return Status; - } + RtlMoveMemory( + Irp->AssociatedIrp.SystemBuffer, + DeviceExtension->PortData - DeviceExtension->InputCount, + sizeof(MOUSE_INPUT_DATA)); - MouclassDeviceObject = DeviceObject; + if (DeviceExtension->InputCount > 1) + { + RtlMoveMemory( + DeviceExtension->PortData - DeviceExtension->InputCount, + DeviceExtension->PortData - DeviceExtension->InputCount + 1, + (DeviceExtension->InputCount - 1) * sizeof(MOUSE_INPUT_DATA)); + } + DeviceExtension->PortData--; + DeviceExtension->InputCount--; + DeviceExtension->ReadIsPending = FALSE; - return STATUS_SUCCESS; + /* Go to next packet and complete this request with STATUS_SUCCESS */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); + + IoStartNextPacket(DeviceObject, FALSE); + KeReleaseSpinLock(&DeviceExtension->SpinLock, oldIrql); + } + else + { + DeviceExtension->ReadIsPending = TRUE; + } } + +static NTSTATUS +SearchForLegacyDrivers( + IN PMOUCLASS_DRIVER_EXTENSION DriverExtension) +{ + PDEVICE_OBJECT PortDeviceObject = NULL; + PFILE_OBJECT FileObject = NULL; + UNICODE_STRING PortName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0"); + NTSTATUS Status; + + /* FIXME: search for more than once legacy driver */ + + Status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); + if(Status != STATUS_SUCCESS) + { + DPRINT("Could not open old device object (Status 0x%08lx)\n", Status); + return Status; + } + + if (DriverExtension->ConnectMultiplePorts) + Status = ConnectMousePortDriver(PortDeviceObject, DriverExtension->MainMouclassDeviceObject); + else + { + /* What to do */ + KEBUGCHECK(0); + } + if (!NT_SUCCESS(Status)) + { + DPRINT("ConnectMousePortDriver() failed with status 0x%08lx\n", Status); + return Status; + } + return STATUS_SUCCESS; +} + +/* + * Standard DriverEntry method. + */ +NTSTATUS NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + PMOUCLASS_DRIVER_EXTENSION DriverExtension; + ULONG i; + NTSTATUS Status; + + Status = IoAllocateDriverObjectExtension( + DriverObject, + DriverObject, + sizeof(MOUCLASS_DRIVER_EXTENSION), + (PVOID*)&DriverExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); + return Status; + } + RtlZeroMemory(DriverExtension, sizeof(MOUCLASS_DRIVER_EXTENSION)); + + Status = ReadRegistryEntries(RegistryPath, DriverExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT("ReadRegistryEntries() failed with status 0x%08lx\n", Status); + return Status; + } + + if (DriverExtension->ConnectMultiplePorts == 1) + { + Status = CreatePointerClassDeviceObject( + DriverObject, + &DriverExtension->MainMouclassDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT("CreatePointerClassDeviceObject() failed with status 0x%08lx\n", Status); + return Status; + } + } + + DriverObject->DriverExtension->AddDevice = MouclassAddDevice; + DriverObject->DriverUnload = DriverUnload; + + for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = IrpStub; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = MouclassCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = MouclassClose; + DriverObject->MajorFunction[IRP_MJ_READ] = MouclassRead; + DriverObject->DriverStartIo = MouclassStartIo; + + SearchForLegacyDrivers(DriverExtension); + + return STATUS_SUCCESS; +} _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h --- trunk/reactos/drivers/input/mouclass/mouclass.h 2005-10-31 00:10:32 UTC (rev 18905) +++ trunk/reactos/drivers/input/mouclass/mouclass.h 2005-10-31 00:14:45 UTC (rev 18906) @@ -1,11 +1,65 @@ -#define MOUSE_BUFFER_SIZE 100 +#include <ntddk.h> +#include <kbdmou.h> +#include <ntddmou.h> +#include <stdio.h> -typedef struct _DEVICE_EXTENSION { - PIO_WORKITEM WorkItem; - KSPIN_LOCK SpinLock; - BOOLEAN PassiveCallbackQueued; - BOOLEAN ReadIsPending; - ULONG InputCount; - PMOUSE_INPUT_DATA PortData; - PDEVICE_OBJECT PortDeviceObject; // FIXME: Expand this to handle multiple port drivers (make *PortDeviceObject) -} DEVICE_EXTENSION, *PDEVICE_EXTENSION; +#if defined(__GNUC__) + NTSTATUS NTAPI + IoAttachDeviceToDeviceStackSafe( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject); +#else + #error Unknown compiler! +#endif + +typedef enum +{ + dsStopped, + dsStarted, + dsPaused, + dsRemoved, + dsSurpriseRemoved +} MOUCLASS_DEVICE_STATE; + +typedef struct _MOUCLASS_DRIVER_EXTENSION +{ + /* Registry settings */ + ULONG ConnectMultiplePorts; + ULONG MouseDataQueueSize; + UNICODE_STRING PointerDeviceBaseName; + + PDEVICE_OBJECT MainMouclassDeviceObject; +} MOUCLASS_DRIVER_EXTENSION, *PMOUCLASS_DRIVER_EXTENSION; + +typedef struct _COMMON_DEVICE_EXTENSION +{ + BOOLEAN IsClassDO; +} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct _MOUPORT_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; +} MOUPORT_DEVICE_EXTENSION, *PMOUPORT_DEVICE_EXTENSION; + +typedef struct _MOUCLASS_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + + MOUCLASS_DEVICE_STATE PnpState; + PMOUCLASS_DRIVER_EXTENSION DriverExtension; + PDEVICE_OBJECT LowerDevice; + UNICODE_STRING MouseInterfaceName; + + KSPIN_LOCK SpinLock; + BOOLEAN ReadIsPending; + ULONG InputCount; + PMOUSE_INPUT_DATA PortData; +} MOUCLASS_DEVICE_EXTENSION, *PMOUCLASS_DEVICE_EXTENSION; + +/* misc.c */ + +NTSTATUS NTAPI +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.xml --- trunk/reactos/drivers/input/mouclass/mouclass.xml 2005-10-31 00:10:32 UTC (rev 18905) +++ trunk/reactos/drivers/input/mouclass/mouclass.xml 2005-10-31 00:14:45 UTC (rev 18906) @@ -3,6 +3,7 @@ <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> + <file>misc.c</file> <file>mouclass.c</file> <file>mouclass.rc</file> </module> _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-10-31 00:10:32 UTC (rev 18905) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-10-31 00:14:45 UTC (rev 18906) @@ -151,7 +151,7 @@ VOID STDCALL MouseThreadMain(PVOID StartContext) { [truncated at 1000 lines; 59 more skipped]

1 0

[turner] 18905: Removed some code to make dir behave the same way as MS CMD. bug reported by irc::mikedep333
by turner＠svn.reactos.com 31 Oct '05

31 Oct '05

Removed some code to make dir behave the same way as MS CMD. bug reported by irc::mikedep333 Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-10-31 00:10:04 UTC (rev 18904) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-10-31 00:10:32 UTC (rev 18905) @@ -240,7 +240,7 @@ BOOL bPNegative; /* Negative switch parameter */ BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ LPTSTR ptrLast; /* A pointer to the last character of param */ - UINT t = 0; + /* Initialize variables; */ @@ -261,31 +261,6 @@ lpFlags->stTimeField.bParSetted = TRUE; - /* Add correct handling of *. */ - for(t=0;t<_tcslen(Line);t++) - { - static INT count=0; - - if ((count==0) && (Line[t]==_T('*'))) - count++; - - else if ((count==1) && (Line[t]==_T('.'))) - count++; - - else if ((count==2) && (Line[t]==_T('*'))) - count++; - - else if (!_istspace(Line[t])) - { - if (count==2) - lpFlags->bWideListColSort = ! bNegative; - count=-1; - } - } - - - - /* Main Loop (see README_DIR.txt) */ /* scan the command line char per char, and we process its char */ while (*Line) @@ -1980,7 +1955,7 @@ stFlags.stOrderBy.bUnSet = FALSE; nErrorLevel = 0; - + /* read the parameters from the DIRCMD environment variable */ if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) if (!DirReadParam(dircmd, &param, &stFlags))

1 0

[greatlrd] 18904: Fix so startup process of ddraw hal can be compile with visualstudio
by greatlrd＠svn.reactos.com 31 Oct '05

31 Oct '05

Fix so startup process of ddraw hal can be compile with visualstudio Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-30 23:54:05 UTC (rev 18903) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-31 00:10:04 UTC (rev 18904) @@ -58,13 +58,13 @@ return DD_FALSE; } - This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + This->HalInfo.vmiData.pvmList = (LPVIDMEM) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); - This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + This->DirectDrawGlobal.lpdwFourCC = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * + (LPDDSURFACEDESC) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); if(!DdQueryDirectDrawObject ( @@ -285,7 +285,7 @@ /* Get the ZPixelFormats */ - This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); DriverInfo.guidInfo = GUID_ZPixelFormats; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats;

1 0

[greatlrd] 18903: Free Hal memory that have been alloc at exist
by greatlrd＠svn.reactos.com 30 Oct '05

30 Oct '05

Free Hal memory that have been alloc at exist Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-30 23:48:30 UTC (rev 18902) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-30 23:54:05 UTC (rev 18903) @@ -24,9 +24,14 @@ /* alloc all the space */ - This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDHAL_CALLBACKS)); - This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(D3DHAL_CALLBACKS)); - This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3DHAL_GLOBALDRIVERDATA)); + This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDHAL_CALLBACKS)); + + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + sizeof(D3DHAL_CALLBACKS)); + + This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_GLOBALDRIVERDATA)); /* Fill in some info */ This->HalInfo.lpD3DGlobalDriverData = This->DirectDrawGlobal.lpD3DGlobalDriverData; @@ -53,10 +58,15 @@ return DD_FALSE; } - This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); - This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); + This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); + This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); + if(!DdQueryDirectDrawObject ( &This->DirectDrawGlobal, &This->HalInfo, @@ -134,7 +144,8 @@ This->HalInfo.GetDriverInfo( &DriverInfo);*/ /* Get the D3DCallbacks2 */ - This->DirectDrawGlobal.lpD3DHALCallbacks2 = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_CALLBACKS2)); + This->DirectDrawGlobal.lpD3DHALCallbacks2 = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_CALLBACKS2)); DriverInfo.guidInfo = GUID_D3DCallbacks2; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks2; DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS2); @@ -142,7 +153,8 @@ /* Get the D3DCallbacks3 */ - This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_CALLBACKS3)); + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_CALLBACKS3)); DriverInfo.guidInfo = GUID_D3DCallbacks3; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks; DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS3); @@ -159,7 +171,8 @@ /* Get the D3DExtendedCaps */ - This->DirectDrawGlobal.lpD3DExtendedCaps = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_D3DEXTENDEDCAPS)); + This->DirectDrawGlobal.lpD3DExtendedCaps = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_D3DEXTENDEDCAPS)); DriverInfo.guidInfo = GUID_D3DExtendedCaps; DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpD3DExtendedCaps; DriverInfo.dwExpectedSize = sizeof(D3DHAL_D3DEXTENDEDCAPS); @@ -191,7 +204,8 @@ /* Get the KernelCaps */ - This->DirectDrawGlobal.lpDDKernelCaps = (LPDDKERNELCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDHAL_DDKERNELCALLBACKS)); + This->DirectDrawGlobal.lpDDKernelCaps = (LPDDKERNELCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDHAL_DDKERNELCALLBACKS)); DriverInfo.guidInfo = GUID_KernelCaps; DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpDDKernelCaps; DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); @@ -222,7 +236,8 @@ /* Get the NonLocalVidMemCaps */ - This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDNONLOCALVIDMEMCAPS)); + This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDNONLOCALVIDMEMCAPS)); DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpddNLVCaps; DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); @@ -261,7 +276,8 @@ /* Get the VideoPortCaps */ - This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDVIDEOPORTCAPS)); + This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDVIDEOPORTCAPS)); DriverInfo.guidInfo = GUID_VideoPortCaps; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpDDVideoPortCaps; DriverInfo.dwExpectedSize = sizeof(DDVIDEOPORTCAPS); @@ -269,7 +285,8 @@ /* Get the ZPixelFormats */ - This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); + This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); DriverInfo.guidInfo = GUID_ZPixelFormats; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); @@ -318,19 +335,33 @@ DdDeleteDirectDrawObject (&This->DirectDrawGlobal); - if(This->HalInfo.vmiData.pvmList) - HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); + if(This->DirectDrawGlobal.lpDDKernelCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDKernelCaps); + + if(This->DirectDrawGlobal.lpddNLVCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpddNLVCaps); + + if(This->DirectDrawGlobal.lpDDVideoPortCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDVideoPortCaps); + if(This->DirectDrawGlobal.lpdwFourCC) HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC); + if(This->DirectDrawGlobal.lpZPixelFormats) HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpZPixelFormats); + + if(This->HalInfo.vmiData.pvmList) + HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); + if(((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverD ata)->lpTextureFormats) HeapFree(GetProcessHeap(), 0, ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats); if(This->DirectDrawGlobal.lpDDCBtmp) HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDCBtmp); + if(This->DirectDrawGlobal.lpD3DHALCallbacks) HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks); + if(This->DirectDrawGlobal.lpD3DGlobalDriverData) HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); }

1 0

[hpoussin] 18902: Prevent i8042prt to search for a keyboard/mouse more than once
by hpoussin＠svn.reactos.com 30 Oct '05

30 Oct '05

Prevent i8042prt to search for a keyboard/mouse more than once Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-30 23:29:40 UTC (rev 18901) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-30 23:48:30 UTC (rev 18902) @@ -647,9 +647,15 @@ PDEVICE_EXTENSION DevExt; PFDO_DEVICE_EXTENSION FdoDevExt; PDEVICE_OBJECT Fdo; + static BOOLEAN AlreadyAdded = FALSE; DPRINT("I8042AddDevice\n"); + /* HACK! */ + if (AlreadyAdded) + return STATUS_UNSUCCESSFUL; + AlreadyAdded = TRUE; + Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), NULL,

1 0

[greatlrd] 18901: small ceanup in hal startup process
by greatlrd＠svn.reactos.com 30 Oct '05

30 Oct '05

small ceanup in hal startup process Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-30 23:21:57 UTC (rev 18900) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-30 23:29:40 UTC (rev 18901) @@ -49,9 +49,8 @@ NULL, NULL, NULL )) - { - OutputDebugString(L"First DdQueryDirectDrawObject failed"); - return 1; + { + return DD_FALSE; } This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); @@ -71,9 +70,8 @@ This->DirectDrawGlobal.lpdwFourCC, This->HalInfo.vmiData.pvmList )) - { - OutputDebugString(L"Second DdQueryDirectDrawObject failed"); - return 1; + { + return DD_FALSE; } /* Copy HalInfo to DirectDrawGlobal (Not complete)*/ @@ -277,12 +275,7 @@ DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Setup some info from the callbacks we got */ - - /* FIXME do more callbacks and fill the gpl struct */ - + /* Setup some info from the callbacks we got */ DDHAL_GETAVAILDRIVERMEMORYDATA mem; mem.lpDD = &This->DirectDrawGlobal; @@ -290,9 +283,8 @@ This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; - - /* Now all setup for HAL is done and we hopply do not have forget anything */ - + + /* Now all setup for HAL is done */ return DD_OK; }

1 0

[greatlrd] 18900: Small change for hal startup process only few callbacks are not include
by greatlrd＠svn.reactos.com 30 Oct '05

30 Oct '05

Small change for hal startup process only few callbacks are not include Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-30 22:47:31 UTC (rev 18899) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-10-30 23:21:57 UTC (rev 18900) @@ -15,7 +15,6 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - /* point to it self */ This->DirectDrawGlobal.lp16DD = &This->DirectDrawGlobal; @@ -29,7 +28,6 @@ This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(D3DHAL_CALLBACKS)); This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3DHAL_GLOBALDRIVERDATA)); - /* Fill in some info */ This->HalInfo.lpD3DGlobalDriverData = This->DirectDrawGlobal.lpD3DGlobalDriverData; This->HalInfo.lpD3DHALCallbacks = This->DirectDrawGlobal.lpD3DHALCallbacks; @@ -37,8 +35,6 @@ This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf; This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette; This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface; - - /* FIXME The insate is not right we need the info that the three NULL return */ /* query all kinds of infos from the driver */ if(!DdQueryDirectDrawObject ( @@ -57,15 +53,9 @@ OutputDebugString(L"First DdQueryDirectDrawObject failed"); return 1; } - - /* FIXME The insate is not right we need the info that the three NULL return and use it here*/ - - /* Fixme shall we selected the pixel type before we call the DdQueryDirectDrawObject second time - and fill in more info ?? */ - + This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); - This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); - This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); + This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); if(!DdQueryDirectDrawObject ( @@ -91,23 +81,11 @@ RtlCopyMemory(&This->DirectDrawGlobal.vmiData,&This->HalInfo.vmiData,siz eof(VIDMEMINFO)); RtlCopyMemory(&This->DirectDrawGlobal.ddCaps,&This->HalInfo.ddCaps,sizeo f(DDCORECAPS)); This->DirectDrawGlobal.dwMonitorFrequency = This->HalInfo.dwMonitorFrequency; - - /* have not check where it should go into yet - This->HalInfo.GetDriverInfo datatype LPDDHAL_GETDRIVERINFO - */ - + This->DirectDrawGlobal.dwModeIndex = This->HalInfo.dwModeIndex; - - /* have not check where it should go into yet - This->HalInfo.lpdwFourCC datatype LPDWORD - */ - This->DirectDrawGlobal.dwNumModes = This->HalInfo.dwNumModes; This->DirectDrawGlobal.lpModeInfo = This->HalInfo.lpModeInfo; - /* have not check where it should go into yet - This->HalInfo.dwFlags data type DWORD - */ /* Unsure which of these two for lpPDevice This->DirectDrawGlobal.dwPDevice = This->HalInfo.lpPDevice; @@ -115,12 +93,8 @@ */ This->DirectDrawGlobal.hInstance = This->HalInfo.hInstance; - - /* have not check where it should go into yet - This->lpD3DGlobalDriverData datatype ULONG_PTR - This->lpD3DHALCallbacks datatype ULONG_PTR - */ - RtlCopyMemory(&This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf,&This->HalI nfo.lpDDExeBufCallbacks,sizeof(DDHAL_DDEXEBUFCALLBACKS)); + + RtlCopyMemory(&This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf,&This->HalI nfo.lpDDExeBufCallbacks,sizeof(DDHAL_DDEXEBUFCALLBACKS)); @@ -297,7 +271,7 @@ /* Get the ZPixelFormats */ - This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT)HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT)); + This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); DriverInfo.guidInfo = GUID_ZPixelFormats; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); @@ -305,49 +279,18 @@ - /* Setup some info from the callbacks we got */ + /* Setup some info from the callbacks we got */ - /* FIXME do more callbacks and fill the gpl struct */ + /* FIXME do more callbacks and fill the gpl struct */ - DDHAL_GETAVAILDRIVERMEMORYDATA mem; - mem.lpDD = &This->DirectDrawGlobal; + DDHAL_GETAVAILDRIVERMEMORYDATA mem; + mem.lpDD = &This->DirectDrawGlobal; - This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); + This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); - This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; - This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; - - - - /* */ - /* DWORD dwIntRefCnt; - - - LPVOID lpVtbl; - LPDDRAWI_DDRAWSURFACE_LCL lpLcl; - LPDDRAWI_DDRAWSURFACE_INT lpLink; - - } DDRAWI_DDRAWSURFACE_INT; - */ - - /* Setting up some part for surface not ever thing are being fill in yet */ - This->DirectDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), 0, - sizeof(DDRAWI_DDRAWSURFACE_INT)); - - This->DirectDrawGlobal.dsList->lpLink = (LPDDRAWI_DDRAWSURFACE_INT) &This->DirectDrawGlobal.dsList; - - This->DirectDrawGlobal.dsList->lpLcl = (LPDDRAWI_DDRAWSURFACE_LCL)HeapAlloc(GetProcessHeap(), 0, - sizeof(DDRAWI_DDRAWSURFACE_LCL)); - - This->DirectDrawGlobal.dsList->lpLcl->lpGbl = - (LPDDRAWI_DDRAWSURFACE_GBL)HeapAlloc(GetProcessHeap(), 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - - This->DirectDrawGlobal.dsList->lpLcl->lpGbl->lpDD = &This->DirectDrawGlobal; - - - - - + This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; + This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; + /* Now all setup for HAL is done and we hopply do not have forget anything */ return DD_OK;

1 0

[arty] 18899: use %lx for printing NTSTATUS
by arty＠svn.reactos.com 30 Oct '05

30 Oct '05

use %lx for printing NTSTATUS Modified: trunk/reactos/drivers/dd/green/pnp.c _____ Modified: trunk/reactos/drivers/dd/green/pnp.c --- trunk/reactos/drivers/dd/green/pnp.c 2005-10-30 22:33:26 UTC (rev 18898) +++ trunk/reactos/drivers/dd/green/pnp.c 2005-10-30 22:47:31 UTC (rev 18899) @@ -35,7 +35,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Status = %08x\n", Status); + DPRINT1("Status = %08lx\n", Status); return Status; } @@ -47,7 +47,7 @@ if (!NT_SUCCESS(Status)) { IoDeleteDevice(Fdo); - DPRINT1("Status = %08x\n", Status); + DPRINT1("Status = %08lx\n", Status); return Status; } ((PKEYBOARD_DEVICE_EXTENSION)DeviceExtension->Keyboard->DeviceExtension) ->Green = Fdo; @@ -57,7 +57,7 @@ { IoDeleteDevice(DeviceExtension->Keyboard); IoDeleteDevice(Fdo); - DPRINT1("Status = %08x\n", Status); + DPRINT1("Status = %08lx\n", Status); return Status; } ((PSCREEN_DEVICE_EXTENSION)DeviceExtension->Screen->DeviceExtension)->Gr een = Fdo; @@ -90,6 +90,6 @@ Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - DPRINT1("Status = %08x\n", Status); + DPRINT("Status = %08lx\n", Status); return Status; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs