Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[aandrejevic] 60969: [FAST486] Fix several bugs in Fast486RotateOperation.
by aandrejevic＠svn.reactos.org 13 Nov '13

13 Nov '13

Author: aandrejevic Date: Wed Nov 13 02:38:36 2013 New Revision: 60969 URL: http://svn.reactos.org/svn/reactos?rev=60969&view=rev Log: [FAST486] Fix several bugs in Fast486RotateOperation. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Wed Nov 13 02:38:36 2013 @@ -161,17 +161,17 @@ UCHAR Count) { ULONG HighestBit = 1 << (Bits - 1); + ULONG MaxValue = HighestBit | (HighestBit - 1); ULONG Result; /* Normalize the count */ Count &= 0x1F; + if (Operation <= 1) Count %= Bits; + else if (Operation <= 3) Count %= Bits + 1; + /* If the count is zero, do nothing */ - if (Count == 0) - { - Result = Value; - goto SetFlags; - } + if (Count == 0) return Value; /* Check which operation is this */ switch (Operation) @@ -205,9 +205,40 @@ /* RCL */ case 2: { - Result = (Value << Count) - | (State->Flags.Cf << (Count - 1)) - | (Value >> (Bits - Count + 1)); + Result = (Value << Count) | (State->Flags.Cf << (Count - 1)); + + /* Complete the calculation, but make sure we don't shift by too much */ + if ((Bits - Count) < 31) Result |= Value >> (Bits - Count + 1); + + /* Update CF and OF */ + State->Flags.Cf = ((Value & (1 << (Bits - Count))) != 0); + if (Count == 1) State->Flags.Of = State->Flags.Cf ^ ((Result & HighestBit) != 0); + + break; + } + + /* RCR */ + case 3: + { + /* Update OF */ + if (Count == 1) State->Flags.Of = State->Flags.Cf ^ ((Value & HighestBit) != 0); + + Result = (Value >> Count) | (State->Flags.Cf << (Bits - Count)); + + /* Complete the calculation, but make sure we don't shift by too much */ + if ((Bits - Count) < 31) Result |= Value << (Bits - Count + 1); + + /* Update CF */ + State->Flags.Cf = ((Value & (1 << (Count - 1))) != 0); + + break; + } + + /* SHL/SAL */ + case 4: + case 6: + { + Result = Value << Count; /* Update CF and OF */ State->Flags.Cf = ((Value & (1 << (Bits - Count))) != 0); @@ -217,35 +248,6 @@ break; } - /* RCR */ - case 3: - { - Result = (Value >> Count) - | (State->Flags.Cf << (Bits - Count)) - | (Value << (Bits - Count + 1)); - - /* Update CF and OF */ - State->Flags.Cf = ((Value & (1 << (Bits - Count))) != 0); - if (Count == 1) State->Flags.Of = State->Flags.Cf - ^ ((Result & (HighestBit >> 1)) != 0); - - break; - } - - /* SHL/SAL */ - case 4: - case 6: - { - Result = Value << Count; - - /* Update CF and OF */ - State->Flags.Cf = ((Value & (1 << (Bits - Count))) != 0); - if (Count == 1) State->Flags.Of = State->Flags.Cf - ^ ((Result & HighestBit) != 0); - - break; - } - /* SHR */ case 5: { @@ -274,11 +276,10 @@ } } -SetFlags: if (Operation >= 4) { /* Update ZF, SF and PF */ - State->Flags.Zf = (Result == 0); + State->Flags.Zf = ((Result & MaxValue) == 0); State->Flags.Sf = ((Result & HighestBit) != 0); State->Flags.Pf = Fast486CalculateParity(Result); }

1 0

[spetreolle] 60968: [WINNLS] Fix German and Romanian language ids, which resulted into wrong codepage resources into kernel32. Add French resource file.
by spetreolle＠svn.reactos.org 13 Nov '13

13 Nov '13

Author: spetreolle Date: Wed Nov 13 01:04:23 2013 New Revision: 60968 URL: http://svn.reactos.org/svn/reactos?rev=60968&view=rev Log: [WINNLS] Fix German and Romanian language ids, which resulted into wrong codepage resources into kernel32. Add French resource file. Added: trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc - copied, changed from r60924, trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Wed Nov 13 01:04:23 2013 @@ -17,8 +17,12 @@ #ifdef LANGUAGE_EN_US #include "winnls/lang/en-US.rc" #endif +#pragma code_page(65001) #ifdef LANGUAGE_ES_ES #include "winnls/lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "winnls/lang/fr-FR.rc" #endif #ifdef LANGUAGE_RO_RO #include "winnls/lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc [iso-8859-1] Wed Nov 13 01:04:23 2013 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT STRINGTABLE BEGIN Copied: trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc (from r60924, trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc [iso-8859-1] Wed Nov 13 01:04:23 2013 @@ -1,6 +1,6 @@ #pragma code_page(1252) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT STRINGTABLE BEGIN Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] Wed Nov 13 01:04:23 2013 @@ -5,7 +5,7 @@ * CHANGE LOG: 2011-09-05 initial translation */ -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN

1 0

[aandrejevic] 60967: [FAST486] Don't return uninitialized variables.
by aandrejevic＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: aandrejevic Date: Tue Nov 12 21:55:05 2013 New Revision: 60967 URL: http://svn.reactos.org/svn/reactos?rev=60967&view=rev Log: [FAST486] Don't return uninitialized variables. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Tue Nov 12 21:55:05 2013 @@ -167,7 +167,11 @@ Count &= 0x1F; /* If the count is zero, do nothing */ - if (Count == 0) goto SetFlags; + if (Count == 0) + { + Result = Value; + goto SetFlags; + } /* Check which operation is this */ switch (Operation)

1 0

[aandrejevic] 60966: [FAST486] In rotate operations, the count is always masked with 0x1F, regardless of the operand size.
by aandrejevic＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: aandrejevic Date: Tue Nov 12 19:25:50 2013 New Revision: 60966 URL: http://svn.reactos.org/svn/reactos?rev=60966&view=rev Log: [FAST486] In rotate operations, the count is always masked with 0x1F, regardless of the operand size. Modified: branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Tue Nov 12 19:25:50 2013 @@ -637,8 +637,7 @@ } /* Normalize the count */ - if (OperandSize) Count &= 0x1F; - else Count &= 0x0F; + Count &= 0x1F; /* Do nothing if the count is zero */ if (Count == 0) return TRUE; @@ -840,8 +839,7 @@ } /* Normalize the count */ - if (OperandSize) Count &= 0x1F; - else Count &= 0x0F; + Count &= 0x1F; /* Do nothing if the count is zero */ if (Count == 0) return TRUE; Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Tue Nov 12 19:25:50 2013 @@ -163,16 +163,11 @@ ULONG HighestBit = 1 << (Bits - 1); ULONG Result; - if ((Operation != 2) && (Operation != 3)) - { - /* Mask the count */ - Count &= Bits - 1; - } - else - { - /* For RCL and RCR, the CF is included in the value */ - Count %= Bits + 1; - } + /* Normalize the count */ + Count &= 0x1F; + + /* If the count is zero, do nothing */ + if (Count == 0) goto SetFlags; /* Check which operation is this */ switch (Operation) @@ -275,6 +270,7 @@ } } +SetFlags: if (Operation >= 4) { /* Update ZF, SF and PF */

1 0

[tkreuzer] 60965: [NTOSKRNL] Fix freeing of the driver string, this should only be done, if the lowest bit is set.
by tkreuzer＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: tkreuzer Date: Tue Nov 12 19:23:42 2013 New Revision: 60965 URL: http://svn.reactos.org/svn/reactos?rev=60965&view=rev Log: [NTOSKRNL] Fix freeing of the driver string, this should only be done, if the lowest bit is set. Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Tue Nov 12 19:23:42 2013 @@ -3214,11 +3214,20 @@ &LoadedImports); if (!NT_SUCCESS(Status)) { + BOOLEAN NeedToFreeString = FALSE; + + /* If the lowest bit is set to 1, this is a hint that we need to free */ + if (*(ULONG_PTR*)MissingDriverName & 1) + { + NeedToFreeString = TRUE; + *(ULONG_PTR*)MissingDriverName &= ~1; + } + DPRINT1("MiResolveImageReferences failed with status 0x%x\n", Status); DPRINT1(" Missing driver '%ws', missing API '%s'\n", MissingDriverName, MissingApiName); - if (MissingDriverName != NULL) + if (NeedToFreeString) { ExFreePoolWithTag(MissingDriverName, TAG_LDR_WSTR); }

1 0

[aandrejevic] 60964: [FAST486] Don't forget to check for the operand/address size prefix.
by aandrejevic＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: aandrejevic Date: Tue Nov 12 18:40:13 2013 New Revision: 60964 URL: http://svn.reactos.org/svn/reactos?rev=60964&view=rev Log: [FAST486] Don't forget to check for the operand/address size prefix. Modified: branches/ntvdm/lib/fast486/extraops.c Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Tue Nov 12 18:40:13 2013 @@ -903,6 +903,9 @@ OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); + /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) {

1 0

[aandrejevic] 60963: [FAST486] Fix the 3-byte IMUL instruction. If the operand size is 16-bit, the result should be written in 16-bit too.
by aandrejevic＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: aandrejevic Date: Tue Nov 12 18:21:30 2013 New Revision: 60963 URL: http://svn.reactos.org/svn/reactos?rev=60963&view=rev Log: [FAST486] Fix the 3-byte IMUL instruction. If the operand size is 16-bit, the result should be written in 16-bit too. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Tue Nov 12 18:21:30 2013 @@ -3595,7 +3595,6 @@ BOOLEAN OperandSize, AddressSize; FAST486_MOD_REG_RM ModRegRm; LONG Multiplier; - LONGLONG Product; /* Make sure this is the right instruction */ ASSERT((Opcode & 0xFD) == 0x69); @@ -3658,6 +3657,7 @@ if (OperandSize) { LONG RegValue, Multiplicand; + LONGLONG Product; /* Read the operands */ if (!Fast486ReadModrmDwordOperands(State, @@ -3671,10 +3671,20 @@ /* Multiply */ Product = (LONGLONG)Multiplicand * (LONGLONG)Multiplier; + + /* Check for carry/overflow */ + State->Flags.Cf = State->Flags.Of = ((Product < MINLONG) || (Product > MAXLONG)); + + /* Write-back the result */ + return Fast486WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + (ULONG)((LONG)Product)); } else { SHORT RegValue, Multiplicand; + LONG Product; /* Read the operands */ if (!Fast486ReadModrmWordOperands(State, @@ -3687,17 +3697,17 @@ } /* Multiply */ - Product = (LONGLONG)Multiplicand * (LONGLONG)Multiplier; - } - - /* Check for carry/overflow */ - State->Flags.Cf = State->Flags.Of = ((Product < MINLONG) || (Product > MAXLONG)); - - /* Write-back the result */ - return Fast486WriteModrmDwordOperands(State, - &ModRegRm, - TRUE, - (ULONG)((LONG)Product)); + Product = (LONG)Multiplicand * (LONG)Multiplier; + + /* Check for carry/overflow */ + State->Flags.Cf = State->Flags.Of = ((Product < MINSHORT) || (Product > MAXSHORT)); + + /* Write-back the result */ + return Fast486WriteModrmWordOperands(State, + &ModRegRm, + TRUE, + (USHORT)((SHORT)Product)); + } } FAST486_OPCODE_HANDLER(Fast486OpcodePushByteImm)

1 0

[tkreuzer] 60962: [VIDEOPRT] FORMATTING, no code change.
by tkreuzer＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: tkreuzer Date: Tue Nov 12 16:36:12 2013 New Revision: 60962 URL: http://svn.reactos.org/svn/reactos?rev=60962&view=rev Log: [VIDEOPRT] FORMATTING, no code change. Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] Tue Nov 12 16:36:12 2013 @@ -30,60 +30,54 @@ /* * Reset display to blue screen */ - -BOOLEAN NTAPI +BOOLEAN +NTAPI IntVideoPortResetDisplayParameters(ULONG Columns, ULONG Rows) { - PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - - if (ResetDisplayParametersDeviceExtension == NULL) - return FALSE; - - DriverExtension = ResetDisplayParametersDeviceExtension->DriverExtension; - - if (DriverExtension->InitializationData.HwResetHw != NULL) - { - if (DriverExtension->InitializationData.HwResetHw( - &ResetDisplayParametersDeviceExtension->MiniPortDeviceExtension, - Columns, Rows)) - { - ResetDisplayParametersDeviceExtension = NULL; - return TRUE; - } - } - - ResetDisplayParametersDeviceExtension = NULL; - return FALSE; -} - -NTSTATUS NTAPI + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + + if (ResetDisplayParametersDeviceExtension == NULL) + return FALSE; + + DriverExtension = ResetDisplayParametersDeviceExtension->DriverExtension; + + if (DriverExtension->InitializationData.HwResetHw != NULL) + { + if (DriverExtension->InitializationData.HwResetHw( + &ResetDisplayParametersDeviceExtension->MiniPortDeviceExtension, + Columns, Rows)) + { + ResetDisplayParametersDeviceExtension = NULL; + return TRUE; + } + } + + ResetDisplayParametersDeviceExtension = NULL; + return FALSE; +} + +NTSTATUS +NTAPI IntVideoPortAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PhysicalDeviceObject) -{ - PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; - - /* - * Get the initialization data we saved in VideoPortInitialize. - */ - - DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); - - /* - * Create adapter device object. - */ - - Status = IntVideoPortCreateAdapterDeviceObject( - DriverObject, - DriverExtension, - PhysicalDeviceObject, - &DeviceObject); - if (NT_SUCCESS(Status)) - VideoPortDeviceNumber++; - - return Status; + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + + /* Get the initialization data we saved in VideoPortInitialize. */ + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + + /* Create adapter device object. */ + Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, + DriverExtension, + PhysicalDeviceObject, + &DeviceObject); + if (NT_SUCCESS(Status)) + VideoPortDeviceNumber++; + + return Status; } /* @@ -94,54 +88,53 @@ * Run Level * PASSIVE_LEVEL */ - -NTSTATUS NTAPI +NTSTATUS +NTAPI IntVideoPortDispatchOpen( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - - TRACE_(VIDEOPRT, "IntVideoPortDispatchOpen\n"); - - if (CsrssInitialized == FALSE) - { - /* - * We know the first open call will be from the CSRSS process - * to let us know its handle. - */ - - INFO_(VIDEOPRT, "Referencing CSRSS\n"); - Csrss = (PKPROCESS)PsGetCurrentProcess(); - INFO_(VIDEOPRT, "Csrss %p\n", Csrss); - - CsrssInitialized = TRUE; - - Irp->IoStatus.Information = FILE_OPENED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; - } - - DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - DriverExtension = DeviceExtension->DriverExtension; - - if (DriverExtension->InitializationData.HwInitialize(&DeviceExtension->MiniPortDeviceExtension)) - { - Irp->IoStatus.Status = STATUS_SUCCESS; - - InterlockedIncrement((PLONG)&DeviceExtension->DeviceOpened); - } - else - { - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - } - - Irp->IoStatus.Information = FILE_OPENED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + + TRACE_(VIDEOPRT, "IntVideoPortDispatchOpen\n"); + + if (CsrssInitialized == FALSE) + { + /* + * We know the first open call will be from the CSRSS process + * to let us know its handle. + */ + + INFO_(VIDEOPRT, "Referencing CSRSS\n"); + Csrss = (PKPROCESS)PsGetCurrentProcess(); + INFO_(VIDEOPRT, "Csrss %p\n", Csrss); + + CsrssInitialized = TRUE; + + Irp->IoStatus.Information = FILE_OPENED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; + } + + DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DriverExtension = DeviceExtension->DriverExtension; + + if (DriverExtension->InitializationData.HwInitialize(&DeviceExtension->MiniPortDeviceExtension)) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + InterlockedIncrement((PLONG)&DeviceExtension->DeviceOpened); + } + else + { + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + } + + Irp->IoStatus.Information = FILE_OPENED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; } /* @@ -152,30 +145,30 @@ * Run Level * PASSIVE_LEVEL */ - -NTSTATUS NTAPI +NTSTATUS +NTAPI IntVideoPortDispatchClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - - TRACE_(VIDEOPRT, "IntVideoPortDispatchClose\n"); - - DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - if (DeviceExtension->DeviceOpened >= 1 && - InterlockedDecrement((PLONG)&DeviceExtension->DeviceOpened) == 0) - { - ResetDisplayParametersDeviceExtension = NULL; - InbvNotifyDisplayOwnershipLost(NULL); - ResetDisplayParametersDeviceExtension = DeviceExtension; - IntVideoPortResetDisplayParameters(80, 50); - } - - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + + TRACE_(VIDEOPRT, "IntVideoPortDispatchClose\n"); + + DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + if ((DeviceExtension->DeviceOpened >= 1) && + (InterlockedDecrement((PLONG)&DeviceExtension->DeviceOpened) == 0)) + { + ResetDisplayParametersDeviceExtension = NULL; + InbvNotifyDisplayOwnershipLost(NULL); + ResetDisplayParametersDeviceExtension = DeviceExtension; + IntVideoPortResetDisplayParameters(80, 50); + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; } /* @@ -186,73 +179,86 @@ * Run Level * PASSIVE_LEVEL */ - -NTSTATUS NTAPI +NTSTATUS +NTAPI IntVideoPortDispatchDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IrpStack; - PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - PVIDEO_REQUEST_PACKET vrp; - NTSTATUS Status; - - TRACE_(VIDEOPRT, "IntVideoPortDispatchDeviceControl\n"); - - IrpStack = IoGetCurrentIrpStackLocation(Irp); - DeviceExtension = DeviceObject->DeviceExtension; - DriverExtension = DeviceExtension->DriverExtension; - - /* Translate the IRP to a VRP */ - vrp = ExAllocatePoolWithTag(NonPagedPool, - sizeof(VIDEO_REQUEST_PACKET), - TAG_REQUEST_PACKET); - if (NULL == vrp) - { - return STATUS_NO_MEMORY; - } - - vrp->StatusBlock = (PSTATUS_BLOCK)&(Irp->IoStatus); - vrp->IoControlCode = IrpStack->Parameters.DeviceIoControl.IoControlCode; - - INFO_(VIDEOPRT, "- IoControlCode: %x\n", vrp->IoControlCode); - - /* We're assuming METHOD_BUFFERED */ - vrp->InputBuffer = Irp->AssociatedIrp.SystemBuffer; - vrp->InputBufferLength = IrpStack->Parameters.DeviceIoControl.InputBufferLength; - vrp->OutputBuffer = Irp->AssociatedIrp.SystemBuffer; - vrp->OutputBufferLength = IrpStack->Parameters.DeviceIoControl.OutputBufferLength; - - /* Call the Miniport Driver with the VRP */ - DriverExtension->InitializationData.HwStartIO( - &DeviceExtension->MiniPortDeviceExtension, - vrp); - - /* Free the VRP */ - ExFreePoolWithTag(vrp, TAG_REQUEST_PACKET); - - INFO_(VIDEOPRT, "- Returned status: %x\n", Irp->IoStatus.Status); - - if (Irp->IoStatus.Status != STATUS_SUCCESS) - { - /* Map from win32 error codes to NT status values. */ - switch (Irp->IoStatus.Status) - { - case ERROR_NOT_ENOUGH_MEMORY: Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; break; - case ERROR_MORE_DATA: Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; break; - case ERROR_INVALID_FUNCTION: Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; break; - case ERROR_INVALID_PARAMETER: Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; break; - case ERROR_INSUFFICIENT_BUFFER: Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; break; - case ERROR_DEV_NOT_EXIST: Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; break; - case ERROR_IO_PENDING: Irp->IoStatus.Status = STATUS_PENDING; break; - } - } - - Status = Irp->IoStatus.Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpStack; + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + PVIDEO_REQUEST_PACKET vrp; + NTSTATUS Status; + + TRACE_(VIDEOPRT, "IntVideoPortDispatchDeviceControl\n"); + + IrpStack = IoGetCurrentIrpStackLocation(Irp); + DeviceExtension = DeviceObject->DeviceExtension; + DriverExtension = DeviceExtension->DriverExtension; + + /* Translate the IRP to a VRP */ + vrp = ExAllocatePoolWithTag(NonPagedPool, + sizeof(VIDEO_REQUEST_PACKET), + TAG_REQUEST_PACKET); + if (vrp == NULL) + { + return STATUS_NO_MEMORY; + } + + vrp->StatusBlock = (PSTATUS_BLOCK) & (Irp->IoStatus); + vrp->IoControlCode = IrpStack->Parameters.DeviceIoControl.IoControlCode; + + INFO_(VIDEOPRT, "- IoControlCode: %x\n", vrp->IoControlCode); + + /* We're assuming METHOD_BUFFERED */ + vrp->InputBuffer = Irp->AssociatedIrp.SystemBuffer; + vrp->InputBufferLength = IrpStack->Parameters.DeviceIoControl.InputBufferLength; + vrp->OutputBuffer = Irp->AssociatedIrp.SystemBuffer; + vrp->OutputBufferLength = IrpStack->Parameters.DeviceIoControl.OutputBufferLength; + + /* Call the Miniport Driver with the VRP */ + DriverExtension->InitializationData.HwStartIO( + &DeviceExtension->MiniPortDeviceExtension, + vrp); + + /* Free the VRP */ + ExFreePoolWithTag(vrp, TAG_REQUEST_PACKET); + + INFO_(VIDEOPRT, "- Returned status: %x\n", Irp->IoStatus.Status); + + if (Irp->IoStatus.Status != STATUS_SUCCESS) + { + switch (Irp->IoStatus.Status) + { + case ERROR_NOT_ENOUGH_MEMORY: + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + break; + case ERROR_MORE_DATA: + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + break; + case ERROR_INVALID_FUNCTION: + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + break; + case ERROR_INVALID_PARAMETER: + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + break; + case ERROR_INSUFFICIENT_BUFFER: + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + case ERROR_DEV_NOT_EXIST: + Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; + break; + case ERROR_IO_PENDING: + Irp->IoStatus.Status = STATUS_PENDING; + break; + } + } + + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } /* @@ -273,127 +279,119 @@ * PASSIVE_LEVEL */ -NTSTATUS NTAPI +NTSTATUS +NTAPI IntVideoPortDispatchWrite( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION piosStack = IoGetCurrentIrpStackLocation(Irp); - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - NTSTATUS nErrCode; - - DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* - * Storing the device extension pointer in a static variable is an - * ugly hack. Unfortunately, we need it in IntVideoPortResetDisplayParameters - * and InbvNotifyDisplayOwnershipLost doesn't allow us to pass a userdata - * parameter. On the bright side, the DISPLAY device is opened - * exclusively, so there can be only one device extension active at - * any point in time. - * - * FIXME: We should process all opened display devices in - * IntVideoPortResetDisplayParameters. - */ - - ResetDisplayParametersDeviceExtension = DeviceExtension; - InbvNotifyDisplayOwnershipLost(IntVideoPortResetDisplayParameters); - - nErrCode = STATUS_SUCCESS; - Irp->IoStatus.Information = piosStack->Parameters.Write.Length; - Irp->IoStatus.Status = nErrCode; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return nErrCode; -} - -NTSTATUS NTAPI + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION piosStack = IoGetCurrentIrpStackLocation(Irp); + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + NTSTATUS nErrCode; + + DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* + * Storing the device extension pointer in a static variable is an + * ugly hack. Unfortunately, we need it in IntVideoPortResetDisplayParameters + * and InbvNotifyDisplayOwnershipLost doesn't allow us to pass a userdata + * parameter. On the bright side, the DISPLAY device is opened + * exclusively, so there can be only one device extension active at + * any point in time. + * + * FIXME: We should process all opened display devices in + * IntVideoPortResetDisplayParameters. + */ + ResetDisplayParametersDeviceExtension = DeviceExtension; + InbvNotifyDisplayOwnershipLost(IntVideoPortResetDisplayParameters); + + nErrCode = STATUS_SUCCESS; + Irp->IoStatus.Information = piosStack->Parameters.Write.Length; + Irp->IoStatus.Status = nErrCode; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return nErrCode; +} + +NTSTATUS +NTAPI IntVideoPortPnPStartDevice( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); - PDRIVER_OBJECT DriverObject; - PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - PCM_RESOURCE_LIST AllocatedResources; - - /* - * Get the initialization data we saved in VideoPortInitialize. - */ - - DriverObject = DeviceObject->DriverObject; - DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); - DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* - * Store some resources in the DeviceExtension. - */ - - AllocatedResources = Stack->Parameters.StartDevice.AllocatedResources; - if (AllocatedResources != NULL) - { - CM_FULL_RESOURCE_DESCRIPTOR *FullList; - CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; - ULONG ResourceCount; - ULONG ResourceListSize; - - /* Save the resource list */ - ResourceCount = AllocatedResources->List[0].PartialResourceList.Count; - ResourceListSize = - FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. - PartialDescriptors[ResourceCount]); - DeviceExtension->AllocatedResources = ExAllocatePool(PagedPool, ResourceListSize); - if (DeviceExtension->AllocatedResources == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(DeviceExtension->AllocatedResources, - AllocatedResources, - ResourceListSize); - - /* Get the interrupt level/vector - needed by HwFindAdapter sometimes */ - for (FullList = AllocatedResources->List; - FullList < AllocatedResources->List + AllocatedResources->Count; - FullList++) - { - INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", - FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); - - /* FIXME: Is this ASSERT ok for resources from the PNP manager? */ - ASSERT(FullList->InterfaceType == PCIBus); - ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber); - ASSERT(1 == FullList->PartialResourceList.Version); - ASSERT(1 == FullList->PartialResourceList.Revision); - for (Descriptor = FullList->PartialResourceList.PartialDescriptors; - Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; - Descriptor++) - { - if (Descriptor->Type == CmResourceTypeInterrupt) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + PDRIVER_OBJECT DriverObject; + PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST AllocatedResources; + + /* Get the initialization data we saved in VideoPortInitialize.*/ + DriverObject = DeviceObject->DriverObject; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* Store some resources in the DeviceExtension. */ + AllocatedResources = Stack->Parameters.StartDevice.AllocatedResources; + if (AllocatedResources != NULL) + { + CM_FULL_RESOURCE_DESCRIPTOR *FullList; + CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; + ULONG ResourceCount; + ULONG ResourceListSize; + + /* Save the resource list */ + ResourceCount = AllocatedResources->List[0].PartialResourceList.Count; + ResourceListSize = + FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. + PartialDescriptors[ResourceCount]); + DeviceExtension->AllocatedResources = ExAllocatePool(PagedPool, ResourceListSize); + if (DeviceExtension->AllocatedResources == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(DeviceExtension->AllocatedResources, + AllocatedResources, + ResourceListSize); + + /* Get the interrupt level/vector - needed by HwFindAdapter sometimes */ + for (FullList = AllocatedResources->List; + FullList < AllocatedResources->List + AllocatedResources->Count; + FullList++) + { + INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", + FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision); + + /* FIXME: Is this ASSERT ok for resources from the PNP manager? */ + ASSERT(FullList->InterfaceType == PCIBus); + ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber); + ASSERT(1 == FullList->PartialResourceList.Version); + ASSERT(1 == FullList->PartialResourceList.Revision); + for (Descriptor = FullList->PartialResourceList.PartialDescriptors; + Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; + Descriptor++) { - DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; - DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; - if (Descriptor->ShareDisposition == CmResourceShareShared) - DeviceExtension->InterruptShared = TRUE; - else - DeviceExtension->InterruptShared = FALSE; + if (Descriptor->Type == CmResourceTypeInterrupt) + { + DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; + DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; + if (Descriptor->ShareDisposition == CmResourceShareShared) + DeviceExtension->InterruptShared = TRUE; + else + DeviceExtension->InterruptShared = FALSE; + } } - } - } - } - INFO_(VIDEOPRT, "Interrupt level: 0x%x Interrupt Vector: 0x%x\n", + } + } + + INFO_(VIDEOPRT, "Interrupt level: 0x%x Interrupt Vector: 0x%x\n", DeviceExtension->InterruptLevel, DeviceExtension->InterruptVector); - /* - * Create adapter device object. - */ - - return IntVideoPortFindAdapter( - DriverObject, - DriverExtension, - DeviceObject); + /* Create adapter device object. */ + return IntVideoPortFindAdapter(DriverObject, + DriverExtension, + DeviceObject); } @@ -404,12 +402,12 @@ PIRP Irp, PVOID Context) { - PKEVENT Event = Context; - - if (Irp->PendingReturned) - KeSetEvent(Event, IO_NO_INCREMENT, FALSE); - - return STATUS_MORE_PROCESSING_REQUIRED; + PKEVENT Event = Context; + + if (Irp->PendingReturned) + KeSetEvent(Event, IO_NO_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; } NTSTATUS @@ -434,7 +432,8 @@ if (i == 0) return Irp->IoStatus.Status; - DeviceRelations = ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS) + ((i - 1) * sizeof(PVOID))); + DeviceRelations = ExAllocatePool(PagedPool, + sizeof(DEVICE_RELATIONS) + ((i - 1) * sizeof(PVOID))); if (!DeviceRelations) return STATUS_NO_MEMORY; DeviceRelations->Count = i; @@ -463,101 +462,109 @@ NTAPI IntVideoPortForwardIrpAndWait(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - KEVENT Event; - NTSTATUS Status; - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = - (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - IoSetCompletionRoutine(Irp, IntVideoPortForwardIrpAndWaitCompletionRoutine, - &Event, TRUE, TRUE, TRUE); - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - return Status; -} - -NTSTATUS NTAPI + KEVENT Event; + NTSTATUS Status; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = + (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + IoSetCompletionRoutine(Irp, + IntVideoPortForwardIrpAndWaitCompletionRoutine, + &Event, + TRUE, + TRUE, + TRUE); + + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + return Status; +} + +NTSTATUS +NTAPI IntVideoPortDispatchFdoPnp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - - switch (IrpSp->MinorFunction) - { - case IRP_MN_START_DEVICE: - Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) - Status = IntVideoPortPnPStartDevice(DeviceObject, Irp); - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - - case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) - Status = IntVideoPortFilterResourceRequirements(DeviceObject, Irp); - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - - case IRP_MN_QUERY_DEVICE_RELATIONS: - if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) - { - IoSkipCurrentIrpStackLocation(Irp); - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - } - else - { - Status = IntVideoPortQueryBusRelations(DeviceObject, Irp); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - break; - - case IRP_MN_REMOVE_DEVICE: - case IRP_MN_QUERY_REMOVE_DEVICE: - case IRP_MN_CANCEL_REMOVE_DEVICE: - case IRP_MN_SURPRISE_REMOVAL: - - case IRP_MN_STOP_DEVICE: - Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + Status = IntVideoPortPnPStartDevice(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + Status = IntVideoPortFilterResourceRequirements(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) + { + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } + else + { + Status = IntVideoPortQueryBusRelations(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + break; + + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + + case IRP_MN_STOP_DEVICE: + Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + Status = STATUS_SUCCESS; + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: Status = STATUS_SUCCESS; - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - - case IRP_MN_QUERY_STOP_DEVICE: - case IRP_MN_CANCEL_STOP_DEVICE: - Status = STATUS_SUCCESS; - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - - default: - Status = Irp->IoStatus.Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - } - - return Status; -} - -NTSTATUS NTAPI + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + default: + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + } + + return Status; +} + +NTSTATUS +NTAPI IntVideoPortDispatchPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -570,40 +577,44 @@ return IntVideoPortDispatchPdoPnp(DeviceObject, Irp); } -NTSTATUS NTAPI +NTSTATUS +NTAPI IntVideoPortDispatchCleanup( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - - DeviceExtension = DeviceObject->DeviceExtension; - RtlFreeUnicodeString(&DeviceExtension->RegistryPath); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; -} - -NTSTATUS NTAPI + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + RtlFreeUnicodeString(&DeviceExtension->RegistryPath); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI IntVideoPortDispatchPower( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS NTAPI + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI IntVideoPortDispatchSystemControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID NTAPI + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return STATUS_NOT_IMPLEMENTED; +} + +VOID +NTAPI IntVideoPortUnload(PDRIVER_OBJECT DriverObject) { }

1 0

[tfaber] 60961: [OOPS] - Fix build
by tfaber＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: tfaber Date: Tue Nov 12 13:20:41 2013 New Revision: 60961 URL: http://svn.reactos.org/svn/reactos?rev=60961&view=rev Log: [OOPS] - Fix build Modified: trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/x86/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt [iso-8859-1] Tue Nov 12 13:20:41 2013 @@ -28,7 +28,7 @@ ) add_asm_files(mesa_x86_asm ${ASM_SOURCE}) -add_library(mesa_x86 STATIC ${SOURCE} ${mesa_x86_asm)) +add_library(mesa_x86 STATIC ${SOURCE} ${mesa_x86_asm}) if(NOT MSVC) add_compile_flags("-Wno-format")

1 0

[tfaber] 60960: [OPENGL32] - Fix MSVC_IDE build CORE-7570 #resolve
by tfaber＠svn.reactos.org 12 Nov '13

12 Nov '13

Author: tfaber Date: Tue Nov 12 13:17:41 2013 New Revision: 60960 URL: http://svn.reactos.org/svn/reactos?rev=60960&view=rev Log: [OPENGL32] - Fix MSVC_IDE build CORE-7570 #resolve Modified: trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/x86/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt [iso-8859-1] Tue Nov 12 13:17:41 2013 @@ -4,6 +4,10 @@ x86_xform.c 3dnow.c sse.c + rtasm/x86sse.c +) + +list(APPEND ASM_SOURCE common_x86_asm.S x86_xform2.S x86_xform3.S @@ -21,10 +25,10 @@ sse_xform4.S sse_normal.S read_rgba_span_x86.S - rtasm/x86sse.c ) -add_library(mesa_x86 STATIC ${SOURCE}) +add_asm_files(mesa_x86_asm ${ASM_SOURCE}) +add_library(mesa_x86 STATIC ${SOURCE} ${mesa_x86_asm)) if(NOT MSVC) add_compile_flags("-Wno-format") Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Tue Nov 12 13:17:41 2013 @@ -28,12 +28,12 @@ if(ARCH STREQUAL "i386") # Optimisation: use asm trampolines to ICD provided functions - list(APPEND SOURCE + add_asm_files(opengl32_asm glapi_x86.s ) endif() -add_library(opengl32 SHARED ${SOURCE}) +add_library(opengl32 SHARED ${SOURCE} ${opengl32_asm}) target_link_libraries(opengl32 wine ${PSEH_LIB} @@ -53,4 +53,4 @@ set_module_type(opengl32 win32dll) add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll) -add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2013